From 3234c91557a5737e9e14097efa31e723b3ca390b Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 10 Nov 2014 12:00:27 -0800
Subject: [PATCH 001/783] google: drop duplicate path trim from opendir()

opendir() trims the path passed then calls getDriveFile() -
which immediately does the same trim operation. This breaks
opendir() on the root directory, which causes the failure of
the testStat() test when it checks the ctime of the root dir.
---
 apps/files_external/lib/google.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 62b0f182e98..d3a665cd53a 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -228,8 +228,6 @@ class Google extends \OC\Files\Storage\Common {
 	}
 
 	public function opendir($path) {
-		// Remove leading and trailing slashes
-		$path = trim($path, '/');
 		$folder = $this->getDriveFile($path);
 		if ($folder) {
 			$files = array();
-- 
GitLab


From 874ccbfb817569b6e741af477addb287342145d0 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 21 Jul 2015 20:40:32 +0200
Subject: [PATCH 002/783] Add custom CSP for Win 10 compatibility

The default content-security-policy of ownCloud forbids inline
JavaScript for security reasons. IE starting on Windows 10 will
however also obey the CSP which will break the event source fallback.
As a workaround thus we set a custom policy which allows the execution
of inline JavaScript.

This fixes https://github.com/owncloud/core/issues/14286
---
 lib/private/eventsource.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/private/eventsource.php b/lib/private/eventsource.php
index c69671c1a75..e2be808e726 100644
--- a/lib/private/eventsource.php
+++ b/lib/private/eventsource.php
@@ -59,6 +59,17 @@ class OC_EventSource implements \OCP\IEventSource {
 		$this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
 		if ($this->fallback) {
 			$this->fallBackId = (int)$_GET['fallback_id'];
+			/**
+			 * FIXME: The default content-security-policy of ownCloud forbids inline
+			 * JavaScript for security reasons. IE starting on Windows 10 will
+			 * however also obey the CSP which will break the event source fallback.
+			 *
+			 * As a workaround thus we set a custom policy which allows the execution
+			 * of inline JavaScript.
+			 *
+			 * @link https://github.com/owncloud/core/issues/14286
+			 */
+			header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'");
 			header("Content-Type: text/html");
 			echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
 		} else {
-- 
GitLab


From 7604bcb3cb07389d76e1f4e8b2023003845efbdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Fortier?=
 <frederic.fortier@oronospolytechnique.com>
Date: Mon, 3 Aug 2015 20:15:22 -0400
Subject: [PATCH 003/783] Properly nest groups when using memberOf to detect
 group membership, fixes #17759

---
 apps/user_ldap/group_ldap.php       | 39 ++++++++++++++++++++++++++---
 apps/user_ldap/tests/group_ldap.php |  7 +++---
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 1b83817151c..44b0ceac7eb 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -181,6 +181,39 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		return $allMembers;
 	}
 
+	/**
+	 * @param string $dnGroup
+	 * @param array &$seen
+	 * @return array
+	 */
+	private function _getGroupDNsFromMemberOf($DN, &$seen = null) {
+		if ($seen === null) {
+			$seen = array();
+		}
+		if (array_key_exists($DN, $seen)) {
+			// avoid loops
+			return array();
+		}
+		$seen[$DN] = 1;
+		$groups = $this->access->readAttribute($DN, 'memberOf');
+		if (is_array($groups)) {
+			$groups = $this->access->groupsMatchFilter($groups);
+			$allGroups =  $groups;
+			foreach ($groups as $group) {
+				$nestedGroups = $this->access->connection->ldapNestedGroups;
+				if (!empty($nestedGroups)) {
+					$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
+					if ($subGroups) {
+						$allGroups = array_merge($allGroups, $subGroups);
+					}
+				}
+			}	
+			return $allGroups;	
+		} else {
+			return array();
+		}
+	}
+
 	/**
 	 * translates a primary group ID into an ownCloud internal name
 	 * @param string $gid as given by primaryGroupID on AD
@@ -377,14 +410,14 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		if(intval($this->access->connection->hasMemberOfFilterSupport) === 1
 			&& intval($this->access->connection->useMemberOfToDetectMembership) === 1
 		) {
-			$groupDNs = $this->access->readAttribute($userDN, 'memberOf');
-
+			$groupDNs = $this->_getGroupDNsFromMemberOf($userDN);
+			
 			if (is_array($groupDNs)) {
-				$groupDNs = $this->access->groupsMatchFilter($groupDNs);
 				foreach ($groupDNs as $dn) {
 					$groups[] = $this->access->dn2groupname($dn);
 				}
 			}
+			
 			if($primaryGroup !== false) {
 				$groups[] = $primaryGroup;
 			}
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index f716618ce48..805238e7d37 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -395,16 +395,15 @@ class Test_Group_Ldap extends \Test\TestCase {
 			->method('username2dn')
 			->will($this->returnValue($dn));
 
-		$access->expects($this->once())
+		$access->expects($this->exactly(3))
 			->method('readAttribute')
-			->with($dn, 'memberOf')
-			->will($this->returnValue(['cn=groupA,dc=foobar', 'cn=groupB,dc=foobar']));
+			->will($this->onConsecutiveCalls(['cn=groupA,dc=foobar', 'cn=groupB,dc=foobar'], [], []));
 
 		$access->expects($this->exactly(2))
 			->method('dn2groupname')
 			->will($this->returnArgument(0));
 
-		$access->expects($this->once())
+		$access->expects($this->exactly(3))
 			->method('groupsMatchFilter')
 			->will($this->returnArgument(0));
 
-- 
GitLab


From e0469d001384eb9c4125ca16d9babdf673be57ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Fortier?=
 <frederic.fortier@oronospolytechnique.com>
Date: Tue, 4 Aug 2015 11:19:57 -0400
Subject: [PATCH 004/783] Take review comments into consideration for pr #18042
 / issue #17759

---
 apps/user_ldap/group_ldap.php | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 44b0ceac7eb..a592913c8f5 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -182,8 +182,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	}
 
 	/**
-	 * @param string $dnGroup
-	 * @param array &$seen
+	 * @param string $DN
+	 * @param array|null &$seen
 	 * @return array
 	 */
 	private function _getGroupDNsFromMemberOf($DN, &$seen = null) {
@@ -196,22 +196,19 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		}
 		$seen[$DN] = 1;
 		$groups = $this->access->readAttribute($DN, 'memberOf');
-		if (is_array($groups)) {
-			$groups = $this->access->groupsMatchFilter($groups);
-			$allGroups =  $groups;
-			foreach ($groups as $group) {
-				$nestedGroups = $this->access->connection->ldapNestedGroups;
-				if (!empty($nestedGroups)) {
-					$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
-					if ($subGroups) {
-						$allGroups = array_merge($allGroups, $subGroups);
-					}
-				}
-			}	
-			return $allGroups;	
-		} else {
+		if (!is_array($groups)) {
 			return array();
 		}
+		$groups = $this->access->groupsMatchFilter($groups);
+		$allGroups =  $groups;
+		foreach ($groups as $group) {
+			$nestedGroups = $this->access->connection->ldapNestedGroups;
+			if (!empty($nestedGroups)) {
+				$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
+				$allGroups = array_merge($allGroups, $subGroups);
+			}
+		}	
+		return $allGroups;	
 	}
 
 	/**
-- 
GitLab


From a55f233e9ffac7d492733f50a37343b4243898bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Fortier?=
 <frederic.fortier@oronospolytechnique.com>
Date: Fri, 7 Aug 2015 08:56:28 -0400
Subject: [PATCH 005/783] fix more review comments for #18042 / #17759

---
 apps/user_ldap/group_ldap.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index a592913c8f5..3b47eb56b03 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -201,9 +201,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		}
 		$groups = $this->access->groupsMatchFilter($groups);
 		$allGroups =  $groups;
-		foreach ($groups as $group) {
-			$nestedGroups = $this->access->connection->ldapNestedGroups;
-			if (!empty($nestedGroups)) {
+		$nestedGroups = $this->access->connection->ldapNestedGroups;
+		if (intval($nestedGroups) === 1) {
+			foreach ($groups as $group) {
 				$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
 				$allGroups = array_merge($allGroups, $subGroups);
 			}
@@ -408,7 +408,6 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 			&& intval($this->access->connection->useMemberOfToDetectMembership) === 1
 		) {
 			$groupDNs = $this->_getGroupDNsFromMemberOf($userDN);
-			
 			if (is_array($groupDNs)) {
 				foreach ($groupDNs as $dn) {
 					$groups[] = $this->access->dn2groupname($dn);
-- 
GitLab


From 6379b1932ff6440865f765a918ff097849ed785f Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Fri, 21 Aug 2015 10:30:42 +0100
Subject: [PATCH 006/783] Allow domain to be specified for SMB

---
 apps/files_external/lib/backend/smb.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apps/files_external/lib/backend/smb.php b/apps/files_external/lib/backend/smb.php
index 3d950a80c31..dc15f6d3dbf 100644
--- a/apps/files_external/lib/backend/smb.php
+++ b/apps/files_external/lib/backend/smb.php
@@ -42,6 +42,8 @@ class SMB extends Backend {
 				(new DefinitionParameter('share', $l->t('Share'))),
 				(new DefinitionParameter('root', $l->t('Remote subfolder')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('domain', $l->t('Domain')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
 			->setDependencyCheck('\OC\Files\Storage\SMB::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
@@ -49,4 +51,14 @@ class SMB extends Backend {
 		;
 	}
 
+	/**
+	 * @param StorageConfig $storage
+	 */
+	public function manipulateStorageConfig(StorageConfig &$storage) {
+		$user = $storage->getBackendOption('user');
+		if ($domain = $storage->getBackendOption('domain')) {
+			$storage->setBackendOption('user', $domain.'\\'.$user);
+		}
+	}
+
 }
-- 
GitLab


From 4e0e2eb22200c4962230f1c8595efe8b88a7c21e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 24 Aug 2015 12:12:08 +0200
Subject: [PATCH 007/783] Change log level of debugging logs to debug

---
 lib/private/share/share.php | 44 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 9aea4677b5b..c245f0f88a9 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -599,7 +599,7 @@ class Share extends Constants {
 		if ($backend->isShareTypeAllowed($shareType) === false) {
 			$message = 'Sharing %s failed, because the backend does not allow shares from type %i';
 			$message_t = $l->t('Sharing %s failed, because the backend does not allow shares from type %i', array($itemSourceName, $shareType));
-			\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareType), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareType), \OCP\Util::DEBUG);
 			throw new \Exception($message_t);
 		}
 
@@ -617,14 +617,14 @@ class Share extends Constants {
 			if (!$path) {
 				$message = 'Sharing %s failed, because the file does not exist';
 				$message_t = $l->t('Sharing %s failed, because the file does not exist', array($itemSourceName));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			// verify that the user has share permission
 			if (!\OC\Files\Filesystem::isSharable($path)) {
 				$message = 'You are not allowed to share %s';
 				$message_t = $l->t('You are not allowed to share %s', array($itemSourceName));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 		}
@@ -637,7 +637,7 @@ class Share extends Constants {
 			foreach ($mounts as $mount) {
 				if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
 					$message = 'Sharing "' . $itemSourceName . '" failed, because it contains files shared with you!';
-					\OCP\Util::writeLog('OCP\Share', $message, \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', $message, \OCP\Util::DEBUG);
 					throw new \Exception($message);
 				}
 
@@ -654,13 +654,13 @@ class Share extends Constants {
 			if ($shareWith == $uidOwner) {
 				$message = 'Sharing %s failed, because the user %s is the item owner';
 				$message_t = $l->t('Sharing %s failed, because the user %s is the item owner', array($itemSourceName, $shareWith));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			if (!\OC_User::userExists($shareWith)) {
 				$message = 'Sharing %s failed, because the user %s does not exist';
 				$message_t = $l->t('Sharing %s failed, because the user %s does not exist', array($itemSourceName, $shareWith));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			if ($shareWithinGroupOnly) {
@@ -669,7 +669,7 @@ class Share extends Constants {
 					$message = 'Sharing %s failed, because the user '
 						.'%s is not a member of any groups that %s is a member of';
 					$message_t = $l->t('Sharing %s failed, because the user %s is not a member of any groups that %s is a member of', array($itemSourceName, $shareWith, $uidOwner));
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith, $uidOwner), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith, $uidOwner), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 			}
@@ -682,7 +682,7 @@ class Share extends Constants {
 				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
 					$message = 'Sharing %s failed, because this item is already shared with %s';
 					$message_t = $l->t('Sharing %s failed, because this item is already shared with %s', array($itemSourceName, $shareWith));
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 			}
@@ -690,14 +690,14 @@ class Share extends Constants {
 			if (!\OC_Group::groupExists($shareWith)) {
 				$message = 'Sharing %s failed, because the group %s does not exist';
 				$message_t = $l->t('Sharing %s failed, because the group %s does not exist', array($itemSourceName, $shareWith));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			if ($shareWithinGroupOnly && !\OC_Group::inGroup($uidOwner, $shareWith)) {
 				$message = 'Sharing %s failed, because '
 					.'%s is not a member of the group %s';
 				$message_t = $l->t('Sharing %s failed, because %s is not a member of the group %s', array($itemSourceName, $uidOwner, $shareWith));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $uidOwner, $shareWith), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $uidOwner, $shareWith), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			// Check if the item source is already shared with the group, either from the same owner or a different user
@@ -710,7 +710,7 @@ class Share extends Constants {
 				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
 					$message = 'Sharing %s failed, because this item is already shared with %s';
 					$message_t = $l->t('Sharing %s failed, because this item is already shared with %s', array($itemSourceName, $shareWith));
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 			}
@@ -750,7 +750,7 @@ class Share extends Constants {
 				if (\OCP\Util::isPublicLinkPasswordRequired() && empty($shareWith)) {
 					$message = 'You need to provide a password to create a public link, only protected links are allowed';
 					$message_t = $l->t('You need to provide a password to create a public link, only protected links are allowed');
-					\OCP\Util::writeLog('OCP\Share', $message, \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', $message, \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 
@@ -779,7 +779,7 @@ class Share extends Constants {
 			}
 			$message = 'Sharing %s failed, because sharing with links is not allowed';
 			$message_t = $l->t('Sharing %s failed, because sharing with links is not allowed', array($itemSourceName));
-			\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::DEBUG);
 			throw new \Exception($message_t);
 		} else if ($shareType === self::SHARE_TYPE_REMOTE) {
 
@@ -790,7 +790,7 @@ class Share extends Constants {
 				$shareWith, $uidOwner, self::FORMAT_NONE, null, 1, true, true)) {
 					$message = 'Sharing %s failed, because this item is already shared with %s';
 					$message_t = $l->t('Sharing %s failed, because this item is already shared with %s', array($itemSourceName, $shareWith));
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 			}
 
@@ -819,7 +819,7 @@ class Share extends Constants {
 			// Future share types need to include their own conditions
 			$message = 'Share type %s is not valid for %s';
 			$message_t = $l->t('Share type %s is not valid for %s', array($shareType, $itemSource));
-			\OCP\Util::writeLog('OCP\Share', sprintf($message, $shareType, $itemSource), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('OCP\Share', sprintf($message, $shareType, $itemSource), \OCP\Util::DEBUG);
 			throw new \Exception($message_t);
 		}
 
@@ -1047,7 +1047,7 @@ class Share extends Constants {
 					$message = 'Setting permissions for %s failed,'
 						.' because the permissions exceed permissions granted to %s';
 					$message_t = $l->t('Setting permissions for %s failed, because the permissions exceed permissions granted to %s', array($itemSource, \OC_User::getUser()));
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource, \OC_User::getUser()), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource, \OC_User::getUser()), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 			}
@@ -1110,7 +1110,7 @@ class Share extends Constants {
 		$message = 'Setting permissions for %s failed, because the item was not found';
 		$message_t = $l->t('Setting permissions for %s failed, because the item was not found', array($itemSource));
 
-		\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource), \OCP\Util::ERROR);
+		\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource), \OCP\Util::DEBUG);
 		throw new \Exception($message_t);
 	}
 
@@ -2158,7 +2158,7 @@ class Share extends Constants {
 				$message = 'Sharing %s failed, because the user %s is the original sharer';
 				$message_t = $l->t('Sharing %s failed, because the user %s is the original sharer', array($itemSourceName, $shareWith));
 
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 		}
@@ -2170,7 +2170,7 @@ class Share extends Constants {
 					$message = 'Sharing %s failed, because the permissions exceed permissions granted to %s';
 					$message_t = $l->t('Sharing %s failed, because the permissions exceed permissions granted to %s', array($itemSourceName, $uidOwner));
 
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $uidOwner), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $uidOwner), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				} else {
 					// TODO Don't check if inside folder
@@ -2196,7 +2196,7 @@ class Share extends Constants {
 				$message = 'Sharing %s failed, because resharing is not allowed';
 				$message_t = $l->t('Sharing %s failed, because resharing is not allowed', array($itemSourceName));
 
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 		} else {
@@ -2209,7 +2209,7 @@ class Share extends Constants {
 				$message = 'Sharing %s failed, because the sharing backend for '
 					.'%s could not find its source';
 				$message_t = $l->t('Sharing %s failed, because the sharing backend for %s could not find its source', array($itemSource, $itemType));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource, $itemType), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource, $itemType), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			if ($backend instanceof \OCP\Share_Backend_File_Dependent) {
@@ -2224,7 +2224,7 @@ class Share extends Constants {
 					$message = 'Sharing %s failed, because the file could not be found in the file cache';
 					$message_t = $l->t('Sharing %s failed, because the file could not be found in the file cache', array($itemSource));
 
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 			} else {
-- 
GitLab


From 5a6b10ae6fd5a50e2f3dde7f28d5e24faa51383d Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 25 Aug 2015 18:46:43 +0200
Subject: [PATCH 008/783] only show search icon on desktop, like on mobile

---
 core/css/header.css |  2 +-
 core/css/mobile.css | 23 -----------------------
 core/css/styles.css | 19 +++++++++++++------
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/core/css/header.css b/core/css/header.css
index 466022e9f76..5630f96953f 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -294,7 +294,7 @@
 }
 #expand {
 	display: block;
-	padding: 7px 30px 6px 22px;
+	padding: 7px 30px 6px 10px;
 	cursor: pointer;
 }
 #expand * {
diff --git a/core/css/mobile.css b/core/css/mobile.css
index 9008e39b89c..29507a0faa9 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -26,35 +26,12 @@
 	display: none;
 }
 
-/* compress search box on mobile, expand when focused */
-.searchbox input[type="search"] {
-	width: 0;
-	cursor: pointer;
-	background-color: transparent;
-	-webkit-transition: all 100ms;
-	-moz-transition: all 100ms;
-	-o-transition: all 100ms;
-	transition: all 100ms;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-	opacity: .7;
-}
-.searchbox input[type="search"]:focus,
-.searchbox input[type="search"]:active {
-	width: 155px;
-	max-width: 50%;
-	cursor: text;
-	background-color: #112;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	opacity: 1;
-}
-
 /* do not show display name on mobile when profile picture is present */
 #header .avatardiv.avatardiv-shown + #expandDisplayName {
 	display: none;
 }
 #header #expand {
 	display: block;
-	padding: 7px 30px 6px 7px;
 }
 
 /* do not show update notification on mobile */
diff --git a/core/css/styles.css b/core/css/styles.css
index 5ad81fd12aa..3c4c21d4e2c 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -258,21 +258,28 @@ input:disabled+label, input:disabled:hover+label, input:disabled:focus+label {
 	font-size: 1.2em;
 	padding: 3px;
 	padding-left: 25px;
-	background: #112 url('../img/actions/search-white.svg') no-repeat 6px center;
+	background: transparent url('../img/actions/search-white.svg') no-repeat 6px center;
 	color: #fff;
 	border: 0;
 	border-radius: 3px;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
-	opacity: .3;
 	margin-top: 9px;
 	float: right;
+	width: 0;
+	cursor: pointer;
+	-webkit-transition: all 100ms;
+	-moz-transition: all 100ms;
+	-o-transition: all 100ms;
+	transition: all 100ms;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+	opacity: .7;
 }
-.searchbox input[type="search"]:hover,
 .searchbox input[type="search"]:focus,
 .searchbox input[type="search"]:active {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-	opacity: .7;
 	color: #fff;
+	width: 155px;
+	max-width: 50%;
+	cursor: text;
+	background-color: #112;
 }
 
 input[type="submit"].enabled {
-- 
GitLab


From 2458a09ac4fa399f38f54765e4858ae3c8963d87 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 26 Aug 2015 09:46:47 +0200
Subject: [PATCH 009/783] use same font-size for share action text

---
 apps/files/css/files.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 026713569a1..3945d6211ad 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -499,7 +499,6 @@ table td.filename .uploadtext {
 .fileactions {
 	position: absolute;
 	right: 0;
-	font-size: 11px;
 }
 
 .busy .fileactions, .busy .action {
-- 
GitLab


From 8d1fb6059f283d4777df6114d8a61ece965c283f Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 26 Aug 2015 09:47:09 +0200
Subject: [PATCH 010/783] proper padding and whitespace for share and more
 actions

---
 apps/files/css/files.css  | 7 +++++++
 apps/files/css/mobile.css | 8 ++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 3945d6211ad..ba82455c374 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -572,6 +572,13 @@ a.action > img {
 	opacity: 0;
 	display:none;
 }
+#fileList a.action.action-share,
+#fileList a.action.action-menu {
+	padding: 17px 14px;
+}
+#fileList .fileActionsMenu {
+	margin-right: 21px;
+}
 
 .ie8 #fileList a.action img,
 #fileList tr:hover a.action,
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 635c24c4168..b43bd3cfce1 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -47,15 +47,11 @@ table td.filename .nametext {
 	display: inline !important;
 }
 #fileList a.action.action-menu img {
-	padding-left: 2px;
+	padding-left: 0;
 }
 
 #fileList .fileActionsMenu {
-	margin-right: 5px;
-}
-/* some padding for better clickability */
-#fileList a.action img {
-	padding: 0 6px 0 12px;
+	margin-right: 12px;
 }
 /* hide text of the share action on mobile */
 #fileList a.action-share span {
-- 
GitLab


From 6cbb56ac5fb3a1ad0477465ec5708ebd7f6901b5 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 26 Aug 2015 09:57:50 +0200
Subject: [PATCH 011/783] remove border around bubble menu

---
 core/css/apps.css | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/core/css/apps.css b/core/css/apps.css
index 620c3013829..ee0f7516b1f 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -302,7 +302,6 @@
 	z-index: 110;
 	margin: -5px 14px 5px 10px;
 	right: 0;
-	border: 1px solid #bbb;
 	-webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 	-moz-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 	-ms-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
@@ -320,9 +319,7 @@
 
 /* miraculous border arrow stuff */
 .bubble:after,
-.bubble:before,
-#app-navigation .app-navigation-entry-menu:after,
-#app-navigation .app-navigation-entry-menu:before {
+#app-navigation .app-navigation-entry-menu:after {
 	bottom: 100%;
 	right: 0; /* change this to adjust the arrow position */
 	border: solid transparent;
@@ -341,14 +338,6 @@
 	margin-left: -10px;
 }
 
-.bubble:before,
-#app-navigation .app-navigation-entry-menu:before {
-	border-color: rgba(187, 187, 187, 0);
-	border-bottom-color: #bbb;
-	border-width: 11px;
-	margin-left: -11px;
-}
-
 	/* list of options for an entry */
 	#app-navigation .app-navigation-entry-menu ul {
 		display: block !important;
-- 
GitLab


From 898243a5ee9a4922a17934419717816a6dd427a0 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 26 Aug 2015 10:27:55 +0200
Subject: [PATCH 012/783] fix share icons of shared items being placed off on
 mobile

---
 core/js/share.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 7e0d0b7a2d3..cd4a614e9d1 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -127,7 +127,7 @@ OC.Share={
 									if (img.attr('src') !== OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
 										$(actions[i]).addClass('permanent');
-										$(actions[i]).html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
+										$(actions[i]).html('<span> '+t('core', 'Shared')+'</span>').prepend(img);
 									}
 								}
 								for(i = 0; i < files.length; i++) {
@@ -276,7 +276,7 @@ OC.Share={
 			else if (recipients) {
 				message = t('core', 'Shared with {recipients}', {recipients: this._formatShareList(recipients.split(", ")).join(", ")}, 0, {escape: false});
 			}
-			action.html(' <span>' + message + '</span>').prepend(img);
+			action.html('<span> ' + message + '</span>').prepend(img);
 			if (owner || recipients) {
 				action.find('.remoteAddress').tipsy({gravity: 's'});
 			}
-- 
GitLab


From 90ed32ebc509edc5bf4978c304db79e6140d2b09 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 26 Aug 2015 10:30:24 +0200
Subject: [PATCH 013/783] Properly show token errors in ajax/update.php event
 source

---
 core/ajax/update.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/ajax/update.php b/core/ajax/update.php
index 14b4f913f76..c25ef1b9084 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -28,15 +28,19 @@
 set_time_limit(0);
 require_once '../../lib/base.php';
 
-\OCP\JSON::callCheck();
+$l = \OC::$server->getL10N('core');
+
+$eventSource = \OC::$server->createEventSource();
+// need to send an initial message to force-init the event source,
+// which will then trigger its own CSRF check and produces its own CSRF error
+// message
+$eventSource->send('success', (string)$l->t('Preparing update'));
 
 if (OC::checkUpgrade(false)) {
 	// if a user is currently logged in, their session must be ignored to
 	// avoid side effects
 	\OC_User::setIncognitoMode(true);
 
-	$l = new \OC_L10N('core');
-	$eventSource = \OC::$server->createEventSource();
 	$logger = \OC::$server->getLogger();
 	$updater = new \OC\Updater(
 			\OC::$server->getHTTPHelper(),
@@ -96,6 +100,10 @@ if (OC::checkUpgrade(false)) {
 			(string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledThirdPartyApps)));
 	}
 
-	$eventSource->send('done', '');
-	$eventSource->close();
+} else {
+	$eventSource->send('notice', (string)$l->t('Already up to date'));
 }
+
+$eventSource->send('done', '');
+$eventSource->close();
+
-- 
GitLab


From ce6045f84b833c35de5b507c4d15b2a753e476b9 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 26 Aug 2015 10:56:27 +0200
Subject: [PATCH 014/783] Properly show update exception

---
 core/ajax/update.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/ajax/update.php b/core/ajax/update.php
index c25ef1b9084..a693deeb9cf 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -89,7 +89,13 @@ if (OC::checkUpgrade(false)) {
 		OC_Config::setValue('maintenance', false);
 	});
 
-	$updater->upgrade();
+	try {
+		$updater->upgrade();
+	} catch (\Exception $e) {
+		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+		$eventSource->close();
+		exit();
+	}
 
 	if (!empty($incompatibleApps)) {
 		$eventSource->send('notice',
-- 
GitLab


From 23aa44b6b5b456988005559c4617f9a8da4521d3 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 26 Aug 2015 11:04:39 +0200
Subject: [PATCH 015/783] Make maintenance/update text white

Removing the color makes it default to white as defined in the parent
style.
---
 core/css/styles.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 5ad81fd12aa..b196b4f1b3f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -680,7 +680,6 @@ label.infield {
 #body-login .update {
 	width: inherit;
 	text-align: center;
-	color: #ccc;
 }
 
 #body-login .update .appList {
-- 
GitLab


From c11ea056d06be7859071eb3176462a9d4d56964e Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 26 Aug 2015 11:07:29 +0200
Subject: [PATCH 016/783] properly shade file actions and menu items, don't
 differentiate between mobile and desktop

---
 apps/files/css/files.css  | 41 +++++++++++++++++++++++++++++++++------
 apps/files/css/mobile.css | 16 +--------------
 core/css/apps.css         | 30 ++++++++++++++++++----------
 3 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index ba82455c374..f8c1d03b666 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -594,9 +594,9 @@ a.action > img {
 #fileList tr:focus a.action.disabled:focus,
 #fileList .name:focus a.action.disabled:focus,
 #fileList a.action.disabled img {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-	filter: alpha(opacity=50);
-	opacity: .5;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	filter: alpha(opacity=30);
+	opacity: .3;
 	display:inline;
 }
 .ie8 #fileList a.action:hover img,
@@ -606,15 +606,44 @@ a.action > img {
 #fileList tr:hover a.action:hover,
 #fileList tr:focus a.action:focus,
 #fileList .name:focus a.action:focus {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	filter: alpha(opacity=100);
-	opacity: 1;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+	filter: alpha(opacity=70);
+	opacity: 7;
 	display:inline;
 }
 #fileList tr a.action.disabled {
 	background: none;
 }
 
+/* show share action of shared items darker to distinguish from non-shared */
+#fileList a.action.permanent.shared-style {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
+	filter: alpha(opacity=70) !important;
+	opacity: .7 !important;
+}
+/* always show actions on mobile, not only on hover */
+#fileList a.action,
+#fileList a.action.action-menu.permanent {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)" !important;
+	filter: alpha(opacity=30) !important;
+	opacity: .3 !important;
+	display: inline !important;
+}
+
+/* properly display actions in the popover menu */
+#fileList .fileActionsMenu .action {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)" !important;
+	filter: alpha(opacity=50) !important;
+	opacity: .5 !important;
+}
+#fileList .fileActionsMenu .action:hover,
+#fileList .fileActionsMenu .action:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
+	filter: alpha(opacity=100) !important;
+	opacity: 1 !important;
+}
+
+
 #selectedActionsList a.download.disabled,
 #fileList tr a.action.action-download.disabled {
 	color: #000000;
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index b43bd3cfce1..c5507a1e268 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -32,26 +32,12 @@ table td.filename .nametext {
 	width: 100%;
 }
 
-/* show share action of shared items darker to distinguish from non-shared */
-#fileList a.action.permanent.shared-style {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
-	filter: alpha(opacity=70) !important;
-	opacity: .7 !important;
-}
-/* always show actions on mobile, not only on hover */
-#fileList a.action,
-#fileList a.action.action-menu.permanent {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)" !important;
-	filter: alpha(opacity=20) !important;
-	opacity: .2 !important;
-	display: inline !important;
-}
 #fileList a.action.action-menu img {
 	padding-left: 0;
 }
 
 #fileList .fileActionsMenu {
-	margin-right: 12px;
+	margin-right: 6px;
 }
 /* hide text of the share action on mobile */
 #fileList a.action-share span {
diff --git a/core/css/apps.css b/core/css/apps.css
index ee0f7516b1f..17595479ae2 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -292,6 +292,7 @@
 		list-style-type: none;
 	}
 
+/* menu bubble / popover */
 .bubble,
 #app-navigation .app-navigation-entry-menu {
 	position: absolute;
@@ -308,15 +309,6 @@
 	-o-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 	filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 }
-
-#app-navigation .app-navigation-entry-menu {
-	display: none;
-}
-
-#app-navigation .app-navigation-entry-menu.open {
-	display: block;
-}
-
 /* miraculous border arrow stuff */
 .bubble:after,
 #app-navigation .app-navigation-entry-menu:after {
@@ -329,7 +321,6 @@
 	position: absolute;
 	pointer-events: none;
 }
-
 .bubble:after,
 #app-navigation .app-navigation-entry-menu:after {
 	border-color: rgba(238, 238, 238, 0);
@@ -337,6 +328,25 @@
 	border-width: 10px;
 	margin-left: -10px;
 }
+.bubble .action {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)" !important;
+	filter: alpha(opacity=50) !important;
+	opacity: .5 !important;
+}
+.bubble .action:hover,
+.bubble .action:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
+	filter: alpha(opacity=100) !important;
+	opacity: 1 !important;
+}
+
+#app-navigation .app-navigation-entry-menu {
+	display: none;
+}
+
+#app-navigation .app-navigation-entry-menu.open {
+	display: block;
+}
 
 	/* list of options for an entry */
 	#app-navigation .app-navigation-entry-menu ul {
-- 
GitLab


From 202af1e3229278abde5dd4597917ff3c390d5f6f Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 26 Aug 2015 11:39:22 +0200
Subject: [PATCH 017/783] fix unit tests

---
 apps/files_sharing/tests/js/shareSpec.js | 16 ++++++++--------
 core/js/tests/specs/shareSpec.js         |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js
index 581e15caf93..b6368b901ee 100644
--- a/apps/files_sharing/tests/js/shareSpec.js
+++ b/apps/files_sharing/tests/js/shareSpec.js
@@ -117,7 +117,7 @@ describe('OCA.Sharing.Util tests', function() {
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('Shared');
+			expect($action.find('>span').text().trim()).toEqual('Shared');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
 			expect($action.find('img').length).toEqual(1);
@@ -138,7 +138,7 @@ describe('OCA.Sharing.Util tests', function() {
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('Shared');
+			expect($action.find('>span').text().trim()).toEqual('Shared');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('public.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-public.svg');
 			expect($action.find('img').length).toEqual(1);
@@ -159,7 +159,7 @@ describe('OCA.Sharing.Util tests', function() {
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('User One');
+			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
 		});
@@ -179,7 +179,7 @@ describe('OCA.Sharing.Util tests', function() {
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('Shared with User One, User Two');
+			expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
 			expect($action.find('img').length).toEqual(1);
@@ -275,7 +275,7 @@ describe('OCA.Sharing.Util tests', function() {
 
 			OC.Share.updateIcon('file', 1);
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('Shared with Group One, Group Two, User One, User Two');
+			expect($action.find('>span').text().trim()).toEqual('Shared with Group One, Group Two, User One, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
 		it('updates share icon after updating shares of a file', function() {
@@ -311,7 +311,7 @@ describe('OCA.Sharing.Util tests', function() {
 			OC.Share.updateIcon('file', 1);
 
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('Shared with User One, User Three, User Two');
+			expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Three, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
 		it('removes share icon after removing all shares from a file', function() {
@@ -380,7 +380,7 @@ describe('OCA.Sharing.Util tests', function() {
 			OC.Share.updateIcon('file', 1);
 
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('User One');
+			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
 		it('keep share text after unsharing reshare', function() {
@@ -416,7 +416,7 @@ describe('OCA.Sharing.Util tests', function() {
 			OC.Share.updateIcon('file', 1);
 
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('User One');
+			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
 	});
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index 3dc25134f59..5a59a117d77 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -1132,7 +1132,7 @@ describe('OC.Share tests', function() {
 				OC.Share.markFileAsShared($file);
 
 				$action = $file.find('.action-share>span');
-				expect($action.text()).toEqual(output);
+				expect($action.text().trim()).toEqual(output);
 				if (_.isString(title)) {
 					expect($action.find('.remoteAddress').attr('title')).toEqual(title);
 				} else {
@@ -1236,7 +1236,7 @@ describe('OC.Share tests', function() {
 				OC.Share.markFileAsShared($file, true);
 
 				$action = $file.find('.action-share>span');
-				expect($action.text()).toEqual(output);
+				expect($action.text().trim()).toEqual(output);
 				if (_.isString(title)) {
 					expect($action.find('.remoteAddress').attr('title')).toEqual(title);
 				} else if (_.isArray(title)) {
-- 
GitLab


From 98301210a9172e6b0a44bcaf43b4ecf4b31f938e Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 8 Aug 2015 22:15:12 +0200
Subject: [PATCH 018/783] Start of OCS Share API sharees endpoint

---
 apps/files_sharing/api/sharees.php    | 234 ++++++++++++++++++++++++++
 apps/files_sharing/appinfo/routes.php |  11 ++
 2 files changed, 245 insertions(+)
 create mode 100644 apps/files_sharing/api/sharees.php

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
new file mode 100644
index 00000000000..83acdd086c3
--- /dev/null
+++ b/apps/files_sharing/api/sharees.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCA\Files_Sharing\API;
+
+use OCP\IGroupManager;
+use OCP\IUserManager;
+use OCP\IAppConfig;
+use OCP\IUserSession;
+use OCP\IURLGenerator;
+
+class Sharees {
+
+	/** @var IGroupManager */
+	private $groupManager;
+
+	/** @var IUserManager */
+	private $userManager;
+
+	/** @var \OCP\Contacts\IManager */
+	private $contactsManager;
+
+	/** @var IAppConfig */
+	private $appConfig;
+
+	/** @var IUserSession */
+	private $userSession;
+
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
+	/**
+	 * @param IGroupManager $groupManager
+	 * @param IUserManager $userManager
+	 * @param \OCP\Contacts\IManager $contactsManager
+	 * @param IAppConfig $appConfig
+	 * @param IUserSession $userSession
+	 */
+	public function __construct(IGroupManager $groupManager,
+	                            IUserManager $userManager,
+								\OCP\Contacts\IManager $contactsManager,
+								IAppConfig $appConfig,
+								IUserSession $userSession,
+								IURLGenerator $urlGenerator) {
+		$this->groupManager = $groupManager;
+		$this->userManager = $userManager;
+		$this->contactsManager = $contactsManager;
+		$this->appConfig = $appConfig;
+		$this->userSession = $userSession;
+		$this->urlGenerator = $urlGenerator;
+	}
+
+	/**
+	 * @param string $search
+	 * @param bool $shareWithGroupOnly
+	 *
+	 * @return array possible sharees
+	 */
+	private function getUsers($search, $shareWithGroupOnly) {
+		$sharees = [];
+		
+		$users = [];
+		if ($shareWithGroupOnly) {
+			// Search in all the groups this user is part of
+			$userGroups = $this->groupManager->getUserGroupsIds($this->userSession->getUser());
+			foreach ($userGroups as $userGroup) {
+				$users = array_merge($users, $this->groupManager->displayNamesInGroup($userGroup, $search));
+			}
+			$users = array_unique($users);
+		} else {
+			// Search in all users
+			$users_tmp = $this->userManager->searchDisplayName($search);
+
+			// Put in array that maps uid => displayName
+			foreach($users_tmp as $user) {
+				$users[$user->getUID()] = $user->getDisplayName();
+			}
+		}
+
+
+		foreach ($users as $uid => $displayName) {
+			$sharees[] = [
+				'label' => $displayName,
+				'value' => [
+					'shareType' => \OCP\Share::SHARE_TYPE_USER,
+					'shareWith' => $uid
+				]
+			];
+		}
+
+		return $sharees;
+	}
+
+	/**
+	 * @param string $search
+	 * @param bool $shareWithGroupOnly
+	 *
+	 * @return array possible sharees
+	 */
+	private function getGroups($search, $shareWithGroupOnly) {
+		$sharees = [];
+		$groups = $this->groupManager->search($search);
+
+		if ($shareWithGroupOnly) {
+			// Intersect all the groups that match with the groups this user is a member of
+			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
+			$groups = array_intersect($groups, $userGroups);
+		}
+
+		foreach ($groups as $group) {
+			$sharees[] = [
+				'label' => $group->getGID(),
+				'value' => [
+					'shareType' => \OCP\Share::SHARE_TYPE_GROUP,
+					'shareWith' => $group->getGID()
+				]
+			];
+		}
+
+		return $sharees;
+	}
+
+	/**
+	 * @param string $search
+	 *
+	 * @return array possible sharees
+	 */
+	private function getRemote($search) {
+		$sharees = [];
+
+		if (substr_count($search, '@') >= 1) {
+			$sharees[] = [
+				'label' => $search,
+				'value' => [
+					'shareType' => \OCP\Share::SHARE_TYPE_REMOTE,
+					'shareWith' => $search
+				]
+			];
+		}
+
+		// Search in contacts
+		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
+		foreach ($addressBookContacts as $contact) {
+			if (isset($contact['CLOUD'])) {
+				foreach ($contact['CLOUD'] as $cloudId) {
+					$sharees[] = [
+						'label' => $contact['FN'] . ' (' . $cloudId . ')',
+						'value' => [
+							'shareType' => \OCP\Share::SHARE_TYPE_REMOTE,
+							'shareWith' => $cloudId
+						]
+					];
+				}
+			}
+		}
+
+		return $sharees;
+	}
+
+	public function search($params) {
+		$search = isset($_GET['search']) ? (string)$_GET['search'] : '';
+		$item_type = isset($_GET['item_type']) ? (string)$_GET['item_type'] : null;
+		$share_type = isset($_GET['share_type']) ? intval($_GET['share_type']) : null;
+		$page = isset($_GET['page']) ? intval($_GET['page']) : 1;
+		$per_page = isset($_GET['per_page']) ? intval($_GET['per_page']) : 200;
+
+		// Verify arguments
+		if ($item_type === null) {
+			return new \OC_OCS_Result(null, 400, 'missing item_type');
+		}
+
+		$shareWithGroupOnly = $this->appConfig->getValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes' ? true : false;
+
+		$sharees = [];
+		// Get users
+		if ($share_type === null || $share_type === \OCP\Share::SHARE_TYPE_USER) {
+			$sharees = array_merge($sharees, $this->getUsers($search, $shareWithGroupOnly));
+		}
+
+		// Get groups
+		if ($share_type === null || $share_type === \OCP\Share::SHARE_TYPE_GROUP) {
+			$sharees = array_merge($sharees, $this->getGroups($search, $shareWithGroupOnly));
+		}
+
+		// Get remote
+		if (($share_type === null || $share_type === \OCP\Share::SHARE_TYPE_REMOTE) &&
+		    \OCP\Share::getBackend($item_type)->isShareTypeAllowed(\OCP\Share::SHARE_TYPE_REMOTE)) {
+			$sharees = array_merge($sharees, $this->getRemote($search));
+		}
+
+		//Pagination
+		$start = ($page - 1) * $per_page;
+		$end = $page * $per_page;
+		$tot = count($sharees);
+
+		$sharees = array_slice($sharees, $start, $per_page);
+		$response = new \OC_OCS_Result($sharees);
+
+		// FIXME: Do this?
+		$response->setTotalItems($tot);
+		$response->setItemsPerPage($per_page);
+
+		// TODO add other link rels
+
+		if ($tot > $end) {
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees?') .
+				'search=' . $search .
+				'&item_type=' . $item_type .
+				'&share_type=' . $share_type .
+				'&page=' . ($page + 1) .
+				'&per_page=' . $per_page;
+			$response->addHeader('Link', '<' . $url . '> rel="next"');
+		}
+
+		return $response;
+	}
+}
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 184ad29bba4..498b0eb55e9 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -102,3 +102,14 @@ API::register('delete',
 		array('\OCA\Files_Sharing\API\Remote', 'declineShare'),
 		'files_sharing');
 
+$sharees = new \OCA\Files_Sharing\API\Sharees(\OC::$server->getGroupManager(),
+                                              \OC::$server->getUserManager(),
+                                              \OC::$server->getContactsManager(),
+                                              \OC::$server->getAppConfig(),
+                                              \OC::$server->getUserSession(),
+                                              \OC::$server->getURLGenerator());
+
+API::register('get',
+		'/apps/files_sharing/api/v1/sharees',
+		[$sharees, 'search'],
+		'files_sharing', API::USER_AUTH);
-- 
GitLab


From 8a5c1e6d4d63b2efc2c3e8acca98043973295863 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sun, 9 Aug 2015 20:47:49 +0200
Subject: [PATCH 019/783] Sort sharees

To ensure that pagination is working properly we need to make sure the
shares are always in the same order.

Sorting is first done by label (catches most instances)
If there is a user and a group with the same label we sort by shareType
If there are multiple users with the same label we sort those by
shareWith
---
 apps/files_sharing/api/sharees.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 83acdd086c3..8146c98b01a 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -205,6 +205,24 @@ class Sharees {
 			$sharees = array_merge($sharees, $this->getRemote($search));
 		}
 
+
+		// Sort sharees
+		usort($sharees, function($a, $b) {
+			$res = strcmp($a['label'], $b['label']);
+
+			// If labels are equal sort by share type
+			if ($res === 0) {
+				$res = $a['value']['shareType'] - $b['value']['shareType'];
+			}
+
+			// If sharetype is equal compare shareWith
+			if ($res === 0) {
+				$res = strcmp($a['value']['shareWith'], $b['value']['shareWith']);
+			}
+
+			return $res;
+		});
+
 		//Pagination
 		$start = ($page - 1) * $per_page;
 		$end = $page * $per_page;
-- 
GitLab


From b2fbecc39fa5d0538a946244e5b85a7145cb4505 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sun, 9 Aug 2015 21:19:35 +0200
Subject: [PATCH 020/783] Empty skeleton for tests

---
 apps/files_sharing/tests/sharees.php | 50 ++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 apps/files_sharing/tests/sharees.php

diff --git a/apps/files_sharing/tests/sharees.php b/apps/files_sharing/tests/sharees.php
new file mode 100644
index 00000000000..a9e3350ceb3
--- /dev/null
+++ b/apps/files_sharing/tests/sharees.php
@@ -0,0 +1,50 @@
+<?php
+
+use OCA\Files_Sharing\API\Sharees;
+use OCA\Files_sharing\Tests\TestCase;
+
+class ShareesTest extends TestCase {
+
+	/**
+	 * Properly mock all injected elements
+	 */
+	protected function setup() {
+
+	}
+
+	public function testArguments() {
+
+	}
+
+	public function testsOnlyUsers() {
+
+	}
+
+	public function testOnlyGroups() {
+
+	}
+
+	public function testRemoteAddress() {
+
+	}
+
+	public function testRemoteFromContacts() {
+
+	}
+
+	public function testAll() {
+
+	}
+
+	public function testSorting() {
+
+	}
+
+	public function testPagination() {
+
+	}
+
+	public function testShareWithinGroup() {
+
+	}
+}
-- 
GitLab


From 9b0058d2b0c2137329491adbbf239b72f26f1637 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 11 Aug 2015 14:57:51 +0200
Subject: [PATCH 021/783] Move test file to subdir

---
 apps/files_sharing/api/sharees.php             | 2 +-
 apps/files_sharing/tests/{ => api}/sharees.php | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename apps/files_sharing/tests/{ => api}/sharees.php (100%)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 8146c98b01a..5dd0da55de3 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -54,7 +54,7 @@ class Sharees {
 	 * @param IUserSession $userSession
 	 */
 	public function __construct(IGroupManager $groupManager,
-	                            IUserManager $userManager,
+								IUserManager $userManager,
 								\OCP\Contacts\IManager $contactsManager,
 								IAppConfig $appConfig,
 								IUserSession $userSession,
diff --git a/apps/files_sharing/tests/sharees.php b/apps/files_sharing/tests/api/sharees.php
similarity index 100%
rename from apps/files_sharing/tests/sharees.php
rename to apps/files_sharing/tests/api/sharees.php
-- 
GitLab


From be257bc9cc2330d0e67957525cb66646b346a850 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 11 Aug 2015 15:43:44 +0200
Subject: [PATCH 022/783] Add tests for "getUsers()"

---
 apps/files_sharing/api/sharees.php       |   2 +-
 apps/files_sharing/tests/api/sharees.php | 229 ++++++++++++++++++++---
 2 files changed, 206 insertions(+), 25 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 5dd0da55de3..6853bd8a269 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -79,7 +79,7 @@ class Sharees {
 		$users = [];
 		if ($shareWithGroupOnly) {
 			// Search in all the groups this user is part of
-			$userGroups = $this->groupManager->getUserGroupsIds($this->userSession->getUser());
+			$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
 			foreach ($userGroups as $userGroup) {
 				$users = array_merge($users, $this->groupManager->displayNamesInGroup($userGroup, $search));
 			}
diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index a9e3350ceb3..30397ba8678 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -1,50 +1,231 @@
 <?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_Sharing\Tests\API;
 
 use OCA\Files_Sharing\API\Sharees;
 use OCA\Files_sharing\Tests\TestCase;
 
 class ShareesTest extends TestCase {
+	/** @var Sharees */
+	protected $sharees;
 
-	/**
-	 * Properly mock all injected elements
-	 */
-	protected function setup() {
+	/** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $userManager;
 
-	}
+	/** @var \OCP\IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $groupManager;
 
-	public function testArguments() {
+	/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+	protected $session;
 
-	}
+	protected function setUp() {
+		parent::setUp();
 
-	public function testsOnlyUsers() {
+		$this->userManager = $this->getMockBuilder('OCP\IUserManager')
+			->disableOriginalConstructor()
+			->getMock();
 
-	}
+		$this->groupManager = $this->getMockBuilder('OCP\IGroupManager')
+			->disableOriginalConstructor()
+			->getMock();
 
-	public function testOnlyGroups() {
+		$this->session = $this->getMockBuilder('OCP\IUserSession')
+			->disableOriginalConstructor()
+			->getMock();
 
+		$this->sharees = new Sharees(
+			$this->groupManager,
+			$this->userManager,
+			$this->getMockBuilder('OCP\Contacts\IManager')->disableOriginalConstructor()->getMock(),
+			$this->getMockBuilder('OCP\IAppConfig')->disableOriginalConstructor()->getMock(),
+			$this->session,
+			$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock()
+		);
 	}
 
-	public function testRemoteAddress() {
+	protected function getUserMock($uid, $displayName) {
+		$user = $this->getMockBuilder('OCP\IUser')
+			->disableOriginalConstructor()
+			->getMock();
 
-	}
+		$user->expects($this->any())
+			->method('getUID')
+			->willReturn($uid);
 
-	public function testRemoteFromContacts() {
+		$user->expects($this->any())
+			->method('getDisplayName')
+			->willReturn($displayName);
 
+		return $user;
 	}
 
-	public function testAll() {
-
+	public function dataGetUsers() {
+		return [
+			['test', false, [], [], []],
+			['test', true, [], [], []],
+			[
+				'test',
+				false,
+				[],
+				[
+					$this->getUserMock('test1', 'Test One'),
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				]
+			],
+			[
+				'test',
+				false,
+				[],
+				[
+					$this->getUserMock('test1', 'Test One'),
+					$this->getUserMock('test2', 'Test Two'),
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				]
+			],
+			[
+				'test',
+				true,
+				['abc', 'xyz'],
+				[
+					['abc', 'test', -1, 0, ['test1' => 'Test One']],
+					['xyz', 'test', -1, 0, []],
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				]
+			],
+			[
+				'test',
+				true,
+				['abc', 'xyz'],
+				[
+					['abc', 'test', -1, 0, [
+						'test1' => 'Test One',
+						'test2' => 'Test Two',
+					]],
+					['xyz', 'test', -1, 0, [
+						'test1' => 'Test One',
+						'test2' => 'Test Two',
+					]],
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				]
+			],
+			[
+				'test',
+				true,
+				['abc', 'xyz'],
+				[
+					['abc', 'test', -1, 0, [
+						'test1' => 'Test One',
+					]],
+					['xyz', 'test', -1, 0, [
+						'test2' => 'Test Two',
+					]],
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				]
+			],
+		];
 	}
 
-	public function testSorting() {
-
-	}
-
-	public function testPagination() {
-
+	/**
+	 * @dataProvider dataGetUsers
+	 *
+	 * @param string $searchTerm
+	 * @param bool $shareWithGroupOnly
+	 * @param array $groupResponse
+	 * @param array $userResponse
+	 * @param array $expected
+	 */
+	public function testGetUsers($searchTerm, $shareWithGroupOnly, $groupResponse, $userResponse, $expected) {
+		if (!$shareWithGroupOnly) {
+			$this->userManager->expects($this->once())
+				->method('searchDisplayName')
+				->with($searchTerm)
+				->willReturn($userResponse);
+		} else {
+			$this->session->expects($this->any())
+				->method('getUser')
+				->willReturn($this->getUserMock('admin', 'Administrator'));
+
+			$this->groupManager->expects($this->once())
+				->method('getUserGroupIds')
+				->with($this->anything())
+				->willReturn($groupResponse);
+
+			$this->groupManager->expects($this->exactly(sizeof($groupResponse)))
+				->method('displayNamesInGroup')
+				->with($this->anything(), $searchTerm)
+				->willReturnMap($userResponse);
+		}
+
+		$users = $this->invokePrivate($this->sharees, 'getUsers', [$searchTerm, $shareWithGroupOnly]);
+
+		$this->assertEquals($expected, $users);
 	}
 
-	public function testShareWithinGroup() {
-
-	}
+//	public function testArguments() {
+//
+//	}
+//
+//	public function testsOnlyUsers() {
+//
+//	}
+//
+//	public function testOnlyGroups() {
+//
+//	}
+//
+//	public function testRemoteAddress() {
+//
+//	}
+//
+//	public function testRemoteFromContacts() {
+//
+//	}
+//
+//	public function testAll() {
+//
+//	}
+//
+//	public function testSorting() {
+//
+//	}
+//
+//	public function testPagination() {
+//
+//	}
+//
+//	public function testShareWithinGroup() {
+//
+//	}
 }
-- 
GitLab


From ad450d4f0ed4ebbb5e9e6256750061b0adb950e1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 11 Aug 2015 16:22:05 +0200
Subject: [PATCH 023/783] Add tests for "getGroups()"

---
 apps/files_sharing/api/sharees.php       | 21 ++++---
 apps/files_sharing/tests/api/sharees.php | 72 +++++++++++++++++++++++-
 2 files changed, 82 insertions(+), 11 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 6853bd8a269..7a3555e0a5b 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -20,6 +20,7 @@
  */
 namespace OCA\Files_Sharing\API;
 
+use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IUserManager;
 use OCP\IAppConfig;
@@ -100,8 +101,8 @@ class Sharees {
 				'label' => $displayName,
 				'value' => [
 					'shareType' => \OCP\Share::SHARE_TYPE_USER,
-					'shareWith' => $uid
-				]
+					'shareWith' => $uid,
+				],
 			];
 		}
 
@@ -117,20 +118,22 @@ class Sharees {
 	private function getGroups($search, $shareWithGroupOnly) {
 		$sharees = [];
 		$groups = $this->groupManager->search($search);
+		$groups = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
 
-		if ($shareWithGroupOnly) {
+		if (!empty($groups) && $shareWithGroupOnly) {
 			// Intersect all the groups that match with the groups this user is a member of
 			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
+			$userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
 			$groups = array_intersect($groups, $userGroups);
 		}
 
-		foreach ($groups as $group) {
+		foreach ($groups as $gid) {
 			$sharees[] = [
-				'label' => $group->getGID(),
+				'label' => $gid,
 				'value' => [
 					'shareType' => \OCP\Share::SHARE_TYPE_GROUP,
-					'shareWith' => $group->getGID()
-				]
+					'shareWith' => $gid,
+				],
 			];
 		}
 
@@ -150,8 +153,8 @@ class Sharees {
 				'label' => $search,
 				'value' => [
 					'shareType' => \OCP\Share::SHARE_TYPE_REMOTE,
-					'shareWith' => $search
-				]
+					'shareWith' => $search,
+				],
 			];
 		}
 
diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index 30397ba8678..25074e4e8c4 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -78,6 +78,18 @@ class ShareesTest extends TestCase {
 		return $user;
 	}
 
+	protected function getGroupMock($gid) {
+		$group = $this->getMockBuilder('OCP\IGroup')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$group->expects($this->any())
+			->method('getGID')
+			->willReturn($gid);
+
+		return $group;
+	}
+
 	public function dataGetUsers() {
 		return [
 			['test', false, [], [], []],
@@ -173,13 +185,14 @@ class ShareesTest extends TestCase {
 				->with($searchTerm)
 				->willReturn($userResponse);
 		} else {
+			$user = $this->getUserMock('admin', 'Administrator');
 			$this->session->expects($this->any())
 				->method('getUser')
-				->willReturn($this->getUserMock('admin', 'Administrator'));
+				->willReturn($user);
 
 			$this->groupManager->expects($this->once())
 				->method('getUserGroupIds')
-				->with($this->anything())
+				->with($user)
 				->willReturn($groupResponse);
 
 			$this->groupManager->expects($this->exactly(sizeof($groupResponse)))
@@ -193,6 +206,61 @@ class ShareesTest extends TestCase {
 		$this->assertEquals($expected, $users);
 	}
 
+	public function dataGetGroups() {
+		return [
+			['test', false, [], [], []],
+			[
+				'test', false,
+				[$this->getGroupMock('test1')],
+				[],
+				[['label' => 'test1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+			],
+			['test', true, [], [], []],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test1'),
+					$this->getGroupMock('test2'),
+				],
+				[$this->getGroupMock('test1')],
+				[['label' => 'test1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataGetGroups
+	 *
+	 * @param string $searchTerm
+	 * @param bool $shareWithGroupOnly
+	 * @param array $groupResponse
+	 * @param array $userGroupsResponse
+	 * @param array $expected
+	 */
+	public function testGetGroups($searchTerm, $shareWithGroupOnly, $groupResponse, $userGroupsResponse, $expected) {
+		$this->groupManager->expects($this->once())
+			->method('search')
+			->with($searchTerm)
+			->willReturn($groupResponse);
+
+		if ($shareWithGroupOnly) {
+			$user = $this->getUserMock('admin', 'Administrator');
+			$this->session->expects($this->any())
+				->method('getUser')
+				->willReturn($user);
+
+			$numGetUserGroupsCalls = empty($groupResponse) ? 0 : 1;
+			$this->groupManager->expects($this->exactly($numGetUserGroupsCalls))
+				->method('getUserGroups')
+				->with($user)
+				->willReturn($userGroupsResponse);
+		}
+
+		$users = $this->invokePrivate($this->sharees, 'getGroups', [$searchTerm, $shareWithGroupOnly]);
+
+		$this->assertEquals($expected, $users);
+	}
+
 //	public function testArguments() {
 //
 //	}
-- 
GitLab


From 16e5c15c283c40fd9c7a3f009f054b825bcadbb7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 11 Aug 2015 16:31:54 +0200
Subject: [PATCH 024/783] Add tests for "getRemote()"

---
 apps/files_sharing/tests/api/sharees.php | 85 +++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index 25074e4e8c4..04b8ef50253 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -34,6 +34,9 @@ class ShareesTest extends TestCase {
 	/** @var \OCP\IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
 	protected $groupManager;
 
+	/** @var \OCP\Contacts\IManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $contactsManager;
+
 	/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */
 	protected $session;
 
@@ -48,6 +51,10 @@ class ShareesTest extends TestCase {
 			->disableOriginalConstructor()
 			->getMock();
 
+		$this->contactsManager = $this->getMockBuilder('OCP\Contacts\IManager')
+			->disableOriginalConstructor()
+			->getMock();
+
 		$this->session = $this->getMockBuilder('OCP\IUserSession')
 			->disableOriginalConstructor()
 			->getMock();
@@ -55,7 +62,7 @@ class ShareesTest extends TestCase {
 		$this->sharees = new Sharees(
 			$this->groupManager,
 			$this->userManager,
-			$this->getMockBuilder('OCP\Contacts\IManager')->disableOriginalConstructor()->getMock(),
+			$this->contactsManager,
 			$this->getMockBuilder('OCP\IAppConfig')->disableOriginalConstructor()->getMock(),
 			$this->session,
 			$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock()
@@ -261,6 +268,82 @@ class ShareesTest extends TestCase {
 		$this->assertEquals($expected, $users);
 	}
 
+	public function dataGetRemote() {
+		return [
+			['test', [], []],
+			[
+				'test@remote',
+				[],
+				[
+					['label' => 'test@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
+				],
+			],
+			[
+				'test',
+				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User @ Localhost',
+						'CLOUD' => [
+							'username@localhost',
+						],
+					],
+				],
+				[
+					['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
+				],
+			],
+			[
+				'test@remote',
+				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User @ Localhost',
+						'CLOUD' => [
+							'username@localhost',
+						],
+					],
+				],
+				[
+					['label' => 'test@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
+					['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
+				],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataGetRemote
+	 *
+	 * @param string $searchTerm
+	 * @param array $contacts
+	 * @param array $expected
+	 */
+	public function testGetRemote($searchTerm, $contacts, $expected) {
+		$this->contactsManager->expects($this->any())
+			->method('search')
+			->with($searchTerm, ['CLOUD', 'FN'])
+			->willReturn($contacts);
+
+		$users = $this->invokePrivate($this->sharees, 'getRemote', [$searchTerm]);
+
+		$this->assertEquals($expected, $users);
+	}
+
 //	public function testArguments() {
 //
 //	}
-- 
GitLab


From 4b08783946c8b2b1e731b3193e581b59bbbb15f5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 11 Aug 2015 17:24:54 +0200
Subject: [PATCH 025/783] Use SearchResultSorter

---
 apps/files_sharing/api/sharees.php | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 7a3555e0a5b..120df126a7c 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -210,21 +210,10 @@ class Sharees {
 
 
 		// Sort sharees
-		usort($sharees, function($a, $b) {
-			$res = strcmp($a['label'], $b['label']);
-
-			// If labels are equal sort by share type
-			if ($res === 0) {
-				$res = $a['value']['shareType'] - $b['value']['shareType'];
-			}
-
-			// If sharetype is equal compare shareWith
-			if ($res === 0) {
-				$res = strcmp($a['value']['shareWith'], $b['value']['shareWith']);
-			}
-
-			return $res;
-		});
+		$sorter = new \OC\Share\SearchResultSorter($search,
+			'label',
+			\OC::$server->getLogger());
+		usort($sharees, array($sorter, 'sort'));
 
 		//Pagination
 		$start = ($page - 1) * $per_page;
@@ -239,7 +228,6 @@ class Sharees {
 		$response->setItemsPerPage($per_page);
 
 		// TODO add other link rels
-
 		if ($tot > $end) {
 			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees?') .
 				'search=' . $search .
-- 
GitLab


From a66aa1fe02038d70bd567cbcdc486441017d3172 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 11 Aug 2015 18:03:07 +0200
Subject: [PATCH 026/783] Filter the sharees with the existing shares

---
 apps/files_sharing/api/sharees.php | 94 ++++++++++++++++++++----------
 1 file changed, 64 insertions(+), 30 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 120df126a7c..a499b0ec6d3 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -178,33 +178,49 @@ class Sharees {
 	}
 
 	public function search($params) {
-		$search = isset($_GET['search']) ? (string)$_GET['search'] : '';
-		$item_type = isset($_GET['item_type']) ? (string)$_GET['item_type'] : null;
-		$share_type = isset($_GET['share_type']) ? intval($_GET['share_type']) : null;
-		$page = isset($_GET['page']) ? intval($_GET['page']) : 1;
-		$per_page = isset($_GET['per_page']) ? intval($_GET['per_page']) : 200;
+		$search = isset($_GET['search']) ? (string) $_GET['search'] : '';
+		$itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
+		$existingShares = isset($_GET['existingShares']) ? (array) $_GET['existingShares'] : [];
+		$shareType = isset($_GET['shareType']) ? intval($_GET['shareType']) : null;
+		$page = !empty($_GET['page']) ? intval($_GET['page']) : 1;
+		$perPage = !empty($_GET['limit']) ? intval($_GET['limit']) : 200;
+
+		$sharedUsers = $sharedGroups = [];
+		if (!empty($existingShares)) {
+			if (!empty($existingShares[\OCP\Share::SHARE_TYPE_USER]) &&
+				is_array($existingShares[\OCP\Share::SHARE_TYPE_USER])) {
+				$sharedUsers = $existingShares[\OCP\Share::SHARE_TYPE_USER];
+			}
+
+			if (!empty($existingShares[\OCP\Share::SHARE_TYPE_GROUP]) &&
+				is_array($existingShares[\OCP\Share::SHARE_TYPE_GROUP])) {
+				$sharedGroups = $existingShares[\OCP\Share::SHARE_TYPE_GROUP];
+			}
+		}
 
 		// Verify arguments
-		if ($item_type === null) {
-			return new \OC_OCS_Result(null, 400, 'missing item_type');
+		if ($itemType === null) {
+			return new \OC_OCS_Result(null, 400, 'missing itemType');
 		}
 
 		$shareWithGroupOnly = $this->appConfig->getValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes' ? true : false;
 
 		$sharees = [];
 		// Get users
-		if ($share_type === null || $share_type === \OCP\Share::SHARE_TYPE_USER) {
-			$sharees = array_merge($sharees, $this->getUsers($search, $shareWithGroupOnly));
+		if ($shareType === null || $shareType === \OCP\Share::SHARE_TYPE_USER) {
+			$potentialSharees = $this->getUsers($search, $shareWithGroupOnly);
+			$sharees = array_merge($sharees, $this->filterSharees($potentialSharees, $sharedUsers));
 		}
 
 		// Get groups
-		if ($share_type === null || $share_type === \OCP\Share::SHARE_TYPE_GROUP) {
-			$sharees = array_merge($sharees, $this->getGroups($search, $shareWithGroupOnly));
+		if ($shareType === null || $shareType === \OCP\Share::SHARE_TYPE_GROUP) {
+			$potentialSharees = $this->getGroups($search, $shareWithGroupOnly);
+			$sharees = array_merge($sharees, $this->filterSharees($potentialSharees, $sharedGroups));
 		}
 
 		// Get remote
-		if (($share_type === null || $share_type === \OCP\Share::SHARE_TYPE_REMOTE) &&
-		    \OCP\Share::getBackend($item_type)->isShareTypeAllowed(\OCP\Share::SHARE_TYPE_REMOTE)) {
+		if (($shareType === null || $shareType === \OCP\Share::SHARE_TYPE_REMOTE) &&
+		    \OCP\Share::getBackend($itemType)->isShareTypeAllowed(\OCP\Share::SHARE_TYPE_REMOTE)) {
 			$sharees = array_merge($sharees, $this->getRemote($search));
 		}
 
@@ -216,28 +232,46 @@ class Sharees {
 		usort($sharees, array($sorter, 'sort'));
 
 		//Pagination
-		$start = ($page - 1) * $per_page;
-		$end = $page * $per_page;
-		$tot = count($sharees);
+		$start = ($page - 1) * $perPage;
+		$end = $page * $perPage;
+		$total = sizeof($sharees);
 
-		$sharees = array_slice($sharees, $start, $per_page);
-		$response = new \OC_OCS_Result($sharees);
+		$sharees = array_slice($sharees, $start, $perPage);
 
-		// FIXME: Do this?
-		$response->setTotalItems($tot);
-		$response->setItemsPerPage($per_page);
-
-		// TODO add other link rels
-		if ($tot > $end) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees?') .
-				'search=' . $search .
-				'&item_type=' . $item_type .
-				'&share_type=' . $share_type .
-				'&page=' . ($page + 1) .
-				'&per_page=' . $per_page;
+		$response = new \OC_OCS_Result($sharees);
+		$response->setTotalItems($total);
+		$response->setItemsPerPage($perPage);
+
+		if ($total > $end) {
+			$params = [
+				'search' => $search,
+				'itemType' => $itemType,
+				'existingShares' => $existingShares,
+				'page' => $page + 1,
+				'limit' => $perPage,
+			];
+			if ($shareType !== null) {
+				$params['shareType'] = $shareType;
+			}
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?' . http_build_query($params);
 			$response->addHeader('Link', '<' . $url . '> rel="next"');
 		}
 
 		return $response;
 	}
+
+	/**
+	 * Filter out already existing shares from a list of potential sharees
+	 *
+	 * @param array $potentialSharees
+	 * @param array $existingSharees
+	 * @return array
+	 */
+	private function filterSharees($potentialSharees, $existingSharees) {
+		$sharees = array_map(function ($sharee) use ($existingSharees) {
+			return in_array($sharee['value']['shareWith'], $existingSharees) ? null : $sharee;
+		}, $potentialSharees);
+
+		return array_filter($sharees);
+	}
 }
-- 
GitLab


From 3f64e9423bf190629f867be20f17444a00257f8a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 12 Aug 2015 14:19:34 +0200
Subject: [PATCH 027/783] Split logic and global usage and add tests for
 "searchSharees()"

---
 apps/files_sharing/api/sharees.php       |  39 +++-
 apps/files_sharing/tests/api/sharees.php | 222 +++++++++++++++++++----
 2 files changed, 217 insertions(+), 44 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index a499b0ec6d3..573fd8f2ab1 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -74,7 +74,7 @@ class Sharees {
 	 *
 	 * @return array possible sharees
 	 */
-	private function getUsers($search, $shareWithGroupOnly) {
+	protected function getUsers($search, $shareWithGroupOnly) {
 		$sharees = [];
 		
 		$users = [];
@@ -115,7 +115,7 @@ class Sharees {
 	 *
 	 * @return array possible sharees
 	 */
-	private function getGroups($search, $shareWithGroupOnly) {
+	protected function getGroups($search, $shareWithGroupOnly) {
 		$sharees = [];
 		$groups = $this->groupManager->search($search);
 		$groups = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
@@ -145,7 +145,7 @@ class Sharees {
 	 *
 	 * @return array possible sharees
 	 */
-	private function getRemote($search) {
+	protected function getRemote($search) {
 		$sharees = [];
 
 		if (substr_count($search, '@') >= 1) {
@@ -177,14 +177,37 @@ class Sharees {
 		return $sharees;
 	}
 
+	/**
+	 * @param array $params
+	 * @return \OC_OCS_Result
+	 */
 	public function search($params) {
-		$search = isset($_GET['search']) ? (string) $_GET['search'] : '';
-		$itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
-		$existingShares = isset($_GET['existingShares']) ? (array) $_GET['existingShares'] : [];
+		$search = isset($_GET['search']) ? (string)$_GET['search'] : '';
+		$itemType = isset($_GET['itemType']) ? (string)$_GET['itemType'] : null;
+		$existingShares = isset($_GET['existingShares']) ? (array)$_GET['existingShares'] : [];
 		$shareType = isset($_GET['shareType']) ? intval($_GET['shareType']) : null;
 		$page = !empty($_GET['page']) ? intval($_GET['page']) : 1;
 		$perPage = !empty($_GET['limit']) ? intval($_GET['limit']) : 200;
 
+		$shareWithGroupOnly = $this->appConfig->getValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+
+		return $this->searchSharees($search, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly);
+	}
+
+	/**
+	 * Testable search function that does not need globals
+	 *
+	 * @param string $search
+	 * @param string $itemType
+	 * @param array $existingShares
+	 * @param int $shareType
+	 * @param int $page
+	 * @param int $perPage
+	 * @param bool $shareWithGroupOnly
+	 * @return \OC_OCS_Result
+	 */
+	protected function searchSharees($search, $itemType, array $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly) {
+
 		$sharedUsers = $sharedGroups = [];
 		if (!empty($existingShares)) {
 			if (!empty($existingShares[\OCP\Share::SHARE_TYPE_USER]) &&
@@ -203,8 +226,6 @@ class Sharees {
 			return new \OC_OCS_Result(null, 400, 'missing itemType');
 		}
 
-		$shareWithGroupOnly = $this->appConfig->getValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes' ? true : false;
-
 		$sharees = [];
 		// Get users
 		if ($shareType === null || $shareType === \OCP\Share::SHARE_TYPE_USER) {
@@ -267,7 +288,7 @@ class Sharees {
 	 * @param array $existingSharees
 	 * @return array
 	 */
-	private function filterSharees($potentialSharees, $existingSharees) {
+	protected function filterSharees($potentialSharees, $existingSharees) {
 		$sharees = array_map(function ($sharee) use ($existingSharees) {
 			return in_array($sharee['value']['shareWith'], $existingSharees) ? null : $sharee;
 		}, $potentialSharees);
diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index 04b8ef50253..93a8d5c3d7e 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -344,39 +344,191 @@ class ShareesTest extends TestCase {
 		$this->assertEquals($expected, $users);
 	}
 
-//	public function testArguments() {
-//
-//	}
-//
-//	public function testsOnlyUsers() {
-//
-//	}
-//
-//	public function testOnlyGroups() {
-//
-//	}
-//
-//	public function testRemoteAddress() {
-//
-//	}
-//
-//	public function testRemoteFromContacts() {
-//
-//	}
-//
-//	public function testAll() {
-//
-//	}
-//
-//	public function testSorting() {
-//
-//	}
-//
-//	public function testPagination() {
-//
-//	}
-//
-//	public function testShareWithinGroup() {
-//
-//	}
+	public function dataSearchSharees() {
+		return [
+			['test', 'folder', [], null, 1, 2, false, [], [], [], [], 0, false],
+			['test', 'folder', [0 => ['test1'], 1 => ['test2 group']], null, 1, 2, false, [], [], [], [], 0, false],
+			// First page with 2 of 3 results
+			[
+				'test', 'folder', [], null, 1, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], [
+					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
+				], [
+					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+				], [
+					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
+				], 3, true,
+			],
+			// Second page with the 3rd result
+			[
+				'test', 'folder', [], null, 2, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], [
+					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
+				], [
+					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+				], [
+					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+				], 3, false,
+			],
+			// Ingnoring already shared user
+			[
+				'test', 'folder', [\OCP\Share::SHARE_TYPE_USER => ['test1']], null, 1, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], [
+					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
+				], [
+					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+				], [
+					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
+					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+				], 2, false,
+			],
+			// Share type restricted to user - Only one user
+			[
+				'test', 'folder', [], \OCP\Share::SHARE_TYPE_USER, 1, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], null, null, [
+					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], 1, false,
+			],
+			// Share type restricted to user - Multipage result
+			[
+				'test', 'folder', [], \OCP\Share::SHARE_TYPE_USER, 1, 2, false, [
+					['label' => 'test 1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'test 2', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+					['label' => 'test 3', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test3']],
+				], null, null, [
+					['label' => 'test 1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'test 2', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				], 3, true,
+			],
+			// Share type restricted to user - Only user already shared
+			[
+				'test', 'folder', [\OCP\Share::SHARE_TYPE_USER => ['test1']], \OCP\Share::SHARE_TYPE_USER, 1, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], null, null, [], 0, false,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSearchSharees
+	 *
+	 * @param string $searchTerm
+	 * @param string $itemType
+	 * @param array $existingShares
+	 * @param int $shareType
+	 * @param int $page
+	 * @param int $perPage
+	 * @param bool $shareWithGroupOnly
+	 * @param array $expected
+	 */
+	public function testSearchSharees($searchTerm, $itemType, array $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly,
+									  $mockedUserResult, $mockedGroupsResult, $mockedRemotesResult, $expected, $totalItems, $nextLink) {
+		/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\API\Sharees $sharees */
+		$sharees = $this->getMockBuilder('\OCA\Files_Sharing\API\Sharees')
+			->setConstructorArgs([
+				$this->groupManager,
+				$this->userManager,
+				$this->contactsManager,
+				$this->getMockBuilder('OCP\IAppConfig')->disableOriginalConstructor()->getMock(),
+				$this->session,
+				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock()
+			])
+			->setMethods(array('getUsers', 'getGroups', 'getRemote'))
+			->getMock();
+		$sharees->expects(($mockedUserResult === null) ? $this->never() : $this->once())
+			->method('getUsers')
+			->with($searchTerm, $shareWithGroupOnly)
+			->willReturn($mockedUserResult);
+		$sharees->expects(($mockedGroupsResult === null) ? $this->never() : $this->once())
+			->method('getGroups')
+			->with($searchTerm, $shareWithGroupOnly)
+			->willReturn($mockedGroupsResult);
+		$sharees->expects(($mockedRemotesResult === null) ? $this->never() : $this->once())
+			->method('getRemote')
+			->with($searchTerm)
+			->willReturn($mockedRemotesResult);
+
+		/** @var \OC_OCS_Result $ocs */
+		$ocs = $this->invokePrivate($sharees, 'searchSharees', [$searchTerm, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly]);
+
+		$this->assertEquals($expected, $ocs->getData());
+
+		// Check number of total results
+		$meta = $ocs->getMeta();
+		$this->assertArrayHasKey('totalitems', $meta);
+		$this->assertSame($totalItems, $meta['totalitems']);
+
+		// Check if next link is set
+		if ($nextLink) {
+			$headers = $ocs->getHeaders();
+			$this->assertArrayHasKey('Link', $headers);
+			$this->assertStringStartsWith('<', $headers['Link']);
+			$this->assertStringEndsWith('> rel="next"', $headers['Link']);
+		}
+	}
+
+	public function testSearchShareesNoItemType() {
+		/** @var \OC_OCS_Result $ocs */
+		$ocs = $this->invokePrivate($this->sharees, 'searchSharees', ['', null, [], null, 0, 0, false]);
+
+		$this->assertSame(400, $ocs->getStatusCode(), 'Expected status code 400');
+		$this->assertSame([], $ocs->getData(), 'Expected that no data is send');
+
+		$meta = $ocs->getMeta();
+		$this->assertNotEmpty($meta);
+		$this->assertArrayHasKey('message', $meta);
+		$this->assertSame('missing itemType', $meta['message']);
+	}
+
+
+	public function dataFilterSharees() {
+		return [
+			[[], [], []],
+			[
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				],
+				[],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				],
+			],
+			[
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+				['test1'],
+				[
+					1 => ['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+			],
+			[
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+				['test2'],
+				[
+					0 => ['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataFilterSharees
+	 *
+	 * @param array $potentialSharees
+	 * @param array $existingSharees
+	 * @param array $expectedSharees
+	 */
+	public function testFilterSharees($potentialSharees, $existingSharees, $expectedSharees) {
+		$this->assertEquals($expectedSharees, $this->invokePrivate($this->sharees, 'filterSharees', [$potentialSharees, $existingSharees]));
+	}
 }
-- 
GitLab


From 327c47a9894cb6f8730e5824e3bda1b5e51db9d5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 12 Aug 2015 14:23:48 +0200
Subject: [PATCH 028/783] Do not use deprecated method in new code

---
 apps/files_sharing/api/sharees.php       | 17 ++++++++---------
 apps/files_sharing/appinfo/routes.php    |  2 +-
 apps/files_sharing/tests/api/sharees.php |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 573fd8f2ab1..4ae6784c3d9 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -23,7 +23,7 @@ namespace OCA\Files_Sharing\API;
 use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IUserManager;
-use OCP\IAppConfig;
+use OCP\IConfig;
 use OCP\IUserSession;
 use OCP\IURLGenerator;
 
@@ -38,8 +38,8 @@ class Sharees {
 	/** @var \OCP\Contacts\IManager */
 	private $contactsManager;
 
-	/** @var IAppConfig */
-	private $appConfig;
+	/** @var IConfig */
+	private $config;
 
 	/** @var IUserSession */
 	private $userSession;
@@ -51,19 +51,19 @@ class Sharees {
 	 * @param IGroupManager $groupManager
 	 * @param IUserManager $userManager
 	 * @param \OCP\Contacts\IManager $contactsManager
-	 * @param IAppConfig $appConfig
+	 * @param IConfig $config
 	 * @param IUserSession $userSession
 	 */
 	public function __construct(IGroupManager $groupManager,
 								IUserManager $userManager,
 								\OCP\Contacts\IManager $contactsManager,
-								IAppConfig $appConfig,
+								IConfig $config,
 								IUserSession $userSession,
 								IURLGenerator $urlGenerator) {
 		$this->groupManager = $groupManager;
 		$this->userManager = $userManager;
 		$this->contactsManager = $contactsManager;
-		$this->appConfig = $appConfig;
+		$this->config = $config;
 		$this->userSession = $userSession;
 		$this->urlGenerator = $urlGenerator;
 	}
@@ -178,10 +178,9 @@ class Sharees {
 	}
 
 	/**
-	 * @param array $params
 	 * @return \OC_OCS_Result
 	 */
-	public function search($params) {
+	public function search() {
 		$search = isset($_GET['search']) ? (string)$_GET['search'] : '';
 		$itemType = isset($_GET['itemType']) ? (string)$_GET['itemType'] : null;
 		$existingShares = isset($_GET['existingShares']) ? (array)$_GET['existingShares'] : [];
@@ -189,7 +188,7 @@ class Sharees {
 		$page = !empty($_GET['page']) ? intval($_GET['page']) : 1;
 		$perPage = !empty($_GET['limit']) ? intval($_GET['limit']) : 200;
 
-		$shareWithGroupOnly = $this->appConfig->getValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+		$shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
 
 		return $this->searchSharees($search, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly);
 	}
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 498b0eb55e9..45ea85ff724 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -105,7 +105,7 @@ API::register('delete',
 $sharees = new \OCA\Files_Sharing\API\Sharees(\OC::$server->getGroupManager(),
                                               \OC::$server->getUserManager(),
                                               \OC::$server->getContactsManager(),
-                                              \OC::$server->getAppConfig(),
+                                              \OC::$server->getConfig(),
                                               \OC::$server->getUserSession(),
                                               \OC::$server->getURLGenerator());
 
diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index 93a8d5c3d7e..863dc193ae0 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -63,7 +63,7 @@ class ShareesTest extends TestCase {
 			$this->groupManager,
 			$this->userManager,
 			$this->contactsManager,
-			$this->getMockBuilder('OCP\IAppConfig')->disableOriginalConstructor()->getMock(),
+			$this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
 			$this->session,
 			$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock()
 		);
@@ -434,7 +434,7 @@ class ShareesTest extends TestCase {
 				$this->groupManager,
 				$this->userManager,
 				$this->contactsManager,
-				$this->getMockBuilder('OCP\IAppConfig')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
 				$this->session,
 				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock()
 			])
-- 
GitLab


From 068a81897e0a307b7823aeab48595ed7b6f613b0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 12 Aug 2015 15:03:50 +0200
Subject: [PATCH 029/783] Add tests for "search()"

---
 apps/files_sharing/api/sharees.php       |  12 +-
 apps/files_sharing/tests/api/sharees.php | 151 ++++++++++++++++++++++-
 2 files changed, 156 insertions(+), 7 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 4ae6784c3d9..bfde21deb2a 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -181,12 +181,12 @@ class Sharees {
 	 * @return \OC_OCS_Result
 	 */
 	public function search() {
-		$search = isset($_GET['search']) ? (string)$_GET['search'] : '';
-		$itemType = isset($_GET['itemType']) ? (string)$_GET['itemType'] : null;
-		$existingShares = isset($_GET['existingShares']) ? (array)$_GET['existingShares'] : [];
-		$shareType = isset($_GET['shareType']) ? intval($_GET['shareType']) : null;
-		$page = !empty($_GET['page']) ? intval($_GET['page']) : 1;
-		$perPage = !empty($_GET['limit']) ? intval($_GET['limit']) : 200;
+		$search = isset($_GET['search']) ? (string) $_GET['search'] : '';
+		$itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
+		$existingShares = isset($_GET['existingShares']) ? (array) $_GET['existingShares'] : [];
+		$shareType = isset($_GET['shareType']) && is_numeric($_GET['shareType']) ? (int) $_GET['shareType'] : null;
+		$page = !empty($_GET['page']) ? (int) $_GET['page'] : 1;
+		$perPage = !empty($_GET['limit']) ? (int) $_GET['limit'] : 200;
 
 		$shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
 
diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index 863dc193ae0..1a25266fe04 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -344,6 +344,154 @@ class ShareesTest extends TestCase {
 		$this->assertEquals($expected, $users);
 	}
 
+	public function dataSearch() {
+		return [
+			[[], '', '', null, [], null, 1, 200, false],
+
+			// Test itemType
+			[[
+				'search' => '',
+			], '', '', null, [], null, 1, 200, false],
+			[[
+				'search' => 'foobar',
+			], '', 'foobar', null, [], null, 1, 200, false],
+			[[
+				'search' => 0,
+			], '', '0', null, [], null, 1, 200, false],
+
+			// Test itemType
+			[[
+				'itemType' => '',
+			], '', '', '', [], null, 1, 200, false],
+			[[
+				'itemType' => 'folder',
+			], '', '', 'folder', [], null, 1, 200, false],
+			[[
+				'itemType' => 0,
+			], '', '', '0', [], null, 1, 200, false],
+
+			// Test existingShares
+			[[
+				'existingShares' => [],
+			], '', '', null, [], null, 1, 200, false],
+			[[
+				'existingShares' => [0 => ['test'], 1 => ['foobar']],
+			], '', '', null, [0 => ['test'], 1 => ['foobar']], null, 1, 200, false],
+
+			// Test shareType
+			[[
+			], '', '', null, [], null, 1, 200, false],
+			[[
+				'shareType' => 0,
+			], '', '', null, [], 0, 1, 200, false],
+			[[
+				'shareType' => '0',
+			], '', '', null, [], 0, 1, 200, false],
+			[[
+				'shareType' => 1,
+			], '', '', null, [], 1, 1, 200, false],
+			[[
+				'shareType' => 10,
+			], '', '', null, [], 10, 1, 200, false],
+			[[
+				'shareType' => 'foobar',
+			], '', '', null, [], null, 1, 200, false],
+
+			// Test pagination
+			[[
+				'page' => 0,
+			], '', '', null, [], null, 1, 200, false],
+			[[
+				'page' => '0',
+			], '', '', null, [], null, 1, 200, false],
+			[[
+				'page' => 1,
+			], '', '', null, [], null, 1, 200, false],
+			[[
+				'page' => 10,
+			], '', '', null, [], null, 10, 200, false],
+
+			// Test limit
+			[[
+				'limit' => 0,
+			], '', '', null, [], null, 1, 200, false],
+			[[
+				'limit' => '0',
+			], '', '', null, [], null, 1, 200, false],
+			[[
+				'limit' => 1,
+			], '', '', null, [], null, 1, 1, false],
+			[[
+				'limit' => 10,
+			], '', '', null, [], null, 1, 10, false],
+
+			// Test $shareWithGroupOnly setting
+			[[], 'no', '', null, [], null, 1, 200, false],
+			[[], 'yes', '', null, [], null, 1, 200, true],
+
+		];
+	}
+
+	/**
+	 * @dataProvider dataSearch
+	 *
+	 * @param array $getData
+	 * @param string $apiSetting
+	 * @param string $search
+	 * @param string $itemType
+	 * @param array $existingShares
+	 * @param int $shareType
+	 * @param int $page
+	 * @param int $perPage
+	 * @param bool $shareWithGroupOnly
+	 */
+	public function testSearch($getData, $apiSetting, $search, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly) {
+		$oldGet = $_GET;
+		$_GET = $getData;
+
+		$config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$config->expects($this->once())
+			->method('getAppValue')
+			->with('core', 'shareapi_only_share_with_group_members', 'no')
+			->willReturn($apiSetting);
+
+		$sharees = $this->getMockBuilder('\OCA\Files_Sharing\API\Sharees')
+			->setConstructorArgs([
+				$this->groupManager,
+				$this->userManager,
+				$this->contactsManager,
+				$config,
+				$this->session,
+				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock()
+			])
+			->setMethods(array('searchSharees'))
+			->getMock();
+		$sharees->expects($this->once())
+			->method('searchSharees')
+			->with($search, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly)
+			->willReturnCallback(function
+					($isearch, $iitemType, $iexistingShares, $ishareType, $ipage, $iperPage, $ishareWithGroupOnly)
+				use ($search, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly) {
+
+				// We are doing strict comparisons here, so we can differ 0/'' and null on shareType/itemType
+				$this->assertSame($search, $isearch);
+				$this->assertSame($itemType, $iitemType);
+				$this->assertSame($existingShares, $iexistingShares);
+				$this->assertSame($shareType, $ishareType);
+				$this->assertSame($page, $ipage);
+				$this->assertSame($perPage, $iperPage);
+				$this->assertSame($shareWithGroupOnly, $ishareWithGroupOnly);
+				return new \OC_OCS_Result([]);
+			});
+
+		/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\API\Sharees $sharees */
+		$this->assertInstanceOf('\OC_OCS_Result', $sharees->search());
+
+		$_GET = $oldGet;
+	}
+
 	public function dataSearchSharees() {
 		return [
 			['test', 'folder', [], null, 1, 2, false, [], [], [], [], 0, false],
@@ -455,6 +603,7 @@ class ShareesTest extends TestCase {
 
 		/** @var \OC_OCS_Result $ocs */
 		$ocs = $this->invokePrivate($sharees, 'searchSharees', [$searchTerm, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly]);
+		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
 
 		$this->assertEquals($expected, $ocs->getData());
 
@@ -475,6 +624,7 @@ class ShareesTest extends TestCase {
 	public function testSearchShareesNoItemType() {
 		/** @var \OC_OCS_Result $ocs */
 		$ocs = $this->invokePrivate($this->sharees, 'searchSharees', ['', null, [], null, 0, 0, false]);
+		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
 
 		$this->assertSame(400, $ocs->getStatusCode(), 'Expected status code 400');
 		$this->assertSame([], $ocs->getData(), 'Expected that no data is send');
@@ -485,7 +635,6 @@ class ShareesTest extends TestCase {
 		$this->assertSame('missing itemType', $meta['message']);
 	}
 
-
 	public function dataFilterSharees() {
 		return [
 			[[], [], []],
-- 
GitLab


From c6ed40c9f891454d8f9ceeb67c45ff3d8ce22537 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 12 Aug 2015 17:05:20 +0200
Subject: [PATCH 030/783] Make shareType an array

---
 apps/files_sharing/api/sharees.php       |  57 +++++++--
 apps/files_sharing/tests/api/sharees.php | 145 ++++++++++++++++-------
 2 files changed, 144 insertions(+), 58 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index bfde21deb2a..de5f9c8cbf4 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -184,13 +184,46 @@ class Sharees {
 		$search = isset($_GET['search']) ? (string) $_GET['search'] : '';
 		$itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
 		$existingShares = isset($_GET['existingShares']) ? (array) $_GET['existingShares'] : [];
-		$shareType = isset($_GET['shareType']) && is_numeric($_GET['shareType']) ? (int) $_GET['shareType'] : null;
-		$page = !empty($_GET['page']) ? (int) $_GET['page'] : 1;
-		$perPage = !empty($_GET['limit']) ? (int) $_GET['limit'] : 200;
+		$page = !empty($_GET['page']) ? max(1, (int) $_GET['page']) : 1;
+		$perPage = !empty($_GET['limit']) ? max(1, (int) $_GET['limit']) : 200;
+
+		$shareTypes = [
+			\OCP\Share::SHARE_TYPE_USER,
+			\OCP\Share::SHARE_TYPE_GROUP,
+			\OCP\Share::SHARE_TYPE_REMOTE,
+		];
+		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
+			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
+			sort($shareTypes);
+
+		} else if (isset($_GET['shareType']) && is_numeric($_GET['shareType'])) {
+			$shareTypes = array_intersect($shareTypes, [(int) $_GET['shareType']]);
+			sort($shareTypes);
+		}
+
+		if (in_array(\OCP\Share::SHARE_TYPE_REMOTE, $shareTypes) && !$this->isRemoteSharingAllowed($itemType)) {
+			// Remove remote shares from type array, because it is not allowed.
+			$shareTypes = array_diff($shareTypes, [\OCP\Share::SHARE_TYPE_REMOTE]);
+		}
 
 		$shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
 
-		return $this->searchSharees($search, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly);
+		return $this->searchSharees($search, $itemType, $existingShares, $shareTypes, $page, $perPage, $shareWithGroupOnly);
+	}
+
+	/**
+	 * Method to get out the static call for better testing
+	 *
+	 * @param string $itemType
+	 * @return bool
+	 */
+	protected function isRemoteSharingAllowed($itemType) {
+		try {
+			$backend = \OCP\Share::getBackend($itemType);
+			return $backend->isShareTypeAllowed(\OCP\Share::SHARE_TYPE_REMOTE);
+		} catch (\Exception $e) {
+			return false;
+		}
 	}
 
 	/**
@@ -199,13 +232,13 @@ class Sharees {
 	 * @param string $search
 	 * @param string $itemType
 	 * @param array $existingShares
-	 * @param int $shareType
+	 * @param array $shareTypes
 	 * @param int $page
 	 * @param int $perPage
 	 * @param bool $shareWithGroupOnly
 	 * @return \OC_OCS_Result
 	 */
-	protected function searchSharees($search, $itemType, array $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly) {
+	protected function searchSharees($search, $itemType, array $existingShares, array $shareTypes, $page, $perPage, $shareWithGroupOnly) {
 
 		$sharedUsers = $sharedGroups = [];
 		if (!empty($existingShares)) {
@@ -227,20 +260,19 @@ class Sharees {
 
 		$sharees = [];
 		// Get users
-		if ($shareType === null || $shareType === \OCP\Share::SHARE_TYPE_USER) {
+		if (in_array(\OCP\Share::SHARE_TYPE_USER, $shareTypes)) {
 			$potentialSharees = $this->getUsers($search, $shareWithGroupOnly);
 			$sharees = array_merge($sharees, $this->filterSharees($potentialSharees, $sharedUsers));
 		}
 
 		// Get groups
-		if ($shareType === null || $shareType === \OCP\Share::SHARE_TYPE_GROUP) {
+		if (in_array(\OCP\Share::SHARE_TYPE_GROUP, $shareTypes)) {
 			$potentialSharees = $this->getGroups($search, $shareWithGroupOnly);
 			$sharees = array_merge($sharees, $this->filterSharees($potentialSharees, $sharedGroups));
 		}
 
 		// Get remote
-		if (($shareType === null || $shareType === \OCP\Share::SHARE_TYPE_REMOTE) &&
-		    \OCP\Share::getBackend($itemType)->isShareTypeAllowed(\OCP\Share::SHARE_TYPE_REMOTE)) {
+		if (in_array(\OCP\Share::SHARE_TYPE_REMOTE, $shareTypes)) {
 			$sharees = array_merge($sharees, $this->getRemote($search));
 		}
 
@@ -267,12 +299,11 @@ class Sharees {
 				'search' => $search,
 				'itemType' => $itemType,
 				'existingShares' => $existingShares,
+				'shareType' => $shareTypes,
 				'page' => $page + 1,
 				'limit' => $perPage,
 			];
-			if ($shareType !== null) {
-				$params['shareType'] = $shareType;
-			}
+
 			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?' . http_build_query($params);
 			$response->addHeader('Link', '<' . $url . '> rel="next"');
 		}
diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index 1a25266fe04..ec19036bb8f 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -345,89 +345,109 @@ class ShareesTest extends TestCase {
 	}
 
 	public function dataSearch() {
+		$allTypes = [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE];
+
 		return [
-			[[], '', '', null, [], null, 1, 200, false],
+			[[], '', true, '', null, [], $allTypes, 1, 200, false],
 
 			// Test itemType
 			[[
 				'search' => '',
-			], '', '', null, [], null, 1, 200, false],
+			], '', true, '', null, [], $allTypes, 1, 200, false],
 			[[
 				'search' => 'foobar',
-			], '', 'foobar', null, [], null, 1, 200, false],
+			], '', true, 'foobar', null, [], $allTypes, 1, 200, false],
 			[[
 				'search' => 0,
-			], '', '0', null, [], null, 1, 200, false],
+			], '', true, '0', null, [], $allTypes, 1, 200, false],
 
 			// Test itemType
 			[[
 				'itemType' => '',
-			], '', '', '', [], null, 1, 200, false],
+			], '', true, '', '', [], $allTypes, 1, 200, false],
 			[[
 				'itemType' => 'folder',
-			], '', '', 'folder', [], null, 1, 200, false],
+			], '', true, '', 'folder', [], $allTypes, 1, 200, false],
 			[[
 				'itemType' => 0,
-			], '', '', '0', [], null, 1, 200, false],
+			], '', true, '', '0', [], $allTypes, 1, 200, false],
 
 			// Test existingShares
 			[[
 				'existingShares' => [],
-			], '', '', null, [], null, 1, 200, false],
+			], '', true, '', null, [], $allTypes, 1, 200, false],
 			[[
 				'existingShares' => [0 => ['test'], 1 => ['foobar']],
-			], '', '', null, [0 => ['test'], 1 => ['foobar']], null, 1, 200, false],
+			], '', true, '', null, [0 => ['test'], 1 => ['foobar']], $allTypes, 1, 200, false],
 
 			// Test shareType
 			[[
-			], '', '', null, [], null, 1, 200, false],
+			], '', true, '', null, [], $allTypes, 1, 200, false],
 			[[
 				'shareType' => 0,
-			], '', '', null, [], 0, 1, 200, false],
+			], '', true, '', null, [], [0], 1, 200, false],
 			[[
 				'shareType' => '0',
-			], '', '', null, [], 0, 1, 200, false],
+			], '', true, '', null, [], [0], 1, 200, false],
 			[[
 				'shareType' => 1,
-			], '', '', null, [], 1, 1, 200, false],
+			], '', true, '', null, [], [1], 1, 200, false],
 			[[
-				'shareType' => 10,
-			], '', '', null, [], 10, 1, 200, false],
+				'shareType' => 12,
+			], '', true, '', null, [], [], 1, 200, false],
 			[[
 				'shareType' => 'foobar',
-			], '', '', null, [], null, 1, 200, false],
+			], '', true, '', null, [], $allTypes, 1, 200, false],
+			[[
+				'shareType' => [0, 1, 2],
+			], '', true, '', null, [], [0, 1], 1, 200, false],
+			[[
+				'shareType' => [0, 1],
+			], '', true, '', null, [], [0, 1], 1, 200, false],
+			[[
+				'shareType' => $allTypes,
+			], '', true, '', null, [], $allTypes, 1, 200, false],
+			[[
+				'shareType' => $allTypes,
+			], '', false, '', null, [], [0, 1], 1, 200, false],
 
 			// Test pagination
 			[[
 				'page' => 0,
-			], '', '', null, [], null, 1, 200, false],
+			], '', true, '', null, [], $allTypes, 1, 200, false],
 			[[
 				'page' => '0',
-			], '', '', null, [], null, 1, 200, false],
+			], '', true, '', null, [], $allTypes, 1, 200, false],
+			[[
+				'page' => -1,
+			], '', true, '', null, [], $allTypes, 1, 200, false],
 			[[
 				'page' => 1,
-			], '', '', null, [], null, 1, 200, false],
+			], '', true, '', null, [], $allTypes, 1, 200, false],
 			[[
 				'page' => 10,
-			], '', '', null, [], null, 10, 200, false],
+			], '', true, '', null, [], $allTypes, 10, 200, false],
 
 			// Test limit
 			[[
 				'limit' => 0,
-			], '', '', null, [], null, 1, 200, false],
+			], '', true, '', null, [], $allTypes, 1, 200, false],
 			[[
 				'limit' => '0',
-			], '', '', null, [], null, 1, 200, false],
+			], '', true, '', null, [], $allTypes, 1, 200, false],
+			[[
+				'limit' => -1,
+			], '', true, '', null, [], $allTypes, 1, 1, false],
 			[[
 				'limit' => 1,
-			], '', '', null, [], null, 1, 1, false],
+			], '', true, '', null, [], $allTypes, 1, 1, false],
 			[[
 				'limit' => 10,
-			], '', '', null, [], null, 1, 10, false],
+			], '', true, '', null, [], $allTypes, 1, 10, false],
 
 			// Test $shareWithGroupOnly setting
-			[[], 'no', '', null, [], null, 1, 200, false],
-			[[], 'yes', '', null, [], null, 1, 200, true],
+			[[], 'no', true, '', null, [], $allTypes, 1, 200, false],
+			[[], 'yes', true, '', null, [], $allTypes, 1, 200, true],
 
 		];
 	}
@@ -437,15 +457,16 @@ class ShareesTest extends TestCase {
 	 *
 	 * @param array $getData
 	 * @param string $apiSetting
+	 * @param bool $remoteSharingEnabled
 	 * @param string $search
 	 * @param string $itemType
 	 * @param array $existingShares
-	 * @param int $shareType
+	 * @param array $shareTypes
 	 * @param int $page
 	 * @param int $perPage
 	 * @param bool $shareWithGroupOnly
 	 */
-	public function testSearch($getData, $apiSetting, $search, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly) {
+	public function testSearch($getData, $apiSetting, $remoteSharingEnabled, $search, $itemType, $existingShares, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
 		$oldGet = $_GET;
 		$_GET = $getData;
 
@@ -466,25 +487,29 @@ class ShareesTest extends TestCase {
 				$this->session,
 				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock()
 			])
-			->setMethods(array('searchSharees'))
+			->setMethods(array('searchSharees', 'isRemoteSharingAllowed'))
 			->getMock();
 		$sharees->expects($this->once())
 			->method('searchSharees')
-			->with($search, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly)
+			->with($search, $itemType, $existingShares, $shareTypes, $page, $perPage, $shareWithGroupOnly)
 			->willReturnCallback(function
-					($isearch, $iitemType, $iexistingShares, $ishareType, $ipage, $iperPage, $ishareWithGroupOnly)
-				use ($search, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly) {
+					($isearch, $iitemType, $iexistingShares, $ishareTypes, $ipage, $iperPage, $ishareWithGroupOnly)
+				use ($search, $itemType, $existingShares, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
 
 				// We are doing strict comparisons here, so we can differ 0/'' and null on shareType/itemType
 				$this->assertSame($search, $isearch);
 				$this->assertSame($itemType, $iitemType);
 				$this->assertSame($existingShares, $iexistingShares);
-				$this->assertSame($shareType, $ishareType);
+				$this->assertSame($shareTypes, $ishareTypes);
 				$this->assertSame($page, $ipage);
 				$this->assertSame($perPage, $iperPage);
 				$this->assertSame($shareWithGroupOnly, $ishareWithGroupOnly);
 				return new \OC_OCS_Result([]);
 			});
+		$sharees->expects($this->any())
+			->method('isRemoteSharingAllowed')
+			->with($itemType)
+			->willReturn($remoteSharingEnabled);
 
 		/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\API\Sharees $sharees */
 		$this->assertInstanceOf('\OC_OCS_Result', $sharees->search());
@@ -492,13 +517,32 @@ class ShareesTest extends TestCase {
 		$_GET = $oldGet;
 	}
 
+	public function dataIsRemoteSharingAllowed() {
+		return [
+			['file', true],
+			['folder', true],
+			['', false],
+			['contacts', false],
+		];
+	}
+
+	/**
+	 * @dataProvider dataIsRemoteSharingAllowed
+	 *
+	 * @param string $itemType
+	 * @param bool $expected
+	 */
+	public function testIsRemoteSharingAllowed($itemType, $expected) {
+		$this->assertSame($expected, $this->invokePrivate($this->sharees, 'isRemoteSharingAllowed', [$itemType]));
+	}
+
 	public function dataSearchSharees() {
 		return [
-			['test', 'folder', [], null, 1, 2, false, [], [], [], [], 0, false],
-			['test', 'folder', [0 => ['test1'], 1 => ['test2 group']], null, 1, 2, false, [], [], [], [], 0, false],
+			['test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [], [], 0, false],
+			['test', 'folder', [0 => ['test1'], 1 => ['test2 group']], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [], [], 0, false],
 			// First page with 2 of 3 results
 			[
-				'test', 'folder', [], null, 1, 2, false, [
+				'test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], [
 					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
@@ -511,7 +555,7 @@ class ShareesTest extends TestCase {
 			],
 			// Second page with the 3rd result
 			[
-				'test', 'folder', [], null, 2, 2, false, [
+				'test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 2, 2, false, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], [
 					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
@@ -521,9 +565,20 @@ class ShareesTest extends TestCase {
 					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
 				], 3, false,
 			],
+			// No groups requested
+			[
+				'test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
+				['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+			], null, [
+				['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+			], [
+				['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+			], 2, false,
+			],
 			// Ingnoring already shared user
 			[
-				'test', 'folder', [\OCP\Share::SHARE_TYPE_USER => ['test1']], null, 1, 2, false, [
+				'test', 'folder', [\OCP\Share::SHARE_TYPE_USER => ['test1']], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], [
 					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
@@ -536,7 +591,7 @@ class ShareesTest extends TestCase {
 			],
 			// Share type restricted to user - Only one user
 			[
-				'test', 'folder', [], \OCP\Share::SHARE_TYPE_USER, 1, 2, false, [
+				'test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], null, null, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
@@ -544,7 +599,7 @@ class ShareesTest extends TestCase {
 			],
 			// Share type restricted to user - Multipage result
 			[
-				'test', 'folder', [], \OCP\Share::SHARE_TYPE_USER, 1, 2, false, [
+				'test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
 					['label' => 'test 1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 					['label' => 'test 2', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
 					['label' => 'test 3', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test3']],
@@ -555,7 +610,7 @@ class ShareesTest extends TestCase {
 			],
 			// Share type restricted to user - Only user already shared
 			[
-				'test', 'folder', [\OCP\Share::SHARE_TYPE_USER => ['test1']], \OCP\Share::SHARE_TYPE_USER, 1, 2, false, [
+				'test', 'folder', [\OCP\Share::SHARE_TYPE_USER => ['test1']], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], null, null, [], 0, false,
 			],
@@ -568,13 +623,13 @@ class ShareesTest extends TestCase {
 	 * @param string $searchTerm
 	 * @param string $itemType
 	 * @param array $existingShares
-	 * @param int $shareType
+	 * @param array $shareTypes
 	 * @param int $page
 	 * @param int $perPage
 	 * @param bool $shareWithGroupOnly
 	 * @param array $expected
 	 */
-	public function testSearchSharees($searchTerm, $itemType, array $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly,
+	public function testSearchSharees($searchTerm, $itemType, array $existingShares, array $shareTypes, $page, $perPage, $shareWithGroupOnly,
 									  $mockedUserResult, $mockedGroupsResult, $mockedRemotesResult, $expected, $totalItems, $nextLink) {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\API\Sharees $sharees */
 		$sharees = $this->getMockBuilder('\OCA\Files_Sharing\API\Sharees')
@@ -602,7 +657,7 @@ class ShareesTest extends TestCase {
 			->willReturn($mockedRemotesResult);
 
 		/** @var \OC_OCS_Result $ocs */
-		$ocs = $this->invokePrivate($sharees, 'searchSharees', [$searchTerm, $itemType, $existingShares, $shareType, $page, $perPage, $shareWithGroupOnly]);
+		$ocs = $this->invokePrivate($sharees, 'searchSharees', [$searchTerm, $itemType, $existingShares, $shareTypes, $page, $perPage, $shareWithGroupOnly]);
 		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
 
 		$this->assertEquals($expected, $ocs->getData());
@@ -623,7 +678,7 @@ class ShareesTest extends TestCase {
 
 	public function testSearchShareesNoItemType() {
 		/** @var \OC_OCS_Result $ocs */
-		$ocs = $this->invokePrivate($this->sharees, 'searchSharees', ['', null, [], null, 0, 0, false]);
+		$ocs = $this->invokePrivate($this->sharees, 'searchSharees', ['', null, [], [], 0, 0, false]);
 		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
 
 		$this->assertSame(400, $ocs->getStatusCode(), 'Expected status code 400');
-- 
GitLab


From a0ab7a257858b305434255df2f33ef4b323ac81d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 13 Aug 2015 10:57:08 +0200
Subject: [PATCH 031/783] Add all possible links next, prev, first and last

---
 apps/files_sharing/api/sharees.php       | 54 +++++++++++++++++-------
 apps/files_sharing/tests/api/sharees.php | 50 +++++++++++++++++++++-
 2 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index de5f9c8cbf4..714b4950c59 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -285,7 +285,6 @@ class Sharees {
 
 		//Pagination
 		$start = ($page - 1) * $perPage;
-		$end = $page * $perPage;
 		$total = sizeof($sharees);
 
 		$sharees = array_slice($sharees, $start, $perPage);
@@ -294,18 +293,16 @@ class Sharees {
 		$response->setTotalItems($total);
 		$response->setItemsPerPage($perPage);
 
-		if ($total > $end) {
-			$params = [
-				'search' => $search,
-				'itemType' => $itemType,
-				'existingShares' => $existingShares,
-				'shareType' => $shareTypes,
-				'page' => $page + 1,
-				'limit' => $perPage,
-			];
+		$links = $this->getPaginationLinks($page, $total, [
+			'search' => $search,
+			'itemType' => $itemType,
+			'existingShares' => $existingShares,
+			'shareType' => $shareTypes,
+			'limit' => $perPage,
+		]);
 
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?' . http_build_query($params);
-			$response->addHeader('Link', '<' . $url . '> rel="next"');
+		if (!empty($links)) {
+			$response->addHeader('Link', implode(', ', $links));
 		}
 
 		return $response;
@@ -319,10 +316,37 @@ class Sharees {
 	 * @return array
 	 */
 	protected function filterSharees($potentialSharees, $existingSharees) {
-		$sharees = array_map(function ($sharee) use ($existingSharees) {
+		$sharees = array_filter($potentialSharees, function ($sharee) use ($existingSharees) {
 			return in_array($sharee['value']['shareWith'], $existingSharees) ? null : $sharee;
-		}, $potentialSharees);
+		});
 
-		return array_filter($sharees);
+		return $sharees;
+	}
+
+	/**
+	 * Generates a bunch of pagination links for the current page
+	 *
+	 * @param int $page Current page
+	 * @param int $total Number of total items that need to be paginated
+	 * @param array $params Parameters for the URL
+	 * @return array
+	 */
+	protected function getPaginationLinks($page, $total, array $params) {
+		$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+
+		$links = [];
+		if ($page > 1) {
+			$params['page'] = 1;
+			$links[] = '<' . $url . http_build_query($params) . '>; rel="first"';
+			$params['page'] = $page - 1;
+			$links[] = '<' . $url . http_build_query($params) . '>; rel="prev"';
+		}
+		if ($page * $params['limit'] < $total) {
+			$params['page'] = $page + 1;
+			$links[] = '<' . $url . http_build_query($params) . '>; rel="next"';
+			$params['page'] = ceil($total / $params['limit']);
+			$links[] = '<' . $url . http_build_query($params) . '>; rel="last"';
+		}
+		return $links;
 	}
 }
diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index ec19036bb8f..7efd29e592d 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -672,7 +672,7 @@ class ShareesTest extends TestCase {
 			$headers = $ocs->getHeaders();
 			$this->assertArrayHasKey('Link', $headers);
 			$this->assertStringStartsWith('<', $headers['Link']);
-			$this->assertStringEndsWith('> rel="next"', $headers['Link']);
+			$this->assertStringEndsWith('"', $headers['Link']);
 		}
 	}
 
@@ -735,4 +735,52 @@ class ShareesTest extends TestCase {
 	public function testFilterSharees($potentialSharees, $existingSharees, $expectedSharees) {
 		$this->assertEquals($expectedSharees, $this->invokePrivate($this->sharees, 'filterSharees', [$potentialSharees, $existingSharees]));
 	}
+
+	public function dataGetPaginationLinks() {
+		return [
+			[1, 1, ['limit' => 2], []],
+			[1, 3, ['limit' => 2], [
+				'<?limit=2&page=2>; rel="next"',
+				'<?limit=2&page=2>; rel="last"',
+			]],
+			[1, 21, ['limit' => 2], [
+				'<?limit=2&page=2>; rel="next"',
+				'<?limit=2&page=11>; rel="last"',
+			]],
+			[2, 21, ['limit' => 2], [
+				'<?limit=2&page=1>; rel="first"',
+				'<?limit=2&page=1>; rel="prev"',
+				'<?limit=2&page=3>; rel="next"',
+				'<?limit=2&page=11>; rel="last"',
+			]],
+			[5, 21, ['limit' => 2], [
+				'<?limit=2&page=1>; rel="first"',
+				'<?limit=2&page=4>; rel="prev"',
+				'<?limit=2&page=6>; rel="next"',
+				'<?limit=2&page=11>; rel="last"',
+			]],
+			[10, 21, ['limit' => 2], [
+				'<?limit=2&page=1>; rel="first"',
+				'<?limit=2&page=9>; rel="prev"',
+				'<?limit=2&page=11>; rel="next"',
+				'<?limit=2&page=11>; rel="last"',
+			]],
+			[11, 21, ['limit' => 2], [
+				'<?limit=2&page=1>; rel="first"',
+				'<?limit=2&page=10>; rel="prev"',
+			]],
+		];
+	}
+
+	/**
+	 * @dataProvider dataGetPaginationLinks
+	 *
+	 * @param int $page
+	 * @param int $total
+	 * @param array $params
+	 * @param array $expected
+	 */
+	public function testGetPaginationLinks($page, $total, $params, $expected) {
+		$this->assertEquals($expected, $this->invokePrivate($this->sharees, 'getPaginationLinks', [$page, $total, $params]));
+	}
 }
-- 
GitLab


From 5c4fbf519133cc0e017581a29151911f685a64b0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 13 Aug 2015 11:06:03 +0200
Subject: [PATCH 032/783] Inject the logger as well

---
 apps/files_sharing/api/sharees.php       | 63 ++++++++++++++----------
 apps/files_sharing/appinfo/routes.php    |  3 +-
 apps/files_sharing/tests/api/sharees.php |  9 ++--
 3 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 714b4950c59..129a66851a7 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -20,12 +20,16 @@
  */
 namespace OCA\Files_Sharing\API;
 
+use OC\Share\SearchResultSorter;
+use OCP\Contacts\IManager;
 use OCP\IGroup;
 use OCP\IGroupManager;
+use OCP\ILogger;
 use OCP\IUserManager;
 use OCP\IConfig;
 use OCP\IUserSession;
 use OCP\IURLGenerator;
+use OCP\Share;
 
 class Sharees {
 
@@ -35,7 +39,7 @@ class Sharees {
 	/** @var IUserManager */
 	private $userManager;
 
-	/** @var \OCP\Contacts\IManager */
+	/** @var IManager */
 	private $contactsManager;
 
 	/** @var IConfig */
@@ -47,25 +51,32 @@ class Sharees {
 	/** @var IURLGenerator */
 	private $urlGenerator;
 
+	/** @var ILogger */
+	private $logger;
+
 	/**
 	 * @param IGroupManager $groupManager
 	 * @param IUserManager $userManager
-	 * @param \OCP\Contacts\IManager $contactsManager
+	 * @param IManager $contactsManager
 	 * @param IConfig $config
 	 * @param IUserSession $userSession
+	 * @param IURLGenerator $urlGenerator
+	 * @param ILogger $logger
 	 */
 	public function __construct(IGroupManager $groupManager,
 								IUserManager $userManager,
-								\OCP\Contacts\IManager $contactsManager,
+								IManager $contactsManager,
 								IConfig $config,
 								IUserSession $userSession,
-								IURLGenerator $urlGenerator) {
+								IURLGenerator $urlGenerator,
+								ILogger $logger) {
 		$this->groupManager = $groupManager;
 		$this->userManager = $userManager;
 		$this->contactsManager = $contactsManager;
 		$this->config = $config;
 		$this->userSession = $userSession;
 		$this->urlGenerator = $urlGenerator;
+		$this->logger = $logger;
 	}
 
 	/**
@@ -100,7 +111,7 @@ class Sharees {
 			$sharees[] = [
 				'label' => $displayName,
 				'value' => [
-					'shareType' => \OCP\Share::SHARE_TYPE_USER,
+					'shareType' => Share::SHARE_TYPE_USER,
 					'shareWith' => $uid,
 				],
 			];
@@ -131,7 +142,7 @@ class Sharees {
 			$sharees[] = [
 				'label' => $gid,
 				'value' => [
-					'shareType' => \OCP\Share::SHARE_TYPE_GROUP,
+					'shareType' => Share::SHARE_TYPE_GROUP,
 					'shareWith' => $gid,
 				],
 			];
@@ -152,7 +163,7 @@ class Sharees {
 			$sharees[] = [
 				'label' => $search,
 				'value' => [
-					'shareType' => \OCP\Share::SHARE_TYPE_REMOTE,
+					'shareType' => Share::SHARE_TYPE_REMOTE,
 					'shareWith' => $search,
 				],
 			];
@@ -166,7 +177,7 @@ class Sharees {
 					$sharees[] = [
 						'label' => $contact['FN'] . ' (' . $cloudId . ')',
 						'value' => [
-							'shareType' => \OCP\Share::SHARE_TYPE_REMOTE,
+							'shareType' => Share::SHARE_TYPE_REMOTE,
 							'shareWith' => $cloudId
 						]
 					];
@@ -188,9 +199,9 @@ class Sharees {
 		$perPage = !empty($_GET['limit']) ? max(1, (int) $_GET['limit']) : 200;
 
 		$shareTypes = [
-			\OCP\Share::SHARE_TYPE_USER,
-			\OCP\Share::SHARE_TYPE_GROUP,
-			\OCP\Share::SHARE_TYPE_REMOTE,
+			Share::SHARE_TYPE_USER,
+			Share::SHARE_TYPE_GROUP,
+			Share::SHARE_TYPE_REMOTE,
 		];
 		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
 			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
@@ -201,9 +212,9 @@ class Sharees {
 			sort($shareTypes);
 		}
 
-		if (in_array(\OCP\Share::SHARE_TYPE_REMOTE, $shareTypes) && !$this->isRemoteSharingAllowed($itemType)) {
+		if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes) && !$this->isRemoteSharingAllowed($itemType)) {
 			// Remove remote shares from type array, because it is not allowed.
-			$shareTypes = array_diff($shareTypes, [\OCP\Share::SHARE_TYPE_REMOTE]);
+			$shareTypes = array_diff($shareTypes, [Share::SHARE_TYPE_REMOTE]);
 		}
 
 		$shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
@@ -219,8 +230,8 @@ class Sharees {
 	 */
 	protected function isRemoteSharingAllowed($itemType) {
 		try {
-			$backend = \OCP\Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(\OCP\Share::SHARE_TYPE_REMOTE);
+			$backend = Share::getBackend($itemType);
+			return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
 		} catch (\Exception $e) {
 			return false;
 		}
@@ -242,14 +253,14 @@ class Sharees {
 
 		$sharedUsers = $sharedGroups = [];
 		if (!empty($existingShares)) {
-			if (!empty($existingShares[\OCP\Share::SHARE_TYPE_USER]) &&
-				is_array($existingShares[\OCP\Share::SHARE_TYPE_USER])) {
-				$sharedUsers = $existingShares[\OCP\Share::SHARE_TYPE_USER];
+			if (!empty($existingShares[Share::SHARE_TYPE_USER]) &&
+				is_array($existingShares[Share::SHARE_TYPE_USER])) {
+				$sharedUsers = $existingShares[Share::SHARE_TYPE_USER];
 			}
 
-			if (!empty($existingShares[\OCP\Share::SHARE_TYPE_GROUP]) &&
-				is_array($existingShares[\OCP\Share::SHARE_TYPE_GROUP])) {
-				$sharedGroups = $existingShares[\OCP\Share::SHARE_TYPE_GROUP];
+			if (!empty($existingShares[Share::SHARE_TYPE_GROUP]) &&
+				is_array($existingShares[Share::SHARE_TYPE_GROUP])) {
+				$sharedGroups = $existingShares[Share::SHARE_TYPE_GROUP];
 			}
 		}
 
@@ -260,27 +271,25 @@ class Sharees {
 
 		$sharees = [];
 		// Get users
-		if (in_array(\OCP\Share::SHARE_TYPE_USER, $shareTypes)) {
+		if (in_array(Share::SHARE_TYPE_USER, $shareTypes)) {
 			$potentialSharees = $this->getUsers($search, $shareWithGroupOnly);
 			$sharees = array_merge($sharees, $this->filterSharees($potentialSharees, $sharedUsers));
 		}
 
 		// Get groups
-		if (in_array(\OCP\Share::SHARE_TYPE_GROUP, $shareTypes)) {
+		if (in_array(Share::SHARE_TYPE_GROUP, $shareTypes)) {
 			$potentialSharees = $this->getGroups($search, $shareWithGroupOnly);
 			$sharees = array_merge($sharees, $this->filterSharees($potentialSharees, $sharedGroups));
 		}
 
 		// Get remote
-		if (in_array(\OCP\Share::SHARE_TYPE_REMOTE, $shareTypes)) {
+		if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes)) {
 			$sharees = array_merge($sharees, $this->getRemote($search));
 		}
 
 
 		// Sort sharees
-		$sorter = new \OC\Share\SearchResultSorter($search,
-			'label',
-			\OC::$server->getLogger());
+		$sorter = new SearchResultSorter($search, 'label', $this->logger);
 		usort($sharees, array($sorter, 'sort'));
 
 		//Pagination
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 45ea85ff724..2000eab651f 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -107,7 +107,8 @@ $sharees = new \OCA\Files_Sharing\API\Sharees(\OC::$server->getGroupManager(),
                                               \OC::$server->getContactsManager(),
                                               \OC::$server->getConfig(),
                                               \OC::$server->getUserSession(),
-                                              \OC::$server->getURLGenerator());
+                                              \OC::$server->getURLGenerator(),
+                                              \OC::$server->getLogger());
 
 API::register('get',
 		'/apps/files_sharing/api/v1/sharees',
diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index 7efd29e592d..ddce7fddcd3 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -65,7 +65,8 @@ class ShareesTest extends TestCase {
 			$this->contactsManager,
 			$this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
 			$this->session,
-			$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock()
+			$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
+			$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
 		);
 	}
 
@@ -485,7 +486,8 @@ class ShareesTest extends TestCase {
 				$this->contactsManager,
 				$config,
 				$this->session,
-				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock()
+				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
 			])
 			->setMethods(array('searchSharees', 'isRemoteSharingAllowed'))
 			->getMock();
@@ -639,7 +641,8 @@ class ShareesTest extends TestCase {
 				$this->contactsManager,
 				$this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
 				$this->session,
-				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock()
+				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
 			])
 			->setMethods(array('getUsers', 'getGroups', 'getRemote'))
 			->getMock();
-- 
GitLab


From 0227cfff081a79627d038f7e30a1bdece9df4d3a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 13 Aug 2015 10:13:23 +0200
Subject: [PATCH 033/783] Take a list of share IDs instead of the user and
 group names

---
 apps/files_sharing/api/sharees.php       |  68 +++++++++++---
 apps/files_sharing/appinfo/routes.php    |   3 +-
 apps/files_sharing/tests/api/sharees.php | 114 ++++++++++++-----------
 3 files changed, 118 insertions(+), 67 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 129a66851a7..3e802b3028a 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -20,8 +20,10 @@
  */
 namespace OCA\Files_Sharing\API;
 
+use Doctrine\DBAL\Connection;
 use OC\Share\SearchResultSorter;
 use OCP\Contacts\IManager;
+use OCP\IDBConnection;
 use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\ILogger;
@@ -54,6 +56,9 @@ class Sharees {
 	/** @var ILogger */
 	private $logger;
 
+	/** @var IDBConnection */
+	private $connection;
+
 	/**
 	 * @param IGroupManager $groupManager
 	 * @param IUserManager $userManager
@@ -62,6 +67,7 @@ class Sharees {
 	 * @param IUserSession $userSession
 	 * @param IURLGenerator $urlGenerator
 	 * @param ILogger $logger
+	 * @param IDBConnection $connection
 	 */
 	public function __construct(IGroupManager $groupManager,
 								IUserManager $userManager,
@@ -69,7 +75,8 @@ class Sharees {
 								IConfig $config,
 								IUserSession $userSession,
 								IURLGenerator $urlGenerator,
-								ILogger $logger) {
+								ILogger $logger,
+								IDBConnection $connection) {
 		$this->groupManager = $groupManager;
 		$this->userManager = $userManager;
 		$this->contactsManager = $contactsManager;
@@ -77,6 +84,7 @@ class Sharees {
 		$this->userSession = $userSession;
 		$this->urlGenerator = $urlGenerator;
 		$this->logger = $logger;
+		$this->connection = $connection;
 	}
 
 	/**
@@ -194,7 +202,7 @@ class Sharees {
 	public function search() {
 		$search = isset($_GET['search']) ? (string) $_GET['search'] : '';
 		$itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
-		$existingShares = isset($_GET['existingShares']) ? (array) $_GET['existingShares'] : [];
+		$shareIds = isset($_GET['existingShares']) ? (array) $_GET['existingShares'] : [];
 		$page = !empty($_GET['page']) ? max(1, (int) $_GET['page']) : 1;
 		$perPage = !empty($_GET['limit']) ? max(1, (int) $_GET['limit']) : 200;
 
@@ -219,7 +227,7 @@ class Sharees {
 
 		$shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
 
-		return $this->searchSharees($search, $itemType, $existingShares, $shareTypes, $page, $perPage, $shareWithGroupOnly);
+		return $this->searchSharees($search, $itemType, $shareIds, $shareTypes, $page, $perPage, $shareWithGroupOnly);
 	}
 
 	/**
@@ -242,25 +250,27 @@ class Sharees {
 	 *
 	 * @param string $search
 	 * @param string $itemType
-	 * @param array $existingShares
+	 * @param array $shareIds
 	 * @param array $shareTypes
 	 * @param int $page
 	 * @param int $perPage
 	 * @param bool $shareWithGroupOnly
 	 * @return \OC_OCS_Result
 	 */
-	protected function searchSharees($search, $itemType, array $existingShares, array $shareTypes, $page, $perPage, $shareWithGroupOnly) {
+	protected function searchSharees($search, $itemType, array $shareIds, array $shareTypes, $page, $perPage, $shareWithGroupOnly) {
 
 		$sharedUsers = $sharedGroups = [];
-		if (!empty($existingShares)) {
-			if (!empty($existingShares[Share::SHARE_TYPE_USER]) &&
-				is_array($existingShares[Share::SHARE_TYPE_USER])) {
-				$sharedUsers = $existingShares[Share::SHARE_TYPE_USER];
+		$existingSharees = $this->getShareesForShareIds($shareIds);
+
+		if (!empty($existingSharees)) {
+			if (!empty($existingSharees[Share::SHARE_TYPE_USER]) &&
+				is_array($existingSharees[Share::SHARE_TYPE_USER])) {
+				$sharedUsers = $existingSharees[Share::SHARE_TYPE_USER];
 			}
 
-			if (!empty($existingShares[Share::SHARE_TYPE_GROUP]) &&
-				is_array($existingShares[Share::SHARE_TYPE_GROUP])) {
-				$sharedGroups = $existingShares[Share::SHARE_TYPE_GROUP];
+			if (!empty($existingSharees[Share::SHARE_TYPE_GROUP]) &&
+				is_array($existingSharees[Share::SHARE_TYPE_GROUP])) {
+				$sharedGroups = $existingSharees[Share::SHARE_TYPE_GROUP];
 			}
 		}
 
@@ -305,7 +315,7 @@ class Sharees {
 		$links = $this->getPaginationLinks($page, $total, [
 			'search' => $search,
 			'itemType' => $itemType,
-			'existingShares' => $existingShares,
+			'existingShares' => $shareIds,
 			'shareType' => $shareTypes,
 			'limit' => $perPage,
 		]);
@@ -332,6 +342,38 @@ class Sharees {
 		return $sharees;
 	}
 
+	/**
+	 * Get a list of existing share_with's for the given share IDs (if the current user owns them)
+	 *
+	 * @param array $shareIds
+	 * @return array
+	 */
+	protected function getShareesForShareIds($shareIds) {
+		if (empty($shareIds)) {
+			return [];
+		}
+
+		$queryBuilder = $this->connection->getQueryBuilder();
+		$exprBuilder = $queryBuilder->expr();
+
+		$queryBuilder->select(['share_type', 'share_with'])
+			->from('share')
+			->where($exprBuilder->in('id', $queryBuilder->createParameter('shareIds')))
+			->andWhere($exprBuilder->eq('uid_owner', $queryBuilder->createParameter('user')))
+			->andWhere($exprBuilder->isNull('parent'))
+			->setParameter('shareIds', $shareIds, Connection::PARAM_INT_ARRAY)
+			->setParameter('user', $this->userSession->getUser()->getUID());
+		$query = $queryBuilder->execute();
+
+		$sharees = [];
+		while ($row = $query->fetch()) {
+			$sharees[$row['share_type']][] = $row['share_with'];
+		}
+		$query->closeCursor();
+
+		return $sharees;
+	}
+
 	/**
 	 * Generates a bunch of pagination links for the current page
 	 *
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 2000eab651f..28dc3ab967f 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -108,7 +108,8 @@ $sharees = new \OCA\Files_Sharing\API\Sharees(\OC::$server->getGroupManager(),
                                               \OC::$server->getConfig(),
                                               \OC::$server->getUserSession(),
                                               \OC::$server->getURLGenerator(),
-                                              \OC::$server->getLogger());
+                                              \OC::$server->getLogger(),
+                                              \OC::$server->getDatabaseConnection());
 
 API::register('get',
 		'/apps/files_sharing/api/v1/sharees',
diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index ddce7fddcd3..24a659eb063 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -66,7 +66,8 @@ class ShareesTest extends TestCase {
 			$this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
 			$this->session,
 			$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
-			$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
+			$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(),
+			\OC::$server->getDatabaseConnection()
 		);
 	}
 
@@ -349,106 +350,106 @@ class ShareesTest extends TestCase {
 		$allTypes = [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE];
 
 		return [
-			[[], '', true, '', null, [], $allTypes, 1, 200, false],
+			[[], '', true, [], '', null, $allTypes, 1, 200, false],
 
 			// Test itemType
 			[[
 				'search' => '',
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
 				'search' => 'foobar',
-			], '', true, 'foobar', null, [], $allTypes, 1, 200, false],
+			], '', true, [], 'foobar', null, $allTypes, 1, 200, false],
 			[[
 				'search' => 0,
-			], '', true, '0', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '0', null, $allTypes, 1, 200, false],
 
 			// Test itemType
 			[[
 				'itemType' => '',
-			], '', true, '', '', [], $allTypes, 1, 200, false],
+			], '', true, [], '', '', $allTypes, 1, 200, false],
 			[[
 				'itemType' => 'folder',
-			], '', true, '', 'folder', [], $allTypes, 1, 200, false],
+			], '', true, [], '', 'folder', $allTypes, 1, 200, false],
 			[[
 				'itemType' => 0,
-			], '', true, '', '0', [], $allTypes, 1, 200, false],
+			], '', true, [], '', '0', $allTypes, 1, 200, false],
 
 			// Test existingShares
 			[[
 				'existingShares' => [],
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
-				'existingShares' => [0 => ['test'], 1 => ['foobar']],
-			], '', true, '', null, [0 => ['test'], 1 => ['foobar']], $allTypes, 1, 200, false],
+				'existingShares' => [12, 42],
+			], '', true, [12, 42], '', null, $allTypes, 1, 200, false],
 
 			// Test shareType
 			[[
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
 				'shareType' => 0,
-			], '', true, '', null, [], [0], 1, 200, false],
+			], '', true, [], '', null, [0], 1, 200, false],
 			[[
 				'shareType' => '0',
-			], '', true, '', null, [], [0], 1, 200, false],
+			], '', true, [], '', null, [0], 1, 200, false],
 			[[
 				'shareType' => 1,
-			], '', true, '', null, [], [1], 1, 200, false],
+			], '', true, [], '', null, [1], 1, 200, false],
 			[[
 				'shareType' => 12,
-			], '', true, '', null, [], [], 1, 200, false],
+			], '', true, [], '', null, [], 1, 200, false],
 			[[
 				'shareType' => 'foobar',
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
 				'shareType' => [0, 1, 2],
-			], '', true, '', null, [], [0, 1], 1, 200, false],
+			], '', true, [], '', null, [0, 1], 1, 200, false],
 			[[
 				'shareType' => [0, 1],
-			], '', true, '', null, [], [0, 1], 1, 200, false],
+			], '', true, [], '', null, [0, 1], 1, 200, false],
 			[[
 				'shareType' => $allTypes,
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
 				'shareType' => $allTypes,
-			], '', false, '', null, [], [0, 1], 1, 200, false],
+			], '', false, [], '', null, [0, 1], 1, 200, false],
 
 			// Test pagination
 			[[
 				'page' => 0,
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
 				'page' => '0',
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
 				'page' => -1,
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
 				'page' => 1,
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
 				'page' => 10,
-			], '', true, '', null, [], $allTypes, 10, 200, false],
+			], '', true, [], '', null, $allTypes, 10, 200, false],
 
 			// Test limit
 			[[
 				'limit' => 0,
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
 				'limit' => '0',
-			], '', true, '', null, [], $allTypes, 1, 200, false],
+			], '', true, [], '', null, $allTypes, 1, 200, false],
 			[[
 				'limit' => -1,
-			], '', true, '', null, [], $allTypes, 1, 1, false],
+			], '', true, [], '', null, $allTypes, 1, 1, false],
 			[[
 				'limit' => 1,
-			], '', true, '', null, [], $allTypes, 1, 1, false],
+			], '', true, [], '', null, $allTypes, 1, 1, false],
 			[[
 				'limit' => 10,
-			], '', true, '', null, [], $allTypes, 1, 10, false],
+			], '', true, [], '', null, $allTypes, 1, 10, false],
 
 			// Test $shareWithGroupOnly setting
-			[[], 'no', true, '', null, [], $allTypes, 1, 200, false],
-			[[], 'yes', true, '', null, [], $allTypes, 1, 200, true],
+			[[], 'no', true, [], '', null, $allTypes, 1, 200, false],
+			[[], 'yes', true, [], '', null, $allTypes, 1, 200, true],
 
 		];
 	}
@@ -459,15 +460,15 @@ class ShareesTest extends TestCase {
 	 * @param array $getData
 	 * @param string $apiSetting
 	 * @param bool $remoteSharingEnabled
+	 * @param array $shareIds
 	 * @param string $search
 	 * @param string $itemType
-	 * @param array $existingShares
 	 * @param array $shareTypes
 	 * @param int $page
 	 * @param int $perPage
 	 * @param bool $shareWithGroupOnly
 	 */
-	public function testSearch($getData, $apiSetting, $remoteSharingEnabled, $search, $itemType, $existingShares, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
+	public function testSearch($getData, $apiSetting, $remoteSharingEnabled, $shareIds, $search, $itemType, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
 		$oldGet = $_GET;
 		$_GET = $getData;
 
@@ -487,21 +488,22 @@ class ShareesTest extends TestCase {
 				$config,
 				$this->session,
 				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
-				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
+				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(),
+				\OC::$server->getDatabaseConnection()
 			])
 			->setMethods(array('searchSharees', 'isRemoteSharingAllowed'))
 			->getMock();
 		$sharees->expects($this->once())
 			->method('searchSharees')
-			->with($search, $itemType, $existingShares, $shareTypes, $page, $perPage, $shareWithGroupOnly)
+			->with($search, $itemType, $shareIds, $shareTypes, $page, $perPage, $shareWithGroupOnly)
 			->willReturnCallback(function
-					($isearch, $iitemType, $iexistingShares, $ishareTypes, $ipage, $iperPage, $ishareWithGroupOnly)
-				use ($search, $itemType, $existingShares, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
+					($isearch, $iitemType, $ishareIds, $ishareTypes, $ipage, $iperPage, $ishareWithGroupOnly)
+				use ($search, $itemType, $shareIds, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
 
 				// We are doing strict comparisons here, so we can differ 0/'' and null on shareType/itemType
 				$this->assertSame($search, $isearch);
 				$this->assertSame($itemType, $iitemType);
-				$this->assertSame($existingShares, $iexistingShares);
+				$this->assertSame($shareIds, $ishareIds);
 				$this->assertSame($shareTypes, $ishareTypes);
 				$this->assertSame($page, $ipage);
 				$this->assertSame($perPage, $iperPage);
@@ -540,11 +542,11 @@ class ShareesTest extends TestCase {
 
 	public function dataSearchSharees() {
 		return [
-			['test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [], [], 0, false],
-			['test', 'folder', [0 => ['test1'], 1 => ['test2 group']], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [], [], 0, false],
+			['test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [], [], 0, false],
+			['test', 'folder', [1, 2], [0 => ['test1'], 1 => ['test2 group']], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [], [], 0, false],
 			// First page with 2 of 3 results
 			[
-				'test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
+				'test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], [
 					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
@@ -557,7 +559,7 @@ class ShareesTest extends TestCase {
 			],
 			// Second page with the 3rd result
 			[
-				'test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 2, 2, false, [
+				'test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 2, 2, false, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], [
 					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
@@ -569,7 +571,7 @@ class ShareesTest extends TestCase {
 			],
 			// No groups requested
 			[
-				'test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
+				'test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
 				['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 			], null, [
 				['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
@@ -580,7 +582,7 @@ class ShareesTest extends TestCase {
 			],
 			// Ingnoring already shared user
 			[
-				'test', 'folder', [\OCP\Share::SHARE_TYPE_USER => ['test1']], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
+				'test', 'folder', [1], [\OCP\Share::SHARE_TYPE_USER => ['test1']], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], [
 					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
@@ -593,7 +595,7 @@ class ShareesTest extends TestCase {
 			],
 			// Share type restricted to user - Only one user
 			[
-				'test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
+				'test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], null, null, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
@@ -601,7 +603,7 @@ class ShareesTest extends TestCase {
 			],
 			// Share type restricted to user - Multipage result
 			[
-				'test', 'folder', [], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
+				'test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
 					['label' => 'test 1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 					['label' => 'test 2', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
 					['label' => 'test 3', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test3']],
@@ -612,7 +614,7 @@ class ShareesTest extends TestCase {
 			],
 			// Share type restricted to user - Only user already shared
 			[
-				'test', 'folder', [\OCP\Share::SHARE_TYPE_USER => ['test1']], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
+				'test', 'folder', [1], [\OCP\Share::SHARE_TYPE_USER => ['test1']], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
 					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], null, null, [], 0, false,
 			],
@@ -624,6 +626,7 @@ class ShareesTest extends TestCase {
 	 *
 	 * @param string $searchTerm
 	 * @param string $itemType
+	 * @param array $shareIds
 	 * @param array $existingShares
 	 * @param array $shareTypes
 	 * @param int $page
@@ -631,7 +634,7 @@ class ShareesTest extends TestCase {
 	 * @param bool $shareWithGroupOnly
 	 * @param array $expected
 	 */
-	public function testSearchSharees($searchTerm, $itemType, array $existingShares, array $shareTypes, $page, $perPage, $shareWithGroupOnly,
+	public function testSearchSharees($searchTerm, $itemType, array $shareIds, array $existingShares, array $shareTypes, $page, $perPage, $shareWithGroupOnly,
 									  $mockedUserResult, $mockedGroupsResult, $mockedRemotesResult, $expected, $totalItems, $nextLink) {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\API\Sharees $sharees */
 		$sharees = $this->getMockBuilder('\OCA\Files_Sharing\API\Sharees')
@@ -642,10 +645,15 @@ class ShareesTest extends TestCase {
 				$this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
 				$this->session,
 				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
-				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
+				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(),
+				\OC::$server->getDatabaseConnection()
 			])
-			->setMethods(array('getUsers', 'getGroups', 'getRemote'))
+			->setMethods(array('getShareesForShareIds', 'getUsers', 'getGroups', 'getRemote'))
 			->getMock();
+		$sharees->expects($this->once())
+			->method('getShareesForShareIds')
+			->with($shareIds)
+			->willReturn($existingShares);
 		$sharees->expects(($mockedUserResult === null) ? $this->never() : $this->once())
 			->method('getUsers')
 			->with($searchTerm, $shareWithGroupOnly)
@@ -660,7 +668,7 @@ class ShareesTest extends TestCase {
 			->willReturn($mockedRemotesResult);
 
 		/** @var \OC_OCS_Result $ocs */
-		$ocs = $this->invokePrivate($sharees, 'searchSharees', [$searchTerm, $itemType, $existingShares, $shareTypes, $page, $perPage, $shareWithGroupOnly]);
+		$ocs = $this->invokePrivate($sharees, 'searchSharees', [$searchTerm, $itemType, $shareIds, $shareTypes, $page, $perPage, $shareWithGroupOnly]);
 		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
 
 		$this->assertEquals($expected, $ocs->getData());
-- 
GitLab


From 83b88c9a264a46f393df95e6c57793f0300495da Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 17 Aug 2015 12:13:49 +0200
Subject: [PATCH 034/783] Do not return the current user himself

---
 apps/files_sharing/api/sharees.php       |  5 +++
 apps/files_sharing/tests/api/sharees.php | 44 +++++++++++++++++++++---
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 3e802b3028a..f12677265bf 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -116,6 +116,11 @@ class Sharees {
 
 
 		foreach ($users as $uid => $displayName) {
+			if ($uid === $this->userSession->getUser()->getUID()) {
+				// Skip the current user
+				continue;
+			}
+
 			$sharees[] = [
 				'label' => $displayName,
 				'value' => [
diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index 24a659eb063..9b7a21b0635 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -127,6 +127,20 @@ class ShareesTest extends TestCase {
 					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
 				]
 			],
+			[
+				'test',
+				false,
+				[],
+				[
+					$this->getUserMock('test1', 'Test One'),
+					$this->getUserMock('test2', 'Test Two'),
+					$this->getUserMock('admin', 'Should be removed'),
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				]
+			],
 			[
 				'test',
 				true,
@@ -175,6 +189,26 @@ class ShareesTest extends TestCase {
 					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
 				]
 			],
+			[
+				'test',
+				true,
+				['abc', 'xyz'],
+				[
+					['abc', 'test', -1, 0, [
+						'test1' => 'Test One',
+					]],
+					['xyz', 'test', -1, 0, [
+						'test2' => 'Test Two',
+					]],
+					['admin', 'Should be removed', -1, 0, [
+						'test2' => 'Test Two',
+					]],
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				]
+			],
 		];
 	}
 
@@ -188,17 +222,17 @@ class ShareesTest extends TestCase {
 	 * @param array $expected
 	 */
 	public function testGetUsers($searchTerm, $shareWithGroupOnly, $groupResponse, $userResponse, $expected) {
+		$user = $this->getUserMock('admin', 'Administrator');
+		$this->session->expects($this->any())
+			->method('getUser')
+			->willReturn($user);
+
 		if (!$shareWithGroupOnly) {
 			$this->userManager->expects($this->once())
 				->method('searchDisplayName')
 				->with($searchTerm)
 				->willReturn($userResponse);
 		} else {
-			$user = $this->getUserMock('admin', 'Administrator');
-			$this->session->expects($this->any())
-				->method('getUser')
-				->willReturn($user);
-
 			$this->groupManager->expects($this->once())
 				->method('getUserGroupIds')
 				->with($user)
-- 
GitLab


From 6b69e7b1dae71601db8486df4c30ab9d73419694 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 17 Aug 2015 12:43:20 +0200
Subject: [PATCH 035/783] Add tests for "getShareesForShareIds()"

---
 apps/files_sharing/tests/api/sharees.php | 93 ++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/sharees.php
index 9b7a21b0635..675cc7bede0 100644
--- a/apps/files_sharing/tests/api/sharees.php
+++ b/apps/files_sharing/tests/api/sharees.php
@@ -21,6 +21,8 @@
 
 namespace OCA\Files_Sharing\Tests\API;
 
+use Doctrine\DBAL\Connection;
+use OC\Share\Constants;
 use OCA\Files_Sharing\API\Sharees;
 use OCA\Files_sharing\Tests\TestCase;
 
@@ -781,6 +783,97 @@ class ShareesTest extends TestCase {
 		$this->assertEquals($expectedSharees, $this->invokePrivate($this->sharees, 'filterSharees', [$potentialSharees, $existingSharees]));
 	}
 
+	public function dataGetShareesForShareIds() {
+		return [
+			[[], []],
+			[[1, 2, 3], [Constants::SHARE_TYPE_USER => ['user1'], Constants::SHARE_TYPE_GROUP => ['group1']]],
+		];
+	}
+
+	/**
+	 * @dataProvider dataGetShareesForShareIds
+	 *
+	 * @param array $shareIds
+	 * @param array $expectedSharees
+	 */
+	public function testGetShareesForShareIds(array $shareIds, array $expectedSharees) {
+		$owner = $this->getUniqueID('test');
+		$shares2delete = [];
+
+		if (!empty($shareIds)) {
+			$userShare = $this->createShare(Constants::SHARE_TYPE_USER, 'user1', $owner, null);
+			$shares2delete[] = $userShare;
+			$shares2delete[] = $this->createShare(Constants::SHARE_TYPE_USER, 'user3', $owner . '2', null);
+
+			$groupShare = $this->createShare(Constants::SHARE_TYPE_GROUP, 'group1', $owner, null);
+			$shares2delete[] = $groupShare;
+			$groupShare2 = $this->createShare(Constants::SHARE_TYPE_GROUP, 'group2', $owner . '2', null);
+			$shares2delete[] = $groupShare2;
+
+			$shares2delete[] = $this->createShare($this->invokePrivate(new Constants(), 'shareTypeGroupUserUnique'), 'user2', $owner, $groupShare);
+			$shares2delete[] = $this->createShare($this->invokePrivate(new Constants(), 'shareTypeGroupUserUnique'), 'user4', $owner, $groupShare2);
+		}
+
+		$user = $this->getUserMock($owner, 'Sharee OCS test user');
+		$this->session->expects($this->any())
+			->method('getUser')
+			->willReturn($user);
+		$this->assertEquals($expectedSharees, $this->invokePrivate($this->sharees, 'getShareesForShareIds', [$shares2delete]));
+
+		$this->deleteShares($shares2delete);
+	}
+
+	/**
+	 * @param int $type
+	 * @param string $with
+	 * @param string $owner
+	 * @param int $parent
+	 * @return int
+	 */
+	protected function createShare($type, $with, $owner, $parent) {
+		$connection = \OC::$server->getDatabaseConnection();
+		$queryBuilder = $connection->getQueryBuilder();
+		$queryBuilder->insert('share')
+			->values([
+				'share_type'	=> $queryBuilder->createParameter('share_type'),
+				'share_with'	=> $queryBuilder->createParameter('share_with'),
+				'uid_owner'		=> $queryBuilder->createParameter('uid_owner'),
+				'parent'		=> $queryBuilder->createParameter('parent'),
+				'item_type'		=> $queryBuilder->expr()->literal('fake'),
+				'item_source'	=> $queryBuilder->expr()->literal(''),
+				'item_target'	=> $queryBuilder->expr()->literal(''),
+				'file_source'	=> $queryBuilder->expr()->literal(0),
+				'file_target'	=> $queryBuilder->expr()->literal(''),
+				'permissions'	=> $queryBuilder->expr()->literal(0),
+				'stime'			=> $queryBuilder->expr()->literal(0),
+				'accepted'		=> $queryBuilder->expr()->literal(0),
+				'expiration'	=> $queryBuilder->expr()->literal(''),
+				'token'			=> $queryBuilder->expr()->literal(''),
+				'mail_send'		=> $queryBuilder->expr()->literal(0),
+			])
+			->setParameters([
+				'share_type'	=> $type,
+				'share_with'	=> $with,
+				'uid_owner'		=> $owner,
+				'parent'		=> $parent,
+			])
+			->execute();
+		return $connection->lastInsertId('share');
+	}
+
+	/**
+	 * @param int[] $shareIds
+	 * @return null
+	 */
+	protected function deleteShares(array $shareIds) {
+		$connection = \OC::$server->getDatabaseConnection();
+		$queryBuilder = $connection->getQueryBuilder();
+		$queryBuilder->delete('share')
+			->where($queryBuilder->expr()->in('id', $queryBuilder->createParameter('ids')))
+			->setParameter('ids', $shareIds, Connection::PARAM_INT_ARRAY)
+			->execute();
+	}
+
 	public function dataGetPaginationLinks() {
 		return [
 			[1, 1, ['limit' => 2], []],
-- 
GitLab


From 937586a3f0260bbc976d13637a708c530c708517 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 17 Aug 2015 12:44:23 +0200
Subject: [PATCH 036/783] Rename file to match the class name

---
 apps/files_sharing/tests/api/{sharees.php => shareestest.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename apps/files_sharing/tests/api/{sharees.php => shareestest.php} (100%)

diff --git a/apps/files_sharing/tests/api/sharees.php b/apps/files_sharing/tests/api/shareestest.php
similarity index 100%
rename from apps/files_sharing/tests/api/sharees.php
rename to apps/files_sharing/tests/api/shareestest.php
-- 
GitLab


From f4186d3dfccc80c6a819c94ece8883c981a9d013 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 19 Aug 2015 10:14:15 +0200
Subject: [PATCH 037/783] Fix wrong value for datetime field

---
 apps/files_sharing/tests/api/shareestest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index 675cc7bede0..c856b93d0fe 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -847,7 +847,7 @@ class ShareesTest extends TestCase {
 				'permissions'	=> $queryBuilder->expr()->literal(0),
 				'stime'			=> $queryBuilder->expr()->literal(0),
 				'accepted'		=> $queryBuilder->expr()->literal(0),
-				'expiration'	=> $queryBuilder->expr()->literal(''),
+				'expiration'	=> $queryBuilder->createParameter('expiration'),
 				'token'			=> $queryBuilder->expr()->literal(''),
 				'mail_send'		=> $queryBuilder->expr()->literal(0),
 			])
@@ -857,6 +857,7 @@ class ShareesTest extends TestCase {
 				'uid_owner'		=> $owner,
 				'parent'		=> $parent,
 			])
+			->setParameter('expiration', null, 'datetime')
 			->execute();
 		return $connection->lastInsertId('share');
 	}
-- 
GitLab


From ac8941f6ac919464b672db5961f14604d681c628 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 19 Aug 2015 12:06:00 +0200
Subject: [PATCH 038/783] Manually query for the last id

---
 apps/files_sharing/tests/api/shareestest.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index c856b93d0fe..3b2e17d9fdc 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -859,7 +859,17 @@ class ShareesTest extends TestCase {
 			])
 			->setParameter('expiration', null, 'datetime')
 			->execute();
-		return $connection->lastInsertId('share');
+
+		$queryBuilder = $connection->getQueryBuilder();
+		$query = $queryBuilder->select('id')
+			->from('share')
+			->orderBy('id', 'DESC')
+			->setMaxResults(1)
+			->execute();
+		$share = $query->fetch();
+		$query->closeCursor();
+
+		return (int) $share['id'];
 	}
 
 	/**
-- 
GitLab


From aa2a894eb0b1e7df6384abc56b0d3a375a062936 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 26 Aug 2015 09:40:20 +0200
Subject: [PATCH 039/783] Fix performance issues of the sharees api

---
 apps/files_sharing/api/sharees.php    | 326 ++++++++++++--------------
 apps/files_sharing/appinfo/routes.php |   4 +-
 2 files changed, 151 insertions(+), 179 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index f12677265bf..4454d647b1c 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -20,13 +20,12 @@
  */
 namespace OCA\Files_Sharing\API;
 
-use Doctrine\DBAL\Connection;
-use OC\Share\SearchResultSorter;
 use OCP\Contacts\IManager;
-use OCP\IDBConnection;
 use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\ILogger;
+use OCP\IRequest;
+use OCP\IUser;
 use OCP\IUserManager;
 use OCP\IConfig;
 use OCP\IUserSession;
@@ -50,14 +49,37 @@ class Sharees {
 	/** @var IUserSession */
 	private $userSession;
 
+	/** @var IRequest */
+	private $request;
+
 	/** @var IURLGenerator */
 	private $urlGenerator;
 
 	/** @var ILogger */
 	private $logger;
 
-	/** @var IDBConnection */
-	private $connection;
+	/** @var bool */
+	private $shareWithGroupOnly;
+
+	/** @var int */
+	protected $offset = 0;
+
+	/** @var int */
+	protected $limit = 10;
+
+	/** @var array */
+	protected $result = [
+		'exact' => [
+			'users' => [],
+			'groups' => [],
+			'remotes' => [],
+		],
+		'users' => [],
+		'groups' => [],
+		'remotes' => [],
+	];
+
+	protected $reachedEndFor = [];
 
 	/**
 	 * @param IGroupManager $groupManager
@@ -66,8 +88,8 @@ class Sharees {
 	 * @param IConfig $config
 	 * @param IUserSession $userSession
 	 * @param IURLGenerator $urlGenerator
+	 * @param IRequest $request
 	 * @param ILogger $logger
-	 * @param IDBConnection $connection
 	 */
 	public function __construct(IGroupManager $groupManager,
 								IUserManager $userManager,
@@ -75,8 +97,8 @@ class Sharees {
 								IConfig $config,
 								IUserSession $userSession,
 								IURLGenerator $urlGenerator,
-								ILogger $logger,
-								IDBConnection $connection) {
+								IRequest $request,
+								ILogger $logger) {
 		$this->groupManager = $groupManager;
 		$this->userManager = $userManager;
 		$this->contactsManager = $contactsManager;
@@ -84,67 +106,82 @@ class Sharees {
 		$this->userSession = $userSession;
 		$this->urlGenerator = $urlGenerator;
 		$this->logger = $logger;
-		$this->connection = $connection;
 	}
 
 	/**
 	 * @param string $search
-	 * @param bool $shareWithGroupOnly
-	 *
-	 * @return array possible sharees
 	 */
-	protected function getUsers($search, $shareWithGroupOnly) {
-		$sharees = [];
-		
-		$users = [];
-		if ($shareWithGroupOnly) {
+	protected function getUsers($search) {
+		$this->result['users'] = $this->result['exact']['users'] = $users = [];
+
+		if ($this->shareWithGroupOnly) {
 			// Search in all the groups this user is part of
 			$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
 			foreach ($userGroups as $userGroup) {
-				$users = array_merge($users, $this->groupManager->displayNamesInGroup($userGroup, $search));
+				$users = $this->groupManager->displayNamesInGroup($userGroup, $search, $this->limit, $this->offset);
+				foreach ($users as $uid => $userDisplayName) {
+					$users[$uid] = $userDisplayName;
+				}
 			}
-			$users = array_unique($users);
 		} else {
 			// Search in all users
-			$users_tmp = $this->userManager->searchDisplayName($search);
+			$usersTmp = $this->userManager->searchDisplayName($search, $this->limit, $this->offset);
 
-			// Put in array that maps uid => displayName
-			foreach($users_tmp as $user) {
+			foreach ($usersTmp as $user) {
 				$users[$user->getUID()] = $user->getDisplayName();
 			}
 		}
 
+		if (sizeof($users) < $this->limit) {
+			$this->reachedEndFor[] = 'users';
+		}
 
-		foreach ($users as $uid => $displayName) {
-			if ($uid === $this->userSession->getUser()->getUID()) {
-				// Skip the current user
-				continue;
-			}
-
-			$sharees[] = [
-				'label' => $displayName,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_USER,
+		$foundUserById = false;
+		foreach ($users as $uid => $userDisplayName) {
+			if ($uid === $search || $userDisplayName === $search) {
+				if ($uid === $search) {
+					$foundUserById = true;
+				}
+				$this->result['exact']['users'][] = [
+					'shareWith' => $search,
+					'label' => $search,
+				];
+			} else {
+				$this->result['users'][] = [
 					'shareWith' => $uid,
-				],
-			];
+					'label' => $userDisplayName,
+				];
+			}
 		}
 
-		return $sharees;
+		if ($this->offset === 0 && !$foundUserById) {
+			// On page one we try if the search result has a direct hit on the
+			// user id and if so, we add that to the exact match list
+			$user = $this->userManager->get($search);
+			if ($user instanceof IUser) {
+				array_push($this->result['exact']['users'], [
+					'shareWith' => $user->getUID(),
+					'label' => $user->getDisplayName(),
+				]);
+			}
+		}
 	}
 
 	/**
 	 * @param string $search
-	 * @param bool $shareWithGroupOnly
-	 *
-	 * @return array possible sharees
 	 */
-	protected function getGroups($search, $shareWithGroupOnly) {
-		$sharees = [];
-		$groups = $this->groupManager->search($search);
+	protected function getGroups($search) {
+		$this->result['groups'] = $this->result['exact']['groups'] = [];
+
+		$groups = $this->groupManager->search($search, $this->limit, $this->offset);
 		$groups = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
 
-		if (!empty($groups) && $shareWithGroupOnly) {
+		if (sizeof($groups) < $this->limit) {
+			$this->reachedEndFor[] = 'groups';
+		}
+
+		$userGroups =  [];
+		if (!empty($groups) && $this->shareWithGroupOnly) {
 			// Intersect all the groups that match with the groups this user is a member of
 			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
 			$userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
@@ -152,53 +189,68 @@ class Sharees {
 		}
 
 		foreach ($groups as $gid) {
-			$sharees[] = [
-				'label' => $gid,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_GROUP,
+			if ($gid === $search) {
+				$this->result['exact']['groups'][] = [
+					'shareWith' => $search,
+					'label' => $search,
+				];
+			} else {
+				$this->result['groups'][] = [
 					'shareWith' => $gid,
-				],
-			];
+					'label' => $gid,
+				];
+			}
 		}
 
-		return $sharees;
+		if ($this->offset === 0 && empty($this->result['exact']['groups'])) {
+			// On page one we try if the search result has a direct hit on the
+			// user id and if so, we add that to the exact match list
+			$group = $this->groupManager->get($search);
+			if ($group instanceof IGroup && (!$this->shareWithGroupOnly || array_intersect([$group], $userGroups))) {
+				array_push($this->result['exact']['users'], [
+					'shareWith' => $group->getGID(),
+					'label' => $group->getGID(),
+				]);
+			}
+		}
 	}
 
 	/**
 	 * @param string $search
-	 *
 	 * @return array possible sharees
 	 */
 	protected function getRemote($search) {
-		$sharees = [];
+		$this->result['remotes'] = [];
 
-		if (substr_count($search, '@') >= 1) {
-			$sharees[] = [
+		if (substr_count($search, '@') >= 1 && $this->offset === 0) {
+			$this->result['exact']['remotes'][] = [
+				'shareWith' => $search,
 				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_REMOTE,
-					'shareWith' => $search,
-				],
 			];
 		}
 
 		// Search in contacts
+		//@todo Pagination missing
 		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
 		foreach ($addressBookContacts as $contact) {
 			if (isset($contact['CLOUD'])) {
 				foreach ($contact['CLOUD'] as $cloudId) {
-					$sharees[] = [
-						'label' => $contact['FN'] . ' (' . $cloudId . ')',
-						'value' => [
-							'shareType' => Share::SHARE_TYPE_REMOTE,
-							'shareWith' => $cloudId
-						]
-					];
+					if ($contact['FN'] === $search || $cloudId === $search) {
+						$this->result['exact']['remotes'][] = [
+							'shareWith' => $cloudId,
+							'label' => $contact['FN'],
+						];
+					} else {
+						$this->result['remotes'][] = [
+							'shareWith' => $cloudId,
+							'label' => $contact['FN'],
+						];
+					}
 				}
 			}
 		}
 
-		return $sharees;
+		$this->reachedEndFor[] = 'remotes';
 	}
 
 	/**
@@ -230,9 +282,11 @@ class Sharees {
 			$shareTypes = array_diff($shareTypes, [Share::SHARE_TYPE_REMOTE]);
 		}
 
-		$shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+		$this->limit = (int) $perPage;
+		$this->offset = $perPage * ($page - 1);
 
-		return $this->searchSharees($search, $itemType, $shareIds, $shareTypes, $page, $perPage, $shareWithGroupOnly);
+		return $this->searchSharees($search, $itemType, $shareIds, $shareTypes, $page, $perPage);
 	}
 
 	/**
@@ -259,150 +313,68 @@ class Sharees {
 	 * @param array $shareTypes
 	 * @param int $page
 	 * @param int $perPage
-	 * @param bool $shareWithGroupOnly
 	 * @return \OC_OCS_Result
 	 */
-	protected function searchSharees($search, $itemType, array $shareIds, array $shareTypes, $page, $perPage, $shareWithGroupOnly) {
-
-		$sharedUsers = $sharedGroups = [];
-		$existingSharees = $this->getShareesForShareIds($shareIds);
-
-		if (!empty($existingSharees)) {
-			if (!empty($existingSharees[Share::SHARE_TYPE_USER]) &&
-				is_array($existingSharees[Share::SHARE_TYPE_USER])) {
-				$sharedUsers = $existingSharees[Share::SHARE_TYPE_USER];
-			}
-
-			if (!empty($existingSharees[Share::SHARE_TYPE_GROUP]) &&
-				is_array($existingSharees[Share::SHARE_TYPE_GROUP])) {
-				$sharedGroups = $existingSharees[Share::SHARE_TYPE_GROUP];
-			}
-		}
-
+	protected function searchSharees($search, $itemType, array $shareIds, array $shareTypes, $page, $perPage) {
 		// Verify arguments
 		if ($itemType === null) {
 			return new \OC_OCS_Result(null, 400, 'missing itemType');
 		}
 
-		$sharees = [];
 		// Get users
 		if (in_array(Share::SHARE_TYPE_USER, $shareTypes)) {
-			$potentialSharees = $this->getUsers($search, $shareWithGroupOnly);
-			$sharees = array_merge($sharees, $this->filterSharees($potentialSharees, $sharedUsers));
+			$this->getUsers($search);
 		}
 
 		// Get groups
 		if (in_array(Share::SHARE_TYPE_GROUP, $shareTypes)) {
-			$potentialSharees = $this->getGroups($search, $shareWithGroupOnly);
-			$sharees = array_merge($sharees, $this->filterSharees($potentialSharees, $sharedGroups));
+			$this->getGroups($search);
 		}
 
 		// Get remote
 		if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes)) {
-			$sharees = array_merge($sharees, $this->getRemote($search));
+			$this->getRemote($search);
 		}
 
-
-		// Sort sharees
-		$sorter = new SearchResultSorter($search, 'label', $this->logger);
-		usort($sharees, array($sorter, 'sort'));
-
-		//Pagination
-		$start = ($page - 1) * $perPage;
-		$total = sizeof($sharees);
-
-		$sharees = array_slice($sharees, $start, $perPage);
-
-		$response = new \OC_OCS_Result($sharees);
-		$response->setTotalItems($total);
+		$response = new \OC_OCS_Result($this->result);
 		$response->setItemsPerPage($perPage);
 
-		$links = $this->getPaginationLinks($page, $total, [
-			'search' => $search,
-			'itemType' => $itemType,
-			'existingShares' => $shareIds,
-			'shareType' => $shareTypes,
-			'limit' => $perPage,
-		]);
-
-		if (!empty($links)) {
-			$response->addHeader('Link', implode(', ', $links));
+		if (sizeof($this->reachedEndFor) < 3) {
+			$response->addHeader('Link', $this->getPaginationLink($page, [
+				'search' => $search,
+				'itemType' => $itemType,
+				'existingShares' => $shareIds,
+				'shareType' => $shareTypes,
+				'limit' => $perPage,
+			]));
 		}
 
 		return $response;
 	}
 
 	/**
-	 * Filter out already existing shares from a list of potential sharees
-	 *
-	 * @param array $potentialSharees
-	 * @param array $existingSharees
-	 * @return array
-	 */
-	protected function filterSharees($potentialSharees, $existingSharees) {
-		$sharees = array_filter($potentialSharees, function ($sharee) use ($existingSharees) {
-			return in_array($sharee['value']['shareWith'], $existingSharees) ? null : $sharee;
-		});
-
-		return $sharees;
-	}
-
-	/**
-	 * Get a list of existing share_with's for the given share IDs (if the current user owns them)
+	 * Generates a bunch of pagination links for the current page
 	 *
-	 * @param array $shareIds
-	 * @return array
+	 * @param int $page Current page
+	 * @param array $params Parameters for the URL
+	 * @return string
 	 */
-	protected function getShareesForShareIds($shareIds) {
-		if (empty($shareIds)) {
-			return [];
-		}
-
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$exprBuilder = $queryBuilder->expr();
-
-		$queryBuilder->select(['share_type', 'share_with'])
-			->from('share')
-			->where($exprBuilder->in('id', $queryBuilder->createParameter('shareIds')))
-			->andWhere($exprBuilder->eq('uid_owner', $queryBuilder->createParameter('user')))
-			->andWhere($exprBuilder->isNull('parent'))
-			->setParameter('shareIds', $shareIds, Connection::PARAM_INT_ARRAY)
-			->setParameter('user', $this->userSession->getUser()->getUID());
-		$query = $queryBuilder->execute();
-
-		$sharees = [];
-		while ($row = $query->fetch()) {
-			$sharees[$row['share_type']][] = $row['share_with'];
+	protected function getPaginationLink($page, array $params) {
+		if ($this->isV2()) {
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+		} else {
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
 		}
-		$query->closeCursor();
+		$params['page'] = $page + 1;
+		$link = '<' . $url . http_build_query($params) . '>; rel="next"';
 
-		return $sharees;
+		return $link;
 	}
 
 	/**
-	 * Generates a bunch of pagination links for the current page
-	 *
-	 * @param int $page Current page
-	 * @param int $total Number of total items that need to be paginated
-	 * @param array $params Parameters for the URL
-	 * @return array
+	 * @return bool
 	 */
-	protected function getPaginationLinks($page, $total, array $params) {
-		$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
-
-		$links = [];
-		if ($page > 1) {
-			$params['page'] = 1;
-			$links[] = '<' . $url . http_build_query($params) . '>; rel="first"';
-			$params['page'] = $page - 1;
-			$links[] = '<' . $url . http_build_query($params) . '>; rel="prev"';
-		}
-		if ($page * $params['limit'] < $total) {
-			$params['page'] = $page + 1;
-			$links[] = '<' . $url . http_build_query($params) . '>; rel="next"';
-			$params['page'] = ceil($total / $params['limit']);
-			$links[] = '<' . $url . http_build_query($params) . '>; rel="last"';
-		}
-		return $links;
+	protected function isV2() {
+		return $this->request->getScriptName() === '/ocs/v2.php';
 	}
 }
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 28dc3ab967f..375124cb730 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -108,8 +108,8 @@ $sharees = new \OCA\Files_Sharing\API\Sharees(\OC::$server->getGroupManager(),
                                               \OC::$server->getConfig(),
                                               \OC::$server->getUserSession(),
                                               \OC::$server->getURLGenerator(),
-                                              \OC::$server->getLogger(),
-                                              \OC::$server->getDatabaseConnection());
+                                              \OC::$server->getRequest(),
+                                              \OC::$server->getLogger());
 
 API::register('get',
 		'/apps/files_sharing/api/v1/sharees',
-- 
GitLab


From 2a6e676048f1f8e521e5b6c189e71e02bb2e5005 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 26 Aug 2015 10:51:26 +0200
Subject: [PATCH 040/783] Adjust tests

---
 apps/files_sharing/api/sharees.php           |  77 ++-
 apps/files_sharing/tests/api/shareestest.php | 674 ++++++++-----------
 2 files changed, 348 insertions(+), 403 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 4454d647b1c..807b6b3314f 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -35,31 +35,31 @@ use OCP\Share;
 class Sharees {
 
 	/** @var IGroupManager */
-	private $groupManager;
+	protected $groupManager;
 
 	/** @var IUserManager */
-	private $userManager;
+	protected $userManager;
 
 	/** @var IManager */
-	private $contactsManager;
+	protected $contactsManager;
 
 	/** @var IConfig */
-	private $config;
+	protected $config;
 
 	/** @var IUserSession */
-	private $userSession;
+	protected $userSession;
 
 	/** @var IRequest */
-	private $request;
+	protected $request;
 
 	/** @var IURLGenerator */
-	private $urlGenerator;
+	protected $urlGenerator;
 
 	/** @var ILogger */
-	private $logger;
+	protected $logger;
 
 	/** @var bool */
-	private $shareWithGroupOnly;
+	protected $shareWithGroupOnly = false;
 
 	/** @var int */
 	protected $offset = 0;
@@ -105,6 +105,7 @@ class Sharees {
 		$this->config = $config;
 		$this->userSession = $userSession;
 		$this->urlGenerator = $urlGenerator;
+		$this->request = $request;
 		$this->logger = $logger;
 	}
 
@@ -118,8 +119,8 @@ class Sharees {
 			// Search in all the groups this user is part of
 			$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
 			foreach ($userGroups as $userGroup) {
-				$users = $this->groupManager->displayNamesInGroup($userGroup, $search, $this->limit, $this->offset);
-				foreach ($users as $uid => $userDisplayName) {
+				$usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $this->limit, $this->offset);
+				foreach ($usersTmp as $uid => $userDisplayName) {
 					$users[$uid] = $userDisplayName;
 				}
 			}
@@ -143,13 +144,19 @@ class Sharees {
 					$foundUserById = true;
 				}
 				$this->result['exact']['users'][] = [
-					'shareWith' => $search,
-					'label' => $search,
+					'label' => $userDisplayName,
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_USER,
+						'shareWith' => $uid,
+					],
 				];
 			} else {
 				$this->result['users'][] = [
-					'shareWith' => $uid,
 					'label' => $userDisplayName,
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_USER,
+						'shareWith' => $uid,
+					],
 				];
 			}
 		}
@@ -160,8 +167,11 @@ class Sharees {
 			$user = $this->userManager->get($search);
 			if ($user instanceof IUser) {
 				array_push($this->result['exact']['users'], [
-					'shareWith' => $user->getUID(),
 					'label' => $user->getDisplayName(),
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_USER,
+						'shareWith' => $user->getUID(),
+					],
 				]);
 			}
 		}
@@ -191,13 +201,19 @@ class Sharees {
 		foreach ($groups as $gid) {
 			if ($gid === $search) {
 				$this->result['exact']['groups'][] = [
-					'shareWith' => $search,
 					'label' => $search,
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_GROUP,
+						'shareWith' => $search,
+					],
 				];
 			} else {
 				$this->result['groups'][] = [
-					'shareWith' => $gid,
 					'label' => $gid,
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_GROUP,
+						'shareWith' => $gid,
+					],
 				];
 			}
 		}
@@ -208,8 +224,11 @@ class Sharees {
 			$group = $this->groupManager->get($search);
 			if ($group instanceof IGroup && (!$this->shareWithGroupOnly || array_intersect([$group], $userGroups))) {
 				array_push($this->result['exact']['users'], [
-					'shareWith' => $group->getGID(),
 					'label' => $group->getGID(),
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_GROUP,
+						'shareWith' => $group->getGID(),
+					],
 				]);
 			}
 		}
@@ -224,8 +243,11 @@ class Sharees {
 
 		if (substr_count($search, '@') >= 1 && $this->offset === 0) {
 			$this->result['exact']['remotes'][] = [
-				'shareWith' => $search,
 				'label' => $search,
+				'value' => [
+					'shareType' => Share::SHARE_TYPE_REMOTE,
+					'shareWith' => $search,
+				],
 			];
 		}
 
@@ -237,13 +259,19 @@ class Sharees {
 				foreach ($contact['CLOUD'] as $cloudId) {
 					if ($contact['FN'] === $search || $cloudId === $search) {
 						$this->result['exact']['remotes'][] = [
-							'shareWith' => $cloudId,
 							'label' => $contact['FN'],
+							'value' => [
+								'shareType' => Share::SHARE_TYPE_REMOTE,
+								'shareWith' => $cloudId,
+							],
 						];
 					} else {
 						$this->result['remotes'][] = [
-							'shareWith' => $cloudId,
 							'label' => $contact['FN'],
+							'value' => [
+								'shareType' => Share::SHARE_TYPE_REMOTE,
+								'shareWith' => $cloudId,
+							],
 						];
 					}
 				}
@@ -259,7 +287,6 @@ class Sharees {
 	public function search() {
 		$search = isset($_GET['search']) ? (string) $_GET['search'] : '';
 		$itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
-		$shareIds = isset($_GET['existingShares']) ? (array) $_GET['existingShares'] : [];
 		$page = !empty($_GET['page']) ? max(1, (int) $_GET['page']) : 1;
 		$perPage = !empty($_GET['limit']) ? max(1, (int) $_GET['limit']) : 200;
 
@@ -286,7 +313,7 @@ class Sharees {
 		$this->limit = (int) $perPage;
 		$this->offset = $perPage * ($page - 1);
 
-		return $this->searchSharees($search, $itemType, $shareIds, $shareTypes, $page, $perPage);
+		return $this->searchSharees($search, $itemType, $shareTypes, $page, $perPage);
 	}
 
 	/**
@@ -309,13 +336,12 @@ class Sharees {
 	 *
 	 * @param string $search
 	 * @param string $itemType
-	 * @param array $shareIds
 	 * @param array $shareTypes
 	 * @param int $page
 	 * @param int $perPage
 	 * @return \OC_OCS_Result
 	 */
-	protected function searchSharees($search, $itemType, array $shareIds, array $shareTypes, $page, $perPage) {
+	protected function searchSharees($search, $itemType, array $shareTypes, $page, $perPage) {
 		// Verify arguments
 		if ($itemType === null) {
 			return new \OC_OCS_Result(null, 400, 'missing itemType');
@@ -343,7 +369,6 @@ class Sharees {
 			$response->addHeader('Link', $this->getPaginationLink($page, [
 				'search' => $search,
 				'itemType' => $itemType,
-				'existingShares' => $shareIds,
 				'shareType' => $shareTypes,
 				'limit' => $perPage,
 			]));
diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index 3b2e17d9fdc..d9f36623343 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -25,6 +25,7 @@ use Doctrine\DBAL\Connection;
 use OC\Share\Constants;
 use OCA\Files_Sharing\API\Sharees;
 use OCA\Files_sharing\Tests\TestCase;
+use OCP\Share;
 
 class ShareesTest extends TestCase {
 	/** @var Sharees */
@@ -42,6 +43,9 @@ class ShareesTest extends TestCase {
 	/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */
 	protected $session;
 
+	/** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */
+	protected $request;
+
 	protected function setUp() {
 		parent::setUp();
 
@@ -61,6 +65,10 @@ class ShareesTest extends TestCase {
 			->disableOriginalConstructor()
 			->getMock();
 
+		$this->request = $this->getMockBuilder('OCP\IRequest')
+			->disableOriginalConstructor()
+			->getMock();
+
 		$this->sharees = new Sharees(
 			$this->groupManager,
 			$this->userManager,
@@ -68,8 +76,8 @@ class ShareesTest extends TestCase {
 			$this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
 			$this->session,
 			$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
-			$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(),
-			\OC::$server->getDatabaseConnection()
+			$this->request,
+			$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
 		);
 	}
 
@@ -103,8 +111,8 @@ class ShareesTest extends TestCase {
 
 	public function dataGetUsers() {
 		return [
-			['test', false, [], [], []],
-			['test', true, [], [], []],
+			['test', false, [], [], [], [], true],
+			['test', true, [], [], [], [], true],
 			[
 				'test',
 				false,
@@ -112,9 +120,11 @@ class ShareesTest extends TestCase {
 				[
 					$this->getUserMock('test1', 'Test One'),
 				],
+				[],
 				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				]
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				],
+				true,
 			],
 			[
 				'test',
@@ -124,92 +134,85 @@ class ShareesTest extends TestCase {
 					$this->getUserMock('test1', 'Test One'),
 					$this->getUserMock('test2', 'Test Two'),
 				],
+				[],
 				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
-				]
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+				false,
 			],
 			[
 				'test',
 				false,
 				[],
 				[
+					$this->getUserMock('test', 'Test'),
 					$this->getUserMock('test1', 'Test One'),
 					$this->getUserMock('test2', 'Test Two'),
-					$this->getUserMock('admin', 'Should be removed'),
 				],
 				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
-				]
+					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+				false,
 			],
 			[
 				'test',
 				true,
 				['abc', 'xyz'],
 				[
-					['abc', 'test', -1, 0, ['test1' => 'Test One']],
-					['xyz', 'test', -1, 0, []],
+					['abc', 'test', 2, 0, ['test1' => 'Test One']],
+					['xyz', 'test', 2, 0, []],
 				],
+				[],
 				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				]
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				],
+				true,
 			],
 			[
 				'test',
 				true,
 				['abc', 'xyz'],
 				[
-					['abc', 'test', -1, 0, [
+					['abc', 'test', 2, 0, [
 						'test1' => 'Test One',
 						'test2' => 'Test Two',
 					]],
-					['xyz', 'test', -1, 0, [
+					['xyz', 'test', 2, 0, [
 						'test1' => 'Test One',
 						'test2' => 'Test Two',
 					]],
 				],
+				[],
 				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
-				]
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+				false,
 			],
 			[
 				'test',
 				true,
 				['abc', 'xyz'],
 				[
-					['abc', 'test', -1, 0, [
-						'test1' => 'Test One',
+					['abc', 'test', 2, 0, [
+						'test' => 'Test One',
 					]],
-					['xyz', 'test', -1, 0, [
+					['xyz', 'test', 2, 0, [
 						'test2' => 'Test Two',
 					]],
 				],
 				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
-				]
-			],
-			[
-				'test',
-				true,
-				['abc', 'xyz'],
-				[
-					['abc', 'test', -1, 0, [
-						'test1' => 'Test One',
-					]],
-					['xyz', 'test', -1, 0, [
-						'test2' => 'Test Two',
-					]],
-					['admin', 'Should be removed', -1, 0, [
-						'test2' => 'Test Two',
-					]],
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
 				],
 				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
-				]
+					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+				false,
 			],
 		];
 	}
@@ -221,9 +224,15 @@ class ShareesTest extends TestCase {
 	 * @param bool $shareWithGroupOnly
 	 * @param array $groupResponse
 	 * @param array $userResponse
+	 * @param array $exactExpected
 	 * @param array $expected
+	 * @param bool $reachedEnd
 	 */
-	public function testGetUsers($searchTerm, $shareWithGroupOnly, $groupResponse, $userResponse, $expected) {
+	public function testGetUsers($searchTerm, $shareWithGroupOnly, $groupResponse, $userResponse, $exactExpected, $expected, $reachedEnd) {
+		$this->invokePrivate($this->sharees, 'limit', [2]);
+		$this->invokePrivate($this->sharees, 'offset', [0]);
+		$this->invokePrivate($this->sharees, 'shareWithGroupOnly', [$shareWithGroupOnly]);
+
 		$user = $this->getUserMock('admin', 'Administrator');
 		$this->session->expects($this->any())
 			->method('getUser')
@@ -232,7 +241,7 @@ class ShareesTest extends TestCase {
 		if (!$shareWithGroupOnly) {
 			$this->userManager->expects($this->once())
 				->method('searchDisplayName')
-				->with($searchTerm)
+				->with($searchTerm, $this->invokePrivate($this->sharees, 'limit'), $this->invokePrivate($this->sharees, 'offset'))
 				->willReturn($userResponse);
 		} else {
 			$this->groupManager->expects($this->once())
@@ -242,25 +251,41 @@ class ShareesTest extends TestCase {
 
 			$this->groupManager->expects($this->exactly(sizeof($groupResponse)))
 				->method('displayNamesInGroup')
-				->with($this->anything(), $searchTerm)
+				->with($this->anything(), $searchTerm, $this->invokePrivate($this->sharees, 'limit'), $this->invokePrivate($this->sharees, 'offset'))
 				->willReturnMap($userResponse);
 		}
 
-		$users = $this->invokePrivate($this->sharees, 'getUsers', [$searchTerm, $shareWithGroupOnly]);
+		$this->invokePrivate($this->sharees, 'getUsers', [$searchTerm]);
+		$result = $this->invokePrivate($this->sharees, 'result');
 
-		$this->assertEquals($expected, $users);
+		$this->assertEquals($exactExpected, $result['exact']['users']);
+		$this->assertEquals($expected, $result['users']);
+		$this->assertCount((int) $reachedEnd, $this->invokePrivate($this->sharees, 'reachedEndFor'));
 	}
 
 	public function dataGetGroups() {
 		return [
-			['test', false, [], [], []],
+			['test', false, [], [], [], [], true],
 			[
 				'test', false,
 				[$this->getGroupMock('test1')],
 				[],
-				[['label' => 'test1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				[],
+				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				true,
 			],
-			['test', true, [], [], []],
+			[
+				'test', false,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[],
+				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
+				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				false,
+			],
+			['test', true, [], [], [], [], true],
 			[
 				'test', true,
 				[
@@ -268,7 +293,31 @@ class ShareesTest extends TestCase {
 					$this->getGroupMock('test2'),
 				],
 				[$this->getGroupMock('test1')],
-				[['label' => 'test1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				[],
+				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				false,
+			],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test')],
+				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
+				[],
+				false,
+			],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test1')],
+				[],
+				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				false,
 			],
 		];
 	}
@@ -280,12 +329,18 @@ class ShareesTest extends TestCase {
 	 * @param bool $shareWithGroupOnly
 	 * @param array $groupResponse
 	 * @param array $userGroupsResponse
+	 * @param array $exactExpected
 	 * @param array $expected
+	 * @param bool $reachedEnd
 	 */
-	public function testGetGroups($searchTerm, $shareWithGroupOnly, $groupResponse, $userGroupsResponse, $expected) {
+	public function testGetGroups($searchTerm, $shareWithGroupOnly, $groupResponse, $userGroupsResponse, $exactExpected, $expected, $reachedEnd) {
+		$this->invokePrivate($this->sharees, 'limit', [2]);
+		$this->invokePrivate($this->sharees, 'offset', [0]);
+		$this->invokePrivate($this->sharees, 'shareWithGroupOnly', [$shareWithGroupOnly]);
+
 		$this->groupManager->expects($this->once())
 			->method('search')
-			->with($searchTerm)
+			->with($searchTerm, $this->invokePrivate($this->sharees, 'limit'), $this->invokePrivate($this->sharees, 'offset'))
 			->willReturn($groupResponse);
 
 		if ($shareWithGroupOnly) {
@@ -301,20 +356,25 @@ class ShareesTest extends TestCase {
 				->willReturn($userGroupsResponse);
 		}
 
-		$users = $this->invokePrivate($this->sharees, 'getGroups', [$searchTerm, $shareWithGroupOnly]);
+		$this->invokePrivate($this->sharees, 'getGroups', [$searchTerm]);
+		$result = $this->invokePrivate($this->sharees, 'result');
 
-		$this->assertEquals($expected, $users);
+		$this->assertEquals($exactExpected, $result['exact']['groups']);
+		$this->assertEquals($expected, $result['groups']);
+		$this->assertCount((int) $reachedEnd, $this->invokePrivate($this->sharees, 'reachedEndFor'));
 	}
 
 	public function dataGetRemote() {
 		return [
-			['test', [], []],
+			['test', [], [], [], true],
 			[
 				'test@remote',
 				[],
 				[
-					['label' => 'test@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
+					['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
 				],
+				[],
+				true,
 			],
 			[
 				'test',
@@ -334,9 +394,11 @@ class ShareesTest extends TestCase {
 						],
 					],
 				],
+				[],
 				[
-					['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
+					['label' => 'User @ Localhost', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
 				],
+				true,
 			],
 			[
 				'test@remote',
@@ -357,9 +419,12 @@ class ShareesTest extends TestCase {
 					],
 				],
 				[
-					['label' => 'test@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
-					['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
+					['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
+				],
+				[
+					['label' => 'User @ Localhost', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
 				],
+				true,
 			],
 		];
 	}
@@ -369,123 +434,120 @@ class ShareesTest extends TestCase {
 	 *
 	 * @param string $searchTerm
 	 * @param array $contacts
+	 * @param array $exactExpected
 	 * @param array $expected
+	 * @param bool $reachedEnd
 	 */
-	public function testGetRemote($searchTerm, $contacts, $expected) {
+	public function testGetRemote($searchTerm, $contacts, $exactExpected, $expected, $reachedEnd) {
 		$this->contactsManager->expects($this->any())
 			->method('search')
 			->with($searchTerm, ['CLOUD', 'FN'])
 			->willReturn($contacts);
 
-		$users = $this->invokePrivate($this->sharees, 'getRemote', [$searchTerm]);
+		$this->invokePrivate($this->sharees, 'getRemote', [$searchTerm]);
+		$result = $this->invokePrivate($this->sharees, 'result');
 
-		$this->assertEquals($expected, $users);
+		$this->assertEquals($exactExpected, $result['exact']['remotes']);
+		$this->assertEquals($expected, $result['remotes']);
+		$this->assertCount((int) $reachedEnd, $this->invokePrivate($this->sharees, 'reachedEndFor'));
 	}
 
 	public function dataSearch() {
-		$allTypes = [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE];
+		$allTypes = [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE];
 
 		return [
-			[[], '', true, [], '', null, $allTypes, 1, 200, false],
+			[[], '', true, '', null, $allTypes, 1, 200, false],
 
 			// Test itemType
 			[[
 				'search' => '',
-			], '', true, [], '', null, $allTypes, 1, 200, false],
+			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'search' => 'foobar',
-			], '', true, [], 'foobar', null, $allTypes, 1, 200, false],
+			], '', true, 'foobar', null, $allTypes, 1, 200, false],
 			[[
 				'search' => 0,
-			], '', true, [], '0', null, $allTypes, 1, 200, false],
+			], '', true, '0', null, $allTypes, 1, 200, false],
 
 			// Test itemType
 			[[
 				'itemType' => '',
-			], '', true, [], '', '', $allTypes, 1, 200, false],
+			], '', true, '', '', $allTypes, 1, 200, false],
 			[[
 				'itemType' => 'folder',
-			], '', true, [], '', 'folder', $allTypes, 1, 200, false],
+			], '', true, '', 'folder', $allTypes, 1, 200, false],
 			[[
 				'itemType' => 0,
-			], '', true, [], '', '0', $allTypes, 1, 200, false],
-
-			// Test existingShares
-			[[
-				'existingShares' => [],
-			], '', true, [], '', null, $allTypes, 1, 200, false],
-			[[
-				'existingShares' => [12, 42],
-			], '', true, [12, 42], '', null, $allTypes, 1, 200, false],
+			], '', true, '', '0', $allTypes, 1, 200, false],
 
 			// Test shareType
 			[[
-			], '', true, [], '', null, $allTypes, 1, 200, false],
+			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'shareType' => 0,
-			], '', true, [], '', null, [0], 1, 200, false],
+			], '', true, '', null, [0], 1, 200, false],
 			[[
 				'shareType' => '0',
-			], '', true, [], '', null, [0], 1, 200, false],
+			], '', true, '', null, [0], 1, 200, false],
 			[[
 				'shareType' => 1,
-			], '', true, [], '', null, [1], 1, 200, false],
+			], '', true, '', null, [1], 1, 200, false],
 			[[
 				'shareType' => 12,
-			], '', true, [], '', null, [], 1, 200, false],
+			], '', true, '', null, [], 1, 200, false],
 			[[
 				'shareType' => 'foobar',
-			], '', true, [], '', null, $allTypes, 1, 200, false],
+			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'shareType' => [0, 1, 2],
-			], '', true, [], '', null, [0, 1], 1, 200, false],
+			], '', true, '', null, [0, 1], 1, 200, false],
 			[[
 				'shareType' => [0, 1],
-			], '', true, [], '', null, [0, 1], 1, 200, false],
+			], '', true, '', null, [0, 1], 1, 200, false],
 			[[
 				'shareType' => $allTypes,
-			], '', true, [], '', null, $allTypes, 1, 200, false],
+			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'shareType' => $allTypes,
-			], '', false, [], '', null, [0, 1], 1, 200, false],
+			], '', false, '', null, [0, 1], 1, 200, false],
 
 			// Test pagination
 			[[
 				'page' => 0,
-			], '', true, [], '', null, $allTypes, 1, 200, false],
+			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'page' => '0',
-			], '', true, [], '', null, $allTypes, 1, 200, false],
+			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'page' => -1,
-			], '', true, [], '', null, $allTypes, 1, 200, false],
+			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'page' => 1,
-			], '', true, [], '', null, $allTypes, 1, 200, false],
+			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'page' => 10,
-			], '', true, [], '', null, $allTypes, 10, 200, false],
+			], '', true, '', null, $allTypes, 10, 200, false],
 
 			// Test limit
 			[[
 				'limit' => 0,
-			], '', true, [], '', null, $allTypes, 1, 200, false],
+			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'limit' => '0',
-			], '', true, [], '', null, $allTypes, 1, 200, false],
+			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'limit' => -1,
-			], '', true, [], '', null, $allTypes, 1, 1, false],
+			], '', true, '', null, $allTypes, 1, 1, false],
 			[[
 				'limit' => 1,
-			], '', true, [], '', null, $allTypes, 1, 1, false],
+			], '', true, '', null, $allTypes, 1, 1, false],
 			[[
 				'limit' => 10,
-			], '', true, [], '', null, $allTypes, 1, 10, false],
+			], '', true, '', null, $allTypes, 1, 10, false],
 
 			// Test $shareWithGroupOnly setting
-			[[], 'no', true, [], '', null, $allTypes, 1, 200, false],
-			[[], 'yes', true, [], '', null, $allTypes, 1, 200, true],
+			[[], 'no', true, '', null, $allTypes, 1, 200, false],
+			[[], 'yes', true, '', null, $allTypes, 1, 200, true],
 
 		];
 	}
@@ -496,7 +558,6 @@ class ShareesTest extends TestCase {
 	 * @param array $getData
 	 * @param string $apiSetting
 	 * @param bool $remoteSharingEnabled
-	 * @param array $shareIds
 	 * @param string $search
 	 * @param string $itemType
 	 * @param array $shareTypes
@@ -504,7 +565,7 @@ class ShareesTest extends TestCase {
 	 * @param int $perPage
 	 * @param bool $shareWithGroupOnly
 	 */
-	public function testSearch($getData, $apiSetting, $remoteSharingEnabled, $shareIds, $search, $itemType, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
+	public function testSearch($getData, $apiSetting, $remoteSharingEnabled, $search, $itemType, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
 		$oldGet = $_GET;
 		$_GET = $getData;
 
@@ -524,26 +585,24 @@ class ShareesTest extends TestCase {
 				$config,
 				$this->session,
 				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
-				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(),
-				\OC::$server->getDatabaseConnection()
+				$this->getMockBuilder('OCP\IRequest')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
 			])
 			->setMethods(array('searchSharees', 'isRemoteSharingAllowed'))
 			->getMock();
 		$sharees->expects($this->once())
 			->method('searchSharees')
-			->with($search, $itemType, $shareIds, $shareTypes, $page, $perPage, $shareWithGroupOnly)
+			->with($search, $itemType, $shareTypes, $page, $perPage)
 			->willReturnCallback(function
-					($isearch, $iitemType, $ishareIds, $ishareTypes, $ipage, $iperPage, $ishareWithGroupOnly)
-				use ($search, $itemType, $shareIds, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
+					($isearch, $iitemType, $ishareTypes, $ipage, $iperPage)
+				use ($search, $itemType, $shareTypes, $page, $perPage) {
 
 				// We are doing strict comparisons here, so we can differ 0/'' and null on shareType/itemType
 				$this->assertSame($search, $isearch);
 				$this->assertSame($itemType, $iitemType);
-				$this->assertSame($shareIds, $ishareIds);
 				$this->assertSame($shareTypes, $ishareTypes);
 				$this->assertSame($page, $ipage);
 				$this->assertSame($perPage, $iperPage);
-				$this->assertSame($shareWithGroupOnly, $ishareWithGroupOnly);
 				return new \OC_OCS_Result([]);
 			});
 		$sharees->expects($this->any())
@@ -554,6 +613,8 @@ class ShareesTest extends TestCase {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\API\Sharees $sharees */
 		$this->assertInstanceOf('\OC_OCS_Result', $sharees->search());
 
+		$this->assertSame($shareWithGroupOnly, $this->invokePrivate($sharees, 'shareWithGroupOnly'));
+
 		$_GET = $oldGet;
 	}
 
@@ -578,81 +639,88 @@ class ShareesTest extends TestCase {
 
 	public function dataSearchSharees() {
 		return [
-			['test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [], [], 0, false],
-			['test', 'folder', [1, 2], [0 => ['test1'], 1 => ['test2 group']], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [], [], 0, false],
-			// First page with 2 of 3 results
-			[
-				'test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
-					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				], [
-					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
-				], [
-					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
-				], [
-					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
-				], 3, true,
-			],
-			// Second page with the 3rd result
+			['test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [],
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [],
+					'groups' => [],
+					'remotes' => [],
+				], false],
+			['test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [],
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [],
+					'groups' => [],
+					'remotes' => [],
+				], false],
 			[
-				'test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 2, 2, false, [
-					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				], [
-					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
+				'test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE], 1, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				], [
-					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+					['label' => 'testgroup1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
 				], [
-					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
-				], 3, false,
+					['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+				],
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [
+						['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					],
+					'groups' => [
+						['label' => 'testgroup1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
+					],
+					'remotes' => [
+						['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+					],
+				], true,
 			],
 			// No groups requested
 			[
-				'test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
-				['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-			], null, [
-				['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
-			], [
-				['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
-			], 2, false,
-			],
-			// Ingnoring already shared user
-			[
-				'test', 'folder', [1], [\OCP\Share::SHARE_TYPE_USER => ['test1']], [\OCP\Share::SHARE_TYPE_USER, \OCP\Share::SHARE_TYPE_GROUP, \OCP\Share::SHARE_TYPE_REMOTE], 1, 2, false, [
-					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				], [
-					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
-				], [
-					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
-				], [
-					['label' => 'testgroup1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
-					['label' => 'testz@remote', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
-				], 2, false,
+				'test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_REMOTE], 1, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], null, [
+					['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+				],
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [
+						['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					],
+					'groups' => [],
+					'remotes' => [
+						['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+					],
+				], false,
 			],
 			// Share type restricted to user - Only one user
 			[
-				'test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
-					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				], null, null, [
-					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				], 1, false,
+				'test', 'folder', [Share::SHARE_TYPE_USER], 1, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], null, null,
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [
+						['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					],
+					'groups' => [],
+					'remotes' => [],
+				], false,
 			],
 			// Share type restricted to user - Multipage result
 			[
-				'test', 'folder', [], [], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
-					['label' => 'test 1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'test 2', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
-					['label' => 'test 3', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test3']],
-				], null, null, [
-					['label' => 'test 1', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'test 2', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
-				], 3, true,
-			],
-			// Share type restricted to user - Only user already shared
-			[
-				'test', 'folder', [1], [\OCP\Share::SHARE_TYPE_USER => ['test1']], [\OCP\Share::SHARE_TYPE_USER], 1, 2, false, [
-					['label' => 'test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				], null, null, [], 0, false,
+				'test', 'folder', [Share::SHARE_TYPE_USER], 1, 2, false, [
+					['label' => 'test 1', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'test 2', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				], null, null,
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [
+						['label' => 'test 1', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+						['label' => 'test 2', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+					],
+					'groups' => [],
+					'remotes' => [],
+				], true,
 			],
 		];
 	}
@@ -662,16 +730,18 @@ class ShareesTest extends TestCase {
 	 *
 	 * @param string $searchTerm
 	 * @param string $itemType
-	 * @param array $shareIds
-	 * @param array $existingShares
 	 * @param array $shareTypes
 	 * @param int $page
 	 * @param int $perPage
 	 * @param bool $shareWithGroupOnly
+	 * @param array $mockedUserResult
+	 * @param array $mockedGroupsResult
+	 * @param array $mockedRemotesResult
 	 * @param array $expected
+	 * @param bool $nextLink
 	 */
-	public function testSearchSharees($searchTerm, $itemType, array $shareIds, array $existingShares, array $shareTypes, $page, $perPage, $shareWithGroupOnly,
-									  $mockedUserResult, $mockedGroupsResult, $mockedRemotesResult, $expected, $totalItems, $nextLink) {
+	public function testSearchSharees($searchTerm, $itemType, array $shareTypes, $page, $perPage, $shareWithGroupOnly,
+									  $mockedUserResult, $mockedGroupsResult, $mockedRemotesResult, $expected, $nextLink) {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\API\Sharees $sharees */
 		$sharees = $this->getMockBuilder('\OCA\Files_Sharing\API\Sharees')
 			->setConstructorArgs([
@@ -681,45 +751,47 @@ class ShareesTest extends TestCase {
 				$this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
 				$this->session,
 				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
-				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(),
-				\OC::$server->getDatabaseConnection()
+				$this->getMockBuilder('OCP\IRequest')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
 			])
 			->setMethods(array('getShareesForShareIds', 'getUsers', 'getGroups', 'getRemote'))
 			->getMock();
-		$sharees->expects($this->once())
-			->method('getShareesForShareIds')
-			->with($shareIds)
-			->willReturn($existingShares);
 		$sharees->expects(($mockedUserResult === null) ? $this->never() : $this->once())
 			->method('getUsers')
-			->with($searchTerm, $shareWithGroupOnly)
-			->willReturn($mockedUserResult);
+			->with($searchTerm)
+			->willReturnCallback(function() use ($sharees, $mockedUserResult) {
+				$result = $this->invokePrivate($sharees, 'result');
+				$result['users'] = $mockedUserResult;
+				$this->invokePrivate($sharees, 'result', [$result]);
+			});
 		$sharees->expects(($mockedGroupsResult === null) ? $this->never() : $this->once())
 			->method('getGroups')
-			->with($searchTerm, $shareWithGroupOnly)
-			->willReturn($mockedGroupsResult);
+			->with($searchTerm)
+			->willReturnCallback(function() use ($sharees, $mockedGroupsResult) {
+				$result = $this->invokePrivate($sharees, 'result');
+				$result['groups'] = $mockedGroupsResult;
+				$this->invokePrivate($sharees, 'result', [$result]);
+			});
 		$sharees->expects(($mockedRemotesResult === null) ? $this->never() : $this->once())
 			->method('getRemote')
 			->with($searchTerm)
-			->willReturn($mockedRemotesResult);
+			->willReturnCallback(function() use ($sharees, $mockedRemotesResult) {
+				$result = $this->invokePrivate($sharees, 'result');
+				$result['remotes'] = $mockedRemotesResult;
+				$this->invokePrivate($sharees, 'result', [$result]);
+			});
 
 		/** @var \OC_OCS_Result $ocs */
-		$ocs = $this->invokePrivate($sharees, 'searchSharees', [$searchTerm, $itemType, $shareIds, $shareTypes, $page, $perPage, $shareWithGroupOnly]);
+		$ocs = $this->invokePrivate($sharees, 'searchSharees', [$searchTerm, $itemType, $shareTypes, $page, $perPage, $shareWithGroupOnly]);
 		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
-
 		$this->assertEquals($expected, $ocs->getData());
 
-		// Check number of total results
-		$meta = $ocs->getMeta();
-		$this->assertArrayHasKey('totalitems', $meta);
-		$this->assertSame($totalItems, $meta['totalitems']);
-
 		// Check if next link is set
 		if ($nextLink) {
 			$headers = $ocs->getHeaders();
 			$this->assertArrayHasKey('Link', $headers);
 			$this->assertStringStartsWith('<', $headers['Link']);
-			$this->assertStringEndsWith('"', $headers['Link']);
+			$this->assertStringEndsWith('>; rel="next"', $headers['Link']);
 		}
 	}
 
@@ -737,199 +809,47 @@ class ShareesTest extends TestCase {
 		$this->assertSame('missing itemType', $meta['message']);
 	}
 
-	public function dataFilterSharees() {
+	public function dataGetPaginationLink() {
 		return [
-			[[], [], []],
-			[
-				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				],
-				[],
-				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				],
-			],
-			[
-				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
-				],
-				['test1'],
-				[
-					1 => ['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
-				],
-			],
-			[
-				[
-					['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-					['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
-				],
-				['test2'],
-				[
-					0 => ['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
-				],
-			],
+			[1, '/ocs/v1.php', ['limit' => 2], '<?limit=2&page=2>; rel="next"'],
+			[10, '/ocs/v2.php', ['limit' => 2], '<?limit=2&page=11>; rel="next"'],
 		];
 	}
 
 	/**
-	 * @dataProvider dataFilterSharees
+	 * @dataProvider dataGetPaginationLink
 	 *
-	 * @param array $potentialSharees
-	 * @param array $existingSharees
-	 * @param array $expectedSharees
-	 */
-	public function testFilterSharees($potentialSharees, $existingSharees, $expectedSharees) {
-		$this->assertEquals($expectedSharees, $this->invokePrivate($this->sharees, 'filterSharees', [$potentialSharees, $existingSharees]));
-	}
-
-	public function dataGetShareesForShareIds() {
-		return [
-			[[], []],
-			[[1, 2, 3], [Constants::SHARE_TYPE_USER => ['user1'], Constants::SHARE_TYPE_GROUP => ['group1']]],
-		];
-	}
-
-	/**
-	 * @dataProvider dataGetShareesForShareIds
-	 *
-	 * @param array $shareIds
-	 * @param array $expectedSharees
-	 */
-	public function testGetShareesForShareIds(array $shareIds, array $expectedSharees) {
-		$owner = $this->getUniqueID('test');
-		$shares2delete = [];
-
-		if (!empty($shareIds)) {
-			$userShare = $this->createShare(Constants::SHARE_TYPE_USER, 'user1', $owner, null);
-			$shares2delete[] = $userShare;
-			$shares2delete[] = $this->createShare(Constants::SHARE_TYPE_USER, 'user3', $owner . '2', null);
-
-			$groupShare = $this->createShare(Constants::SHARE_TYPE_GROUP, 'group1', $owner, null);
-			$shares2delete[] = $groupShare;
-			$groupShare2 = $this->createShare(Constants::SHARE_TYPE_GROUP, 'group2', $owner . '2', null);
-			$shares2delete[] = $groupShare2;
-
-			$shares2delete[] = $this->createShare($this->invokePrivate(new Constants(), 'shareTypeGroupUserUnique'), 'user2', $owner, $groupShare);
-			$shares2delete[] = $this->createShare($this->invokePrivate(new Constants(), 'shareTypeGroupUserUnique'), 'user4', $owner, $groupShare2);
-		}
-
-		$user = $this->getUserMock($owner, 'Sharee OCS test user');
-		$this->session->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$this->assertEquals($expectedSharees, $this->invokePrivate($this->sharees, 'getShareesForShareIds', [$shares2delete]));
-
-		$this->deleteShares($shares2delete);
-	}
-
-	/**
-	 * @param int $type
-	 * @param string $with
-	 * @param string $owner
-	 * @param int $parent
-	 * @return int
+	 * @param int $page
+	 * @param string $scriptName
+	 * @param array $params
+	 * @param array $expected
 	 */
-	protected function createShare($type, $with, $owner, $parent) {
-		$connection = \OC::$server->getDatabaseConnection();
-		$queryBuilder = $connection->getQueryBuilder();
-		$queryBuilder->insert('share')
-			->values([
-				'share_type'	=> $queryBuilder->createParameter('share_type'),
-				'share_with'	=> $queryBuilder->createParameter('share_with'),
-				'uid_owner'		=> $queryBuilder->createParameter('uid_owner'),
-				'parent'		=> $queryBuilder->createParameter('parent'),
-				'item_type'		=> $queryBuilder->expr()->literal('fake'),
-				'item_source'	=> $queryBuilder->expr()->literal(''),
-				'item_target'	=> $queryBuilder->expr()->literal(''),
-				'file_source'	=> $queryBuilder->expr()->literal(0),
-				'file_target'	=> $queryBuilder->expr()->literal(''),
-				'permissions'	=> $queryBuilder->expr()->literal(0),
-				'stime'			=> $queryBuilder->expr()->literal(0),
-				'accepted'		=> $queryBuilder->expr()->literal(0),
-				'expiration'	=> $queryBuilder->createParameter('expiration'),
-				'token'			=> $queryBuilder->expr()->literal(''),
-				'mail_send'		=> $queryBuilder->expr()->literal(0),
-			])
-			->setParameters([
-				'share_type'	=> $type,
-				'share_with'	=> $with,
-				'uid_owner'		=> $owner,
-				'parent'		=> $parent,
-			])
-			->setParameter('expiration', null, 'datetime')
-			->execute();
-
-		$queryBuilder = $connection->getQueryBuilder();
-		$query = $queryBuilder->select('id')
-			->from('share')
-			->orderBy('id', 'DESC')
-			->setMaxResults(1)
-			->execute();
-		$share = $query->fetch();
-		$query->closeCursor();
-
-		return (int) $share['id'];
-	}
+	public function testGetPaginationLink($page, $scriptName, $params, $expected) {
+		$this->request->expects($this->once())
+			->method('getScriptName')
+			->willReturn($scriptName);
 
-	/**
-	 * @param int[] $shareIds
-	 * @return null
-	 */
-	protected function deleteShares(array $shareIds) {
-		$connection = \OC::$server->getDatabaseConnection();
-		$queryBuilder = $connection->getQueryBuilder();
-		$queryBuilder->delete('share')
-			->where($queryBuilder->expr()->in('id', $queryBuilder->createParameter('ids')))
-			->setParameter('ids', $shareIds, Connection::PARAM_INT_ARRAY)
-			->execute();
+		$this->assertEquals($expected, $this->invokePrivate($this->sharees, 'getPaginationLink', [$page, $params]));
 	}
 
-	public function dataGetPaginationLinks() {
+	public function dataIsV2() {
 		return [
-			[1, 1, ['limit' => 2], []],
-			[1, 3, ['limit' => 2], [
-				'<?limit=2&page=2>; rel="next"',
-				'<?limit=2&page=2>; rel="last"',
-			]],
-			[1, 21, ['limit' => 2], [
-				'<?limit=2&page=2>; rel="next"',
-				'<?limit=2&page=11>; rel="last"',
-			]],
-			[2, 21, ['limit' => 2], [
-				'<?limit=2&page=1>; rel="first"',
-				'<?limit=2&page=1>; rel="prev"',
-				'<?limit=2&page=3>; rel="next"',
-				'<?limit=2&page=11>; rel="last"',
-			]],
-			[5, 21, ['limit' => 2], [
-				'<?limit=2&page=1>; rel="first"',
-				'<?limit=2&page=4>; rel="prev"',
-				'<?limit=2&page=6>; rel="next"',
-				'<?limit=2&page=11>; rel="last"',
-			]],
-			[10, 21, ['limit' => 2], [
-				'<?limit=2&page=1>; rel="first"',
-				'<?limit=2&page=9>; rel="prev"',
-				'<?limit=2&page=11>; rel="next"',
-				'<?limit=2&page=11>; rel="last"',
-			]],
-			[11, 21, ['limit' => 2], [
-				'<?limit=2&page=1>; rel="first"',
-				'<?limit=2&page=10>; rel="prev"',
-			]],
+			['/ocs/v1.php', false],
+			['/ocs/v2.php', true],
 		];
 	}
 
 	/**
-	 * @dataProvider dataGetPaginationLinks
+	 * @dataProvider dataIsV2
 	 *
-	 * @param int $page
-	 * @param int $total
-	 * @param array $params
-	 * @param array $expected
+	 * @param string $scriptName
+	 * @param bool $expected
 	 */
-	public function testGetPaginationLinks($page, $total, $params, $expected) {
-		$this->assertEquals($expected, $this->invokePrivate($this->sharees, 'getPaginationLinks', [$page, $total, $params]));
+	public function testIsV2($scriptName, $expected) {
+		$this->request->expects($this->once())
+			->method('getScriptName')
+			->willReturn($scriptName);
+
+		$this->assertEquals($expected, $this->invokePrivate($this->sharees, 'isV2'));
 	}
 }
-- 
GitLab


From 199d1dc239a55f9be25b8779122420537f34ecf8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 26 Aug 2015 11:45:11 +0200
Subject: [PATCH 041/783] Bring the coverage back to 100%

---
 apps/files_sharing/api/sharees.php           |  38 +++--
 apps/files_sharing/tests/api/shareestest.php | 156 ++++++++++++++++++-
 2 files changed, 169 insertions(+), 25 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 807b6b3314f..d7eabb9a550 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -139,8 +139,8 @@ class Sharees {
 
 		$foundUserById = false;
 		foreach ($users as $uid => $userDisplayName) {
-			if ($uid === $search || $userDisplayName === $search) {
-				if ($uid === $search) {
+			if (strtolower($uid) === $search || strtolower($userDisplayName) === $search) {
+				if (strtolower($uid) === $search) {
 					$foundUserById = true;
 				}
 				$this->result['exact']['users'][] = [
@@ -199,7 +199,7 @@ class Sharees {
 		}
 
 		foreach ($groups as $gid) {
-			if ($gid === $search) {
+			if (strtolower($gid) === $search) {
 				$this->result['exact']['groups'][] = [
 					'label' => $search,
 					'value' => [
@@ -222,8 +222,8 @@ class Sharees {
 			// On page one we try if the search result has a direct hit on the
 			// user id and if so, we add that to the exact match list
 			$group = $this->groupManager->get($search);
-			if ($group instanceof IGroup && (!$this->shareWithGroupOnly || array_intersect([$group], $userGroups))) {
-				array_push($this->result['exact']['users'], [
+			if ($group instanceof IGroup && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
+				array_push($this->result['exact']['groups'], [
 					'label' => $group->getGID(),
 					'value' => [
 						'shareType' => Share::SHARE_TYPE_GROUP,
@@ -241,23 +241,17 @@ class Sharees {
 	protected function getRemote($search) {
 		$this->result['remotes'] = [];
 
-		if (substr_count($search, '@') >= 1 && $this->offset === 0) {
-			$this->result['exact']['remotes'][] = [
-				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_REMOTE,
-					'shareWith' => $search,
-				],
-			];
-		}
-
 		// Search in contacts
 		//@todo Pagination missing
 		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
+		$foundRemoteById = false;
 		foreach ($addressBookContacts as $contact) {
 			if (isset($contact['CLOUD'])) {
 				foreach ($contact['CLOUD'] as $cloudId) {
-					if ($contact['FN'] === $search || $cloudId === $search) {
+					if (strtolower($contact['FN']) === $search || strtolower($cloudId) === $search) {
+						if (strtolower($cloudId) === $search) {
+							$foundRemoteById = true;
+						}
 						$this->result['exact']['remotes'][] = [
 							'label' => $contact['FN'],
 							'value' => [
@@ -278,6 +272,16 @@ class Sharees {
 			}
 		}
 
+		if (!$foundRemoteById && substr_count($search, '@') >= 1 && substr_count($search, ' ') === 0 && $this->offset === 0) {
+			$this->result['exact']['remotes'][] = [
+				'label' => $search,
+				'value' => [
+					'shareType' => Share::SHARE_TYPE_REMOTE,
+					'shareWith' => $search,
+				],
+			];
+		}
+
 		$this->reachedEndFor[] = 'remotes';
 	}
 
@@ -313,7 +317,7 @@ class Sharees {
 		$this->limit = (int) $perPage;
 		$this->offset = $perPage * ($page - 1);
 
-		return $this->searchSharees($search, $itemType, $shareTypes, $page, $perPage);
+		return $this->searchSharees(strtolower($search), $itemType, $shareTypes, $page, $perPage);
 	}
 
 	/**
diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index d9f36623343..1e4438acd88 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -111,8 +111,20 @@ class ShareesTest extends TestCase {
 
 	public function dataGetUsers() {
 		return [
-			['test', false, [], [], [], [], true],
-			['test', true, [], [], [], [], true],
+			['test', false, [], [], [], [], true, false],
+			['test', true, [], [], [], [], true, false],
+			[
+				'test', false, [], [],
+				[
+					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
+				], [], true, $this->getUserMock('test', 'Test')
+			],
+			[
+				'test', true, [], [],
+				[
+					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
+				], [], true, $this->getUserMock('test', 'Test')
+			],
 			[
 				'test',
 				false,
@@ -125,6 +137,7 @@ class ShareesTest extends TestCase {
 					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				],
 				true,
+				false,
 			],
 			[
 				'test',
@@ -140,24 +153,26 @@ class ShareesTest extends TestCase {
 					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
 				],
 				false,
+				false,
 			],
 			[
 				'test',
 				false,
 				[],
 				[
-					$this->getUserMock('test', 'Test'),
+					$this->getUserMock('test0', 'Test'),
 					$this->getUserMock('test1', 'Test One'),
 					$this->getUserMock('test2', 'Test Two'),
 				],
 				[
-					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
+					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test0']],
 				],
 				[
 					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
 				],
 				false,
+				false,
 			],
 			[
 				'test',
@@ -172,6 +187,7 @@ class ShareesTest extends TestCase {
 					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
 				],
 				true,
+				false,
 			],
 			[
 				'test',
@@ -193,6 +209,7 @@ class ShareesTest extends TestCase {
 					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
 				],
 				false,
+				false,
 			],
 			[
 				'test',
@@ -213,6 +230,7 @@ class ShareesTest extends TestCase {
 					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
 				],
 				false,
+				false,
 			],
 		];
 	}
@@ -227,8 +245,9 @@ class ShareesTest extends TestCase {
 	 * @param array $exactExpected
 	 * @param array $expected
 	 * @param bool $reachedEnd
+	 * @param mixed $singleUser
 	 */
-	public function testGetUsers($searchTerm, $shareWithGroupOnly, $groupResponse, $userResponse, $exactExpected, $expected, $reachedEnd) {
+	public function testGetUsers($searchTerm, $shareWithGroupOnly, $groupResponse, $userResponse, $exactExpected, $expected, $reachedEnd, $singleUser) {
 		$this->invokePrivate($this->sharees, 'limit', [2]);
 		$this->invokePrivate($this->sharees, 'offset', [0]);
 		$this->invokePrivate($this->sharees, 'shareWithGroupOnly', [$shareWithGroupOnly]);
@@ -255,6 +274,13 @@ class ShareesTest extends TestCase {
 				->willReturnMap($userResponse);
 		}
 
+		if ($singleUser !== false) {
+			$this->userManager->expects($this->once())
+				->method('get')
+				->with($searchTerm)
+				->willReturn($singleUser);
+		}
+
 		$this->invokePrivate($this->sharees, 'getUsers', [$searchTerm]);
 		$result = $this->invokePrivate($this->sharees, 'result');
 
@@ -265,7 +291,7 @@ class ShareesTest extends TestCase {
 
 	public function dataGetGroups() {
 		return [
-			['test', false, [], [], [], [], true],
+			['test', false, [], [], [], [], true, false],
 			[
 				'test', false,
 				[$this->getGroupMock('test1')],
@@ -273,6 +299,7 @@ class ShareesTest extends TestCase {
 				[],
 				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
 				true,
+				false,
 			],
 			[
 				'test', false,
@@ -284,8 +311,41 @@ class ShareesTest extends TestCase {
 				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
 				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
 				false,
+				false,
 			],
-			['test', true, [], [], [], [], true],
+			[
+				'test', false,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[],
+				[],
+				[
+					['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
+					['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
+				],
+				false,
+				null,
+			],
+			[
+				'test', false,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[],
+				[
+					['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']],
+				],
+				[
+					['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
+					['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
+				],
+				false,
+				$this->getGroupMock('test'),
+			],
+			['test', true, [], [], [], [], true, false],
 			[
 				'test', true,
 				[
@@ -296,6 +356,7 @@ class ShareesTest extends TestCase {
 				[],
 				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
 				false,
+				false,
 			],
 			[
 				'test', true,
@@ -307,6 +368,7 @@ class ShareesTest extends TestCase {
 				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
 				[],
 				false,
+				false,
 			],
 			[
 				'test', true,
@@ -318,6 +380,51 @@ class ShareesTest extends TestCase {
 				[],
 				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
 				false,
+				false,
+			],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
+				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
+				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				false,
+				false,
+			],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
+				[],
+				[
+					['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
+					['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
+				],
+				false,
+				null,
+			],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
+				[
+					['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']],
+				],
+				[
+					['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
+					['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
+				],
+				false,
+				$this->getGroupMock('test'),
 			],
 		];
 	}
@@ -332,8 +439,9 @@ class ShareesTest extends TestCase {
 	 * @param array $exactExpected
 	 * @param array $expected
 	 * @param bool $reachedEnd
+	 * @param mixed $singleGroup
 	 */
-	public function testGetGroups($searchTerm, $shareWithGroupOnly, $groupResponse, $userGroupsResponse, $exactExpected, $expected, $reachedEnd) {
+	public function testGetGroups($searchTerm, $shareWithGroupOnly, $groupResponse, $userGroupsResponse, $exactExpected, $expected, $reachedEnd, $singleGroup) {
 		$this->invokePrivate($this->sharees, 'limit', [2]);
 		$this->invokePrivate($this->sharees, 'offset', [0]);
 		$this->invokePrivate($this->sharees, 'shareWithGroupOnly', [$shareWithGroupOnly]);
@@ -343,6 +451,13 @@ class ShareesTest extends TestCase {
 			->with($searchTerm, $this->invokePrivate($this->sharees, 'limit'), $this->invokePrivate($this->sharees, 'offset'))
 			->willReturn($groupResponse);
 
+		if ($singleGroup !== false) {
+			$this->groupManager->expects($this->once())
+				->method('get')
+				->with($searchTerm)
+				->willReturn($singleGroup);
+		}
+
 		if ($shareWithGroupOnly) {
 			$user = $this->getUserMock('admin', 'Administrator');
 			$this->session->expects($this->any())
@@ -426,6 +541,31 @@ class ShareesTest extends TestCase {
 				],
 				true,
 			],
+			[
+				'username@localhost',
+				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User @ Localhost',
+						'CLOUD' => [
+							'username@localhost',
+						],
+					],
+				],
+				[
+					['label' => 'User @ Localhost', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
+				],
+				[
+				],
+				true,
+			],
 		];
 	}
 
-- 
GitLab


From 40203d7d1e7b55f2b0eb32c1ad36ada2b060d987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 26 Aug 2015 12:19:24 +0200
Subject: [PATCH 042/783] Remove languages which are no longer maintained on
 transifex

---
 apps/files/l10n/af.js                |   8 --
 apps/files/l10n/af.json              |   1 -
 apps/files/l10n/ca@valencia.js       |   9 ---
 apps/files/l10n/ca@valencia.json     |   7 --
 apps/files/l10n/de_CH.js             |  56 --------------
 apps/files/l10n/de_CH.json           |  54 --------------
 apps/files/l10n/en_NZ.js             |   9 ---
 apps/files/l10n/en_NZ.json           |   7 --
 apps/files/l10n/es_BO.js             |   9 ---
 apps/files/l10n/es_BO.json           |   7 --
 apps/files/l10n/es_CO.js             |   9 ---
 apps/files/l10n/es_CO.json           |   7 --
 apps/files/l10n/es_CR.js             |  19 -----
 apps/files/l10n/es_CR.json           |  17 -----
 apps/files/l10n/es_EC.js             |   9 ---
 apps/files/l10n/es_EC.json           |   7 --
 apps/files/l10n/es_PE.js             |   9 ---
 apps/files/l10n/es_PE.json           |   7 --
 apps/files/l10n/es_PY.js             |  19 -----
 apps/files/l10n/es_PY.json           |  17 -----
 apps/files/l10n/es_US.js             |   9 ---
 apps/files/l10n/es_US.json           |   7 --
 apps/files/l10n/es_UY.js             |   9 ---
 apps/files/l10n/es_UY.json           |   7 --
 apps/files/l10n/eu_ES.js             |   8 --
 apps/files/l10n/eu_ES.json           |   6 --
 apps/files/l10n/fi.js                |  14 ----
 apps/files/l10n/fi.json              |  12 ---
 apps/files/l10n/fr_CA.js             |   9 ---
 apps/files/l10n/fr_CA.json           |   7 --
 apps/files/l10n/hi_IN.js             |   8 --
 apps/files/l10n/hi_IN.json           |   6 --
 apps/files/l10n/sk.js                |   9 ---
 apps/files/l10n/sk.json              |   7 --
 apps/files/l10n/ur.js                |   6 --
 apps/files/l10n/ur.json              |   4 -
 apps/files_external/l10n/de_CH.js    |  28 -------
 apps/files_external/l10n/de_CH.json  |  26 -------
 apps/files_external/l10n/eu_ES.js    |   8 --
 apps/files_external/l10n/eu_ES.json  |   6 --
 apps/files_external/l10n/fi.js       |   9 ---
 apps/files_external/l10n/fi.json     |   7 --
 apps/files_external/l10n/sk.js       |   9 ---
 apps/files_external/l10n/sk.json     |   7 --
 apps/files_sharing/l10n/de_CH.js     |  17 -----
 apps/files_sharing/l10n/de_CH.json   |  15 ----
 apps/files_sharing/l10n/es_CR.js     |  11 ---
 apps/files_sharing/l10n/es_CR.json   |   9 ---
 apps/files_sharing/l10n/es_PY.js     |  11 ---
 apps/files_sharing/l10n/es_PY.json   |   9 ---
 apps/files_sharing/l10n/eu_ES.js     |   7 --
 apps/files_sharing/l10n/eu_ES.json   |   5 --
 apps/files_sharing/l10n/fi.js        |   7 --
 apps/files_sharing/l10n/fi.json      |   5 --
 apps/files_sharing/l10n/sk.js        |   7 --
 apps/files_sharing/l10n/sk.json      |   5 --
 apps/files_trashbin/l10n/de_CH.js    |  15 ----
 apps/files_trashbin/l10n/de_CH.json  |  13 ----
 apps/files_trashbin/l10n/eu_ES.js    |   6 --
 apps/files_trashbin/l10n/eu_ES.json  |   4 -
 apps/files_trashbin/l10n/fi.js       |   7 --
 apps/files_trashbin/l10n/fi.json     |   5 --
 apps/files_trashbin/l10n/sk.js       |   6 --
 apps/files_trashbin/l10n/sk.json     |   4 -
 apps/files_trashbin/l10n/ur.js       |   6 --
 apps/files_trashbin/l10n/ur.json     |   4 -
 apps/files_versions/l10n/de_CH.js    |  11 ---
 apps/files_versions/l10n/de_CH.json  |   9 ---
 apps/user_ldap/l10n/ca@valencia.js   |   7 --
 apps/user_ldap/l10n/ca@valencia.json |   5 --
 apps/user_ldap/l10n/de_CH.js         |  80 --------------------
 apps/user_ldap/l10n/de_CH.json       |  78 --------------------
 apps/user_ldap/l10n/en_NZ.js         |   7 --
 apps/user_ldap/l10n/en_NZ.json       |   5 --
 apps/user_ldap/l10n/es_BO.js         |   7 --
 apps/user_ldap/l10n/es_BO.json       |   5 --
 apps/user_ldap/l10n/es_CO.js         |   7 --
 apps/user_ldap/l10n/es_CO.json       |   5 --
 apps/user_ldap/l10n/es_CR.js         |   7 --
 apps/user_ldap/l10n/es_CR.json       |   5 --
 apps/user_ldap/l10n/es_EC.js         |   7 --
 apps/user_ldap/l10n/es_EC.json       |   5 --
 apps/user_ldap/l10n/es_PE.js         |   7 --
 apps/user_ldap/l10n/es_PE.json       |   5 --
 apps/user_ldap/l10n/es_PY.js         |   7 --
 apps/user_ldap/l10n/es_PY.json       |   5 --
 apps/user_ldap/l10n/es_US.js         |   7 --
 apps/user_ldap/l10n/es_US.json       |   5 --
 apps/user_ldap/l10n/es_UY.js         |   7 --
 apps/user_ldap/l10n/es_UY.json       |   5 --
 apps/user_ldap/l10n/eu_ES.js         |   6 --
 apps/user_ldap/l10n/eu_ES.json       |   4 -
 apps/user_ldap/l10n/fi.js            |  11 ---
 apps/user_ldap/l10n/fi.json          |   9 ---
 apps/user_ldap/l10n/fr_CA.js         |   7 --
 apps/user_ldap/l10n/fr_CA.json       |   5 --
 apps/user_ldap/l10n/hi_IN.js         |   7 --
 apps/user_ldap/l10n/hi_IN.json       |   5 --
 apps/user_ldap/l10n/sk.js            |   7 --
 apps/user_ldap/l10n/sk.json          |   5 --
 apps/user_ldap/l10n/ur.js            |   6 --
 apps/user_ldap/l10n/ur.json          |   4 -
 apps/user_webdavauth/l10n/de_CH.js   |   8 --
 apps/user_webdavauth/l10n/de_CH.json |   6 --
 apps/user_webdavauth/l10n/eu_ES.js   |   6 --
 apps/user_webdavauth/l10n/eu_ES.json |   4 -
 apps/user_webdavauth/l10n/fi.js      |   6 --
 apps/user_webdavauth/l10n/fi.json    |   4 -
 apps/user_webdavauth/l10n/sk.js      |   6 --
 apps/user_webdavauth/l10n/sk.json    |   4 -
 core/l10n/ca@valencia.js             |   8 --
 core/l10n/ca@valencia.json           |   6 --
 core/l10n/de_CH.js                   | 105 ---------------------------
 core/l10n/de_CH.json                 | 103 --------------------------
 core/l10n/en_NZ.js                   |   8 --
 core/l10n/en_NZ.json                 |   6 --
 core/l10n/es_BO.js                   |   8 --
 core/l10n/es_BO.json                 |   6 --
 core/l10n/es_CO.js                   |   8 --
 core/l10n/es_CO.json                 |   6 --
 core/l10n/es_CR.js                   |   8 --
 core/l10n/es_CR.json                 |   6 --
 core/l10n/es_EC.js                   |   8 --
 core/l10n/es_EC.json                 |   6 --
 core/l10n/es_PE.js                   |   8 --
 core/l10n/es_PE.json                 |   6 --
 core/l10n/es_PY.js                   |   8 --
 core/l10n/es_PY.json                 |   6 --
 core/l10n/es_US.js                   |   8 --
 core/l10n/es_US.json                 |   6 --
 core/l10n/es_UY.js                   |   8 --
 core/l10n/es_UY.json                 |   6 --
 core/l10n/eu_ES.js                   |   8 --
 core/l10n/eu_ES.json                 |   6 --
 core/l10n/fi.js                      |  18 -----
 core/l10n/fi.json                    |  16 ----
 core/l10n/fr_CA.js                   |   8 --
 core/l10n/fr_CA.json                 |   6 --
 core/l10n/hi_IN.js                   |   6 --
 core/l10n/hi_IN.json                 |   4 -
 core/l10n/ignorelist                 |   1 -
 core/l10n/sk.js                      |  30 --------
 core/l10n/sk.json                    |  28 -------
 core/l10n/ur.js                      |   6 --
 core/l10n/ur.json                    |   4 -
 lib/l10n/ca@valencia.js              |  10 ---
 lib/l10n/ca@valencia.json            |   8 --
 lib/l10n/de_CH.js                    |  40 ----------
 lib/l10n/de_CH.json                  |  38 ----------
 lib/l10n/en_NZ.js                    |  10 ---
 lib/l10n/en_NZ.json                  |   8 --
 lib/l10n/es_BO.js                    |  10 ---
 lib/l10n/es_BO.json                  |   8 --
 lib/l10n/es_CO.js                    |  10 ---
 lib/l10n/es_CO.json                  |   8 --
 lib/l10n/es_CR.js                    |  10 ---
 lib/l10n/es_CR.json                  |   8 --
 lib/l10n/es_EC.js                    |  10 ---
 lib/l10n/es_EC.json                  |   8 --
 lib/l10n/es_PE.js                    |  10 ---
 lib/l10n/es_PE.json                  |   8 --
 lib/l10n/es_PY.js                    |  10 ---
 lib/l10n/es_PY.json                  |   8 --
 lib/l10n/es_US.js                    |  10 ---
 lib/l10n/es_US.json                  |   8 --
 lib/l10n/es_UY.js                    |  10 ---
 lib/l10n/es_UY.json                  |   8 --
 lib/l10n/eu_ES.js                    |   6 --
 lib/l10n/eu_ES.json                  |   4 -
 lib/l10n/fi.js                       |   7 --
 lib/l10n/fi.json                     |   5 --
 lib/l10n/fr_CA.js                    |  10 ---
 lib/l10n/fr_CA.json                  |   8 --
 lib/l10n/hi_IN.js                    |   9 ---
 lib/l10n/hi_IN.json                  |   7 --
 lib/l10n/sk.js                       |   7 --
 lib/l10n/sk.json                     |   5 --
 lib/l10n/ur.js                       |   9 ---
 lib/l10n/ur.json                     |   7 --
 settings/l10n/de_CH.js               | 102 --------------------------
 settings/l10n/de_CH.json             | 100 -------------------------
 settings/l10n/eu_ES.js               |   9 ---
 settings/l10n/eu_ES.json             |   7 --
 settings/l10n/fi.js                  |  11 ---
 settings/l10n/fi.json                |   9 ---
 settings/l10n/sk.js                  |   9 ---
 settings/l10n/sk.json                |   7 --
 settings/l10n/ur.js                  |   6 --
 settings/l10n/ur.json                |   4 -
 189 files changed, 2206 deletions(-)
 delete mode 100644 apps/files/l10n/af.js
 delete mode 100644 apps/files/l10n/af.json
 delete mode 100644 apps/files/l10n/ca@valencia.js
 delete mode 100644 apps/files/l10n/ca@valencia.json
 delete mode 100644 apps/files/l10n/de_CH.js
 delete mode 100644 apps/files/l10n/de_CH.json
 delete mode 100644 apps/files/l10n/en_NZ.js
 delete mode 100644 apps/files/l10n/en_NZ.json
 delete mode 100644 apps/files/l10n/es_BO.js
 delete mode 100644 apps/files/l10n/es_BO.json
 delete mode 100644 apps/files/l10n/es_CO.js
 delete mode 100644 apps/files/l10n/es_CO.json
 delete mode 100644 apps/files/l10n/es_CR.js
 delete mode 100644 apps/files/l10n/es_CR.json
 delete mode 100644 apps/files/l10n/es_EC.js
 delete mode 100644 apps/files/l10n/es_EC.json
 delete mode 100644 apps/files/l10n/es_PE.js
 delete mode 100644 apps/files/l10n/es_PE.json
 delete mode 100644 apps/files/l10n/es_PY.js
 delete mode 100644 apps/files/l10n/es_PY.json
 delete mode 100644 apps/files/l10n/es_US.js
 delete mode 100644 apps/files/l10n/es_US.json
 delete mode 100644 apps/files/l10n/es_UY.js
 delete mode 100644 apps/files/l10n/es_UY.json
 delete mode 100644 apps/files/l10n/eu_ES.js
 delete mode 100644 apps/files/l10n/eu_ES.json
 delete mode 100644 apps/files/l10n/fi.js
 delete mode 100644 apps/files/l10n/fi.json
 delete mode 100644 apps/files/l10n/fr_CA.js
 delete mode 100644 apps/files/l10n/fr_CA.json
 delete mode 100644 apps/files/l10n/hi_IN.js
 delete mode 100644 apps/files/l10n/hi_IN.json
 delete mode 100644 apps/files/l10n/sk.js
 delete mode 100644 apps/files/l10n/sk.json
 delete mode 100644 apps/files/l10n/ur.js
 delete mode 100644 apps/files/l10n/ur.json
 delete mode 100644 apps/files_external/l10n/de_CH.js
 delete mode 100644 apps/files_external/l10n/de_CH.json
 delete mode 100644 apps/files_external/l10n/eu_ES.js
 delete mode 100644 apps/files_external/l10n/eu_ES.json
 delete mode 100644 apps/files_external/l10n/fi.js
 delete mode 100644 apps/files_external/l10n/fi.json
 delete mode 100644 apps/files_external/l10n/sk.js
 delete mode 100644 apps/files_external/l10n/sk.json
 delete mode 100644 apps/files_sharing/l10n/de_CH.js
 delete mode 100644 apps/files_sharing/l10n/de_CH.json
 delete mode 100644 apps/files_sharing/l10n/es_CR.js
 delete mode 100644 apps/files_sharing/l10n/es_CR.json
 delete mode 100644 apps/files_sharing/l10n/es_PY.js
 delete mode 100644 apps/files_sharing/l10n/es_PY.json
 delete mode 100644 apps/files_sharing/l10n/eu_ES.js
 delete mode 100644 apps/files_sharing/l10n/eu_ES.json
 delete mode 100644 apps/files_sharing/l10n/fi.js
 delete mode 100644 apps/files_sharing/l10n/fi.json
 delete mode 100644 apps/files_sharing/l10n/sk.js
 delete mode 100644 apps/files_sharing/l10n/sk.json
 delete mode 100644 apps/files_trashbin/l10n/de_CH.js
 delete mode 100644 apps/files_trashbin/l10n/de_CH.json
 delete mode 100644 apps/files_trashbin/l10n/eu_ES.js
 delete mode 100644 apps/files_trashbin/l10n/eu_ES.json
 delete mode 100644 apps/files_trashbin/l10n/fi.js
 delete mode 100644 apps/files_trashbin/l10n/fi.json
 delete mode 100644 apps/files_trashbin/l10n/sk.js
 delete mode 100644 apps/files_trashbin/l10n/sk.json
 delete mode 100644 apps/files_trashbin/l10n/ur.js
 delete mode 100644 apps/files_trashbin/l10n/ur.json
 delete mode 100644 apps/files_versions/l10n/de_CH.js
 delete mode 100644 apps/files_versions/l10n/de_CH.json
 delete mode 100644 apps/user_ldap/l10n/ca@valencia.js
 delete mode 100644 apps/user_ldap/l10n/ca@valencia.json
 delete mode 100644 apps/user_ldap/l10n/de_CH.js
 delete mode 100644 apps/user_ldap/l10n/de_CH.json
 delete mode 100644 apps/user_ldap/l10n/en_NZ.js
 delete mode 100644 apps/user_ldap/l10n/en_NZ.json
 delete mode 100644 apps/user_ldap/l10n/es_BO.js
 delete mode 100644 apps/user_ldap/l10n/es_BO.json
 delete mode 100644 apps/user_ldap/l10n/es_CO.js
 delete mode 100644 apps/user_ldap/l10n/es_CO.json
 delete mode 100644 apps/user_ldap/l10n/es_CR.js
 delete mode 100644 apps/user_ldap/l10n/es_CR.json
 delete mode 100644 apps/user_ldap/l10n/es_EC.js
 delete mode 100644 apps/user_ldap/l10n/es_EC.json
 delete mode 100644 apps/user_ldap/l10n/es_PE.js
 delete mode 100644 apps/user_ldap/l10n/es_PE.json
 delete mode 100644 apps/user_ldap/l10n/es_PY.js
 delete mode 100644 apps/user_ldap/l10n/es_PY.json
 delete mode 100644 apps/user_ldap/l10n/es_US.js
 delete mode 100644 apps/user_ldap/l10n/es_US.json
 delete mode 100644 apps/user_ldap/l10n/es_UY.js
 delete mode 100644 apps/user_ldap/l10n/es_UY.json
 delete mode 100644 apps/user_ldap/l10n/eu_ES.js
 delete mode 100644 apps/user_ldap/l10n/eu_ES.json
 delete mode 100644 apps/user_ldap/l10n/fi.js
 delete mode 100644 apps/user_ldap/l10n/fi.json
 delete mode 100644 apps/user_ldap/l10n/fr_CA.js
 delete mode 100644 apps/user_ldap/l10n/fr_CA.json
 delete mode 100644 apps/user_ldap/l10n/hi_IN.js
 delete mode 100644 apps/user_ldap/l10n/hi_IN.json
 delete mode 100644 apps/user_ldap/l10n/sk.js
 delete mode 100644 apps/user_ldap/l10n/sk.json
 delete mode 100644 apps/user_ldap/l10n/ur.js
 delete mode 100644 apps/user_ldap/l10n/ur.json
 delete mode 100644 apps/user_webdavauth/l10n/de_CH.js
 delete mode 100644 apps/user_webdavauth/l10n/de_CH.json
 delete mode 100644 apps/user_webdavauth/l10n/eu_ES.js
 delete mode 100644 apps/user_webdavauth/l10n/eu_ES.json
 delete mode 100644 apps/user_webdavauth/l10n/fi.js
 delete mode 100644 apps/user_webdavauth/l10n/fi.json
 delete mode 100644 apps/user_webdavauth/l10n/sk.js
 delete mode 100644 apps/user_webdavauth/l10n/sk.json
 delete mode 100644 core/l10n/ca@valencia.js
 delete mode 100644 core/l10n/ca@valencia.json
 delete mode 100644 core/l10n/de_CH.js
 delete mode 100644 core/l10n/de_CH.json
 delete mode 100644 core/l10n/en_NZ.js
 delete mode 100644 core/l10n/en_NZ.json
 delete mode 100644 core/l10n/es_BO.js
 delete mode 100644 core/l10n/es_BO.json
 delete mode 100644 core/l10n/es_CO.js
 delete mode 100644 core/l10n/es_CO.json
 delete mode 100644 core/l10n/es_CR.js
 delete mode 100644 core/l10n/es_CR.json
 delete mode 100644 core/l10n/es_EC.js
 delete mode 100644 core/l10n/es_EC.json
 delete mode 100644 core/l10n/es_PE.js
 delete mode 100644 core/l10n/es_PE.json
 delete mode 100644 core/l10n/es_PY.js
 delete mode 100644 core/l10n/es_PY.json
 delete mode 100644 core/l10n/es_US.js
 delete mode 100644 core/l10n/es_US.json
 delete mode 100644 core/l10n/es_UY.js
 delete mode 100644 core/l10n/es_UY.json
 delete mode 100644 core/l10n/eu_ES.js
 delete mode 100644 core/l10n/eu_ES.json
 delete mode 100644 core/l10n/fi.js
 delete mode 100644 core/l10n/fi.json
 delete mode 100644 core/l10n/fr_CA.js
 delete mode 100644 core/l10n/fr_CA.json
 delete mode 100644 core/l10n/hi_IN.js
 delete mode 100644 core/l10n/hi_IN.json
 delete mode 100644 core/l10n/ignorelist
 delete mode 100644 core/l10n/sk.js
 delete mode 100644 core/l10n/sk.json
 delete mode 100644 core/l10n/ur.js
 delete mode 100644 core/l10n/ur.json
 delete mode 100644 lib/l10n/ca@valencia.js
 delete mode 100644 lib/l10n/ca@valencia.json
 delete mode 100644 lib/l10n/de_CH.js
 delete mode 100644 lib/l10n/de_CH.json
 delete mode 100644 lib/l10n/en_NZ.js
 delete mode 100644 lib/l10n/en_NZ.json
 delete mode 100644 lib/l10n/es_BO.js
 delete mode 100644 lib/l10n/es_BO.json
 delete mode 100644 lib/l10n/es_CO.js
 delete mode 100644 lib/l10n/es_CO.json
 delete mode 100644 lib/l10n/es_CR.js
 delete mode 100644 lib/l10n/es_CR.json
 delete mode 100644 lib/l10n/es_EC.js
 delete mode 100644 lib/l10n/es_EC.json
 delete mode 100644 lib/l10n/es_PE.js
 delete mode 100644 lib/l10n/es_PE.json
 delete mode 100644 lib/l10n/es_PY.js
 delete mode 100644 lib/l10n/es_PY.json
 delete mode 100644 lib/l10n/es_US.js
 delete mode 100644 lib/l10n/es_US.json
 delete mode 100644 lib/l10n/es_UY.js
 delete mode 100644 lib/l10n/es_UY.json
 delete mode 100644 lib/l10n/eu_ES.js
 delete mode 100644 lib/l10n/eu_ES.json
 delete mode 100644 lib/l10n/fi.js
 delete mode 100644 lib/l10n/fi.json
 delete mode 100644 lib/l10n/fr_CA.js
 delete mode 100644 lib/l10n/fr_CA.json
 delete mode 100644 lib/l10n/hi_IN.js
 delete mode 100644 lib/l10n/hi_IN.json
 delete mode 100644 lib/l10n/sk.js
 delete mode 100644 lib/l10n/sk.json
 delete mode 100644 lib/l10n/ur.js
 delete mode 100644 lib/l10n/ur.json
 delete mode 100644 settings/l10n/de_CH.js
 delete mode 100644 settings/l10n/de_CH.json
 delete mode 100644 settings/l10n/eu_ES.js
 delete mode 100644 settings/l10n/eu_ES.json
 delete mode 100644 settings/l10n/fi.js
 delete mode 100644 settings/l10n/fi.json
 delete mode 100644 settings/l10n/sk.js
 delete mode 100644 settings/l10n/sk.json
 delete mode 100644 settings/l10n/ur.js
 delete mode 100644 settings/l10n/ur.json

diff --git a/apps/files/l10n/af.js b/apps/files/l10n/af.js
deleted file mode 100644
index 5bdf101699a..00000000000
--- a/apps/files/l10n/af.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : "[ ,]",
-    "_%n file_::_%n files_" : "[ ,]",
-    "_Uploading %n file_::_Uploading %n files_" : "[ ,]"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/af.json b/apps/files/l10n/af.json
deleted file mode 100644
index 26e5833738b..00000000000
--- a/apps/files/l10n/af.json
+++ /dev/null
@@ -1 +0,0 @@
-{"translations":{"_%n folder_::_%n folders_":["",""],"_%n file_::_%n files_":["",""],"_Uploading %n file_::_Uploading %n files_":["",""]},"pluralForm":"nplurals=2; plural=(n != 1);"}
\ No newline at end of file
diff --git a/apps/files/l10n/ca@valencia.js b/apps/files/l10n/ca@valencia.js
deleted file mode 100644
index 7988332fa91..00000000000
--- a/apps/files/l10n/ca@valencia.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ca@valencia.json b/apps/files/l10n/ca@valencia.json
deleted file mode 100644
index ef5fc586755..00000000000
--- a/apps/files/l10n/ca@valencia.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/de_CH.js b/apps/files/l10n/de_CH.js
deleted file mode 100644
index 7bccd435300..00000000000
--- a/apps/files/l10n/de_CH.js
+++ /dev/null
@@ -1,56 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Unknown error" : "Unbekannter Fehler",
-    "Could not move %s - File with this name already exists" : "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
-    "Could not move %s" : "Konnte %s nicht verschieben",
-    "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
-    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.",
-    "Unable to set upload directory." : "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
-    "Invalid Token" : "Ungültiges Merkmal",
-    "No file was uploaded. Unknown error" : "Keine Datei hochgeladen. Unbekannter Fehler",
-    "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist grösser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
-    "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden",
-    "No file was uploaded" : "Keine Datei konnte übertragen werden.",
-    "Missing a temporary folder" : "Kein temporärer Ordner vorhanden",
-    "Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte",
-    "Not enough storage available" : "Nicht genug Speicher vorhanden.",
-    "Invalid directory." : "Ungültiges Verzeichnis.",
-    "Files" : "Dateien",
-    "Upload cancelled." : "Upload abgebrochen.",
-    "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Share" : "Teilen",
-    "Delete" : "Löschen",
-    "Unshare" : "Teilung aufheben",
-    "Delete permanently" : "Endgültig löschen",
-    "Rename" : "Umbenennen",
-    "Pending" : "Ausstehend",
-    "Error" : "Fehler",
-    "Name" : "Name",
-    "Size" : "Grösse",
-    "Modified" : "Geändert",
-    "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
-    "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
-    "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
-    "%s could not be renamed" : "%s konnte nicht umbenannt werden",
-    "File handling" : "Dateibehandlung",
-    "Maximum upload size" : "Maximale Upload-Grösse",
-    "max. possible: " : "maximal möglich:",
-    "Save" : "Speichern",
-    "WebDAV" : "WebDAV",
-    "New" : "Neu",
-    "Text file" : "Textdatei",
-    "New folder" : "Neues Verzeichnis",
-    "Folder" : "Ordner",
-    "From link" : "Von einem Link",
-    "Nothing in here. Upload something!" : "Alles leer. Laden Sie etwas hoch!",
-    "Download" : "Herunterladen",
-    "Upload too large" : "Der Upload ist zu gross",
-    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.",
-    "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/de_CH.json b/apps/files/l10n/de_CH.json
deleted file mode 100644
index c7a64d52c87..00000000000
--- a/apps/files/l10n/de_CH.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{ "translations": {
-    "Unknown error" : "Unbekannter Fehler",
-    "Could not move %s - File with this name already exists" : "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
-    "Could not move %s" : "Konnte %s nicht verschieben",
-    "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
-    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.",
-    "Unable to set upload directory." : "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
-    "Invalid Token" : "Ungültiges Merkmal",
-    "No file was uploaded. Unknown error" : "Keine Datei hochgeladen. Unbekannter Fehler",
-    "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist grösser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
-    "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden",
-    "No file was uploaded" : "Keine Datei konnte übertragen werden.",
-    "Missing a temporary folder" : "Kein temporärer Ordner vorhanden",
-    "Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte",
-    "Not enough storage available" : "Nicht genug Speicher vorhanden.",
-    "Invalid directory." : "Ungültiges Verzeichnis.",
-    "Files" : "Dateien",
-    "Upload cancelled." : "Upload abgebrochen.",
-    "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Share" : "Teilen",
-    "Delete" : "Löschen",
-    "Unshare" : "Teilung aufheben",
-    "Delete permanently" : "Endgültig löschen",
-    "Rename" : "Umbenennen",
-    "Pending" : "Ausstehend",
-    "Error" : "Fehler",
-    "Name" : "Name",
-    "Size" : "Grösse",
-    "Modified" : "Geändert",
-    "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
-    "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
-    "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
-    "%s could not be renamed" : "%s konnte nicht umbenannt werden",
-    "File handling" : "Dateibehandlung",
-    "Maximum upload size" : "Maximale Upload-Grösse",
-    "max. possible: " : "maximal möglich:",
-    "Save" : "Speichern",
-    "WebDAV" : "WebDAV",
-    "New" : "Neu",
-    "Text file" : "Textdatei",
-    "New folder" : "Neues Verzeichnis",
-    "Folder" : "Ordner",
-    "From link" : "Von einem Link",
-    "Nothing in here. Upload something!" : "Alles leer. Laden Sie etwas hoch!",
-    "Download" : "Herunterladen",
-    "Upload too large" : "Der Upload ist zu gross",
-    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.",
-    "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/en_NZ.js b/apps/files/l10n/en_NZ.js
deleted file mode 100644
index 7988332fa91..00000000000
--- a/apps/files/l10n/en_NZ.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/en_NZ.json b/apps/files/l10n/en_NZ.json
deleted file mode 100644
index ef5fc586755..00000000000
--- a/apps/files/l10n/en_NZ.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_BO.js b/apps/files/l10n/es_BO.js
deleted file mode 100644
index 7988332fa91..00000000000
--- a/apps/files/l10n/es_BO.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_BO.json b/apps/files/l10n/es_BO.json
deleted file mode 100644
index ef5fc586755..00000000000
--- a/apps/files/l10n/es_BO.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_CO.js b/apps/files/l10n/es_CO.js
deleted file mode 100644
index 7988332fa91..00000000000
--- a/apps/files/l10n/es_CO.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_CO.json b/apps/files/l10n/es_CO.json
deleted file mode 100644
index ef5fc586755..00000000000
--- a/apps/files/l10n/es_CO.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_CR.js b/apps/files/l10n/es_CR.js
deleted file mode 100644
index db0f96010ee..00000000000
--- a/apps/files/l10n/es_CR.js
+++ /dev/null
@@ -1,19 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Files" : "Archivos",
-    "A new file or folder has been <strong>created</strong>" : "Un nuevo archivo o carpeta ha sido <strong>creado</strong>",
-    "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>cambiado</strong>",
-    "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
-    "A file or folder has been <strong>restored</strong>" : "Un archivo o carpeta ha sido <strong>restaurado</strong>",
-    "You created %1$s" : "Usted creó %1$s",
-    "%2$s created %1$s" : "%2$s creó %1$s",
-    "%1$s was created in a public folder" : "%1$s fue creado en un folder público",
-    "You changed %1$s" : "Usted cambió %1$s",
-    "%2$s changed %1$s" : "%2$s cambió %1$s",
-    "You deleted %1$s" : "Usted eliminó %1$s",
-    "%2$s deleted %1$s" : "%2$s eliminó %1$s",
-    "You restored %1$s" : "Usted restauró %1$s",
-    "%2$s restored %1$s" : "%2$s restauró %1$s"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_CR.json b/apps/files/l10n/es_CR.json
deleted file mode 100644
index 506baf10fb6..00000000000
--- a/apps/files/l10n/es_CR.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{ "translations": {
-    "Files" : "Archivos",
-    "A new file or folder has been <strong>created</strong>" : "Un nuevo archivo o carpeta ha sido <strong>creado</strong>",
-    "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>cambiado</strong>",
-    "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
-    "A file or folder has been <strong>restored</strong>" : "Un archivo o carpeta ha sido <strong>restaurado</strong>",
-    "You created %1$s" : "Usted creó %1$s",
-    "%2$s created %1$s" : "%2$s creó %1$s",
-    "%1$s was created in a public folder" : "%1$s fue creado en un folder público",
-    "You changed %1$s" : "Usted cambió %1$s",
-    "%2$s changed %1$s" : "%2$s cambió %1$s",
-    "You deleted %1$s" : "Usted eliminó %1$s",
-    "%2$s deleted %1$s" : "%2$s eliminó %1$s",
-    "You restored %1$s" : "Usted restauró %1$s",
-    "%2$s restored %1$s" : "%2$s restauró %1$s"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_EC.js b/apps/files/l10n/es_EC.js
deleted file mode 100644
index 7988332fa91..00000000000
--- a/apps/files/l10n/es_EC.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_EC.json b/apps/files/l10n/es_EC.json
deleted file mode 100644
index ef5fc586755..00000000000
--- a/apps/files/l10n/es_EC.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_PE.js b/apps/files/l10n/es_PE.js
deleted file mode 100644
index 7988332fa91..00000000000
--- a/apps/files/l10n/es_PE.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_PE.json b/apps/files/l10n/es_PE.json
deleted file mode 100644
index ef5fc586755..00000000000
--- a/apps/files/l10n/es_PE.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_PY.js b/apps/files/l10n/es_PY.js
deleted file mode 100644
index 2cfff7608e5..00000000000
--- a/apps/files/l10n/es_PY.js
+++ /dev/null
@@ -1,19 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Files" : "Archivos",
-    "A new file or folder has been <strong>created</strong>" : "Ha sido <strong>creado</strong> un nuevo archivo o carpeta",
-    "A file or folder has been <strong>changed</strong>" : "Ha sido <strong>modificado</strong> un archivo o carpeta",
-    "A file or folder has been <strong>deleted</strong>" : "Ha sido <strong>eliminado</strong> un archivo o carpeta",
-    "A file or folder has been <strong>restored</strong>" : "Se ha <strong>recuperado</strong> un archivo o carpeta",
-    "You created %1$s" : "Ha creado %1$s",
-    "%2$s created %1$s" : "%2$s ha creado %1$s",
-    "%1$s was created in a public folder" : "%1$s ha sido creado en una carpeta pública",
-    "You changed %1$s" : "Ha modificado %1$s",
-    "%2$s changed %1$s" : "%2$s ha modificado %1$s",
-    "You deleted %1$s" : "Usted ha eliminado %1$s",
-    "%2$s deleted %1$s" : "%2$s ha eliminado %1$s",
-    "You restored %1$s" : "Ha recuperado %1$s",
-    "%2$s restored %1$s" : "%2$s ha recuperado %1$s"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_PY.json b/apps/files/l10n/es_PY.json
deleted file mode 100644
index 37392794692..00000000000
--- a/apps/files/l10n/es_PY.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{ "translations": {
-    "Files" : "Archivos",
-    "A new file or folder has been <strong>created</strong>" : "Ha sido <strong>creado</strong> un nuevo archivo o carpeta",
-    "A file or folder has been <strong>changed</strong>" : "Ha sido <strong>modificado</strong> un archivo o carpeta",
-    "A file or folder has been <strong>deleted</strong>" : "Ha sido <strong>eliminado</strong> un archivo o carpeta",
-    "A file or folder has been <strong>restored</strong>" : "Se ha <strong>recuperado</strong> un archivo o carpeta",
-    "You created %1$s" : "Ha creado %1$s",
-    "%2$s created %1$s" : "%2$s ha creado %1$s",
-    "%1$s was created in a public folder" : "%1$s ha sido creado en una carpeta pública",
-    "You changed %1$s" : "Ha modificado %1$s",
-    "%2$s changed %1$s" : "%2$s ha modificado %1$s",
-    "You deleted %1$s" : "Usted ha eliminado %1$s",
-    "%2$s deleted %1$s" : "%2$s ha eliminado %1$s",
-    "You restored %1$s" : "Ha recuperado %1$s",
-    "%2$s restored %1$s" : "%2$s ha recuperado %1$s"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_US.js b/apps/files/l10n/es_US.js
deleted file mode 100644
index 7988332fa91..00000000000
--- a/apps/files/l10n/es_US.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_US.json b/apps/files/l10n/es_US.json
deleted file mode 100644
index ef5fc586755..00000000000
--- a/apps/files/l10n/es_US.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_UY.js b/apps/files/l10n/es_UY.js
deleted file mode 100644
index 7988332fa91..00000000000
--- a/apps/files/l10n/es_UY.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_UY.json b/apps/files/l10n/es_UY.json
deleted file mode 100644
index ef5fc586755..00000000000
--- a/apps/files/l10n/es_UY.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/eu_ES.js b/apps/files/l10n/eu_ES.js
deleted file mode 100644
index ed4c18dac7e..00000000000
--- a/apps/files/l10n/eu_ES.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Delete" : "Ezabatu",
-    "Save" : "Gorde",
-    "Download" : "Deskargatu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/eu_ES.json b/apps/files/l10n/eu_ES.json
deleted file mode 100644
index 6e8c511d42a..00000000000
--- a/apps/files/l10n/eu_ES.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Delete" : "Ezabatu",
-    "Save" : "Gorde",
-    "Download" : "Deskargatu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/fi.js b/apps/files/l10n/fi.js
deleted file mode 100644
index 8733d6b1798..00000000000
--- a/apps/files/l10n/fi.js
+++ /dev/null
@@ -1,14 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Rename" : "Nimeä uudelleen",
-    "Delete" : "Poista",
-    "Error" : "Virhe",
-    "Favorite" : "Suosikit",
-    "Save" : "Tallenna",
-    "Settings" : "Asetukset",
-    "New folder" : "Luo kansio",
-    "Folder" : "Kansio",
-    "Upload" : "Lähetä"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/fi.json b/apps/files/l10n/fi.json
deleted file mode 100644
index 4a78a83735a..00000000000
--- a/apps/files/l10n/fi.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{ "translations": {
-    "Rename" : "Nimeä uudelleen",
-    "Delete" : "Poista",
-    "Error" : "Virhe",
-    "Favorite" : "Suosikit",
-    "Save" : "Tallenna",
-    "Settings" : "Asetukset",
-    "New folder" : "Luo kansio",
-    "Folder" : "Kansio",
-    "Upload" : "Lähetä"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/fr_CA.js b/apps/files/l10n/fr_CA.js
deleted file mode 100644
index c50be1aa479..00000000000
--- a/apps/files/l10n/fr_CA.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/files/l10n/fr_CA.json b/apps/files/l10n/fr_CA.json
deleted file mode 100644
index 210ac153bab..00000000000
--- a/apps/files/l10n/fr_CA.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/hi_IN.js b/apps/files/l10n/hi_IN.js
deleted file mode 100644
index 329844854f1..00000000000
--- a/apps/files/l10n/hi_IN.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/hi_IN.json b/apps/files/l10n/hi_IN.json
deleted file mode 100644
index 37156658a86..00000000000
--- a/apps/files/l10n/hi_IN.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/sk.js b/apps/files/l10n/sk.js
deleted file mode 100644
index 47af64a4937..00000000000
--- a/apps/files/l10n/sk.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Share" : "Zdieľať",
-    "Delete" : "Odstrániť",
-    "Save" : "Uložiť",
-    "Download" : "Stiahnuť"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files/l10n/sk.json b/apps/files/l10n/sk.json
deleted file mode 100644
index a61d2917bc9..00000000000
--- a/apps/files/l10n/sk.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Share" : "Zdieľať",
-    "Delete" : "Odstrániť",
-    "Save" : "Uložiť",
-    "Download" : "Stiahnuť"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/ur.js b/apps/files/l10n/ur.js
deleted file mode 100644
index 87ed21fd6c7..00000000000
--- a/apps/files/l10n/ur.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ur.json b/apps/files/l10n/ur.json
deleted file mode 100644
index 1c1fc3d16c1..00000000000
--- a/apps/files/l10n/ur.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_external/l10n/de_CH.js b/apps/files_external/l10n/de_CH.js
deleted file mode 100644
index b0039573097..00000000000
--- a/apps/files_external/l10n/de_CH.js
+++ /dev/null
@@ -1,28 +0,0 @@
-OC.L10N.register(
-    "files_external",
-    {
-    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
-    "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Port" : "Port",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Share" : "Freigeben",
-    "URL" : "URL",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
-    "Personal" : "Persönlich",
-    "Saved" : "Gespeichert",
-    "Name" : "Name",
-    "External Storage" : "Externer Speicher",
-    "Folder name" : "Ordnername",
-    "Configuration" : "Konfiguration",
-    "Add storage" : "Speicher hinzufügen",
-    "Delete" : "Löschen",
-    "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/de_CH.json b/apps/files_external/l10n/de_CH.json
deleted file mode 100644
index 955fae07f5b..00000000000
--- a/apps/files_external/l10n/de_CH.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{ "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
-    "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Port" : "Port",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Share" : "Freigeben",
-    "URL" : "URL",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
-    "Personal" : "Persönlich",
-    "Saved" : "Gespeichert",
-    "Name" : "Name",
-    "External Storage" : "Externer Speicher",
-    "Folder name" : "Ordnername",
-    "Configuration" : "Konfiguration",
-    "Add storage" : "Speicher hinzufügen",
-    "Delete" : "Löschen",
-    "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_external/l10n/eu_ES.js b/apps/files_external/l10n/eu_ES.js
deleted file mode 100644
index 513edcb534e..00000000000
--- a/apps/files_external/l10n/eu_ES.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "files_external",
-    {
-    "Location" : "kokapena",
-    "Personal" : "Pertsonala",
-    "Delete" : "Ezabatu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/eu_ES.json b/apps/files_external/l10n/eu_ES.json
deleted file mode 100644
index 149a30d1a7e..00000000000
--- a/apps/files_external/l10n/eu_ES.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Location" : "kokapena",
-    "Personal" : "Pertsonala",
-    "Delete" : "Ezabatu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_external/l10n/fi.js b/apps/files_external/l10n/fi.js
deleted file mode 100644
index eaa9b89fc04..00000000000
--- a/apps/files_external/l10n/fi.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_external",
-    {
-    "Username" : "Käyttäjätunnus",
-    "Password" : "Salasana",
-    "URL" : "URL",
-    "Delete" : "Poista"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/fi.json b/apps/files_external/l10n/fi.json
deleted file mode 100644
index 8a702552ca1..00000000000
--- a/apps/files_external/l10n/fi.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Username" : "Käyttäjätunnus",
-    "Password" : "Salasana",
-    "URL" : "URL",
-    "Delete" : "Poista"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_external/l10n/sk.js b/apps/files_external/l10n/sk.js
deleted file mode 100644
index edae863703d..00000000000
--- a/apps/files_external/l10n/sk.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_external",
-    {
-    "Location" : "Poloha",
-    "Share" : "Zdieľať",
-    "Personal" : "Osobné",
-    "Delete" : "Odstrániť"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_external/l10n/sk.json b/apps/files_external/l10n/sk.json
deleted file mode 100644
index 4d6a95caf3c..00000000000
--- a/apps/files_external/l10n/sk.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Location" : "Poloha",
-    "Share" : "Zdieľať",
-    "Personal" : "Osobné",
-    "Delete" : "Odstrániť"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de_CH.js b/apps/files_sharing/l10n/de_CH.js
deleted file mode 100644
index 2cdb3d47c69..00000000000
--- a/apps/files_sharing/l10n/de_CH.js
+++ /dev/null
@@ -1,17 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "Cancel" : "Abbrechen",
-    "Shared by" : "Geteilt von",
-    "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
-    "Password" : "Passwort",
-    "Name" : "Name",
-    "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
-    "Reasons might be:" : "Gründe könnten sein:",
-    "the item was removed" : "Das Element wurde entfernt",
-    "the link expired" : "Der Link ist abgelaufen",
-    "sharing is disabled" : "Teilen ist deaktiviert",
-    "For more info, please ask the person who sent this link." : "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
-    "Download" : "Herunterladen"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_CH.json b/apps/files_sharing/l10n/de_CH.json
deleted file mode 100644
index a161e06bae8..00000000000
--- a/apps/files_sharing/l10n/de_CH.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{ "translations": {
-    "Cancel" : "Abbrechen",
-    "Shared by" : "Geteilt von",
-    "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
-    "Password" : "Passwort",
-    "Name" : "Name",
-    "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
-    "Reasons might be:" : "Gründe könnten sein:",
-    "the item was removed" : "Das Element wurde entfernt",
-    "the link expired" : "Der Link ist abgelaufen",
-    "sharing is disabled" : "Teilen ist deaktiviert",
-    "For more info, please ask the person who sent this link." : "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
-    "Download" : "Herunterladen"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/es_CR.js b/apps/files_sharing/l10n/es_CR.js
deleted file mode 100644
index 38387ee8608..00000000000
--- a/apps/files_sharing/l10n/es_CR.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta has sido <strong>compartido</strong>",
-    "You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
-    "You shared %1$s with group %2$s" : "Usted compartió %1$s con el grupo %2$s",
-    "%2$s shared %1$s with you" : "%2$s compartió %1$s con usted",
-    "You shared %1$s via link" : "Usted compartió %1$s con un vínculo",
-    "Shares" : "Compartidos"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es_CR.json b/apps/files_sharing/l10n/es_CR.json
deleted file mode 100644
index 6a92ddc55b4..00000000000
--- a/apps/files_sharing/l10n/es_CR.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta has sido <strong>compartido</strong>",
-    "You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
-    "You shared %1$s with group %2$s" : "Usted compartió %1$s con el grupo %2$s",
-    "%2$s shared %1$s with you" : "%2$s compartió %1$s con usted",
-    "You shared %1$s via link" : "Usted compartió %1$s con un vínculo",
-    "Shares" : "Compartidos"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/es_PY.js b/apps/files_sharing/l10n/es_PY.js
deleted file mode 100644
index ca83052f991..00000000000
--- a/apps/files_sharing/l10n/es_PY.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "A file or folder has been <strong>shared</strong>" : "Se ha <strong>compartido</strong> un archivo o carpeta",
-    "You shared %1$s with %2$s" : "Ha compartido %1$s con %2$s",
-    "You shared %1$s with group %2$s" : "Ha compartido %1$s con el grupo %2$s",
-    "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con tigo",
-    "You shared %1$s via link" : "Ha compartido %1$s via enlace",
-    "Shares" : "Compartidos"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es_PY.json b/apps/files_sharing/l10n/es_PY.json
deleted file mode 100644
index ca21de5caaf..00000000000
--- a/apps/files_sharing/l10n/es_PY.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "A file or folder has been <strong>shared</strong>" : "Se ha <strong>compartido</strong> un archivo o carpeta",
-    "You shared %1$s with %2$s" : "Ha compartido %1$s con %2$s",
-    "You shared %1$s with group %2$s" : "Ha compartido %1$s con el grupo %2$s",
-    "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con tigo",
-    "You shared %1$s via link" : "Ha compartido %1$s via enlace",
-    "Shares" : "Compartidos"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/eu_ES.js b/apps/files_sharing/l10n/eu_ES.js
deleted file mode 100644
index 240f0181559..00000000000
--- a/apps/files_sharing/l10n/eu_ES.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "Cancel" : "Ezeztatu",
-    "Download" : "Deskargatu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/eu_ES.json b/apps/files_sharing/l10n/eu_ES.json
deleted file mode 100644
index 9adbb2b8185..00000000000
--- a/apps/files_sharing/l10n/eu_ES.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Cancel" : "Ezeztatu",
-    "Download" : "Deskargatu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fi.js b/apps/files_sharing/l10n/fi.js
deleted file mode 100644
index 1f1bf5377b3..00000000000
--- a/apps/files_sharing/l10n/fi.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "Cancel" : "Peruuta",
-    "Password" : "Salasana"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/fi.json b/apps/files_sharing/l10n/fi.json
deleted file mode 100644
index a80ddde0fed..00000000000
--- a/apps/files_sharing/l10n/fi.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Cancel" : "Peruuta",
-    "Password" : "Salasana"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sk.js b/apps/files_sharing/l10n/sk.js
deleted file mode 100644
index aa385851497..00000000000
--- a/apps/files_sharing/l10n/sk.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "Cancel" : "Zrušiť",
-    "Download" : "Stiahnuť"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_sharing/l10n/sk.json b/apps/files_sharing/l10n/sk.json
deleted file mode 100644
index 65bbffa4191..00000000000
--- a/apps/files_sharing/l10n/sk.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Cancel" : "Zrušiť",
-    "Download" : "Stiahnuť"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/de_CH.js b/apps/files_trashbin/l10n/de_CH.js
deleted file mode 100644
index 70a428d4c93..00000000000
--- a/apps/files_trashbin/l10n/de_CH.js
+++ /dev/null
@@ -1,15 +0,0 @@
-OC.L10N.register(
-    "files_trashbin",
-    {
-    "Couldn't delete %s permanently" : "Konnte %s nicht dauerhaft löschen",
-    "Couldn't restore %s" : "Konnte %s nicht wiederherstellen",
-    "Deleted files" : "Gelöschte Dateien",
-    "Restore" : "Wiederherstellen",
-    "Error" : "Fehler",
-    "restored" : "Wiederhergestellt",
-    "Nothing in here. Your trash bin is empty!" : "Nichts zu löschen, Ihr Papierkorb ist leer!",
-    "Name" : "Name",
-    "Deleted" : "Gelöscht",
-    "Delete" : "Löschen"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/de_CH.json b/apps/files_trashbin/l10n/de_CH.json
deleted file mode 100644
index 497b6c35d55..00000000000
--- a/apps/files_trashbin/l10n/de_CH.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{ "translations": {
-    "Couldn't delete %s permanently" : "Konnte %s nicht dauerhaft löschen",
-    "Couldn't restore %s" : "Konnte %s nicht wiederherstellen",
-    "Deleted files" : "Gelöschte Dateien",
-    "Restore" : "Wiederherstellen",
-    "Error" : "Fehler",
-    "restored" : "Wiederhergestellt",
-    "Nothing in here. Your trash bin is empty!" : "Nichts zu löschen, Ihr Papierkorb ist leer!",
-    "Name" : "Name",
-    "Deleted" : "Gelöscht",
-    "Delete" : "Löschen"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/eu_ES.js b/apps/files_trashbin/l10n/eu_ES.js
deleted file mode 100644
index 8e988be3bf6..00000000000
--- a/apps/files_trashbin/l10n/eu_ES.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "files_trashbin",
-    {
-    "Delete" : "Ezabatu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/eu_ES.json b/apps/files_trashbin/l10n/eu_ES.json
deleted file mode 100644
index 14a2375ad60..00000000000
--- a/apps/files_trashbin/l10n/eu_ES.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Delete" : "Ezabatu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/fi.js b/apps/files_trashbin/l10n/fi.js
deleted file mode 100644
index e3b5a93ead8..00000000000
--- a/apps/files_trashbin/l10n/fi.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "files_trashbin",
-    {
-    "Error" : "Virhe",
-    "Delete" : "Poista"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/fi.json b/apps/files_trashbin/l10n/fi.json
deleted file mode 100644
index 639a5749f28..00000000000
--- a/apps/files_trashbin/l10n/fi.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Error" : "Virhe",
-    "Delete" : "Poista"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/sk.js b/apps/files_trashbin/l10n/sk.js
deleted file mode 100644
index 1b73b5f3afa..00000000000
--- a/apps/files_trashbin/l10n/sk.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "files_trashbin",
-    {
-    "Delete" : "Odstrániť"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_trashbin/l10n/sk.json b/apps/files_trashbin/l10n/sk.json
deleted file mode 100644
index 418f8874a6f..00000000000
--- a/apps/files_trashbin/l10n/sk.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Delete" : "Odstrániť"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ur.js b/apps/files_trashbin/l10n/ur.js
deleted file mode 100644
index cfdfd802748..00000000000
--- a/apps/files_trashbin/l10n/ur.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "files_trashbin",
-    {
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/ur.json b/apps/files_trashbin/l10n/ur.json
deleted file mode 100644
index 1c1fc3d16c1..00000000000
--- a/apps/files_trashbin/l10n/ur.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/de_CH.js b/apps/files_versions/l10n/de_CH.js
deleted file mode 100644
index 9e970501fb7..00000000000
--- a/apps/files_versions/l10n/de_CH.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Could not revert: %s" : "Konnte %s nicht zurücksetzen",
-    "Versions" : "Versionen",
-    "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgänging machen.",
-    "More versions..." : "Mehrere Versionen...",
-    "No other versions available" : "Keine anderen Versionen verfügbar",
-    "Restore" : "Wiederherstellen"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/de_CH.json b/apps/files_versions/l10n/de_CH.json
deleted file mode 100644
index 8d4b76f8c2c..00000000000
--- a/apps/files_versions/l10n/de_CH.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "Could not revert: %s" : "Konnte %s nicht zurücksetzen",
-    "Versions" : "Versionen",
-    "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgänging machen.",
-    "More versions..." : "Mehrere Versionen...",
-    "No other versions available" : "Keine anderen Versionen verfügbar",
-    "Restore" : "Wiederherstellen"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ca@valencia.js b/apps/user_ldap/l10n/ca@valencia.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/ca@valencia.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ca@valencia.json b/apps/user_ldap/l10n/ca@valencia.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/ca@valencia.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/de_CH.js b/apps/user_ldap/l10n/de_CH.js
deleted file mode 100644
index 2145f0d05ec..00000000000
--- a/apps/user_ldap/l10n/de_CH.js
+++ /dev/null
@@ -1,80 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Failed to clear the mappings." : "Löschen der Zuordnung fehlgeschlagen.",
-    "Failed to delete the server configuration" : "Löschen der Serverkonfiguration fehlgeschlagen",
-    "The configuration is valid and the connection could be established!" : "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "Cannot add server configuration" : "Das Hinzufügen der Serverkonfiguration schlug fehl",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Select groups" : "Wähle Gruppen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
-    "Do you really want to delete the current Server Configuration?" : "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
-    "Confirm Deletion" : "Löschung bestätigen",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
-    "Test Configuration" : "Testkonfiguration",
-    "Help" : "Hilfe",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Host" : "Host",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, ausser wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
-    "Port" : "Port",
-    "User DN" : "Benutzer-DN",
-    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
-    "Password" : "Passwort",
-    "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
-    "One Base DN per line" : "Ein Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren",
-    "Advanced" : "Erweitert",
-    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
-    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
-    "Connection Settings" : "Verbindungseinstellungen",
-    "Configuration Active" : "Konfiguration aktiv",
-    "When unchecked, this configuration will be skipped." : "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
-    "Backup (Replica) Host" : "Backup Host (Kopie)",
-    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
-    "Backup (Replica) Port" : "Backup Port",
-    "Disable Main Server" : "Hauptserver deaktivieren",
-    "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.",
-    "Turn off SSL certificate validation." : "Schalten Sie die SSL-Zertifikatsprüfung aus.",
-    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
-    "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
-    "in seconds. A change empties the cache." : "in Sekunden. Eine Änderung leert den Cache.",
-    "Directory Settings" : "Ordnereinstellungen",
-    "User Display Name Field" : "Feld für den Anzeigenamen des Benutzers",
-    "The LDAP attribute to use to generate the user's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.",
-    "Base User Tree" : "Basis-Benutzerbaum",
-    "One User Base DN per line" : "Ein Benutzer Basis-DN pro Zeile",
-    "User Search Attributes" : "Benutzersucheigenschaften",
-    "Optional; one attribute per line" : "Optional; ein Attribut pro Zeile",
-    "Group Display Name Field" : "Feld für den Anzeigenamen der Gruppe",
-    "The LDAP attribute to use to generate the groups's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.",
-    "Base Group Tree" : "Basis-Gruppenbaum",
-    "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile",
-    "Group Search Attributes" : "Gruppensucheigenschaften",
-    "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer",
-    "Special Attributes" : "Spezielle Eigenschaften",
-    "Quota Field" : "Kontingent-Feld",
-    "Quota Default" : "Standard-Kontingent",
-    "in bytes" : "in Bytes",
-    "Email Field" : "E-Mail-Feld",
-    "User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
-    "Internal Username" : "Interner Benutzername",
-    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
-    "Internal Username Attribute:" : "Interne Eigenschaften des Benutzers:",
-    "Override UUID detection" : "UUID-Erkennung überschreiben",
-    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
-    "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
-    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
-    "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
-    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/de_CH.json b/apps/user_ldap/l10n/de_CH.json
deleted file mode 100644
index b68fa0b2345..00000000000
--- a/apps/user_ldap/l10n/de_CH.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{ "translations": {
-    "Failed to clear the mappings." : "Löschen der Zuordnung fehlgeschlagen.",
-    "Failed to delete the server configuration" : "Löschen der Serverkonfiguration fehlgeschlagen",
-    "The configuration is valid and the connection could be established!" : "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "Cannot add server configuration" : "Das Hinzufügen der Serverkonfiguration schlug fehl",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Select groups" : "Wähle Gruppen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
-    "Do you really want to delete the current Server Configuration?" : "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
-    "Confirm Deletion" : "Löschung bestätigen",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
-    "Test Configuration" : "Testkonfiguration",
-    "Help" : "Hilfe",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Host" : "Host",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, ausser wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
-    "Port" : "Port",
-    "User DN" : "Benutzer-DN",
-    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
-    "Password" : "Passwort",
-    "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
-    "One Base DN per line" : "Ein Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren",
-    "Advanced" : "Erweitert",
-    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
-    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
-    "Connection Settings" : "Verbindungseinstellungen",
-    "Configuration Active" : "Konfiguration aktiv",
-    "When unchecked, this configuration will be skipped." : "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
-    "Backup (Replica) Host" : "Backup Host (Kopie)",
-    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
-    "Backup (Replica) Port" : "Backup Port",
-    "Disable Main Server" : "Hauptserver deaktivieren",
-    "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.",
-    "Turn off SSL certificate validation." : "Schalten Sie die SSL-Zertifikatsprüfung aus.",
-    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
-    "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
-    "in seconds. A change empties the cache." : "in Sekunden. Eine Änderung leert den Cache.",
-    "Directory Settings" : "Ordnereinstellungen",
-    "User Display Name Field" : "Feld für den Anzeigenamen des Benutzers",
-    "The LDAP attribute to use to generate the user's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.",
-    "Base User Tree" : "Basis-Benutzerbaum",
-    "One User Base DN per line" : "Ein Benutzer Basis-DN pro Zeile",
-    "User Search Attributes" : "Benutzersucheigenschaften",
-    "Optional; one attribute per line" : "Optional; ein Attribut pro Zeile",
-    "Group Display Name Field" : "Feld für den Anzeigenamen der Gruppe",
-    "The LDAP attribute to use to generate the groups's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.",
-    "Base Group Tree" : "Basis-Gruppenbaum",
-    "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile",
-    "Group Search Attributes" : "Gruppensucheigenschaften",
-    "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer",
-    "Special Attributes" : "Spezielle Eigenschaften",
-    "Quota Field" : "Kontingent-Feld",
-    "Quota Default" : "Standard-Kontingent",
-    "in bytes" : "in Bytes",
-    "Email Field" : "E-Mail-Feld",
-    "User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
-    "Internal Username" : "Interner Benutzername",
-    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
-    "Internal Username Attribute:" : "Interne Eigenschaften des Benutzers:",
-    "Override UUID detection" : "UUID-Erkennung überschreiben",
-    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
-    "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
-    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
-    "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
-    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/en_NZ.js b/apps/user_ldap/l10n/en_NZ.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/en_NZ.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/en_NZ.json b/apps/user_ldap/l10n/en_NZ.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/en_NZ.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_BO.js b/apps/user_ldap/l10n/es_BO.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/es_BO.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_BO.json b/apps/user_ldap/l10n/es_BO.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/es_BO.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_CO.js b/apps/user_ldap/l10n/es_CO.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/es_CO.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_CO.json b/apps/user_ldap/l10n/es_CO.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/es_CO.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_CR.js b/apps/user_ldap/l10n/es_CR.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/es_CR.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_CR.json b/apps/user_ldap/l10n/es_CR.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/es_CR.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_EC.js b/apps/user_ldap/l10n/es_EC.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/es_EC.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_EC.json b/apps/user_ldap/l10n/es_EC.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/es_EC.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_PE.js b/apps/user_ldap/l10n/es_PE.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/es_PE.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_PE.json b/apps/user_ldap/l10n/es_PE.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/es_PE.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_PY.js b/apps/user_ldap/l10n/es_PY.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/es_PY.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_PY.json b/apps/user_ldap/l10n/es_PY.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/es_PY.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_US.js b/apps/user_ldap/l10n/es_US.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/es_US.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_US.json b/apps/user_ldap/l10n/es_US.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/es_US.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_UY.js b/apps/user_ldap/l10n/es_UY.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/es_UY.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_UY.json b/apps/user_ldap/l10n/es_UY.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/es_UY.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/eu_ES.js b/apps/user_ldap/l10n/eu_ES.js
deleted file mode 100644
index e2907d44953..00000000000
--- a/apps/user_ldap/l10n/eu_ES.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Save" : "Gorde"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/eu_ES.json b/apps/user_ldap/l10n/eu_ES.json
deleted file mode 100644
index 7a78f4becee..00000000000
--- a/apps/user_ldap/l10n/eu_ES.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Gorde"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fi.js b/apps/user_ldap/l10n/fi.js
deleted file mode 100644
index 7e8944002b2..00000000000
--- a/apps/user_ldap/l10n/fi.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Error" : "Virhe",
-    "Server" : "Palvelin",
-    "Save" : "Tallenna",
-    "Help" : "Apua",
-    "Password" : "Salasana",
-    "Back" : "Takaisin"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/fi.json b/apps/user_ldap/l10n/fi.json
deleted file mode 100644
index 7b82cac2bd2..00000000000
--- a/apps/user_ldap/l10n/fi.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "Error" : "Virhe",
-    "Server" : "Palvelin",
-    "Save" : "Tallenna",
-    "Help" : "Apua",
-    "Password" : "Salasana",
-    "Back" : "Takaisin"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fr_CA.js b/apps/user_ldap/l10n/fr_CA.js
deleted file mode 100644
index 95c97db2f9c..00000000000
--- a/apps/user_ldap/l10n/fr_CA.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_ldap/l10n/fr_CA.json b/apps/user_ldap/l10n/fr_CA.json
deleted file mode 100644
index 8e0cd6f6783..00000000000
--- a/apps/user_ldap/l10n/fr_CA.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/hi_IN.js b/apps/user_ldap/l10n/hi_IN.js
deleted file mode 100644
index 37042a4f412..00000000000
--- a/apps/user_ldap/l10n/hi_IN.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/hi_IN.json b/apps/user_ldap/l10n/hi_IN.json
deleted file mode 100644
index 521de7ba1a8..00000000000
--- a/apps/user_ldap/l10n/hi_IN.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/sk.js b/apps/user_ldap/l10n/sk.js
deleted file mode 100644
index 33b6d85e734..00000000000
--- a/apps/user_ldap/l10n/sk.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Save" : "Uložiť",
-    "Advanced" : "Pokročilé"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/user_ldap/l10n/sk.json b/apps/user_ldap/l10n/sk.json
deleted file mode 100644
index 52c7f32624b..00000000000
--- a/apps/user_ldap/l10n/sk.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Save" : "Uložiť",
-    "Advanced" : "Pokročilé"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ur.js b/apps/user_ldap/l10n/ur.js
deleted file mode 100644
index 7dfbc33c3e6..00000000000
--- a/apps/user_ldap/l10n/ur.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ur.json b/apps/user_ldap/l10n/ur.json
deleted file mode 100644
index 1c1fc3d16c1..00000000000
--- a/apps/user_ldap/l10n/ur.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/de_CH.js b/apps/user_webdavauth/l10n/de_CH.js
deleted file mode 100644
index 84bcb9d4efb..00000000000
--- a/apps/user_webdavauth/l10n/de_CH.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV-Authentifizierung",
-    "Save" : "Speichern",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/de_CH.json b/apps/user_webdavauth/l10n/de_CH.json
deleted file mode 100644
index 1c47d57a349..00000000000
--- a/apps/user_webdavauth/l10n/de_CH.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV-Authentifizierung",
-    "Save" : "Speichern",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/eu_ES.js b/apps/user_webdavauth/l10n/eu_ES.js
deleted file mode 100644
index 68ab406f834..00000000000
--- a/apps/user_webdavauth/l10n/eu_ES.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Gorde"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/eu_ES.json b/apps/user_webdavauth/l10n/eu_ES.json
deleted file mode 100644
index 7a78f4becee..00000000000
--- a/apps/user_webdavauth/l10n/eu_ES.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Gorde"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/fi.js b/apps/user_webdavauth/l10n/fi.js
deleted file mode 100644
index 09bd8e55e7f..00000000000
--- a/apps/user_webdavauth/l10n/fi.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Tallenna"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/fi.json b/apps/user_webdavauth/l10n/fi.json
deleted file mode 100644
index f4a8647859b..00000000000
--- a/apps/user_webdavauth/l10n/fi.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Tallenna"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sk.js b/apps/user_webdavauth/l10n/sk.js
deleted file mode 100644
index 299b57be670..00000000000
--- a/apps/user_webdavauth/l10n/sk.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Uložiť"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/user_webdavauth/l10n/sk.json b/apps/user_webdavauth/l10n/sk.json
deleted file mode 100644
index 48cd128194e..00000000000
--- a/apps/user_webdavauth/l10n/sk.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Uložiť"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/core/l10n/ca@valencia.js b/core/l10n/ca@valencia.js
deleted file mode 100644
index 4cb36aaaaac..00000000000
--- a/core/l10n/ca@valencia.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ca@valencia.json b/core/l10n/ca@valencia.json
deleted file mode 100644
index 43fce52c5cf..00000000000
--- a/core/l10n/ca@valencia.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/de_CH.js b/core/l10n/de_CH.js
deleted file mode 100644
index a95205b439b..00000000000
--- a/core/l10n/de_CH.js
+++ /dev/null
@@ -1,105 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
-    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
-    "Updated database" : "Datenbank aktualisiert",
-    "Sunday" : "Sonntag",
-    "Monday" : "Montag",
-    "Tuesday" : "Dienstag",
-    "Wednesday" : "Mittwoch",
-    "Thursday" : "Donnerstag",
-    "Friday" : "Freitag",
-    "Saturday" : "Samstag",
-    "January" : "Januar",
-    "February" : "Februar",
-    "March" : "März",
-    "April" : "April",
-    "May" : "Mai",
-    "June" : "Juni",
-    "July" : "Juli",
-    "August" : "August",
-    "September" : "September",
-    "October" : "Oktober",
-    "November" : "November",
-    "December" : "Dezember",
-    "Settings" : "Einstellungen",
-    "Saving..." : "Speichern...",
-    "Reset password" : "Passwort zurücksetzen",
-    "No" : "Nein",
-    "Yes" : "Ja",
-    "Choose" : "Auswählen",
-    "Ok" : "OK",
-    "New Files" : "Neue Dateien",
-    "Cancel" : "Abbrechen",
-    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
-    "Shared" : "Geteilt",
-    "Share" : "Teilen",
-    "Error" : "Fehler",
-    "Error while sharing" : "Fehler beim Teilen",
-    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
-    "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
-    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
-    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
-    "Password protect" : "Passwortschutz",
-    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
-    "Email link to person" : "Link per E-Mail verschicken",
-    "Send" : "Senden",
-    "Set expiration date" : "Ein Ablaufdatum setzen",
-    "Expiration date" : "Ablaufdatum",
-    "group" : "Gruppe",
-    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
-    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
-    "Unshare" : "Freigabe aufheben",
-    "can edit" : "kann bearbeiten",
-    "access control" : "Zugriffskontrolle",
-    "create" : "erstellen",
-    "update" : "aktualisieren",
-    "delete" : "löschen",
-    "Password protected" : "Passwortgeschützt",
-    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
-    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
-    "Sending ..." : "Sende ...",
-    "Email sent" : "Email gesendet",
-    "Warning" : "Warnung",
-    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
-    "Delete" : "Löschen",
-    "Add" : "Hinzufügen",
-    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
-    "%s password reset" : "%s-Passwort zurücksetzen",
-    "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-    "Username" : "Benutzername",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
-    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
-    "Reset" : "Zurücksetzen",
-    "New password" : "Neues Passwort",
-    "Personal" : "Persönlich",
-    "Users" : "Benutzer",
-    "Apps" : "Apps",
-    "Admin" : "Administrator",
-    "Help" : "Hilfe",
-    "Access forbidden" : "Zugriff verboten",
-    "Security Warning" : "Sicherheitshinweis",
-    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-    "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
-    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
-    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
-    "Password" : "Passwort",
-    "Data folder" : "Datenverzeichnis",
-    "Configure the database" : "Datenbank einrichten",
-    "Database user" : "Datenbank-Benutzer",
-    "Database password" : "Datenbank-Passwort",
-    "Database name" : "Datenbank-Name",
-    "Database tablespace" : "Datenbank-Tablespace",
-    "Database host" : "Datenbank-Host",
-    "Finish setup" : "Installation abschliessen",
-    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
-    "Log out" : "Abmelden",
-    "remember" : "merken",
-    "Log in" : "Einloggen",
-    "Alternative Logins" : "Alternative Logins"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de_CH.json b/core/l10n/de_CH.json
deleted file mode 100644
index 8d84ade00cd..00000000000
--- a/core/l10n/de_CH.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{ "translations": {
-    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
-    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
-    "Updated database" : "Datenbank aktualisiert",
-    "Sunday" : "Sonntag",
-    "Monday" : "Montag",
-    "Tuesday" : "Dienstag",
-    "Wednesday" : "Mittwoch",
-    "Thursday" : "Donnerstag",
-    "Friday" : "Freitag",
-    "Saturday" : "Samstag",
-    "January" : "Januar",
-    "February" : "Februar",
-    "March" : "März",
-    "April" : "April",
-    "May" : "Mai",
-    "June" : "Juni",
-    "July" : "Juli",
-    "August" : "August",
-    "September" : "September",
-    "October" : "Oktober",
-    "November" : "November",
-    "December" : "Dezember",
-    "Settings" : "Einstellungen",
-    "Saving..." : "Speichern...",
-    "Reset password" : "Passwort zurücksetzen",
-    "No" : "Nein",
-    "Yes" : "Ja",
-    "Choose" : "Auswählen",
-    "Ok" : "OK",
-    "New Files" : "Neue Dateien",
-    "Cancel" : "Abbrechen",
-    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
-    "Shared" : "Geteilt",
-    "Share" : "Teilen",
-    "Error" : "Fehler",
-    "Error while sharing" : "Fehler beim Teilen",
-    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
-    "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
-    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
-    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
-    "Password protect" : "Passwortschutz",
-    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
-    "Email link to person" : "Link per E-Mail verschicken",
-    "Send" : "Senden",
-    "Set expiration date" : "Ein Ablaufdatum setzen",
-    "Expiration date" : "Ablaufdatum",
-    "group" : "Gruppe",
-    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
-    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
-    "Unshare" : "Freigabe aufheben",
-    "can edit" : "kann bearbeiten",
-    "access control" : "Zugriffskontrolle",
-    "create" : "erstellen",
-    "update" : "aktualisieren",
-    "delete" : "löschen",
-    "Password protected" : "Passwortgeschützt",
-    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
-    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
-    "Sending ..." : "Sende ...",
-    "Email sent" : "Email gesendet",
-    "Warning" : "Warnung",
-    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
-    "Delete" : "Löschen",
-    "Add" : "Hinzufügen",
-    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
-    "%s password reset" : "%s-Passwort zurücksetzen",
-    "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-    "Username" : "Benutzername",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
-    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
-    "Reset" : "Zurücksetzen",
-    "New password" : "Neues Passwort",
-    "Personal" : "Persönlich",
-    "Users" : "Benutzer",
-    "Apps" : "Apps",
-    "Admin" : "Administrator",
-    "Help" : "Hilfe",
-    "Access forbidden" : "Zugriff verboten",
-    "Security Warning" : "Sicherheitshinweis",
-    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-    "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
-    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
-    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
-    "Password" : "Passwort",
-    "Data folder" : "Datenverzeichnis",
-    "Configure the database" : "Datenbank einrichten",
-    "Database user" : "Datenbank-Benutzer",
-    "Database password" : "Datenbank-Passwort",
-    "Database name" : "Datenbank-Name",
-    "Database tablespace" : "Datenbank-Tablespace",
-    "Database host" : "Datenbank-Host",
-    "Finish setup" : "Installation abschliessen",
-    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
-    "Log out" : "Abmelden",
-    "remember" : "merken",
-    "Log in" : "Einloggen",
-    "Alternative Logins" : "Alternative Logins"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/en_NZ.js b/core/l10n/en_NZ.js
deleted file mode 100644
index 4cb36aaaaac..00000000000
--- a/core/l10n/en_NZ.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en_NZ.json b/core/l10n/en_NZ.json
deleted file mode 100644
index 43fce52c5cf..00000000000
--- a/core/l10n/en_NZ.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_BO.js b/core/l10n/es_BO.js
deleted file mode 100644
index 4cb36aaaaac..00000000000
--- a/core/l10n/es_BO.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_BO.json b/core/l10n/es_BO.json
deleted file mode 100644
index 43fce52c5cf..00000000000
--- a/core/l10n/es_BO.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_CO.js b/core/l10n/es_CO.js
deleted file mode 100644
index 4cb36aaaaac..00000000000
--- a/core/l10n/es_CO.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CO.json b/core/l10n/es_CO.json
deleted file mode 100644
index 43fce52c5cf..00000000000
--- a/core/l10n/es_CO.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_CR.js b/core/l10n/es_CR.js
deleted file mode 100644
index 4cb36aaaaac..00000000000
--- a/core/l10n/es_CR.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CR.json b/core/l10n/es_CR.json
deleted file mode 100644
index 43fce52c5cf..00000000000
--- a/core/l10n/es_CR.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_EC.js b/core/l10n/es_EC.js
deleted file mode 100644
index 4cb36aaaaac..00000000000
--- a/core/l10n/es_EC.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_EC.json b/core/l10n/es_EC.json
deleted file mode 100644
index 43fce52c5cf..00000000000
--- a/core/l10n/es_EC.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_PE.js b/core/l10n/es_PE.js
deleted file mode 100644
index 4cb36aaaaac..00000000000
--- a/core/l10n/es_PE.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_PE.json b/core/l10n/es_PE.json
deleted file mode 100644
index 43fce52c5cf..00000000000
--- a/core/l10n/es_PE.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_PY.js b/core/l10n/es_PY.js
deleted file mode 100644
index 4cb36aaaaac..00000000000
--- a/core/l10n/es_PY.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_PY.json b/core/l10n/es_PY.json
deleted file mode 100644
index 43fce52c5cf..00000000000
--- a/core/l10n/es_PY.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_US.js b/core/l10n/es_US.js
deleted file mode 100644
index 4cb36aaaaac..00000000000
--- a/core/l10n/es_US.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_US.json b/core/l10n/es_US.json
deleted file mode 100644
index 43fce52c5cf..00000000000
--- a/core/l10n/es_US.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_UY.js b/core/l10n/es_UY.js
deleted file mode 100644
index 4cb36aaaaac..00000000000
--- a/core/l10n/es_UY.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_UY.json b/core/l10n/es_UY.json
deleted file mode 100644
index 43fce52c5cf..00000000000
--- a/core/l10n/es_UY.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/eu_ES.js b/core/l10n/eu_ES.js
deleted file mode 100644
index 847f4cc5da0..00000000000
--- a/core/l10n/eu_ES.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "Cancel" : "Ezeztatu",
-    "Delete" : "Ezabatu",
-    "Personal" : "Pertsonala"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/eu_ES.json b/core/l10n/eu_ES.json
deleted file mode 100644
index 0f7c86a7b9e..00000000000
--- a/core/l10n/eu_ES.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Cancel" : "Ezeztatu",
-    "Delete" : "Ezabatu",
-    "Personal" : "Pertsonala"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/fi.js b/core/l10n/fi.js
deleted file mode 100644
index 84301350b9b..00000000000
--- a/core/l10n/fi.js
+++ /dev/null
@@ -1,18 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "Settings" : "Asetukset",
-    "No" : "EI",
-    "Yes" : "KYLLÄ",
-    "Choose" : "Valitse",
-    "Cancel" : "Peruuta",
-    "Error" : "Virhe",
-    "Share link" : "Jaa linkki",
-    "Password" : "Salasana",
-    "Delete" : "Poista",
-    "Add" : "Lisää",
-    "Help" : "Apua",
-    "Username" : "Käyttäjätunnus",
-    "Log in" : "Kirjaudu sisään"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/fi.json b/core/l10n/fi.json
deleted file mode 100644
index d9a8d572f51..00000000000
--- a/core/l10n/fi.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{ "translations": {
-    "Settings" : "Asetukset",
-    "No" : "EI",
-    "Yes" : "KYLLÄ",
-    "Choose" : "Valitse",
-    "Cancel" : "Peruuta",
-    "Error" : "Virhe",
-    "Share link" : "Jaa linkki",
-    "Password" : "Salasana",
-    "Delete" : "Poista",
-    "Add" : "Lisää",
-    "Help" : "Apua",
-    "Username" : "Käyttäjätunnus",
-    "Log in" : "Kirjaudu sisään"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/fr_CA.js b/core/l10n/fr_CA.js
deleted file mode 100644
index 572404948ed..00000000000
--- a/core/l10n/fr_CA.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fr_CA.json b/core/l10n/fr_CA.json
deleted file mode 100644
index b43ffe08ed3..00000000000
--- a/core/l10n/fr_CA.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/hi_IN.js b/core/l10n/hi_IN.js
deleted file mode 100644
index c483b4ab65d..00000000000
--- a/core/l10n/hi_IN.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hi_IN.json b/core/l10n/hi_IN.json
deleted file mode 100644
index 52ecaf565a9..00000000000
--- a/core/l10n/hi_IN.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/ignorelist b/core/l10n/ignorelist
deleted file mode 100644
index a2b225cbe4a..00000000000
--- a/core/l10n/ignorelist
+++ /dev/null
@@ -1 +0,0 @@
-js/jquery-ui-1.8.16.custom.min.js
diff --git a/core/l10n/sk.js b/core/l10n/sk.js
deleted file mode 100644
index 6d446d19099..00000000000
--- a/core/l10n/sk.js
+++ /dev/null
@@ -1,30 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "Sunday" : "Nedeľa",
-    "Monday" : "Pondelok",
-    "Tuesday" : "Utorok",
-    "Wednesday" : "Streda",
-    "Thursday" : "Štvrtok",
-    "Friday" : "Piatok",
-    "Saturday" : "Sobota",
-    "January" : "Január",
-    "February" : "Február",
-    "March" : "Marec",
-    "April" : "Apríl",
-    "May" : "Máj",
-    "June" : "Jún",
-    "July" : "Júl",
-    "August" : "August",
-    "September" : "September",
-    "October" : "Október",
-    "November" : "November",
-    "December" : "December",
-    "Settings" : "Nastavenia",
-    "Cancel" : "Zrušiť",
-    "Share" : "Zdieľať",
-    "group" : "skupina",
-    "Delete" : "Odstrániť",
-    "Personal" : "Osobné"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/core/l10n/sk.json b/core/l10n/sk.json
deleted file mode 100644
index 05064303dac..00000000000
--- a/core/l10n/sk.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{ "translations": {
-    "Sunday" : "Nedeľa",
-    "Monday" : "Pondelok",
-    "Tuesday" : "Utorok",
-    "Wednesday" : "Streda",
-    "Thursday" : "Štvrtok",
-    "Friday" : "Piatok",
-    "Saturday" : "Sobota",
-    "January" : "Január",
-    "February" : "Február",
-    "March" : "Marec",
-    "April" : "Apríl",
-    "May" : "Máj",
-    "June" : "Jún",
-    "July" : "Júl",
-    "August" : "August",
-    "September" : "September",
-    "October" : "Október",
-    "November" : "November",
-    "December" : "December",
-    "Settings" : "Nastavenia",
-    "Cancel" : "Zrušiť",
-    "Share" : "Zdieľať",
-    "group" : "skupina",
-    "Delete" : "Odstrániť",
-    "Personal" : "Osobné"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/core/l10n/ur.js b/core/l10n/ur.js
deleted file mode 100644
index 442326e9ad7..00000000000
--- a/core/l10n/ur.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ur.json b/core/l10n/ur.json
deleted file mode 100644
index 1c1fc3d16c1..00000000000
--- a/core/l10n/ur.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/ca@valencia.js b/lib/l10n/ca@valencia.js
deleted file mode 100644
index a12702211c2..00000000000
--- a/lib/l10n/ca@valencia.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ca@valencia.json b/lib/l10n/ca@valencia.json
deleted file mode 100644
index b994fa289eb..00000000000
--- a/lib/l10n/ca@valencia.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/de_CH.js b/lib/l10n/de_CH.js
deleted file mode 100644
index d0d4be0f4e6..00000000000
--- a/lib/l10n/de_CH.js
+++ /dev/null
@@ -1,40 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "Help" : "Hilfe",
-    "Personal" : "Persönlich",
-    "Settings" : "Einstellungen",
-    "Users" : "Benutzer",
-    "Admin" : "Administrator",
-    "No app name specified" : "Kein App-Name spezifiziert",
-    "web services under your control" : "Web-Services unter Ihrer Kontrolle",
-    "App directory already exists" : "Anwendungsverzeichnis existiert bereits",
-    "App can't be installed because of not allowed code in the App" : "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden",
-    "Application is not enabled" : "Die Anwendung ist nicht aktiviert",
-    "Authentication error" : "Authentifizierungs-Fehler",
-    "Token expired. Please reload page." : "Token abgelaufen. Bitte laden Sie die Seite neu.",
-    "%s enter the database username." : "%s geben Sie den Datenbank-Benutzernamen an.",
-    "%s enter the database name." : "%s geben Sie den Datenbank-Namen an.",
-    "%s you may not use dots in the database name" : "%s Der Datenbank-Name darf keine Punkte enthalten",
-    "MS SQL username and/or password not valid: %s" : "MS SQL Benutzername und/oder Passwort ungültig: %s",
-    "You need to enter either an existing account or the administrator." : "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-    "DB Error: \"%s\"" : "DB Fehler: \"%s\"",
-    "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"",
-    "Oracle connection could not be established" : "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
-    "Oracle username and/or password not valid" : "Oracle Benutzername und/oder Passwort ungültig",
-    "Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL Benutzername und/oder Passwort ungültig",
-    "Set an admin username." : "Setze Administrator Benutzername.",
-    "Set an admin password." : "Setze Administrator Passwort",
-    "%s shared »%s« with you" : "%s teilt »%s« mit Ihnen",
-    "Could not find category \"%s\"" : "Die Kategorie «%s» konnte nicht gefunden werden.",
-    "seconds ago" : "Gerade eben",
-    "today" : "Heute",
-    "yesterday" : "Gestern",
-    "last month" : "Letzten Monat",
-    "last year" : "Letztes Jahr",
-    "years ago" : "Vor  Jahren",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/de_CH.json b/lib/l10n/de_CH.json
deleted file mode 100644
index 26ab7e1b201..00000000000
--- a/lib/l10n/de_CH.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{ "translations": {
-    "Help" : "Hilfe",
-    "Personal" : "Persönlich",
-    "Settings" : "Einstellungen",
-    "Users" : "Benutzer",
-    "Admin" : "Administrator",
-    "No app name specified" : "Kein App-Name spezifiziert",
-    "web services under your control" : "Web-Services unter Ihrer Kontrolle",
-    "App directory already exists" : "Anwendungsverzeichnis existiert bereits",
-    "App can't be installed because of not allowed code in the App" : "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden",
-    "Application is not enabled" : "Die Anwendung ist nicht aktiviert",
-    "Authentication error" : "Authentifizierungs-Fehler",
-    "Token expired. Please reload page." : "Token abgelaufen. Bitte laden Sie die Seite neu.",
-    "%s enter the database username." : "%s geben Sie den Datenbank-Benutzernamen an.",
-    "%s enter the database name." : "%s geben Sie den Datenbank-Namen an.",
-    "%s you may not use dots in the database name" : "%s Der Datenbank-Name darf keine Punkte enthalten",
-    "MS SQL username and/or password not valid: %s" : "MS SQL Benutzername und/oder Passwort ungültig: %s",
-    "You need to enter either an existing account or the administrator." : "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-    "DB Error: \"%s\"" : "DB Fehler: \"%s\"",
-    "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"",
-    "Oracle connection could not be established" : "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
-    "Oracle username and/or password not valid" : "Oracle Benutzername und/oder Passwort ungültig",
-    "Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL Benutzername und/oder Passwort ungültig",
-    "Set an admin username." : "Setze Administrator Benutzername.",
-    "Set an admin password." : "Setze Administrator Passwort",
-    "%s shared »%s« with you" : "%s teilt »%s« mit Ihnen",
-    "Could not find category \"%s\"" : "Die Kategorie «%s» konnte nicht gefunden werden.",
-    "seconds ago" : "Gerade eben",
-    "today" : "Heute",
-    "yesterday" : "Gestern",
-    "last month" : "Letzten Monat",
-    "last year" : "Letztes Jahr",
-    "years ago" : "Vor  Jahren",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/en_NZ.js b/lib/l10n/en_NZ.js
deleted file mode 100644
index a12702211c2..00000000000
--- a/lib/l10n/en_NZ.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/en_NZ.json b/lib/l10n/en_NZ.json
deleted file mode 100644
index b994fa289eb..00000000000
--- a/lib/l10n/en_NZ.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_BO.js b/lib/l10n/es_BO.js
deleted file mode 100644
index a12702211c2..00000000000
--- a/lib/l10n/es_BO.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_BO.json b/lib/l10n/es_BO.json
deleted file mode 100644
index b994fa289eb..00000000000
--- a/lib/l10n/es_BO.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_CO.js b/lib/l10n/es_CO.js
deleted file mode 100644
index a12702211c2..00000000000
--- a/lib/l10n/es_CO.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_CO.json b/lib/l10n/es_CO.json
deleted file mode 100644
index b994fa289eb..00000000000
--- a/lib/l10n/es_CO.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_CR.js b/lib/l10n/es_CR.js
deleted file mode 100644
index a12702211c2..00000000000
--- a/lib/l10n/es_CR.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_CR.json b/lib/l10n/es_CR.json
deleted file mode 100644
index b994fa289eb..00000000000
--- a/lib/l10n/es_CR.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_EC.js b/lib/l10n/es_EC.js
deleted file mode 100644
index a12702211c2..00000000000
--- a/lib/l10n/es_EC.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_EC.json b/lib/l10n/es_EC.json
deleted file mode 100644
index b994fa289eb..00000000000
--- a/lib/l10n/es_EC.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_PE.js b/lib/l10n/es_PE.js
deleted file mode 100644
index a12702211c2..00000000000
--- a/lib/l10n/es_PE.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_PE.json b/lib/l10n/es_PE.json
deleted file mode 100644
index b994fa289eb..00000000000
--- a/lib/l10n/es_PE.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_PY.js b/lib/l10n/es_PY.js
deleted file mode 100644
index a12702211c2..00000000000
--- a/lib/l10n/es_PY.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_PY.json b/lib/l10n/es_PY.json
deleted file mode 100644
index b994fa289eb..00000000000
--- a/lib/l10n/es_PY.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_US.js b/lib/l10n/es_US.js
deleted file mode 100644
index a12702211c2..00000000000
--- a/lib/l10n/es_US.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_US.json b/lib/l10n/es_US.json
deleted file mode 100644
index b994fa289eb..00000000000
--- a/lib/l10n/es_US.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_UY.js b/lib/l10n/es_UY.js
deleted file mode 100644
index a12702211c2..00000000000
--- a/lib/l10n/es_UY.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_UY.json b/lib/l10n/es_UY.json
deleted file mode 100644
index b994fa289eb..00000000000
--- a/lib/l10n/es_UY.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/eu_ES.js b/lib/l10n/eu_ES.js
deleted file mode 100644
index f547910d4aa..00000000000
--- a/lib/l10n/eu_ES.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "Personal" : "Pertsonala"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/eu_ES.json b/lib/l10n/eu_ES.json
deleted file mode 100644
index 711c235ddc2..00000000000
--- a/lib/l10n/eu_ES.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Personal" : "Pertsonala"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/fi.js b/lib/l10n/fi.js
deleted file mode 100644
index f1346425331..00000000000
--- a/lib/l10n/fi.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "Help" : "Apua",
-    "Settings" : "Asetukset"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/fi.json b/lib/l10n/fi.json
deleted file mode 100644
index b556f7f1816..00000000000
--- a/lib/l10n/fi.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Help" : "Apua",
-    "Settings" : "Asetukset"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/fr_CA.js b/lib/l10n/fr_CA.js
deleted file mode 100644
index 9408adc0dc3..00000000000
--- a/lib/l10n/fr_CA.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/fr_CA.json b/lib/l10n/fr_CA.json
deleted file mode 100644
index 2a227e468c7..00000000000
--- a/lib/l10n/fr_CA.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/hi_IN.js b/lib/l10n/hi_IN.js
deleted file mode 100644
index da0dcc6bdde..00000000000
--- a/lib/l10n/hi_IN.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n minute ago_::_%n minutes ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n day go_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/hi_IN.json b/lib/l10n/hi_IN.json
deleted file mode 100644
index 4286553dd0c..00000000000
--- a/lib/l10n/hi_IN.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n minute ago_::_%n minutes ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n day go_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/sk.js b/lib/l10n/sk.js
deleted file mode 100644
index 1eed1a5720c..00000000000
--- a/lib/l10n/sk.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "Personal" : "Osobné",
-    "Settings" : "Nastavenia"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/lib/l10n/sk.json b/lib/l10n/sk.json
deleted file mode 100644
index bd84c129e92..00000000000
--- a/lib/l10n/sk.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Personal" : "Osobné",
-    "Settings" : "Nastavenia"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/lib/l10n/ur.js b/lib/l10n/ur.js
deleted file mode 100644
index da0dcc6bdde..00000000000
--- a/lib/l10n/ur.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n minute ago_::_%n minutes ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n day go_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ur.json b/lib/l10n/ur.json
deleted file mode 100644
index 4286553dd0c..00000000000
--- a/lib/l10n/ur.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n minute ago_::_%n minutes ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n day go_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/settings/l10n/de_CH.js b/settings/l10n/de_CH.js
deleted file mode 100644
index af913b8d81e..00000000000
--- a/settings/l10n/de_CH.js
+++ /dev/null
@@ -1,102 +0,0 @@
-OC.L10N.register(
-    "settings",
-    {
-    "Enabled" : "Aktiviert",
-    "Authentication error" : "Authentifizierungs-Fehler",
-    "Group already exists" : "Die Gruppe existiert bereits",
-    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
-    "Email saved" : "E-Mail-Adresse gespeichert",
-    "Invalid email" : "Ungültige E-Mail-Adresse",
-    "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden",
-    "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden",
-    "Language changed" : "Sprache geändert",
-    "Invalid request" : "Ungültige Anforderung",
-    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
-    "Unable to add user to group %s" : "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
-    "Unable to remove user from group %s" : "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
-    "Couldn't update app." : "Die App konnte nicht aktualisiert werden.",
-    "Saved" : "Gespeichert",
-    "Email sent" : "Email gesendet",
-    "All" : "Alle",
-    "Please wait...." : "Bitte warten....",
-    "Error while disabling app" : "Fehler während der Deaktivierung der Anwendung",
-    "Disable" : "Deaktivieren",
-    "Enable" : "Aktivieren",
-    "Error while enabling app" : "Fehler während der Aktivierung der Anwendung",
-    "Updating...." : "Update...",
-    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
-    "Updated" : "Aktualisiert",
-    "Delete" : "Löschen",
-    "Decrypting files... Please wait, this can take some time." : "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-    "Groups" : "Gruppen",
-    "undo" : "rückgängig machen",
-    "never" : "niemals",
-    "add group" : "Gruppe hinzufügen",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "Error creating user" : "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
-    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
-    "__language_name__" : "Deutsch (Schweiz)",
-    "SSL root certificates" : "SSL-Root-Zertifikate",
-    "Encryption" : "Verschlüsselung",
-    "Login" : "Anmelden",
-    "Security Warning" : "Sicherheitshinweis",
-    "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
-    "Setup Warning" : "Einrichtungswarnung",
-    "Module 'fileinfo' missing" : "Das Modul 'fileinfo' fehlt",
-    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
-    "Locale not working" : "Die Lokalisierung funktioniert nicht",
-    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
-    "Cron" : "Cron",
-    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
-    "Sharing" : "Teilen",
-    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
-    "Allow public uploads" : "Erlaube öffentliches hochladen",
-    "Allow resharing" : "Erlaube Weiterverteilen",
-    "Security" : "Sicherheit",
-    "Enforce HTTPS" : "HTTPS erzwingen",
-    "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
-    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
-    "Server address" : "Adresse des Servers",
-    "Port" : "Port",
-    "Log" : "Log",
-    "Log level" : "Log-Level",
-    "More" : "Mehr",
-    "Less" : "Weniger",
-    "Version" : "Version",
-    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
-    "More apps" : "Mehr Apps",
-    "by" : "von",
-    "User Documentation" : "Dokumentation für Benutzer",
-    "Administrator Documentation" : "Dokumentation für Administratoren",
-    "Online Documentation" : "Online-Dokumentation",
-    "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommerzieller Support",
-    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
-    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
-    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-    "Password" : "Passwort",
-    "Your password was changed" : "Ihr Passwort wurde geändert.",
-    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
-    "Current password" : "Aktuelles Passwort",
-    "New password" : "Neues Passwort",
-    "Change password" : "Passwort ändern",
-    "Email" : "E-Mail",
-    "Your email address" : "Ihre E-Mail-Adresse",
-    "Cancel" : "Abbrechen",
-    "Language" : "Sprache",
-    "Help translate" : "Helfen Sie bei der Übersetzung",
-    "Import Root Certificate" : "Root-Zertifikate importieren",
-    "Log-in password" : "Login-Passwort",
-    "Decrypt all Files" : "Alle Dateien entschlüsseln",
-    "Login Name" : "Loginname",
-    "Create" : "Erstellen",
-    "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
-    "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-    "Unlimited" : "Unbegrenzt",
-    "Other" : "Andere",
-    "Username" : "Benutzername",
-    "set new password" : "Neues Passwort setzen",
-    "Default" : "Standard"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de_CH.json b/settings/l10n/de_CH.json
deleted file mode 100644
index ad7338d33b1..00000000000
--- a/settings/l10n/de_CH.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{ "translations": {
-    "Enabled" : "Aktiviert",
-    "Authentication error" : "Authentifizierungs-Fehler",
-    "Group already exists" : "Die Gruppe existiert bereits",
-    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
-    "Email saved" : "E-Mail-Adresse gespeichert",
-    "Invalid email" : "Ungültige E-Mail-Adresse",
-    "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden",
-    "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden",
-    "Language changed" : "Sprache geändert",
-    "Invalid request" : "Ungültige Anforderung",
-    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
-    "Unable to add user to group %s" : "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
-    "Unable to remove user from group %s" : "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
-    "Couldn't update app." : "Die App konnte nicht aktualisiert werden.",
-    "Saved" : "Gespeichert",
-    "Email sent" : "Email gesendet",
-    "All" : "Alle",
-    "Please wait...." : "Bitte warten....",
-    "Error while disabling app" : "Fehler während der Deaktivierung der Anwendung",
-    "Disable" : "Deaktivieren",
-    "Enable" : "Aktivieren",
-    "Error while enabling app" : "Fehler während der Aktivierung der Anwendung",
-    "Updating...." : "Update...",
-    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
-    "Updated" : "Aktualisiert",
-    "Delete" : "Löschen",
-    "Decrypting files... Please wait, this can take some time." : "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-    "Groups" : "Gruppen",
-    "undo" : "rückgängig machen",
-    "never" : "niemals",
-    "add group" : "Gruppe hinzufügen",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "Error creating user" : "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
-    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
-    "__language_name__" : "Deutsch (Schweiz)",
-    "SSL root certificates" : "SSL-Root-Zertifikate",
-    "Encryption" : "Verschlüsselung",
-    "Login" : "Anmelden",
-    "Security Warning" : "Sicherheitshinweis",
-    "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
-    "Setup Warning" : "Einrichtungswarnung",
-    "Module 'fileinfo' missing" : "Das Modul 'fileinfo' fehlt",
-    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
-    "Locale not working" : "Die Lokalisierung funktioniert nicht",
-    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
-    "Cron" : "Cron",
-    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
-    "Sharing" : "Teilen",
-    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
-    "Allow public uploads" : "Erlaube öffentliches hochladen",
-    "Allow resharing" : "Erlaube Weiterverteilen",
-    "Security" : "Sicherheit",
-    "Enforce HTTPS" : "HTTPS erzwingen",
-    "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
-    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
-    "Server address" : "Adresse des Servers",
-    "Port" : "Port",
-    "Log" : "Log",
-    "Log level" : "Log-Level",
-    "More" : "Mehr",
-    "Less" : "Weniger",
-    "Version" : "Version",
-    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
-    "More apps" : "Mehr Apps",
-    "by" : "von",
-    "User Documentation" : "Dokumentation für Benutzer",
-    "Administrator Documentation" : "Dokumentation für Administratoren",
-    "Online Documentation" : "Online-Dokumentation",
-    "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommerzieller Support",
-    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
-    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
-    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-    "Password" : "Passwort",
-    "Your password was changed" : "Ihr Passwort wurde geändert.",
-    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
-    "Current password" : "Aktuelles Passwort",
-    "New password" : "Neues Passwort",
-    "Change password" : "Passwort ändern",
-    "Email" : "E-Mail",
-    "Your email address" : "Ihre E-Mail-Adresse",
-    "Cancel" : "Abbrechen",
-    "Language" : "Sprache",
-    "Help translate" : "Helfen Sie bei der Übersetzung",
-    "Import Root Certificate" : "Root-Zertifikate importieren",
-    "Log-in password" : "Login-Passwort",
-    "Decrypt all Files" : "Alle Dateien entschlüsseln",
-    "Login Name" : "Loginname",
-    "Create" : "Erstellen",
-    "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
-    "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-    "Unlimited" : "Unbegrenzt",
-    "Other" : "Andere",
-    "Username" : "Benutzername",
-    "set new password" : "Neues Passwort setzen",
-    "Default" : "Standard"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/settings/l10n/eu_ES.js b/settings/l10n/eu_ES.js
deleted file mode 100644
index b5685139534..00000000000
--- a/settings/l10n/eu_ES.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "settings",
-    {
-    "Invalid request" : "Eskakizun baliogabea",
-    "Delete" : "Ezabatu",
-    "Cancel" : "Ezeztatu",
-    "Other" : "Bestea"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/eu_ES.json b/settings/l10n/eu_ES.json
deleted file mode 100644
index 062f410b0e9..00000000000
--- a/settings/l10n/eu_ES.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Invalid request" : "Eskakizun baliogabea",
-    "Delete" : "Ezabatu",
-    "Cancel" : "Ezeztatu",
-    "Other" : "Bestea"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/settings/l10n/fi.js b/settings/l10n/fi.js
deleted file mode 100644
index bf1854567a1..00000000000
--- a/settings/l10n/fi.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "settings",
-    {
-    "Delete" : "Poista",
-    "More" : "Lisää",
-    "Password" : "Salasana",
-    "Cancel" : "Peruuta",
-    "Username" : "Käyttäjätunnus",
-    "Create" : "Luo"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/fi.json b/settings/l10n/fi.json
deleted file mode 100644
index 58852d56692..00000000000
--- a/settings/l10n/fi.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "Delete" : "Poista",
-    "More" : "Lisää",
-    "Password" : "Salasana",
-    "Cancel" : "Peruuta",
-    "Username" : "Käyttäjätunnus",
-    "Create" : "Luo"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/settings/l10n/sk.js b/settings/l10n/sk.js
deleted file mode 100644
index e48cc9d9ed9..00000000000
--- a/settings/l10n/sk.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "settings",
-    {
-    "Delete" : "Odstrániť",
-    "never" : "nikdy",
-    "Cancel" : "Zrušiť",
-    "Other" : "Ostatné"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/settings/l10n/sk.json b/settings/l10n/sk.json
deleted file mode 100644
index 609a62d21fd..00000000000
--- a/settings/l10n/sk.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Delete" : "Odstrániť",
-    "never" : "nikdy",
-    "Cancel" : "Zrušiť",
-    "Other" : "Ostatné"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/settings/l10n/ur.js b/settings/l10n/ur.js
deleted file mode 100644
index 78fcf358b75..00000000000
--- a/settings/l10n/ur.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "settings",
-    {
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ur.json b/settings/l10n/ur.json
deleted file mode 100644
index 1c1fc3d16c1..00000000000
--- a/settings/l10n/ur.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
-- 
GitLab


From 3773c69f01c5d2e7c695cd31b8000742c589bef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 26 Aug 2015 12:19:58 +0200
Subject: [PATCH 043/783] Adding simple script to remove language files from
 core

---
 l10n/rm-old.sh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 l10n/rm-old.sh

diff --git a/l10n/rm-old.sh b/l10n/rm-old.sh
new file mode 100644
index 00000000000..30e4509db25
--- /dev/null
+++ b/l10n/rm-old.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+lang=(ach ady af_ZA ak am_ET ar ast az bal be bg_BG bn_BD bn_IN bs ca cs_CZ cy_GB da de de_AT de_DE el en_GB en@pirate eo es es_AR es_CL es_MX et_EE eu fa fi_FI fil fr fy_NL gl gu he hi hr hu_HU hy ia id io is it ja jv ka_GE km kn ko ku_IQ la lb lo lt_LT lv mg mk ml ml_IN mn mr ms_MY mt_MT my_MM nb_NO nds ne nl nn_NO nqo oc or_IN pa pl pt_BR pt_PT ro ru si_LK sk_SK sl sq sr sr@latin su sv sw_KE ta_IN ta_LK te tg_TJ th_TH tl_PH tr tzl tzm ug uk ur_PK uz vi yo zh_CN zh_HK zh_TW)
+
+ignore=""
+
+for fignore in "${lang[@]}"; do
+  ignore=${ignore}"-not -name ${fignore}.js -not -name ${fignore}.json "
+done
+
+
+find ../lib/l10n -type f $ignore -delete
+find ../settings/l10n -type f $ignore -delete
+find ../core/l10n -type f $ignore -delete
+find ../apps/files/l10n -type f $ignore -delete
+find ../apps/encryption/l10n -type f $ignore -delete
+find ../apps/files_external/l10n -type f $ignore -delete
+find ../apps/files_sharing/l10n -type f $ignore -delete
+find ../apps/files_trashbin/l10n -type f $ignore -delete
+find ../apps/files_versions/l10n -type f $ignore -delete
+find ../apps/user_ldap/l10n -type f $ignore -delete
+find ../apps/user_webdavauth/l10n -type f $ignore -delete
+
+
-- 
GitLab


From 3d2ee95f1e06972188967b2bc19720001a4f1395 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 26 Aug 2015 14:29:36 +0200
Subject: [PATCH 044/783] Remove last occurence of `forcessl`

This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time.
---
 lib/private/user/session.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 75a884fb452..baceeb43956 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -297,8 +297,8 @@ class Session implements IUserSession, Emitter {
 	 * Remove cookie for "remember username"
 	 */
 	public function unsetMagicInCookie() {
-		//TODO: DI for cookies and OC_Config
-		$secureCookie = \OC_Config::getValue('forcessl', false);
+		//TODO: DI for cookies and IRequest
+		$secureCookie = \OC::$server->getRequest()->getServerProtocol() === 'https';
 
 		unset($_COOKIE["oc_username"]); //TODO: DI
 		unset($_COOKIE["oc_token"]);
-- 
GitLab


From 8c08dd0ac26290829b10e28c333358ae10d953eb Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 24 Aug 2015 15:56:04 +0200
Subject: [PATCH 045/783] occ tool to encrypt all files

---
 apps/encryption/appinfo/application.php       |  20 +
 apps/encryption/lib/crypto/encryptall.php     | 424 ++++++++++++++++++
 apps/encryption/lib/crypto/encryption.php     |  19 +
 apps/encryption/lib/users/setup.php           |   2 +
 apps/encryption/templates/altmail.php         |  16 +
 apps/encryption/templates/mail.php            |  39 ++
 .../tests/lib/crypto/encryptalltest.php       | 291 ++++++++++++
 .../tests/lib/crypto/encryptionTest.php       |   7 +
 core/command/encryption/encryptall.php        | 114 +++++
 core/register_command.php                     |   1 +
 lib/public/encryption/iencryptionmodule.php   |  12 +
 .../command/encryption/encryptalltest.php     | 131 ++++++
 .../lib/files/storage/wrapper/encryption.php  |   2 +-
 tests/lib/files/stream/encryption.php         |   2 +-
 14 files changed, 1078 insertions(+), 2 deletions(-)
 create mode 100644 apps/encryption/lib/crypto/encryptall.php
 create mode 100644 apps/encryption/templates/altmail.php
 create mode 100644 apps/encryption/templates/mail.php
 create mode 100644 apps/encryption/tests/lib/crypto/encryptalltest.php
 create mode 100644 core/command/encryption/encryptall.php
 create mode 100644 tests/core/command/encryption/encryptalltest.php

diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index d4804394c5f..cba8964eefb 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -30,6 +30,7 @@ use OCA\Encryption\Controller\RecoveryController;
 use OCA\Encryption\Controller\SettingsController;
 use OCA\Encryption\Controller\StatusController;
 use OCA\Encryption\Crypto\Crypt;
+use OCA\Encryption\Crypto\EncryptAll;
 use OCA\Encryption\Crypto\Encryption;
 use OCA\Encryption\HookManager;
 use OCA\Encryption\Hooks\UserHooks;
@@ -42,6 +43,7 @@ use OCP\App;
 use OCP\AppFramework\IAppContainer;
 use OCP\Encryption\IManager;
 use OCP\IConfig;
+use Symfony\Component\Console\Helper\QuestionHelper;
 
 
 class Application extends \OCP\AppFramework\App {
@@ -111,6 +113,7 @@ class Application extends \OCP\AppFramework\App {
 				$container->query('Crypt'),
 				$container->query('KeyManager'),
 				$container->query('Util'),
+				$container->query('EncryptAll'),
 				$container->getServer()->getLogger(),
 				$container->getServer()->getL10N($container->getAppName())
 			);
@@ -221,6 +224,23 @@ class Application extends \OCP\AppFramework\App {
 					$server->getUserManager());
 			});
 
+		$container->registerService('EncryptAll',
+			function (IAppContainer $c) {
+				$server = $c->getServer();
+				return new EncryptAll(
+					$c->query('UserSetup'),
+					$c->getServer()->getUserManager(),
+					new View(),
+					$c->query('KeyManager'),
+					$server->getConfig(),
+					$server->getMailer(),
+					$server->getL10N('encryption'),
+					new QuestionHelper(),
+					$server->getSecureRandom()
+				);
+			}
+		);
+
 	}
 
 	public function registerSettings() {
diff --git a/apps/encryption/lib/crypto/encryptall.php b/apps/encryption/lib/crypto/encryptall.php
new file mode 100644
index 00000000000..a0c69c13fdd
--- /dev/null
+++ b/apps/encryption/lib/crypto/encryptall.php
@@ -0,0 +1,424 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace OCA\Encryption\Crypto;
+
+use OC\Encryption\Exceptions\DecryptionFailedException;
+use OC\Files\View;
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Users\Setup;
+use OCP\IConfig;
+use OCP\IL10N;
+use OCP\IUserManager;
+use OCP\Mail\IMailer;
+use OCP\Security\ISecureRandom;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+class EncryptAll {
+
+	/** @var Setup */
+	protected $userSetup;
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var View */
+	protected $rootView;
+
+	/** @var KeyManager */
+	protected $keyManager;
+
+	/** @var array  */
+	protected $userPasswords;
+
+	/** @var  IConfig */
+	protected $config;
+
+	/** @var IMailer */
+	protected $mailer;
+
+	/** @var  IL10N */
+	protected $l;
+
+	/** @var  QuestionHelper */
+	protected $questionHelper;
+
+	/** @var  OutputInterface */
+	protected $output;
+
+	/** @var  InputInterface */
+	protected $input;
+
+	/** @var ISecureRandom */
+	protected $secureRandom;
+
+	/**
+	 * @param Setup $userSetup
+	 * @param IUserManager $userManager
+	 * @param View $rootView
+	 * @param KeyManager $keyManager
+	 * @param IConfig $config
+	 * @param IMailer $mailer
+	 * @param IL10N $l
+	 * @param QuestionHelper $questionHelper
+	 * @param ISecureRandom $secureRandom
+	 */
+	public function __construct(
+		Setup $userSetup,
+		IUserManager $userManager,
+		View $rootView,
+		KeyManager $keyManager,
+		IConfig $config,
+		IMailer $mailer,
+		IL10N $l,
+		QuestionHelper $questionHelper,
+		ISecureRandom $secureRandom
+	) {
+		$this->userSetup = $userSetup;
+		$this->userManager = $userManager;
+		$this->rootView = $rootView;
+		$this->keyManager = $keyManager;
+		$this->config = $config;
+		$this->mailer = $mailer;
+		$this->l = $l;
+		$this->questionHelper = $questionHelper;
+		$this->secureRandom = $secureRandom;
+		// store one time passwords for the users
+		$this->userPasswords = array();
+	}
+
+	/**
+	 * start to encrypt all files
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 */
+	public function encryptAll(InputInterface $input, OutputInterface $output) {
+
+		$this->input = $input;
+		$this->output = $output;
+
+		$headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
+		$this->output->writeln("\n");
+		$this->output->writeln($headline);
+		$this->output->writeln(str_pad('', strlen($headline), '='));
+
+		//create private/public keys for each user and store the private key password
+		$this->output->writeln("\n");
+		$this->output->writeln('Create key-pair for every user');
+		$this->output->writeln('------------------------------');
+		$this->output->writeln('');
+		$this->output->writeln('This module will encrypt all files in the users files folder initially.');
+		$this->output->writeln('Already existing versions and files in the trash bin will not be encrypted.');
+		$this->output->writeln('');
+		$this->createKeyPairs();
+
+		//setup users file system and encrypt all files one by one (take should encrypt setting of storage into account)
+		$this->output->writeln("\n");
+		$this->output->writeln('Start to encrypt users files');
+		$this->output->writeln('----------------------------');
+		$this->output->writeln('');
+		$this->encryptAllUsersFiles();
+		//send-out or display password list and write it to a file
+		$this->output->writeln("\n");
+		$this->output->writeln('Generated encryption key passwords');
+		$this->output->writeln('----------------------------------');
+		$this->output->writeln('');
+		$this->outputPasswords();
+		$this->output->writeln("\n");
+	}
+
+	/**
+	 * create key-pair for every user
+	 */
+	protected function createKeyPairs() {
+		$this->output->writeln("\n");
+		$progress = new ProgressBar($this->output);
+		$progress->setFormat(" %message% \n [%bar%]");
+		$progress->start();
+
+		foreach($this->userManager->getBackends() as $backend) {
+			$limit = 500;
+			$offset = 0;
+			do {
+				$users = $backend->getUsers('', $limit, $offset);
+				foreach ($users as $user) {
+					if ($this->keyManager->userHasKeys($user) === false) {
+						$progress->setMessage('Create key-pair for ' . $user);
+						$progress->advance();
+						$this->setupUserFS($user);
+						$password = $this->generateOneTimePassword($user);
+						$this->userSetup->setupUser($user, $password);
+					} else {
+						// users which already have a key-pair will be stored with a
+						// empty password and filtered out later
+						$this->userPasswords[$user] = '';
+					}
+				}
+				$offset += $limit;
+			} while(count($users) >= $limit);
+		}
+
+		$progress->setMessage('Key-pair created for all users');
+		$progress->finish();
+	}
+
+	/**
+	 * iterate over all user and encrypt their files
+	 */
+	protected function encryptAllUsersFiles() {
+		$this->output->writeln("\n");
+		$progress = new ProgressBar($this->output);
+		$progress->setFormat(" %message% \n [%bar%]");
+		$progress->start();
+		$numberOfUsers = count($this->userPasswords);
+		$userNo = 1;
+		foreach ($this->userPasswords as $uid => $password) {
+			$userCount = "$uid ($userNo of $numberOfUsers)";
+			$this->encryptUsersFiles($uid, $progress, $userCount);
+			$userNo++;
+		}
+		$progress->setMessage("all files encrypted");
+		$progress->finish();
+
+	}
+
+	/**
+	 * encrypt files from the given user
+	 *
+	 * @param string $uid
+	 * @param ProgressBar $progress
+	 * @param string $userCount
+	 */
+	protected function encryptUsersFiles($uid, ProgressBar $progress, $userCount) {
+
+		$this->setupUserFS($uid);
+		$directories = array();
+		$directories[] =  '/' . $uid . '/files';
+
+		while($root = array_pop($directories)) {
+			$content = $this->rootView->getDirectoryContent($root);
+			foreach ($content as $file) {
+				$path = $root . '/' . $file['name'];
+				if ($this->rootView->is_dir($path)) {
+					$directories[] = $path;
+					continue;
+				} else {
+					$progress->setMessage("encrypt files for user $userCount: $path");
+					$progress->advance();
+					if($this->encryptFile($path) === false) {
+						$progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
+						$progress->advance();
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * encrypt file
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	protected function encryptFile($path) {
+
+		$source = $path;
+		$target = $path . '.encrypted.' . time();
+
+		try {
+			$this->rootView->copy($source, $target);
+			$this->rootView->rename($target, $source);
+		} catch (DecryptionFailedException $e) {
+			if ($this->rootView->file_exists($target)) {
+				$this->rootView->unlink($target);
+			}
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * output one-time encryption passwords
+	 */
+	protected function outputPasswords() {
+		$table = new Table($this->output);
+		$table->setHeaders(array('Username', 'Private key password'));
+
+		//create rows
+		$newPasswords = array();
+		$unchangedPasswords = array();
+		foreach ($this->userPasswords as $uid => $password) {
+			if (empty($password)) {
+				$unchangedPasswords[] = $uid;
+			} else {
+				$newPasswords[] = [$uid, $password];
+			}
+		}
+		$table->setRows($newPasswords);
+		$table->render();
+
+		if (!empty($unchangedPasswords)) {
+			$this->output->writeln("\nThe following users already had a key-pair which was reused without setting a new password:\n");
+			foreach ($unchangedPasswords as $uid) {
+				$this->output->writeln("    $uid");
+			}
+		}
+
+		$this->writePasswordsToFile($newPasswords);
+
+		$this->output->writeln('');
+		$question = new ConfirmationQuestion('Do you want to send the passwords directly to the users by mail? (y/n) ', false);
+		if ($this->questionHelper->ask($this->input, $this->output, $question)) {
+			$this->sendPasswordsByMail();
+		}
+	}
+
+	/**
+	 * write one-time encryption passwords to a csv file
+	 *
+	 * @param array $passwords
+	 */
+	protected function writePasswordsToFile(array $passwords) {
+		$fp = $this->rootView->fopen('oneTimeEncryptionPasswords.csv', 'w');
+		foreach ($passwords as $pwd) {
+			fputcsv($fp, $pwd);
+		}
+		fclose($fp);
+		$this->output->writeln("\n");
+		$this->output->writeln('A list of all newly created passwords was written to data/oneTimeEncryptionPasswords.csv');
+		$this->output->writeln('');
+		$this->output->writeln('Each of these users need to login to the web interface, go to the');
+		$this->output->writeln('personal settings section "ownCloud basic encryption module" and');
+		$this->output->writeln('update the private key password to match the login password again by');
+		$this->output->writeln('entering the one-time password into the "old log-in password" field');
+		$this->output->writeln('and their current login password');
+	}
+
+	/**
+	 * setup user file system
+	 *
+	 * @param string $uid
+	 */
+	protected function setupUserFS($uid) {
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($uid);
+	}
+
+	/**
+	 * generate one time password for the user and store it in a array
+	 *
+	 * @param string $uid
+	 * @return string password
+	 */
+	protected function generateOneTimePassword($uid) {
+		$password = $this->secureRandom->getMediumStrengthGenerator()->generate(8);
+		$this->userPasswords[$uid] = $password;
+		return $password;
+	}
+
+	/**
+	 * send encryption key passwords to the users by mail
+	 */
+	protected function sendPasswordsByMail() {
+		$noMail = [];
+
+		$this->output->writeln('');
+		$progress = new ProgressBar($this->output, count($this->userPasswords));
+		$progress->start();
+
+		foreach ($this->userPasswords as $recipient => $password) {
+			$progress->advance();
+			if (!empty($password)) {
+				$recipientDisplayName = $this->userManager->get($recipient)->getDisplayName();
+				$to = $this->config->getUserValue($recipient, 'settings', 'email', '');
+
+				if ($to === '') {
+					$noMail[] = $recipient;
+					continue;
+				}
+
+				$subject = (string)$this->l->t('one-time password for server-side-encryption');
+				list($htmlBody, $textBody) = $this->createMailBody($password);
+
+				// send it out now
+				try {
+					$message = $this->mailer->createMessage();
+					$message->setSubject($subject);
+					$message->setTo([$to => $recipientDisplayName]);
+					$message->setHtmlBody($htmlBody);
+					$message->setPlainBody($textBody);
+					$message->setFrom([
+						\OCP\Util::getDefaultEmailAddress('admin-noreply')
+					]);
+
+					$this->mailer->send($message);
+				} catch (\Exception $e) {
+					$noMail[] = $recipient;
+				}
+			}
+		}
+
+		$progress->finish();
+
+		if (empty($noMail)) {
+			$this->output->writeln("\n\nPassword successfully send to all users");
+		} else {
+			$table = new Table($this->output);
+			$table->setHeaders(array('Username', 'Private key password'));
+			$this->output->writeln("\n\nCould not send password to following users:\n");
+			$rows = [];
+			foreach ($noMail as $uid) {
+				$rows[] = [$uid, $this->userPasswords[$uid]];
+			}
+			$table->setRows($rows);
+			$table->render();
+		}
+
+	}
+
+	/**
+	 * create mail body for plain text and html mail
+	 *
+	 * @param string $password one-time encryption password
+	 * @return array an array of the html mail body and the plain text mail body
+	 */
+	protected function createMailBody($password) {
+
+		$html = new \OC_Template("encryption", "mail", "");
+		$html->assign ('password', $password);
+		$htmlMail = $html->fetchPage();
+
+		$plainText = new \OC_Template("encryption", "altmail", "");
+		$plainText->assign ('password', $password);
+		$plainTextMail = $plainText->fetchPage();
+
+		return [$htmlMail, $plainTextMail];
+	}
+
+}
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 1fa0581506b..1bd6af2eca7 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -35,6 +35,8 @@ use OCP\Encryption\IEncryptionModule;
 use OCA\Encryption\KeyManager;
 use OCP\IL10N;
 use OCP\ILogger;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class Encryption implements IEncryptionModule {
 
@@ -79,22 +81,28 @@ class Encryption implements IEncryptionModule {
 	/** @var IL10N */
 	private $l;
 
+	/** @var EncryptAll */
+	private $encryptAll;
+
 	/**
 	 *
 	 * @param Crypt $crypt
 	 * @param KeyManager $keyManager
 	 * @param Util $util
+	 * @param EncryptAll $encryptAll
 	 * @param ILogger $logger
 	 * @param IL10N $il10n
 	 */
 	public function __construct(Crypt $crypt,
 								KeyManager $keyManager,
 								Util $util,
+								EncryptAll $encryptAll,
 								ILogger $logger,
 								IL10N $il10n) {
 		$this->crypt = $crypt;
 		$this->keyManager = $keyManager;
 		$this->util = $util;
+		$this->encryptAll = $encryptAll;
 		$this->logger = $logger;
 		$this->l = $il10n;
 	}
@@ -397,6 +405,17 @@ class Encryption implements IEncryptionModule {
 		return true;
 	}
 
+	/**
+	 * Initial encryption of all files
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output write some status information to the terminal during encryption
+	 * @return bool
+	 */
+	public function encryptAll(InputInterface $input, OutputInterface $output) {
+		return $this->encryptAll->encryptAll($input, $output);
+	}
+
 	/**
 	 * @param string $path
 	 * @return string
diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/users/setup.php
index f224826ed52..433ea824c9b 100644
--- a/apps/encryption/lib/users/setup.php
+++ b/apps/encryption/lib/users/setup.php
@@ -76,6 +76,8 @@ class Setup {
 	}
 
 	/**
+	 * check if user has a key pair, if not we create one
+	 *
 	 * @param string $uid userid
 	 * @param string $password user password
 	 * @return bool
diff --git a/apps/encryption/templates/altmail.php b/apps/encryption/templates/altmail.php
new file mode 100644
index 00000000000..b92c6b4a7c4
--- /dev/null
+++ b/apps/encryption/templates/altmail.php
@@ -0,0 +1,16 @@
+<?php
+/** @var OC_Theme $theme */
+/** @var array $_ */
+
+print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", array($_['password'])));
+if ( isset($_['expiration']) ) {
+	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
+	print_unescaped("\n\n");
+}
+// TRANSLATORS term at the end of a mail
+p($l->t("Cheers!"));
+?>
+
+	--
+<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
+<?php print_unescaped("\n".$theme->getBaseUrl());
diff --git a/apps/encryption/templates/mail.php b/apps/encryption/templates/mail.php
new file mode 100644
index 00000000000..2b61e915dec
--- /dev/null
+++ b/apps/encryption/templates/mail.php
@@ -0,0 +1,39 @@
+<?php
+/** @var OC_Theme $theme */
+/** @var array $_ */
+?>
+<table cellspacing="0" cellpadding="0" border="0" width="100%">
+	<tr><td>
+			<table cellspacing="0" cellpadding="0" border="0" width="600px">
+				<tr>
+					<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
+					<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
+						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+					</td>
+				</tr>
+				<tr><td colspan="2">&nbsp;</td></tr>
+				<tr>
+					<td width="20px">&nbsp;</td>
+					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
+						<?php
+						print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "ownCloud basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', array($_['password'])));
+						// TRANSLATORS term at the end of a mail
+						p($l->t('Cheers!'));
+						?>
+					</td>
+				</tr>
+				<tr><td colspan="2">&nbsp;</td></tr>
+				<tr>
+					<td width="20px">&nbsp;</td>
+					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
+						<?php p($theme->getName()); ?> -
+						<?php p($theme->getSlogan()); ?>
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2">&nbsp;</td>
+				</tr>
+			</table>
+		</td></tr>
+</table>
diff --git a/apps/encryption/tests/lib/crypto/encryptalltest.php b/apps/encryption/tests/lib/crypto/encryptalltest.php
new file mode 100644
index 00000000000..e907d154a2d
--- /dev/null
+++ b/apps/encryption/tests/lib/crypto/encryptalltest.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace OCA\Encryption\Tests\lib\Crypto;
+
+
+use OCA\Encryption\Crypto\EncryptAll;
+use Test\TestCase;
+
+class EncryptAllTest extends TestCase {
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCA\Encryption\KeyManager */
+	protected $keyManager;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\IUserManager */
+	protected $userManager;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCA\Encryption\Users\Setup */
+	protected $setupUser;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OC\Files\View */
+	protected $view;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\IConfig */
+	protected $config;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\Mail\IMailer */
+	protected $mailer;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\IL10N */
+	protected $l;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Helper\QuestionHelper */
+	protected $questionHelper;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Input\InputInterface */
+	protected $inputInterface;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Output\OutputInterface */
+	protected $outputInterface;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\UserInterface */
+	protected $userInterface;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\Security\ISecureRandom  */
+	protected $secureRandom;
+
+	/** @var  EncryptAll */
+	protected $encryptAll;
+
+	function setUp() {
+		parent::setUp();
+		$this->setupUser = $this->getMockBuilder('OCA\Encryption\Users\Setup')
+			->disableOriginalConstructor()->getMock();
+		$this->keyManager = $this->getMockBuilder('OCA\Encryption\KeyManager')
+			->disableOriginalConstructor()->getMock();
+		$this->userManager = $this->getMockBuilder('OCP\IUserManager')
+			->disableOriginalConstructor()->getMock();
+		$this->view = $this->getMockBuilder('OC\Files\View')
+			->disableOriginalConstructor()->getMock();
+		$this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$this->mailer = $this->getMockBuilder('OCP\Mail\IMailer')
+			->disableOriginalConstructor()->getMock();
+		$this->l = $this->getMockBuilder('OCP\IL10N')
+			->disableOriginalConstructor()->getMock();
+		$this->questionHelper = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
+			->disableOriginalConstructor()->getMock();
+		$this->inputInterface = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')
+			->disableOriginalConstructor()->getMock();
+		$this->outputInterface = $this->getMockBuilder('Symfony\Component\Console\Output\OutputInterface')
+			->disableOriginalConstructor()->getMock();
+		$this->userInterface = $this->getMockBuilder('OCP\UserInterface')
+			->disableOriginalConstructor()->getMock();
+
+
+		$this->outputInterface->expects($this->any())->method('getFormatter')
+			->willReturn($this->getMock('\Symfony\Component\Console\Formatter\OutputFormatterInterface'));
+
+		$this->userManager->expects($this->any())->method('getBackends')->willReturn([$this->userInterface]);
+		$this->userInterface->expects($this->any())->method('getUsers')->willReturn(['user1', 'user2']);
+
+		$this->secureRandom = $this->getMockBuilder('OCP\Security\ISecureRandom')->disableOriginalConstructor()->getMock();
+		$this->secureRandom->expects($this->any())->method('getMediumStrengthGenerator')->willReturn($this->secureRandom);
+		$this->secureRandom->expects($this->any())->method('getLowStrengthGenerator')->willReturn($this->secureRandom);
+		$this->secureRandom->expects($this->any())->method('generate')->willReturn('12345678');
+
+
+		$this->encryptAll = new EncryptAll(
+			$this->setupUser,
+			$this->userManager,
+			$this->view,
+			$this->keyManager,
+			$this->config,
+			$this->mailer,
+			$this->l,
+			$this->questionHelper,
+			$this->secureRandom
+		);
+	}
+
+	public function testEncryptAll() {
+		/** @var EncryptAll  | \PHPUnit_Framework_MockObject_MockObject  $encryptAll */
+		$encryptAll = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
+			->setConstructorArgs(
+				[
+					$this->setupUser,
+					$this->userManager,
+					$this->view,
+					$this->keyManager,
+					$this->config,
+					$this->mailer,
+					$this->l,
+					$this->questionHelper,
+					$this->secureRandom
+				]
+			)
+			->setMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords'])
+			->getMock();
+
+		$encryptAll->expects($this->at(0))->method('createKeyPairs')->with();
+		$encryptAll->expects($this->at(1))->method('encryptAllUsersFiles')->with();
+		$encryptAll->expects($this->at(2))->method('outputPasswords')->with();
+
+		$encryptAll->encryptAll($this->inputInterface, $this->outputInterface);
+
+	}
+
+	public function testCreateKeyPairs() {
+		/** @var EncryptAll  | \PHPUnit_Framework_MockObject_MockObject  $encryptAll */
+		$encryptAll = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
+			->setConstructorArgs(
+				[
+					$this->setupUser,
+					$this->userManager,
+					$this->view,
+					$this->keyManager,
+					$this->config,
+					$this->mailer,
+					$this->l,
+					$this->questionHelper,
+					$this->secureRandom
+				]
+			)
+			->setMethods(['setupUserFS', 'generateOneTimePassword'])
+			->getMock();
+
+
+		// set protected property $output
+		$this->invokePrivate($encryptAll, 'output', [$this->outputInterface]);
+
+		$this->keyManager->expects($this->exactly(2))->method('userHasKeys')
+			->willReturnCallback(
+				function ($user) {
+					if ($user === 'user1') {
+						return false;
+					}
+					return true;
+				}
+			);
+
+		$encryptAll->expects($this->once())->method('setupUserFS')->with('user1');
+		$encryptAll->expects($this->once())->method('generateOneTimePassword')->with('user1')->willReturn('password');
+		$this->setupUser->expects($this->once())->method('setupUser')->with('user1', 'password');
+
+		$this->invokePrivate($encryptAll, 'createKeyPairs');
+
+		$userPasswords = $this->invokePrivate($encryptAll, 'userPasswords');
+
+		// we only expect the skipped user, because generateOneTimePassword which
+		// would set the user with the new password was mocked.
+		// This method will be tested separately
+		$this->assertSame(1, count($userPasswords));
+		$this->assertSame('', $userPasswords['user2']);
+	}
+
+	public function testEncryptAllUsersFiles() {
+		/** @var EncryptAll  | \PHPUnit_Framework_MockObject_MockObject  $encryptAll */
+		$encryptAll = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
+			->setConstructorArgs(
+				[
+					$this->setupUser,
+					$this->userManager,
+					$this->view,
+					$this->keyManager,
+					$this->config,
+					$this->mailer,
+					$this->l,
+					$this->questionHelper,
+					$this->secureRandom
+				]
+			)
+			->setMethods(['encryptUsersFiles'])
+			->getMock();
+
+		// set protected property $output
+		$this->invokePrivate($encryptAll, 'output', [$this->outputInterface]);
+		$this->invokePrivate($encryptAll, 'userPasswords', [['user1' => 'pwd1', 'user2' => 'pwd2']]);
+
+		$encryptAll->expects($this->at(0))->method('encryptUsersFiles')->with('user1');
+		$encryptAll->expects($this->at(1))->method('encryptUsersFiles')->with('user2');
+
+		$this->invokePrivate($encryptAll, 'encryptAllUsersFiles');
+
+	}
+
+	public function testEncryptUsersFiles() {
+		/** @var EncryptAll  | \PHPUnit_Framework_MockObject_MockObject  $encryptAll */
+		$encryptAll = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
+			->setConstructorArgs(
+				[
+					$this->setupUser,
+					$this->userManager,
+					$this->view,
+					$this->keyManager,
+					$this->config,
+					$this->mailer,
+					$this->l,
+					$this->questionHelper,
+					$this->secureRandom
+				]
+			)
+			->setMethods(['encryptFile'])
+			->getMock();
+
+
+		$this->view->expects($this->at(0))->method('getDirectoryContent')
+			->with('/user1/files')->willReturn(
+				[
+					['name' => 'foo', 'type'=>'dir'],
+					['name' => 'bar', 'type'=>'file'],
+				]
+			);
+
+		$this->view->expects($this->at(3))->method('getDirectoryContent')
+			->with('/user1/files/foo')->willReturn(
+				[
+					['name' => 'subfile', 'type'=>'file']
+				]
+			);
+
+		$this->view->expects($this->any())->method('is_dir')
+			->willReturnCallback(
+				function($path) {
+					if ($path === '/user1/files/foo') {
+						return true;
+					}
+					return false;
+				}
+			);
+
+		$encryptAll->expects($this->at(0))->method('encryptFile')->with('/user1/files/bar');
+		$encryptAll->expects($this->at(1))->method('encryptFile')->with('/user1/files/foo/subfile');
+
+		$progressBar = $this->getMockBuilder('Symfony\Component\Console\Helper\ProgressBar')
+			->disableOriginalConstructor()->getMock();
+
+		$this->invokePrivate($encryptAll, 'encryptUsersFiles', ['user1', $progressBar, '']);
+
+	}
+
+	public function testGenerateOneTimePassword() {
+		$password = $this->invokePrivate($this->encryptAll, 'generateOneTimePassword', ['user1']);
+		$this->assertTrue(is_string($password));
+		$this->assertSame(8, strlen($password));
+
+		$userPasswords = $this->invokePrivate($this->encryptAll, 'userPasswords');
+		$this->assertSame(1, count($userPasswords));
+		$this->assertSame($password, $userPasswords['user1']);
+	}
+
+}
diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php
index 7b0b29fe197..f58aa5d3ccb 100644
--- a/apps/encryption/tests/lib/crypto/encryptionTest.php
+++ b/apps/encryption/tests/lib/crypto/encryptionTest.php
@@ -36,6 +36,9 @@ class EncryptionTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	private $keyManagerMock;
 
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	private $encryptAllMock;
+
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	private $cryptMock;
 
@@ -60,6 +63,9 @@ class EncryptionTest extends TestCase {
 		$this->keyManagerMock = $this->getMockBuilder('OCA\Encryption\KeyManager')
 			->disableOriginalConstructor()
 			->getMock();
+		$this->encryptAllMock = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->loggerMock = $this->getMockBuilder('OCP\ILogger')
 			->disableOriginalConstructor()
 			->getMock();
@@ -75,6 +81,7 @@ class EncryptionTest extends TestCase {
 			$this->cryptMock,
 			$this->keyManagerMock,
 			$this->utilMock,
+			$this->encryptAllMock,
 			$this->loggerMock,
 			$this->l10nMock
 		);
diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
new file mode 100644
index 00000000000..db413a33d92
--- /dev/null
+++ b/core/command/encryption/encryptall.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Core\Command\Encryption;
+
+use OCP\App\IAppManager;
+use OCP\Encryption\IManager;
+use OCP\IConfig;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+class EncryptAll extends Command {
+
+	/** @var IManager */
+	protected $encryptionManager;
+
+	/** @var  IAppManager */
+	protected $appManager;
+
+	/** @var IConfig */
+	protected $config;
+
+	/** @var  QuestionHelper */
+	protected $questionHelper;
+
+	/** @var bool */
+	protected $wasTrashbinEnabled;
+
+	/** @var  bool */
+	protected $wasSingleUserModeEnabled;
+
+	/**
+	 * @param IManager $encryptionManager
+	 * @param IAppManager $appManager
+	 * @param IConfig $config
+	 * @param QuestionHelper $questionHelper
+	 */
+	public function __construct(
+		IManager $encryptionManager,
+		IAppManager $appManager,
+		IConfig $config,
+		QuestionHelper $questionHelper
+	) {
+		parent::__construct();
+		$this->appManager = $appManager;
+		$this->encryptionManager = $encryptionManager;
+		$this->config = $config;
+		$this->questionHelper = $questionHelper;
+		$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
+		$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleUser', false);
+		$this->config->setSystemValue('singleUser', true);
+		$this->appManager->disableApp('files_trashbin');
+	}
+
+	public function __destruct() {
+		$this->config->setSystemValue('singleUser', $this->wasSingleUserModeEnabled);
+		if ($this->wasTrashbinEnabled) {
+			$this->appManager->enableApp('files_trashbin');
+		}
+	}
+
+	protected function configure() {
+		parent::configure();
+
+		$this->setName('encryption:encrypt_all');
+		$this->setDescription(
+			'This will encrypt all files for all users. '
+			. 'Please make sure that no user access his files during this process!'
+		);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+
+		if ($this->encryptionManager->isEnabled() === false) {
+			throw new \Exception('Server side encryption is not enabled');
+		}
+
+		$output->writeln("\n");
+		$output->writeln('You are about to start to encrypt all files stored in your ownCloud.');
+		$output->writeln('It will depend on the encryption module you use which files get encrypted.');
+		$output->writeln('Depending on the number and size of your files this can take some time');
+		$output->writeln('Please make sure that no user access his files during this process!');
+		$output->writeln('');
+		$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
+		if ($this->questionHelper->ask($input, $output, $question)) {
+			$defaultModule = $this->encryptionManager->getEncryptionModule();
+			$defaultModule->encryptAll($input, $output);
+		} else {
+			$output->writeln('aborted');
+		}
+	}
+
+}
diff --git a/core/register_command.php b/core/register_command.php
index 6cd81b4c3b7..86816f10419 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -57,6 +57,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
 	$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
 	$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
+	$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
 
 	$application->add(new OC\Core\Command\Maintenance\MimeTypesJS());
 	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php
index 183b322e714..a5cd7075691 100644
--- a/lib/public/encryption/iencryptionmodule.php
+++ b/lib/public/encryption/iencryptionmodule.php
@@ -23,6 +23,8 @@
  */
 
 namespace OCP\Encryption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Interface IEncryptionModule
@@ -134,4 +136,14 @@ interface IEncryptionModule {
 	 */
 	public function isReadable($path, $uid);
 
+	/**
+	 * Initial encryption of all files
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output write some status information to the terminal during encryption
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function encryptAll(InputInterface $input, OutputInterface $output);
+
 }
diff --git a/tests/core/command/encryption/encryptalltest.php b/tests/core/command/encryption/encryptalltest.php
new file mode 100644
index 00000000000..41edee6987c
--- /dev/null
+++ b/tests/core/command/encryption/encryptalltest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace Tests\Core\Command\Encryption;
+
+
+use OC\Core\Command\Encryption\EncryptAll;
+use Test\TestCase;
+
+class EncryptAllTest extends TestCase {
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IConfig */
+	protected $config;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\Encryption\IManager  */
+	protected $encryptionManager;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\App\IAppManager  */
+	protected $appManager;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject  | \Symfony\Component\Console\Input\InputInterface */
+	protected $consoleInput;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Output\OutputInterface */
+	protected $consoleOutput;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Helper\QuestionHelper */
+	protected $questionHelper;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\Encryption\IEncryptionModule */
+	protected $encryptionModule;
+
+	/** @var  EncryptAll */
+	protected $command;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->encryptionManager = $this->getMockBuilder('OCP\Encryption\IManager')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->appManager = $this->getMockBuilder('OCP\App\IAppManager')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->questionHelper = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+
+	}
+
+	public function testEncryptAll() {
+		// trash bin needs to be disabled in order to avoid adding dummy files to the users
+		// trash bin which gets deleted during the encryption process
+		$this->appManager->expects($this->once())->method('disableApp')->with('files_trashbin');
+		// enable single user mode to avoid that other user login during encryption
+		// destructor should disable the single user mode again
+		$this->config->expects($this->once())->method('getSystemValue')->with('singleUser', false)->willReturn(false);
+		$this->config->expects($this->at(1))->method('setSystemValue')->with('singleUser', true);
+		$this->config->expects($this->at(2))->method('setSystemValue')->with('singleUser', false);
+
+		new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
+	}
+
+	/**
+	 * @dataProvider dataTestExecute
+	 */
+	public function testExecute($answer, $askResult) {
+
+		$command = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
+
+		$this->encryptionManager->expects($this->once())->method('isEnabled')->willReturn(true);
+		$this->questionHelper->expects($this->once())->method('ask')->willReturn($askResult);
+
+		if ($answer === 'Y' || $answer === 'y') {
+			$this->encryptionManager->expects($this->once())
+				->method('getEncryptionModule')->willReturn($this->encryptionModule);
+			$this->encryptionModule->expects($this->once())
+				->method('encryptAll')->with($this->consoleInput, $this->consoleOutput);
+		} else {
+			$this->encryptionManager->expects($this->never())->method('getEncryptionModule');
+			$this->encryptionModule->expects($this->never())->method('encryptAll');
+		}
+
+		$this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function dataTestExecute() {
+		return [
+			['y', true], ['Y', true], ['n', false], ['N', false], ['', false]
+		];
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testExecuteException() {
+		$command = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
+		$this->encryptionManager->expects($this->once())->method('isEnabled')->willReturn(false);
+		$this->encryptionManager->expects($this->never())->method('getEncryptionModule');
+		$this->encryptionModule->expects($this->never())->method('encryptAll');
+		$this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+}
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index c49e6bb0d1f..3d1bf1077a2 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -194,7 +194,7 @@ class Encryption extends \Test\Files\Storage\Storage {
 	protected function buildMockModule() {
 		$this->encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule')
 			->disableOriginalConstructor()
-			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable'])
+			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable', 'encryptAll'])
 			->getMock();
 
 		$this->encryptionModule->expects($this->any())->method('getId')->willReturn('UNIT_TEST_MODULE');
diff --git a/tests/lib/files/stream/encryption.php b/tests/lib/files/stream/encryption.php
index 281ec0a14a0..ed3b5b1b156 100644
--- a/tests/lib/files/stream/encryption.php
+++ b/tests/lib/files/stream/encryption.php
@@ -305,7 +305,7 @@ class Encryption extends \Test\TestCase {
 	protected function buildMockModule() {
 		$encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule')
 			->disableOriginalConstructor()
-			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable'])
+			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable', 'encryptAll'])
 			->getMock();
 
 		$encryptionModule->expects($this->any())->method('getId')->willReturn('UNIT_TEST_MODULE');
-- 
GitLab


From e51fe617d89fd515e9e6836f205f67c613939b41 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 24 Aug 2015 15:57:03 +0200
Subject: [PATCH 046/783] copy always file by file to encrypt/decrypt it if
 needed

---
 .../files/storage/wrapper/encryption.php      | 44 +++++--------
 .../lib/files/storage/wrapper/encryption.php  | 61 +++----------------
 2 files changed, 23 insertions(+), 82 deletions(-)

diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 4ba9b21ddb4..805a2bc1ad0 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -67,7 +67,6 @@ class Encryption extends Wrapper {
 	/** @var IMountPoint */
 	private $mount;
 
-
 	/** @var IStorage */
 	private $keyStorage;
 
@@ -300,33 +299,15 @@ class Encryption extends Wrapper {
 	public function copy($path1, $path2) {
 
 		$source = $this->getFullPath($path1);
-		$target = $this->getFullPath($path2);
 
 		if ($this->util->isExcluded($source)) {
 			return $this->storage->copy($path1, $path2);
 		}
 
-		$result = $this->storage->copy($path1, $path2);
-
-		if ($result && $this->encryptionManager->isEnabled()) {
-			$keysCopied = $this->copyKeys($source, $target);
-
-			if ($keysCopied &&
-				dirname($source) !== dirname($target) &&
-				$this->util->isFile($target)
-			) {
-				$this->update->update($target);
-			}
-
-			$data = $this->getMetaData($path1);
-
-			if (isset($data['encrypted'])) {
-				$this->getCache()->put($path2, ['encrypted' => $data['encrypted']]);
-			}
-			if (isset($data['size'])) {
-				$this->updateUnencryptedSize($target, $data['size']);
-			}
-		}
+		// need to stream copy file by file in case we copy between a encrypted
+		// and a unencrypted storage
+		$this->unlink($path2);
+		$result = $this->copyFromStorage($this, $path1, $path2);
 
 		return $result;
 	}
@@ -511,12 +492,17 @@ class Encryption extends Wrapper {
 				}
 			}
 		} else {
-			$source = $sourceStorage->fopen($sourceInternalPath, 'r');
-			$target = $this->fopen($targetInternalPath, 'w');
-			list(, $result) = \OC_Helper::streamCopy($source, $target);
-			fclose($source);
-			fclose($target);
-
+			try {
+				$source = $sourceStorage->fopen($sourceInternalPath, 'r');
+				$target = $this->fopen($targetInternalPath, 'w');
+				list(, $result) = \OC_Helper::streamCopy($source, $target);
+				fclose($source);
+				fclose($target);
+			} catch (\Exception $e) {
+				fclose($source);
+				fclose($target);
+				throw $e;
+			}
 			if($result) {
 				if ($preserveMtime) {
 					$this->touch($targetInternalPath, $sourceStorage->filemtime($sourceInternalPath));
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index 3d1bf1077a2..36a5b288c64 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -241,59 +241,14 @@ class Encryption extends \Test\Files\Storage\Storage {
 		$this->instance->rename($source, $target);
 	}
 
-	/**
-	 * @dataProvider dataTestCopyAndRename
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @param $encryptionEnabled
-	 * @param boolean $copyKeysReturn
-	 * @param boolean $shouldUpdate
-	 */
-	public function testCopyEncryption($source,
-							 $target,
-							 $encryptionEnabled,
-							 $copyKeysReturn,
-							 $shouldUpdate) {
-
-		if ($encryptionEnabled) {
-			$this->keyStore
-				->expects($this->once())
-				->method('copyKeys')
-				->willReturn($copyKeysReturn);
-			$this->cache->expects($this->atLeastOnce())
-				->method('put')
-				->willReturnCallback(function($path, $data) {
-					$this->assertArrayHasKey('encrypted', $data);
-					$this->assertTrue($data['encrypted']);
-				});
-		} else {
-			$this->cache->expects($this->never())->method('put');
-			$this->keyStore->expects($this->never())->method('copyKeys');
-		}
-		$this->util->expects($this->any())
-			->method('isFile')->willReturn(true);
-		$this->util->expects($this->any())
-			->method('isExcluded')->willReturn(false);
-		$this->encryptionManager->expects($this->once())
-			->method('isEnabled')->willReturn($encryptionEnabled);
-		if ($shouldUpdate) {
-			$this->update->expects($this->once())
-				->method('update');
-		} else {
-			$this->update->expects($this->never())
-				->method('update');
-		}
-
-		$this->instance->mkdir($source);
-		$this->instance->mkdir(dirname($target));
-		$this->instance->copy($source, $target);
-
-		if ($encryptionEnabled) {
-			$this->assertSame($this->dummySize,
-				$this->instance->filesize($target)
-			);
-		}
+	public function testCopyEncryption() {
+		$this->instance->file_put_contents('source.txt', 'bar');
+		$this->instance->copy('source.txt', 'target.txt');
+		$this->assertSame('bar', $this->instance->file_get_contents('target.txt'));
+		$targetMeta = $this->instance->getMetaData('target.txt');
+		$sourceMeta = $this->instance->getMetaData('source.txt');
+		$this->assertSame($sourceMeta['encrypted'], $targetMeta['encrypted']);
+		$this->assertSame($sourceMeta['size'], $targetMeta['size']);
 	}
 
 	/**
-- 
GitLab


From bf0c3b3d21cf918b074ffa26c018b022721a3464 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 24 Aug 2015 12:16:55 +0200
Subject: [PATCH 047/783] reduce grey tones in app navigation, bubble menu and
 scrollbar

---
 apps/files/css/files.css    |   2 +-
 apps/files/img/delete.png   | Bin 209 -> 243 bytes
 apps/files/img/delete.svg   |   2 +-
 apps/files/img/external.png | Bin 369 -> 392 bytes
 apps/files/img/external.svg |   2 +-
 apps/files/img/folder.png   | Bin 160 -> 303 bytes
 apps/files/img/folder.svg   |   4 ++--
 apps/files/img/public.png   | Bin 297 -> 307 bytes
 apps/files/img/public.svg   |   6 +++---
 apps/files/img/share.png    | Bin 365 -> 264 bytes
 apps/files/img/share.svg    |   2 +-
 apps/files/img/star.png     | Bin 373 -> 490 bytes
 apps/files/img/star.svg     |   4 ++--
 core/css/apps.css           |  41 ++++++++++++++++--------------------
 core/css/styles.css         |   2 +-
 15 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f8c1d03b666..a1b9312b152 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -133,7 +133,7 @@
 	position: fixed !important;
 	bottom: 44px;
 	width: inherit !important;
-	background-color: #f5f5f5;
+	background-color: #fff;
 }
 /* double padding to account for Deleted files entry, issue with Firefox */
 .app-files #app-navigation > ul li:nth-last-child(2) {
diff --git a/apps/files/img/delete.png b/apps/files/img/delete.png
index b2ab8c5efefab235fa4bfa1eb06afa0106116a21..e891b370cca7b3d83e937863dbbc9578c5b8b1bd 100644
GIT binary patch
delta 227
zcmcb}_?dBnL_G%^0|SHn=l_X7ilx}eGlT;OYB*9lfPBsZkH}&M2Hxu+%;=;sy8<XE
zS>hT|5}cn_Ql40p%1~Zju9umYU7Va)kgAtols@~NjTBH(fv1aOh(+(&Nr7Ak6nLB`
zSN{L~L$hMW+xyHZ_NPKLN`%{5>u%aj7V?TY<RyEJ`J_wG*2$g|T2?7BP1u}#J9)Fi
zr>WweEFT!`!Y2ng9#!1`#rm_L|MB^U&(t-XW|T<#w)um70$&irgv53YW{$t-il*cn
XUC&$i?88QNpydpnu6{1-oD!M<G#*vQ

literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF4e$wZ{r~?zkVzysV6}MxP$_>&
zkY6wZlbEu;jYmjKLSj;GRm1s7Qv-ogE}kxqAso@YCl~TI7>GC=%(iXwoH0dk#!6)d
zt~37P8V_c9`R#pTcq4Cvn@h|jhT{JxOCH2*5?}SEG4|R5iEHaMwygTiaAUH}>5lAv
QeUPg>UHx3vIVCg!03d`qr2qf`

diff --git a/apps/files/img/delete.svg b/apps/files/img/delete.svg
index b6dc2cc4173..f0a3cd4db88 100644
--- a/apps/files/img/delete.svg
+++ b/apps/files/img/delete.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path opacity=".5" d="m6.5 1-0.5 1h-3c-0.554 0-1 0.446-1 1v1h12v-1c0-0.554-0.446-1-1-1h-3l-0.5-1zm-3.5 4 0.875 9c0.061 0.549 0.5729 1 1.125 1h6c0.55232 0 1.064-0.45102 1.125-1l0.875-9z" fill-rule="evenodd"/>
+ <path d="m6.5 1-0.5 1h-3c-0.554 0-1 0.446-1 1v1h12v-1c0-0.554-0.446-1-1-1h-3l-0.5-1zm-3.5 4 0.875 9c0.061 0.549 0.5729 1 1.125 1h6c0.55232 0 1.064-0.45102 1.125-1l0.875-9z" fill-rule="evenodd"/>
 </svg>
diff --git a/apps/files/img/external.png b/apps/files/img/external.png
index 2ac5e9344c33c1abf1b12d115d91d2d3e4240650..af03dbf3e05397a5aa029b699297933729f55d56 100644
GIT binary patch
delta 376
zcmV-;0f+wa0*C{U8Gi-<001BJ|6u?C00eVFNmK|32nc)#WQYI&010qNS#tmY4c7nw
z4c7reD4Tcy000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*E^l&Yo9;Xs00036Nkl<Z
zIE|&#y)Hyy5C-69*hMFi2!)CQ(NU4m(XPe~xB)J~E$FxliGN0jhHUm0=;%bD+lItw
z&e@!--LsqQB$F@m_kJ^PW+F39B8|FWM6BXqNcc4~JB>>6CYCA*FL=j3P6q&7qoWw%
z1YNvU^tk{GTq67QDl>Z{Y~dj@j|Yq~kL_V&j^bbucXa?$HN`7<>ML&J9KYjq(85N=
zencxXyAkn;J#i>WyueLnsw&Qk-)=Ei_;!kSAv5a%ir5jF6}yeY(jLk|DVcennLicR
zG}cOEB)}*sNleT}#PS$5%_6_oBJASJ|7{zjA6PFri1HdEVhS^3bnu;-y*-FY&-oAb
WnUGyx?$P7`0000<MNUMnLSTYnGo1MV

literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}OMp*^>;M1%fy{vgdo_$60$rd}
z666=mz{teR!p6bL&BG@sA}S@TpscNHU}9$B;OXV#9}yK3mz126o>Nd#UR~d?(opg*
zP+x(ki(^OyW9f->J|;y8wuj=e++vK~H$+`ScKrX#GO53%rS{+11?OvKbGmqIs>;VW
z6|rsjXZf5b-Ce3(d(y_0$FH<yow>KM=UeKVWP7(8b21!$N4JZrr8@97E_af=nSEWZ
m+%HG&k@Si5#+K5Sg%A0U_44K|IP%y96l$KXelF{r5}E*ru~6s$

diff --git a/apps/files/img/external.svg b/apps/files/img/external.svg
index d1940f2f1b3..80eba5b9960 100644
--- a/apps/files/img/external.svg
+++ b/apps/files/img/external.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path opacity=".5" d="m7.4515 1.6186 2.3806 2.2573-3.5709 3.386 2.3806 2.2573 3.5709-3.386 2.3806 2.2573v-6.7725h-7.1422zm-4.7612 1.1286c-0.65945 0-1.1903 0.5034-1.1903 1.1286v9.029c0 0.6253 0.53085 1.1286 1.1903 1.1286h9.522c0.6594 0 1.1903-0.5034 1.1903-1.1286v-3.386l-1.19-1.1287v4.5146h-9.5217v-9.029h4.761l-1.1905-1.1287h-3.5707z"/>
+ <path d="m7.4515 1.6186 2.3806 2.2573-3.5709 3.386 2.3806 2.2573 3.5709-3.386 2.3806 2.2573v-6.7725h-7.1422zm-4.7612 1.1286c-0.65945 0-1.1903 0.5034-1.1903 1.1286v9.029c0 0.6253 0.53085 1.1286 1.1903 1.1286h9.522c0.6594 0 1.1903-0.5034 1.1903-1.1286v-3.386l-1.19-1.1287v4.5146h-9.5217v-9.029h4.761l-1.1905-1.1287h-3.5707z"/>
 </svg>
diff --git a/apps/files/img/folder.png b/apps/files/img/folder.png
index ada4c4c2f882d05c44d53a592309c44d0c6e31f2..4a8861f25ca0bc4709493b03f005491a0ba571d3 100644
GIT binary patch
literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI13?%1G+4BcTB?S0{xB_XKf?xhGdVv<mmjw9*
zGcdDq2q-EktEijVxP->UCa2Xlt=PJ4_n}jdp1=I^ZMU*&0#IqZr;B4q#jUGnZt^)8
z2sm7HoVuti>;3=#OOF_FE_Ql!wAS`y>+U%g(Lz&}#05{8)GKAYRVLYE$wbA8d(=%>
z|IFyU(kMNbYwg^kPgByo{yW)<s9k!RpzwzE=hR&*#6DCSyS&z$aayht>}yX~KbLh*
G2~7Y(dQVsY

literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ{r~?zkckFt+ujrch1g4i
z{DK*H6!Hs;>NyroKLZpp_H=O!;fPL7XkeVSC4{3{SC{u30~51^GUEx47OgaI25!p(
n5}Xy1o(67GQw~mIyV}RdQ2Rut*RtbFHpmiBS3j3^P6<r_*P$oq

diff --git a/apps/files/img/folder.svg b/apps/files/img/folder.svg
index 1a97808443d..4411b065c1c 100644
--- a/apps/files/img/folder.svg
+++ b/apps/files/img/folder.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.04 -864.43)">
-  <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2327 0.53125-0.5312l0.0004-8.1661c0-0.289-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.2771-0.30237 0.5638-0.57937 0.5638s-0.57447-0.2867-0.57447-0.5638l0.0004-7.0055c0-0.2771 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
+ <g transform="matrix(.86667 0 0 .86667 -172.04 -864.43)" fill-rule="evenodd">
+  <path style="" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2327 0.53125-0.5312l0.0004-8.1661c0-0.289-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.2771-0.30237 0.5638-0.57937 0.5638s-0.57447-0.2867-0.57447-0.5638l0.0004-7.0055c0-0.2771 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
  </g>
 </svg>
diff --git a/apps/files/img/public.png b/apps/files/img/public.png
index f49c5fb1ee555b025a3645238a90515a6baf0f8a..772838ad2058e5e6e16c9fcb13e1bb6708155238 100644
GIT binary patch
delta 205
zcmV;;05bon0<!{;BnVVcOjJex|NoIOMv*`Zf3S|B6951J8+1}mQveAI7aA!yJVQ`Y
zS7CsMh_|@8(bntm@$>fjm!aBi0001UNkl<Zc-nQ#K@Nl<5Jb^JMHCT5QNX(YJ;!94
zgpIX(o&NZq4k^0ECbN*PwO5w0@d~JtYX5owJa;)9+{SyEnf3p_zn;$WoU)OAI%&J-
zH|kC8=j9$Z9?}PTU|4Gpq@sY=2C_)2d}BDWi0dV$pz*mM*I@@bYBo!V00000NkvXX
Hu0mjf5lmjG

delta 198
zcmV;%06G7&0;vL!BnVDWOjJex|NoIOOMk=(=`jER02*{sPE!B`1q%%n8y+DjDJw8Q
zLquC#Xlr$Nd3$|-_lSV*0001RNkl<Zc-nQ#(Gox)6olaoi6oL!_WfU!8D+Y$ci)-w
z<9|9xbd617CS7Z<EMwypP+4mKcmO>2atPc;S!O2v{`cqASsqg|rJoMk?mBx@`!jiw
zabx&;4-9MV0m%w@Y)}?ym2V73=HhyZ5;T5y1EN6&)&Sqv0{{R307*qoM6N<$f*`(7
A8vp<R

diff --git a/apps/files/img/public.svg b/apps/files/img/public.svg
index 23ac51d8367..99a71c6cb5b 100644
--- a/apps/files/img/public.svg
+++ b/apps/files/img/public.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" transform="matrix(.67042 -.67042 .67042 .67042 .62542 93.143)">
-  <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m69.5-61.5c-1.9217 0-3.5 1.5783-3.5 3.5 0 0.17425 0.0062 0.33232 0.03125 0.5h2.0625c-0.053-0.156-0.094-0.323-0.094-0.5 0-0.8483 0.6517-1.5 1.5-1.5h5c0.8483 0 1.5 0.6517 1.5 1.5s-0.6517 1.5-1.5 1.5h-1.6875c-0.28733 0.79501-0.78612 1.4793-1.4375 2h3.125c1.9217 0 3.5-1.5783 3.5-3.5s-1.5783-3.5-3.5-3.5h-5z"/>
-  <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m68.5-54.5c1.9217 0 3.5-1.5783 3.5-3.5 0-0.17425-0.0062-0.33232-0.03125-0.5h-2.0625c0.053 0.156 0.094 0.323 0.094 0.5 0 0.8483-0.6517 1.5-1.5 1.5h-5c-0.8483 0-1.5-0.6517-1.5-1.5s0.6517-1.5 1.5-1.5h1.6875c0.28733-0.79501 0.78612-1.4793 1.4375-2h-3.125c-1.9217 0-3.5 1.5783-3.5 3.5s1.5783 3.5 3.5 3.5h5z"/>
+ <g transform="matrix(.67042 -.67042 .67042 .67042 .62542 93.143)">
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m69.5-61.5c-1.9217 0-3.5 1.5783-3.5 3.5 0 0.17425 0.0062 0.33232 0.03125 0.5h2.0625c-0.053-0.156-0.094-0.323-0.094-0.5 0-0.8483 0.6517-1.5 1.5-1.5h5c0.8483 0 1.5 0.6517 1.5 1.5s-0.6517 1.5-1.5 1.5h-1.6875c-0.28733 0.79501-0.78612 1.4793-1.4375 2h3.125c1.9217 0 3.5-1.5783 3.5-3.5s-1.5783-3.5-3.5-3.5h-5z"/>
+  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m68.5-54.5c1.9217 0 3.5-1.5783 3.5-3.5 0-0.17425-0.0062-0.33232-0.03125-0.5h-2.0625c0.053 0.156 0.094 0.323 0.094 0.5 0 0.8483-0.6517 1.5-1.5 1.5h-5c-0.8483 0-1.5-0.6517-1.5-1.5s0.6517-1.5 1.5-1.5h1.6875c0.28733-0.79501 0.78612-1.4793 1.4375-2h-3.125c-1.9217 0-3.5 1.5783-3.5 3.5s1.5783 3.5 3.5 3.5h5z"/>
  </g>
 </svg>
diff --git a/apps/files/img/share.png b/apps/files/img/share.png
index 61c87e78b6cc9f46d9ffec57af4e9961b6a85964..fdacbbabebcf013a5a80907b3e62cb2e3c0ee26d 100644
GIT binary patch
delta 247
zcmV<T00{r>0*C^T8Gi-<001BJ|6u?C0MAK8K~y-)WBC97KLaJ0c!dlMra-(Ii0=Y%
zB@i=_YQRMx{*Q#ch&BKST+lRw@Kk~Z0D&eDuK?nISPXDPF#rf;fjA9_<$+igh!+F#
zU#Q~8KwJ*Q%YpbP5GSGpA`rv?@gJz-e@N_SK%5K2?091V2yo7!IqxSB7XdLRQPBtl
z$I%S<3dCVR%t)*Oen9*gs`)RHL6?Cz7@tANfyf8M0YEGY#I``Z56PelK%5H1i?9YF
xo@jIc;)7VC5HlJH7!*cULZVtyrb=eQg#qdo4PA^R@Y4VQ002ovPDHLkV1nC8U~B*Y

literal 365
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}V}MVH>;M1%fy@B}jq6q!0j<|A
z3GxeOU}R!p=i=iR5|NTqP*PRb(AG0BHnFhr3Ji&iPe@8m&&bZpFRHArsjE-fZpR1I
zR^aL47*fGl+kaf>kOPmivwq7Y0VePGUHAXjD?FY#cdPyfziE7vV*Vsn?Z~&j*Ky#`
zOUna#r%%c)y;6On=a^%~mWO-7V!1ia`)>D$Y4pFnc?0){b+Pw9wH{b&w0ytRnLYt&
n-m_Ddhh&G;&G7yIbIwOrTRrXz9ku5iK_TYp>gTe~DWM4flxSBb

diff --git a/apps/files/img/share.svg b/apps/files/img/share.svg
index 97f52f2e783..d67d35c6e56 100644
--- a/apps/files/img/share.svg
+++ b/apps/files/img/share.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" transform="translate(0 -1036.4)">
+ <g transform="translate(0 -1036.4)">
   <path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-1.3565 0-2.4542 1.0977-2.4542 2.4543 0 1.3565 1.0977 2.4542 2.4542 2.4542 0.54607 0 1.0528-0.1755 1.4606-0.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/>
  </g>
 </svg>
diff --git a/apps/files/img/star.png b/apps/files/img/star.png
index 6b0ec67ec1c5729ca1d758e271c84ff1a328f707..3c66c49a8c4e07667790aa1e0597229a67ece20b 100644
GIT binary patch
literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00004b3#c}2nYxW
zd<bNS00009a7bBm000&x000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10cS}>K~zYIwbnmN98na9;b+$vf`V*}g(7ZaArXW$!NM4#jg^fl
z7wr_%`vFp<NNbncLeM}+;Rmp{NFityNk~K#Edt`AL6c%<$gs>Tb0<4LINbSj&Uw$h
zoSAzG*8rY`22~4yRw6512RK5dOvo$ziEOq^&~^f}Sr%j%w+T=agL#8PnqdvSiTg)b
z4v5dC2l(ONY+^gq<)&Clfy6eGCqV^IF@(pcMPvK*GmK^AIKfw3;5-^H+r~3kz^@J!
z|F1RCh^v~y_Yxo{c;3DQBiQdE<V%O;){oC!fb5_z3lgh>w*>+BcrUQ!-{5xu<QlI-
z07)GOfX+f^6005niESb)S*L&9e1YO#76Hu_02SJ!(mvoDyu&)KQr>?Hg^Z^p*~4VQ
zXB3}O{OTc~)kNT_)?p;8qZaWq;or#cOVt+cw6^O!N2?k(qL>dMpj}Ld1Vnm)k9nP|
g=qUh+^)T(>UjS6k{<<F%9smFU07*qoM6N<$f{HuFg#Z8m

literal 373
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}OMp*^>;M1%fy{vgdo_$60$rd}
z666=mz{teH&dtNiFCZ)`B`qT>ud1n~qibbt=iuQT5g8Smol{U$TvA$IRb5w~a=ahp
zu@X-g#}En0(1YwkO$H3E2iX^`SP_ww6Q~pM;r{<RBhO=vv5Rb$zu&N2z4ngqu4|XN
z)_E1VGzSJsdB$(nY154O8e!1;Z<g-bPfK6yJTUvtli1@fesQi-_B^c(YMQy^l}@JL
rhTz<U;L}1eeUfY6JmFa8!uo-EYdQaAv$EH_K_Tbq>gTe~DWM4fmiAYc

diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg
index fb3eef1e452..3207f6f9a46 100644
--- a/apps/files/img/star.svg
+++ b/apps/files/img/star.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" transform="matrix(.049689 0 0 .049689 -7.3558 -36.792)">
-  <path d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)"/>
+ <g transform="matrix(.049689 0 0 .049689 -7.3558 -36.792)">
+  <path style="" d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)"/>
  </g>
 </svg>
diff --git a/core/css/apps.css b/core/css/apps.css
index 17595479ae2..846eba8e4bf 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -22,7 +22,7 @@
 	height: 100%;
 	float: left;
 	-moz-box-sizing: border-box; box-sizing: border-box;
-	background-color: #f5f5f5;
+	background-color: #fff;
 	padding-bottom: 44px;
 	-webkit-user-select: none;
 	-moz-user-select: none;
@@ -42,10 +42,6 @@
 	width: 100%;
 	-moz-box-sizing: border-box; box-sizing: border-box;
 }
-#app-navigation .active,
-#app-navigation .active a {
-	background-color: #ddd;
-}
 
 #app-navigation .active.with-menu > a,
 #app-navigation .with-counter > a {
@@ -56,14 +52,6 @@
 	padding-right: 90px;
 }
 
-#app-navigation li:hover > a,
-#app-navigation li:focus > a,
-#app-navigation a:focus,
-#app-navigation .selected,
-#app-navigation .selected a {
-	background-color: #ddd;
-}
-
 #app-navigation .with-icon a,
 #app-navigation .app-navigation-entry-loading a {
 	padding-left: 44px;
@@ -82,7 +70,17 @@
 	-moz-box-sizing: border-box; box-sizing: border-box;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-	color: #333;
+	color: #000;
+	opacity: .5;
+}
+#app-navigation .active,
+#app-navigation .active a,
+#app-navigation li:hover > a,
+#app-navigation li:focus > a,
+#app-navigation a:focus,
+#app-navigation .selected,
+#app-navigation .selected a {
+	opacity: 1;
 }
 
 #app-navigation .collapse {
@@ -296,7 +294,7 @@
 .bubble,
 #app-navigation .app-navigation-entry-menu {
 	position: absolute;
-	background-color: #eee;
+	background-color: #fff;
 	color: #333;
 	border-radius: 3px;
 	border-top-right-radius: 0;
@@ -324,7 +322,7 @@
 .bubble:after,
 #app-navigation .app-navigation-entry-menu:after {
 	border-color: rgba(238, 238, 238, 0);
-	border-bottom-color: #eee;
+	border-bottom-color: #fff;
 	border-width: 10px;
 	margin-left: -10px;
 }
@@ -473,13 +471,10 @@
 #app-settings.opened #app-settings-content {
 	display: block;
 }
-#app-settings-header {
-	background-color: #eee;
-}
 #app-settings-content {
 	display: none;
 	padding: 10px;
-	background-color: #eee;
+	background-color: #fff;
 }
 #app-settings.open #app-settings-content {
 	display: block;
@@ -499,7 +494,7 @@
 	width: 100%;
 	padding: 0;
 	margin: 0;
-	background-color: transparent;
+	background-color: #fff;
 	background-image: url('../img/actions/settings.svg');
 	background-position: 14px center;
 	background-repeat: no-repeat;
@@ -512,11 +507,11 @@
 }
 .settings-button:hover,
 .settings-button:focus {
-	background-color: #ddd;
+	background-color: #fff;
 }
 .settings-button.opened:hover,
 .settings-button.opened:focus {
-	background-color: transparent;
+	background-color: #fff;
 }
 
 /* buttons */
diff --git a/core/css/styles.css b/core/css/styles.css
index 8b89837bcec..cad407b52ea 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -186,7 +186,7 @@ input img, button img, .button img {
 	background-color: transparent;
 }
 ::-webkit-scrollbar-thumb {
-	background: #ccc;
+	background: #ddd;
 }
 
 
-- 
GitLab


From c41089bcada846ac2c4f526ae4e96bea9d22f744 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 26 Aug 2015 17:28:40 +0200
Subject: [PATCH 048/783] reduce grey tones to one for list highlight

---
 apps/files/css/files.css | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index a1b9312b152..4a56490fe0f 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -96,7 +96,10 @@
 	min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
 }
 
-#filestable tbody tr { background-color:#fff; height:51px; }
+#filestable tbody tr {
+	background-color: #fff;
+	height: 51px;
+}
 
 /* fit app list view heights */
 .app-files #app-content>.viewcontainer {
@@ -140,20 +143,20 @@
 	margin-bottom: 44px;
 }
 
-#filestable tbody tr { background-color:#fff; height:40px; }
+#filestable tbody tr {
+	background-color: #fff;
+	height: 40px;
+}
 #filestable tbody tr:hover,
 #filestable tbody tr:focus,
 #filestable tbody .name:focus,
-#filestable tbody tr:active {
-	background-color: rgb(240,240,240);
-}
+#filestable tbody tr:active,
 #filestable tbody tr.highlighted,
 #filestable tbody tr.highlighted .name:focus,
-#filestable tbody tr.selected {
-	background-color: rgb(230,230,230);
-}
-#filestable tbody tr.searchresult {
-	background-color: rgb(240,240,240);
+#filestable tbody tr.selected,
+#filestable tbody tr.searchresult,
+table tr.mouseOver td {
+	background-color: #f8f8f8;
 }
 tbody a { color:#000; }
 
@@ -178,9 +181,6 @@ tr:focus span.extension {
 	color: #777;
 }
 
-table tr.mouseOver td {
-	background-color: #eee;
-}
 table th, table th a {
 	color: #999;
 }
@@ -275,7 +275,7 @@ table thead th {
 	background-color: #fff;
 }
 table.multiselect thead th {
-	background-color: rgba(220,220,220,.8);
+	background-color: rgba(248,248,248,.8); /* #f8f8f8 like other hover style */
 	color: #000;
 	font-weight: bold;
 	border-bottom: 0;
@@ -706,7 +706,7 @@ table.dragshadow td.size {
 	left: 0;
 	right: 0;
 	bottom: 0;
-	background-color: white;
+	background-color: #fff;
 	background-repeat: no-repeat no-repeat;
 	background-position: 50%;
 	opacity: 0.7;
-- 
GitLab


From 46978b616cf18d86c3b5790560d233ebde1fc8e7 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 27 Aug 2015 01:55:20 -0400
Subject: [PATCH 049/783] [tx-robot] updated from transifex

---
 apps/files_external/l10n/el.js      | 22 ++++++++++++++++++++++
 apps/files_external/l10n/el.json    | 22 ++++++++++++++++++++++
 apps/files_external/l10n/fi_FI.js   |  2 ++
 apps/files_external/l10n/fi_FI.json |  2 ++
 apps/files_external/l10n/fr.js      | 15 +++++++++++++++
 apps/files_external/l10n/fr.json    | 15 +++++++++++++++
 apps/files_external/l10n/pt_BR.js   |  1 +
 apps/files_external/l10n/pt_BR.json |  1 +
 core/l10n/de.js                     |  2 +-
 core/l10n/de.json                   |  2 +-
 lib/l10n/el.js                      |  1 +
 lib/l10n/el.json                    |  1 +
 lib/l10n/fr.js                      |  1 +
 lib/l10n/fr.json                    |  1 +
 lib/l10n/tr.js                      |  1 +
 lib/l10n/tr.json                    |  1 +
 settings/l10n/de.js                 |  6 +++---
 settings/l10n/de.json               |  6 +++---
 settings/l10n/el.js                 |  7 +++++++
 settings/l10n/el.json               |  7 +++++++
 settings/l10n/fr.js                 |  7 +++++++
 settings/l10n/fr.json               |  7 +++++++
 22 files changed, 122 insertions(+), 8 deletions(-)

diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js
index 156b713acba..13fb910e79d 100644
--- a/apps/files_external/l10n/el.js
+++ b/apps/files_external/l10n/el.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Please provide a valid app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί εφαρμογής και μυστικό.",
     "Step 1 failed. Exception: %s" : "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
     "Step 2 failed. Exception: %s" : "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
     "External storage" : "Εξωτερική αποθήκευση",
@@ -22,12 +25,19 @@ OC.L10N.register(
     "SFTP with secret key login" : "SFTP με σύνδεση με κρυφό κλειδί",
     "Public key" : "Δημόσιο κλειδί",
     "Storage with id \"%i\" not found" : "Αποθήκευση με id \"%i\" δεν βρέθηκε",
+    "Invalid backend or authentication mechanism class" : "Μη έγκυρη κλάση συστήματος ή μηχανισμού πιστοποίησης",
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
+    "Objectstore forbidden" : "Απαγορευμένο objectstore",
     "Invalid storage backend \"%s\"" : "Μή έγκυρο σύστημα υποστήριξης αποθήκευσης  \"%s\"",
+    "Unsatisfied backend parameters" : "Ελλιπείς παράμετροι συστήματος",
+    "Unsatisfied authentication mechanism parameters" : "Ελλιπείς παράμετροι μηχανισμού πιστοποίησης",
+    "Admin-only storage backend \"%s\"" : "Σύστημα αποθήκευσης μόνο για διαχειριστή \"%s\"",
     "Personal" : "Προσωπικά",
     "System" : "Σύστημα",
     "Grant access" : "Παροχή πρόσβασης",
     "Access granted" : "Πρόσβαση παρασχέθηκε",
+    "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1",
+    "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "Enable previews" : "Ενεργοποίηση προεπισκοπήσεων",
     "Check for changes" : "Έλεγχος για αλλαγές",
@@ -39,12 +49,19 @@ OC.L10N.register(
     "Saved" : "Αποθηκεύτηκαν",
     "Generate keys" : "Δημιουργία κλειδιών",
     "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
+    "Access key" : "Κλειδί πρόσβασης",
+    "Secret key" : "Μυστικό κλειδί",
+    "Builtin" : "Builtin",
     "None" : "Τίποτα",
+    "OAuth1" : "OAuth1",
     "App key" : "Κλειδί εφαρμογής",
     "App secret" : "Μυστικό εφαρμογής",
+    "OAuth2" : "OAuth2",
     "Client ID" : "ID πελάτη",
     "Client secret" : "Μυστικό πελάτη",
+    "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
     "Password" : "Κωδικός πρόσβασης",
+    "Session credentials" : "Διαπιστευτήρια συνεδρίας",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Όνομα Υπολογιστή",
     "Port" : "Θύρα",
@@ -55,11 +72,15 @@ OC.L10N.register(
     "URL" : "URL",
     "Secure https://" : "Ασφαλής σύνδεση https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Ασφαλής ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Τοπικός",
     "Location" : "Τοποθεσία",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Σημείωση:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
@@ -71,6 +92,7 @@ OC.L10N.register(
     "Scope" : "Εύρος",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
     "Folder name" : "Όνομα φακέλου",
+    "Authentication" : "Πιστοποίηση",
     "Configuration" : "Ρυθμίσεις",
     "Available for" : "Διαθέσιμο για",
     "Advanced settings" : "Ρυθμίσεις για προχωρημένους",
diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json
index 5412c9a44ab..c2211b18842 100644
--- a/apps/files_external/l10n/el.json
+++ b/apps/files_external/l10n/el.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Please provide a valid app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί εφαρμογής και μυστικό.",
     "Step 1 failed. Exception: %s" : "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
     "Step 2 failed. Exception: %s" : "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
     "External storage" : "Εξωτερική αποθήκευση",
@@ -20,12 +23,19 @@
     "SFTP with secret key login" : "SFTP με σύνδεση με κρυφό κλειδί",
     "Public key" : "Δημόσιο κλειδί",
     "Storage with id \"%i\" not found" : "Αποθήκευση με id \"%i\" δεν βρέθηκε",
+    "Invalid backend or authentication mechanism class" : "Μη έγκυρη κλάση συστήματος ή μηχανισμού πιστοποίησης",
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
+    "Objectstore forbidden" : "Απαγορευμένο objectstore",
     "Invalid storage backend \"%s\"" : "Μή έγκυρο σύστημα υποστήριξης αποθήκευσης  \"%s\"",
+    "Unsatisfied backend parameters" : "Ελλιπείς παράμετροι συστήματος",
+    "Unsatisfied authentication mechanism parameters" : "Ελλιπείς παράμετροι μηχανισμού πιστοποίησης",
+    "Admin-only storage backend \"%s\"" : "Σύστημα αποθήκευσης μόνο για διαχειριστή \"%s\"",
     "Personal" : "Προσωπικά",
     "System" : "Σύστημα",
     "Grant access" : "Παροχή πρόσβασης",
     "Access granted" : "Πρόσβαση παρασχέθηκε",
+    "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1",
+    "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "Enable previews" : "Ενεργοποίηση προεπισκοπήσεων",
     "Check for changes" : "Έλεγχος για αλλαγές",
@@ -37,12 +47,19 @@
     "Saved" : "Αποθηκεύτηκαν",
     "Generate keys" : "Δημιουργία κλειδιών",
     "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
+    "Access key" : "Κλειδί πρόσβασης",
+    "Secret key" : "Μυστικό κλειδί",
+    "Builtin" : "Builtin",
     "None" : "Τίποτα",
+    "OAuth1" : "OAuth1",
     "App key" : "Κλειδί εφαρμογής",
     "App secret" : "Μυστικό εφαρμογής",
+    "OAuth2" : "OAuth2",
     "Client ID" : "ID πελάτη",
     "Client secret" : "Μυστικό πελάτη",
+    "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
     "Password" : "Κωδικός πρόσβασης",
+    "Session credentials" : "Διαπιστευτήρια συνεδρίας",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Όνομα Υπολογιστή",
     "Port" : "Θύρα",
@@ -53,11 +70,15 @@
     "URL" : "URL",
     "Secure https://" : "Ασφαλής σύνδεση https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Ασφαλής ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Τοπικός",
     "Location" : "Τοποθεσία",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Σημείωση:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
@@ -69,6 +90,7 @@
     "Scope" : "Εύρος",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
     "Folder name" : "Όνομα φακέλου",
+    "Authentication" : "Πιστοποίηση",
     "Configuration" : "Ρυθμίσεις",
     "Available for" : "Διαθέσιμο για",
     "Advanced settings" : "Ρυθμίσεις για προχωρημένους",
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
index 54fdd01751e..1e67d9ffc73 100644
--- a/apps/files_external/l10n/fi_FI.js
+++ b/apps/files_external/l10n/fi_FI.js
@@ -18,6 +18,7 @@ OC.L10N.register(
     "Share" : "Jaa",
     "Remote subfolder" : "Etäalikansio",
     "Public key" : "Julkinen avain",
+    "Storage with id \"%i\" not found" : "Tallennustilaa tunnisteella \"%i\" ei löytynyt",
     "Invalid mount point" : "Virheellinen liitoskohta",
     "Personal" : "Henkilökohtainen",
     "System" : "Järjestelmä",
@@ -26,6 +27,7 @@ OC.L10N.register(
     "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä",
     "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä",
     "Enable encryption" : "Käytä salausta",
+    "Enable previews" : "Käytä esikatseluja",
     "Check for changes" : "Tarkista muutokset",
     "Never" : "Ei koskaan",
     "Once every direct access" : "Kerran aina suoran käytön yhteydessä",
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
index 33db4d9d5dc..3870158899b 100644
--- a/apps/files_external/l10n/fi_FI.json
+++ b/apps/files_external/l10n/fi_FI.json
@@ -16,6 +16,7 @@
     "Share" : "Jaa",
     "Remote subfolder" : "Etäalikansio",
     "Public key" : "Julkinen avain",
+    "Storage with id \"%i\" not found" : "Tallennustilaa tunnisteella \"%i\" ei löytynyt",
     "Invalid mount point" : "Virheellinen liitoskohta",
     "Personal" : "Henkilökohtainen",
     "System" : "Järjestelmä",
@@ -24,6 +25,7 @@
     "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä",
     "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä",
     "Enable encryption" : "Käytä salausta",
+    "Enable previews" : "Käytä esikatseluja",
     "Check for changes" : "Tarkista muutokset",
     "Never" : "Ei koskaan",
     "Once every direct access" : "Kerran aina suoran käytön yhteydessä",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index e47f9d167bd..42944b2f2fb 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons de requête a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons d'accès a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Please provide a valid app key and secret." : "Veuillez fournir une clé d'application et un mot de passe valides.",
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s",
     "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
@@ -22,8 +25,11 @@ OC.L10N.register(
     "SFTP with secret key login" : "SFTP avec identification par clé",
     "Public key" : "Clef publique",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
+    "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
+    "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
+    "Admin-only storage backend \"%s\"" : "Service de stockage \"%s\" pour admins seulement",
     "Personal" : "Personnel",
     "System" : "Système",
     "Grant access" : "Autoriser l'accès",
@@ -40,11 +46,15 @@ OC.L10N.register(
     "Generate keys" : "Générer des clés",
     "Error generating key pair" : "Erreur lors de la génération des clés",
     "None" : "Aucun",
+    "OAuth1" : "OAuth1",
     "App key" : "App key",
     "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
+    "Username and password" : "Nom d'utilisateur et mot de passe",
     "Password" : "Mot de passe",
+    "Session credentials" : "Informations d'identification de session",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Nom de l'hôte",
     "Port" : "Port",
@@ -55,11 +65,15 @@ OC.L10N.register(
     "URL" : "URL",
     "Secure https://" : "Sécurisation https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Sécurisation ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Local",
     "Location" : "Emplacement",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Attention :</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
@@ -71,6 +85,7 @@ OC.L10N.register(
     "Scope" : "Portée",
     "External Storage" : "Stockage externe",
     "Folder name" : "Nom du dossier",
+    "Authentication" : "Authentification",
     "Configuration" : "Configuration",
     "Available for" : "Disponible pour",
     "Advanced settings" : "Paramètres avancés",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index c0c927ebffb..ffc2de0ef53 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons de requête a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons d'accès a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Please provide a valid app key and secret." : "Veuillez fournir une clé d'application et un mot de passe valides.",
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s",
     "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
@@ -20,8 +23,11 @@
     "SFTP with secret key login" : "SFTP avec identification par clé",
     "Public key" : "Clef publique",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
+    "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
+    "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
+    "Admin-only storage backend \"%s\"" : "Service de stockage \"%s\" pour admins seulement",
     "Personal" : "Personnel",
     "System" : "Système",
     "Grant access" : "Autoriser l'accès",
@@ -38,11 +44,15 @@
     "Generate keys" : "Générer des clés",
     "Error generating key pair" : "Erreur lors de la génération des clés",
     "None" : "Aucun",
+    "OAuth1" : "OAuth1",
     "App key" : "App key",
     "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
+    "Username and password" : "Nom d'utilisateur et mot de passe",
     "Password" : "Mot de passe",
+    "Session credentials" : "Informations d'identification de session",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Nom de l'hôte",
     "Port" : "Port",
@@ -53,11 +63,15 @@
     "URL" : "URL",
     "Secure https://" : "Sécurisation https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Sécurisation ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Local",
     "Location" : "Emplacement",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Attention :</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
@@ -69,6 +83,7 @@
     "Scope" : "Portée",
     "External Storage" : "Stockage externe",
     "Folder name" : "Nom du dossier",
+    "Authentication" : "Authentification",
     "Configuration" : "Configuration",
     "Available for" : "Disponible pour",
     "Advanced settings" : "Paramètres avancés",
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index 58c15fa0b02..8140d8be980 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "files_external",
     {
+    "Please provide a valid app key and secret." : "Por favor forneça uma chave e segurança válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index 089da37f0d2..13ce808ba84 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Please provide a valid app key and secret." : "Por favor forneça uma chave e segurança válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index f8d4f47ee33..1361a970a42 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -192,7 +192,7 @@ OC.L10N.register(
     "You can click here to return to %s." : "Du kannst zur Rückkehr zu %s hier klicken.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass %s %s mit Dir geteilt hat.\nZum Anzeigen: %s\n\n",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
-    "Cheers!" : "Hallo!",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Internal Server Error" : "Interner Serverfehler",
     "The server encountered an internal error and was unable to complete your request." : "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wende Dich an den Serveradministrator, sollte dieser Fehler mehrfach auftreten, und füge Deiner Anfrage die unten stehenden technischen Details bei.",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 60a5fb1e282..3eee17db65e 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -190,7 +190,7 @@
     "You can click here to return to %s." : "Du kannst zur Rückkehr zu %s hier klicken.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass %s %s mit Dir geteilt hat.\nZum Anzeigen: %s\n\n",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
-    "Cheers!" : "Hallo!",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Internal Server Error" : "Interner Serverfehler",
     "The server encountered an internal error and was unable to complete your request." : "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wende Dich an den Serveradministrator, sollte dieser Fehler mehrfach auftreten, und füge Deiner Anfrage die unten stehenden technischen Details bei.",
diff --git a/lib/l10n/el.js b/lib/l10n/el.js
index 2e47db30473..b47cc7e36d2 100644
--- a/lib/l10n/el.js
+++ b/lib/l10n/el.js
@@ -46,6 +46,7 @@ OC.L10N.register(
     "Can't read file" : "Αδυναμία ανάγνωσης αρχείου",
     "App directory already exists" : "Ο κατάλογος εφαρμογών υπάρχει ήδη",
     "Can't create app folder. Please fix permissions. %s" : "Δεν είναι δυνατόν να δημιουργηθεί ο φάκελος εφαρμογής. Παρακαλώ διορθώστε τις άδειες πρόσβασης. %s",
+    "Archive does not contain a directory named %s" : "Το αρχείο δεν περιέχει κατάλογο με το όνομα %s",
     "No source specified when installing app" : "Δεν προσδιορίστηκε πηγή κατά την εγκατάσταση της εφαρμογής",
     "No href specified when installing app from http" : "Δεν προσδιορίστηκε href κατά την εγκατάσταση της εφαρμογής μέσω http ",
     "No path specified when installing app from local file" : "Δεν προσδιορίστηκε μονοπάτι κατά την εγκατάσταση εφαρμογής από τοπικό αρχείο",
diff --git a/lib/l10n/el.json b/lib/l10n/el.json
index 7b0b9b149ad..d82aec00129 100644
--- a/lib/l10n/el.json
+++ b/lib/l10n/el.json
@@ -44,6 +44,7 @@
     "Can't read file" : "Αδυναμία ανάγνωσης αρχείου",
     "App directory already exists" : "Ο κατάλογος εφαρμογών υπάρχει ήδη",
     "Can't create app folder. Please fix permissions. %s" : "Δεν είναι δυνατόν να δημιουργηθεί ο φάκελος εφαρμογής. Παρακαλώ διορθώστε τις άδειες πρόσβασης. %s",
+    "Archive does not contain a directory named %s" : "Το αρχείο δεν περιέχει κατάλογο με το όνομα %s",
     "No source specified when installing app" : "Δεν προσδιορίστηκε πηγή κατά την εγκατάσταση της εφαρμογής",
     "No href specified when installing app from http" : "Δεν προσδιορίστηκε href κατά την εγκατάσταση της εφαρμογής μέσω http ",
     "No path specified when installing app from local file" : "Δεν προσδιορίστηκε μονοπάτι κατά την εγκατάσταση εφαρμογής από τοπικό αρχείο",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 8e7de3462a3..873abd44ad0 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Can't read file" : "Impossible de lire le fichier",
     "App directory already exists" : "Le dossier de l'application existe déjà",
     "Can't create app folder. Please fix permissions. %s" : "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s",
+    "Archive does not contain a directory named %s" : "Le fichier archive ne contient pas de répertoire %s",
     "No source specified when installing app" : "Aucune source spécifiée pour installer l'application",
     "No href specified when installing app from http" : "Aucun href spécifié pour installer l'application par http",
     "No path specified when installing app from local file" : "Aucun chemin spécifié pour installer l'application depuis un fichier local",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 25bcf5b17ee..440f2ddd84d 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -46,6 +46,7 @@
     "Can't read file" : "Impossible de lire le fichier",
     "App directory already exists" : "Le dossier de l'application existe déjà",
     "Can't create app folder. Please fix permissions. %s" : "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s",
+    "Archive does not contain a directory named %s" : "Le fichier archive ne contient pas de répertoire %s",
     "No source specified when installing app" : "Aucune source spécifiée pour installer l'application",
     "No href specified when installing app from http" : "Aucun href spécifié pour installer l'application par http",
     "No path specified when installing app from local file" : "Aucun chemin spécifié pour installer l'application depuis un fichier local",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index d26505b4a1e..828b5a85569 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Dosya okunamıyor",
     "App directory already exists" : "Uygulama dizini zaten mevcut",
     "Can't create app folder. Please fix permissions. %s" : "Uygulama dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s",
+    "Archive does not contain a directory named %s" : "Arşivde %s adında bir dizin bulunmuyor",
     "No source specified when installing app" : "Uygulama kurulurken bir kaynak belirtilmedi",
     "No href specified when installing app from http" : "Uygulama http'den kurulurken href belirtilmedi",
     "No path specified when installing app from local file" : "Uygulama yerel dosyadan kurulurken dosya yolu belirtilmedi",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index 4170115682d..13b63ee6f7d 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Dosya okunamıyor",
     "App directory already exists" : "Uygulama dizini zaten mevcut",
     "Can't create app folder. Please fix permissions. %s" : "Uygulama dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s",
+    "Archive does not contain a directory named %s" : "Arşivde %s adında bir dizin bulunmuyor",
     "No source specified when installing app" : "Uygulama kurulurken bir kaynak belirtilmedi",
     "No href specified when installing app from http" : "Uygulama http'den kurulurken href belirtilmedi",
     "No path specified when installing app from local file" : "Uygulama yerel dosyadan kurulurken dosya yolu belirtilmedi",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index c294a499258..b74a5364d1a 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -180,8 +180,8 @@ OC.L10N.register(
     "More" : "Mehr",
     "Less" : "Weniger",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
-    "Transactional File Locking is enabled." : "Dateisperren bei Transaktionen sind aktiviert.",
-    "Transactional File Locking is disabled." : "Dateisperren bei Transaktionen sind deaktiviert.",
+    "Transactional File Locking is enabled." : "Transaktionale Dateisperre ist aktiviert.",
+    "Transactional File Locking is disabled." : "Transaktionale Dateisperre ist deaktiviert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a> schauen.",
@@ -208,7 +208,7 @@ OC.L10N.register(
     "Enable experimental apps" : "Experimentelle Apps aktivieren",
     "No apps found for your version" : "Es wurden keine Apps für Deine Version gefunden",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.<br><br>Dein Benutzername: %s<br>Greife darauf zu: <a href=\"%s\">%s</a><br><br>",
-    "Cheers!" : "Hallo!",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.\n\nDein Benutzername: %s\nGreife darauf zu: %s\n\n",
     "Administrator documentation" : "Dokumentation für Administratoren",
     "Online documentation" : "Online-Dokumentation",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 9c67fb65ee8..d0e658c3c0f 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -178,8 +178,8 @@
     "More" : "Mehr",
     "Less" : "Weniger",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
-    "Transactional File Locking is enabled." : "Dateisperren bei Transaktionen sind aktiviert.",
-    "Transactional File Locking is disabled." : "Dateisperren bei Transaktionen sind deaktiviert.",
+    "Transactional File Locking is enabled." : "Transaktionale Dateisperre ist aktiviert.",
+    "Transactional File Locking is disabled." : "Transaktionale Dateisperre ist deaktiviert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a> schauen.",
@@ -206,7 +206,7 @@
     "Enable experimental apps" : "Experimentelle Apps aktivieren",
     "No apps found for your version" : "Es wurden keine Apps für Deine Version gefunden",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.<br><br>Dein Benutzername: %s<br>Greife darauf zu: <a href=\"%s\">%s</a><br><br>",
-    "Cheers!" : "Hallo!",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.\n\nDein Benutzername: %s\nGreife darauf zu: %s\n\n",
     "Administrator documentation" : "Dokumentation für Administratoren",
     "Online documentation" : "Online-Dokumentation",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 3a647b0baac..859bfe296cf 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -132,6 +132,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν έχει γίνει στο root του τομέα  και χρησιμοποιείται το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή  \"overwrite.cli.url\" στο αρχείο  config.php που βρίσκεται στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Δεν ήταν δυνατή η εκτέλεση της cronjob μέσω τερματικού. Εμφανίστηκαν τα παρακάτω τεχνικά σφάλματα:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Παρακαλώ ελέγξτε ξανά <a target=\"_blank\" href=\"%s\">τους οδηγούς εγκατάστασης,  καθώς επίσης και για τυχόν σφάλματα ή προειδοποιήσεις στο <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Όλοι οι έλεγχοι επιτυχείς.",
     "Open documentation" : "Ανοιχτή τεκμηρίωση.",
     "Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
     "Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
@@ -154,6 +155,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
     "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή",
+    "Please read carefully before activating server-side encryption: " : "Παρακαλούμε διαβάστε προσεκτικά πριν ενεργοποιήσετε την κρυπτογράφηση στο διακομιστή:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Η κρυπτογράφηση είναι μια μη αντιστρεπτή διαδικασία. Μόλις ενεργοποιηθεί, όλα τα αρχεία από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή και η κρυπτογράφηση δεν είναι δυνατόν να απενεργοποιηθεί αργότερα",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Οποιοσδήποτε έχει αυξημένα δικαιώματα πρόσβασης στο διακομιστή του ownCloud σας μπορεί να αποκρυπτογραφήσει τα αρχεία σας είτε παγιδεύοντας τα αιτήματα ή διαβάζοντας τους κωδικούς χρηστών που είναι αποθηκευμένοι σε απλά αρχεία κειμένου. Η κρυπτογράφηση στο διακομιστή δεν προστατεύει επομένως από κακόβουλους διαχειριστές αλλά είναι χρήσιμη στο να προστατεύει τα δεδομένα σας σε εξωτερικούς διακομιστές αποθήκευσης.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Ανάλογα με το άρθρωμα που χρησιμοποιείται το μέγεθος αρχείων γενικά αυξάνεται (κατά 35%% ή και περισσότερο αν χρησιμοποιηθεί το προεπιλεγμένο άρθρωμα)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Θα πρέπει να λαμβάνετε τακτικά αντίγραφα ασφαλείας όλων των κλειδιών κρυπτογράφησης για να αποφύγετε μόνιμη απώλεια δεδομένων (data/<user>/files_encryption και data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Δεν έχει φορτωθεί μονάδα κρυπτογράφησης, παρακαλούμε φορτώστε μια μονάδα κρυπτογράφησης από το μενού εφαρμογών.",
     "Select default encryption module:" : "Επιλογή προεπιλεγμένης μονάδας κρυπτογράφησης:",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 9081d9791e9..a0b1f0c7f13 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -130,6 +130,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν έχει γίνει στο root του τομέα  και χρησιμοποιείται το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή  \"overwrite.cli.url\" στο αρχείο  config.php που βρίσκεται στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Δεν ήταν δυνατή η εκτέλεση της cronjob μέσω τερματικού. Εμφανίστηκαν τα παρακάτω τεχνικά σφάλματα:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Παρακαλώ ελέγξτε ξανά <a target=\"_blank\" href=\"%s\">τους οδηγούς εγκατάστασης,  καθώς επίσης και για τυχόν σφάλματα ή προειδοποιήσεις στο <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Όλοι οι έλεγχοι επιτυχείς.",
     "Open documentation" : "Ανοιχτή τεκμηρίωση.",
     "Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
     "Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
@@ -152,6 +153,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
     "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή",
+    "Please read carefully before activating server-side encryption: " : "Παρακαλούμε διαβάστε προσεκτικά πριν ενεργοποιήσετε την κρυπτογράφηση στο διακομιστή:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Η κρυπτογράφηση είναι μια μη αντιστρεπτή διαδικασία. Μόλις ενεργοποιηθεί, όλα τα αρχεία από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή και η κρυπτογράφηση δεν είναι δυνατόν να απενεργοποιηθεί αργότερα",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Οποιοσδήποτε έχει αυξημένα δικαιώματα πρόσβασης στο διακομιστή του ownCloud σας μπορεί να αποκρυπτογραφήσει τα αρχεία σας είτε παγιδεύοντας τα αιτήματα ή διαβάζοντας τους κωδικούς χρηστών που είναι αποθηκευμένοι σε απλά αρχεία κειμένου. Η κρυπτογράφηση στο διακομιστή δεν προστατεύει επομένως από κακόβουλους διαχειριστές αλλά είναι χρήσιμη στο να προστατεύει τα δεδομένα σας σε εξωτερικούς διακομιστές αποθήκευσης.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Ανάλογα με το άρθρωμα που χρησιμοποιείται το μέγεθος αρχείων γενικά αυξάνεται (κατά 35%% ή και περισσότερο αν χρησιμοποιηθεί το προεπιλεγμένο άρθρωμα)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Θα πρέπει να λαμβάνετε τακτικά αντίγραφα ασφαλείας όλων των κλειδιών κρυπτογράφησης για να αποφύγετε μόνιμη απώλεια δεδομένων (data/<user>/files_encryption και data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Δεν έχει φορτωθεί μονάδα κρυπτογράφησης, παρακαλούμε φορτώστε μια μονάδα κρυπτογράφησης από το μενού εφαρμογών.",
     "Select default encryption module:" : "Επιλογή προεπιλεγμένης μονάδας κρυπτογράφησης:",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 41db5f7f44b..d07fe9ebf26 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -132,6 +132,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>,  et cherchez des erreurs ou avertissements dans  <a href=\"#log-section\">les logs</a>.",
+    "All checks passed." : "Tous les tests ont réussi.",
     "Open documentation" : "Voir la documentation",
     "Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
     "Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
@@ -154,6 +155,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Utilisez un service webcron pour exécuter cron.php toutes les 15 minutes par HTTP",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
     "Enable server-side encryption" : "Activer le chiffrement côté serveur",
+    "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Le chiffrement côté serveur est un processus à sens unique. Une fois le chiffrement activé, tous les fichiers seront dorénavant chiffrés sur le serveur, et il ne sera plus possible de désactiver le chiffrement.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Toute personne ayant un accès d'administrateur sur votre serveur ownCloud peut déchiffrer vos fichiers en interceptant les requêtes, ou en lisant les mots de passe des utilisateurs qui sont stockés dans les fichiers de sessions. Le chiffrement côté serveur n'empêche donc pas vos fichiers d'être lus par des administrateurs mal intentionnés, mais sert à protéger vos données stockées sur des espaces de stockages externes ou tiers.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Selon le module de chiffrement utilisé, la taille des fichiers peut augmenter (dans le cas du module par défaut, l'augmentation est de 35%% ou plus)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Vous devriez sauvegarder régulièrement les clés de chiffrement pour éviter toute perte de données irrémédiable (data/<user>/files_encryption et data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
     "Enable encryption" : "Activer le chiffrement",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.",
     "Select default encryption module:" : "Sélectionnez le module de chiffrement par défaut :",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index b462d52b8c4..0688759770c 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -130,6 +130,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>,  et cherchez des erreurs ou avertissements dans  <a href=\"#log-section\">les logs</a>.",
+    "All checks passed." : "Tous les tests ont réussi.",
     "Open documentation" : "Voir la documentation",
     "Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
     "Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
@@ -152,6 +153,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Utilisez un service webcron pour exécuter cron.php toutes les 15 minutes par HTTP",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
     "Enable server-side encryption" : "Activer le chiffrement côté serveur",
+    "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Le chiffrement côté serveur est un processus à sens unique. Une fois le chiffrement activé, tous les fichiers seront dorénavant chiffrés sur le serveur, et il ne sera plus possible de désactiver le chiffrement.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Toute personne ayant un accès d'administrateur sur votre serveur ownCloud peut déchiffrer vos fichiers en interceptant les requêtes, ou en lisant les mots de passe des utilisateurs qui sont stockés dans les fichiers de sessions. Le chiffrement côté serveur n'empêche donc pas vos fichiers d'être lus par des administrateurs mal intentionnés, mais sert à protéger vos données stockées sur des espaces de stockages externes ou tiers.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Selon le module de chiffrement utilisé, la taille des fichiers peut augmenter (dans le cas du module par défaut, l'augmentation est de 35%% ou plus)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Vous devriez sauvegarder régulièrement les clés de chiffrement pour éviter toute perte de données irrémédiable (data/<user>/files_encryption et data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
     "Enable encryption" : "Activer le chiffrement",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.",
     "Select default encryption module:" : "Sélectionnez le module de chiffrement par défaut :",
-- 
GitLab


From 60426e2ef81e27446196a74fc5ac1c36d457a553 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 27 Aug 2015 09:59:27 +0200
Subject: [PATCH 050/783] add comment for translators

---
 settings/personal.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings/personal.php b/settings/personal.php
index bbbba3b5b8d..32944de7200 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -71,6 +71,7 @@ $languages=array();
 $commonlanguages = array();
 foreach($languageCodes as $lang) {
 	$l = \OC::$server->getL10N('settings', $lang);
+	// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
 	if(substr($l->t('__language_name__'), 0, 1) !== '_') {//first check if the language name is in the translation file
 		$ln=array('code'=>$lang, 'name'=> (string)$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])) {
-- 
GitLab


From dacf0fc7fc37781b69a74c8f9b021f5dac31d2a3 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 27 Aug 2015 10:00:01 +0200
Subject: [PATCH 051/783] remove language code fallbacks for properly
 translated language names

---
 settings/languageCodes.php | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index e5fe9ff29ad..729cc3c6af3 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -25,48 +25,22 @@
  */
 
 return array(
-'bg_BG'=>'български език',
-'ca'=>'Català',
-'cs_CZ'=>'Čeština',
-'da'=>'Dansk',
-'de'=>'Deutsch (Persönlich)',
-'de_DE'=>'Deutsch (Förmlich)',
 'el'=>'Ελληνικά',
-'en'=>'English',
-'es'=>'Español',
-'et_EE'=>'Eesti',
 'fa'=>'فارسى',
 'fi_FI'=>'Suomi',
-'fr'=>'Français',
 'hi'=>'हिन्दी',
 'id'=>'Bahasa Indonesia',
-'it'=>'Italiano',
 'lb'=>'Lëtzebuergesch',
-//'l10n-de'=>'',
 'ms_MY'=>'Bahasa Melayu',
 'nb_NO'=>'Norwegian Bokmål',
-'nl'=>'Nederlands',
-'pl'=>'Polski',
 'pt_BR'=>'Português brasileiro',
 'pt_PT'=>'Português',
 'ro'=>'română',
-'ru'=>'Русский язык',
-'sr'=>'Српски',
 'sr@latin'=>'Srpski',
 'sv'=>'Svenska',
-'zh_CN'=>'简体中文',
-'sk_SK'=>'Slovenčina',
 'hu_HU'=>'Magyar',
-'eu'=>'Euskara',
-'lt_LT'=>'Lietuvių',
-'eo'=>'Esperanto',
-'tr'=>'Türkçe',
 'hr'=>'Hrvatski',
 'ar'=>'العربية',
-'he'=>'עִבְרִית,',
-'ia'=>'Interlingua',
-'sl'=>'Slovenski',
-'nn_NO'=>'Nynorsk',
 'lv'=>'Latviešu',
 'mk'=>'македонски',
 'uk'=>'Українська',
@@ -76,9 +50,7 @@ return array(
 'bn_BD'=>'Bengali',
 'ta_LK'=>'தமிழ்',
 'zh_HK'=>'繁體中文（香港）',
-'oc'=>'Occitan (post 1500)',
 'is'=>'Icelandic',
-'pl_PL'=>'Polski',
 'ka_GE'=>'Georgian for Georgia',
 'ku_IQ'=>'Kurdish Iraq',
 'si_LK'=>'Sinhala',
-- 
GitLab


From c3c7689b6743e5d36a6d46730a53b058499ca97a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 27 Aug 2015 13:14:50 +0200
Subject: [PATCH 052/783] Add a public interface for the language factory so
 apps can use it

---
 lib/private/l10n/factory.php | 24 +++++++++++++++---------
 lib/private/server.php       |  9 ++++++++-
 lib/public/l10n/ifactory.php | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 lib/public/l10n/ifactory.php

diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php
index 4424d014f47..a9ac4da42a2 100644
--- a/lib/private/l10n/factory.php
+++ b/lib/private/l10n/factory.php
@@ -25,29 +25,35 @@
 
 namespace OC\L10N;
 
+use OCP\L10N\IFactory;
+
 /**
- * TODO: Description
+ * A factory that generates language instances
  */
-class Factory {
+class Factory implements IFactory {
 	/**
 	 * cached instances
 	 */
 	protected $instances = array();
 
 	/**
-	 * get an L10N instance
+	 * Get a language instance
 	 *
 	 * @param string $app
 	 * @param string|null $lang
-	 * @return \OC_L10N
+	 * @return \OCP\IL10N
 	 */
 	public function get($app, $lang = null) {
-		if (!is_null($lang)) {
-			return new \OC_L10N($app, $lang);
-		} else if (!isset($this->instances[$app])) {
-			$this->instances[$app] = new \OC_L10N($app);
+		$key = $lang;
+		if ($key === null) {
+			$key = 'null';
+		}
+
+		if (!isset($this->instances[$key][$app])) {
+			$this->instances[$key][$app] = new \OC_L10N($app, $lang);
 		}
-		return $this->instances[$app];
+
+		return $this->instances[$key][$app];
 	}
 
 }
diff --git a/lib/private/server.php b/lib/private/server.php
index 287b70eb806..a47fa2e43f9 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -673,6 +673,13 @@ class Server extends SimpleContainer implements IServerContainer {
 		return $this->query('AppConfig');
 	}
 
+	/**
+	 * @return \OCP\L10N\IFactory
+	 */
+	public function getL10NFactory() {
+		return $this->query('L10NFactory');
+	}
+
 	/**
 	 * get an L10N instance
 	 *
@@ -681,7 +688,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return \OC_L10N
 	 */
 	public function getL10N($app, $lang = null) {
-		return $this->query('L10NFactory')->get($app, $lang);
+		return $this->getL10NFactory()->get($app, $lang);
 	}
 
 	/**
diff --git a/lib/public/l10n/ifactory.php b/lib/public/l10n/ifactory.php
new file mode 100644
index 00000000000..e2dc1c313cc
--- /dev/null
+++ b/lib/public/l10n/ifactory.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCP\L10N;
+
+interface IFactory {
+	/**
+	 * Get a language instance
+	 *
+	 * @param string $app
+	 * @param string|null $lang
+	 * @return \OCP\IL10N
+	 */
+	public function get($app, $lang = null);
+}
-- 
GitLab


From 67f3dc232fc81c95f7320ff9e17e25b1fd20db44 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 27 Aug 2015 14:49:40 +0200
Subject: [PATCH 053/783] fix right sidebar causing filename overflow, fix
 #18383

---
 apps/files/css/files.css | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 4a56490fe0f..fe57e4ef3c3 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -373,30 +373,53 @@ table td.filename .nametext .innernametext {
 	max-width: 47%;
 }
 
-@media only screen and (min-width: 1366px) {
+@media only screen and (min-width: 1500px) {
+	table td.filename .nametext .innernametext {
+		max-width: 790px;
+	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 390px;
+	}
+}
+@media only screen and (min-width: 1366px) and (max-width: 1500px) {
 	table td.filename .nametext .innernametext {
 		max-width: 660px;
 	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 290px;
+	}
 }
 @media only screen and (min-width: 1200px) and (max-width: 1366px) {
 	table td.filename .nametext .innernametext {
 		max-width: 500px;
 	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 230px;
+	}
 }
 @media only screen and (min-width: 1100px) and (max-width: 1200px) {
 	table td.filename .nametext .innernametext {
 		max-width: 400px;
 	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 230px;
+	}
 }
 @media only screen and (min-width: 1000px) and (max-width: 1100px) {
 	table td.filename .nametext .innernametext {
 		max-width: 310px;
 	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 230px;
+	}
 }
 @media only screen and (min-width: 768px) and (max-width: 1000px) {
 	table td.filename .nametext .innernametext {
 		max-width: 240px;
 	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 230px;
+	}
 }
 
 /* for smaller resolutions - see mobile.css */
-- 
GitLab


From 1a8f921a3d7dc1fa05e225a681b0022cd0e121e5 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 24 Aug 2015 18:14:41 +0200
Subject: [PATCH 054/783] simpler style for filetype icons

---
 core/img/filetypes/application-epub+zip.png   | Bin 1273 -> 0 bytes
 core/img/filetypes/application-epub+zip.svg   |  74 ------------
 core/img/filetypes/application-javascript.png | Bin 1243 -> 0 bytes
 core/img/filetypes/application-javascript.svg |  71 ------------
 core/img/filetypes/application-pdf.png        | Bin 1672 -> 354 bytes
 core/img/filetypes/application-pdf.svg        |  49 +-------
 core/img/filetypes/application-rss+xml.png    | Bin 1024 -> 0 bytes
 core/img/filetypes/application-rss+xml.svg    |  38 ------
 core/img/filetypes/application-x-cbr.png      | Bin 1113 -> 0 bytes
 core/img/filetypes/application-x-cbr.svg      |  78 -------------
 .../application-x-shockwave-flash.png         | Bin 880 -> 0 bytes
 .../application-x-shockwave-flash.svg         |  56 ---------
 core/img/filetypes/application.png            | Bin 945 -> 244 bytes
 core/img/filetypes/application.svg            |  57 +--------
 core/img/filetypes/audio.png                  | Bin 743 -> 362 bytes
 core/img/filetypes/audio.svg                  |  47 +-------
 core/img/filetypes/database.png               | Bin 1117 -> 0 bytes
 core/img/filetypes/database.svg               |  47 --------
 core/img/filetypes/file.png                   | Bin 300 -> 155 bytes
 core/img/filetypes/file.svg                   |  32 +-----
 core/img/filetypes/folder-drag-accept.png     | Bin 760 -> 137 bytes
 core/img/filetypes/folder-drag-accept.svg     |  60 +---------
 core/img/filetypes/folder-external.png        | Bin 850 -> 274 bytes
 core/img/filetypes/folder-external.svg        |  54 +--------
 core/img/filetypes/folder-public.png          | Bin 1207 -> 264 bytes
 core/img/filetypes/folder-public.svg          |  57 +--------
 core/img/filetypes/folder-shared.png          | Bin 1134 -> 308 bytes
 core/img/filetypes/folder-shared.svg          |  61 +---------
 core/img/filetypes/folder-starred.png         | Bin 0 -> 309 bytes
 core/img/filetypes/folder-starred.svg         |   4 +
 core/img/filetypes/folder.png                 | Bin 713 -> 135 bytes
 core/img/filetypes/folder.svg                 |  58 +---------
 core/img/filetypes/font.png                   | Bin 1623 -> 0 bytes
 core/img/filetypes/font.svg                   |  35 ------
 core/img/filetypes/image-vector.png           | Bin 885 -> 0 bytes
 core/img/filetypes/image-vector.svg           |  48 --------
 core/img/filetypes/image.png                  | Bin 695 -> 223 bytes
 core/img/filetypes/image.svg                  |  39 +------
 core/img/filetypes/package-x-generic.png      | Bin 720 -> 142 bytes
 core/img/filetypes/package-x-generic.svg      |  53 +--------
 core/img/filetypes/text-calendar.png          | Bin 1271 -> 250 bytes
 core/img/filetypes/text-calendar.svg          |  87 +-------------
 core/img/filetypes/text-code.png              | Bin 834 -> 194 bytes
 core/img/filetypes/text-code.svg              |  60 +---------
 core/img/filetypes/text-html.png              | Bin 581 -> 0 bytes
 core/img/filetypes/text-html.svg              |  43 -------
 core/img/filetypes/text-vcard.png             | Bin 668 -> 439 bytes
 core/img/filetypes/text-vcard.svg             |  53 +--------
 core/img/filetypes/text-x-c.png               | Bin 1228 -> 0 bytes
 core/img/filetypes/text-x-c.svg               |  70 ------------
 core/img/filetypes/text-x-h.png               | Bin 1168 -> 0 bytes
 core/img/filetypes/text-x-h.svg               |  74 ------------
 core/img/filetypes/text-x-python.png          | Bin 1368 -> 0 bytes
 core/img/filetypes/text-x-python.svg          |  80 -------------
 core/img/filetypes/text.png                   | Bin 620 -> 169 bytes
 core/img/filetypes/text.svg                   |  39 +------
 core/img/filetypes/video.png                  | Bin 1252 -> 166 bytes
 core/img/filetypes/video.svg                  |  92 +--------------
 core/img/filetypes/web.png                    | Bin 2136 -> 0 bytes
 core/img/filetypes/web.svg                    |  36 ------
 core/img/filetypes/x-office-document.png      | Bin 856 -> 169 bytes
 core/img/filetypes/x-office-document.svg      |  53 +--------
 core/img/filetypes/x-office-presentation.png  | Bin 1028 -> 135 bytes
 core/img/filetypes/x-office-presentation.svg  | 108 +-----------------
 core/img/filetypes/x-office-spreadsheet.png   | Bin 715 -> 166 bytes
 core/img/filetypes/x-office-spreadsheet.svg   |  63 +---------
 core/js/mimetypelist.js                       |  45 ++++----
 67 files changed, 69 insertions(+), 1852 deletions(-)
 delete mode 100644 core/img/filetypes/application-epub+zip.png
 delete mode 100644 core/img/filetypes/application-epub+zip.svg
 delete mode 100644 core/img/filetypes/application-javascript.png
 delete mode 100644 core/img/filetypes/application-javascript.svg
 delete mode 100644 core/img/filetypes/application-rss+xml.png
 delete mode 100644 core/img/filetypes/application-rss+xml.svg
 delete mode 100644 core/img/filetypes/application-x-cbr.png
 delete mode 100644 core/img/filetypes/application-x-cbr.svg
 delete mode 100644 core/img/filetypes/application-x-shockwave-flash.png
 delete mode 100644 core/img/filetypes/application-x-shockwave-flash.svg
 delete mode 100644 core/img/filetypes/database.png
 delete mode 100644 core/img/filetypes/database.svg
 create mode 100644 core/img/filetypes/folder-starred.png
 create mode 100644 core/img/filetypes/folder-starred.svg
 delete mode 100644 core/img/filetypes/font.png
 delete mode 100644 core/img/filetypes/font.svg
 delete mode 100644 core/img/filetypes/image-vector.png
 delete mode 100644 core/img/filetypes/image-vector.svg
 delete mode 100644 core/img/filetypes/text-html.png
 delete mode 100644 core/img/filetypes/text-html.svg
 delete mode 100644 core/img/filetypes/text-x-c.png
 delete mode 100644 core/img/filetypes/text-x-c.svg
 delete mode 100644 core/img/filetypes/text-x-h.png
 delete mode 100644 core/img/filetypes/text-x-h.svg
 delete mode 100644 core/img/filetypes/text-x-python.png
 delete mode 100644 core/img/filetypes/text-x-python.svg
 delete mode 100644 core/img/filetypes/web.png
 delete mode 100644 core/img/filetypes/web.svg

diff --git a/core/img/filetypes/application-epub+zip.png b/core/img/filetypes/application-epub+zip.png
deleted file mode 100644
index 2399088b28adc460fd1009343cfee2eebfae4a17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1273
zcmV<V1P1$wP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000EQNkl<ZSi`+n
zU1%It6#nk)WV207H;s+hrj1E#UrNBzCJ-Ci6+x-sQ?w5XiePELqzED^RT1iwh;RBJ
zKB$D0NctqAsY(h3B_jIfQ@bSHT76iPCT6?;bH{V;oteG6J0-Jeadz+CJG1xP?>pZ)
zbLWh3T^HstF)=Zp%jKS-p?KtY688_Uz^O_&j;!_O_)dMuwS?Vu<-&)Vl!<4f;mBsQ
z6SK1ygl*fX$^tAALp?{=_@!PpuHZJE^PGS4|KR**PakQV-9(_hz1=!}`eijvbOKMk
zTEe|L9y>XFZA$`tjE#*Ukw~CiE@SlI1F$TLhp<3jQiM;aw*>gZUv`@Ogp_IkNiMV3
zF8xTauT%^8J^l6JEeUW=WHK47uC5}V&tv4dK?1WBpx+A~Ga&}&AF^=+U`<3yY4j3t
zt6SwkBm(BR*7P}hL>fQ}slbKu9Uch{UT>#WQOZ<XAkeso@{rJ31*x!I?S0MAASpxa
zT~fe}Mt~QnBf(OF<4+{$BN*88KCm-XQ1iWBtrrm3jsm=xMW9kAAA<@V{6+y34Q&Gt
zR0bpzk*EaB#xWJjd-7fA%vYX!=-r6{<^4u+MJvE-n4bG%$mj}~D)1r}dnB~y!u8~*
z^SwJqadhvbn)};dpW^1mueC4)cLtLnB?K!FF$e0J^gI_@azFX@C&vi<46069*)b88
z{?GNLAQ?>+rPV?X)Ei3=Tm;GY(5^>ubl(};T#C4O<vkUYXH(}fvTst|AvbRQ9I}oR
zO2CSe1LlU(pFD<<{z;T+XZz~%J1E-M@!+04h{f8J8XKG0U~bLUOXj;(U}*OVj1Ekq
zRKAV5#dC1tf8$Vp3S$GWpyHG;zxXcl)-nzao`7v7kj`GNts`V~1<Z{k@Scnh?0!<o
zz4XULRNHPM*}W4-_P<1-C}Hl$bI2i0;3*s%I!kk(Xi_24MpO^3frXd#3%`7VQ>pin
zI{YH+Ya3Y3{)D+7-UdH|O0f)vhaM;JDMe^u>0`(aLroz=Ll7YcbUYnu>!quhx%3vr
zzliYzXEE4&9C@*Vg0-T+#~+?n|IIACiCg8XO}TJacL8UAN0*J<<}zl!djl_={D4SI
zdwZ~;@f6CHyaH!Jon3K5O|5K8cY$xLn0uk%YaN|7dA*D;zkMC0%597voTfIV#$V92
zJeJXMpRMLQ<|CQyLvkRLfa5p~dEf>faKA&5xQ@@ic@4#KPBk7E=-Lhf_viU`eh9Y}
z0w+j9Ewz3QfJnrU-@Jj3W}jDfox3WePMh-7uNwUwQPl$0HVFhd!0>*rPpD>$!HQMY
zwRpld!0Vr?ihv_q+lb5@@SlFZ_r4Ztfi~T1a1Y)!>I2mFmdFa!?FDQk5EP)k_s!*Z
zuz&}y3stjVZK)!vDPR!ru_18h!wude0s@>%Rtq6$+zoa0<Fhx%p#lWz)T$&7k<(fd
z`Xv0jAk6#bk}O08Z=gaDr7Bi6d_0c6zCIKR1#~5PP{XaS1GiMcNX801s<*6&dU|@2
zy}iBj>2&&(`m<f)()UYSBSt)2$6jQNwY9a4K*h$lV<ON+3UreaF>dz)nBFBEZuF|R
jPA|Wk=6_8D{_o>I=Sj}Q1)c8A00000NkvXXu0mjf8e3#(

diff --git a/core/img/filetypes/application-epub+zip.svg b/core/img/filetypes/application-epub+zip.svg
deleted file mode 100644
index 7de28f4f216..00000000000
--- a/core/img/filetypes/application-epub+zip.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="l" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .67568 2.3784 -.21621)" y1="5" x1="24">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".027065"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".97377"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.1657e-8 1.6179 -1.4834 -2.9808e-8 28.734 -9.2241)" r="20">
-   <stop stop-color="#5f5f5f" offset="0"/>
-   <stop stop-color="#4f4f4f" offset=".26238"/>
-   <stop stop-color="#3b3b3b" offset=".70495"/>
-   <stop stop-color="#2b2b2b" offset="1"/>
-  </radialGradient>
-  <linearGradient id="k" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .69231 1.8 -.61538)" y1="44" x1="24">
-   <stop stop-color="#272727" offset="0"/>
-   <stop stop-color="#454545" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="6.6476" cx="24.502" gradientTransform="matrix(0 1.8069 -2.0594 0 30.19 -41.984)" r="17.498">
-   <stop stop-color="#c4ea71" offset="0"/>
-   <stop stop-color="#7c9d35" offset="1"/>
-  </radialGradient>
-  <linearGradient id="j" y2="61.482" gradientUnits="userSpaceOnUse" x2="32.901" gradientTransform="matrix(.45331 0 0 .48531 1.9942 .11705)" y1="4.6482" x1="32.901">
-   <stop stop-color="#96bf3e" offset="0"/>
-   <stop stop-color="#4d6b0d" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" y2="3" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="10.654" gradientTransform="matrix(0.6 0 0 0.75 .60001 .12498)" y1="1" x1="10.654"/>
-  <linearGradient id="a">
-   <stop stop-color="#eee" offset="0"/>
-   <stop stop-color="#d9d9da" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .076923 1.8002 .15385)" y1="44" x1="24">
-   <stop stop-color="#272727" offset="0"/>
-   <stop stop-color="#454545" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" y2="4.8826" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="3.1234" gradientTransform="matrix(.69042 0 0 1.0165 .25019 -2.4917)" x2="24.64" x1="24.627"/>
-  <linearGradient id="f" y2=".065302" gradientUnits="userSpaceOnUse" y1=".065302" gradientTransform="matrix(.49254 0 0 .49377 .89029 .14413)" x2="54.887" x1="5.2123">
-   <stop stop-color="#96bf3e" offset="0"/>
-   <stop stop-color="#4d6b0d" offset="1"/>
-  </linearGradient>
-  <radialGradient id="e" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="d" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="m" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(0.65 0 0 .33333 0.4 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect height="7" width="5" y="40" x="38" fill="url(#e)"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#d)"/>
-   <rect height="7" width="28" y="40" x="10" fill="url(#m)"/>
-  </g>
- </g>
- <g stroke-linejoin="round">
-  <path d="m27.491 2.3044c-0.203-0.6551-0.076-1.171-0.188-1.7957h-20.794l0.12273 1.9826" stroke="url(#f)" stroke-miterlimit="0" stroke-width="1.0174" fill="url(#g)"/>
-  <g stroke-linecap="round">
-   <path style="color:#000000" d="m7.5002 3.5h-2.4c-0.3425 0-0.6-0.0318-0.6-0.0732v-2.0973c0-0.66594 0.33542-0.8295 0.77454-0.8295h2.2255" stroke="url(#h)" fill="url(#i)"/>
-   <rect rx=".5" ry=".5" height="26.981" width="21.981" stroke="url(#j)" stroke-miterlimit="0" y="2.5096" x="5.5095" stroke-width="1.019" fill="url(#b)"/>
-   <path style="color:#000000" d="m7.5 2.5v27h-2.4c-0.34251 0-0.6-0.28577-0.6-0.65854v-26.341z" stroke="url(#k)" fill="url(#c)"/>
-   <rect opacity=".5" height="25" width="21" stroke="url(#l)" y="3.5" x="5.5" fill="none"/>
-  </g>
- </g>
- <path opacity=".2" d="m17 20.305-3.7708-3.714 3.7708-3.7135 1.257 1.2378-2.5141 2.4757 1.257 1.238 3.7708-3.7135-3.2848-3.2351c-0.26823-0.26439-0.70331-0.26439-0.97177 0l-5.3129 5.2324c-0.26823 0.26417-0.26823 0.69265 0 0.95704l5.3129 5.2322c0.26846 0.26439 0.70353 0.26439 0.97177 0l5.3129-5.2322c0.26823-0.26439 0.26823-0.69287 0-0.95704l-0.77128-0.75937-5.0277 4.9515z"/>
- <path d="m17 19.123-3.7708-3.714 3.7708-3.7135 1.257 1.2378-2.5141 2.4757 1.257 1.238 3.7708-3.7135-3.2848-3.2351c-0.26823-0.26439-0.70331-0.26439-0.97177 0l-5.3129 5.2324c-0.26823 0.26417-0.26823 0.69265 0 0.95704l5.3129 5.2322c0.26846 0.26439 0.70353 0.26439 0.97177 0l5.3129-5.2322c0.26823-0.26439 0.26823-0.69287 0-0.95704l-0.77128-0.75937-5.0277 4.9515z" fill="#fff"/>
-</svg>
diff --git a/core/img/filetypes/application-javascript.png b/core/img/filetypes/application-javascript.png
deleted file mode 100644
index 1e1d3140f63cf6bde1b015abd154e351da0d16d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1243
zcmV<11SI>3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000D{Nkl<ZSi`lK
zOK4nG7{`C#nRD;Vy_4x=V#p-%6{xj77J@EnML}?(SVd6Ll?yit3T~w0Lcxs-!Hpt<
z8&L}?6kLcPmV&sk>Z14}iXsw;Oq%A=_Rh?`ckX$(NHdN}n<iuW!ClOm!}tB}|DNx0
z#Cy-6oj7r#H90w{xeT_juwV`zJUBJDwkc4f(U7UBsd4Art_D|1k>~lTjq95L(ljlK
zqF|#k|JOu>G);?30yyXJ-tRiVy6;N@3|f*T6h(oEpp>F03W6ZOIoJQaZsX(QLqTl<
zSbzJ$=VI%FDs4xx3+>qwAW0IEBq0n#<gZz@E64=UW!yD4lcp(A6p`mS%gf75O-)g&
z)pieH{mJv3iElq-;+7i#Vd>=W)NXwXsa&<KAVULGt5wS7G61EZM4bKx0;N!|or4`7
z)S(ps@Xq0_0THljs7%>5z#xdV7OgejIWQIkoGbkYz%KnwdhA`Ky-X<xaMogtL0^A6
z<pU3(s(TQT?EzdI$bu<A1n+|W|Ha%d6raDr^xkoTi2#%aG~QR}w!f$K_7^k`zdu|W
zw%cuzB%xBNP%{>9Eh2(7hWYt<GOrl@^mX>{waC&>WNM7nRY8{^jx63;f*bC<VA^i0
z5;mJnn$0EvZB+v6@#0aUn4X?SMI$82LYCkO_<P<FKk+I>H(~L|FX{dKHKPwb*7vuq
zN;pWnu&_XyrYNOo7=yPC1iTwOq~M)^DX7;ht4CiWe(+hUhn}W-=;=*9cbo+?Gc#)n
zAb9IRJl@%V_cX7g)Bb@taE$7+)O60`(N{R58&n^89z8kpAHSQr<W>N29J92v#M!fF
zan|Ck!&{HFp4HV=R#sN9_dLm8S(C+cF^&*rI!x|KxH>*X_q`X%e?PgU0&2UJ%sY>_
zehtD6><P-q<1f*>`&s^29AU9t#rpu2pX2IrL+6t>hc86ySrA1LBgXVUfpdl=Nyw8f
z6gdQCI<+gw9(;kU^(&okKIYm+8Hx-|h%-GTC~v<GT(BB?1`eU4m*<4FQG$1#L&hd>
z`wt-FGsL4~SmW0ea~^9PD1A|7w^X2BuT!hl)>2dc1rRSxOf+#}1;$31Y36k2kCV=6
z#6x||<BJ|SRa|{?_$<h>3~MdM7%I;90i5*|ML}U4I_r^}h`6SSMfH80DI%6TiapP~
zJbWQqpL*oXDFOxFSSV?X2f_-W2*tyP`Sav4I6a4Q7B2#o5xD72YIht$DwW|1QTzBu
z<YA1-QsleOxMC#5_X;E`V<hOeVws$Q`=3H<jWGtTHA*RrG5CQ7w4+Y|kbiZQ=K0|!
zu9r}GhF1ZnyPEXIyU=;w?-N;;AtJ<aOsCVK(P+?UH2&W_pre?PN)Pfb7!Bn*OPS(a
zJcZnLFWqi;txccbABG|AcAF@QXti3jS}g$f?c29=1-$oUJ;z+9f>IGC1M3x)yC0=~
z;6Ca@3?VxPxZ<S`z*&6JL(0*Prr)h<%OwFsM3hqN_bJf9u3gPUM79JF5q;#yk#Kf)
zcI9$hPM4RLLlM#5d()4(QI_+RA(zK`enUXH9CyH-*gsGDsb&yiq1*rf002ovPDHLk
FV1l{)Qr7?g

diff --git a/core/img/filetypes/application-javascript.svg b/core/img/filetypes/application-javascript.svg
deleted file mode 100644
index 4e9819bb685..00000000000
--- a/core/img/filetypes/application-javascript.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="f" x1="29.465" gradientUnits="userSpaceOnUse" y1="17.607" gradientTransform="translate(4.1161 -1.6069)" x2="29.465" y2="34.607">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".17647"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".82353"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="13.884" gradientUnits="userSpaceOnUse" y1="12.607" gradientTransform="translate(4.1161 -1.6069)" x2="13.884" y2="41.607">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".82759"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" y2=".4976" gradientUnits="userSpaceOnUse" y1="44.759" x2="23.749" x1="23.749">
-   <stop stop-color="#a3a3a3" offset="0"/>
-   <stop stop-color="#bababa" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/>
-  <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" fx="8.5513" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.0816" gradientTransform="matrix(0 7.0761 -7.4527 0 100.32 -66.262)" r="12.672">
-   <stop stop-color="#ffcd7d" offset="0"/>
-   <stop stop-color="#fc8f36" offset=".26238"/>
-   <stop stop-color="#e23a0e" offset=".70495"/>
-   <stop stop-color="#ac441f" offset="1"/>
-  </radialGradient>
-  <linearGradient id="i" x1="25" gradientUnits="userSpaceOnUse" y1="49.945" gradientTransform="translate(2.1239 -1.9451)" x2="25" y2="4.9451">
-   <stop stop-color="#ba3d12" offset="0"/>
-   <stop stop-color="#db6737" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="scale(.66667)">
-  <g>
-   <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#e)"/>
-   <path opacity=".3" fill="url(#c)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/>
-   <path opacity=".3" fill="url(#d)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/>
-  </g>
-  <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#k)" stroke-width=".99992" fill="url(#l)"/>
-  <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#h)" stroke-linecap="round" fill="none"/>
-  <path d="m11 21v1h2.3438v-1h-2.344zm0 4v1h2.75v-1h-2.75zm0 2v1h2.9375v-1h-5.282zm0 2v1h2.5312v-1h-4.875zm0 2.1562v0.96875h2.2188v-0.96875h-2.2188zm0.406-10.156v1h2.25v-1h-2.25zm-2.75 2v1h1v-1h-1zm3.1562 2v1h1.8438v-1h-1.8438zm0.125 2v1h2.7188v-1h-2.7188zm-0.34375 2v1h2.0625v-1h-2.0625zm-0.375 2.1562v0.96875h2.125v-0.96875h-2.125zm-2.562 2.844v1h4.2812v-1h-4.281zm0 2v1h3.6875v-1h-3.688zm3.9688 0v1h1.7812v-1h-1.7812zm-0.625 2v1h3.3438v-1h-3.3438zm-3.344 0h3.0367v1h-3.037v-1zm3.4062-22v1h5.5938v-1h-5.5938zm0.03125 2v1h5.0938v-1h-5.0938zm1.1875 16v1h4.5938v-1h-4.5938zm4.9375 0v1h1.8125v-1h-1.8125zm2.1562 0v1h4.3125v-1h-4.3125zm4.6562 0v1h2.9688v-1h-2.9688zm3.2812 0v1h1.1562v-1h-1.1562zm1.5 0v1h0.6875v-1h-0.6875zm1 0v1h1.8438v-1h-1.8438zm-16.031 2v1h0.8125v-1h-0.8125zm1.0312 0v1h1.625v-1h-1.625zm1.875 0v1h1.625v-1h-1.625zm2.125 0v1h2.5938v-1h-2.5938zm2.9062 0v1h3.375v-1h-3.375zm3.8438 0v1h2.2812v-1h-2.2812zm2.5625 0v1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094zm0-11v1h2.375v-1h-2.375zm2.6875 0v1h2.25v-1h-2.25zm2.5625 0v1h1.9688v-1h-1.9688zm2.2812 0v1h0.875v-1h-0.875zm1.1875 0v1h1.9375v-1h-1.9375zm2.2812 0v1h5v-1h-5zm-11 2l0.001 1h3.7812v-1h-3.7812zm4.1562 0v1h1.8125v-1h-1.8125zm2.1562 0v1h0.84375v-1h-0.84375zm1.2188 0v1h1.625v-1h-1.625zm2 0v1h1.625v-1h-1.625zm1.9688 0v1h2.6562v-1h-2.6562zm3.0312 0v1h3.4688v-1h-3.4688zm-14.53 2v1h4.1875v-1h-4.188zm4.5 0v1h4.5v-1h-4.5zm-4.5 2v1h2.3125v-1h-2.312zm2.625 0v1h2.1562v-1h-2.1562zm2.4688 0v1h1.9062v-1h-1.9062zm3.8125 5v1h1.9062v-1h-1.9062zm2.2188 0v1h1.9062v-1h-1.9062zm2.2188 0v1h2.75v-1h-2.75zm3.0938 0v1h0.5625v-1h-0.5625zm-7.438 7v1h2.3438v-1h-2.344zm2.6562 0v1h2.1875v-1h-2.1875zm2.5 0v1h1.844v-1h-1.844zm-5.156 2v1h1.875v-1h-1.875zm2.1875 0v1h4.8125v-1h-4.8125zm5.125 0v1h3.6875v-1h-3.6875zm-7.313 2v1h2.4375v-1h-2.438zm2.7812 0v1h4.2812v-1h-4.2812zm4.5938 0v1h2.9375v-1h-2.9375zm-7.375 2.125v0.96875h1.875v-0.96875h-1.875zm2.1875 0v0.96875h1.9062v-0.96875h-1.9062zm2.2188 0v0.96875h2.7188v-0.96875h-2.7188zm3.0312 0v0.96875h0.5625v-0.96875h-0.5625zm0.875 0v0.96875h3.5312v-0.96875h-3.5312zm-8.375 6.875v1h2.4375v-1h-2.4375zm2.75 0v1h2.25v-1h-2.25zm2.5938 0v1h1.9375v-1h-1.9375zm2.25 0v1h3.0938v-1h-3.0938zm3.4375 0v1h5.0312v-1h-5.0312z" fill="url(#j)"/>
-  <g stroke-linejoin="round">
-   <path style="color:#000000" d="m37.105 28.194c-0.000013 0.91667-0.16668 1.7188-0.5 2.4062-0.33335 0.6875-0.8073 1.2604-1.4219 1.7188-0.61459 0.45833-1.3594 0.80208-2.2344 1.0312-0.87501 0.22917-1.8542 0.34375-2.9375 0.34375-0.57292 0-1.1042-0.02083-1.5938-0.0625-0.48959-0.03125-0.95313-0.08854-1.3906-0.17188-0.4375-0.08333-0.85938-0.1875-1.2656-0.3125-0.40625-0.125-0.81771-0.28125-1.2344-0.46875v-3.9375c0.4375 0.21876 0.89583 0.41667 1.375 0.59375 0.48958 0.17709 0.97395 0.33334 1.4531 0.46875 0.47916 0.125 0.9427 0.22396 1.3906 0.29688 0.45833 0.07292 0.8802 0.10938 1.2656 0.10938 0.42708 0.000004 0.79166-0.03646 1.0938-0.10938 0.30208-0.08333 0.54687-0.1927 0.73438-0.32812 0.19791-0.14583 0.33853-0.3125 0.42188-0.5 0.09374-0.19791 0.14062-0.40624 0.14062-0.625-0.000008-0.21874-0.03647-0.41145-0.10938-0.57812-0.06251-0.17708-0.21355-0.35937-0.45312-0.54688-0.23959-0.19791-0.59376-0.41666-1.0625-0.65625-0.45834-0.24999-1.0781-0.55208-1.8594-0.90625-0.76042-0.34374-1.4219-0.68228-1.9844-1.0156-0.55209-0.34374-1.0104-0.72395-1.375-1.1406-0.35417-0.41666-0.61979-0.89061-0.79688-1.4219-0.17708-0.54166-0.26563-1.1823-0.26562-1.9219-0.000001-0.81249 0.15625-1.5208 0.46875-2.125 0.3125-0.61457 0.75521-1.125 1.3281-1.5312 0.57291-0.40623 1.2604-0.70832 2.0625-0.90625 0.8125-0.20832 1.7135-0.31248 2.7031-0.3125 1.0417 0.000018 2.0312 0.11981 2.9688 0.35938 0.93749 0.2396 1.901 0.59898 2.8906 1.0781l-1.4375 3.375c-0.794-0.376-1.549-0.683-2.268-0.923-0.71876-0.23957-1.4375-0.35936-2.1562-0.35938-0.64584 0.000015-1.1146 0.1146-1.4062 0.34375-0.28126 0.22918-0.42188 0.54168-0.42188 0.9375-0.000005 0.20835 0.03645 0.39585 0.10938 0.5625 0.07291 0.15626 0.21874 0.32293 0.4375 0.5 0.21874 0.16668 0.52603 0.35418 0.92188 0.5625 0.39582 0.19793 0.91145 0.44272 1.5469 0.73438 0.73957 0.32293 1.4062 0.64584 2 0.96875 0.59374 0.31251 1.1042 0.67188 1.5312 1.0781 0.42707 0.40626 0.7552 0.88022 0.98438 1.4219 0.22915 0.54167 0.34374 1.1979 0.34375 1.9688m-24.526 11.906c-0.67708-0.000006-1.2708-0.03646-1.7812-0.10938-0.511-0.063-0.9428-0.141-1.297-0.235v-4.0312c0.38542 0.08333 0.79167 0.15625 1.2188 0.21875 0.41667 0.0625 0.875 0.09375 1.375 0.09375 0.47917-0.000002 0.92188-0.05209 1.3281-0.15625 0.41666-0.10417 0.77604-0.28646 1.0781-0.54688 0.3125-0.25 0.55208-0.58854 0.71875-1.0156 0.17708-0.42708 0.26562-0.96354 0.26562-1.6094v-22.172h5.0906v22.016c0 1.3125-0.19272 2.4427-0.57812 3.3906-0.37501 0.94791-0.90626 1.7292-1.5938 2.3438-0.67709 0.625-1.4896 1.0833-2.4375 1.375-0.948 0.29-1.995 0.436-3.141 0.436z" stroke="url(#i)" fill="url(#b)"/>
-   <path opacity=".5" style="color:#000000" d="m16.531 11.562v21.156c-0.000003 0.74521-0.14604 1.4057-0.375 1.9688h0.03125c-0.0053 0.01356-0.02582 0.01774-0.03125 0.03125-0.21291 0.52977-0.51641 1.033-0.96875 1.4062-0.01075 0.0093-0.02039 0.02213-0.03125 0.03125-0.42364 0.35547-0.94402 0.58756-1.4688 0.71875-0.5068 0.12994-1.0399 0.1875-1.5938 0.1875-0.54293 0-1.0548-0.02228-1.5312-0.09375-0.01053-0.0015-0.02074 0.0016-0.03125 0v1.9375c0.14199 0.02453 0.25 0.04337 0.40625 0.0625a1.0305 1.0305 0 0 1 0.03125 0c0.4327 0.06181 0.93779 0.09374 1.5938 0.09375h0.25c1.0584-0.000006 2.0104-0.14984 2.8438-0.40625 0.8161-0.25111 1.5028-0.60837 2.0625-1.125a1.0305 1.0305 0 0 1 0 -0.03125c0.56066-0.5012 0.98871-1.119 1.3125-1.9375 0.32074-0.78887 0.5-1.7802 0.5-3v-21h-3z" stroke="url(#g)" fill="none"/>
-   <path opacity=".5" style="color:#000000" d="m31.062 16.625c-0.91729 0.000017-1.7568 0.09872-2.4688 0.28125-0.6983 0.17232-1.2665 0.42933-1.7188 0.75-0.43783 0.31048-0.75495 0.67432-1 1.1562-0.22591 0.43677-0.34375 0.97587-0.34375 1.6562-0.000001 0.67187 0.0572 1.1952 0.1875 1.5938 0.13076 0.39228 0.3626 0.74863 0.625 1.0625 0.27891 0.31876 0.63321 0.6313 1.125 0.9375 0.54028 0.32018 1.1571 0.64423 1.875 0.96875 0.78022 0.35371 1.4056 0.66564 1.9062 0.9375 0.0091 0.0047 0.02219-0.0047 0.03125 0 0.48031 0.2467 0.86296 0.48708 1.1875 0.75 0.01 0.0081 0.02142 0.02313 0.03125 0.03125 0.29407 0.23569 0.56733 0.5282 0.71875 0.90625 0.0064 0.0161-0.006 0.04609 0 0.0625 0.0023 0.0064 0.02897-0.0065 0.03125 0 0.11318 0.2766 0.18749 0.5805 0.1875 0.9375-0.000015 0.40344-0.11735 0.74498-0.25 1.0312-0.0031 0.0069 0.0032 0.02432 0 0.03125h-0.03125c-0.14902 0.31791-0.36691 0.67002-0.6875 0.90625a1.0305 1.0305 0 0 1 -0.03125 0c-0.37162 0.26839-0.71579 0.37311-1.0625 0.46875a1.0305 1.0305 0 0 1 -0.03125 0c-0.376 0.092-0.832 0.157-1.343 0.157-0.47826 0.000005-0.9298-0.0492-1.4062-0.125-0.45579-0.07419-0.96671-0.17338-1.5-0.3125a1.0305 1.0305 0 0 1 -0.03125 0c-0.50955-0.144-0.9949-0.3173-1.5-0.5v1.6562c0.16564 0.0631 0.33735 0.13746 0.5 0.1875 0.3613 0.11117 0.74977 0.23508 1.1562 0.3125 0.37252 0.07096 0.77865 0.09491 1.25 0.125a1.0305 1.0305 0 0 1 0.03125 0c0.45573 0.03879 0.95205 0.0625 1.5 0.0625 1.0107 0 1.9133-0.10974 2.6875-0.3125 0.77223-0.20225 1.389-0.48131 1.875-0.84375 0.4815-0.35909 0.82413-0.78767 1.0938-1.3438 0.25489-0.52574 0.40624-1.177 0.40625-1.9688-0.000011-0.66872-0.08918-1.1823-0.25-1.5625-0.17948-0.42419-0.42147-0.74998-0.75-1.0625-0.35949-0.34194-0.77277-0.66986-1.2812-0.9375a1.0305 1.0305 0 0 1 -0.03125 0c-0.56267-0.306-1.1894-0.62451-1.9062-0.9375a1.0305 1.0305 0 0 1 -0.03125 0c-0.62352-0.28619-1.1526-0.52942-1.5938-0.75-0.43674-0.22984-0.78885-0.44773-1.0625-0.65625a1.0305 1.0305 0 0 1 -0.03125 0c-0.29046-0.23511-0.54194-0.49605-0.71875-0.875a1.0305 1.0305 0 0 1 0 -0.03125c-0.11448-0.26163-0.21876-0.58868-0.21875-0.96875-0.000008-0.667 0.32053-1.3491 0.8125-1.75a1.0305 1.0305 0 0 1 0.03125 0c0.58219-0.45741 1.2635-0.56248 2.0312-0.5625 0.81828 0.000017 1.6395 0.12985 2.4688 0.40625 0.46119 0.15374 0.94101 0.36068 1.4062 0.5625l0.625-1.4375c-0.604-0.25-1.22-0.541-1.783-0.684-0.838-0.215-1.746-0.313-2.719-0.313z" stroke="url(#f)" fill="none"/>
-  </g>
- </g>
-</svg>
diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png
index 74676372671865506deb906403a7056324b81f12..1c0b18e2f5100c589b0fca3a249b297c868d84f7 100644
GIT binary patch
literal 354
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfoB*E?S0H^m$o+Pp$DKg8I|1$x
zbQi)1^tc=BeK*wSZn)q5xX?$rsgLr~9~ERgD#(0Xl=Zkc=V@K}v&O1t&9%?l>Yuka
zzMR<eYHI)Mxij9(pY>+Z+&7Eny<4^H-I^8eH?IA(Z`Y>-dp{pO@cGEWFDH+GId%N&
zxieqSpZRwA;`i%UzTdq5<L>RBj~@Pc|L*U%Z~uP({`cqi|Ns9Pv_G{2-N#W9<QL3f
zWa;$!!{;wMmUXcJ#d1Ae978G?b5EoTH5mx7U5Ho|-=q31F6lkjo&R}0YNwsp?wwcH
z+Va3OTja!vD!Ie`j2H3>bmX~rJe+Z~)<Wj-k(Q12v7v@vwrBTW_Uuoty?3wv;%m=^
wX8-ScByX4%eB(Bw+|l2cIGYPR3^Y##)ve>WTfETz4bWl+Pgg&ebxsLQ0LXu}g#Z8m

literal 1672
zcmV;326y?1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000J0Nkl<ZSi|j?
zU5H&*6~}-3<D7Fp=c9KfNi&^vW|B_R8q=CIVr*$`5Stb$D8-a26suUF6!fKyu_BS8
zpwv)MAL?5Z5g}<&Od>5xgiu2))r2PFM`p;hMki?}OlFd~bMHNSEg#OE>D>A1i;x#L
zcd_Sk_TBq`{_DT~YmZS?uII2^=kb34e*TwF8k4`PXU&d*)s<b|xdIl9F<>p2S;(e2
zwPF_)R58qIN&pp96(eXG!t}_+@n5}pVeAiYs8*K*aA!}~j>jI}`RXm(w?}b40b`l~
zO!hYhEZJ-_APQ(@6~(RFz*vlPbI$-ogiF6WN_g)g=TDq?l;0lt9B_C^0P8C^?CR|(
zNA*7)qhY{UgRvHxvuOg!fI+|z-@lWNk8h(fJ<Zvlzr-Ei_$Fv}aIID&ZKMqU@?|Qq
z<HqjQ(an_`b}b9QV+y`rBQzQr?bd?Txmk^w1JTGAY5(GvDGY9;HZj4U_kNd~Hh&Ze
zLcLz6(MSQPUc7{@&49~6y^hBemel|P5(Etbs-TLh!HA+ZONUy6^sJ-nD_<w-=wxbi
zl)wDo`;?}qi24S&cJ*4zmQ$mnSjhHBL#B=80Eh}Ik}b3rwc1R9f*3*^ll%08bbjU`
zjB{K#_DA0S*-vPX9VuWsD=hT2#>51!dAN!o3lR8)WuYRdD5zu#6Gg1SZ`)4yBVWL`
zx0BXtoc`%cTzdUAD&+zt@0hNqM4g>YS<b6-3q}<cZSKp50cb8Z3Rv9WARV87gt)Jt
zG)=iO`VMdX@JE<`y+c<iPbrRY#vrQ1ZS9K=0E>u#XcjB^0IF0|K`Y(lw%kSO?tAc+
z3ZgJmt?~Y;zw-9JeY9yxDIZhx9wUl`6jLl^<+<<-V>2?F>0Owk767$Ih*$4@9-Nym
z3@)EN!|=gFOr1VOrC6Yti^zKqq9}@}VoU9dHebZ52r4Tw0LI6N1V9-(agvc&4pJQ+
zrkuodmkN|(Ph=hQyJ#8&jgw{0H)v2KXg2FgA{6EP;lqrbJjuk+5Uy6GElDUB^5kMi
z;yu=6LT$kvBvadx-KGgvl*rf*DMR4jhYq3>6Lfh;R45R8M=o+%E0EbDGP555f(Tf*
zWD44Pd%1#=w-&d=bGsl}-2V9EbPo*B5yzAxM`8^c1Q9{Qyj%uBnxR24F2Wg$w~okp
za&bbbP^A0Tjrcf^ijsz~vIqfsc0NeY0}pU@XoySuUq(lUQIn}VE6t1nL$g-^PQm7L
z6bktzvk>?96aMjc(neU6KD(d_=c2grHu}EzJh{(4j06D{jDXS1SWs<c!Mc{;&yQro
zElk!M+1eF-K$K%oJx%*SKdZKGW$it8v-YtsF}3*){`2CC*vW}G23kd^80VKTp=`Ky
zH&ago$r4Uz7nWh+{r9+h<S3{1?&bGieUi&(&r<%#CI(*kF$~_;)Pb~w1j+6JOT7L}
zwMudQdeT(zy4Vd{0C;2SZBay5649L`Bp2T0_)|~w)(iVEal*j2pTpd~sY!cQ*RwUw
zECchRUd!5Y+|fzC_a>aOG6PE1_#!MN=V)^gtCE=UBS(2-_a0P)fjxV$o9{$K=0ZiV
z&bPd|gg~uU1690pth)C;8fjRRr4|6vEU%1KB{EQUp7toBe)=@WpV^J1fepLAMf9<)
zA21-2+4sD+pQ+A(W_QP2lB4V1`)D*mwsv_9=v-aTf<Tm_wUoUhoH@hsXP!kd3_QCV
z`uj5$nj)MfpjK~W_N<U3IZ(*oxE9~nx5x(;`DbQ2`T+=0M3jPYl$<9$bC#h4zrZ+4
z&)1%$k!I#(yayCjp<b^6N*qTxYvyR_*!~Gb)h!Dk4Km$G)9fD7yqIY7iY6lDjHO^5
z=l36A;-BXz4-Qhi|5Jnz=E`tpriO}QjU|cVmb8?&Y@rdPwyY0~RHuLa?&Q>?eZ9Sr
z_t_(3S{fU%LL5^5w*LUzzVjUGo_K<*qoc%~oup}+fiZ?8Nm@E)eP)I?4<3?{nd&Po
zy>fO@rBZ1tTf5=bG<|4OlG}kX9SgeZoB=5q5%EDJHdu9*nh22~uBD_}lRJ4XZ5$r*
z{x?%1=f=m!CtCmjtXZ?B7(!_G-p3;1{+IuPS!+X@rgi7sm9eq0Yl|4TUgN(HotT^K
S8{*yo0000<MNUMnLSTZJvL|=|

diff --git a/core/img/filetypes/application-pdf.svg b/core/img/filetypes/application-pdf.svg
index b671e98725d..5646f4caaac 100644
--- a/core/img/filetypes/application-pdf.svg
+++ b/core/img/filetypes/application-pdf.svg
@@ -1,48 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="167.98" gradientUnits="userSpaceOnUse" y1="8.5081" gradientTransform="matrix(.44444 0 0 .44444 -24 2.7778)" x2="167.98" y2="54.78">
-   <stop stop-color="#fffdf3" offset="0"/>
-   <stop stop-color="#fbebeb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" gradientUnits="userSpaceOnUse" cy="9.9941" cx="8.2761" gradientTransform="matrix(0 4.2742 -5.2474 0 68.489 -37.143)" r="12.672">
-   <stop stop-color="#f89b7e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".26238"/>
-   <stop stop-color="#c6262e" offset=".66094"/>
-   <stop stop-color="#690b2c" offset="1"/>
-  </radialGradient>
-  <radialGradient id="j" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="k" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="g" y2="39.999" gradientUnits="userSpaceOnUse" y1="47.028" x2="25.058" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.7 0 0 .33333 -.8 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect y="40" width="5" fill="url(#j)" x="38" height="7"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#k)"/>
-   <rect y="40" width="28" fill="url(#g)" x="10" height="7"/>
-  </g>
- </g>
- <rect style="color:#000000" rx="2" ry="2" height="25" width="25" y="4.5" x="3.5" fill="url(#l)"/>
- <path opacity=".15" style="color:#000000" fill="#661215" d="m18.188 4.9688a1.0386 1.0386 0 0 0 -0.46875 0.25c-8.0692 6.9232-12.522 7.7862-13.782 7.8752a1.0386 1.0386 0 0 0 -0.4375 0.125v8.7187a1.0386 1.0386 0 0 0 0.5 0.125c1.2408 0 3.1922 0.83225 5.0625 2.2812 1.726 1.337 3.383 3.164 4.594 5.156h12.844c1.108 0 2-0.892 2-2v-0.125c-1.2349-2.981-2.1282-7.0748-2.8125-10.781-0.003-0.023 0.003-0.0395 0-0.0625-0.61012-4.7373 0.28634-8.959 0.625-10.281a1.0386 1.0386 0 0 0 -1 -1.2812h-6.9062a1.0386 1.0386 0 0 0 -0.21875 0zm0 4.875c-0.19809 1.3497-0.34502 2.9178-0.46875 4.7812-0.23961 3.6087-0.31211 8.3302-0.34375 13.438-1.2326-2.3066-3.3956-4.6736-5.8438-6.6875-1.4134-1.1626-2.8465-2.1591-4.125-2.9062-0.81148-0.4742-1.5307-0.8115-2.2188-1.0312 1.5275-0.29509 3.8744-0.90217 6.625-2.625 2.3056-1.4441 4.5975-3.3663 6.375-4.9687z" fill-rule="evenodd"/>
- <path opacity=".3" style="color:#000000" fill="#661215" d="m18.406 6c-8.18 7.019-12.852 8.016-14.406 8.125v2.5312c1.1732-0.164 4.1092-0.751 7.25-2.718 4.027-2.523 8.844-7.313 8.844-7.313-1.302 2.5536-1.684 11.312-1.719 22.875h8.125c0.60271 0 1.1339-0.26843 1.5-0.6875 0.00027-0.0105 0-0.0207 0-0.0312-1.565-3.227-2.576-7.895-3.344-12.062-0.655-4.973 0.298-9.3183 0.656-10.719h-6.9062zm-14.406 12.219v2.8125c3.2857 0 8.2665 3.8155 10.875 8.4688h2.2188c-1.665-4.451-10.589-11.282-13.094-11.282z" fill-rule="evenodd"/>
- <path style="color:#000000" d="m18.408 5c-8.18 7.019-12.854 8.01-14.408 8.119v2.5225c1.1732-0.16382 4.1224-0.73265 7.2632-2.6998 4.0274-2.5225 8.8421-7.3113 8.8421-7.3113-1.32 2.5898-1.705 11.522-1.73 23.333h8.441c0.661 0 1.184-0.523 1.184-1.183-1.565-3.227-2.588-7.893-3.355-12.06-0.656-4.973 0.312-9.3203 0.671-10.721h-6.9079zm-14.408 12.23v2.7938c3.3961 0 8.6171 4.0752 11.143 8.9398h2.1215c-1.187-4.423-10.673-11.734-13.264-11.734z" fill="url(#i)"/>
- <path opacity=".05" d="m25.688 5.0313c-3.216 1.9588-13.74 7.9437-21.688 7.1877v5.4062s17.674 2.6262 24-2.5938v-8.7187c0-0.69873-0.55021-1.2812-1.25-1.2812h-1.0625zm2.312 12.25c-3.181 3.168-6.45 7.386-8.625 11.719h2.5312c1.761-2.975 4.072-6.235 6.094-8.25v-3.4688z" fill-rule="evenodd"/>
- <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" height="23" width="23" stroke="url(#h)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
- <rect opacity=".35" stroke-linejoin="round" style="color:#000000" rx="2" ry="2" height="25" width="25" stroke="#410000" stroke-linecap="round" y="4.5" x="3.5" fill="none"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0.000005 0.22905 0.20608 0.43749 0.43164 0.4375h11.139c0.22556-0.000006 0.43163-0.20845 0.43164-0.4375v-10.143c-0.004-0.06684-0.02269-0.1329-0.05469-0.19141l-3.3125-3.1992c-0.043-0.0164-0.08876-0.025544-0.13477-0.027344h-8.0684c-0.02684-0.0026-0.055191-0.0026-0.082031 0z" fill="#dc5047"/>
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m7.3561 3h0.19315c0.18549 0 0.36359 0.065879 0.49263 0.1949 0.53227 0.5322 0.28209 1.8297 0.015948 2.9022-0.01613 0.048381-0.023832 0.089205-0.031897 0.11339 0.32259 0.91119 0.78197 1.6448 1.29 2.0641 0.20968 0.16127 0.44366 0.32261 0.70173 0.46775 0.36291-0.040318 0.70953-0.056697 1.0402-0.056697 1 0 1.6055 0.17735 1.8394 0.55634 0.08065 0.12902 0.11988 0.28168 0.09569 0.44295-0.0081 0.20159-0.07989 0.38817-0.22505 0.53331-0.1371 0.15321-0.37878 0.24096-0.73362 0.24096-0.61292 0-1.6141-0.18585-2.4206-0.59709-1.3871 0.15321-2.4193 0.33985-3.2499 0.60595-0.040323 0.01613-0.088854 0.03075-0.14531 0.05493-1 1.71-1.7408 2.477-2.394 2.477-0.1291 0-0.2594-0.032-0.3562-0.089l-0.3863-0.249-0.0248-0.041c-0.0565-0.145-0.073-0.283-0.0408-0.436 0.0887-0.427 0.5491-1.105 1.5169-1.71 0.1532-0.113 0.3951-0.242 0.7177-0.395 0.2419-0.4192 0.5001-0.9108 0.7744-1.451 0.4113-0.8306 0.6684-1.6522 0.87-2.3618v-0.00886c-0.2984-0.9757-0.4756-1.5639-0.1772-2.6364 0.0726-0.3064 0.3396-0.6219 0.638-0.6219zm0.1205 0.49965c-0.01613 0.024192-0.040576 0.065194-0.056705 0.097448-0.1371 0.33867-0.12878 0.92736 0.056705 1.6531l0.040757-0.031892c0.056453-0.25804 0.08097-0.48348 0.12936-0.66088l0.023036-0.12934c0.0806-0.4596 0.0644-0.6941-0.0727-0.8876zm0.065566 3.6463c-0.1856 0.5968-0.4523 1.2334-0.8152 1.9349-0.1613 0.3064-0.3395 0.5961-0.404 0.838l0.088602-0.0319c1.0242-0.3951 1.9936-0.6204 2.6952-0.7494-0.1209-0.0806-0.2346-0.17-0.3313-0.2587-0.4839-0.4112-0.9027-1.0071-1.2334-1.7328zm3.3616 2.2165c-0.05645 0-0.11171 0.0008653-0.18429 0.081503 0.58873 0.25804 1.1601 0.41106 1.531 0.41106 0.05645 0 0.10578-0.0079 0.15417-0.01595h0.0319c0.04032-0.01613 0.06459-0.02568 0.07266-0.10631-0.01614-0.0242-0.03234-0.05633-0.07266-0.08859-0.08065-0.08064-0.40375-0.28172-1.5328-0.28172zm-5.8622 1.4596c-0.16936 0.09677-0.30743 0.18531-0.38808 0.24982-0.5726 0.52414-0.9343 1.0561-0.97462 1.3625 0.36291-0.12095 0.83849-0.65276 1.3627-1.6123z" fill="#fff"/>
 </svg>
diff --git a/core/img/filetypes/application-rss+xml.png b/core/img/filetypes/application-rss+xml.png
deleted file mode 100644
index 5b18ee2cd4fd647d820fc8dac732b7a53fdcc490..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmV+b1poVqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000BWNkl<ZScUDE
zO=w(I6vuz(&ZJ3a(!|;-xUd=*Y9$o}sYoRT5m$;X1r4}SaG^*Q6aorvMChWMB7$JC
zNOj>#TqtR^B6Oirl~`&QtzV_IlEgG0&CI*+92f8F&b-&mEP`?2gFE-#$Gi9cJO6V(
z-iVp8nU~vC_5T6>3jp=*2j`x@e-39uAR8=Ypt5$`J12Ln3t;Hb*i%ytLBI(}TCz4-
zyGp}Sp|rNNs9_lAj~pp=DFditXJ@dh3*a0g4qRG7m~IFQL{;<JOq2H3?U-tBfLIN@
z2Oohr%sCL3yCFRQEQp#++!VY|#_k1xD&`gOK8-jNPaLpJxDtTEcGCjF4D%^WF90)3
z(%=md1F_U~N#<o=07-3OtxDCdTLMs3@QDiu-~@xj`qcevuaHcfG!+GacumIc>3|yM
zW6Ucig1Cg*QUIxnK5)TOj?59$^xnr<KXbq=vEO1%B6VrRVjvW5RO)AGpfe2^cuQ79
zF920TeUb)5u()i$VdX4Xa1*8>bH*#$mjiJcy|*B0DO?Yu&u+tUGwZX+GdE(z;=WRl
z(3)48ub)6K{EYs2n)t#j@h{&X6*hMF&!GYs@qMp?I0ulC8>o#;QrkVr0HA-&vi8wy
z=%sV(5d;7v=`z48s&O9<XyL%p^ge34?xudrIQ4rU#oatk<E2k%eRh!ciNl3h-Z}rt
zcVz;A{#Jo%J_&995;{La^y3Wf^LH71{1vu5IK|)-uVSjSkH6m~UNo|!Ap<b4m1jZe
zdq6GO2h=Mg2fm~E;$gN-JWafMmDQtfvU2D-Fk|Sk{m9O-+^wvrS2PNrC9BGOj8@En
z5`d{<aoV}PMt%1_wm$g=!!Lh`Y`c;6sbjQ`e*go6G@dzt#)3wva2Je)&*FX^2<E`T
z3-__G{{f<(zM_8nUYgGy#9~<e_-*vB->KcYhx%O;ouW~fc-XF(17!!Su+Ge(SN>-4
zttr|+d`bO|y$n7yg{~~qI{7I8wO!*CQCleu=CyJstVluO!07Z*u0QlG(%ixFd(!|6
z-19K%mFVm#0P16VI&xo?hP?E%3RD$~Vl+~s^QV!aVRU5)o4<_CT}%WcrG4i696+Or
z%_-aw4O|pgo`%xBJAM7gO)Gb9-`3FO#eA!k><I4nJ2hQ?`OpS#c$6~>ORE!KTx_oE
zfT<#lQC#D?O2KQL#CiW9p8QoykFdGL()%3%BI1rs?rhEe`rAf-lcyZk5)o&?Z0tyZ
uBnSOSH`oSV9=KwGXlV}o+t;T5HTwsktq4JpUSq2O0000<MNUMnLSTXhG3$%~

diff --git a/core/img/filetypes/application-rss+xml.svg b/core/img/filetypes/application-rss+xml.svg
deleted file mode 100644
index 54a9f46e4ec..00000000000
--- a/core/img/filetypes/application-rss+xml.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.57063 0 0 .57063 2.3049 3.3049)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="m" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.0673e-7 3.4663 -5.3421 -1.0405e-7 69.185 -26.355)" r="12.672">
-   <stop stop-color="#ffcd7d" offset="0"/>
-   <stop stop-color="#fc8f36" offset=".26238"/>
-   <stop stop-color="#e23a0e" offset=".70495"/>
-   <stop stop-color="#ac441f" offset="1"/>
-  </radialGradient>
-  <linearGradient id="i" x1="25" gradientUnits="userSpaceOnUse" y1="47.935" gradientTransform="matrix(.66015 0 0 .52505 .15636 5.186)" x2="25" y2=".91791">
-   <stop stop-color="#ba3d12" offset="0"/>
-   <stop stop-color="#db6737" offset="1"/>
-  </linearGradient>
-  <radialGradient id="k" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 24.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 24.981)" r="117.14"/>
-  <linearGradient id="j" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 24.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="28" x="4.95" fill="url(#j)"/>
- <path opacity=".15" d="m4.95 28v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#l)"/>
- <path opacity=".15" d="m27.05 28v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#k)"/>
- <path stroke-linejoin="round" style="color:#000000" d="m4.4473 5.4473c5.2946 0 23.105 0.00147 23.105 0.00147l0.000029 23.104h-23.105v-23.105z" stroke="url(#i)" stroke-width=".89464" fill="url(#m)"/>
- <path opacity=".5" stroke-linejoin="round" d="m26.557 27.557h-21.113v-21.113h21.113z" stroke="url(#h)" stroke-linecap="round" stroke-width=".88668" fill="none"/>
- <path d="m7.0633 24.902c0-0.30708 0.10601-0.56488 0.31803-0.7734 0.21203-0.2123 0.47138-0.31845 0.77805-0.31846 0.2991 0.000007 0.55277 0.10616 0.76101 0.31846 0.21202 0.20852 0.31803 0.46632 0.31803 0.7734 0 0.29951-0.10601 0.55541-0.31803 0.76771-0.20824 0.20852-0.46191 0.31278-0.76101 0.31277-0.30667 0.000007-0.56603-0.10425-0.77805-0.31277-0.2121-0.209-0.3181-0.465-0.3181-0.768m-0.0633-4.931v1.816c2.3202 0 4.2047 1.8882 4.2047 4.2129h1.8223c0-3.33-2.7035-6.0293-6.027-6.0293zm0.00312-3.9745v2.0078c4.4053 0 7.9822 3.5816 7.9822 7.9928h2.0147c0.000015-5.5219-4.4823-10.001-9.9969-10.001z" fill="#fff"/>
-</svg>
diff --git a/core/img/filetypes/application-x-cbr.png b/core/img/filetypes/application-x-cbr.png
deleted file mode 100644
index c0d374a459658d2d19ae4a077152f47d6133c19c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1113
zcmV-f1g86mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CaNkl<ZSi`-S
zO^91n6vuz(PUa=kH1m;~Okrl|hz^L1Oce(PLE2SOa3Lcu+zA%MRTnPYyA@Y1bvs4q
zMno5N;X;I3gdz%Ji$R^L)TT4GW}Mh$?l~^*%gcL7B*{$i!p*%ex#yk#`Jaz_B4$Q<
zY;JB|+S}WE36QmCXE?F?GyXvFUb}00|6l8X?+Urn7Z=~zK9km$qi59X_06rVi;~Ob
zIM60eCdgv6)F+tszQOvQP2sQoJG}k=3s3c)?gNm|=iT}9uK`df!t)pI^PtAr=T?6l
z3IJeZV}nAWK&#baeWi+XAmR`QP8<k0CkO%(j5Z8a0|Pb16wDNj*Y-h^YqgJ04+UUm
zY;SL~v$Mng{ytB?@-WUhoRee~CpdA403u+9C5i(ORZXo*<Yw`{&tHQ9r1#w!o>jpC
zDheV97Q7yxQ?(wszzPO>Fb06$mzaU7;+#VjL@Zd}6-<HD0rH0THW~m`&4N%v0Vkj+
zB9d62iT(8Xcr}anX5+aaqueQ?A@~Ff0FYh+Ldsc4yP#AP5N3vs3LrgI4FQ}eDk1WP
zF8z|ud<*fAvAnZKM`s|-f|}tJRD$J`a*XBjS*piZDMnQaxfz=6UH)#}=J&=mZvOct
zs_kyvm|?1z7&>YUWTwWJi?B4e!IKNGGC47okts&=6r*{n$DiP_%8Ok6<vs4~-N>-0
zZg32^;VuYyJYQO4ed+Z+<-Mbjo8g(|H!0;86WLIZ{9yrv`N-TkMBGRvcXDEiQ?q9h
zS=Bh04;O?X?dFQhW7YlX{HaVmP|?vD$Oy*ebo<t~V*&W>_V=lB9Oj@x)CVA|Tv4y6
zH?Cg)kbhcxBPqYzxWzX=eS~_8<uwHJQG&4PZnAaxE&kZ84F&MYm3NUsBa!VgaD*7h
zO*&fnU-{tEH&}XTjYk*PDNip@I(CBQ{RV}o$YS+z0G5|lxKXdA*bK~$1)w9WY9NLn
zOh&@Vr6P^y4_vwa9qo2#x55Qw6r*`gubg9U_GF+vGzv)>9=Q;C?=wI`-4DVdLX>wz
z`8=t91Pl(^_xQTDg+EZr)v3(=;6)GT0`G$hLh0|^1D(^7>HXXUOwUGG63it1fI2-|
z40Nnd)Jo<W%3Mahw<<=G4Tp+>&h3}BUNY8qIIyHSu=MR1zi(s)GPS^K>}yGUKG6DJ
z7UD)V-LQ_;5p@|z0qE!+V10%MOED71fp=rLptl;Pvmm=4NI=3)Hw!?$KU^K?WWgZo
z`&+UBEW{gC!;jJxt13|xv9Pc}v)QCnDAU!O?E{ChkP61OZw)U*<#KtZQmI_3)oL#T
z<nqep&%WY84fDCr%jNRS?(XirgvH)}$CXN@6h+ajs!pit#Dh@mob%2(-)gn)*6Z~~
f`nNs+|M&P8Mv_AMRyw2800000NkvXXu0mjfKM^4A

diff --git a/core/img/filetypes/application-x-cbr.svg b/core/img/filetypes/application-x-cbr.svg
deleted file mode 100644
index 3c9e150e790..00000000000
--- a/core/img/filetypes/application-x-cbr.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="l" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .67568 2.3784 -.21621)" y1="5" x1="24">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".027065"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".97377"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.1657e-8 1.6179 -1.4834 -2.9808e-8 28.734 -9.2241)" r="20">
-   <stop stop-color="#5f5f5f" offset="0"/>
-   <stop stop-color="#4f4f4f" offset=".26238"/>
-   <stop stop-color="#3b3b3b" offset=".70495"/>
-   <stop stop-color="#2b2b2b" offset="1"/>
-  </radialGradient>
-  <linearGradient id="k" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .69231 1.8 -.61538)" y1="44" x1="24">
-   <stop stop-color="#272727" offset="0"/>
-   <stop stop-color="#454545" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="6.6476" cx="24.502" gradientTransform="matrix(0 1.8069 -2.0594 0 30.19 -41.984)" r="17.498">
-   <stop stop-color="#c4ea71" offset="0"/>
-   <stop stop-color="#7c9d35" offset="1"/>
-  </radialGradient>
-  <linearGradient id="j" y2="61.482" gradientUnits="userSpaceOnUse" x2="32.901" gradientTransform="matrix(.45331 0 0 .48531 1.9942 .11705)" y1="4.6482" x1="32.901">
-   <stop stop-color="#96bf3e" offset="0"/>
-   <stop stop-color="#4d6b0d" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" y2="3" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="10.654" gradientTransform="matrix(0.6 0 0 0.75 .60001 .12498)" y1="1" x1="10.654"/>
-  <linearGradient id="a">
-   <stop stop-color="#eee" offset="0"/>
-   <stop stop-color="#d9d9da" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .076923 1.8002 .15385)" y1="44" x1="24">
-   <stop stop-color="#272727" offset="0"/>
-   <stop stop-color="#454545" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" y2="4.8826" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="3.1234" gradientTransform="matrix(.69042 0 0 1.0165 .25019 -2.4917)" x2="24.64" x1="24.627"/>
-  <linearGradient id="f" y2=".065302" gradientUnits="userSpaceOnUse" y1=".065302" gradientTransform="matrix(.49254 0 0 .49377 .89029 .14413)" x2="54.887" x1="5.2123">
-   <stop stop-color="#96bf3e" offset="0"/>
-   <stop stop-color="#4d6b0d" offset="1"/>
-  </linearGradient>
-  <radialGradient id="e" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="d" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="m" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(0.65 0 0 .33333 0.4 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect height="7" width="5" y="40" x="38" fill="url(#e)"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#d)"/>
-   <rect height="7" width="28" y="40" x="10" fill="url(#m)"/>
-  </g>
- </g>
- <g stroke-linejoin="round">
-  <path d="m27.491 2.3044c-0.203-0.6551-0.076-1.171-0.188-1.7957h-20.794l0.12273 1.9826" stroke="url(#f)" stroke-miterlimit="0" stroke-width="1.0174" fill="url(#g)"/>
-  <g stroke-linecap="round">
-   <path style="color:#000000" d="m7.5002 3.5h-2.4c-0.3425 0-0.6-0.0318-0.6-0.0732v-2.0973c0-0.66594 0.33542-0.8295 0.77454-0.8295h2.2255" stroke="url(#h)" fill="url(#i)"/>
-   <rect rx=".5" ry=".5" height="26.981" width="21.981" stroke="url(#j)" stroke-miterlimit="0" y="2.5096" x="5.5095" stroke-width="1.019" fill="url(#b)"/>
-   <path style="color:#000000" d="m7.5 2.5v27h-2.4c-0.34251 0-0.6-0.28577-0.6-0.65854v-26.341z" stroke="url(#k)" fill="url(#c)"/>
-   <rect opacity=".5" height="25" width="21" stroke="url(#l)" y="3.5" x="5.5" fill="none"/>
-  </g>
- </g>
- <g opacity=".2" transform="matrix(-.17866 0 0 .17866 25.444 7.067)">
-  <path d="m50.463 22.014c-19.869 0-35.984 11.045-35.984 24.674 0 6.475 3.667 12.342 9.612 16.748l-4.027 14.551 20.54-7.582c3.132 0.615 6.438 0.967 9.859 0.967 19.873 0 35.98-11.049 35.98-24.684 0-13.629-16.107-24.674-35.98-24.674z"/>
- </g>
- <g fill="#fff" transform="matrix(-.17866 0 0 .17866 25.444 6.067)">
-  <path fill="#fff" d="m50.463 22.014c-19.869 0-35.984 11.045-35.984 24.674 0 6.475 3.667 12.342 9.612 16.748l-4.027 14.551 20.54-7.582c3.132 0.615 6.438 0.967 9.859 0.967 19.873 0 35.98-11.049 35.98-24.684 0-13.629-16.107-24.674-35.98-24.674z"/>
- </g>
-</svg>
diff --git a/core/img/filetypes/application-x-shockwave-flash.png b/core/img/filetypes/application-x-shockwave-flash.png
deleted file mode 100644
index 75424f81d68477d9b2744b14a3b36d05d6787538..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 880
zcmV-$1CRWPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009wNkl<ZScT1&
zO=x3P6vuz}edIMxo0z0+YHN&0!Nn8>E9ydbuEbHKx^T8y7;x#X3x{HHAsG-v6gqBP
z4xR2q7Z#jR{D6+A<A{n*rp<IpYBOm*a9&>W?sa3N&AXkxgg59P-sW;Xe&?QZ?|nik
z#eU7t&%d6}=V!SC+Su5*w7k50X8)SiYn037W)~I~UN#IP(&SP~mX?+R>j3}&*LCT1
zI*|fcmNpgIGJD$+g$|3U#ZpQ|4$&9D?Hr<30H9m_o!9|g%t%|Xv%XGob(PZE8m8m$
z!o`aRV(JtCkW%&ypnRVn&lD)GtdPJWYua4jDIbWTltM~*G(gulEPz+5@zrama5qcj
z6DeW{+;#`UAON7#p+gu}KP;Zc+}a|aOfhU2+;Uy&zRO*SWGMeb?}0F1<-1Gle)~1q
zbed#5MoYH&qp`>RufD?bpI->r>ojl+l$8AR=4mEUNk-x^gfF>T-Q~&mJ|O+r<9MDI
zss(`^=nl$J)tAnnLp1A*XHvu+n{uO0{@D{G9+|~;-2=niO|Bclfm+~u9>wMN$&F`-
zJ2s|m@>koVxN?q9W@q@~nWwdWIt_FYl|TKM;h`AABO^GrNk=Mjxk;ubC-B=ozyJ12
zz(2Z+NGYy=be5^i-NYRe(=;&^*p`9pNZeK%!w^~ko%%k8H^01q*=~_cPh!VoT)zA(
z&C1OKHpjBr(DC}(fm<6zuD!iTZt5O}jyY6zD-2EE%Tu3y6Y#IqYJs)E0hFTg{W{m)
zdV`6vQPSfX49DU|X`7jM&Qh&bZ(n9V0J^u}=aVNeJ3iTDlF`u&){sqkyG-iQC$Jxw
z#`C;T00X}T{$7RY>El?Ag=w3VZ)~&sXO)@7cWJd+M<(ya)G5?4G=)GaNwe8tZ>NDd
zbsrBGKE$;hl%}dMMI8#DGmejqQQEr7@Po(6zIc++=U$@TY$AO>RPt_2okGpPL+95J
zLg0BGtyYU_&xD5s2t5P63Nz({>i_vy{GS6@mPITUixfcD{{Vmx!kC+zyHY3=RwK>+
zk2W_quLvOwrPRMPV*l0%Aq0@<1&dG}psw~M6;b!PU;PbI_*uwsFzOWm0000<MNUMn
GLSTYAV5>C%

diff --git a/core/img/filetypes/application-x-shockwave-flash.svg b/core/img/filetypes/application-x-shockwave-flash.svg
deleted file mode 100644
index b373fd6512d..00000000000
--- a/core/img/filetypes/application-x-shockwave-flash.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="q" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <radialGradient id="r" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="m" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="n" x1="27.401" gradientUnits="userSpaceOnUse" y1="22.442" gradientTransform="matrix(.65714 0 0 .65901 .22856 .17230)" x2="27.401" y2="25.726">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="o" x1="25" gradientUnits="userSpaceOnUse" y1="12" gradientTransform="matrix(.65714 0 0 .65901 .22856 .17230)" x2="25" y2="35">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="s" fx="30.345" gradientUnits="userSpaceOnUse" cy="10.417" cx="28.897" gradientTransform="matrix(.85740 -2.1584e-8 0 1.4143 -9.1048 9.1644)" r="20">
-   <stop stop-color="#f8b17e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".26238"/>
-   <stop stop-color="#c6262e" offset=".66094"/>
-   <stop stop-color="#690b54" offset="1"/>
-  </radialGradient>
-  <linearGradient id="p" x1="21.587" gradientUnits="userSpaceOnUse" y1="11.492" gradientTransform="matrix(.65714 0 0 .65901 -.1 -.12653)" x2="21.587" y2="36.647">
-   <stop stop-color="#911313" offset="0"/>
-   <stop stop-color="#bc301e" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#m)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#r)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#q)"/>
- <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#l)"/>
- <path stroke-linejoin="round" stroke="url(#k)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/>
- <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
- <path opacity=".6" style="color:#000000" d="m22.499 8.0004c-2.6636-0.029674-5.0587 1.658-6.5324 3.7793-0.94364 1.305-1.5732 2.7991-2.0832 4.3148-0.69136 1.6778-1.5201 3.4583-3.0765 4.5016-0.45903 0.43459-1.0981 0.2-1.5957 0.43224-0.34845 0.3228-0.14701 0.84514-0.20078 1.2625 0.014388 0.76734-0.029122 1.5402 0.022375 2.304 0.18898 0.54758 0.88853 0.37796 1.3325 0.38828 2.2257-0.09973 4.2002-1.5034 5.3804-3.336 0.54977-0.82122 0.97797-1.7194 1.3143-2.6473 1.5061-0.0077 3.0142 0.01532 4.519-0.01144 0.47522-0.09148 0.43944-0.63085 0.42264-1.001-0.0162-0.88446 0.03272-1.7755-0.02502-2.6558-0.16487-0.50455-0.76136-0.34818-1.1638-0.37106h-1.4529c0.52776-1.2578 1.4889-2.5011 2.8611-2.8681 0.36161 0.0036 0.81834-0.19473 0.77518-0.62481-0.01611-1.0312 0.03245-2.0689-0.02468-3.096-0.06232-0.20565-0.25794-0.35925-0.47259-0.37101z" fill="#fff"/>
- <g stroke-linecap="round">
-  <path stroke-linejoin="round" style="color:#000000" d="m9.5 20.5v3s4.9977 0.73959 7.2131-6c0.14685-0.000002 4.7869 0 4.7869 0v-3h-3s1.2833-3.7081 4-4l-0.000016-3s-5.0297-0.35936-7.7464 6.7199c-2.35 6.933-5.254 6.28-5.254 6.28z" stroke="url(#p)" fill="url(#s)"/>
-  <path opacity=".1" style="color:#000000" d="m21.5 9.8357v-1.2407c-1.6165 0.19395-3.8735 2.0585-4.8706 4.0955-0.67454 1.078-0.96187 2.016-1.4144 3.1932-0.81519 1.9428-2.1324 4.1368-4.0625 5.1513" stroke="url(#o)" fill="none"/>
-  <path opacity=".1" style="color:#000000" d="m20.5 16.656v-1.1418l-2.3993-0.02926" stroke="url(#n)" fill="none"/>
- </g>
-</svg>
diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png
index b6b1bbce2f0249f7382bc50805372130089759a3..43cc3abafe760069ddcffb04881fae5e08ae213a 100644
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!S%6Q7E0CTvY0~`p^QTXrK4r=j
zAPEFhr%nZu)4%}E0P^7MpCS@|K%IgmL4Lsu>>LW(I>8}1xl_)byKwQ+zp{9}gFwj`
zPZ!6K3dY{PgM7>i9L|NC78*?a_y4?J_Yu`J_G-o2cK4TNG6(mE`HBQ=oONKrMi!=?
zYcdnA&hHBB=yIN}-tcX&Y{&lw(YOvd;ZxDC_MX>W`u(R_``$Hjm-Rn0&bz?!{(PS=
Q2hbh{Pgg&ebxsLQ08!duvj6}9

literal 945
zcmV;i15W&jP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0004fP)t-s|Ns9N
z7Z(x|5)>2^iHV6A7#J277BDa{jEszqj*e4PQ%XuoR#sMsh=`4ijZsliXlQ7sr>9X-
zQCL`5T3T9NU0q&YUSD5dU|?WjVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2
zY;0_8ZEbFDZf|dIaBy&OadC2Ta&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;
zeSLm@et&;|fPjF3fq{a8f`fyDgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|u
zj*pLzkdTm(k&%*;l9Q8@l$4Z}m6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}Zte
zprD|kp`oIpqNAguq@<*!rKP5(rl+T;si~=|s;aB2tE{Z7t*x!EudlGMu(7eRva+(X
zv$M3cw6(Rhwzjsnx3{>sxVpN!ySux*yu7}?zQDl1#l^+R$;r#h%gxQr(9qD*($dt_
z)YsS7+1c6K+uPmU-Jz3&g8%>k5_D2dQveGN8X6!YK&h#%!2A3A{Qdp11A3hR00GfS
zL_t(IPsNf=ZWBQigzL3?qS)Ah$O7z563ha&7Lhmz+<<d&11`djB|%mK5d>S4DC7JY
zkNZ`zn8cYF@2OqCS6!dfUBLgB0f<@lcFpSZVv#DtX7htB1ugY)_NOv*-p@j#(P+dN
zf<a_T?(S@Ux&#7%At_0s(@Ce_9ytUM0aOE;0YMO*)eZWsfz_HOogLs+m!e2XM1`P8
zktwH_jZixC#A<erpn*r1MSBc8;bq==0kVc5VYr%Z=6M!S9%5s9(I(0J1On>$@rLNI
zX!E_^l;nd1plHdpJHX)&<7T0H0_oCuy1-&@FvY;X+o+Rmts;H}3+dSjaQ$?Ym8Wb!
zK)6I0SeQWt$?CP12~OzE_3_M4dH}|5&7DVu==B7%ZuTWi$}Y~%V|uwYchwVIA-Aa%
z&T@n({d_F3mf)1^Y7!Q(2qm+z+M;~<7j$>;cYSxi<=)!g@owMUy^b(hF}!Hr^bgRt
zz2{pa7ga;J$@uNbZ$!bz*dDv?5D|b<3N-WFu>B54r^u^DCEXd^X~7I;lL-I`5+%Pg
z%u6?;nZW=6x@~qjN7d@q#_I@MH6VR0ZvX>A7Gned%2Qep2EanFH3pGdGhWqSMXR3C
T8pI){00000NkvXXu0mjftQ64g

diff --git a/core/img/filetypes/application.svg b/core/img/filetypes/application.svg
index edce49e3e4e..f37966d4a25 100644
--- a/core/img/filetypes/application.svg
+++ b/core/img/filetypes/application.svg
@@ -1,57 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="p" x1="16" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="9" gradientTransform="matrix(1 0 0 -1 0 34.004)" x2="16" y2="25"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="o" x1="16" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="16" y1="9" y2="25"/>
-  <linearGradient id="n" x1="19.927" gradientUnits="userSpaceOnUse" y1="44.949" gradientTransform="matrix(.66667 0 0 .66667 .0000011 .33333)" x2="19.927" y2="4.9969">
-   <stop stop-color="#505050" offset="0"/>
-   <stop stop-color="#8e8e8e" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="s" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.2454e-8 1.4981 -1.5848 -2.76e-8 29.391 -6.3556)" r="20">
-   <stop stop-color="#c7c7c7" offset="0"/>
-   <stop stop-color="#a6a6a6" offset=".26238"/>
-   <stop stop-color="#7b7b7b" offset=".70495"/>
-   <stop stop-color="#595959" offset="1"/>
-  </radialGradient>
-  <linearGradient id="m" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(.64103 0 0 .64103 .61539 1.6154)" x2="24" y2="3.899">
-   <stop stop-color="#505050" offset="0"/>
-   <stop stop-color="#8e8e8e" offset="1"/>
-  </linearGradient>
-  <radialGradient id="q" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="r" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="k" y2="39.999" gradientUnits="userSpaceOnUse" y1="47.028" x2="25.058" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.7 0 0 .33333 -.8 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect y="40" width="5" fill="url(#q)" x="38" height="7"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#r)"/>
-   <rect y="40" width="28" fill="url(#k)" x="10" height="7"/>
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="matrix(.79998 0 0 .8 1.6 1.9554)" fill="#969696">
+  <path d="m6.9375 0.056c-0.2484 0-0.4375 0.18908-0.4375 0.4375v1.25c-0.5539 0.1422-1.0512 0.3719-1.5312 0.6563l-0.9063-0.9063c-0.17566-0.17566-0.44934-0.17566-0.625 0l-1.5 1.5c-0.17566 0.17566-0.17566 0.44934 0 0.625l0.9063 0.9063c-0.2844 0.48-0.5141 0.9773-0.6563 1.5312h-1.25c-0.24842 0-0.4375 0.1891-0.4375 0.4375v2.125c1e-8 0.24842 0.18908 0.4375 0.4375 0.4375h1.25c0.1422 0.5539 0.37188 1.0512 0.65625 1.5312l-0.9063 0.907c-0.17566 0.17566-0.17566 0.44934 0 0.625l1.5 1.5c0.17566 0.17566 0.44934 0.17566 0.625 0l0.9063-0.907c0.48 0.285 0.9773 0.514 1.5312 0.656v1.25c1e-7 0.24842 0.18908 0.4375 0.4375 0.4375h2.125c0.2484 0 0.4375-0.189 0.4375-0.438v-1.25c0.5539-0.1422 1.0512-0.37188 1.5312-0.65625l0.90625 0.90625c0.17566 0.17566 0.44934 0.17566 0.625 0l1.5-1.5c0.17566-0.17566 0.17566-0.44934 0-0.625l-0.906-0.906c0.285-0.48 0.514-0.9771 0.656-1.531h1.25c0.249 0 0.438-0.1891 0.438-0.4375v-2.125c0-0.2484-0.189-0.4375-0.438-0.4375h-1.25c-0.142-0.5539-0.371-1.0512-0.656-1.5312l0.906-0.9063c0.17566-0.17566 0.17566-0.44934 0-0.625l-1.5-1.5c-0.17566-0.17566-0.44934-0.17566-0.625 0l-0.906 0.9063c-0.48-0.2844-0.977-0.5141-1.531-0.6563v-1.25c0.0004-0.24872-0.1887-0.4378-0.4371-0.4378zm1.0625 4.1573c1.8451 0 3.3427 1.4975 3.3427 3.3427 0 1.8451-1.4975 3.3427-3.3427 3.3427-1.8451 0-3.3427-1.4979-3.3427-3.343s1.4976-3.3427 3.3427-3.3427z" display="block" fill="#969696"/>
  </g>
- <rect stroke-linejoin="round" style="color:#000000" rx="2" ry="2" height="25" width="25" stroke="url(#m)" stroke-linecap="round" y="4.5" x="3.5" fill="url(#s)"/>
- <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" height="23" width="23" stroke="url(#l)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
- <path opacity=".41" style="color:#000000" d="m15 10c-0.277 0-0.5 0.223-0.5 0.5v1.6875c-0.54864 0.14074-1.055 0.37601-1.5312 0.65625l-1.219-1.219c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.437 1.437c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.2188 1.2188c-0.28 0.476-0.516 0.982-0.656 1.531h-1.688c-0.277 0-0.5 0.223-0.5 0.5v2c0 0.277 0.223 0.5 0.5 0.5h1.6875c0.14074 0.54864 0.37601 1.055 0.65625 1.5312l-1.219 1.219c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.4375 1.4375c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.2188-1.2188c0.47623 0.28024 0.98261 0.51551 1.5312 0.65625v1.6875c0 0.277 0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5v-1.6875c0.54864-0.14074 1.055-0.37601 1.5312-0.65625l1.219 1.219c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.4375-1.4375c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.22-1.219c0.28-0.476 0.516-0.982 0.656-1.531h1.6875c0.277 0 0.5-0.223 0.5-0.5v-2c0-0.277-0.223-0.5-0.5-0.5h-1.6875c-0.14-0.549-0.376-1.055-0.656-1.531l1.219-1.219c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.437-1.437c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.2188 1.2188c-0.476-0.28-0.982-0.516-1.531-0.656v-1.688c0-0.277-0.223-0.5-0.5-0.5h-2zm1 5c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="#fff"/>
- <path style="color:#000000" d="m15 9c-0.277 0-0.5 0.223-0.5 0.5v1.6875c-0.54864 0.14074-1.055 0.37601-1.5312 0.65625l-1.219-1.219c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.437 1.437c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.2188 1.2188c-0.28 0.476-0.516 0.982-0.656 1.531h-1.688c-0.277 0-0.5 0.223-0.5 0.5v2c0 0.277 0.223 0.5 0.5 0.5h1.6875c0.14074 0.54864 0.37601 1.055 0.65625 1.5312l-1.219 1.219c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.4375 1.4375c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.2188-1.2188c0.47623 0.28024 0.98261 0.51551 1.5312 0.65625v1.6875c0 0.277 0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5v-1.6875c0.54864-0.14074 1.055-0.37601 1.5312-0.65625l1.219 1.219c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.4375-1.4375c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.22-1.219c0.28-0.476 0.516-0.982 0.656-1.531h1.6875c0.277 0 0.5-0.223 0.5-0.5v-2c0-0.277-0.223-0.5-0.5-0.5h-1.6875c-0.14-0.549-0.376-1.055-0.656-1.531l1.219-1.219c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.437-1.437c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.2188 1.2188c-0.476-0.28-0.982-0.516-1.531-0.656v-1.688c0-0.277-0.223-0.5-0.5-0.5h-2zm1 5c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="url(#n)"/>
- <path opacity=".1" stroke-linejoin="round" style="color:#000000" d="m15.062 9.5625c-0.02465 0.61514 0.0508 1.2431-0.0404 1.8499-0.22156 0.48267-0.86813 0.38946-1.2591 0.66131-0.35888 0.1777-0.83286 0.55716-1.2005 0.17633l-1.1562-1.1562-1.3125 1.3125c0.41328 0.43651 0.87815 0.8308 1.2579 1.2948 0.23668 0.48316-0.28717 0.88122-0.39325 1.3266-0.17191 0.37402-0.17866 1.0023-0.7161 1.0335-0.55991 0.0032-1.1199 0.000478-1.6798 0.0014v1.875c0.61514 0.02465 1.2431-0.0508 1.8499 0.0404 0.48267 0.22156 0.38946 0.86813 0.66131 1.2591 0.1777 0.35888 0.55716 0.83286 0.17633 1.2005l-1.1562 1.1562 1.3125 1.3125c0.43651-0.41328 0.8308-0.87815 1.2948-1.2579 0.48316-0.23668 0.88122 0.28717 1.3266 0.39325 0.37402 0.17191 1.0023 0.17866 1.0335 0.7161 0.0032 0.55991 0.000478 1.1199 0.0014 1.6798h1.875c0.02465-0.61514-0.0508-1.2431 0.0404-1.8499 0.22156-0.48267 0.86813-0.38946 1.2591-0.66131 0.35888-0.1777 0.83286-0.55716 1.2005-0.17633l1.1562 1.1562 1.3125-1.3125c-0.41328-0.43651-0.87815-0.8308-1.2579-1.2948-0.23668-0.48316 0.28717-0.88122 0.39325-1.3266 0.17191-0.37402 0.17866-1.0023 0.7161-1.0335 0.55991-0.0032 1.1199-0.000478 1.6798-0.0014v-1.875c-0.61514-0.02465-1.2431 0.0508-1.8499-0.0404-0.482-0.222-0.389-0.869-0.661-1.26-0.177-0.359-0.557-0.833-0.176-1.201l1.1562-1.1562-1.3125-1.3125c-0.43651 0.41328-0.8308 0.87815-1.2948 1.2579-0.48316 0.23668-0.88122-0.28717-1.3266-0.39325-0.37402-0.17191-1.0023-0.17866-1.0335-0.7161-0.0032-0.55991-0.000478-1.1199-0.0014-1.6798h-1.875z" stroke="url(#o)" fill="none"/>
- <path opacity=".1" stroke-linejoin="round" style="color:#000000" d="m16 20.566c1.9374 0.05315 3.6634-1.7201 3.5613-3.6545 0.004-1.9389-1.8147-3.6163-3.7447-3.4659-1.9392 0.04516-3.5671 1.9074-3.3688 3.832 0.10413 1.8114 1.739 3.3229 3.5521 3.2884z" stroke="url(#p)" fill="none"/>
 </svg>
diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png
index 3c78bcfd173c380ee4c8ccfb418ae5ef54954f1a..32171285e8e89653047d0c47bc87cc8f1df0a2c7 100644
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}dw@@fE0F&G|9?Y6!_1j8`}_N+
zPoF+*+O(-tr%stN1wul&K=BzfW&lZ`AP_(V;UtiO3qTBn%c61N;=HR)tN=PirzFTP
zn1PXrOF&vlMa|UQ!pg}jIxe-mskNtn()5K(SFGB!`^edISMNS}{PflPkH7y_p6gTs
z>Pz!<aSW-rHTSG5Uqb*7%Y{ep-o3l?zh+8*%Y+SyVsF3Xa>*yE9`-!tx&K|3ZPHxx
zt$P}d-Al{+)zEh|)qX)^`~h}xgIj#}{)W8>XDM_v;B>i>6;RM8(<rl=zr;q|Xu^uO
d0!ANZ@+uzW&FY@mv=nF~gQu&X%Q~loCIG6yr<ec$

literal 743
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U{nk6332`Z|G&7nxR8*Lh=_=U
zgoK!w7%M9)3kwSy8yh=2I|l~`CnqO2H#dX}5dkVdmgVB&0xIC);o;-s<LBoW5D*X)
z6oeQkDJdx}EiES}r=XyqsHmu{tgND<qN=K@rlzK@uCAe>p{c2<rKP2<t*xV@qpPc{
zr>Cc{uWw*rU}$J)WMpJ)Y;0m;Vrpt?W@ct?Zf;>=VQFb;Wo2b;ZEa&?V{2<`XJ=<`
zZ|~sX;OOY+<mBY+?Cj#=;_B+^=H}+^?(X5?;pyq=<>lq=?d{{^<Lm3|=jZ3|?;j8l
z5EK*?5)u*`8X6WB79JiR85tQJ9UT`Jmz<nDY0{)AQ>ILvI(6E#X)|Wbm^pLitXZ=n
zJL3I;0Vh}z<QL4q%_pUxeC+&95V-yL=?hiKh`qqzjQ4bL43UsLd(bd1I8eahqV@de
zEi7Fg3v?RzI<IaBG&`gvz$B%yAxZl8*_dbbt!*M(<{Yk9Xjtudp~-&9Nt?qA$Eul{
z6gXU5rtqgrZ22W8t;8g{w#+{|gVih8ejcm#=1)G+8Cok6V)r?wg`Ly6bx7I#K>w*w
z(_4q!4)V62H<rK1=Id;x6+iF(wX{oOVO@(%)$`Ze#TEr`X;te8Gb?|8?0Qb<C9zrB
zM#X7GR(mYdw3qUlxdm=BdTw-1Q7iYtl7e8PwX>sKmhjFJ4xbw8x8si3qAiROo|cyv
zaqeabY;@c`$EbCI=AIo58o3v~xpO!@D^yZZ@{ry#N#Ms$bpavAF0+hNuQu>=u&_)t
zi#WN8X@}k{h1soPW_uRi-FYZ%3*(A4W$VA4e^;g+ro_cFi|N?Ur?s+uYk-O~G-tQ7
z%W+QH!uTd`uiB5<JFFcKY}(!TK=W^@CR2xM)AB7(?$<Hb?Qr)}YH|Dnj0Xl!S3j3^
HP6<r_PlfSQ

diff --git a/core/img/filetypes/audio.svg b/core/img/filetypes/audio.svg
index 1b37a1e6eab..ba5bec41737 100644
--- a/core/img/filetypes/audio.svg
+++ b/core/img/filetypes/audio.svg
@@ -1,47 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="h" x1="16.626" gradientUnits="userSpaceOnUse" y1="15.298" gradientTransform="matrix(.52104 0 0 .81327 3.4707 .35442)" x2="20.055" y2="24.628">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.2454e-8 1.4981 -1.5848 -2.76e-8 29.391 -6.3556)" r="20">
-   <stop stop-color="#3e3e3e" offset="0"/>
-   <stop stop-color="#343434" offset=".26238"/>
-   <stop stop-color="#272727" offset=".70495"/>
-   <stop stop-color="#1d1d1d" offset="1"/>
-  </radialGradient>
-  <radialGradient id="j" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="k" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="g" y2="39.999" gradientUnits="userSpaceOnUse" y1="47.028" x2="25.058" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.7 0 0 .33333 -.8 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect y="40" width="5" fill="url(#j)" x="38" height="7"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#k)"/>
-   <rect y="40" width="28" fill="url(#g)" x="10" height="7"/>
-  </g>
- </g>
- <rect style="color:#000000" height="25" width="25" y="4.5" x="3.5" fill="url(#l)"/>
- <rect opacity=".7" style="color:#000000" height="25" width="25" stroke="#000" y="4.5" x="3.5" fill="none"/>
- <rect opacity=".5" height="23" width="23" stroke="url(#i)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
- <path opacity=".1" fill="url(#h)" d="m4 5 0.008 15c0.6904-0.015 23.468-5.529 23.992-5.795v-9.205z" fill-rule="evenodd"/>
- <path opacity=".1" style="color:#000000" d="m16.467 8.0001c-0.53931-0.077588-0.45336 0.42193-0.44484 0.7731-0.0059 4.1692 0.01172 8.3407-0.0088 12.508-0.145 0.32452-0.55212 0.0099-0.80112 0.07215-1.7342-0.05405-3.6017 1.1946-3.847 3.0302-0.25326 1.3789 1.032 2.5932 2.3216 2.6149 1.9178 0.05257 3.5779-1.8787 3.3343-3.8146 0.0065-3.3283-0.01298-6.6593 0.0097-9.9859 0.13139-0.31618 0.4856-0.01847 0.65097 0.09458 1.5212 0.9203 2.8505 2.4463 2.9447 4.3279 0.0815 1.0885-0.14664 2.173-0.46032 3.2072 1.3984-2.3007 1.3227-5.5038-0.40514-7.6054-1.3305-1.3884-2.5797-3.0451-2.8335-5.0311-0.04896-0.18667-0.30655-0.18423-0.46044-0.19158z" fill="#fff"/>
- <path opacity=".9" style="color:#000000" d="m16.467 7.0001c-0.53931-0.077588-0.45336 0.42193-0.44484 0.7731-0.0059 4.1692 0.01172 8.3407-0.0088 12.508-0.145 0.32452-0.55212 0.0099-0.80112 0.07215-1.7342-0.05405-3.6017 1.1946-3.847 3.0302-0.25326 1.3789 1.032 2.5932 2.3216 2.6149 1.9178 0.05257 3.5779-1.8787 3.3343-3.8146 0.0065-3.3283-0.01298-6.6593 0.0097-9.9859 0.13139-0.31618 0.4856-0.01847 0.65097 0.09458 1.5212 0.9203 2.8505 2.4463 2.9447 4.3279 0.0815 1.0885-0.14664 2.173-0.46032 3.2072 1.3984-2.3007 1.3227-5.5038-0.40514-7.6054-1.33-1.388-2.58-3.0443-2.833-5.0303-0.049-0.1866-0.307-0.1842-0.461-0.1916z"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m12.805 1.0011c-2.2 0.3545-5.1445 0.7194-7.3383 1.0937-0.581 0.2835-0.4503 1.0133-0.4761 1.5429v7.0895c-1.2243-0.23017-2.7173 0.78142-2.782 2.3831-0.1057 0.99721 0.77859 1.8652 1.7402 1.8885 1.7217 0.04179 2.8992-1.1005 2.9179-2.545-0.01876-2.4261 0.0056-4.8533 0-7.2795 0.26654-0.01974 4.3036-0.79006 4.6667-0.84134v5.452c-1.07-0.2561-2.4374 0.4472-2.7766 1.8832-0.14314 0.80489 0.1274 1.8152 0.94411 2.156 1.5943 0.73261 3.783-0.75137 3.694-2.493-0.02473-3.235 0.02025-6.4717 0-9.707-0.042-0.30422-0.24827-0.64474-0.59033-0.62281z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/database.png b/core/img/filetypes/database.png
deleted file mode 100644
index 49b2b861757e7bddee8bc56f61886c8514015f04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1117
zcmaKqX;9Nw5WxQ-NCAOD(c0FLqg9zw7^NelgQEhCN~A+0$b@4=2r@y!F+w;xEdj5z
z7z8Otjv^+SKq4W5gj^C52uTnK&=e5DP14e!0jaGZL`q-y+L``l-@cul-M4Sw+cH$t
zc~|F8oFNEuMMfZ^!R}*Qj&Pt6%)43$f>}{tUpl+Jy$wA7k60}JZ-7uJ3<?Sg4i4__
z?j{fjAV#TFB9X}K?Cg$?4h#k(l}ck{V}Xu~i&LxBz#x;!z(AwXa=DyFqX7>fJw06_
zk$^~rLQz;)2m(kX($LUQW@aXdR8FB#fq!5?*VCic>2#n<OiWBqPY<x^bUK&I<@5Or
z1_PwW$0sBuT}e&7nx1|Qhr@yN+}ynU{DPvQZ%ayU5Q)UHGH~#{^74wx%Bt$>+M1f0
z+FEj*4GOpzC`6&qs8k?7(`Z2IAJ}MUXrMoS%wjTGELKxvBfF`I!)8C>a5yb3yp|R|
zkH_b?3R+tQZEZq<07$z)C~9vPi9`~SSSl7vB@&rb`cx+Ccnav~ly@pR6-tFdsqE_R
z>H;sPQmH^^8ns5N(P*{WUTtr0UtfQJ{{U!t05oZ1a0l=tfZ-i}*+H+@|GL8nV03hJ
z%*J!T`1r)cgu!5#oSdARnws8WW^QhNVZmrJnHCopmzI_+7Rw=jPusVK<D;WuAUpUj
zhxZ(voOiprxp{oxx%b0;Uf#jyVlh|o_zGH!Sf`(vonJ8iVK%>5Sy^3u{ny`X>oztv
zHmz3c*4EZPZGYa{1BPlCi3q!NVn9>fmhBnlPQ(@zyvk0qTHFmV`@6S8e<U7vJP=q}
zMZAe+(8G){_XC09kM7`^_BSHjqg=?5mXoh$mY3b`6|ZTou_rQETgOh$nY~N5OIl@F
z&7t=zQZnlKnYm78w~(z(Dgu$bxG9rA8x{u7Yf)$R>Kdppk6n*SQV5m%lks_1LdG{~
zY{CXkV83GdL36I~;>L^JPy|%!F;oO^U5J9;4$0dOxjNQCeu;;h6Nbake$x>CwD+v`
z82@rs81knFfkWD{C#tuw!C3x2I}YUk(g!7!2~7@Nza_Zb$BxLKF+B5)JcpxLJ17)_
zT+HU9SrUqum%bpzcltZ*X+m^yN~D8n*>ETA?po6E(lf>HOt_2R6a{4*{CH;O)SE9z
z2fde#!=5-UJUZdBQe%){291jTv>d;+FJ0*VIL7Y*If=<rDjZb(u3BSl4w&Tz97f02
za}y~GM9um}zwvDncEqmPbf{E#>-;Ib*j;df;(NrO`TDC>Cg0Tw=3`$~HzFB(*zOd_
z;Z=P0J-a?N^iwO9#OdSWFh}<Ep+0A*K5AsWd0r<H5{iYW3%+X1b@_V!AQ}BWbRD*u
bpxw4Bc?n;>5cx32HYv!nQ3zgm^38t%a%oC-

diff --git a/core/img/filetypes/database.svg b/core/img/filetypes/database.svg
deleted file mode 100644
index f3d4570015f..00000000000
--- a/core/img/filetypes/database.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="k" x1="102.31" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-2.3925" gradientTransform="matrix(.45813 0 0 .43889 -31.62 14.933)" x2="102.31" y2="-24.582">
-   <stop stop-color="#a5a6a8" offset="0"/>
-   <stop stop-color="#e8e8e8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="109.96" gradientUnits="userSpaceOnUse" y1="-24.911" gradientTransform="matrix(.45813 0 0 .43889 -31.62 14.933)" x2="109.96" y2="-2.3758">
-   <stop stop-color="#b3b3b3" offset="0"/>
-   <stop stop-color="#dadada" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="103.95" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-7.6657" gradientTransform="matrix(.45783 0 0 .43229 -31.592 18.912)" x2="89.424" y2="-7.6657"/>
-  <linearGradient id="b">
-   <stop stop-color="#868688" offset="0"/>
-   <stop stop-color="#d9d9da" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="89.018" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="22.537" gradientTransform="translate(-78.157 -9.5461)" x2="89.018" y2="27.546"/>
-  <linearGradient id="a">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#4a4a4a" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="103.95" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-7.6657" gradientTransform="matrix(.45783 0 0 .43229 -31.592 24.912)" x2="89.424" y2="-7.6657"/>
-  <linearGradient id="f" x1="89.018" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="22.537" gradientTransform="translate(-78.157 -3.5461)" x2="89.018" y2="27.546"/>
-  <linearGradient id="e" x1="103.95" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-7.6657" gradientTransform="matrix(.45783 0 0 .43229 -31.592 30.912)" x2="89.424" y2="-7.6657"/>
-  <linearGradient id="d" x1="89.018" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="22.537" gradientTransform="translate(-78.157 2.4539)" x2="89.018" y2="27.546"/>
-  <linearGradient id="l" x1="21.381" gradientUnits="userSpaceOnUse" y1="5.0525" gradientTransform="matrix(0.6 0 0 .60526 1.6 2.1711)" x2="21.381" y2="44.137">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".081258"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".92328"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="41.636" cx="23.335" gradientTransform="matrix(.57452 0 0 .22094 2.5938 17.801)" r="22.627">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
- </defs>
- <path opacity=".3" fill="url(#c)" d="m29 27c0.0011 2.7613-5.8195 5-13 5s-13.001-2.239-13-5c-0.0011-2.761 5.8195-5 13-5s13.001 2.2387 13 5z" fill-rule="evenodd"/>
- <g>
-  <path d="m27.49 25.068c0 2.4466-5.1487 4.4322-11.493 4.4322-6.344 0-11.493-1.9856-11.493-4.4322 0.11446-5.4694-1.4047-4.34 11.493-4.4322 13.193-0.0952 11.331-1.1267 11.493 4.4322z" stroke="url(#d)" fill="url(#e)"/>
-  <path d="m27.5 21c0 2.4853-5.1487 4.5-11.5 4.5s-11.5-2.0147-11.5-4.5 5.1487-4.5 11.5-4.5 11.5 2.0147 11.5 4.5z" stroke="#d8d8d8" fill="#868688"/>
-  <path d="m27.49 19.068c0 2.4466-5.1487 4.4322-11.493 4.4322-6.344 0-11.493-1.9856-11.493-4.4322 0.11446-5.4694-1.4047-4.34 11.493-4.4322 13.193-0.0952 11.331-1.1267 11.493 4.4322z" stroke="url(#f)" fill="url(#g)"/>
-  <path d="m27.5 15c0 2.4853-5.1487 4.5-11.5 4.5s-11.5-2.0147-11.5-4.5 5.1487-4.5 11.5-4.5 11.5 2.0147 11.5 4.5z" stroke="#d8d8d8" fill="#868688"/>
-  <path d="m27.49 13.068c0 2.446-5.149 4.432-11.493 4.432-6.3435 0-11.492-1.986-11.492-4.432 0.1144-5.4697-1.4047-4.3402 11.492-4.4325 13.193-0.0952 11.331-1.1267 11.493 4.4325z" stroke="url(#h)" fill="url(#i)"/>
-  <path d="m27.5 9c0 2.4853-5.1487 4.5-11.5 4.5s-11.5-2.015-11.5-4.5c0-2.4853 5.1487-4.5 11.5-4.5 6.351 0 11.5 2.0147 11.5 4.5z" stroke="url(#j)" fill="url(#k)"/>
- </g>
- <rect opacity=".5" style="color:#000000" rx="17.5" ry="4" height="23" width="21" stroke="url(#l)" y="5.5" x="5.5" fill="none"/>
-</svg>
diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
index 54a242d9d29e80a41d437dca7eb598108eebf4f5..b56833a5763fff473ac8ee6765a5e6d270320dbc 100644
GIT binary patch
literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=7=|O`9=e#`Njafed8u
z_LXY~P@1D8$S;_|*wX3EhtFS{*>-XQ#ne4r978ywlM@=6d;0qL+y(eO%C~4aNXi~H
maI@~Y=;-Rka>J-anc;eq)<3H=TQ>r=FnGH9xvX<aXaWF@;xrEc

literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002<Nkl<ZScUDC
zyA6Xd5Qgt8i!vJ^hF}z`48R2Gs42+=?2t`TG60N_io&`}6Cw*ciHOd@Qv8?J+4tSk
z$jo4?uIp1#6eR@EIF8r8@6Yy`UK{0kUN%j0R7#0DCn9Lu);V_o008EB24jpUfYx4D
z;0<$K774w2(~HH-;t-nv-d&KE1F%FNA_KlR<0}CX1p^?W&j5?@uQDLJZNAX%8Hf*H
zX_OFqAj&38iztm@d;ov<7o;)Vy$8}Bh!a3-4Oy0n0{H6h03f2Os%q%E?jq{_p=p{1
yL{!ZDq(M71h=>4iSc3`50Kkncrzl<Pt-1pbwG#SpE6i{J0000<MNUMnLSTXsyLz<%

diff --git a/core/img/filetypes/file.svg b/core/img/filetypes/file.svg
index ab7db2d2e45..4efdbff4c72 100644
--- a/core/img/filetypes/file.svg
+++ b/core/img/filetypes/file.svg
@@ -1,32 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="j" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <radialGradient id="k" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="i" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#i)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#k)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#j)"/>
- <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#h)"/>
- <path stroke-linejoin="round" stroke="url(#g)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/>
- <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3501 1.0014c-0.19751 0.0382-0.35351 0.23331-0.35001 0.43742v13.123c0.000005 0.22905 0.20523 0.43745 0.43079 0.43746l11.139 0.001c0.22556-0.000006 0.43078-0.20841 0.43079-0.43746v-10.143c-0.004-0.06684-0.022-0.13284-0.054-0.19135l-3.3121-3.1989c-0.043-0.0164-0.088-0.0256-0.134-0.0274l-8.0699-0.001c-0.02684-0.0026-0.05393-0.0026-0.08077 0z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png
index fc1d83cfa6f574c0b6930cbefce82dfd7b811ca6..58640b5cb5cc4145decb93017063bdd54904e9eb 100644
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=3+9Gee4Ig%*R5Hg9(&
zP>7`@$S;_oq2v8T&j}lVd{s{u#}JO_<b(qZXY}-#64<)CyM=ognb>%A1Vs6!7|lpz
aOJZPPpUAHGplTY(A_h-aKbLh*2~7aHN+Qqz

literal 760
zcmV<U0tfwxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10(D75K~z|U?U%c56G0S)|1+L-l&cgZD3D7ekdRU!Q3NQ`P#{`F
z#YON0JPCOkL_<YD6hIS1z##-Hwi1%~HoN25+sq!C*u+2*E3wxNf3>6Cv***f%?vR!
z#wjsY@BaY+$ioXFS^zLJpzSs@SB44zV1}9B4q`||HvtR}fQYUG05c;^(_@W1&+FRU
zIHlh<Gq3dl04Q2(-(*>KqIH&Ku+|O~seegId8_yQ=Z^=O3(mRI`UVm8tq*rW|C`aO
z=c_LQ)>;gbg0o17{?3;GKtuvSK`DhKNk$4#EEWNvKtzI>GrDu{!J{h+*X|n~oV$AY
z(qbMF_*~w2H#IZctd!SY$_p1ui%*|CzMJQsv~(MbnX`Dlyu2Yz818(nHo(F|UJL}l
zB_X0Xs>x0eYy};IiRn3HIfX$G!E_8%tF<M!Yg-j<LWs#(xGW!lf&jEJ__4WJkzd}g
z)O5$BQ}gVlZnOp1l?MS|n`r&R%1;@`u~ELiJMXxZ*u1KM5d{7&fJg!el~Q{)Ln(1N
z)qnt$3ibem5<u8)HR?9YkmQsCSs=7pdyOtYteTB_;uv{FKstt2{ysBX$;`a;@Y!w@
zr$`+}J_`tdaVg>`-T@Bwf;bGT+Jt~NIr3Q`h!DpS!Z57$08G1H)mmd>)`LBm1t(&h
z@&hRdQ4l~k>%ReN-&bov;Dd|P_-huNoup4*K|pIC)o-iS9ze6Q(N1*GnJ<;5GcFwA
zXE>=51nlcTt7=*G006W<y?*g({o~4coOm)izEzp&SbHMoxTBi@d;p;C8IXuP0CND2
q2*J?g0Qk(D_5qAbW51e>9pD#BLs(4DxBUSC0000<MNUMnLSTYU)js6_

diff --git a/core/img/filetypes/folder-drag-accept.svg b/core/img/filetypes/folder-drag-accept.svg
index 6c723629057..025e58c517d 100644
--- a/core/img/filetypes/folder-drag-accept.svg
+++ b/core/img/filetypes/folder-drag-accept.svg
@@ -1,60 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="n" x1="27.557" gradientUnits="userSpaceOnUse" y1="7.1627" gradientTransform="matrix(.89186 0 0 .86793 3.1207 7.5747)" x2="27.557" y2="21.387">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" x1="22.935" gradientUnits="userSpaceOnUse" y1="49.629" gradientTransform="matrix(.74675 0 0 .55199 -1.922 3.7198)" x2="22.809" y2="36.658">
-   <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/>
-   <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="m" x1="35.793" gradientUnits="userSpaceOnUse" y1="17.118" gradientTransform="matrix(.64444 0 0 .54135 .53343 3.4884)" x2="35.793" y2="43.761">
-   <stop stop-color="#b4cee1" offset="0"/>
-   <stop stop-color="#5d9fcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="q" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="r" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="p" x1="21.37" gradientUnits="userSpaceOnUse" y1="4.7324" gradientTransform="matrix(.54384 0 0 .61466 3.2688 5.0911)" x2="21.37" y2="34.143">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="o" x1="62.989" gradientUnits="userSpaceOnUse" y1="17.47" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" x2="62.989" y2="20.47">
-   <stop stop-color="#f9f9f9" offset="0"/>
-   <stop stop-color="#d8d8d8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" x1="-51.786" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.50703 0 0 .503 68.029 1.3298)" y1="53.514" y2="3.6337">
-   <stop stop-opacity=".32174" offset="0"/>
-   <stop stop-opacity=".27826" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="translate(0 -2.0003)">
-  <path opacity=".8" style="color:#000000" d="m4.0001 6.5001c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389v9.4561l27-1.36v-8.0961c0-0.4177-0.348-0.5488-0.781-0.5439h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349z" stroke="url(#k)" fill="none"/>
-  <path style="color:#000000" d="m4.0001 7v2h-1v6h26v-6h-15v-2z" fill="url(#o)"/>
-  <path style="color:#000000" stroke-linecap="round" d="m4.5001 7.5v2h-1v6h25v-6h-15v-2z" stroke="url(#p)" fill="none"/>
- </g>
- <g transform="translate(.00009 -3.0003)">
-  <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#j)"/>
-  <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#q)"/>
-  <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#r)"/>
- </g>
- <path style="color:#000000" d="m0.92644 12.421c-0.69105 0.067-0.32196 0.76007-0.37705 1.1498 0.0802 0.25184 1.5982 13.236 1.5982 13.682 0 0.38752 0.22667 0.32187 0.80101 0.32187h26.397c0.61872 0.012 0.48796 0.006 0.48796-0.32797 0.0452-0.17069 1.6394-14.298 1.6623-14.521 0-0.23495 0.0581-0.30493-0.30493-0.30493h-30.265z" fill="url(#m)"/>
- <path opacity=".4" d="m0.68182 12 30.636 0.00023c0.4137 0 0.68181 0.24597 0.68181 0.55177l-1.6732 14.915c0.01 0.38693-0.1364 0.54035-0.61707 0.53224l-27.256-0.01c-0.4137 0-0.83086-0.22836-0.83086-0.53417l-1.6237-14.903c0-0.3058 0.26812-0.55199 0.68182-0.55199z" fill="url(#l)"/>
- <path opacity=".5" style="color:#000000" d="m1.4999 13.412 1.6252 13.176h25.749l1.6247-13.176z" stroke="url(#n)" stroke-linecap="round" stroke-width=".90749" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m0.92644 12.421c-0.69105 0.067-0.32196 0.76007-0.37705 1.1498 0.0802 0.25184 1.5982 13.236 1.5982 13.682 0 0.38752 0.22667 0.32187 0.80101 0.32187h26.397c0.61872 0.012 0.48796 0.006 0.48796-0.32797 0.0452-0.17069 1.6394-14.298 1.6623-14.521 0-0.23495 0.0581-0.30493-0.30493-0.30493h-30.265z" stroke="#000" stroke-linecap="round" stroke-width=".91766" fill="none"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m1.4609 2c-0.2505 0-0.4609 0.2104-0.4609 0.4609v11.078c0 0.259 0.2021 0.461 0.4609 0.461h13.078c0.259 0 0.461-0.202 0.461-0.461v-9.0761c0-0.2504-0.21-0.4629-0.461-0.4629h-6.539l-2-2h-4.5391zm0.5391 3h12v8h-12v-8z" fill-rule="evenodd" fill="#55739a"/>
 </svg>
diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png
index ede1a0d17f35f7b9c433c4bc1603e2fdc412ff4c..56cb385a7725bade3dc3619af65850c071541542 100644
GIT binary patch
literal 274
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}NPtg>E0AVj_#fJ^D!g=NNb#(Y
zlG&lfvqOqzh852WE1DHn0u%v~AZ|#}tWdB>Xz@%C0&<J7Bjrm9c0g05OM?7@85r4&
zJpI$sGfK)U8=5;N&sec`!<mbZ-+%b^yWoJFCs0|Cr;B4q1!M0yPre2P0hhoz?1cdV
zS9blkeJe3ZFYMR!{I6&GnN++Rwreu#YP`88&!EKf^-<Af%`FG!EZs2cP%qDP+wHR*
lvlaw=3vyj>v{df*8^#BYyl0+zKU@v+o2RRv%Q~loCIHOxYQX>i

literal 850
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U|bU56XN>+|9_wee!#}V!y_mN
zR3oXR4kTq%^&sjM3~klT>~!rt^&Na|oqbK*gH64{Y<#0^17ckRLLGyXoWoPyqtd-&
z(tYBy{StBllJbI53qsS1!_$i+vPz<|OEq00;&UtFbIY|nVsw3zb$yb;l5#?t7KOAe
z4{ci+)3XMMk|u6Qnz&KX$WGbVUd6;-&D37q%t6!4LCf4h$HGz9(ox^a$-v6VJUHDq
zJ~y<qJEE*Rx}qn(syC^oH+Av(wA#MR`u@zRTQjF^&02OLXZgjvSv&H9XywJiRhLTU
z?I~G(sdWC{(zTZ>*Ilk!ccpsCftsZU>o#7k-*mlk#o?xvN1L}?YhQD`ecSbpbtgKu
zUGJJat9!?do*g%Or_Jr%d82RRss2r;C+xmCY0u56`)*C!c5eFi^E39}nswmzoZXk^
z?!7$s;GOx0?k+lVckzL%i;v!2a_IW<<M&paxVP%)&DF<muQ_#p!|A)5&fdTB=*_h!
z?`}MO|NQy$w{PG6{Q2|GpFjWp{R2i&%*Mwaz!0}63GxeOU=b7&7Lk)zP*T;>($O<9
zHMg?1ck=WJ2o8%)NJz`dFR83;YU`RXdFI^t3m5O)z5C^xH=n=!`g8F{#s^@Wt9rUP
zhFJ9OoqX2ou!BH@^Vbc_RJ}xbmaKF?7(LJR{?Z>!P7B&Q79Nd0xmG{G)Y|&-xqmY+
z=*1o3XPSLi|MTYEGgbB*{FGOm&3?r5;UCKh^Muw31@U=3Q(op~5k2vGrm5Qvkrfvf
z9$Vl!ar#|7r|@Y}JL+QYxJKB-W;rhGY4YN>GIV*MwMD_*>GL5A#yJnFBCePI{Z`;8
zbv-1%W&Zlrt9G%c96W!6<KJ1Id_HE!O$+P_6!yF>Rh-i>e;fCGk&lb7Pxnq#ubS-C
zDC45hqLC2Z;%4b&@55NhSMWh~mXuSkgF7>)n(Gc;cjg4f@BgM;J~#2#<9o%tB4t@+
zuV=K@D)lu8So=8WP14xiIbkNptJRgg7jE?4+BTab_jK$Ft;OP9{~q1{!}e*Tef)iv
R$swR*?&<31vd$@?2>@Fgeg^;m

diff --git a/core/img/filetypes/folder-external.svg b/core/img/filetypes/folder-external.svg
index 2b96baa90c5..d5d4ef73edf 100644
--- a/core/img/filetypes/folder-external.svg
+++ b/core/img/filetypes/folder-external.svg
@@ -1,54 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="m" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 3.4122)" y1="7.1627" x1="27.557">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 -1.1074)" y1="17.118" x1="35.793">
-   <stop stop-color="#b4cee1" offset="0"/>
-   <stop stop-color="#5d9fcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="n" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="o" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="j" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 3.0908)" y1="4.7324" x1="21.37">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 -.57170)" y1="13" x1="62.989">
-   <stop stop-color="#f9f9f9" offset="0"/>
-   <stop stop-color="#d8d8d8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="d" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 .503 68.029 -.67050)" x2="-51.786" x1="-51.786">
-   <stop stop-opacity=".32174" offset="0"/>
-   <stop stop-opacity=".27826" offset="1"/>
-  </linearGradient>
- </defs>
- <path opacity=".8" style="color:#000000" d="m4.0002 4.4998c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0964c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#d)" fill="none"/>
- <path style="color:#000000" d="m4.0002 4.9997v2h-1v4.0003h26v-4.0003h-15v-2h-10z" fill="url(#i)"/>
- <path style="color:#000000" stroke-linecap="round" d="m4.5002 5.4997v2h-1v4.0003h25v-4.0003h-15v-2h-9z" stroke="url(#j)" fill="none"/>
- <g transform="translate(.00017936 -3.0003)">
-  <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#k)"/>
-  <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#n)"/>
-  <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#o)"/>
- </g>
- <path style="color:#000000" d="m1.927 9.4997c-0.691 0.0796-0.322 0.9023-0.377 1.3653 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#l)"/>
- <path opacity=".5" style="color:#000000" d="m2.5002 10.5 0.62498 16h25.749l0.62498-16z" stroke="url(#m)" stroke-linecap="round" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 9.4997c-0.691 0.0796-0.322 0.9023-0.377 1.3653 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/>
- <path opacity=".7" d="m16 13 2 2-3 3 2 2 3-3 2 2v-6h-6zm-4 1c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h8c0.554 0 1-0.446 1-1v-3l-1-1v4h-8v-8h4l-1-1h-3z"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m1.4609 2c-0.2505 0-0.4609 0.2104-0.4609 0.4609v11.078c0 0.259 0.2021 0.461 0.4609 0.461h13.078c0.259 0 0.461-0.202 0.461-0.461v-9.0761c0-0.2504-0.21-0.4629-0.461-0.4629h-6.539l-2-2h-4.5391zm6.5157 3.793h3.5704v3.3847l-1.192-1.1269-1.7847 1.6914-1.1894-1.1289 1.7851-1.6914-1.1894-1.1289zm-2.3809 0.5644h1.7852l0.5957 0.5645h-2.3809v4.5141h4.7593v-2.2583l0.596 0.5645v1.6938c0 0.312-0.266 0.564-0.596 0.564h-4.7593c-0.3297 0-0.5957-0.252-0.5957-0.564v-4.5141c0-0.3126 0.266-0.5645 0.5957-0.5645z" fill-rule="evenodd" fill="#55739a"/>
 </svg>
diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png
index c8e5e0d3d4cefab4094e584d94abf3c4fea1916d..4887ea6e7672d150e457d5c62b2a459f4fb7ead1 100644
GIT binary patch
literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!M}SX=E07K@oE2I)C%9y0Xz{F&
zqS+xOv%`vKhn36>DVh~pG%KWdW?1p8(3069K(cryPz0z9!~l_C1Qyx+nHOZ4cuA07
zFoU+4d2C!_RYS+*DO0CSpSfY<ruQGdd`;-eF#;-y@N{tuskqg9?x0YE0*C8Gk&CBJ
zc{Tn2e|b&oi&gL1W^S%H{9&=q(v6Ijv#l;{V$%OztR=9(QaVAJC7gBEMfC?<;wtZz
tUb?w(PIG-|z~>>-m7^nC^#4Y=`ICR#``s+7ih*`8c)I$ztaD0e0s!>0W<vk~

literal 1207
zcmV;o1W5adP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11T;xRK~z|U?U&1MRYe@fKXV@U*0i;Nfy%?6<q;^4gus<RQIOUY
z5*~`UQU3r5E@khQC4_|w4J^cnCKAG<fS{l>Q3Np>h}bGcy=`f&?QL&w&%DmKpxn0f
z7H$c(8^6gUXJ*cK<}-7C^Ekpe$7ITz)ZYIG0D|EeA;fZ^tVnOGbFSsF0sv*sxyE9Q
zLWmmR@c{@SQUK05wAK$ag<*Klv-T1D?QzcC7y$qzj4_wuIDV)*j$@25Ma@(p1wpVb
z|2(`RlgXfzdenA{QX-KUkr&Q6UaZ^p%FMZQcduTxqRv`7p#Z+`^WBwe=eqy7bNKAh
zPY(qERn<$j@7eQiUEuo@+W9?g-u7zU-o1NUfx7_Gnr!o(495L8+d{$z9mf$2#(*_$
zKq*7)hdj#B(ACk#m&cCKdiyuZE2fazu!&`<nu6~N0nS>ii3jok+UQ7X0|es+NVha`
z^uv89DG9=m&h|D=eR2>RJC>{(4Iu;=YtXUH<pGSf15#Uj58`nUw6-*J?BG7MlB`<4
ziRWv#a{K1boILzKm%lpA!WE;p2~P-OZ7|vln*nWdN*jVOE*hY%rJ3W0_M?>~Rl9{$
z?N%HxYrzt{AfPwXjV`dKctT*6!5TdTprjs%v>_QgZ2WM5p3ZiT9o&yml9d~`Fn>i2
z%HH)|K6f0gG;<a#%$E(9?}5^WNXJ8;K&xm#YKv!!1Ni2|5tNKr{z5%ZS5<Rl-+Qdv
z{uaI;@WaK^gozST^*hl80AdHySd@%%FnAnCO6HU?80*jvNa<Tm^ky=2rvCuXXX(1l
z^z~*?QN*<i4TvC#A10}Nb2p{aD#vU`X-lN!5P*zwIb|$5c4MY=OEYIaIzVT8nv${#
zthL;3y21447J=uJ?aNR$eI^^;c!#NT=8f5oi5<!qRBm7hpszQZlgeP?!o*#7+Bkps
z09r;!DOprgPmm}fQCh)|7fxcWVM^sQ_$B2`on7_7Sv0XjDnpdZ48?%Vbo47@245N-
zxmV77hLRDB*VZ#*-ckTwo?XT7*BZIec$OfMWLfQwg5J^cP+HU9-P4~3=;}!4w6^&e
zxL=)r-9q>w^Vihp>zl4#;+IPe_=zNIUf;zNQ!5L4@0Y-#jHT!AKZgKRHmjx4T00l&
z0;?cdT0vh|JL%@@%&4m7*Tx2#zWstAk!1DGw|R0_6@`2S0X&D)#%8;_WgY;qN*igc
z3k!|n+0;gUYWSGTpMQWChQwOqCz7muZ5QP;tBM-=J$b^Rw2lBf0w7XaYU|1hHCDNJ
zHPsecuAC>zW|%g29*bVukzZ=#ktZBd*--!vqwQ0ri7}0{YSxpgSwF7M#!|bH7I4D>
zve&;pb>imt7w6z6_);K5Y_;qF`eE=&cDGyvKshkc*CGq_Ip@p>fXULN|C&uYz`q+f
VyPG9K1Ze;O002ovPDHLkV1i`*IFtYY

diff --git a/core/img/filetypes/folder-public.svg b/core/img/filetypes/folder-public.svg
index 6bfae917a8e..bd7039750dc 100644
--- a/core/img/filetypes/folder-public.svg
+++ b/core/img/filetypes/folder-public.svg
@@ -1,57 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="c" x1="27.557" gradientUnits="userSpaceOnUse" y1="7.1627" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 3.4122)" x2="27.557" y2="21.387">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="d" x1="35.793" gradientUnits="userSpaceOnUse" y1="17.118" gradientTransform="matrix(.64444 0 0 .64286 .53352 -1.1074)" x2="35.793" y2="43.761">
-   <stop stop-color="#b4cee1" offset="0"/>
-   <stop stop-color="#5d9fcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="f" x1="21.37" gradientUnits="userSpaceOnUse" y1="4.7324" gradientTransform="matrix(.54384 0 0 .61466 3.2689 3.0908)" x2="21.37" y2="34.143">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="62.989" gradientUnits="userSpaceOnUse" y1="13" gradientTransform="matrix(.61905 0 0 .61905 -30.392 -.57170)" x2="62.989" y2="16">
-   <stop stop-color="#f9f9f9" offset="0"/>
-   <stop stop-color="#d8d8d8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="-51.786" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.50703 0 0 .503 68.029 -.67050)" y1="53.514" y2="3.6337">
-   <stop stop-opacity=".32174" offset="0"/>
-   <stop stop-opacity=".27826" offset="1"/>
-  </linearGradient>
- </defs>
- <path opacity=".8" style="color:#000000" d="m4.0002 4.4998c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0964c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#h)" fill="none"/>
- <path style="color:#000000" d="m4.0002 4.9997v2h-1v4.0003h26v-4.0003h-15v-2h-10z" fill="url(#g)"/>
- <path style="color:#000000" stroke-linecap="round" d="m4.5002 5.4997v2h-1v4.0003h25v-4.0003h-15v-2h-9z" stroke="url(#f)" fill="none"/>
- <g transform="translate(.00017936 -3.0003)">
-  <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#e)"/>
-  <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/>
-  <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#a)"/>
- </g>
- <path style="color:#000000" d="m1.927 9.4997c-0.691 0.0796-0.322 0.9023-0.377 1.3653 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#d)"/>
- <path opacity=".5" style="color:#000000" d="m2.5002 10.5 0.62498 16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 9.4997c-0.691 0.0796-0.322 0.9023-0.377 1.3653 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/>
- <g opacity=".7" transform="matrix(.67042 -.67042 .67042 .67042 8.6253 104.14)">
-  <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m69.5-61.5c-1.9217 0-3.5 1.5783-3.5 3.5 0 0.17425 0.0062 0.33232 0.03125 0.5h2.0625c-0.053-0.156-0.094-0.323-0.094-0.5 0-0.8483 0.6517-1.5 1.5-1.5h5c0.8483 0 1.5 0.6517 1.5 1.5s-0.6517 1.5-1.5 1.5h-1.6875c-0.28733 0.79501-0.78612 1.4793-1.4375 2h3.125c1.9217 0 3.5-1.5783 3.5-3.5s-1.5783-3.5-3.5-3.5h-5z"/>
-  <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m68.5-54.5c1.9217 0 3.5-1.5783 3.5-3.5 0-0.17425-0.0062-0.33232-0.03125-0.5h-2.0625c0.053 0.156 0.094 0.323 0.094 0.5 0 0.8483-0.6517 1.5-1.5 1.5h-5c-0.8483 0-1.5-0.6517-1.5-1.5s0.6517-1.5 1.5-1.5h1.6875c0.28733-0.79501 0.78612-1.4793 1.4375-2h-3.125c-1.9217 0-3.5 1.5783-3.5 3.5s1.5783 3.5 3.5 3.5h5z"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m1.4609 2c-0.2505 0-0.4609 0.2104-0.4609 0.4609v11.078c0 0.259 0.2021 0.461 0.4609 0.461h13.078c0.259 0 0.461-0.202 0.461-0.461v-9.0761c0-0.2504-0.21-0.4629-0.461-0.4629h-6.539l-2-2h-4.5391zm8.3829 3.5c0.4252 0 0.8512 0.1603 1.1742 0.4824 0.644 0.6442 0.644 1.7035 0 2.3477l-1.0492 1.0469c0.0442-0.3929-0.0174-0.7896-0.1876-1.1524l0.5648-0.5644c0.284-0.2844 0.284-0.7215 0-1.0059-0.285-0.2844-0.7218-0.2844-1.0062 0l-1.6757 1.6758c-0.2844 0.2843-0.2844 0.7215 0 1.0058 0.0593 0.0594 0.1291 0.1003 0.1992 0.1348l-0.6914 0.6913c-0.0646-0.048-0.1193-0.098-0.1778-0.156-0.6441-0.6443-0.6441-1.7017 0-2.3458l1.6758-1.6778c0.3221-0.3221 0.7483-0.4824 1.1739-0.4824zm-1.0157 2.3379c0.0646 0.0478 0.1193 0.0978 0.1778 0.1562 0.6438 0.6438 0.6431 1.7015 0 2.3459v0.002l-1.6758 1.676c-0.6442 0.644-1.7035 0.644-2.3477 0-0.6442-0.645-0.6442-1.704 0-2.3481l1.0488-1.0469c-0.0438 0.3929 0.0174 0.7896 0.1876 1.1524l-0.5645 0.5646c-0.2844 0.284-0.2844 0.721 0 1.006 0.2844 0.284 0.7215 0.284 1.0059 0l1.6757-1.6761c0.2844-0.2843 0.2844-0.7215 0-1.0058-0.0593-0.0594-0.1291-0.1003-0.1992-0.1348l0.6914-0.6914z" fill-rule="evenodd" fill="#55739a"/>
 </svg>
diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png
index f1f2fedccfc073dc23ebca5adea512732d9297d8..56c8ff36ed84b51b96fc35b20c45a43d0682bf35 100644
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}W`IwKE0AVj_}|db5E{D50Z0~3
zk0_cKT0A4XWKL-D?BK!~p+z%8if4wE%nT`-6;?buq<B_H@$AsznP4<4v}jgnF%SW{
z5C((<Dwq{of-Ev?np=WD&?=>pAirP+MkZz!X<02DW0TC{hK`=O3s$V%v2*w3dyk(y
zd;a3p>-Ycc7W{n=R2|{z;uuoFn5@90p~1+gKdC`T;=@7?g$AZc4IK?i6I?h>Y%=Ij
zWI2-h<EDjW$^#}R9-ljt9HjIV&YU=-+^(}gMe+RUQ%CiBlU9fv3eXS`ZHZdl@XFv2
Z1H-{Zf(5etZQ>x`d%F6$taD0e0st!}b07c!

literal 1134
zcmV-!1d;oRP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0007HP)t-s|Ns90
z0000000000000000000000000000000000000s;U3=t6k000>xCjbBd93?IQ00000
z03b0vCpJDUKS?h@O+7<RG)Gf4N>)5gT0Kx*MNm~iQ({9`Wk*_POI&A6Uu#ZaY*1ou
zQe|*eW^-3(b69G0T5EM*ZFpa8cO^VcB|cDAVr(cxSSLeQPk5J6f1gr-pjwBhT8O7%
zkgs8oupu%&BQrlFG(RRaKPNUoC^tbUKTjz(Kq@ytD?CRmI6*8qK`c5%EIUOlIYBKt
zLM}Q&FFHamM_4dALNYr-G*V_YNmn*TQ8r6jIZ|UfQDHkuR6JB>Jy2dfQei_+S43re
zMQevfS7b(Fc1KlSRA_coX?Ry=aae|>Sc<J#gP>b~nOuULV040Dn#5q6#9*7nVSklk
zil$?atz?O#WRI?8hoEMl$!CqIXP?JspU7vS%4ed>Xoi|;gqLZPv1ygHX_mEZiJfhX
zqHdbFZl%m_rp<1r&u*yCZm7_2jG%9txO0b<be_C)tI>3;(sZoSb)UU=r^$J#%XzBJ
zd9KrXsmpq<)O)1Be5JvDvDJZ}wSlO^f~m!WwAF*O)`Xw5g`Tj7tjCA6)rYp%h_1+p
zw%3WQ#EO%einY^=tHX=0$BVewjIha!xY&)BosGHJj<L#*vdfUU){wi|lDyfIt-h7M
z+LpG?m$%QDzuKC>+nl@7oxRhY!Q7w1-J-<Zqrlap#oeUB*QdwcsL0-`#o4RJ+pEdm
ztjgc8%iXfg-_+vl*5vNk<?rX`=k4w7`T6<${QUm@{{R2~it3h-0000tbW%=J00a>f
z78oETB_=8=EG{%PH#$2%LP<<eQ&wGIU}kD>ba{P(hKi7rnV+Gith>O%>+S9H^!ofw
zzlll!00DwYL_t&-8O_1LYEw}VfZ=~`rVR+87%{bJu+l(l1-ld%t_5Gjhw>o=SBfs&
zDwOV2RMad2*4k7{>`ijdIWy*_CdLxC;`i|%5TK?^ofe#<fIemFZoxSUE4Xnc<0A7$
zIRf>^IA?@E-8)7Ba~2aoS#5k8u~>EeLRZ*%knuNu|FvS4nAdwWym?2M$PC4zJ98d>
z=f&kVCCLoMf*8Mbz5#n1lrl3E3l(ST=-CltyGF^)P%OGL)_=7VpC4MSeGsp2L`q_Y
zVxwgP_V>a|4YjRX84#Grf}y07dIa8$K(=pJQ({K@3B`(H2#A9$6^S{^Lqkb14?y#4
zkimZE>J4GWVnVUgY5+D{AFuU3eC~BG4F~mI&I}DD3_@T`+B6!S?w3P2sBSV*M3fX$
z!Bn&P{teJ;QOfd2g-X6vq?x#KJb){;Sn?+aQNi*YaDG{>oUE_(DVc%d{v!vR31?|-
zjR6yu3`MNPSYiPOLANWyVs3APfQYb|yYmnH1Y?%JHL-}0y8r+H07*qoM6N<$f=EUG
AQ2+n{

diff --git a/core/img/filetypes/folder-shared.svg b/core/img/filetypes/folder-shared.svg
index b73e1fc3db9..5e0d4fde7a2 100644
--- a/core/img/filetypes/folder-shared.svg
+++ b/core/img/filetypes/folder-shared.svg
@@ -1,61 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="c" x1="27.557" gradientUnits="userSpaceOnUse" y1="7.1627" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 3.4122)" x2="27.557" y2="21.387">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="d" x1="22.935" gradientUnits="userSpaceOnUse" y1="49.629" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 -.83270)" x2="22.809" y2="36.658">
-   <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/>
-   <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" x1="35.793" gradientUnits="userSpaceOnUse" y1="17.118" gradientTransform="matrix(.64444 0 0 .64286 .53352 -1.1074)" x2="35.793" y2="43.761">
-   <stop stop-color="#b4cee1" offset="0"/>
-   <stop stop-color="#5d9fcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="g" x1="21.37" gradientUnits="userSpaceOnUse" y1="4.7324" gradientTransform="matrix(.54384 0 0 .61466 3.2689 3.0908)" x2="21.37" y2="34.143">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="62.989" gradientUnits="userSpaceOnUse" y1="13" gradientTransform="matrix(.61905 0 0 .61905 -30.392 -.57170)" x2="62.989" y2="16">
-   <stop stop-color="#f9f9f9" offset="0"/>
-   <stop stop-color="#d8d8d8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="-51.786" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.50703 0 0 .503 68.029 -.67050)" y1="53.514" y2="3.6337">
-   <stop stop-opacity=".32174" offset="0"/>
-   <stop stop-opacity=".27826" offset="1"/>
-  </linearGradient>
- </defs>
- <path opacity=".8" style="color:#000000" d="m4.0002 4.4998c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0964c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8022z" stroke="url(#i)" fill="none"/>
- <path style="color:#000000" d="m4.0002 4.9997v2h-1v4.0003h26v-4.0003h-15v-2h-9.9998z" fill="url(#h)"/>
- <path style="color:#000000" stroke-linecap="round" d="m4.5002 5.4997v2h-1v4.0003h25v-4.0003h-15v-2h-8.9998z" stroke="url(#g)" fill="none"/>
- <g transform="translate(.00017553 -3.0003)">
-  <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/>
-  <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/>
-  <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#a)"/>
- </g>
- <path style="color:#000000" d="m1.927 9.4997c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.266z" fill="url(#e)"/>
- <path opacity=".4" d="m1.682 8.9997 28.636 0.00027c0.4137 0 0.68181 0.29209 0.68181 0.65523l-0.6735 17.712c0.01 0.45948-0.1364 0.64166-0.61707 0.63203l-27.256-0.011c-0.4137 0-0.83086-0.27118-0.83086-0.63432l-0.62216-17.699c0-0.36314 0.26812-0.65549 0.68182-0.65549z" fill="url(#d)"/>
- <path opacity=".5" style="color:#000000" d="m2.5002 10.5 0.62498 16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 9.4997c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.266z" stroke="#000" stroke-linecap="round" fill="none"/>
- <g opacity=".7" transform="translate(6.9998 -1026.4)">
-  <path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-1.3565 0-2.4542 1.0977-2.4542 2.4543 0 1.3565 1.0977 2.4542 2.4542 2.4542 0.54607 0 1.0528-0.1755 1.4606-0.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m1.4609 2c-0.2505 0-0.4609 0.2104-0.4609 0.4609v11.078c0 0.259 0.2021 0.461 0.4609 0.461h13.078c0.259 0 0.461-0.202 0.461-0.461v-9.0761c0-0.2504-0.21-0.4629-0.461-0.4629h-6.539l-2-2h-4.5391zm8.6521 3.4941c0.679 0 1.227 0.5503 1.227 1.2286 0 0.6782-0.548 1.2285-1.227 1.2285-0.3022 0-0.5806-0.1097-0.7946-0.291l-2.3692 1.207c0.003 0.035 0.0078 0.0714 0.0078 0.1074 0 0.0641-0.0081 0.1281-0.0175 0.1895l2.3476 1.1989c0.2182-0.198 0.5079-0.32 0.8259-0.32 0.679 0 1.229 0.552 1.229 1.23 0 0.679-0.55 1.227-1.229 1.227-0.678 0-1.2282-0.548-1.2282-1.227 0-0.022 0.0027-0.046 0.0039-0.068l-2.4317-1.2362c-0.2039 0.1512-0.4574 0.2382-0.7304 0.2382-0.6783 0-1.2266-0.5483-1.2266-1.2265 0-0.6783 0.5483-1.2266 1.2266-1.2266 0.3043 0 0.5842 0.1096 0.7988 0.293l2.3672-1.2071c-0.0033-0.0366-0.0078-0.0757-0.0078-0.1132 0-0.6783 0.5502-1.2266 1.2282-1.2266v-0.0059z" fill-rule="evenodd" fill="#55739a"/>
 </svg>
diff --git a/core/img/filetypes/folder-starred.png b/core/img/filetypes/folder-starred.png
new file mode 100644
index 0000000000000000000000000000000000000000..09383b5e06b886cee73bf4533e4a8313f445365c
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}T7XZ8E0AVj_@9<G(=&IHZ^O*k
zl0|`)Q$lm+1(r+?FP#}&JTs(dW@yRGuo56+R#?fb(Bhe)ML=>^Xvu64S&U4AWkG`I
zh~@QXS)e_NB|(0{42-PoT-?H<V#*q!Q4Jk4X0BVmegDD3$4=b7d++_X??3+)STGv`
z6~}tIIEGX(_MY$*YE}?ny>M>A1jWJtk)vUMzVBb+5qaUM+x<@$IeFgeGdXVKKNC^N
zvsUoPkAEpMHto3gX_fa!rS~h77lgZHIdFYnaQbd%#{JUIhDvW(ddj%l4wU3DItB_P
Tcl`-u0(sxl)z4*}Q$iB}Zl`<9

literal 0
HcmV?d00001

diff --git a/core/img/filetypes/folder-starred.svg b/core/img/filetypes/folder-starred.svg
new file mode 100644
index 00000000000..de5ef5723da
--- /dev/null
+++ b/core/img/filetypes/folder-starred.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m1.4609 2c-0.2505 0-0.4609 0.2104-0.4609 0.4609v11.078c0 0.259 0.2021 0.461 0.4609 0.461h13.078c0.259 0 0.461-0.202 0.461-0.461v-9.0761c0-0.2504-0.21-0.4629-0.461-0.4629h-6.539l-2-2h-4.5391zm6.545 2.8867l1.0722 2.6836 2.9219 0.2305-2.2227 1.8476 0.6857 2.8516-2.4454-1.543-2.5 1.533 0.7109-2.8025-2.2285-1.9043 2.8848-0.1875 1.1211-2.709z" fill-rule="evenodd" fill="#55739a"/>
+</svg>
diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png
index d6b4d8cab991a041f15af89cebca2d332f5cef51..3dfb4391f2cde95313b8fd10b3193604f95bbabf 100644
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=3+9Gee4Ig%*R5Hg9(&
zP>7`@$S;_oq2v8T&j}lVd}U7;#}JO0$q5G-&gkheC9rjOcMJD0GO-!7F)!swo6#u2
Zz@YU{_@S@KKP{kg22WQ%mvv4FO#rUjB!B<_

literal 713
zcmV;)0yh1LP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10!B$hK~z|U?bkbN6+sjS@c-=NDiSLzZ331Gf}jX0R=2V7@i}bG
zhsd|Ev9YnUP#Yl@LclH{SO{V;A$qgsW_RX1EzEs|kX+;4dmB%+!*F(foE>J)26x9I
zBU|X|{{aAs@j(dT8i1uKb2r`n%S-_PmfZdQG>IXEI{;<}2qD}A0Cxv7ADdK`<sj$w
zDc9X~_l*evfR2c)nc0ciW(E<Ns!~TqQ51KF&*KwSRe^|3``)Rd)9Fl%gS+Ei_rar!
z%gax0-MHRW)m8y{p5w#%$G5$oThCv=eDSORfXi2|K3rLO+AZ?D)x`&K|H0$#>gwty
zfIonw(*L|wL3}>PLMI2<ECL66K*bv(f#oIIz8XRRToo$T3;`@06AOT1E&x#ho7O{s
zs5Xfec?MX^f-D3W3xs8?0xUJLpeSuF040G6j{uaoi7Yr{4z+dxc?J**BHQQ_FvTXZ
zBGdK(=0Fk!r8ojaN;Qd~RENv~K&*(AMt~ISnncmD_5lunL_l>j0_^?j*NFsY&B5A!
zkC;dh>uRh5)%HG#fYrfz@@@EUk%5@8-`m|E0)A|NtC<y|?N=bcL892*`8onnzt540
z$*iQms=x`@Bc~maSo^&m4FLd<nv{sROmYY?>x0QMq}as4Z~*X_BBjJga=0Hj25=gi
z<!G9i0N6MnXl(4lxg5Y`PteAW_@3gh%mYBRvG(fCr}cN2+}mvmLI|c5cL4N(gO==I
vq5yCnhf6T~Pyl=GE)#%7#lnBh77q9gIq-ezK>nL}00000NkvXXu0mjfWGyz$

diff --git a/core/img/filetypes/folder.svg b/core/img/filetypes/folder.svg
index c0a5af9ce1e..e9d96d40490 100644
--- a/core/img/filetypes/folder.svg
+++ b/core/img/filetypes/folder.svg
@@ -1,58 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="c" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 3.4122)" y1="7.1627" x1="27.557">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="d" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 -.83270)" y1="49.629" x1="22.935">
-   <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/>
-   <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 -1.1074)" y1="17.118" x1="35.793">
-   <stop stop-color="#b4cee1" offset="0"/>
-   <stop stop-color="#5d9fcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="g" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 3.0908)" y1="4.7324" x1="21.37">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 -.57170)" y1="13" x1="62.989">
-   <stop stop-color="#f9f9f9" offset="0"/>
-   <stop stop-color="#d8d8d8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 .503 68.029 -.67050)" x2="-51.786" x1="-51.786">
-   <stop stop-opacity=".32174" offset="0"/>
-   <stop stop-opacity=".27826" offset="1"/>
-  </linearGradient>
- </defs>
- <path opacity=".8" style="color:#000000" d="m4.0002 4.4998c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0964c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8022z" stroke="url(#i)" fill="none"/>
- <path style="color:#000000" d="m4.0002 4.9997v2h-1v4.0003h26v-4.0003h-15v-2h-9.9998z" fill="url(#h)"/>
- <path style="color:#000000" stroke-linecap="round" d="m4.5002 5.4997v2h-1v4.0003h25v-4.0003h-15v-2h-8.9998z" stroke="url(#g)" fill="none"/>
- <g transform="translate(.00017553 -3.0003)">
-  <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/>
-  <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/>
-  <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#a)"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.05 -864.43)" fill="#55739a">
+  <path d="m200.2 999.72c-0.28913 0-0.53125 0.2421-0.53125 0.53117v12.784c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53124-0.2327 0.53124-0.5312l0.0004-10.474c0-0.2889-0.24211-0.5338-0.53124-0.5338l-7.5457 0.0005-2.3076-2.3078z" fill-rule="evenodd" fill="#55739a"/>
  </g>
- <path style="color:#000000" d="m1.927 9.4997c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.266z" fill="url(#e)"/>
- <path opacity=".4" d="m1.682 8.9997 28.636 0.00027c0.4137 0 0.68181 0.29209 0.68181 0.65523l-0.6735 17.712c0.01 0.45948-0.1364 0.64166-0.61707 0.63203l-27.256-0.011c-0.4137 0-0.83086-0.27118-0.83086-0.63432l-0.62216-17.699c0-0.36314 0.26812-0.65549 0.68182-0.65549z" fill="url(#d)"/>
- <path opacity=".5" style="color:#000000" d="m2.5002 10.5 0.62498 16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 9.4997c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.266z" stroke="#000" stroke-linecap="round" fill="none"/>
 </svg>
diff --git a/core/img/filetypes/font.png b/core/img/filetypes/font.png
deleted file mode 100644
index 535e03dfa7719300249d7142075884ada1dc5e92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1623
zcmV-d2B`UoP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000IaNkl<ZScUCY
zX>1gA6fcN~U`3@@O6m5X-L})2onvQqw|n$H=t1d$Q33(cKnM}667eWeu@FBP&Xlui
zfpBSULK6@vl!PNzkOHQZqp(D3KnsH1?zUSBeZIHsnr(p=K2T!fhhKK*KkxXx^FKZS
z;PW)`RGt5~2xzt1b&@232cjsxF=zxBh8d0o+9yq#1jWV0ke!_kvMiq*Gy)iHp}}Bi
zD=I32f`S4lEG#4f9hiy8K_Q?hN?k@qhReCxY<3YyN=kAffu&EJ0LO6w=*XF$pAVUt
znXdZh=H^09P7YvMuKW1-40)mi(BT4;$>bmcMx(JEowg(=CwJ4cPN%bBc~bi7oHMF}
zFB)SPS(DkyODSx%HI?0GP2~<-lbFg&rfAb+5x`noDgEw<I|V_o;F&!yFAtDN51v(d
zWY6kjlFlcxd(N2|XUoit&ObkR6<QZff$N`5gBxYj;o5>CxRA&?&LzZ6eIx=Hy-3a|
z<>>4#I{VI>6iow>nk7koXH4<cO)0$n^0c&`<^p5K`E2D@^F+g~<|4EG=JGjU+fd@d
zZ*NZMYShP;J`w>mzCJNAv74f&bmMc9`@96p;h=M)!C?PVr@3-wg08D6$6!BYh`)JK
z7q{Sq5@$Z4#AKe-Gs_yY6vy8y<^rKHUB1;I$65v?K(mh-Xs1Zi)6*%^R!_rW8T_d+
zv$C=vB_#!ljJlrFX^P{x62JCfQrHM@JI6$3Mq{?o_Se!`aO3m0;1`*3ddu`X`xtc_
zIl(4$B7w4AqbbV=a1?>wC&)5<FSEzd+|a&u>J{!M>&%I8{o@&MWlj;`bK@g5Av&zX
z^aEvp>WsS}-1~i*sHw5&bguW7gaj~);<COr_Q%Hu9unf6SLeM3f0RstGX<$VheUSy
zfCN0VpO%&eL;?w%=w+B?(+-H54znUdYHF&h3=i4~2RUy3@nnPJ>g>rtsJG~BbsSSP
zAOV_vT)hq=px5i$@%dfs{2&jiG+ax4ZYs<(8^B~V_K+NA=)Rp$tKrTz<)=f-w0sw8
zd5yi6VL}HafYDej77L9YMRps};em|h&}+4>x*PCUrzm$Q12`4Ec0x@IoA@Kg+pWbD
z;PT{bXfDWv-3(_Na1+w(qaiyve;iOlQm-HpUo<<UhT+cEn-icpFWrTP6btNPG)D&{
zK(mkO@21*6E^umSRnM%7;$E*|g!a9>7MjwNT{x`MLzP;ywqF9C*{2(iN<ddG8nk&M
zLDGT=(@&uP^qqk9caS_r4_Zk&y(5}$-N(zYElLBYOh)+CY=XTSZP)hknv#AA(Cnkr
zHX@LKqlL!LBcT{?tWxvsHIf2*WChm5@V5DJ(qtlyyTWx<E0VT*W31S@EsAg7GG5dD
zGs-r|I;d6)ZJQ!B1^p60Lv`5ou1F{<e4f`=p)x|ac9;?27%M_ewAfi0uK7VLikmV0
zcS+BnC@_~5?|c)%Z>@~rfA`34i4@u@R2t!-1U$1(k-MYsptHUT6)NH4eoXDrXbz4b
zHiz-{Pou;e21(mPde}dZAV_z=h>%8Cgb5csvR{Sqw)HAW+@Rvi*Q<n%4WU9>F9J0C
zn0^Ok0HY@Y_jN2`ZK!ahI$Z2I5Gev-KVo-;2qsaYCZxTAeW11DeUY{%RBYH4eot;&
znBXiQC*1j3B{<iF3b)J0@iY1oxJ-`82-TEj*;%;Ro<$6E|GKa^h?kcI3yvM35`3!?
zVSA_mTU9(vj}rm!2bVqu(t`x{E)I-8vT+;_J5jC*u~Q|%>JY)PYOJ`VR|zoHI&|tl
zMN+0uZl|xWuNobWMm&cYfp{J<lFr@_WXcu?aUCni@~|S9hq55{_UsVGiM`O}WuvQL
zOxVKGK-RHttN`VRB|&`0CxP5bx6Psd5<ubA-rxK@&)1?rFv8c1fQQ5jc<A@GU(9<S
z25^lF{n<-%{L~ftk$w}=POG;awOU>J&KPFXM*&<{sXx~;KOk-@>W@MUzpn}D&>is@
z#LI4H&$uz{0T}Mi2$6gV;g3)u#v>vTA&6HHFQ$$P2n@MrZ&=?8>!H{2VBvoP{{RIR
V3%w?@<-q^|002ovPDHLkV1nN91k(Tj

diff --git a/core/img/filetypes/font.svg b/core/img/filetypes/font.svg
deleted file mode 100644
index 13c0596006b..00000000000
--- a/core/img/filetypes/font.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="22.056" gradientUnits="userSpaceOnUse" y1="15.834" gradientTransform="matrix(.85825 0 0 .86435 .35576 -11.07)" x2="22.056" y2="45.497">
-   <stop stop-color="#575757" offset="0"/>
-   <stop stop-color="#333" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.25444 0 0 .18504 6.1544 20.059)" r="14.098"/>
-  <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.83270 0 0 .18284 17.869 20.171)" r="14.098"/>
-  <radialGradient id="n" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.69391 0 0 .18504 25.492 20.059)" r="14.098"/>
-  <linearGradient id="j" x1="143.92" gradientUnits="userSpaceOnUse" y1="75.221" gradientTransform="matrix(.97891 0 0 .95244 -119.66 -63.433)" x2="143.92" y2="103.13">
-   <stop stop-color="#f8b17e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".3121"/>
-   <stop stop-color="#c6262e" offset=".57054"/>
-   <stop stop-color="#690b54" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" x1="153.41" gradientUnits="userSpaceOnUse" y1="98.785" gradientTransform="matrix(.97891 0 0 .95244 -119.66 -63.433)" x2="153.41" y2="75.221">
-   <stop stop-color="#791235" offset="0"/>
-   <stop stop-color="#dd3b27" offset="1"/>
-  </linearGradient>
-  <radialGradient id="o" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.25444 0 0 .18504 22.459 20.059)" r="14.098"/>
- </defs>
- <g fill-rule="evenodd">
-  <path opacity=".2" d="m24.478 26.848a3.587 2.6087 0 1 1 -7.1739 0 3.587 2.6087 0 1 1 7.1739 0z" fill="url(#o)"/>
-  <path stroke="url(#k)" d="m29.106 9.9132c-0.478-1.0813-1.642-0.968-2.441-1.1397-2.646-0.3044-5.287 0.181-7.504 1.6705-2.1399 1.4497-4.0763 3.4112-5.4365 5.9425-1.1823 2.2548-1.7132 5.267-0.96727 8.1364 0.58709 1.9316 2.3544 3.1247 3.845 2.803 2.2818-0.38055 3.9079-2.4984 5.2493-4.5646 0.60658-0.85208 0.97918-1.9805 1.6952-2.6966-0.1019 1.8363-0.14753 3.7435 0.26981 5.6082 0.2372 1.0995 1.1049 1.9662 1.9843 1.9261 0.89467-0.10266 1.5757-0.87918 2.3174-1.386 0.66706-0.59088 1.4312-1.0989 1.9035-1.9532-0.08137-1.4151-1.3465-0.52654-1.7881-0.04084-0.61732 0.97151-1.8927 0.19955-1.6199-1.1225 0.14283-3.0198 0.84698-5.8557 1.4425-8.7028 0.3348-1.5009 0.68722-2.9931 1.0492-4.4802h-0.000001zm-3.696 1.8848c-1.1333 3.5797-2.3575 7.223-4.4519 9.9984-0.98815 1.2662-2.437 2.4144-4.0344 1.8053-1.1039-0.48951-1.3597-2.0989-1.3836-3.3097-0.14247-3.5752 1.5838-6.5362 3.7419-8.3224 1.5043-1.1975 3.4487-1.7396 5.3479-1.1547 0.35854 0.1335 0.74746 0.47906 0.78012 0.983v-0.000001z" fill="url(#j)"/>
-  <path opacity=".2" d="m31 26.848a9.7826 2.6087 0 1 1 -19.565 0 9.7826 2.6087 0 1 1 19.565 0z" fill="url(#n)"/>
-  <path opacity=".05" d="m24.478 26.879a11.739 2.5777 0 1 1 -23.478 0 11.739 2.5777 0 1 1 23.478 0z" fill="url(#m)"/>
-  <path opacity=".2" d="m8.1739 26.848a3.587 2.6087 0 1 1 -7.1739 0 3.587 2.6087 0 1 1 7.1739 0z" fill="url(#l)"/>
- </g>
- <path stroke="#333" stroke-width="1px" d="m19.663 27.5c-0.79147-2.2568-1.583-4.5913-2.3744-6.8481h-9.7253c-0.8117 2.284-1.6229 4.564-2.4341 6.848h-3.1514c3.0005-8.2609 6.001-15.739 9.0016-24h2.8497c3.0061 8.2609 6.0122 15.739 9.0183 24h-3.1849zm-3.337-10.109-3.913-10.391-3.913 10.391z" fill="url(#i)"/>
-</svg>
diff --git a/core/img/filetypes/image-vector.png b/core/img/filetypes/image-vector.png
deleted file mode 100644
index a847f78fcd8599ea8787c56cfa845a43dd128c7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 885
zcmV-*1B(2KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009#Nkl<ZScT1%
zTWAz#6vuyOW_FVeNsN_TP)dC(L>fxzo3*ldt3sg{n)=W}@d_42ZK)6{zDc3&lS+#b
zArBS7id0HTo0e@;D3nrAR3d~1jgZ=uPBxpmJG(pcoj$C_&0fqHC)ht6KKS^~Ilpth
zo2V+~N~Kb_Rkf2vkcj-1OeVX^=bXw##+c4zGKpnbktR3BkV>Vh3abK8RXoqb_x(r#
z9LJ%u+W=K%s%p)JkE(icYj$8UARY>!e2f|*6u@KeK-J=ZCeTYiAkVIYWy@#h%*Ep{
zb{S3ojjZfOdXmVxx1q)jdL#gIY!BN0B=YlltRoj-^mok3_i)y}hVx<{R$~KtYlOn^
z*O*J+BRfBZCGDXA>fVAmAjUx8LotsUgE@PY_}2G{t?$Kd@5E}1;XJjH=H9o6KaoKD
z57vwm8lY0L?=!4r%ORhItHX!}*sGpL{A|ezGe|xI`Dqf*b;HCc`uYB<I14`mOS@oe
zAGCF#UmZi7I8w|Z#XCqLQ?h&-$+?K<qS-85PR)rC%{#Dh8*=?u^u`s$OCv!JDa?SE
zMm+Z}Kn5%MDkjkp3ZU*5)Z9bB?D!Z0pWKNL?<Swd@}`iS3x1C2o_FzIKaAP3yQ-LI
z-ho651U}~WEzHdkoVEre=c2}t?%7L_=zto&p*vuVse6L&nc2JxmUfXne+HSEB(NKB
zpV^Dw*#2NYW9A2#FS)7`ytI?z2VbCmz`sBKhTFZHAl4kpHxxi9HML@`-h}UFkY6r_
za#`?0RLhzshG}tbLM)Cw*bg_ZMAw1&tY!QgTK_nQ*cNC&@y$M*(}%FXI}Pri(F53n
z{iP~RK-<`tG>;DgP?*f1E1o7;wWbto{2H;72ObI_)HQUzJq18hc9eMI6uv6CF_*%`
z6#4xhmDVO&z_Mp!)Qh_yfa1pONOqdQyF+1Q6p9|j)o<Xx^9tIu1XS_1e}aAWCxVyv
zMGsKeu&v6m%%L>2bz)xVoii61KopAp9atblr5<|+{+|Gj;}DO>BL%qk$vqH2M67{<
zfytqvp^iwi-;X~jB9^Moev490B_aZ}R)R$+AINA~Qd!JXA4dNH_Va9XLKx0700000
LNkvXXu0mjfR3fFG

diff --git a/core/img/filetypes/image-vector.svg b/core/img/filetypes/image-vector.svg
deleted file mode 100644
index 1f0a54a21ca..00000000000
--- a/core/img/filetypes/image-vector.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="i" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="n" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="o" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="l" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="m" x1="28.534" gradientUnits="userSpaceOnUse" y1="24.24" gradientTransform="matrix(.65943 0 0 .64652 -27.821 1.2237)" x2="16.887" y2="13.664">
-   <stop stop-color="#fda852" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#l)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#o)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#n)"/>
- <path stroke-linejoin="round" stroke="url(#k)" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#j)"/>
- <path stroke-linejoin="round" stroke="url(#i)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/>
- <g transform="translate(27.788 -2.3184)">
-  <path stroke="#ea541a" stroke-width="1px" fill="url(#m)" d="m-17.037 24.229c2.7541 1.8316 8.7672-0.61882 3.7681-7.1764-4.9538-6.4982 4.9219-10.76 7.8525-3.2453" fill-rule="evenodd"/>
-  <rect y="22.818" width="2" fill="#ea541a" x="-18.788" height="2"/>
-  <rect y="12.818" width="2" fill="#ea541a" x="-6.788" height="2"/>
-  <path stroke="#ea541a" stroke-width="1px" d="m-17.699 11.147 9.5001 12.316" fill="none"/>
-  <path stroke="#ea541a" d="m-16.288 11.318c0.000372 0.55218-0.44745 1-1 1s-1.0004-0.44782-1-1c-0.000372-0.55218 0.44745-1 1-1s1.0004 0.44782 1 1z" fill="#e6e6e6"/>
-  <path stroke="#ea541a" d="m-7.288 23.318c0.000373 0.55218-0.44745 1-1 1s-1.0004-0.44782-1-1c-0.000372-0.55218 0.44745-1 1-1s1.0004 0.44782 1 1z" fill="#e6e6e6"/>
-  <rect y="15.818" width="2" fill="#ea541a" x="-14.788" height="2"/>
- </g>
-</svg>
diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png
index 305c3d4db27a52367ce49ffbf0fb9d63b409007c..2a5441efdb7989c03307df6ec62ad2ad19bbcbdc 100644
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE0FH)?w&Gb%2Y6zK7IN$
z7(iyj#6Yx|N77f2StUV!!3^Bm2@Nf+Z5{KkKL7CP^B1lQD|Z0pyggkULn;`1PdM^5
zC<r)T40LyK{qfy?txGVI_FvE472g*7T#saY{pe=cA&!~ZEfcN_Ms=Hih{)IDkXhu*
o&b0iQHIw_^1uUKGQtsbfV9t7|=fKjpKw}v^UHx3vIVCg!05?NekN^Mx

literal 695
zcmV;o0!aOdP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007hNkl<ZScT1(
zPiPZC6vn^V?1s`vl%&$o22*O{A<$3=C>pfTs#LHZ)I;@RtU2`5gF+|>4MhS$!D}zU
zo6=j(9z?v^LOdBEAqb(Q;2%V)H8Fp7Jj89+-Pz41J3_wO&hGo(kN0NYBm^2I5{cDd
zFc{UY^H8~5&S$gPjCxJfeiR4<BFSX(CLx4ta!M)E>2y=Ot^)voTCIjwtHl*S6q%_Y
zuofw$T$7u5>ab*42Bnlc1f>+REO!S`2h@KxQ7wP7m3Tbp!O*Z|_?`)%RNzZ>56@Ds
zZ2>Glz65{JV^~qcJ;19C-Mn-FMgjhi7c)1)@c3L@AxvAK1WaED;9hDTf<SP6xs6Bh
zO?<8Xu$>$*Xn|IzFQ0-SbOw_sIuM;bX(_oC=>XKnP@#U4E1=zO0|0*48`yeTvYbHe
zW%(Ft0gCxutlfTr$*EC%c)Nr8zHXwz?Hz`1;uuQ#T~jZum=#b5D*FC;AMaj$WG0W!
zO=A7|Ev!6Qz~cQFhK@+Mo0`@6^jv{%B7`EoHizg;2+HMkeqjn{uY}QT9Nr~neqCFj
z4ip>&a=Y_<eB6zdr&r+}J*qbq9cVV1hCV$3D2l{RApY<oDy2_&zqNyFOJ^WShLaqi
z#$H_k)FJ}G;)58@&4)n<K`7!!DB=ge?x`ZPccuWWvgJ0mk=xj|WO(TF?`H0M5>lC>
z{<G0jaw9L6EDa(%vNecC#$33w9<v27GUn?46o^g-d=vU()~osk;3>-hJp0e`)ymR!
z{695#Ef|QO<&q@9>2z`jU`Y!g6pO_|CX?CZn*FaTl}Z7feRog_?LSZgz|8>Tr51oa
d9Nd)ypg)>=;&A!lyWao+002ovPDHLkV1i!#JEH&q

diff --git a/core/img/filetypes/image.svg b/core/img/filetypes/image.svg
index 0159eed6482..3aaa34cf901 100644
--- a/core/img/filetypes/image.svg
+++ b/core/img/filetypes/image.svg
@@ -1,39 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" y2="43" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" x1="24">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-opacity=".23529" stop-color="#fff" offset=".036262"/>
-   <stop stop-opacity=".15686" stop-color="#fff" offset=".95056"/>
-   <stop stop-opacity=".39216" stop-color="#fff" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" y2="47.013" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" x1="25.132">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="d" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" x1="302.86">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#d)"/>
-  <path opacity=".15" fill="url(#b)" d="m4.95 29v1.9999c-0.8066 0.004-1.95-0.448-1.95-1s0.9001-1 1.95-1z"/>
-  <path opacity=".15" fill="url(#c)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/>
-  <path fill="url(#e)" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z"/>
-  <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#f)" stroke-linecap="round" fill="none"/>
-  <path opacity=".3" stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
- </g>
- <g>
-  <path opacity="0.898" d="m7.7886 21.255h16.423v-15.51h-16.423m3.628 2.8735c1.0944 0 1.981 0.8261 1.981 1.8451s-0.88656 1.8458-1.981 1.8458c-1.0938 0-1.9796-0.8261-1.9796-1.8458 0-1.019 0.88588-1.8451 1.9796-1.8451zm-2.6108 9.4533 2.9348-2.2011 1.4939 1.0904 5.9206-4.3819 2.2011 1.6359 1.4932-1.0897v4.9464z" fill-rule="evenodd" clip-rule="evenodd" fill="#5b2d8d"/>
-  <path fill="#fff" d="m10.658 12.066c-1.8593-0.82639-1.2884-3.3318 0.75961-3.3335 1.9297-0.00157 2.6205 2.394 0.93791 3.2524-0.61512 0.31381-1.1197 0.33792-1.6975 0.08111z"/>
-  <path fill="#fff" d="m10.392 16.949 1.3399-1.004 0.73508 0.52638c0.4043 0.28951 0.80332 0.48661 0.88673 0.43799 0.0834-0.04861 1.4203-1.0288 2.9709-2.1782l2.8192-2.0899 0.43502 0.32295c0.23926 0.17762 0.7424 0.5447 1.1181 0.81574l0.68306 0.49279 0.70677-0.53895 0.70677-0.53895v2.3791 2.3791h-6.8707-6.8707l1.3399-1.004z"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m1.3438 2c-0.19748 0.03825-0.3473 0.2334-0.34375 0.4375v11.125c0 0.23 0.212 0.438 0.4375 0.438h13.125c0.22555-0.000006 0.43749-0.20846 0.4375-0.4375v-10.953c-0.0005-0.33655-0.2645-0.61145-0.5155-0.6095zm0.65619 0.99994 12 0.0000068v5.0001l-1-1-3 4-3-3-4 4h-1zm2.5001 1c-0.82845 0-1.5 0.67155-1.5 1.5s0.67155 1.5 1.5 1.5 1.5-0.67155 1.5-1.5-0.67155-1.5-1.5-1.5z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png
index 4f5c6583bf1bf06ffc3b8da0cc2ac5cc94ac8ca3..eb1470b0dff2ee8a2d33b25675fa9511b0da77c3 100644
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Xn;?ME07K=nH5qrJFH}8NYSj&
zVi58?x~%~y!B!IF7tByz-_Y^i<WlWApoo&Ei(^OyW3mFj!DdHB?w<23i3U!tHzqL1
hvPKBjgl)26WAM7h)bs4l@)<zY44$rjF6*2UngDSGCv^Y-

literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007)Nkl<ZScUCZ
zy>8S%5dPL)pJQJVC4`8dNIVAxd4x#RG^rvwr0ens2nh)(FF-|0l_!9LmN$Sjp+HGQ
zE;_QFABywcdCzuiU;Y|K8p*TX`TJ&Oy*8?f`=sDrz5fpYfGrB&KEHbd==(N`CI~%Q
zg`0I0qJh4C{&N50Y%OoXub<woBXGy-8*6bG&Ka*T7Dllrb9On~S<}}{jI)!oztH&U
zi&y)nKmh@Ar@K*-u!us0nzIQLPo}J_Q#E16h-8<iy8u4;0c38FuB@h2hDwG3gt76~
zvMRj_By7}6N9TVAlK=t$I6T<frp#?1u*foMWXcGNz+=kSJ*J#<Im-wz7EJEJ;lbYa
z6agh3L}`)`G0^&8n)Qj+Ay9)x7$s>ox)=cXVgbOIV5h(KD6nygsFxt@#jsHf+lygL
z2$(V4rhxkL+LQ4^zLu^&oW3`hZDev_x`dDelY@{$(q9gahi5xe1Xee<?8fFwuHweb
z=g?7YLjx;)Pvqf`+T;z!c!lBkVJVJrvAJcZ0f-2go9DPlBH{-y)xUZa=k*r|Kyw5B
zex`QQQxgD}GpN(d>G#j?tsK?SB!L0~)Lwfbr~Zy|38-5SlufpbTq^_M7CoR{+_Y%I
zVhOlVg0{A<d65!sm;$X8x>B`rxdg-u`dLh?GzC=K12=eSEtslk!sdgdi-RVbAP^X1
zf=Lf_VyfWjd%BW|2_gbxOke@@E05yFY`T?Zes^Aiz6G!(c}CZ9(8j43z&PP03&46u
z@ohM*Sj-Wy7Jx4DIj*$d;WsZ2KrH|#%F4{9LFYzElof!p07lNyk<jp&cbB?NQYeWW
z0T>xog)!zafap$~PeK4lRew$X3r;Zin|2380PqhjaR2S-rZqMI0000<MNUMnLSTYV
C#Ym3;

diff --git a/core/img/filetypes/package-x-generic.svg b/core/img/filetypes/package-x-generic.svg
index e00438421af..d183f3bbe0e 100644
--- a/core/img/filetypes/package-x-generic.svg
+++ b/core/img/filetypes/package-x-generic.svg
@@ -1,53 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="i" x1="44.995" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="17.5" gradientTransform="matrix(.70749 0 0 .69403 -.97980 -1.6455)" x2="3.0052" y2="17.5">
-   <stop stop-color="#FFF" stop-opacity="0" offset="0"/>
-   <stop stop-color="#FFF" offset=".245"/>
-   <stop stop-color="#FFF" offset=".7735"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="26" gradientUnits="userSpaceOnUse" y1="22" gradientTransform="matrix(1 0 0 .71429 -8 -1.7143)" x2="26" y2="8">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" offset=".30213"/>
-   <stop stop-color="#FFF" stop-opacity=".69020" offset=".39747"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="23.452" gradientUnits="userSpaceOnUse" y1="30.555" gradientTransform="matrix(.90695 0 0 .81527 -5.2694 -5.0638)" x2="43.007" y2="45.934">
-   <stop stop-color="#FFF" stop-opacity="0" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" x1="24.823" gradientUnits="userSpaceOnUse" y1="15.378" gradientTransform="matrix(.90695 0 0 1.0808 -5.2694 -11.995)" x2="24.997" y2="37.277">
-   <stop stop-color="#dac197" offset="0"/>
-   <stop stop-color="#c1a581" offset=".23942"/>
-   <stop stop-color="#dbc298" offset=".27582"/>
-   <stop stop-color="#a68b60" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" x1="15.464" gradientUnits="userSpaceOnUse" y1="7.9757" gradientTransform="matrix(.70732 0 0 .69403 -.97579 -1.3833)" x2="15.464" y2="45.042">
-   <stop stop-color="#c9af8b" offset="0"/>
-   <stop stop-color="#ad8757" offset=".23942"/>
-   <stop stop-color="#c2a57f" offset=".27582"/>
-   <stop stop-color="#9d7d53" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="41.5" cx="5" gradientTransform="matrix(.59382 0 0 1.5367 -6.6595 -103.94)" r="5"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="d" x1="17.554" gradientUnits="userSpaceOnUse" y1="46" gradientTransform="matrix(1.757 0 0 1.397 -17.394 -16.412)" x2="17.554" y2="35">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="41.5" cx="5" gradientTransform="matrix(.59382 0 0 1.5367 41.141 -103.94)" r="5"/>
- </defs>
- <g opacity=".4" transform="matrix(.69054 0 0 .67815 -.50409 -.44851)">
-  <rect transform="scale(-1)" height="15.367" width="2.9602" y="-47.848" x="-3.6904" fill="url(#c)"/>
-  <rect y="32.482" width="40.412" fill="url(#d)" x="3.6904" height="15.367"/>
-  <rect transform="scale(1,-1)" height="15.367" width="2.9602" y="-47.848" x="44.11" fill="url(#b)"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.05 -864.43)" fill="#35537a">
+  <path d="m4 3-2 2v7.539c0 0.259 0.2021 0.461 0.4609 0.461h11.078c0.259 0 0.461-0.202 0.461-0.461v-7.539l-2-2zm1 1h6l1 1h-8z" fill-rule="evenodd" transform="matrix(1.1538 0 0 1.1538 198.51 997.42)" fill="#55739a"/>
  </g>
- <path d="m5.3977 4.5159h20.864c1.218 0 1.7661-0.19887 2.116 0.69403l2.1232 5.29v18.081c0 1.078 0.0728 0.91332-1.1452 0.91332h-26.712c-1.218 0-1.1452 0.16471-1.1452-0.91332v-18.081l2.1232-5.29c0.3401-0.87486 0.55789-0.69403 1.7759-0.69403z" stroke="url(#e)" stroke-linecap="round" stroke-width=".99420" display="block" fill="url(#f)"/>
- <path opacity=".50549" d="m6.0608 5.219h19.56c1.1418 0 1.8485 0.38625 2.3268 1.4478l1.6473 4.4555v16.063c0 1.0137-0.57913 1.5241-1.721 1.5241h-23.86c-1.1418 0-1.6076-0.56135-1.6076-1.5751v-16.012l1.5942-4.551c0.31884-0.82269 0.91924-1.3522 2.0611-1.3522z" stroke="url(#g)" stroke-width=".74212" display="block" fill="none"/>
- <path opacity=".4" fill="url(#h)" d="m14 4h4v10h-4v-10z"/>
- <path opacity=".4" d="m1.5001 10.5h29" stroke="url(#i)" stroke-linecap="square" stroke-width="1px" fill="none"/>
 </svg>
diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png
index ac48f1f802bc79e35b15b8a6de66b436fee03876..dcb22b53e670fede3591e239b1100c582f1b65d5 100644
GIT binary patch
literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Q-Dv1E0CTxZQ6_(Gp0|U4rEN7
zIu%aB84xKT7Xr|@j;G@e0!<Mu3GxeO@bvQW%PMc^SiEHEp2J6uK6?D*>A$*1rk{Zd
zf;?RuLn>~qJ$0I|!GOahuqI?nSkBhZ|MzFTY-)LNX?MaT;TNle{|G%O<6~g{+p_ZD
z-jjl&CHl2%3fFVhipFqlin`Qz^3nbUOOAT&JQ$Jiv@y<Bay5GrU(8HKpy>>ru6{1-
HoD!M<6oPCZ

literal 1271
zcmV<T1PJ?yP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw00075P)t-s|NsC0
z007K0Gru4pzd#@t7Z<-PD-seC;XExA6cpJxCKwnP78VvaH#e-TtlK&#eSLk~J15vV
zDcLzEe}8{)aBy^VblW>AzP`TIJ}=xmDSv-|dwYAs!^7M<C)YYDrKP3RIxO5eC)_(H
zeSLl7X<d1FdE7cDd3kw#eSLm@et>|0f`WpCgoK8MhKPuWii(Phi;IkmjE;_ukdTm(
zk&%*;l9ZH`m6es2mX?>7mzbECo0yoJnV6fKo1C1SpP!$gprE0lp`xOqqobpwq@<;#
zrKYB)r>Cc=sHmx_sj8}~tE;Q5tgNlAt+BDOva+(Xsi?HHw70jnxw*Nzy1KnNHod*Q
zzBe<zzP`XOE5N|O!NI}AF)G9~EyTpc#eH|heR##i#m7ZL$TBL(G%U-@%gi(>%rz>{
zJ~PlZDbzSA)YR0~)z#M4*4Nk9*x1<F+1c9K+S^V>+geuJ+uPhaC*0iJ-BC#0X<*&m
z-QH74-e6kZXJX!KVcy=}-&RZCX=C5t-{4nF;AC9j;Nam|OyO%};o;%pT210xPU2in
z;#^PSXkX%MUgB(K;^N}tT~Fg)Pvc%t<8EW)Zf4_eXX9{Z<KyGxUr^+5W#n;a<Z@}`
z<mBaKRONGO<>lq(WL4&8SLSwY=H}+-X;|my=jdx%=xkc(=;-NhUFqrR>T_V~>gwxu
zV(XKP>+9?6cw_8&WbEwh?d|REeP`~SmF}IE?(XjIfokvX@9>0d@T8mY@bK}5Zt<s{
z@$vEU^78eysP?$4_q(n6zOVVfu=@J?aS)VW0000ebW%=J009LE2n!4j5gHpHBRF!F
zqouE}x4FpN-{R=;_4fDp`T6|({r&#_)ZRki0006eNkl<ZI8TMr&ubGw6bJA(yPMrj
zOl?{fEwu%kRtlb^H>rr=MeyWF^yEblK`;ITB6{;!^bhbL(t{AigVIBZxOk|9ssyPK
zp(;q#Z8piyk9{*vvOf~&f{*WEAM;_}%&->xr>yj2f2r4ooF)U~H&%vVr0Ii_Gj<95
zGp$Mn2F>bkMq^NP3IM^AU<d|H!8H?L-(IxM`z*Llbb-=!mj&1G>`neB1{cepoPDA1
z`le-=fHFerJ72r()`R2>DhN@{?^dW`n0g14a^4^Bgq)mzs0IK-ia1p~6cW?WK%$y)
zD;+L~BnhAt#qmn#C$SA1xa4Z#q`!rNpdkl<(UN8RJu+sI{+*x{1#MpDg^(HX8Q9++
zkXJ>HG1xrq<^r>kfXOQ=7m$w-0||JiyJxv@&yp#KM0b(2j+8#nx^bGv9QYt01qvf@
z^p3VNlMu^BhzynPAQfx^ej`x}l5A<OWVVCg6X)RV%+dP7;W+Cj4)8h$m5q>41<$V5
z4<=cko)&fe<mm_$>JdPr0c&eXYWfu<W+NgFSK(=O>G7$#EITj6$OsDC`Xt*b(AiP6
zqthO_g_0Cs12&t{dx$nR(DS6{fr&B$tW7S!tLohIrKvcz<%wVKg5d~(gz9IbDvO{3
zsG9*Q$jiYkJV^2epv-9scE3z6!`{O0JOQkBc{T?$pZPIx7+E!PK!>Bl`hdx(M{<DD
hzd<}gh@9oL{s9TeK>x~$hGPH#002ovPDHLkV1i$Do4^17

diff --git a/core/img/filetypes/text-calendar.svg b/core/img/filetypes/text-calendar.svg
index e935abeee9d..051a32f4e57 100644
--- a/core/img/filetypes/text-calendar.svg
+++ b/core/img/filetypes/text-calendar.svg
@@ -1,87 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <radialGradient id="x" spreadMethod="reflect" gradientUnits="userSpaceOnUse" cy="4.9179" cx="14" gradientTransform="matrix(1.0912 -1.8502e-8 3.75e-8 1.5923 7.2228 -4.4685)" r="2">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#8f8f8f" offset="1"/>
-  </radialGradient>
-  <radialGradient id="y" spreadMethod="reflect" gradientUnits="userSpaceOnUse" cy="4.9179" cx="14" gradientTransform="matrix(1.0912 -1.8502e-8 3.75e-8 1.5923 -5.7772 -4.4685)" r="2">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#8f8f8f" offset="1"/>
-  </radialGradient>
-  <linearGradient id="o" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.6 0 0 .64185 1.6 -16.779)" y1="5" x1="24">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".063165"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="p" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" y1="5" x1="24">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".063165"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="z" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(0 .90633 -1.9732 -3.8244e-8 32.673 -1.9201)" r="20">
-   <stop stop-color="#f89b7e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".26238"/>
-   <stop stop-color="#c6262e" offset=".66094"/>
-   <stop stop-color="#690b2c" offset="1"/>
-  </radialGradient>
-  <linearGradient id="q" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.64103 0 0 .64103 .61538 1.6154)" y1="44" x1="24">
-   <stop stop-color="#791235" offset="0"/>
-   <stop stop-color="#dd3b27" offset="1"/>
-  </linearGradient>
-  <linearGradient id="r" y2="18.684" gradientUnits="userSpaceOnUse" x2="23.954" gradientTransform="matrix(.65 0 0 .5 .4 4)" y1="15.999" x1="23.954">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="s" y2="44.984" gradientUnits="userSpaceOnUse" x2="19.36" gradientTransform="matrix(.64103 0 0 .64185 .61538 .95838)" y1="16.138" x1="19.36">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="t" y2="3.8905" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.64103 0 0 .64185 .61538 1.5793)" y1="44" x1="24">
-   <stop stop-color="#787878" offset="0"/>
-   <stop stop-color="#AAA" offset="1"/>
-  </linearGradient>
-  <radialGradient id="v" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="w" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="n" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="u" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.64103 0 0 .64103 .61538 .61538)" y1="44" x1="24">
-   <stop stop-color="#791235" offset="0"/>
-   <stop stop-color="#dd3b27" offset="1"/>
-  </linearGradient>
- </defs>
- <path stroke-linejoin="round" style="color:#000000" d="m5.5 3.5c7.0683 0.00685 14.137-0.013705 21.205 0.010288 1.238 0.083322 1.9649 1.3578 1.7949 2.5045l-24.99-0.7199c0.081-0.9961 0.9903-1.8161 1.9897-1.7949z" stroke="url(#u)" stroke-linecap="round" fill="none"/>
- <g transform="matrix(.7 0 0 .33333 -.8 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect y="40" width="5" height="7" x="38" fill="url(#v)"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#w)"/>
-   <rect y="40" width="28" height="7" x="10" fill="url(#n)"/>
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g fill="#969696" transform="matrix(.5 0 0 .5 290.36 -.78825)">
+  <path d="m-572.71 3.5765c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm16 0c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-13 4v2c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1.875c-1.728 0.44254-3 2.0052-3 3.875v16c0 2.216 1.784 4 4 4h20c2.216 0 4-1.784 4-4v-16c0-1.8698-1.272-3.4325-3-3.875v1.875c0 1.662-1.338 3-3 3s-3-1.338-3-3v-2h-10zm-5.9062 9h21.812c0.0554 0 0.0937 0.03835 0.0937 0.09375v11.812c0 0.0554-0.0384 0.09375-0.0937 0.09375h-21.812c-0.0554 0-0.0937-0.03835-0.0937-0.09375v-11.812c0-0.0554 0.0384-0.09375 0.0937-0.09375z" fill="#969696"/>
  </g>
- <path stroke-linejoin="round" style="color:#000000" d="m28.5 7.0148s0.0137 13.794-0.01029 20.69c-0.084 1.238-1.358 1.965-2.505 1.795-6.896-0.007-13.794 0.014-20.69-0.01-1.238-0.084-1.9649-1.358-1.7949-2.505 0.0068-6.896 0.0103-20.69 0.0103-20.69z" stroke="url(#t)" stroke-linecap="round" fill="url(#s)"/>
- <rect opacity=".3" rx="0" ry="0" height="2" width="26" y="12" x="3" fill="url(#r)"/>
- <g stroke-linejoin="round">
-  <path style="color:#000000" stroke-linecap="round" d="m5.5 4.5c7.0683 0.00685 14.137-0.013705 21.205 0.010288 1.238 0.083322 1.9649 1.3578 1.7949 2.5045l0.073 4.4852h-25.073l0.0103-5.2051c0.081-0.9961 0.9903-1.8161 1.9897-1.7949z" stroke="url(#q)" fill="url(#z)"/>
-  <rect opacity=".5" rx="1" ry="1" height="23" width="23" stroke="url(#p)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
-  <path opacity=".5" stroke="url(#o)" stroke-linecap="square" d="m26.5 10.5h-21" fill="none"/>
- </g>
- <rect opacity=".4" rx="1.8086" ry="1.5304" height="7.0604" width="3" y="2.9396" x="8" fill="#FFF"/>
- <rect rx="1.5869" ry="1.5869" height="2.7652" width="3" y="6.2348" x="8" fill="#cc3429"/>
- <rect rx="1.8086" ry="1.3912" height="7" width="3" y="1.0188" x="8" fill="url(#y)"/>
- <rect opacity=".4" rx="1.8086" ry="1.5304" height="7.0604" width="3" y="2.9396" x="21" fill="#FFF"/>
- <rect rx="1.5869" ry="1.5869" height="2.7652" width="3" y="6.2348" x="21" fill="#cc3429"/>
- <rect rx="1.8086" ry="1.3912" height="7" width="3" y="1.0188" x="21" fill="url(#x)"/>
- <rect style="color:#000000" height="3.9477" width="19.876" y="14.023" x="6.1231" fill="#c5c5c5"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m6.5182 14.553 18.987 0.011-0.09 11.941-18.986-0.011zm0.33122 8.8955 18.622 0.01098m-18.89-2.957 18.622 0.01098m-18.532-2.898 18.622 0.011m-3.654-2.895-0.089 11.769m-2.902-11.724-0.089 11.724m-2.902-11.813-0.089 11.813m-2.901-11.769-0.09 11.769m-2.8345-11.78-0.0893 11.78" stroke="#000" stroke-linecap="round" fill="none"/>
 </svg>
diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png
index c0e7590108104033da94a62c93ac28fef9c14122..652ab3566ad53b2b9b3dc6db75e2b5f8a6322f9f 100644
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b1=0--4b!Ggn>uyslqplD
zPoEBCLr5S44w6M$P6L(llmz(&GcbAj`iHgkP5=Jmr-%UKBcQmQr;B3<M|5(+0d^f0
ziP?@OpXV`LyUga$cCC=DZH_Jvk54w2gv1R$>ju^XPO}WyF3YSCiQrfwu~0To!H<DK
Yo=3?2-Oq!fK$93eUHx3vIVCg!01ECv-T(jq

literal 834
zcmV-I1HJr-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009CNkl<ZScT1&
z%TE(g6o<b%GcBdIBN$qWC@4e>4}r#L)CE{JNTcx)HAZ$Cm;5d4jWJ<ij0@v4#)QPG
z8#hLY28}Vkf|^o%K@l2g=enqt8K%&OL-cGWx##iw&gq%n5mHLb7K_E=Qp#G^z=RN!
zkw_$DKGT*58HQ0Ci9}Eo#Zhs?Fo?xsw#IA#Qc6;(6zO!@Q2<TTSUzn4TbokKyn%mf
zE7i?Afwh1r3Bde3fA2W}&9&=!GdYdV<HGB9k(ildON~xTT{T+*deIO?0hnpeMLKf6
zzP8Op7hb7u$p9DbkLP?%!S#InHjB^WVj-O&sC)VNZI+;3$=BHwgZs8S4{)}(tzdWN
zT*m<}K748MZw=_Yo0_ql4RkhASLH1TSJD#xu`@lbwxmdF{i<TCK@<h>&tF4x@RLhZ
zIbYX_8s^46kb0f46$%XQb`HS&44<yC_<g$?@$G8ND^SSFn!woQuQ^})(P|c6d?NK~
z(vnlz7Q)-Lsi1gK0ES^$g1b&_uqK2z;SJlx3Qa&tiD4Lp0sf06G~2cBR{&`7w9@=O
zNan{p>-KKt!K*j`6W@Q*6!7zQDrw2vT)mFo?Urwk@^;`z)yXB_HUlBEF+DBTZ;QQ6
z0b6miVA-$Xt?8=(>`CsV;&HZ1{m2dgZj4O;aJW1FC6%vk$p8oSV_An!BBO?-vw@C{
zwoV-fxI23jzoMglaWnaJ3XjJ_e}8{ASrKaw(C0mXKtR1jhL&PVwXy+jU%w52-|r`x
zOtQbelS<(x6HlUs{AA)uw1z5-`9<8VK@{ENEI>3G1waUaloCy-2tam*vS*zkgirtj
zRAt5Kl>I;88XhLm-OZ!<c>u!UFbxe2+<5kx#Y}c7qwOK?jK?|DQHRH+<^{-CyQm2;
zG(?T6GVt54swz@S4)3V5<Q?y>Us1$dw{(Dt3R~csFQKMsxZUoOMOL#vm)xoVLI`DK
zWF#><IvR9TeW`vz2%$(RbJwCUQwbpipf3k=(9*z+G>M9GeorUu7r4$pf~lEZrT_o{
M07*qoM6N<$f}C81Q2+n{

diff --git a/core/img/filetypes/text-code.svg b/core/img/filetypes/text-code.svg
index b85ddece9c0..0ff78b6bcf3 100644
--- a/core/img/filetypes/text-code.svg
+++ b/core/img/filetypes/text-code.svg
@@ -1,60 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="k" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#k)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#m)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#l)"/>
- <path stroke-linejoin="round" stroke="url(#j)" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/>
- <path stroke-linejoin="round" stroke="url(#h)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/>
- <path stroke="#89adc2" stroke-width="1px" d="m8 5.505h2.3438zm2.6875 0h2.1875zm2.5312 0h1.9375zm2.25 0h0.84375zm-7.4688 2h3.6562zm4.0625 0h1.75zm2.0625 0h0.875zm1.2188 0h1.5938zm1.9375 0h1.625zm-9.282 1.995h4.2812zm4.625 0h4.625zm1.703 8h0.84375zm1.1875 0h1.875zm2.25 0h4.9062zm-2.6875 2.075h1.8438zm-1.028 5.925h2.9688zm3.8562 0h1.1875z" fill="none"/>
- <g transform="translate(27.06 6.7752)">
-  <path d="m-15.57 10.277h0.93368v1h-0.93368z" fill="#d48eb3"/>
-  <path d="m-14.483 10.277h0.41011v1h-0.41011z" fill="#d48eb3"/>
-  <path opacity=".7" d="m-19.06 16.277h1.9967v1h-1.9967v-1z" fill="#666"/>
-  <path opacity=".7" d="m-16.907 16.277h2.1395v1h-2.1395v-1z" fill="#666"/>
-  <g fill="#d48eb3">
-   <path d="m-14.611 16.277h0.85436v1h-0.85436v-1z"/>
-   <path d="m-13.6 16.277h2.0125v1h-2.0125v-1z"/>
-   <path d="m-9.8967 16.277h0.53704v1h-0.53704v-1z"/>
-   <path d="m-11.431 16.277h1.3779v1h-1.3779v-1z"/>
-   <path d="m-9.2031 16.277h0.31492v1h-0.31492v-1z"/>
-   <path d="m-8.7317 16.277h0.85436v1h-0.85436v-1z"/>
-   <path d="m-16.466 12.277h2.3933v1h-2.3933z"/>
-  </g>
-  <path d="m-19.06 14.277h1.8063v1h-1.8063v-1z" fill="#94d48e"/>
-  <path d="m-17.105 14.277h0.56877v1h-0.56877v-1z" fill="#94d48e"/>
-  <path opacity=".7" d="m-16.387 14.277h1.2986v1h-1.2986v-1z" fill="#666"/>
-  <path opacity=".7" d="m-14.939 14.277h0.88609v1h-0.88609v-1z" fill="#666"/>
-  <path d="m-19.06 18.277h1.4875v1h-1.4875v-1z" fill="#de6161"/>
-  <path opacity=".7" d="m-17.334 18.277h2.6472v1h-2.6472v-1z" fill="#666"/>
- </g>
- <path d="m8 12v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094z" fill="#b78ed4"/>
- <path d="m12.406 12v1h5.594v-1zm0.03125 2v1h5.0938v-1z" fill="#d48eb3"/>
- <path d="m8 17v1h2.5312v-1zm0 2.031v0.969h2.2188v-0.96875z" fill="#94d48e"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m10.828 3.0503-1.4138 1.4142 3.5358 3.5355-3.5358 3.536 1.4138 1.414 4.95-4.95-4.95-4.9497zm-5.6569 0l-4.9493 4.9497 4.9498 4.95 1.4142-1.414-3.5355-3.536 3.5355-3.5355-1.4142-1.4142z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/text-html.png b/core/img/filetypes/text-html.png
deleted file mode 100644
index c3bbf2bfd91f2ae6bba5fdf38bc8903738164653..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0002+P)t-s|Ns90
z00000000000002KzP_QMp_iAJnVFfMo}QqfprN6mqN1Xsqobsxq@|^$rlzK+r>Cf>
zsHv%`s;a81tE;T6tgWrBudlDLu&}YQv9hwVv$M0bw6wLgwYIjlx3{;rxVX8wxw^W#
zySux*yu7`=y}-c0!NI}8!otJD!^FhI$;rve%F4~n&Ck!z($dn_*4Ee8*Vx$D+}zyV
z-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4?Ck9A?d|UF
z?(gsK@bK{Q@$vHV^7Hfa^z`)g_4WPz{r~^}4?0_v00007bW%=J009CI6X@yfibUD~
z008|-L_t(I%f*q=N&-<7MR!A^!XQdAI*%41_7D9(MEDC8^(c4;m2tRpXI3w1bv-W;
z)Oud$Y|cK3B&7?JRFV=&nlJARmh+PU-T=M`GWaIgd<v$bpKSO8K_>Br_4YWqU0V_5
z-UIOVfZvzrJyc~@0EE{CMOIdE4`I_UYJheBin{1;LKNXN^#I+=bpw7X7YQl54q$UJ
z0lFP&bY?zqwIn^=Hj-*L$fGk4vz`m!m;k}`W{3DppX1>9CIF7ypY_lt;|%VL4#>ty
zdtOvC8p8GfFdQ}3v#R=7bzS|}yMGmNnHgN3ge0sU4OSuf5NN$g%Si|(Et1{=roBR6
TbyKKY00000NkvXXu0mjf^*B5w

diff --git a/core/img/filetypes/text-html.svg b/core/img/filetypes/text-html.svg
deleted file mode 100644
index 99215d303ea..00000000000
--- a/core/img/filetypes/text-html.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="k" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#k)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#m)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#l)"/>
- <path stroke-linejoin="round" stroke="url(#j)" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/>
- <path stroke-linejoin="round" stroke="url(#h)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/>
- <g fill="#fff">
-  <rect opacity=".6" style="color:#000000" fill-rule="evenodd" transform="matrix(1 0 -.42525 .90508 0 0)" height="8.839" width="1.2412" y="14.363" x="23.867"/>
-  <path opacity=".6" d="m23.142 16.907-2.939-3.68 0.979-1.227 3.818 4.907-3.919 5.093-1.081-1.12 3.142-3.973z"/>
-  <path opacity=".6" d="m8.8581 16.907 2.9389-3.68-0.979-1.227-3.818 4.907 3.919 5.093 1.081-1.12-3.1419-3.973z"/>
- </g>
- <path opacity=".4" d="m8.8581 15.907 2.9389-3.68-0.979-1.227-3.818 4.907 3.919 5.093 1.081-1.12-3.1419-3.973z" fill="#666"/>
- <rect opacity=".4" style="color:#000000" fill-rule="evenodd" transform="matrix(1 0 -.42525 .90508 0 0)" height="8.839" width="1.2412" y="13.259" x="23.397"/>
- <path opacity=".4" d="m23.142 15.907-2.939-3.68 0.979-1.227 3.818 4.907-3.919 5.093-1.081-1.12 3.142-3.973z" fill="#666"/>
-</svg>
diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png
index 6849792dfd24e77b10f02069a402d2ff59d3319b..81e7d3dc3b66c94723577fe371e731eb78b406a9 100644
GIT binary patch
literal 439
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf#sHrXS0MfW|Nr^(=TDtFb<(6s
z)2C0LIddkE0ptQ1K<>0@(|~Ls14vGpG6li~vVjaBfQZAnKoJNVt`VXJq70+~tN^G6
zq5zqM$O1`-AVeix5YE{3_55j|qpeDU{DK)6Ie7TQBxPjf6qHnSZ0uazJUqQ45|UFg
za`T&8+S)s&&R@A^?YdnD&z!w*>GGAEcOE}`{^I4wpTGYw%x2vSG^N_p#W6%evh-j(
z-@yQewu|@gUAZ^qR`vFM-|G#oFZC2I?E80GMP%xIA)YUxbIVK*Yn=A_84#abl9JlE
zto`AMuDKt$b05sR;?5jCt65q5;{9UjrN<{s-umP%Crfu%kFlV$r?e8EQP)<^g{#-d
oEo@&?ar$=bpW}s3r+s<M8q6mdlBV8U3Umg8r>mdKI;Vst08!V|!~g&Q

literal 668
zcmV;N0%QG&P)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0003jP)t-s|Ns90
z00000000000001FWMorQQ+9TCczAeud3k$#dwhI+etv#{fPjI4frEpCadB}nGBPtW
zGdw&zJv}`>K0ZJ|Kte)7MMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJoxPf$=$
zQBhG+Qc_b>Q&dz`RaI41R#sP6S6EnBT3T9LTU%XSU0z;ZUteEfU|?foV{B|}Zf<UG
zZ*OyRb98icb#--ld3k_<fRd7uot>SZpP!|rrKzc@t*x!NxVXByy2Hc6&d$!y&(GJ_
z*W26M+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4WPz{r~^}qcrll0000HbW%=J009CI
z6LWi}rlzK*rlzK*t-3L%<NyEx4oO5oR5;6xlFd%SKoo_~G*d^gE+jRei9Z|HJb;hk
zYx)j80`6SEhK*4Z1zT%@cILRCKn-_F?_!e4d^tZiqX8i7LYm(KfChlhgA(5PxCOvM
z0Cer7<iI+>1Ar{C11Kx7y+wP4&-B$@oy0=O^~@%hx3n*JgS~B33X8MlQklW5@7sf2
zs1k*lb1!6dajI}|CSxtce+y+Dpn^2=)U+iW0$cGy&EEKQg>G^a(Ni<dzCh*|^wlg4
zl`UgUU(ICPS;5WUV<m>nzo%hNWa0GVI+8+;j(bW0Ad=^MN#Xo0+axoT6o$iH_Eb_x
z8vaAWwEWcv0evI@ZVLo_673ndH9-3#1H=YsXz>T9sHUE<T&{5d0000<MNUMnLSTZj
C(n5X!

diff --git a/core/img/filetypes/text-vcard.svg b/core/img/filetypes/text-vcard.svg
index f9d50fef77c..6b30a4ecafe 100644
--- a/core/img/filetypes/text-vcard.svg
+++ b/core/img/filetypes/text-vcard.svg
@@ -1,53 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="g" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" x1="24" gradientUnits="userSpaceOnUse" y1="14.916" gradientTransform="matrix(.50267 0 0 .64630 2.7118 .79618)" x2="24" y2="32.596">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".12291"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".93706"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="8.4498" cx="10.904" gradientTransform="matrix(0 .96917 -.82966 0 23.014 -1.7852)" r="20">
-   <stop stop-color="#5f5f5f" offset="0"/>
-   <stop stop-color="#4f4f4f" offset=".26238"/>
-   <stop stop-color="#3b3b3b" offset=".70495"/>
-   <stop stop-color="#2b2b2b" offset="1"/>
-  </radialGradient>
-  <linearGradient id="e" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(.65627 0 0 .68929 .25311 -.21112)" x2="24" y2="3.899">
-   <stop stop-color="#272727" offset="0"/>
-   <stop stop-color="#454545" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#g)"/>
-  <path opacity=".15" fill="url(#c)" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z"/>
-  <path opacity=".15" fill="url(#d)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/>
- </g>
- <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#h)"/>
- <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#i)" stroke-linecap="round" fill="none"/>
- <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
- <path opacity=".4" fill="#FFF" d="m15.942 10c-0.43193-0.00263-0.8112 0.0802-1.0693 0.25173-0.33304 0.22128-0.47989 0.24937-0.57286 0.09682-0.08897-0.14595-0.16986-0.12965-0.24824 0.07745-0.06628 0.17515-0.20484 0.25511-0.36281 0.19364-0.15062-0.05862-0.21239-0.03973-0.15276 0.05809 0.05729 0.09402 0.02929 0.17427-0.05728 0.17427s-0.36382 0.2966-0.61105 0.65837c-0.39411 0.57668-0.45839 0.84025-0.45829 2.0526 0.000055 0.76062 0.07517 1.5012-0.15276 1.5491-0.13368 0.02806-0.12095 0.55674-0.05728 1.1037 0.08325 0.71528 0.20761 1.0657 0.55377 1.3942 0.53917 0.51164 1.0312 1.3973 1.0312 1.8783 0 0.65888-1.5163 1.812-3.7844 2.8648l-0.001 1.647h11.999l0.001-1.818c-1.8832-0.86856-3.4418-2.0704-3.4418-2.6933 0-0.47982 0.47343-1.3672 1.0121-1.8783 0.34616-0.32849 0.48961-0.6789 0.57286-1.3942 0.06366-0.54699 0.07227-1.0601-0.05728-1.1037-0.17854-0.06014-0.17188-0.79471-0.17188-1.5491-0.000001-1.0814-0.06787-1.4838-0.34372-1.9364-0.54889-0.9006-2.3323-1.6188-3.6281-1.6265z" fill-rule="evenodd"/>
- <path stroke-linejoin="round" style="color:#000000" d="m15.942 9.5292c-0.6255-0.1462-1.3748 0.30347-1.3748 0.30347l-0.6729 0.33632s-0.72918 0.63672-0.73698 0.85303c-0.41044 0.72679-0.22336 1.6075-0.26498 2.4026 0.03999 0.68261-0.43452 1.1887-0.1965 1.8808-0.03472 0.66822 0.51558 1.0601 0.86937 1.5434 0.39816 0.61145 0.93889 1.4093 0.51306 2.141-0.78719 1.1416-2.0959 1.7466-3.2907 2.3686-0.4059 0.04157-0.25309 0.43145-0.28027 0.70942-0.000647 0.22106-0.07334 0.51408 0.25088 0.41058h10.742v-1.1474c-1.1567-0.58611-2.3639-1.2139-3.1747-2.2562-0.48709-0.69808 0.0011-1.5369 0.38553-2.1576 0.2993-0.51701 0.92489-0.84736 0.93383-1.5066 0.23004-0.66882-0.1171-1.2225-0.18189-1.8604-0.08471-0.84572 0.14453-1.7705-0.25914-2.5574-0.54732-0.80518-1.5498-1.1578-2.4596-1.3737-0.26389-0.053253-0.53234-0.088037-0.80184-0.09011z" stroke="url(#e)" stroke-linecap="round" fill="url(#b)"/>
- <path opacity=".5" stroke-linejoin="round" style="color:#000000" d="m15.797 10.502c-0.10657-0.01105-0.27196 0.03765-0.51076 0.15329-0.17676 0.08559-0.43781 0.15994-0.7045 0.21077l0.01761 0.01916c-0.0033 0.002-0.1837 0.11082-0.29941 0.19161-0.02225 0.01554-0.034 0.0057-0.05284 0.01916-0.0059 0.0083-0.01447 0.01546-0.01761 0.01916-0.07635 0.08979-0.22535 0.27657-0.33464 0.47903-0.11417 0.2115-0.16633 0.4404-0.15851 0.49819a0.52517 0.57134 0 0 1 0.01761 0.13413c-0.05039 0.58523 0.11775 1.3768-0.1409 2.261a0.52517 0.57134 0 0 1 -0.035 0.115c-0.09831 0.18139-0.02434 0.78987 0.1409 1.2455 0.54115 0.61932 1.1974 1.4444 1.18 2.5676a0.52517 0.57134 0 0 1 -0.0176 0.13412c-0.28591 1.0661-1.1672 1.5797-1.726 2.0119a0.52517 0.57134 0 0 1 -0.01761 0.01916c-0.524 0.378-1.084 0.623-1.637 0.919h9c-1.027-0.52495-2.0438-1.1451-2.8532-2.1077-0.0057-0.0069-0.0119-0.01231-0.01761-0.01916-0.37728-0.42677-0.45342-1.0116-0.36986-1.4754 0.08208-0.45566 0.27492-0.83741 0.45793-1.1497 0.0063-0.01067 0.01139-0.02783 0.01761-0.03833 0.18432-0.36085 0.41144-0.60748 0.5636-0.80477 0.15849-0.2055 0.22438-0.31795 0.22896-0.47903a0.52517 0.57134 0 0 1 0.03523 -0.15329c0.05659-0.18584 0.03263-0.33442-0.01761-0.57483-0.04928-0.23579-0.14777-0.55211-0.17612-0.9389-0.000556-0.0075 0.000501-0.01151 0-0.01916-0.04688-0.50185 0.0086-0.95368 0-1.3413-0.0086-0.3855-0.07421-0.66627-0.22896-0.90057-0.0021-0.0024 0.0021-0.01679 0-0.01916-0.54915-0.61896-1.4523-0.93653-2.3073-0.97721a0.52517 0.57134 0 0 1 -0.03523 0z" stroke="url(#f)" stroke-linecap="round" fill="none"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m4.6156 3.3325c-0.97744 0-1.8066 0.71483-1.8066 1.6373 0.0069 0.29157 0.033 0.65113 0.20701 1.4115v0.0188l0.01885 0.01885c0.05585 0.16 0.13714 0.25152 0.24465 0.37639s0.23568 0.27185 0.35756 0.39521c0.0144 0.0145 0.0235 0.02345 0.0376 0.037649 0.02415 0.10519 0.05345 0.21839 0.07527 0.31993 0.05807 0.27016 0.05211 0.46148 0.0376 0.52694-0.42001 0.14747-0.94254 0.32311-1.4114 0.52693-0.2632 0.1144-0.5015 0.2166-0.6963 0.3387-0.1949 0.1221-0.3887 0.2144-0.4517 0.4893-0.001 0.0125-0.001 0.0251 0 0.037648-0.06155 0.56519-0.15466 1.3963-0.22583 1.9572-0.01535 0.11808 0.04685 0.24255 0.15055 0.30111 0.85134 0.45986 2.1591 0.64493 3.4627 0.63988 1.3036-0.0051 2.601-0.20105 3.4251-0.63988 0.10368-0.05855 0.16592-0.18303 0.15055-0.30111-0.0227-0.17536-0.05063-0.57074-0.07527-0.95982-0.02465-0.38905-0.046-0.77173-0.07527-0.99742-0.0102-0.055948-0.0367-0.10883-0.07528-0.15056-0.2616-0.3125-0.6527-0.5037-1.1102-0.6963-0.4176-0.1758-0.9071-0.3584-1.3926-0.5645-0.02715-0.060528-0.05416-0.23663 0-0.50814 0.0145-0.072898 0.03735-0.15098 0.05646-0.22583 0.04565-0.051098 0.08118-0.092853 0.13173-0.15056 0.10782-0.12307 0.22367-0.25215 0.31993-0.37639 0.09625-0.12424 0.175-0.23082 0.22583-0.37639l0.01885-0.0188c0.1967-0.79393 0.19681-1.1252 0.20701-1.4115v-0.01885c0-0.92247-0.82919-1.6373-1.8066-1.6373zm5.1679-1.5025c-1.4251 0-2.634 1.0421-2.634 2.387 0.0101 0.42508 0.04815 0.94927 0.3018 2.0578v0.02745l0.02745 0.02745c0.08143 0.23325 0.19994 0.36668 0.35668 0.54874 0.15674 0.18205 0.3436 0.39632 0.52129 0.57618 0.0209 0.02115 0.0343 0.034299 0.05487 0.054883 0.03525 0.15335 0.07793 0.31839 0.10975 0.46643 0.08465 0.39387 0.07597 0.67278 0.05488 0.76823-0.61234 0.21501-1.3742 0.47106-2.0578 0.76823-0.38378 0.16685-0.73109 0.31583-1.0152 0.49388-0.28411 0.17804-0.56664 0.31254-0.65849 0.71338-0.0015 0.01825-0.0015 0.03665 0 0.05489-0.08974 0.82398-0.22549 2.0356-0.32925 2.8534-0.0224 0.17215 0.06833 0.35362 0.2195 0.43899 1.2412 0.67043 3.1478 0.94028 5.0484 0.93288s3.792-0.2931 4.9936-0.93288c0.15116-0.08537 0.2419-0.26684 0.2195-0.43899-0.03315-0.25564-0.07382-0.83208-0.10975-1.3993-0.03595-0.56718-0.06711-1.1252-0.10974-1.4542-0.0149-0.08155-0.05344-0.15866-0.10975-0.21949-0.38168-0.45576-0.95194-0.73438-1.6188-1.0152-0.60884-0.25635-1.3226-0.52259-2.0304-0.82308-0.03955-0.088248-0.07897-0.345 0-0.74078 0.0212-0.10628 0.05441-0.22011 0.08231-0.32924 0.06652-0.074503 0.11836-0.13538 0.19206-0.2195 0.1572-0.17941 0.3261-0.36762 0.46643-0.54874 0.14033-0.18113 0.25515-0.33651 0.32924-0.54874l0.02745-0.02745c0.28679-1.1574 0.28694-1.6404 0.30182-2.0578v-0.02745c0-1.3449-1.2089-2.387-2.634-2.387z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/text-x-c.png b/core/img/filetypes/text-x-c.png
deleted file mode 100644
index 2bdb16a2a770230e7adab3350a70f544a33600cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1228
zcmV;-1T*`IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000D&Nkl<ZSi`+n
zIc!{26g_|c^JibYOyXqhvG5`!Vk=NsLP-Q-DQJ*zl^{fe(nUfP^ia{!AfTYJXebdB
z2q6SgFeYLN77k!Lu@fs^=g<E4h4;RhWIP^XdpzbyPxF^I@1A?#edpfK`@WB6%+AiP
z_xJbnI00;IY&cU>Q`zQc`wS(MNhX`kW<1a9s&STOVVdS<>+^jCbX~Uz&>ETJf?=3o
z?E?u=&#Ccl6KJe`Ac1CRng+*l0`_#ct_z;$gM}LR4aDQ|j!5kz(D1%_w0qaMZ+>?W
z+Rb?+0U7~11VISA<~T0!oWgQFtg1SRh=7djqg*Z{olZkhl<pB|49l`0iXy6-fiLe^
z&^Q@kMFy|*0=5sQqN7?fFj3X;;+PEfUy{crAj@*#J-uF1EquP{p>JrAcr9Vg@SwT7
z3x*>R^krDwH8s5Z%{^S6$RM8%buR*QYjs@TW{?;j!hFSrgT1H8Ah!kGg}{gy%MW7a
z=3Tr#nZlWb+!=vpB1O%@_iGlygG2bE=#uafQK?lRR|^o~g9bt8Wth<<d^v=9)xl!}
z1Nh*_WxRcH05O?=paX{@(27rfDI%O3#uD+ICyQ|Ft2m$LaOH&@cy@QM*NO%{{dE(!
zjX2y`5{nfN`BMY<>Ms@3=XyIoh8t=X21&T8#epTKfURufQXhk-PjlGW+N9DNB&SP~
z^y-sIeEf3}e{PwuI1$S{i+iOaUU{Nt&$>ra!h$1$RYE8mE)<T4QE3Y=UmE>SZ{EBR
z!Hv}tY?msYhuBE}o-I9;5;jL*_I3f5l7mA9&ol9OHhQ4oJe7+-GN+D2V5>&*J<P)o
z9I|mbC3IXPIwCNVk?}*V4qu2s5M}&+e-qD*rXJLYMwzA8iA17%1R5Cck?`F@g;bg_
zd{)3(*@kYr9aqC6M<644aLOtW&7!1x=*i~r-q$O5<2=a)mu!#yP>@PQhClqN2wPCV
zb8PTTuh;SZ^!U*t&^%e>fXR%H8>Jn%(F`g?XyS<hyz}i6o<GZCFeO1VZ7ixT<~Duw
z4voQKLNG~?{JM&Zr{uPk^Ux89Mx%IbDvVoSte_&rQ1(PPVg%Wd3CxkmTwg8`g_9x1
zQpk?RuwEw>)bfZf=!g_o@zRCS<DCN1LInwTWt_uDzs<u=4x<)MV95kzJ_RM24y3q5
zDx#_Go^e;NA*B9|x1Q;RW$IugDM-|ggot)Lbe|IvaBY&qXA8HmQcl1p+u%!K=+?us
z>sSV`y@+03!>i{)aJ33FfeDOLwd_cUXahnQpuZuB!Stw&J8A(pcS^Xw!@%%3QjQo%
ztcxDO#j}Gx&ZHG$kPrUT811^NLmflIFoI@;lAzlmk#Ob`9?r&h$<;}gQ}1Y$=zXIb
zije+*>H_U0y3!BOMwB)ult4b8rym$WA)*GUVM>y|qk<F)g#u!9P~>vC&XbV#cyzRa
zd^sIid^#e~O&pp4>0B7P=iLTflVSFEt9*-ber9GyTv%98aRMk53L>>ZBH^?pKwppv
qedJQa$-wek_Mu%4&<Q5~C;S6Mq&_8J`lEaR0000<MNUMnLSTZx#6YP4

diff --git a/core/img/filetypes/text-x-c.svg b/core/img/filetypes/text-x-c.svg
deleted file mode 100644
index 462286754f9..00000000000
--- a/core/img/filetypes/text-x-c.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="n" x1="25" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="43" gradientTransform="translate(0 -.00046093)" x2="25" y2="14"/>
-  <linearGradient id="b">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="m" x1="30" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="9.9828" gradientTransform="translate(0 -.00046093)" x2="30" y2="28.585"/>
-  <radialGradient id="f" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.6167e-7 6.6019 -8.0922 -1.9817e-7 104.56 -60.073)" r="12.672">
-   <stop stop-color="#90dbec" offset="0"/>
-   <stop stop-color="#55c1ec" offset=".26238"/>
-   <stop stop-color="#3689e6" offset=".70495"/>
-   <stop stop-color="#2b63a0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="l" x1="25" gradientUnits="userSpaceOnUse" y1="47.935" gradientTransform="translate(0 -.00046093)" x2="25" y2=".91791">
-   <stop stop-color="#185f9a" offset="0"/>
-   <stop stop-color="#599ec9" offset="1"/>
-  </linearGradient>
-  <radialGradient id="e" gradientUnits="userSpaceOnUse" cy="63.965" cx="15.116" gradientTransform="matrix(1.1392 0 0 .40687 6.78 7.7466)" r="12.289">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="k" x1="21.253" gradientUnits="userSpaceOnUse" y1="44.301" gradientTransform="translate(0 .99954)" x2="21.253" y2=".50543">
-   <stop stop-color="#AAA" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/>
-  <linearGradient id="g" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.66667 0 0 .66667 0 .0018413)">
-  <g>
-   <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#g)"/>
-   <path opacity=".3" fill="url(#c)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/>
-   <path opacity=".3" fill="url(#d)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/>
-  </g>
-  <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#i)" stroke-width=".99992" fill="url(#j)"/>
-  <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#h)" stroke-linecap="round" fill="none"/>
-  <path d="m11 6.9995v1h2.375v-1zm2.6875 0v1h2.25v-1zm2.5625 0v1h1.9688v-1zm2.2812 0v1h0.875v-1zm1.1875 0v1h1.9375v-1zm2.2812 0v1h5v-1zm-11 2v1h3.7812v-1zm4.1562 0v1h1.8125v-1zm2.1562 0v1h0.84375v-1zm1.2188 0v1h1.625v-1zm2 0v1h1.625v-1zm1.9688 0v1h2.6562v-1zm3.0312 0v1h3.4688v-1zm-16.904 2.0005v1h4.1875v-1zm4.5 0v1h4.5v-1zm-4.5 2v1h2.3125v-1zm2.625 0v1h2.1562v-1zm2.4688 0v1h1.9062v-1zm-5.0938 3v1h3.0625v-1zm3.4062 0v1h5.5938v-1zm-3.4062 2v1h3.0938v-1zm3.4375 0v1h5.0938v-1c-2.793 2.816-6.7194 8.5464-5.0938 0zm5.4688 0v1h1.9062v-1zm2.2188 0v1h1.9062v-1zm2.2188 0v1h2.75v-1zm3.0938 0v1h0.5625v-1zm-16.438 3v1h2.3438v-1zm0 2v1h1v-1zm0 2v1h2.75v-1zm9 0v1h2.3438v-1zm2.6562 0v1h2.1875v-1zm2.5 0v1h1.8438v-1zm-14.156 2v1h2.9375v-1zm9 0v1h1.875v-1zm2.1875 0v1h4.8125v-1zm5.125 0v1h3.6875v-1zm-16.312 2v1h2.5312v-1zm9 0v1h2.4375v-1zm2.7812 0v1h4.2812v-1zm4.5938 0v1h2.9375v-1zm-16.376 2.156v0.96875h2.2188v-0.96875zm2.5625 0v0.96875h2.125v-0.96875zm-2.562 2.844v1h4.2812v-1zm4.625 0v1h4.5938v-1zm11.75 0v1h2.9688v-1zm3.2812 0v1h1.1562v-1zm1.5 0v1h0.6875v-1zm1 0v1h1.8438v-1zm-22.156 2v1h3.6875v-1zm3.9688 0v1h1.7812v-1zm2.1562 0v1h0.8125v-1zm1.0312 0v1h1.625v-1zm1.875 0v1h1.625v-1zm2.125 0v1h2.5938v-1zm2.9062 0v1h3.375v-1zm3.8438 0v1h2.2812v-1zm2.5625 0v1h0.53125v-1zm-20.469 2v1h3.0312v-1zm3.3438 0v1h3.3438v-1zm5.5938 0v1h2.4375v-1zm2.75 0v1h2.25v-1zm2.5938 0v1h1.9375v-1zm2.25 0v1h3.0938v-1zm3.4375 0v1h5.0312v-1z" fill="url(#k)"/>
-  <path opacity=".3" d="m38 33.772c0.002 2.762-6.267 5.001-14 5.001s-14.002-2.239-14-5.001c-0.0015-2.762 6.267-5.001 14-5.001 7.7331 0 14.002 2.2392 14 5.001z" fill="url(#e)"/>
-  <g stroke-linecap="square">
-   <path stroke-linejoin="round" d="m24 10.5c-6.9 0-12.5 5.6-12.5 12.5s5.6 12.5 12.5 12.5c5.1254 0 10-3.5 11.553-8h-5.536c-1.3314 1.7506-3.794 3-6.0175 3-4.14 0-7.5-3.36-7.5-7.5-0.000002-4.14 3.36-7.5 7.5-7.5 2.6674 0 5.1835 1.9004 6.5132 4h4.9491c-0.46238-4.5-5.9604-9-11.462-9z" stroke="url(#l)" fill="url(#f)"/>
-   <path opacity=".5" d="m34.125 17.937c-1.85-3.7875-5.876-6.4337-10.125-6.375-4.4493-0.06217-8.7511 2.7592-10.485 6.8537-1.8453 4.1071-0.95053 9.2567 2.2024 12.479 2.1403 2.3057 5.2836 3.5679 8.4064 3.5424" stroke="url(#m)" fill="none"/>
-   <path opacity=".5" d="m23.561 14.448c-4.0197 0.13299-7.6119 3.4686-8.0541 7.4638-0.56609 3.8529 1.8882 7.8464 5.5554 9.1288 3.0106 1.1697 7.3287 0.17216 9.3618-2.5497h4.5763" stroke="url(#n)" fill="none"/>
-  </g>
- </g>
-</svg>
diff --git a/core/img/filetypes/text-x-h.png b/core/img/filetypes/text-x-h.png
deleted file mode 100644
index 7b4a36cdbe9e51389769429a2e9a8ae394650feb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1168
zcmV;B1aJF^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000D6Nkl<ZScSco
z&2Jk;7>A!(?|S`Fhd4HIoV3BMihAIHgv6nj3JD2`TU9vq{{V?27t{k+5Zo&D#0_x+
zaYLe9pz480q)L>gp-!po5U;;>cV=D=j#Jl8Z0Do=q&e*DjNfN|?>p~Wi3r2GfB$}U
zX=%yj6=-*NS6{z=y*xZO7AT+3t8%$qwAP+$aK~{7!|>VY{1`yD+l}KmX4ILpN-0IR
z+l{9JSZfiHa|amw_Edmj1wlX@$0((69EUiL@jMS}?cwu4#bWVPP-6gt(+`j1=7(LH
z#j&H-OausmfFKA+CX-le@jMTu6jJ>g+1?_GB9i$9qN~@a*XxwaWpcUP`2h?@7>1<N
zX*!(_0J-nKqj>cq%1!Y6ho8Ch)!mt#I59vro5lBipkKx5beck;z%$3e(@h99_{o_I
z_S6oHzO$kbZNM0eo-O~!0XWAk8U!=Opp-&ujfhaI)rhr0VuOth#+W`-7}DL?z_i;F
z3wf#olYj=Y79=)^6|A;A{qhd>$u@q<B?@Cq`U1<Je1^NQFx8bK9T<#Ot3{*HV1Iv~
zMx${!dQpsx1&IxaCDo|1d~u$9Mp2q`c|8%cbLWeR={(kf;Z9g8l_-@;W1F_TBsSL2
z>#%ZpiTd*<8;|~B{z8)1GA@ZI#A$cw?d;&MtQ;Qfs7^T1foiqN=H@0_TU%7C)fYuL
zNI`4}YE8n+Z*k@8Z)j$Vgpt9<F`fh6?I%+mm<S*uR4Nr#S63;ON<#p0Py>p+mZos?
zCIaMc+@Rfw5P^iXM2)?Zr(k$-CX=C7s~vX0L6?hSgY_)RLO0Yj5egzC=JWKlLfk&2
zHFoS)%>*z_RzQpe0V4{WzLCN~4H=6S#c0M)>_Ds4V(+g<IR7@`(lX0$UL}{y5owE9
z0c(h3O}$>H-EPx-vcsGa#0p{rk@3DVs<9dvUflfUS5iOz#LCVl;kS25M)5%>6vXr)
zj2-Tf0wRc|pMoj*KN4VgL-)7eSzSnx+*o6IagM!*e<C8Ngxf!*6>wY@7Z)iOi_FjG
zF#=*O)<{29XSoIL8<*I9w2gHVJbk=NdUXX6L2C=H2Yw1;ES*k=D2nLzdKe2%CIe2Q
ze_KupFx-fiZ+}ef+S@#gE|B@?7QI}STCGOz-FJA<fIn(rm&zm(35+qMmzSs~=XkL1
z@mR9>mDQJm&-9n<CE7%S((POQg|3U%8i2xw?=%0wdnlz2KSm;gSIBea^G|Uc2dy>P
zZ1!x|u+?f21OdM96NVw#Y?d$#aU2KV_X&c4R4PTU*Fz~qCX=DvZj;aF$>;N9!A{i)
zhfkojrc$Zkx-Okg2iJ99oZj<jwOS~ps8*}2udlPdzJ9h&c+|&8L@1ZbquY+vsZucM
z-kw%711P1G;~d$a&LqciP)ezZ07@zM-o1OtwY9azxf1~OdOfL>az#WR#vHZffHL_i
i0DwqF0*(Rv-}(>x&-Db$Jn*Fe0000<MNUMnLSTXzWii$O

diff --git a/core/img/filetypes/text-x-h.svg b/core/img/filetypes/text-x-h.svg
deleted file mode 100644
index 9ed1bd6ff9c..00000000000
--- a/core/img/filetypes/text-x-h.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="l" x1="21.038" gradientUnits="userSpaceOnUse" y1="29.845" gradientTransform="matrix(.58514 0 0 .60235 3.8714 10.911)" x2="21.038" y2="36.456">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="26.884" gradientUnits="userSpaceOnUse" y1="12.607" gradientTransform="translate(4.1161 -1.6069)" x2="26.884" y2="34.607">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".090909"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95455"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="e" fx="9.3065" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.8368" gradientTransform="matrix(0 7.1404 -7.3431 0 93.723 -67.567)" r="12.672"/>
-  <linearGradient id="b">
-   <stop stop-color="#f8b17e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".26238"/>
-   <stop stop-color="#c6262e" offset=".66094"/>
-   <stop stop-color="#690b54" offset="1"/>
-  </linearGradient>
-  <linearGradient id="n" x1="25" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="49.945" gradientTransform="matrix(.98529 0 0 1.0091 -3.0293 -2.6662)" x2="25" y2="4.9451"/>
-  <linearGradient id="c">
-   <stop stop-color="#791235" offset="0"/>
-   <stop stop-color="#dd3b27" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" fx="9.3065" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.8368" gradientTransform="matrix(0 7.1404 -7.3431 0 93.723 -67.168)" r="12.672"/>
-  <linearGradient id="m" x1="25" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="49.945" gradientTransform="matrix(.98529 0 0 1.0091 -3.0293 -2.2671)" x2="25" y2="4.9451"/>
-  <linearGradient id="k" y2=".4976" gradientUnits="userSpaceOnUse" y1="44.759" x2="23.749" x1="23.749">
-   <stop stop-color="#a3a3a3" offset="0"/>
-   <stop stop-color="#bababa" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="p" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="o" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="g" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="f" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/>
-  <linearGradient id="i" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.66667 0 0 .66667 0 .0018413)">
-  <g>
-   <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#i)"/>
-   <path opacity=".3" fill="url(#f)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/>
-   <path opacity=".3" fill="url(#g)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/>
-  </g>
-  <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#o)" stroke-width=".99992" fill="url(#p)"/>
-  <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#j)" stroke-linecap="round" fill="none"/>
-  <path d="m11 21v1h2.3438v-1h-2.344zm0 4v1h2.75v-1h-2.75zm0 2v1h2.9375v-1h-5.282zm0 2v1h2.5312v-1h-4.875zm0 2.1562v0.96875h2.2188v-0.96875h-2.2188zm0.406-10.156v1h2.25v-1h-2.25zm-2.75 2v1h1v-1h-1zm3.1562 2v1h1.8438v-1h-1.8438zm0.125 2v1h2.7188v-1h-2.7188zm-0.34375 2v1h2.0625v-1h-2.0625zm-0.375 2.1562v0.96875h2.125v-0.96875h-2.125zm-2.562 2.844v1h4.2812v-1h-4.281zm0 2v1h3.6875v-1h-3.688zm3.9688 0v1h1.7812v-1h-1.7812zm-0.625 2v1h3.3438v-1h-3.3438zm-3.344 0h3.0367v1h-3.037v-1zm3.4062-22v1h5.5938v-1h-5.5938zm0.03125 2v1h5.0938v-1h-5.0938zm1.1875 16v1h4.5938v-1h-4.5938zm4.9375 0v1h1.8125v-1h-1.8125zm2.1562 0v1h4.3125v-1h-4.3125zm4.6562 0v1h2.9688v-1h-2.9688zm3.2812 0v1h1.1562v-1h-1.1562zm1.5 0v1h0.6875v-1h-0.6875zm1 0v1h1.8438v-1h-1.8438zm-16.031 2v1h0.8125v-1h-0.8125zm1.0312 0v1h1.625v-1h-1.625zm1.875 0v1h1.625v-1h-1.625zm2.125 0v1h2.5938v-1h-2.5938zm2.9062 0v1h3.375v-1h-3.375zm3.8438 0v1h2.2812v-1h-2.2812zm2.5625 0v1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094zm0-11v1h2.375v-1h-2.375zm2.6875 0v1h2.25v-1h-2.25zm2.5625 0v1h1.9688v-1h-1.9688zm2.2812 0v1h0.875v-1h-0.875zm1.1875 0v1h1.9375v-1h-1.9375zm2.2812 0v1h5v-1h-5zm-11 2l0.001 1h3.7812v-1h-3.7812zm4.1562 0v1h1.8125v-1h-1.8125zm2.1562 0v1h0.84375v-1h-0.84375zm1.2188 0v1h1.625v-1h-1.625zm2 0v1h1.625v-1h-1.625zm1.9688 0v1h2.6562v-1h-2.6562zm3.0312 0v1h3.4688v-1h-3.4688zm-14.53 2v1h4.1875v-1h-4.188zm4.5 0v1h4.5v-1h-4.5zm-4.5 2v1h2.3125v-1h-2.312zm2.625 0v1h2.1562v-1h-2.1562zm2.4688 0v1h1.9062v-1h-1.9062zm3.8125 5v1h1.9062v-1h-1.9062zm2.2188 0v1h1.9062v-1h-1.9062zm2.2188 0v1h2.75v-1h-2.75zm3.0938 0v1h0.5625v-1h-0.5625zm-7.438 7v1h2.3438v-1h-2.344zm2.6562 0v1h2.1875v-1h-2.1875zm2.5 0v1h1.844v-1h-1.844zm-5.156 2v1h1.875v-1h-1.875zm2.1875 0v1h4.8125v-1h-4.8125zm5.125 0v1h3.6875v-1h-3.6875zm-7.313 2v1h2.4375v-1h-2.438zm2.7812 0v1h4.2812v-1h-4.2812zm4.5938 0v1h2.9375v-1h-2.9375zm-7.375 2.125v0.96875h1.875v-0.96875h-1.875zm2.1875 0v0.96875h1.9062v-0.96875h-1.9062zm2.2188 0v0.96875h2.7188v-0.96875h-2.7188zm3.0312 0v0.96875h0.5625v-0.96875h-0.5625zm0.875 0v0.96875h3.5312v-0.96875h-3.5312zm-8.375 6.875v1h2.4375v-1h-2.4375zm2.75 0v1h2.25v-1h-2.25zm2.5938 0v1h1.9375v-1h-1.9375zm2.25 0v1h3.0938v-1h-3.0938zm3.4375 0v1h5.0312v-1h-5.0312z" fill="url(#k)"/>
-  <g stroke-linejoin="round">
-   <path style="color:#000000" d="m34.549 33.5h-4.4021v-9.6523c-0.000012-1.1924-0.18283-2.0842-0.54845-2.6754-0.35602-0.6011-0.90929-0.90166-1.6598-0.90167-0.56771 0.000013-1.044 0.11826-1.4289 0.35476-0.38489 0.23652-0.69279 0.58634-0.92371 1.0495-0.23094 0.46316-0.39451 1.0347-0.49072 1.7147-0.09623 0.67996-0.14434 1.4584-0.14433 2.3355v7.7751h-4.4021v-23h4.4021l0.02888 8.588c0.47147-0.85731 1.0728-1.4732 1.8041-1.8477 0.73126-0.3843 1.5588-0.57646 2.4825-0.57648 0.79861 0.000017 1.5203 0.11827 2.1649 0.35476 0.65428 0.22666 1.2124 0.58635 1.6742 1.079 0.46184 0.49273 0.81785 1.1234 1.068 1.892 0.25016 0.7588 0.37524 1.6703 0.37526 2.7346v10.776z" stroke="url(#m)" fill="url(#d)"/>
-   <path style="color:#000000" d="m11.5 30.987c-0.000001-0.46315 0.06254-0.8524 0.18763-1.1677 0.1347-0.32519 0.31752-0.58633 0.54845-0.78342 0.23092-0.19708 0.50034-0.33997 0.80825-0.42866 0.3079-0.08868 0.63986-0.13303 0.99588-0.13303 0.33676 0.000004 0.65429 0.04435 0.95258 0.13303 0.3079 0.08869 0.57731 0.23158 0.80825 0.42866 0.23092 0.19709 0.41374 0.45823 0.54845 0.78342 0.1347 0.31534 0.20206 0.70459 0.20206 1.1677-0.000007 0.44345-0.06736 0.82284-0.20206 1.1382-0.13471 0.31534-0.31753 0.57648-0.54845 0.78342-0.23093 0.20694-0.50035 0.35476-0.80825 0.44344-0.299 0.1-0.616 0.149-0.953 0.149-0.35602 0-0.68798-0.04927-0.99588-0.14782-0.30791-0.08869-0.57732-0.2365-0.80825-0.44344s-0.41375-0.46808-0.54845-0.78342c-0.12509-0.31534-0.18763-0.69473-0.18763-1.1382" stroke="url(#n)" fill="url(#e)"/>
-   <path opacity=".5" style="color:#000000" d="m18.531 11.75v20.719h2.4062v-6.6875c-0.000007-0.91545 0.051-1.7426 0.15625-2.4688 0.11019-0.76037 0.32838-1.4191 0.625-2 0.30993-0.60695 0.75513-1.1031 1.3125-1.4375 0.54784-0.32869 1.2249-0.53123 1.9688-0.53125 1.0265 0.000018 1.9995 0.53062 2.5312 1.375h0.03125c0.0051 0.008-0.005 0.02321 0 0.03125 0.52572 0.84456 0.71874 1.9068 0.71875 3.1875v8.5312h2.4062v-9.6562c-0.000015-0.95546-0.12792-1.7045-0.34375-2.3438a1.0305 1.0305 0 0 1 0 -0.03125c-0.218-0.661-0.505-1.118-0.842-1.469-0.357-0.372-0.809-0.674-1.312-0.844-0.52338-0.18746-1.1259-0.28124-1.8438-0.28125-0.80443 0.000015-1.4868 0.14206-2.0625 0.4375-0.52554 0.26278-0.96905 0.71674-1.375 1.4375a1.0305 1.0305 0 0 1 -0.907 0.53h-0.25a1.0305 1.0305 0 0 1 -1.0312 -1.0938c0.03222-0.47267 0.08842-0.92314 0.125-1.3438 0.02673-0.34755 0.04266-0.73126 0.0625-1.1875 0.01907-0.44831 0.03124-0.89069 0.03125-1.2812v-3.5938h-2.4062z" transform="matrix(1 0 0 1.0136 2.9688 -.44075)" stroke="url(#h)" stroke-width=".99328" fill="none"/>
-   <path opacity=".5" style="color:#000000" d="m12.5 31c-0.000001-0.27647 0.03714-0.50882 0.11143-0.69706 0.08-0.19412 0.18857-0.35 0.32571-0.46765 0.13714-0.11764 0.29714-0.20294 0.48-0.25588 0.18286-0.05293 0.38-0.07941 0.59143-0.07941 0.2 0.000003 0.38857 0.02647 0.56571 0.07941 0.18285 0.05294 0.34285 0.13824 0.48 0.25588 0.13714 0.11765 0.24571 0.27353 0.32571 0.46765 0.08 0.18824 0.12 0.42059 0.12 0.69706-0.000004 0.26471-0.04001 0.49118-0.12 0.67941-0.08 0.18824-0.18858 0.34412-0.32571 0.46765-0.13715 0.12353-0.29715 0.21176-0.48 0.26471-0.17715 0.05882-0.36572 0.08823-0.56571 0.08823-0.21143 0-0.40857-0.02941-0.59143-0.08823-0.18286-0.05294-0.34286-0.14118-0.48-0.26471-0.137-0.123-0.246-0.279-0.326-0.468-0.074-0.188-0.111-0.414-0.111-0.679" stroke="url(#l)" fill="none"/>
-  </g>
- </g>
-</svg>
diff --git a/core/img/filetypes/text-x-python.png b/core/img/filetypes/text-x-python.png
deleted file mode 100644
index fbaf9a342f626eba72af7e7a11105739f4f2ec85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1368
zcmV-e1*iInP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000FaNkl<ZSi`lK
z&2Jk;6u^J8yWaK3+ObRO#3`ZSBL!Me#g|Y8hjIc5i3_L~Zoq*9;=q+Z03rSX?!9tF
z0>lxihzbcrNfC&z^dnAVCvm*q_3ZA<;}BxfCT^V4KFRX>dG^h3-kX{Co)Qsu%Y_RU
zR%T~sJ???D+wJ_!nKP~3x;+y$8V%KIwWh7LcXe{danM??-m2dNkR(Z#Wf`}6=KqRP
ziX=(00|BhHh{#<B*s*;ez;5aH`(#;$QVPd$$g+$=p@6k^^m|99r>E}-Y7fB9>UV#}
z>34f+5|8aSW-Ndi{LSFTGJ`nYUbQ&5r8yF}G#ZyA38hjAtu@_lmsYDqwOYM90K-ck
za_phkpa!4-OBOGYMjf)aOYy|}xc4tkG|3$S1ocO$lyf9)gHu2$7s@4+`vlf)(p&zF
zto#gK^QDR7eJB8%#Ynma*%nbRCQpZyry2y6D#|X=IChfuFP~$lo<jLkcMRZ+8)UK=
z@&p7nSFf>FJjc}=A=fVdh$tT$U7~t)fwcSm*bTbhMxOW>+AKj#j8b65LCO!4mmg;M
z=f{{-<0_4(671GxZ2c5s&Gw3dBPcic&rY(6h(#O)R;$TRL7st45#?g7Wqo}efT^KI
ztOb>0^8vk$A>Q)a%s%-hkh5|52P#j00zlgN4zKeC#rsZ>to=j~-50{y+lOH1Cd3NZ
z9IU~0JRX`q!hG-xq1VTC6^KPg1E%I*#IGJFEL<ThEThtO#2Q3|?D|*K>k!J%*tEwm
zd_JCN4~Pg>1SAI(mFWjDzkNd8{gq>nKMUC=LYeN$D&EoOac5s;tJ8seK&e_K-MGAM
zBU;9DEua|2DaM^PlLJ^mY>uQI8nukpTu9knMd>T##%KB0KPW7|3(BL=I?Lu-2T+97
zGU@fNG07T!;39d%U~7QWJbSofD3<LI2qgW8B+=-hCDlW;DPb2rK)Fqv%}w$=C-7#;
zwZShc%-=tw+uv{`^g(jgJ2AoOSCGF}Cj;32w%Y*8<Jw;<*yHa|ec%M8(oyn$gyi{6
z?*$9z=wADj=4^$6=P<nTCFR8_#9GqSr4-Z=X&=G^M!*_SU@WZZCQeqQT7)QyNYfOp
z_2|7pF{E^(M{}l3wd#-zHc&R8*UNF|ULKp`opCpo6+vu<*c@vVVHgsI;mDBI8sGPC
zx@=<qB=J^E7#3*G)DbM*t|pj!X>5)de-#@+OpbE4tC>clF)~uC)d<57V+^kAVvND}
zeRS{!?cYD*!Q(}0Rl%k?nS|gL$9mxQA&>yE4kjOxrYVI&0RXKv#+XrovQwBOrihLm
ztT8ClXMMATfB)<I)(;1kWT|Sf^m~F>gZ1W6Sw^SR0T_Y!zJHS!T-SyAvkZC{sgwe`
zT|@QMnO#TQPVRyF3m*|h5n5~1E<O7^k95`|H@>B~SYnt$=G8#Chx5ShK~WUZ@AnCU
z0IfBZN(HSoj^hvn0sVfTVzG$1`X#~UMLbV2e{2e6bC$1bYR|oQXX$ucD$Vnpg@pw?
z&m)dwJkLW!a0XX+e6h*NN2aL;4r@J^u6m3=u5OI2Atx$IXJ%%YnVH%1f2(y<b3<=!
zmX-EzI9`!xFvLA_lH)JF1*m<)HZj1YQak+)S$_q*fO>iQUpoM@$L@guN-5<y&S4ub
zg8KY{t(j8l_63Pj$~%AlyuY-xw0<v|({8uxE2TUU86^^Rt6To1^tm^Z$}JPBd(i_P
aM*aarZn*?jzew-^0000<MNUMnLSTZu1C*rz

diff --git a/core/img/filetypes/text-x-python.svg b/core/img/filetypes/text-x-python.svg
deleted file mode 100644
index b0ed6fc536f..00000000000
--- a/core/img/filetypes/text-x-python.svg
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="i" x1="49.884" gradientUnits="userSpaceOnUse" y1="20.607" gradientTransform="translate(-15.884 -1.6069)" x2="49.884" y2="41.607">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".66667"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="33.715" gradientUnits="userSpaceOnUse" y1="26.955" gradientTransform="translate(-15.884 -1.6069)" x2="33.715" y2="14.148">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".38322"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="29.465" gradientUnits="userSpaceOnUse" y1="13.12" gradientTransform="translate(-15.884 -1.6069)" x2="29.465" y2="35.642">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".2789"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="23.403" cx="9.966" gradientTransform="matrix(0 3.4562 -4.1187 0 121.21 -33.841)" r="13.931">
-   <stop stop-color="#fff3cb" offset="0"/>
-   <stop stop-color="#fdde76" offset=".26238"/>
-   <stop stop-color="#f9c440" offset=".66094"/>
-   <stop stop-color="#e48b20" offset="1"/>
-  </radialGradient>
-  <linearGradient id="c" x1="21.483" gradientUnits="userSpaceOnUse" y1="35.376" gradientTransform="matrix(1.6509 0 0 1.6568 -9.7968 -13.801)" x2="21.483" y2="8.4049">
-   <stop stop-color="#b67926" offset="0"/>
-   <stop stop-color="#eab41a" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" y2=".4976" gradientUnits="userSpaceOnUse" y1="44.759" x2="23.749" x1="23.749">
-   <stop stop-color="#a3a3a3" offset="0"/>
-   <stop stop-color="#bababa" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="m" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="e" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/>
-  <linearGradient id="b">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/>
-  <linearGradient id="f" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.66667 0 0 .66667 0 .0018413)">
-  <g>
-   <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#f)"/>
-   <path opacity=".3" fill="url(#d)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/>
-   <path opacity=".3" fill="url(#e)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/>
-  </g>
-  <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#l)" stroke-width=".99992" fill="url(#m)"/>
-  <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#j)" stroke-linecap="round" fill="none"/>
-  <path d="m11 21v1h2.3438v-1h-2.344zm0 4v1h2.75v-1h-2.75zm0 2v1h2.9375v-1h-5.282zm0 2v1h2.5312v-1h-4.875zm0 2.1562v0.96875h2.2188v-0.96875h-2.2188zm0.406-10.156v1h2.25v-1h-2.25zm-2.75 2v1h1v-1h-1zm3.1562 2v1h1.8438v-1h-1.8438zm0.125 2v1h2.7188v-1h-2.7188zm-0.34375 2v1h2.0625v-1h-2.0625zm-0.375 2.1562v0.96875h2.125v-0.96875h-2.125zm-2.562 2.844v1h4.2812v-1h-4.281zm0 2v1h3.6875v-1h-3.688zm3.9688 0v1h1.7812v-1h-1.7812zm-0.625 2v1h3.3438v-1h-3.3438zm-3.344 0h3.0367v1h-3.037v-1zm3.4062-22v1h5.5938v-1h-5.5938zm0.03125 2v1h5.0938v-1h-5.0938zm1.1875 16v1h4.5938v-1h-4.5938zm4.9375 0v1h1.8125v-1h-1.8125zm2.1562 0v1h4.3125v-1h-4.3125zm4.6562 0v1h2.9688v-1h-2.9688zm3.2812 0v1h1.1562v-1h-1.1562zm1.5 0v1h0.6875v-1h-0.6875zm1 0v1h1.8438v-1h-1.8438zm-16.031 2v1h0.8125v-1h-0.8125zm1.0312 0v1h1.625v-1h-1.625zm1.875 0v1h1.625v-1h-1.625zm2.125 0v1h2.5938v-1h-2.5938zm2.9062 0v1h3.375v-1h-3.375zm3.8438 0v1h2.2812v-1h-2.2812zm2.5625 0v1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094zm0-11v1h2.375v-1h-2.375zm2.6875 0v1h2.25v-1h-2.25zm2.5625 0v1h1.9688v-1h-1.9688zm2.2812 0v1h0.875v-1h-0.875zm1.1875 0v1h1.9375v-1h-1.9375zm2.2812 0v1h5v-1h-5zm-11 2l0.001 1h3.7812v-1h-3.7812zm4.1562 0v1h1.8125v-1h-1.8125zm2.1562 0v1h0.84375v-1h-0.84375zm1.2188 0v1h1.625v-1h-1.625zm2 0v1h1.625v-1h-1.625zm1.9688 0v1h2.6562v-1h-2.6562zm3.0312 0v1h3.4688v-1h-3.4688zm-14.53 2v1h4.1875v-1h-4.188zm4.5 0v1h4.5v-1h-4.5zm-4.5 2v1h2.3125v-1h-2.312zm2.625 0v1h2.1562v-1h-2.1562zm2.4688 0v1h1.9062v-1h-1.9062zm3.8125 5v1h1.9062v-1h-1.9062zm2.2188 0v1h1.9062v-1h-1.9062zm2.2188 0v1h2.75v-1h-2.75zm3.0938 0v1h0.5625v-1h-0.5625zm-7.438 7v1h2.3438v-1h-2.344zm2.6562 0v1h2.1875v-1h-2.1875zm2.5 0v1h1.844v-1h-1.844zm-5.156 2v1h1.875v-1h-1.875zm2.1875 0v1h4.8125v-1h-4.8125zm5.125 0v1h3.6875v-1h-3.6875zm-7.313 2v1h2.4375v-1h-2.438zm2.7812 0v1h4.2812v-1h-4.2812zm4.5938 0v1h2.9375v-1h-2.9375zm-7.375 2.125v0.96875h1.875v-0.96875h-1.875zm2.1875 0v0.96875h1.9062v-0.96875h-1.9062zm2.2188 0v0.96875h2.7188v-0.96875h-2.7188zm3.0312 0v0.96875h0.5625v-0.96875h-0.5625zm0.875 0v0.96875h3.5312v-0.96875h-3.5312zm-8.375 6.875v1h2.4375v-1h-2.4375zm2.75 0v1h2.25v-1h-2.25zm2.5938 0v1h1.9375v-1h-1.9375zm2.25 0v1h3.0938v-1h-3.0938zm3.4375 0v1h5.0312v-1h-5.0312z" fill="url(#k)"/>
-  <g stroke-linejoin="round" style="color:#000000" font-family="Droid Sans" fill="url(#a)" stroke="url(#c)" font-size="32px" font-weight="bold" line-height="125%" stroke-width=".99227">
-   <path stroke="url(#c)" d="m25.746 18.293h4.5664l2.4609 8.5996 0.60156 2.2695c0.03645-0.2552 0.07747-0.51497 0.12305-0.7793 0.04556-0.26432 0.09569-0.52408 0.15039-0.7793 0.06379-0.26432 0.1276-0.5013 0.19141-0.71094l2.4062-8.5996h4.5938l-6.043 17.24c-0.56511 1.6133-1.3353 2.8118-2.3105 3.5957-0.97527 0.78385-2.1966 1.1758-3.6641 1.1758-0.47396-0.000006-0.88412-0.02735-1.2305-0.08203-0.34636-0.04558-0.64258-0.09571-0.88867-0.15039v-3.3086c0.1914 0.04557 0.43294 0.08658 0.72461 0.12305 0.29166 0.03646 0.597 0.05468 0.91602 0.05469 0.4375-0.000003 0.81119-0.05925 1.1211-0.17773 0.30989-0.11849 0.57421-0.28711 0.79297-0.50586 0.22786-0.20964 0.41927-0.46484 0.57422-0.76562 0.16406-0.30078 0.30533-0.63802 0.42383-1.0117l0.25977-0.76562-5.7695-15.422m-11.406 3.1914h0.95312c1.3646 0.000012 2.3906-0.27082 3.0781-0.8125 0.6979-0.54165 1.0469-1.4219 1.0469-2.6406-0.000013-1.1354-0.31251-1.9739-0.9375-2.5156-0.6146-0.54165-1.5833-0.81248-2.9062-0.8125h-1.2344v6.7812m9.9844-3.625c-0.000018 1-0.15106 1.9583-0.45312 2.875-0.3021 0.91668-0.8021 1.724-1.5 2.4219-0.68752 0.69793-1.599 1.2552-2.7344 1.6719-1.125 0.41668-2.5208 0.62501-4.1875 0.625h-1.1094v8.125h-4.8438v-22.844h6.3438c1.4687 0.000023 2.7344 0.16669 3.7969 0.5 1.0729 0.32294 1.9531 0.79169 2.6406 1.4062 0.6979 0.60419 1.2135 1.349 1.5469 2.2344 0.33332 0.87502 0.49998 1.8698 0.5 2.9844" fill="url(#a)"/>
-  </g>
-  <g stroke-linejoin="round" fill="none">
-   <path opacity=".8" style="color:#000000" d="m10.469 11.719v20.875h2.9062v-7.1562a0.97158 0.97158 0 0 1 0.96875 -0.96875h1.0938c1.5857 0.000008 2.8653-0.20009 3.8438-0.5625 1.0403-0.38177 1.8488-0.8716 2.4062-1.4375 0.60221-0.60221 0.9956-1.2593 1.25-2.0312 0.26608-0.80746 0.40623-1.6502 0.40625-2.5625-0.000016-1.0177-0.1544-1.913-0.4375-2.6562-0.28511-0.75726-0.68346-1.3533-1.25-1.8438a0.97158 0.97158 0 0 1 -0.031 -0.03c-0.5457-0.48779-1.2973-0.86009-2.2812-1.1562-0.94313-0.29586-2.1047-0.46873-3.5-0.46875h-5.375z" stroke="url(#h)"/>
-   <path opacity=".8" style="color:#000000" d="m14.188 13.719a0.97158 0.97158 0 0 1 0.15625 0h1.2188c1.444 0.000021 2.6588 0.30588 3.5312 1.0625 0.0069 0.006 0.02437-0.0061 0.03125 0l-0.03125 0.03125c0.8717 0.76818 1.2812 1.915 1.2812 3.2188-0.000015 1.3862-0.43158 2.6369-1.4062 3.4062h-0.03125c-0.93629 0.7268-2.1746 1.0313-3.6562 1.0312h-0.9375a0.97158 0.97158 0 0 1 -0.969 -0.969v-6.8125a0.97158 0.97158 0 0 1 0.8125 -0.96875z" stroke="url(#g)"/>
-   <path opacity=".8" style="color:#000000" d="m27.156 19.25 5.2812 14.125c0.08288 0.21909 0.08288 0.46841 0 0.6875l-0.25 0.6875-0.03125 0.0625c-0.11452 0.35874-0.24034 0.75454-0.4375 1.125-0.0067 0.01252-0.02443 0.01874-0.03125 0.03125-0.21274 0.39778-0.48826 0.72429-0.75 0.96875-0.01011 0.01011-0.02099 0.02128-0.03125 0.03125-0.30722 0.29848-0.68482 0.53114-1.0938 0.6875-0.43825 0.16756-0.9291 0.25-1.4688 0.25-0.23646-0.000002-0.44385-0.01211-0.65625-0.03125v1.375c0.01198 0.0016 0.01908-0.0016 0.03125 0 0.01042-0.000168 0.02083-0.000168 0.03125 0 0.30338 0.0479 0.64191 0.09374 1.0625 0.09375 1.2893-0.000006 2.3062-0.33575 3.0938-0.96875 0.79412-0.63827 1.4766-1.6621 2-3.1562l5.594-15.969h-2.5l-2.2188 7.9062c0.000168 0.01042 0.000168 0.02083 0 0.03125-0.05961 0.19584-0.12825 0.37949-0.1875 0.625-0.05465 0.25498-0.08383 0.47993-0.125 0.71875-0.04289 0.24875-0.09138 0.48621-0.125 0.71875-0.0011 0.0099 0.001 0.02129 0 0.03125l-1.0312 1.5625c-0.488-0.552-0.84-1.577-1.188-2.313-0.058-0.485-0.153-0.926-0.281-1.343l-2.282-7.938z" stroke="url(#i)"/>
-  </g>
- </g>
-</svg>
diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png
index 73080fb3ea02960c42afc2f0ca7eb5a2474a6c2e..13547961c76d9d14ea436ca0b6c19dde2068d737 100644
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=3TdOqnrb29TVF3epcR
z`~{TeC<*clW-zjJe)Hk;7YV`Hyg)HiPZ!4!j_BlshUT8WK0bE=W{>hMS`88kF+8F#
yGujQU6oO;~*kV{bxmJnJ7MbP2a>J-anc*Lg%Ce6UzT1HYFnGH9xvX<aXaWEatTpEV

literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0002zP)t-s|Ns90
z00000000000001FWMorQQ+9TCczAeud3k$#dwhI+etv#{fPjI4frEpCadC03uCB1K
zu(GnUv$M0bw6wLgwYIjlx3{;rxVX8wxw^W#ySux*yu7`=y}rJ_zrVl0z`()5!NS7A
z!^6YG#KgtL#m2_Q$jHda$;ryf%FN8n&CSiu&d$%z&(YD*+S=OO+}z#W-QM2b-{0Th
z;Naom;o{=r<KyGx<mBb$<>uz*=jZ3>=;-O`>FVn0>+9?6?CkCB?e6aG@9*#M@bK~R
z@$&NW^Yioc^z`-h_5J<*|NsAsvZUAm000qmQchC<0Rj&bb9<(yrlzK*rlzK?x-qBZ
z0003aNkl<ZILnoj%T59@6o$XTFw@q6kuk>T26ztN-sf-(K7q36MR1M_BGOKAVz=k-
zf9t6Nm|054?STrwJgLH5o=*T|UjQ6OlOv#{AZIX<5dgwl6SWX^po!F1^F&BQcu=B1
zl%NEq<cIbovBh|dZ=&fxMF$qGqztQpg^b~qnH(^9bf{+a$4Vt8VV&MzrfrDOEq2ge
zU+!T|n>BWB@{cNiC9n?b>!_n(zaCQtk=*34sE)cnU~%YB)%E*2kGUC(`NBM!oxxdW
zoxN9sm>YmL@sOG<q?Am;I;=C^N)Y2&-ee4$vDfS{cpWfaD?gpy>XD+5!~@WwLlbqd
zQ-7xi%bzjG|JS~%3xFN~1x%_7pZCxo0cxU(0O^Z+l$~!4SE0M$;JnTN0000<MNUMn
GLSTX#VpK~2

diff --git a/core/img/filetypes/text.svg b/core/img/filetypes/text.svg
index 32685b586cb..6637aacdd80 100644
--- a/core/img/filetypes/text.svg
+++ b/core/img/filetypes/text.svg
@@ -1,39 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="j" x1="22.004" gradientUnits="userSpaceOnUse" y1="47.813" gradientTransform="matrix(.66858 0 0 .67037 -.67962 -2.3083)" x2="22.004" y2="3.3639">
-   <stop stop-color="#aaa" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="k" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#k)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#m)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#l)"/>
- <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/>
- <g fill="none">
-  <path stroke-linejoin="round" stroke="url(#h)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z"/>
-  <path opacity=".3" stroke-linejoin="round" stroke="#000" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z"/>
-  <path stroke="url(#j)" stroke-width="1px" d="m8 5.5677h1.567zm1.7968 0h1.4625zm1.6924 0h1.2954zm1.5043 0h0.56412zm0.79394 0h1.2536zm1.5043 0h3.3011zm3.5101 0h2.5281zm2.737 0h0.77305zm-13.539 1.9218h2.0684zm2.2774 0h3.3847zm3.5936 0h1.6506zm1.8595 0h1.5461zm1.755 0h1.3163zm1.5252 0 2.0684 0.020955zm2.2565 0.020955h3.3638zm-13.266 1.9895h2.8624zm3.0922 0h3.0922zm3.3011 0h1.2327zm1.4416 0h2.9042zm3.0922 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327zm-14.813 2h1.0656zm1.3998 0h3.9488zm-1.3998 3h2.6325zm2.8415 0h2.8206zm3.0295 0h1.0864zm1.2954 0h2.6534zm2.8624 0h3.3429zm3.5727 0h1.2327zm-13.602 2h2.8624zm3.0922 0h3.0922zm3.3011 0h1.2327zm1.4416 0h2.9042zm3.0922 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327zm-14.813 2h2.4445zm2.7161 0h1.17zm1.379 0h0.58501zm0.81484 0h1.0656zm1.2954 0h1.0864zm1.2954 0h1.7341zm1.964 0h2.2565zm2.4654 0h1.5043zm1.7132 0h0.37608zm-13.643 2.9895h2.0684zm2.2774 0h3.3847zm3.5936 0h1.6506zm1.8595 0h1.5461zm1.755 0h1.3163zm1.5252 0 2.0684 0.02095zm2.2565 0.02095h3.3638zm-13.266 1.989h2.5908zm2.8206 0h0.81484zm1.0238 0h1.8595zm2.0684 0h2.737zm2.9668 0h1.8595zm2.0475 0h0.39697zm0.6059 0h2.3609zm2.6117 0h1.2327zm-14.145 2h2.5908zm2.8206 0h1.17zm1.379 0h1.8386zm2.0475 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327z"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0 0.23 0.2061 0.438 0.4316 0.438h11.138c0.226 0 0.432-0.208 0.432-0.438v-10.142c-0.004-0.0669-0.023-0.133-0.055-0.1915l-3.312-3.1992c-0.043-0.0164-0.089-0.0255-0.135-0.0273h-8.0684c-0.0268-0.00265-0.0552-0.00265-0.082 0zm1.6504 1.998h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png
index a5793d6eb10fa256e91cdd28052fed782427f7c8..5604a4a1891236639fcbf7de826330e45418bf65 100644
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=7=SfKr<uzkt#lB|(0{
z4E8Pujy(VH`QxlxSAb$ho-U3d9MQ=M2N>SSCI}oj!1&Ny!8k%>0Z*S8tHxsH6HciI
nmds$iu+>>IM?hOh!hnIH(?%eb`(G|EP&b38tDnm{r-UW|a8)<1

literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000E5Nkl<ZSi{X$
z-)kI29RJ?#?d_#W8?ZJMQOOS~ib_GTmKyRPeGwEN^rb=spA`CNS|7|?M8z7EszeE*
zPYU+M|3G{QG-;dI<TS~daK<axmr5GF?9Z9;`<<EH+r7PAlA_dw4|Ct0+0XYgpZU(r
z8A1rSn=s%mKmQK_rBZ1M;Uh#Ret59=j?s-z=b7qs;H}Zo(ao{3v04(;as1pQJTdhi
zJo&)|c<SOu@bu@Oz{#&>;M6y>@XU8#%J$^fGx9z4(>NM`{QRUO?&PFAl&@2OwXw0$
znwy*3jZm-GJ?aQ<Y=N_Q8NB6r@M>4UU%LiDeNkb(-O_vN_m&sr_@KEZiHRr4OL-_?
zrUt6js=+xw!5BM1EyeU+Fs=|H0tVa<fqMui0JiJPmSW*EH3k9tn<CzffJ&uOqHTfC
z>(o*#1?a>w0U?<j!JLE$0*Q=-6!3NxfDirrg4$RB7kcJQ&s+)MyCeeJR-j^6i6Dmr
zfr~=ki~!el#o*xJ(#Xij615c5dyZD}Kqq%YU~ZHgXWsJL%OFLlG14);1bMs}0o&W#
ztkG!ro12?HwG^uwP-JrLbs}l|u1>DSu*d}(#{}Sd7xHEV&>l5SvlM~is0e9ITeoh(
zy_4@l-wS8(ogwXK2@z79E<~Ov!aUxLfS#V7RJBs91PDnO;1bv)4?*wg=iun{EcBdu
z7MDdW4Wn6yOhF1}aS`V6W(3%_ovK!fRSl@B)_lOtGH|;J{ja<RM=#7k<>AL=e+nc*
zFF_t}Mu25mscNM-E<z+_tnC~T@v;TRkpVa|F$n{2zXQg=eOdsEg%t5-1UQb9s#c1n
z06indvKI->l9?vhk30(ZPk##iXU2iWF0ex0jDVe;om90_91Fl%B^}6nT-*h%mK(cJ
z#M^BbKu5KzS!%K{>~fVF1{m1!_x0<rH2y05_SsC^fshySb}PbEwNjkt0Fjh}0Q^60
zLha4-@Y5S-!Q1*B4%!w}aY>?Yig>$SMyYD0INk+8y9P>Rh2y}l(;vg-7hi(y`32~+
z$_S*w<5!-VdP^4Z?)@&H*&{-9;P%g}(ERoi{CN6#xN+%wIAD~ZzhZ(ZxD=V(0m;i~
zPj^9HwX#4F(uC$-9*4CLFM{nka2R<kq3;RWrlEE!OgpgWU66NXM`Q-tTLA%w%XpXw
z-ah%rp@1dM02Yhh*Ihsrovc=h>7j`b**yk>KG0{qP7*;T4p?Fb;F5)+kay4jh+JlZ
z!^+^{1r)H7BxZ<|19F=R2`?;x%T4^w*xx^*yfd4Kh|nRB7+zK_E2qI#pG#n6DSTgd
zL0+|bl#r_=Zj_uy2^C!479t(PcOEzYon7FN1I$z|<T_w#+qDbYk^Ss~0PU%UVQBfj
zZ&8b}{Oc@w4}m>A43!}Sw)W5vLdW=9q1`Xz;UN$Q4n;So)xle(e6awu<si1R&1Ul$
z;;|%Xz)HOiOSNBMv9=0VSJq%*WgX^Y)HT-S`zzRgt+s~aS78~yqo<RT@=!jV7YtPN
z7q%0K2N1)EV@bUG=hZt#Czs}@JQF&vS^^9l#7#s4vGE_Gq4PM=68r;Pu0uONPE%0;
O0000<MNUMnLSTZj^<F0c

diff --git a/core/img/filetypes/video.svg b/core/img/filetypes/video.svg
index b54e08bdf2f..1acf7fc6973 100644
--- a/core/img/filetypes/video.svg
+++ b/core/img/filetypes/video.svg
@@ -1,92 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <radialGradient id="h" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(1.603 0 0 0.6 541.99 860.76)" r="2.5"/>
-  <linearGradient id="b">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="g" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(1.603 0 0 0.6 -535.01 -912.96)" r="2.5"/>
-  <linearGradient id="u" x1="25.058" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="43.544" gradientTransform="matrix(.82143 0 0 .42857 518.79 868.22)" x2="25.058" y2="39.999"/>
-  <radialGradient id="f" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(-.0095987 1.5579 -1.4869 -.024192 551.14 849.78)" r="20">
-   <stop stop-color="#f8b17e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".26238"/>
-   <stop stop-color="#c6262e" offset=".66094"/>
-   <stop stop-color="#690b54" offset="1"/>
-  </radialGradient>
-  <linearGradient id="t" x1="547" xlink:href="#e" gradientUnits="userSpaceOnUse" x2="547" y1="887.36" y2="860.36"/>
-  <linearGradient id="e" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(2.641 0 0 2.641 .61539 -60.385)" x2="24" y2="3.899">
-   <stop stop-color="#791235" offset="0"/>
-   <stop stop-color="#bf1d09" offset="1"/>
-  </linearGradient>
-  <linearGradient id="s" x1="24" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.37838 0 0 .64865 529.42 858.29)" x2="24" y2="43"/>
-  <linearGradient id="c" x1="24" gradientUnits="userSpaceOnUse" y1="5.3301" gradientTransform="matrix(2.7297 0 0 2.7297 -1.5135 -62.513)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".029825"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".96141"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="r" x1="24" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.10811 0 0 .64865 524.91 858.29)" x2="24" y2="43"/>
-  <linearGradient id="q" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1306.1 -122.39)" x2="532" y2="812.36"/>
-  <linearGradient id="a">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="p" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1300.1 -122.39)" x2="532" y2="812.36"/>
-  <linearGradient id="o" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1294.1 -122.39)" x2="532" y2="812.36"/>
-  <linearGradient id="n" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1288.1 -122.39)" x2="532" y2="812.36"/>
-  <linearGradient id="m" x1="24" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(-.10811 0 0 .64865 552.09 858.29)" x2="24" y2="43"/>
-  <linearGradient id="l" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1306.1 -1199.4)" x2="532" y2="812.36"/>
-  <linearGradient id="k" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1300.1 -1199.4)" x2="532" y2="812.36"/>
-  <linearGradient id="j" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1294.1 -1199.4)" x2="532" y2="812.36"/>
-  <linearGradient id="i" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1288.1 -1199.4)" x2="532" y2="812.36"/>
-  <linearGradient id="d" x1="598.77" xlink:href="#e" gradientUnits="userSpaceOnUse" x2="598.77" y1="475.7" y2="448.3"/>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <g transform="translate(-523 163)">
-   <rect opacity=".4" height="3" width="4" y="885.36" x="550" fill="url(#h)"/>
-   <rect opacity=".4" transform="scale(-1)" height="3" width="4" y="-888.36" x="-527" fill="url(#g)"/>
-   <rect opacity=".4" height="3" width="23" y="885.36" x="527" fill="url(#u)"/>
-   <g stroke-linecap="round">
-    <rect stroke-linejoin="round" style="color:#000000" height="26" width="16" stroke="url(#t)" x="530.5" y="860.86" fill="url(#f)"/>
-    <rect opacity=".5" stroke-linejoin="round" height="24" width="14" stroke="url(#s)" x="531.5" y="861.86" fill="none"/>
-    <path style="color:#000000" d="m525.5 860.86c-0.554 0-1 0.446-1 1v24c0 0.554 0.446 1 1 1h5v-26h-5zm1 3h1 1v2h-2v-2zm0 6h2v2h-2v-2zm0 6h2v2h-2v-2zm0 6h2v2h-1-1v-2z" fill-opacity=".78431" stroke="#000"/>
-   </g>
-   <g fill="none">
-    <path opacity=".3" d="m525.5 861.86v24h1 3v-3-18-3h-3-1z" stroke="url(#r)" stroke-linecap="round"/>
-    <g stroke-linejoin="round">
-     <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#q)" x="-884.86" y="525.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#p)" x="-878.86" y="525.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#o)" x="-872.86" y="525.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#n)" x="-866.86" y="525.5" height="4"/>
-    </g>
-   </g>
-   <g>
-    <g fill-rule="evenodd">
-     <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="863.36" x="526"/>
-     <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="869.36" x="526"/>
-     <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="875.36" x="526"/>
-     <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="881.36" x="526"/>
-    </g>
-    <path style="color:#000000" d="m551.5 860.86c0.554 0 1 0.446 1 1v24c0 0.554-0.446 1-1 1h-5v-26h5zm-1 3h-1-1v2h2v-2zm0 6h-2v2h2v-2zm0 6h-2v2h2v-2zm0 6h-2v2h1 1v-2z" fill-opacity=".78431" stroke="#000" stroke-linecap="round"/>
-   </g>
-   <g fill="none">
-    <path opacity=".3" d="m551.5 861.86v24h-1-3v-3-18-3h3 1z" stroke="url(#m)" stroke-linecap="round"/>
-    <g stroke-linejoin="round">
-     <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#l)" x="-884.86" y="-551.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#k)" x="-878.86" y="-551.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#j)" x="-872.86" y="-551.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#i)" x="-866.86" y="-551.5" height="4"/>
-    </g>
-   </g>
-   <g fill-rule="evenodd">
-    <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="863.36" x="-551"/>
-    <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="869.36" x="-551"/>
-    <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="875.36" x="-551"/>
-    <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="881.36" x="-551"/>
-   </g>
-   <path opacity="0.32" stroke-linejoin="round" d="m599.62 474.79v-25.573l22.14 12.78z" fill-rule="evenodd" transform="matrix(.45152 0 0 .43013 262.76 675.64)" stroke="url(#d)" stroke-width="2.2691" fill="url(#d)"/>
-   <path stroke-linejoin="round" d="m599.62 474.79v-25.573l22.14 12.78z" fill-rule="evenodd" transform="matrix(.36122 0 0 .35193 317.91 710.77)" stroke="#FFF" stroke-width="2.8047" fill="#fafafa"/>
-  </g>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m1.3438 2c-0.1975 0.0382-0.34736 0.2334-0.3438 0.4375v11.125c0 0.229 0.212 0.438 0.4375 0.438h13.125c0.22555-0.000006 0.4375-0.20846 0.4375-0.4375v-10.953c0-0.3362-0.265-0.611-0.516-0.609zm0.6562 1h12v10h-12zm3 2v6l6-3z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/web.png b/core/img/filetypes/web.png
deleted file mode 100644
index 33063212466ca53e7c562f723864f336d3b21b6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2136
zcmV-e2&eanP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000OdNkl<ZScSz`
zYit}>6+Scj^sc>LuV3*qZtVC`+Bl$urXdKCmbNssDww26N(qAC&<JROBJqPtL<rGT
zYT8oN$|53>h?+uCLZm=S;s!rRNSzpmJp795Bz6+N*7ok~%<eqzaL&x^#*G~)1=N*3
z-SM57`+es-=bk&}P1A&r5<GmwzYir~>q~!*eB;%_jay&;<2r(MjdTB30b71?xbn$g
z{^{kf?s{u5yU;Tb$`5qrhW!U~Bf*1(Rizz~%5Y!vua5Q6GxY5LRKVsJ5B!i*;@$b#
z{L{X??4`YzdJ9fpIG5Ab)8lFDKI6F<7emqfvZ7FZL;W2MwNK~dWOY5U>)^BhwSY}O
zd$ZyzyAHftR2bf&dHn?^2Zo_PCPOk(2BM~dL2n1LK=%3|sxuf6ROk^5fJIfsWs56z
zZ2b8fr|-UR{fZAI;PL18ZwiKj?-p0rfAXrHl{Gvgg30laU0DnA^ceVyN}zP@BT(`1
zdhiz%1IKd!90w+F(0647hGlQS&uc4cKC$ZUho0H_&HqTirXTOA2zdQ3x{9kyE=FaD
z#RQONr=W288qlRUXkr2ag=OH&%>&K^aCv;VrRYr)lvos>5n+0A94@mkgsMNDZ^Wl}
ze(Fox8$PfA&BOiPUtC!-JR^aMi$#08Ku?M=e)4UY`ukroMh?W0_dtsaz!V)!9c{-H
zfMJ3!CjwbT<)AAvMEkqp%!%U=Dk{liF8IR-67blMTAs}<D7$MkZh(mk&h&L5feOGF
zXh{i}szRWk3>K}t9|_TN5<t*wA*R8=z~^QMx`AvlnF&`WVvv_#P<8M6@4WCY1w8u9
z&PuP}|AROm4oJ8t*{&vLtwl@>kn9dEZh%PL3M4du!@x~N15-tE)v)GB#CTUL1dFSn
z<eqhqT~-Gwp9K;Gyc|=TS2s1+-By6kdB5)tS1yXiWs6k2KID+wZ8N)UDTK;uEh0w5
zvJI9IK`t=JE+-BS;+K0NP*eqx`c<G8-U)e&m*py&@sr!9z~ml~3@^IPtc8@>NwnSs
zmp>b_BBhX1(EtqRnQGh499Y*lNB0yV28odY5Jm<;ymkqq=R08XY#RvI1|b%Yqj>Gp
z3krB>>yC)q69|hbj0khDCSq1)7cBcM6g94eoXR^b0<xG9$OX*14SSC2Aa<@346GA+
znW1=1N`R4)AT=`%sw)RvE_e3wwd+gg2~f>cg${1Ns@jF5Clk20J(m5dC;;#B+2q<>
zFbDSEN<0Slc*dYIU|2zbl|E*rkBT@Ey#c=PBHrMQrSnsu8s$231$3v9y*WkT35H>^
z=N*uvW484Rkj@pO#HOLTt^vOGz)GkNIppl-sL5Dc?kpc~@{8vS&~aCh#fAf{`cTC(
zD7^b~n2tDhzX_Q7M+XR_14uNpfB*vp=Uc_Mq3MgT^$TmDA;Q_@<c6~)#poEvn=Up_
zfM&95sw_y<Oqe5tM(lHtQ~oiKvBOc9iw~cN*w9%}h4?%H9Pb5_cY&_!@c9SthvqNe
z2aQE8yB=^|4h6`G8CBJlk$D0PW{w&uQ8w_9Nt4^40;3i?g^SqHkdW!VQ<mkoil8M)
zfQp5<=H6BCtxXTZ%5slY56mzy4U&f6L6_zUIQhF>GfbCa4D&?YE?w~^=9a2k6=obe
zZD^7JQ|H>TQ=YQ7pd)~uApx4Efubm|eA!*_)RT|G>N~KYF*vu^EA)087+bIpAn7qv
zMj|DJkTcth9B})?R`l<OErjl83KZ=o0cntknk7qM`<5p7Onrd5>E9OY1C{`gck!vw
z8w>?7C22!dti2vAuCsDXX<&1l@P*6g2({0Tv;%1oGP+t?S^`gfeWUrv>gwuk+qU@@
z6wv+FE2B(Ly=tb$Byxet$qYCw#!&fkB(S$Bb6fyC=8SX=P%4;_5pb)Ba5&6u+^}JJ
zBogUB5yAHf;5g2WLsrkhms>!K4lr53KA*I}WIP42n{h-=MM|9x$6#R%c(d~CXHw2{
zj({|772)xC+)YhQD^bKr6cOefa@;H6b>JBv?A~swHzv~2r$ta*aH!eT73+w0dxDNb
zQbr^dp+VK|I6&84uNQcphg2#BaXb$Q4Gj(TKA*3fpOXsS+VqHt-p&bW_WBFVxIRfv
zWC&!@7DCbIRbltU`bdcuu{F+dfXI=6BDNy$?d_HJ?%lh8&z?Qs#&L67Tiat;ppW1B
zL1L!I;m+S49>3WBgl>#qFx2UkO_GFAVJ!r6E5PmY&xstr7t<mPdmB>JCr@=5BO@aU
zMP6H58_dnkttAor_U${2LRwo|TF#^e=yRZ@$LZmo(f%W^ZBB}#ExH+vGBtr|P{7Um
zGQ^q4Gbu2@?RI0teQNt(-ud;36DOuf42fuLY^>RUML37cE<)2fu0TPk4rB)@MDj}K
z{+989&do`6;tiFXy{xg>sAkLxx+Z7@x~4h0$8$^?8X8hsTaO*WD0iX*dnYF+bxK1`
zO-*i9Rn_yv<#68I1*ZKY(xd~)frv=NFP|N}(!Te(p<}N-IDX;iy4b||Euwh&y9BzX
zIl3prru8F7j<ln_-=lYrA3y&3>C>kts2(Iqg8KUUCC$yv3mnHch3E*1Jb@6Lkq~zf
z6UGOxPM&W&b-nA*Ap%{~9NiN|@g>ah=Jb14uU?(P-<yd<!UzNcbVj)5)Y|R;F>xHx
z5J`mKkk9@*?B2cmr?FUUhTd`B)iD3hwYIjlA3b{Xz5f3G-=I60!|0#Z{>?klr>VRE
O0000<MNUMnLSTa8Xcf=^

diff --git a/core/img/filetypes/web.svg b/core/img/filetypes/web.svg
deleted file mode 100644
index 5b5a9c3b771..00000000000
--- a/core/img/filetypes/web.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="24.149" cx="17.814" gradientTransform="matrix(-2.644 0 2.9365e-8 2.5344 78.725 -37.986)" r="9.125">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#b6b6b6" offset="1"/>
-  </radialGradient>
-  <linearGradient id="e" x1="62.2" gradientUnits="userSpaceOnUse" y1="-12.489" gradientTransform="matrix(1.4102 0 0 1.4102 -71.718 20.951)" x2="62.2" y2="-1.4615">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="-8.7256" cx="61.24" gradientTransform="matrix(0 2.3489 -2.3489 0 -4.496 -137.2)" r="9.7553">
-   <stop stop-color="#51cfee" offset="0"/>
-   <stop stop-color="#49a3d2" offset=".26238"/>
-   <stop stop-color="#3470b4" offset=".70495"/>
-   <stop stop-color="#273567" offset="1"/>
-  </radialGradient>
-  <linearGradient id="d" x1="20" gradientUnits="userSpaceOnUse" y1="43" gradientTransform="matrix(.65334 0 0 .65333 .059960 .58024)" x2="20" y2="2.6887">
-   <stop stop-color="#254b6d" offset="0"/>
-   <stop stop-color="#415b73" offset=".5"/>
-   <stop stop-color="#6195b5" offset="1"/>
-  </linearGradient>
-  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="4.625" cx="62.625" gradientTransform="matrix(1.4431 0 0 .58311 -74.376 23.108)" r="10.625">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
- </defs>
- <path opacity=".4" fill="url(#a)" d="m31.333 25.804a15.333 6.1955 0 0 1 -30.667 0 15.333 6.1955 0 1 1 30.667 0z" fill-rule="evenodd"/>
- <path d="m29 15.999c0 7.18-5.821 13.001-13 13.001-7.1793 0-13-5.821-13-13.001 0-7.179 5.8207-12.999 13-12.999 7.179 0 13 5.8199 13 12.999z" stroke="url(#d)" stroke-width=".66667" fill="url(#b)"/>
- <path opacity=".4" d="m16.219 3.4688l-1.563 0.1874-1.75 0.4688c0.148-0.0517 0.316-0.1067 0.469-0.1562l-0.219-0.3438-0.656 0.0938-0.344 0.3124-0.531 0.0938-0.469 0.2188-0.218 0.0937-0.063 0.0937-0.344 0.0626-0.219 0.4374-0.25-0.5312-0.0932 0.2188 0.0312 0.5937-0.4062 0.375-0.25 0.6563h0.5l0.2182-0.4376 0.063-0.1562c0.228-0.1612 0.456-0.3448 0.687-0.5l0.532 0.1875c0.08 0.055 0.169 0.101 0.25 0.1563l-1.532 0.3124 0.5 0.375h0.126c-1.3646 1.3155-3.5724 3.8488-4.1255 8.2808 0.024 0.113 0.4375 0.782 0.4375 0.782l1 0.562 0.9688 0.282 0.4374 0.531 0.6558 0.5 0.376-0.094 0.281 0.156v0.094l-0.375 1-0.282 0.437 0.094 0.188-0.2498 0.812 0.8438 1.532 0.844 0.75 0.406 0.531-0.062 1.125 0.281 0.656-0.281 1.219c-0.005 0.013-0.019 0.032 0 0.094 0.036 0.123 1.5 0.944 1.593 0.875 0.093-0.071 0.188-0.125 0.188-0.125l-0.094-0.281 0.375-0.344 0.156-0.375 0.594-0.219 0.469-1.156-0.125-0.344 0.312-0.469 0.719-0.187 0.375-0.844-0.094-1.062 0.563-0.782 0.093-0.812c-0.771-0.384-1.546-0.793-2.312-1.188l-0.375-0.718-0.687-0.157-0.407-1.031-0.906 0.125-0.813-0.594-0.843 0.75v0.094c-0.256-0.074-0.585-0.079-0.8128-0.219l-0.1562-0.531v-0.594l-0.5938 0.063c0.0471-0.374 0.1089-0.752 0.1563-1.125h-0.3437l-0.3438 0.437-0.3125 0.156-0.4687-0.281-0.0313-0.562 0.0937-0.657 0.6876-0.531h0.5624l0.125-0.312 0.6876 0.156 0.5002 0.656 0.093-1.093 0.907-0.719 0.312-0.813 0.688-0.25 0.343-0.562 0.876-0.1565 0.406-0.625h-1.282l0.813-0.375h0.563l0.718-0.25 0.156 0.6875 0.313-0.5-0.375-0.25 0.094-0.2812-0.282-0.2813-0.312-0.0625 0.062-0.3438-0.218-0.4687-0.156 0.0625 0.468-0.7188c0.759-0.2351 1.44-0.4872 2.156-0.8124l-0.062 0.3124 0.375 0.25 0.625-0.4374-0.312-0.3438-0.438 0.2188-0.125-0.0313c0.031-0.0142 0.063-0.0168 0.094-0.0313l0.625-1.625-1.375-0.5624zm-3.563 0.7812l-0.344 0.3125 0.876 0.5937 0.593-0.1874-0.406 0.2812h-0.063l0.219 0.1562v0.4688l-0.469 0.5 0.126 0.25-0.5 0.875 0.031 0.3125-0.5 0.2187-0.313 0.6876-0.156-0.6563-0.875-0.3437-0.156-0.5 1.187-0.6876 0.438-0.4062c0.019 0.0129 0.043 0.0183 0.062 0.0312l0.5-0.4687-0.437-0.1875v-0.0312l-0.063-0.0313-0.062 0.0313-0.032-0.0313 0.063-0.0313-0.094-0.0312-0.219-0.4688-1-0.125-0.031-0.0937 0.438 0.0625 0.25-0.25 0.531-0.0938c0.128-0.0622 0.277-0.1055 0.406-0.1562zm-0.281 1.1562l0.031 0.0313 0.906-0.1875-0.124-0.0938-0.813 0.25zm11.687 0l-0.25 0.1563v0.3437l-0.937 0.5938 0.187 0.875 0.532-0.375 0.344 0.375 0.374 0.2188 0.25-0.6563-0.124-0.375 0.124-0.2813 0.282-0.25c-0.251-0.2223-0.515-0.4216-0.782-0.625zm-12.437 0.25l-0.063 0.1876s-0.398 0.0687-0.5 0.0937c-0.019 0.018-0.042 0.0438-0.062 0.0625v-0.1562l0.625-0.1876zm13.5 0.625l-0.031 0.0626v0.5c0.162-0.0442 0.335-0.0728 0.5-0.0938-0.154-0.159-0.308-0.3175-0.469-0.4688zm-3.687 0.0626v0.3437l0.218 0.25v0.5313l-0.125 0.7187 0.594-0.125 0.406-0.4063-0.375-0.375c-0.124-0.3308-0.251-0.6201-0.406-0.9374h-0.312zm4.218 0.4687l-0.5 0.375-0.062 0.25-0.719 0.625-0.719-0.1875v-0.4375l-0.344 0.2187 0.157 0.4063h-0.531l-0.313 0.5-0.344 0.4063-0.656 0.125 0.375 0.375 0.094 0.375h-0.469l-0.625 0.3442v1h0.281l0.281 0.281 0.594-0.281 0.219-0.594 0.469-0.282 0.094-0.218 0.718-0.1878 0.406 0.4378 0.407 0.25-0.25 0.468 0.406-0.093 0.187-0.5-0.5-0.5628h0.219l0.5 0.4058 0.063 0.532 0.437 0.5 0.125-0.719 0.219-0.125c0.239 0.249 0.423 0.563 0.625 0.844l0.75 0.031 0.406 0.281-0.187 0.282-0.438 0.406h-0.625l-0.812-0.282-0.438 0.063-0.312 0.344-0.906-0.907-0.626-0.187-0.937 0.125-0.813 0.219c-0.462 0.524-0.937 1.049-1.374 1.593l-0.5 1.282 0.25 0.281-0.469 0.625 0.5 1.156c0.412 0.467 0.838 0.94 1.25 1.406l0.593-0.531 0.25 0.313 0.657-0.406 0.219 0.25h0.656l0.375 0.406-0.219 0.781 0.469 0.531-0.031 0.875 0.343 0.657-0.25 0.562c-0.024 0.404-0.062 0.815-0.062 1.219 0.198 0.547 0.406 1.073 0.593 1.625l0.126 0.875v0.469h0.218c0.885-0.838 1.651-1.794 2.282-2.844 0.482-0.804 0.881-1.661 1.187-2.563v-0.656l0.437-0.937c0.179-0.869 0.282-1.768 0.282-2.688 0-3.561-1.408-6.7926-3.688-9.1875zm-4.718 0.25l-0.344 0.125 0.094 0.6563 0.468-0.25-0.218-0.5313zm6.593 5.9375l0.531 0.625 0.657 1.406 0.406 0.438-0.187 0.469 0.343 0.437c-0.165 0.011-0.33 0.031-0.5 0.031-0.308-0.649-0.546-1.32-0.781-2l-0.406-0.437-0.219-0.813 0.156-0.156z"/>
- <path opacity=".4" d="m28.333 15.999c0 6.812-5.5222 12.334-12.333 12.334-6.8111 0-12.333-5.5221-12.333-12.334-0.0003-6.811 5.5216-12.332 12.333-12.332 6.8107 0 12.333 5.5215 12.333 12.333z" stroke="url(#e)" stroke-width=".66667" fill="none"/>
- <g transform="matrix(.66660 -.0091343 .0091343 .66660 -.19246 .35724)">
-  <path stroke-linejoin="round" stroke="#666" fill="url(#c)" d="m30.5 20.937 17 16.5-7.75 0.25s3.25 6.75 3.25 6.75c1 3-3.5 4.125-4.25 1.875l-3-6.75-5.5 5.875 0.25-24.5z" fill-rule="evenodd"/>
-  <path opacity=".4" stroke="#FFF" d="m31.657 23.379 13.476 13.186-6.9219 0.27746s3.8721 7.7566 3.8721 7.7566c0.40273 1.6501-2.0283 2.4126-2.5071 1.1529l-3.6831-7.845-4.4247 4.7083 0.18907-19.236z" fill="none"/>
- </g>
-</svg>
diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png
index 6c0c4f8c228afd8c6cf5454f687edbaf8b09907e..861ac965a7d9e2b247459cc64edb4e44ad13f712 100644
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=8+oUwf>2>9P8S=jvC;
zD6jccFi@JKB*-tA!N}72&4<rlBm`&k0>w-{T^vI=qLULEntS^C_}m4UJ<7LeHApDL
z@QA+5Xg9P{2$B(Ci(&EPS|vJLWR?fZ4WkxihJQRN%RWZ<ZU-8`;OXk;vd$@?2>>W3
BHW2^-

literal 856
zcmV-e1E>6nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009YNkl<ZScScn
zPixy)6vcn<>5o&7V>y8qVv|5Z6GHxegAUycv+26f((f?KSr1uuHr;01&r&F~B{(Tv
zC*8J<ofv!CMDKPXOP2LyOE&2oFh~!-dynot_gp0+r19+Ue_lC_2agq?74q=r%Ncis
z^Yiof$H&M2rqA5$pPb<Sqd%X%*!#^@I9l<fb#MPJk{e?<Iy$n>Edm0(`}Tvc{~0_D
zzc1e0MSfh@N|jH*7`O=`6ws1)Wj<tEJ&}M&l>AmenaLM_836z>Q6)k>e)075lpqM`
zcDs0<hv#|p`+e&5I!Y<J-7ZT@OI%)FCU^Gtr%TALfH8;}lE^UM+uH+Rb#*m2SbW}U
zwMOxV_eCVP3KJ?I(GO)+03Zkgdc7W==Mjb>)oPVquSd07WiS}v`#$}CpM`}5Ha9oN
zh!j_VNC#p-5YqSJ3e19Z1&lGp1dyoz5dm8RF=8#GQLopzy1Js(YO%b$oJ*vTfS8Dc
zm}nZ(C=%2>uzf&;FdPz5lPi!#5xMeXC?gSO2~5*KkzdU017bi_ao|}{N`&zQ7y~Lp
z;Os0~jIr3#NT0>ezVEZOwKa@eR)nD>709+=XJ@DIEA0=O+lcHjY`5Dq8Vx#~4wXs;
z$8i!X)>_l)bSx`AI5-$1QcNK60f}ExnP6*cYq`PV^GQ}+ia_FmCVsay0Mm`A*=){l
zM23+QW-o4UZzs=6DOOfi#_lSmXf~T@t*wORTM&yd1QZw}=wT1E)>gtS;<G#g<#qv4
z|BaDk4C7Gkb{i-j!;Os%YPFh0AP+ejFr#IZAu!7>$g4o9G0YQTwgSHI<GL=c>ssa$
z!*LvTcXuZenob}b5ilaj7|yy4(@D!~z(h$S9~c+e$;k;Ys=#0{pjNAKeSHm#kLLRN
zIzbQ=lAN#&hr57CjIsC+4-X3ij)lrppcDZiwGD~IGgIC|GE)g?%x%?EG%7AAs4Xty
zVE1lT<n`Yopp?>oJpb#>_qVUB(E+^t@cEN%H}m1*;^L!HN{dLsMx{%mA{(n`iQOS?
ifh$QRRg-%2f8i&u-vqRd5o#C!0000<MNUMnLSTXlk%cb+

diff --git a/core/img/filetypes/x-office-document.svg b/core/img/filetypes/x-office-document.svg
index eb2368722e2..c9e404a03fa 100644
--- a/core/img/filetypes/x-office-document.svg
+++ b/core/img/filetypes/x-office-document.svg
@@ -1,53 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="f" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.66892 0 0 .72973 1.8209 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.1779e-7 4.3522 -5.8956 -1.3064e-7 75.942 -39.435)" r="12.672">
-   <stop stop-color="#90dbec" offset="0"/>
-   <stop stop-color="#55c1ec" offset=".26238"/>
-   <stop stop-color="#3689e6" offset=".70495"/>
-   <stop stop-color="#2b63a0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="i" x1="21.982" gradientUnits="userSpaceOnUse" x2="21.982" gradientTransform="translate(-2.9821 -6.0421)" y1="36.042" y2="6.0421">
-   <stop stop-color="#AAA" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#e)"/>
-  <path opacity=".15" fill="url(#c)" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z"/>
-  <path opacity=".15" fill="url(#d)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/>
- </g>
- <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#g)"/>
- <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#h)" stroke-linecap="round" fill="none"/>
- <path d="m11 5.505h1.3436zm1.6874 0h2.1875zm2.5312 0h1.9375zm2.25 0h0.84375zm1.1875 0h1.875zm2.25 0h3.0938zm-9.9061 2h2.6561zm3.0624 0h1.75zm2.0625 0h0.875zm1.2188 0h1.5938zm1.9375 0h1.625zm1.9375 0h2.5938zm-10.219 1.995h3.2811zm3.6249 0h4.625zm4.9375 0h1.8438zm-9.906 2h1.5938zm1.0936 0h5.9062zm-1.0936 3.0372h2.0936zm2.4061 0h5.0625zm5.375 0h2.4688zm2.7812 0h2.3125zm-10.562 1.963h1.3436zm1.6874 0h2.1562zm2.5312 0h1.9375zm2.25 0h0.84375zm1.1875 0h1.875zm2.25 0h3.0938zm-9.9061 2.0753h3.2811zm3.6249 0h4.625zm4.9375 0h1.8438zm-8.562 2.925h2.0936zm2.4061 0h5.0625zm5.375 0h2.4688zm-7.7811 2h2.8749zm3.2186 0h1.2188zm1.5312 0h2.7812zm3.0938 0h4.0938zm-7.8436 2h2.8749zm3.2186 0h1.75zm2.0625 0h2.75zm3.0625 0h2.9688z" stroke="url(#i)" stroke-width="1px" fill="none"/>
- <path style="color:#000000" fill="url(#b)" d="m8.0261 29.5h-3.3605c-0.31067-0.34338-0.074432-1.0251-0.14825-1.5112v-27.322l0.043327-0.11794 0.10492-0.048698h3.3084"/>
- <path opacity=".5" stroke-linejoin="round" d="m8.5 28.5h-3v-27h3" stroke="url(#f)" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0 0.23 0.2061 0.438 0.4316 0.438h11.138c0.226 0 0.432-0.208 0.432-0.438v-10.142c-0.004-0.0669-0.023-0.133-0.055-0.1915l-3.312-3.1992c-0.043-0.0164-0.089-0.0255-0.135-0.0273h-8.0684c-0.0268-0.00265-0.0552-0.00265-0.082 0zm1.6504 1.998h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z" fill="#49abea"/>
 </svg>
diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png
index b129c76de6068c2ca039880dd26f9a17b8ccd883..fbe941e5c3f2fcfb3fa97ae5104948652c867bb0 100644
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE0F#$Egp_CxzF_ig;+|0
z{DK*tfB39#_Gk%^uk7jK7*fHQtiWWjS%J}Q0RuPJ0j-8L^V67G?jCG8ldg1VJ;RB+
WjFm--Tl0a+89ZJ6T-G@yGywqo)F>JN

literal 1028
zcmV+f1pE7mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000BaNkl<ZScS!w
zO=}!S5Qd+cnbk!5p^wFuR$7)EB!baRpcn$d!3R0l-10Ya%rUo+TgWMYBKJf$9SsJN
z9CR`S79_Nm15uXM?r5f~a+r_ocxSD(BPB01%=C13y;b#A^@y4Ae<G-weDUJNS7z3_
zOG6?uJUBS`ejx&?y1KWwcbE1#Jw08mBsQIb=g*)21hjz<!!Sfdif_~FrsqqCiOl5F
z%tS;iiXzPHci@l5j~{=Te}6Lq>-+orTYxU$RAJ*C)^<-$PW%#SGvn2FpSvKs@`@Av
zC4T+nn|C<(-60}_r%#`D0stEiz2+BRBTID<!Tov0laHU=D}m$V<4wp?kR(Rj{|%zQ
zKm@6M!1eX@y&137YK5i(fH*NwO@|1kj;j7}baYgDfA;KIF_%BTIadYe9I9F-V5&$)
z09Q@m@bIwoZf3<?{`}_LJd`64rx7q!5WwkMH~(9h*}N1uKtSG)fT}VYjTnta#Bq$7
z5d;CvW|L;KiRXC*fteIwE{y<!WEwa<Jtc}F0J_~S7Z(>e=jio%Jb3V+WIT!@27>{r
zisyMnvx?)GtE($otybaGYy@J()PYM=V3|lBJ$h6!GHo>X0AMniFc=K*eZS;oj&{3U
zTCb|JDKMu<k%DRwR>918{rWY&?^k}W)oLs+FP8{RJ5cliG*1Db{=x)?!y&3V_kLJg
zTf;dwLwcqPOfw+@l9l1hmoK@wxdEWl=`a`!Xf~TT=eWMUW^ZqgD2nD955th9rKK6~
zE33d%K{Jt%=4fYUr?hc>eSPMjT<wc`pYNM(L{5tcz~W`-c^*lURDSFC`<3T}VOWm9
zO_DMa%@;3DV4nCO6<`$_jYhQw%qeL)J<N=Lzh7ve+wF38b_T%1hYz{DykvKGmwLU<
zcsyQ+Y>w%wNC~)qG+;v7l+5V$dZmrinpjy`!ORH55a0JJb6thJEb|C>kZM3P66vr)
zske<JN!Zxf0JwFnh|q4gaZ{IFN+8y>J871RtWzyIRF%!mO@bhpyT<o@I-O2IwDLMG
z8cKE<ou8i*$1$x|i{Wrs8Pe_TZECd|p69W(wZ(WmW;`Aj{UHbf8jS|^dY#E+f|=oY
zURi`mqFEy{3<FP4)q*jkH9ZfSkx!BY-}hNvUB&nP!uvRm8I4Az^%Yf+_W=QY`_IJN
zkR-|6zK~-k1&MiBP^Z>Ry>z218jZ$#5m*#O1Vlu>{p{2D#~*$!b&ZcUez{iyBJxT^
yM6&W|03qoQ*?$28A~PGw`{w$t;N8CDe(^URxCs@EbDL2B0000<MNUMnLSTYG_2jJp

diff --git a/core/img/filetypes/x-office-presentation.svg b/core/img/filetypes/x-office-presentation.svg
index 534e695537e..4df4b40135b 100644
--- a/core/img/filetypes/x-office-presentation.svg
+++ b/core/img/filetypes/x-office-presentation.svg
@@ -1,108 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="q" x1="24" gradientUnits="userSpaceOnUse" y1="3.5542" gradientTransform="matrix(.72973 0 0 .56757 -1.5146 3.3784)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".11257"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="p" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.82857 0 0 .49975 -3.8857 4.2392)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="o" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.66907 0 0 .46769 45.34 3.6823)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019278 0 0 .0082353 17.982 24.981)" r="117.14"/>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019278 0 0 .0082353 14.018 24.981)" r="117.14"/>
-  <linearGradient id="n" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.056331 0 0 .0082353 -4.3598 24.981)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="m" x1="24" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.66892 0 0 .56757 -1.179 3.3784)" y1="5.5641" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.3251e-7 3.4517 -6.6326 -1.0361e-7 81.872 -26.173)" r="12.672">
-   <stop stop-color="#f9c590" offset="0"/>
-   <stop stop-color="#f19860" offset=".39698"/>
-   <stop stop-color="#ce5d36" offset="1"/>
-  </radialGradient>
-  <linearGradient id="l" x1="25" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(.81963 0 0 .52284 -3.8316 5.2358)" y1="47.935" y2=".91791">
-   <stop stop-color="#71171c" offset="0"/>
-   <stop stop-color="#ed8137" offset="1"/>
-  </linearGradient>
-  <clipPath id="r">
-   <path style="color:#000000" fill="#FFF" d="m10.751-0.72642 19.105 0.025195v10.481l-19.105-0.025202z"/>
-  </clipPath>
-  <linearGradient id="k" x1="22.004" gradientUnits="userSpaceOnUse" y1="63.218" gradientTransform="matrix(1.3394 0 0 -1.9826 -11.198 94.863)" x2="22.004" y2="25.647">
-   <stop stop-color="#AAA" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="25.132" gradientUnits="userSpaceOnUse" y1="15.285" gradientTransform="matrix(1.0813 0 0 .62485 -6.1735 -3.6471)" x2="25.132" y2="37.546">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="-51.786" gradientUnits="userSpaceOnUse" y1="41.798" gradientTransform="matrix(.87314 0 0 .58477 58.066 -4.3435)" x2="-51.786" y2="17.555">
-   <stop stop-color="#AAA" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="14.203" gradientTransform="matrix(1.0821 0 0 .61449 -5.648 -2.5358)" x2="24" y2="35.721">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="25.132" gradientUnits="userSpaceOnUse" y1="15.285" gradientTransform="matrix(1 0 0 .95617 -.49906 -2.93)" x2="25.132" y2="37.546">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" x1="-51.786" gradientUnits="userSpaceOnUse" y1="41.798" gradientTransform="matrix(.80750 0 0 .89483 58.911 -3.9957)" x2="-51.786" y2="17.555">
-   <stop stop-color="#AAA" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" x1="24" gradientUnits="userSpaceOnUse" y1="14.203" gradientTransform="matrix(1.0351 0 0 .98662 -.70292 -2.17)" x2="24" y2="35.721">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <rect opacity=".15" height="2" width="27.2" y="28" x="2.4" fill="url(#n)"/>
-  <path opacity=".15" fill="url(#c)" d="m2.4 28v1.9999c-0.9928 0.004-2.4-0.448-2.4-1s1.1078-1 2.4-1z"/>
-  <path opacity=".15" fill="url(#d)" d="m29.6 28v1.9999c0.99276 0.0038 2.4-0.44808 2.4-1.0001 0-0.552-1.1078-0.99982-2.4-0.99982z"/>
- </g>
- <g stroke-linejoin="round" opacity=".5" clip-path="url(#r)" transform="matrix(1.6122 0 0 1.1261 -16.324 -7.0129)">
-  <path style="color:#000000" d="m13.531 7.5891h13.037v24.901h-13.037z" stroke="url(#f)" stroke-width=".74211" fill="url(#g)"/>
-  <path opacity=".6" style="color:#000000" d="m14.31 9.4115h11.413v22.194h-11.413z" stroke="url(#e)" stroke-width=".74211" fill="none"/>
- </g>
- <g stroke-linejoin="round" transform="translate(0,1)" stroke-width=".99992">
-  <path opacity=".75" style="color:#000000" d="m3.5 2.5 25 0.037621v16.962h-24.859z" stroke="url(#i)" fill="url(#j)"/>
-  <path opacity=".45" style="color:#000000" d="m4.5 3.5 23 0.016517-0.11298 14.984h-22.701z" stroke="url(#h)" fill="none"/>
- </g>
- <g>
-  <path stroke-linejoin="round" d="m1.5 5.5c6.6454 0 29 0.00149 29 0.00149l0.000036 22.999h-29v-23z" stroke="url(#o)" stroke-width=".99992" fill="url(#p)"/>
-  <path d="m29.5 27.5h-27v-21h27z" stroke="url(#q)" stroke-linecap="round" fill="none"/>
-  <path stroke-linejoin="round" style="color:#000000" d="m6 28.5h-4.3138c-0.3495-0.27233-0.083736-0.81302-0.16678-1.1986v-21.669l0.048743-0.093529 0.11803-0.038626h4.2551" stroke="url(#l)" fill="url(#b)"/>
- </g>
- <g fill="none">
-  <path opacity=".5" stroke-linejoin="round" d="m5.5 27.5h-3v-21h3" stroke="url(#m)" stroke-linecap="round"/>
-  <g stroke="#AAA" stroke-width="1px">
-   <path d="m11 8.5h4"/>
-   <path d="m16 8.5h2"/>
-   <path d="m19 8.5h1"/>
-   <path d="m21 8.5h2"/>
-  </g>
- </g>
- <g transform="matrix(1.1415 0 0 1.1415 -13.519 -19.587)">
-  <path opacity=".4" style="color:#000000" fill="#FFF" d="m34.75 25.813a3.8795 3.8795 0 1 1 -2.0522 -3.4222l-1.8273 3.4222z" transform="matrix(1.5701 0 0 1.5701 -16.478 -6.8527)"/>
-  <path opacity=".15" style="color:#000000" d="m34.75 25.813a3.8795 3.8795 0 1 1 -2.0522 -3.4222l-1.8273 3.4222z" transform="matrix(1.5701 0 0 1.5701 -16.478 -7.6015)"/>
- </g>
- <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m7.1562 25v-1h2.2188v1zm2.6562 0v-1h6.3438v1zm-2.6562-4v-1h2.9688v1zm3.7188 0v-1h2.3438v1zm2.9375 0v-1h1.1875v1zm-6.6562-4v-1h3.2812v1zm3.875 0v-1h1.6562v1zm2.2188 0v-1h1.75v1zm-6.0938-4v-1h3.2812v1zm3.9062 0v-1h2.3438v1z" fill="url(#k)"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m1.3438 2c-0.1975 0.0382-0.34736 0.2334-0.3438 0.4375v11.125c0 0.229 0.212 0.438 0.4375 0.438h13.125c0.22555-0.000006 0.4375-0.20846 0.4375-0.4375v-10.953c0-0.3362-0.265-0.611-0.516-0.609zm0.6562 3h12v6h-12z" fill="#f0965f"/>
 </svg>
diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png
index 9efe6f29501a07539a1b855ed89850fcd83f404e..bf22ca23f095143043bdd68a98f7d4b892376a74 100644
GIT binary patch
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=2J3`p($nGkdS^ti687
zNP;DD4N#h+B*-tA!N}6-^@q=2b}Z{+0g4%Ux;Tb#L?<USH23uN@wp2ydz5d{a*&ig
ys=(&V%<OF4bCGfKD+fVEPp)Gf4AE@`EDTal6zzJ8k30hEX7F_Nb6Mw<&;$U@2s7yb

literal 715
zcmV;+0yO=JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007#Nkl<ZScTP9
z&ubGw7=5!YIRxrOF;c0CdJ%1fihA%D<mk<RA%B2}96f{(a`0q4c<~_A+zVPn+7fZ8
zvDj**&;*;7q-_#V+kh1ll8|m^Jk(BRHpym_Oa;HoesAXSeQ&<EJ4+a25W_HxAB-^%
zjvxpj+kU_Qw78~QNt9BL-|vT}X-b<@N?{mA%fVU%Fvd`?*I}BbQUSWI!#ZsMXgMZh
ztSxcS=v24u1dc*PPXfeeC=_zsq}rfxyX2upqtTYyT?JUx27(U(025Ch;a=bYU(at9
z;q{GhoJwafHhS@I9bo3gQ|Ul`3n<qbJpWm)@%&q97egmba$Ko3q<!(!0|}UX_L%33
zlg}moVtS6}rOF<D30Rqc@%sS)!1AjJgu`LJ{{GVn?%uf45l14C{sdTKEwe5)IgGE_
zyu`C&C$$|-z<1&NL4(XZ?pz;ha=~n|G5u1F1^bjq`&MozEb{xl2LK?up5?h{!D=oK
z2sN#^onS`-tZL7m^8o-ha|^hAZM4Y+v&D0>Q@u}sQrbc`6<I(j?Jl6*1h%p{0KhQ-
z$<HaizM3moEGTreV4%-%*y{xVY!{ZK5d*Nr$;9ifwH-~MqXl5LSmY1%85TD-0RV0Q
z$)%<RnOsrgS+Oz!o{@t;UitenZe6`BkYS7G-@Z|G5m9Ns+3z1%P;F4`<_iD-v$BT|
zU(%erwjqz)imMGexB$0H!_e><0Kk4}1vkep31ryfkME}cQwv%mHOtdjEGBI&7&APt
zHmHQ1)b2WgU@+LRpp#Hyfr{u!fUfIsxm-#G9RB2N1rS2Ccs#z7NF+`v?cS`vLkQ6r
xWBjcqqAEfN0dU+ZOktP+elwvdQSEiF@driO)bkoTregpA002ovPDHLkV1jx`LQwz!

diff --git a/core/img/filetypes/x-office-spreadsheet.svg b/core/img/filetypes/x-office-spreadsheet.svg
index aae8f3c95ca..aac8c4e3f73 100644
--- a/core/img/filetypes/x-office-spreadsheet.svg
+++ b/core/img/filetypes/x-office-spreadsheet.svg
@@ -1,63 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="j" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="b">
-   <stop stop-color="#a3c0d0" offset="0"/>
-   <stop stop-color="#5a8caa" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="19.515" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="12.443" gradientTransform="matrix(.66298 0 0 .53532 -.83153 1.3896)" x2="19.515" y2="46.562"/>
-  <linearGradient id="f" x1="19.515" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="12.443" gradientTransform="matrix(.53480 0 0 .65680 2.2155 -.57398)" x2="19.515" y2="46.562"/>
- </defs>
- <g>
-  <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#e)"/>
-  <path opacity=".15" fill="url(#c)" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z"/>
-  <path opacity=".15" fill="url(#d)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/>
- </g>
- <path stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="url(#h)" stroke-width=".99992" fill="url(#i)"/>
- <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#j)" stroke-linecap="round" fill="none"/>
- <path d="m8.5605 7.7356h3.0828v17.645h-3.0828v-17.645z" fill="url(#f)"/>
- <path d="m11 6h12.036v2h-12.036v-2z" fill="url(#g)"/>
- <rect y="5.9254" width="3.0786" fill="#c0d4df" x="8.0005" height="2.0746"/>
- <g fill="none">
-  <path d="m15.5 5.5v20" stroke-opacity=".32418" stroke="#2c465d"/>
-  <path d="m23.333 8.5h-14.667" stroke="#6c6c6c"/>
-  <g stroke-opacity=".32418" stroke="#2c465d">
-   <path d="m23.334 10.5h-14.667"/>
-   <path d="m23.5 13.5h-15"/>
-   <path d="m23.5 16.5h-15"/>
-   <path d="m23.5 19.5h-15"/>
-  </g>
- </g>
- <path opacity=".2" stroke-linejoin="round" d="m8.5005 6.5093 13.946-0.0186" fill-rule="evenodd" stroke="#FFF" stroke-linecap="square" fill="#FFF"/>
- <g fill="none">
-  <path d="m11.5 5.5v20" stroke="#6c6c6c"/>
-  <rect height="19.998" width="14.998" stroke="#6c6c6c" stroke-linecap="square" x="8.5011" y="5.5011" stroke-width="1.0022"/>
-  <path d="m23.5 22.5h-15" stroke-opacity=".32418" stroke="#2c465d"/>
-  <path d="m19.5 5.5v20" stroke-opacity=".32418" stroke="#2c465d"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0.000005 0.22905 0.20608 0.43749 0.43164 0.4375h11.139c0.22556-0.000006 0.43163-0.20845 0.43164-0.4375v-10.143c-0.004-0.06684-0.02269-0.1329-0.05469-0.19141l-3.3125-3.1992c-0.043-0.0164-0.08876-0.025544-0.13477-0.027344h-8.0684c-0.02684-0.0026-0.055194-0.0026-0.082028 2e-7zm1.6504 2.998h2v2h-2zm3 0h5v2h-5zm-3 3h2v2h-2zm3 0h5v2h-5zm-3 3h2v2h-2zm3 0h5v2h-5z" fill="#9abd4e"/>
 </svg>
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index b4de98247d1..e49ace6df73 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -9,23 +9,26 @@
 OC.MimeTypeList={
 	aliases: {
     "application/coreldraw": "image",
-    "application/font-sfnt": "font",
-    "application/font-woff": "font",
-    "application/illustrator": "image/vector",
+    "application/epub+zip": "text",
+    "application/font-sfnt": "image",
+    "application/font-woff": "image",
+    "application/illustrator": "image",
+	"application/javascript": "text/code",
     "application/json": "text/code",
-    "application/msaccess": "database",
+    "application/msaccess": "file",
     "application/msexcel": "x-office/spreadsheet",
     "application/mspowerpoint": "x-office/presentation",
     "application/msword": "x-office/document",
     "application/octet-stream": "file",
-    "application/postscript": "image/vector",
+    "application/postscript": "image",
+	"application/rss+xml": "text/code",
     "application/vnd.android.package-archive": "package/x-generic",
     "application/vnd.ms-excel": "x-office/spreadsheet",
     "application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
-    "application/vnd.ms-fontobject": "font",
+    "application/vnd.ms-fontobject": "image",
     "application/vnd.ms-powerpoint": "x-office/presentation",
     "application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
     "application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -49,58 +52,54 @@ OC.MimeTypeList={
     "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
     "application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
     "application/x-7z-compressed": "package/x-generic",
+    "application/x-cbr": "text",
     "application/x-compressed": "package/x-generic",
     "application/x-dcraw": "image",
     "application/x-deb": "package/x-generic",
-    "application/x-font": "font",
+    "application/x-font": "image",
     "application/x-gimp": "image",
     "application/x-gzip": "package/x-generic",
     "application/x-perl": "text/code",
     "application/x-photoshop": "image",
     "application/x-php": "text/code",
     "application/x-rar-compressed": "package/x-generic",
+    "application/x-shockwave-flash": "application",
     "application/x-tar": "package/x-generic",
     "application/x-tex": "text",
     "application/xml": "text/html",
     "application/yaml": "text/code",
     "application/zip": "package/x-generic",
+    "database": "file",
     "httpd/unix-directory": "dir",
-    "image/svg+xml": "image/vector",
+    "image/svg+xml": "image",
+    "image/vector": "image",
     "text/css": "text/code",
     "text/csv": "x-office/spreadsheet",
-    "text/x-shellscript": "text/code"
+	"text/html": "text/code",
+	"text/x-c": "text/code",
+	"text/x-h": "text/code",
+	"text/x-python": "text/code",
+	"text/x-shellscript": "text/code",
+	"web": "text/code"
 },
 	files: [
-    "text-x-h",
-    "application-rss+xml",
     "video",
     "folder-drag-accept",
-    "application-epub+zip",
     "folder-public",
     "package-x-generic",
-    "application-x-shockwave-flash",
-    "text",
     "folder-external",
-    "web",
     "text-vcard",
     "application",
-    "image-vector",
-    "database",
     "text-code",
-    "text-x-python",
     "x-office-spreadsheet",
     "application-pdf",
     "folder",
     "x-office-document",
-    "text-html",
     "text-calendar",
     "x-office-presentation",
-    "text-x-c",
     "file",
-    "font",
+    "text",
     "folder-shared",
-    "application-x-cbr",
-    "application-javascript",
     "image",
     "audio"
 ],
-- 
GitLab


From 2a935f1b47ed27596ac4a6d8bf5fd911c766d453 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 26 Aug 2015 19:00:42 +0200
Subject: [PATCH 055/783] move log in button into fields and use icon instead
 of text

---
 core/css/styles.css      | 30 +++++++++++++++++++++++++-----
 core/templates/login.php |  9 ++++++---
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index cad407b52ea..1f41af211c5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -456,11 +456,30 @@ input[type="submit"].enabled {
 	padding: 13px;
 	margin: -13px;
 }
-/* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */
+
+/* position log in button as confirm icon in right of password field */
 #body-login #submit.login {
-	margin-right: 7px;
+	position: absolute;
+	right: 0;
+	top: 49px;
+	border: none;
+	background-color: transparent;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	opacity: .3;
+}
+#body-login #submit.login:hover,
+#body-login #submit.login:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+	opacity: .7;
 }
+#body-login input[type="password"] {
+	padding-right: 40px;
+	box-sizing: border-box;
+	min-width: 269px;
+}
+
 #body-login form {
+	position: relative;
 	width: 22em;
 	margin: 2em auto 2em;
 	padding: 0;
@@ -539,10 +558,8 @@ input[name='password-clone'] {
 /* General new input field look */
 #body-login input[type="text"],
 #body-login input[type="password"],
-#body-login input[type="email"],
-#body-login input[type="submit"] {
+#body-login input[type="email"] {
 	border: none;
-	border-radius: 5px;
 }
 
 /* Nicely grouping input field sets */
@@ -783,6 +800,9 @@ label.infield {
 	margin: 24px 5px 0 16px !important;
 	vertical-align: text-bottom;
 }
+#body-login .remember-login-container {
+	text-align: center;
+}
 
 /* Sticky footer */
 #body-login .wrapper {
diff --git a/core/templates/login.php b/core/templates/login.php
index f942e02dc86..0cd76b2b372 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -56,19 +56,22 @@ script('core', [
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 		</p>
 
+		<input type="submit" id="submit" class="login primary icon-confirm" value="" disabled="disabled"/>
+
 		<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
 		<a id="lost-password" class="warning" href="">
 			<?php p($l->t('Wrong password. Reset it?')); ?>
 		</a>
 		<?php endif; ?>
 		<?php if ($_['rememberLoginAllowed'] === true) : ?>
-		<input type="checkbox" name="remember_login" value="1" id="remember_login">
-		<label for="remember_login"><?php p($l->t('remember')); ?></label>
+		<div class="remember-login-container">
+			<input type="checkbox" name="remember_login" value="1" id="remember_login">
+			<label for="remember_login"><?php p($l->t('remember')); ?></label>
+		</div>
 		<?php endif; ?>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
 		<input type="hidden" name="timezone" id="timezone"/>
 		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>">
-		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/>
 	</fieldset>
 </form>
 <?php if (!empty($_['alt_login'])) { ?>
-- 
GitLab


From cea3247d49e2aa0bdf49303a9bffadfb36c44898 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 27 Aug 2015 21:02:00 +0200
Subject: [PATCH 056/783] show feedback spinner for log in process

---
 core/js/login.js         | 24 ++++++++++++++++++++++++
 core/templates/login.php |  3 ++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 core/js/login.js

diff --git a/core/js/login.js b/core/js/login.js
new file mode 100644
index 00000000000..33ec868cb23
--- /dev/null
+++ b/core/js/login.js
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2015
+ *  Vincent Petry <pvince81@owncloud.com>
+ *  Jan-Christoph Borchardt, http://jancborchardt.net
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * @namespace
+ * @memberOf OC
+ */
+OC.Login = _.extend(OC.Login || {}, {
+	onLogin: function () {
+		$('#submit')
+			.removeClass('icon-confirm')
+			.addClass('icon-loading-small')
+			.css('opacity', '1');
+		return true;
+	}
+});
+$(document).ready(function() {
+	$('form[name=login]').submit(OC.Login.onLogin);
+});
diff --git a/core/templates/login.php b/core/templates/login.php
index 0cd76b2b372..50ca6febf08 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -3,7 +3,8 @@
 vendor_script('jsTimezoneDetect/jstz');
 script('core', [
 	'visitortimezone',
-	'lostpassword'
+	'lostpassword',
+	'login'
 ]);
 ?>
 
-- 
GitLab


From e4d0a69126430210fc59f945e73973dd18b9237b Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 27 Aug 2015 21:23:45 +0200
Subject: [PATCH 057/783] position and style remember button on log in page

---
 core/css/styles.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 1f41af211c5..bf6ca519146 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -758,7 +758,7 @@ label.infield {
 	margin: 35px auto;
 }
 #body-login .warning {
-	margin: 0 7px 5px;
+	margin: 0 7px 5px 4px;
 }
 #body-login .warning legend {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
@@ -797,8 +797,10 @@ label.infield {
 	padding: 10px 20px; /* larger log in and installation buttons */
 }
 #remember_login {
-	margin: 24px 5px 0 16px !important;
+	margin: 18px 5px 0 16px !important;
 	vertical-align: text-bottom;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+	opacity: .7;
 }
 #body-login .remember-login-container {
 	text-align: center;
-- 
GitLab


From 8fc7a3dc80edee0e4ac4347dfb019e783876c860 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 27 Aug 2015 21:29:29 +0200
Subject: [PATCH 058/783] use simpler logo for log in page

---
 core/css/header.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/css/header.css b/core/css/header.css
index 5630f96953f..369750251c4 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -70,8 +70,10 @@
 }
 
 #header .logo {
-	background-image: url(../img/logo.svg);
+	background-image: url(../img/logo-icon.svg);
 	background-repeat: no-repeat;
+	background-size: 175px;
+	background-position: center 30px;
 	width: 252px;
 	height: 120px;
 	margin: 0 auto;
-- 
GitLab


From ab8727493037731162563632bd05870c610d202d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 27 Aug 2015 22:23:08 +0200
Subject: [PATCH 059/783] Use certificates that expire in 10 years

:speak_no_evil: :speak_no_evil: :speak_no_evil:
---
 tests/data/certificates/badCertificate.crt  | 31 +++++++++++-------
 tests/data/certificates/goodCertificate.crt | 35 +++++++++++++--------
 tests/lib/security/certificate.php          | 15 ++++-----
 3 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/tests/data/certificates/badCertificate.crt b/tests/data/certificates/badCertificate.crt
index dcb1895fbad..c61c1e6aec6 100644
--- a/tests/data/certificates/badCertificate.crt
+++ b/tests/data/certificates/badCertificate.crt
@@ -1,13 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIICATCCAWoCCQDNdmb4pJrUeDANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB
-VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMB4XDTE0MDgyNzA4NDg1MVoXDTE1MDgyNzA4NDg1MVowRTELMAkG
-A1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0
-IFdpZGdpdHMgUHR5IEx0ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvrMe
-x5D45HVMV2U4kqTU0mzHAihHT6r+OtO6g7S9yIlJZGGVcEet6An78Ow7aYM141eI
-Jfbvqql7OIblHXSw7mvkw4bOQ1ee5lmJYOYCgaMNJ6mBLJfpK9xwidb0ZvhWOA8P
-DLIiBKA3T5ChXCzilD5GF2+H/BXBE9lL9tuDjM0CAwEAATANBgkqhkiG9w0BAQUF
-AAOBgQCJwfJe7j+aNkopw+P8uxobfOnMWU9XC4Pu+39TVLeakeSqu2Y8vJSHmkjF
-WK3VXAJr33Eul5VP/3SWGwuRPd9X4i4iLh1gJfYvi9MJf1lQNYncGCM+xtdrNu2O
-u0yexkOBRrapDYjcv58BiOaFgvFLquKvtVj9HlcYRfwfM77uKQ==
+MIIDtTCCAp2gAwIBAgIJAJ9c5xX3Bf7cMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQwHhcNMTUwODI3MjAxOTEzWhcNMjUwODI0MjAxOTEzWjBF
+MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
+ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApYxB04E1rGUCopazf8PsW+3EYrX8J1Ze4g3jRJEmzqHLB4+T4h45LwLl
+D7OLJCLdYA8sfEruInokNV1oUBGDwBWdZA1w7d4o7Wgwiz7WE0FQwkA7YpvtKK2K
+Xvv5wltdUzI+WpbfhHzlg8XIDCPA0ayWx2CDyqsHMXYNOvov1vPbIASF0nBGnRSK
+5Eu7KUKK5UkO8+G6RqBwxQkd/tB2GV68npls++QzA0nf3IIHcc+yNQqaMnb5CVxg
+z2i98VuvCPzYY/EWHkIGdSSKRqRG4sqRegb6d/qf46NfjVYLziLfsFGFH4fLVy6n
+IxkP0gdnoTGu8K8H6wm57GViGLLsPwIDAQABo4GnMIGkMB0GA1UdDgQWBBRrMYy8
+SOqiMiVdo/dfyN6yftK+jzB1BgNVHSMEbjBsgBRrMYy8SOqiMiVdo/dfyN6yftK+
+j6FJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
+BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAJ9c5xX3Bf7cMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHargAErj8TAhMfozjgqRihCSOIO5DX7
+W/7mBImP6B76ctP+PWzEaGrOPO81WR5apZP72cwnXD6WABKd1YhMSyr2NI++y5jP
+c3KF/3MpGu4ZYV39JUVpfeq5Fzu9d9C49tj384vljixsxeaCUKuZYqyPuHeGr14u
+7UytsqYORRy/rG4xm0mhk/srOzKJlRenSc9QiWH2Mxst55+cj7zXXFG54N7rI3UU
+9e4Lc2NHQLv3Xv6FunC9mB/AUuEcI6XS6CqNyzAtPAvbO6MZGwUft/S/2TAyqJB0
+VsXK3j3X8DJCwruNLGA3Q/TAYHqrElYg8N4b6w4LD91WbrRyWvkCXmM=
 -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/tests/data/certificates/goodCertificate.crt b/tests/data/certificates/goodCertificate.crt
index 4a5d7bd32fe..4072c8db2dc 100644
--- a/tests/data/certificates/goodCertificate.crt
+++ b/tests/data/certificates/goodCertificate.crt
@@ -1,15 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIICazCCAdQCCQCySF7HjQD78DANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJD
-SDEPMA0GA1UECBMGWnVyaWNoMQ8wDQYDVQQHEwZadXJpY2gxFjAUBgNVBAoTDW93
-bkNsb3VkIEluYy4xETAPBgNVBAsTCFNlY3VyaXR5MR4wHAYDVQQDExVzZWN1cml0
-eS5vd25jbG91ZC5jb20wHhcNMTQwODI3MDg0NTUyWhcNMTUwODI3MDg0NTUyWjB6
-MQswCQYDVQQGEwJDSDEPMA0GA1UECBMGWnVyaWNoMQ8wDQYDVQQHEwZadXJpY2gx
-FjAUBgNVBAoTDW93bkNsb3VkIEluYy4xETAPBgNVBAsTCFNlY3VyaXR5MR4wHAYD
-VQQDExVzZWN1cml0eS5vd25jbG91ZC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBAL55lB4RvU0pTyh7YsLCxPBq43xxkRZBxfZENoflCIUsBo7/mXNz2zVO
-476oQ4L47heUOX3j8kemOgPmWEqA34JB8rusijCy5WqFBLnm4HsRLa66i+Jgd+Yl
-QhcKvhGas1K/CVTG4oSLoAmA2coZUL94uxnRtd8aluflHMNGApIlAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADgYEADo08zWdOtIvCKFDnLbzRwIjSYTlAtQtQaULv7KQe3qIn
-iaFAi6fAynHfdC8/2tvmSeniw0OZBkrfVGIVtUbwCSrljNSUY/lWrUR0pE61lb4r
-DpX0JZjlk48XEaErRVDfu3wq6n/2nYg6HnaLOPwt8OSYYrxzvXlFPrKBH3q6R+M=
+MIIEADCCAuigAwIBAgIJAN0NPgU09qt9MA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNV
+BAYTAkNIMRIwEAYDVQQIEwlTdC5HYWxsZW4xGjAYBgNVBAoTEW93bkNsb3VkIFNl
+Y3VyaXR5MR4wHAYDVQQDExVzZWN1cml0eS5vd25jbG91ZC5jb20wHhcNMTUwODI3
+MjAwMzQyWhcNMjUwODI0MjAwMzQyWjBdMQswCQYDVQQGEwJDSDESMBAGA1UECBMJ
+U3QuR2FsbGVuMRowGAYDVQQKExFvd25DbG91ZCBTZWN1cml0eTEeMBwGA1UEAxMV
+c2VjdXJpdHkub3duY2xvdWQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAlxdUFrwhvT+Exp78Nk0A8Zpfi9/XoLyQkKWH162HX++mxtGXrFKAl5PT
+fKRAv0VqY8hincT+6AlzQkdtiOi5OSVFJpeubtSKrShJQyDKmGLlDntanfLc69GT
+EhkznHmA8AeQMK/NApQpOSC+nmdxpu1aKk7QkSYfpmZ41HF8zKWJTyXzFPZGKw+l
+YxfzIxmUMIIZvfeWE3hq3qlJcS+KO8NcCHEpoiVvZp7PpfDTnyOQVjSkWg55c4j6
+cqNgJ93WTOTOE+3D1XF43Oo+0VQivJn7/tQmIOAg+YyL3Sjmzjb8sP0ksx17vpLO
+Z73UShJw5AGtoaS4oQkSd/+qYBwQMwIDAQABo4HCMIG/MB0GA1UdDgQWBBSG7JAe
+KoR82sQ60QhMNWdU4qY6YzCBjwYDVR0jBIGHMIGEgBSG7JAeKoR82sQ60QhMNWdU
+4qY6Y6FhpF8wXTELMAkGA1UEBhMCQ0gxEjAQBgNVBAgTCVN0LkdhbGxlbjEaMBgG
+A1UEChMRb3duQ2xvdWQgU2VjdXJpdHkxHjAcBgNVBAMTFXNlY3VyaXR5Lm93bmNs
+b3VkLmNvbYIJAN0NPgU09qt9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBAJL9LKzWSJCTG0r+pNXw6Xy2DW9xbi3YsUeelkMKMqurmiH59P90juOJQgIC
+B1Jcn/U0rzpJpolI3jJNjHzs/kI4MDkzcKGV84Pqwj+PSdMFK3OCWH/J81lUhrCj
+H3yguZ/JpAisInVeBqg6lRf0X+S8jJIp4ZP2XZJsX70XgkRsEaC9TrlxtFsm839t
+WhroMb25Njm9eAdSYrx5PFDwN8TtJlb5Ve3uZL8D0uBv+p0kWjkt1TrDk2x78F6b
+5ExmE9+APc0gcLtSVwIGX6FDXOcOA8ndkp7p4K0CDnMZfFAU0oKxvnDxehrVKQEL
+os/cq7EKmmsY/rM0uJ6L0ka4WUk=
 -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/tests/lib/security/certificate.php b/tests/lib/security/certificate.php
index 7fc8bbbdf25..81d159ebd52 100644
--- a/tests/lib/security/certificate.php
+++ b/tests/lib/security/certificate.php
@@ -61,29 +61,26 @@ class CertificateTest extends \Test\TestCase {
 	}
 
 	public function testGetOrganization() {
-		$this->assertSame('ownCloud Inc.', $this->goodCertificate->getOrganization());
+		$this->assertSame('ownCloud Security', $this->goodCertificate->getOrganization());
 		$this->assertSame('Internet Widgits Pty Ltd', $this->invalidCertificate->getOrganization());
 	}
 
 	public function testGetIssueDate() {
-		$expected = new DateTime('2014-08-27 08:45:52 GMT');
+		$expected = new DateTime('2015-08-27 20:03:42 GMT');
 		$this->assertEquals($expected->getTimestamp(), $this->goodCertificate->getIssueDate()->getTimestamp());
-		$expected = new DateTime('2014-08-27 08:48:51 GMT');
+		$expected = new DateTime('2015-08-27 20:19:13 GMT');
 		$this->assertEquals($expected->getTimestamp(), $this->invalidCertificate->getIssueDate()->getTimestamp());
 	}
 
 	public function testGetExpireDate() {
-		$expected = new DateTime('2015-08-27 08:45:52 GMT');
+		$expected = new DateTime('2025-08-24 20:03:42 GMT');
 		$this->assertEquals($expected->getTimestamp(), $this->goodCertificate->getExpireDate()->getTimestamp());
-		$expected = new DateTime('2015-08-27 08:48:51 GMT');
+		$expected = new DateTime('2025-08-24 20:19:13 GMT');
 		$this->assertEquals($expected->getTimestamp(), $this->invalidCertificate->getExpireDate()->getTimestamp());
 		$expected = new DateTime('2014-08-28 09:12:43 GMT');
 		$this->assertEquals($expected->getTimestamp(), $this->expiredCertificate->getExpireDate()->getTimestamp());
 	}
 
-	/**
-	 * Obviously the following test case might fail after 2015-08-27, just create a new certificate with longer validity then
-	 */
 	public function testIsExpired() {
 		$this->assertSame(false, $this->goodCertificate->isExpired());
 		$this->assertSame(false, $this->invalidCertificate->isExpired());
@@ -97,7 +94,7 @@ class CertificateTest extends \Test\TestCase {
 	}
 
 	public function testGetIssuerOrganization() {
-		$this->assertSame('ownCloud Inc.', $this->goodCertificate->getIssuerOrganization());
+		$this->assertSame('ownCloud Security', $this->goodCertificate->getIssuerOrganization());
 		$this->assertSame('Internet Widgits Pty Ltd', $this->invalidCertificate->getIssuerOrganization());
 		$this->assertSame('Internet Widgits Pty Ltd', $this->expiredCertificate->getIssuerOrganization());
 	}
-- 
GitLab


From 589b066c4cc4bd44539e2257b85f674f4832a140 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 27 Aug 2015 23:09:32 +0200
Subject: [PATCH 060/783] restore behavior where favorite stars only show up on
 hover, to not clutter the interface so much

---
 apps/files/css/files.css  | 4 ++--
 apps/files/css/mobile.css | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 4a56490fe0f..25a3df53050 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -616,13 +616,13 @@ a.action > img {
 }
 
 /* show share action of shared items darker to distinguish from non-shared */
-#fileList a.action.permanent.shared-style {
+#fileList a.action.permanent.shared-style,
+#fileList a.action.action-favorite.permanent {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
 	filter: alpha(opacity=70) !important;
 	opacity: .7 !important;
 }
 /* always show actions on mobile, not only on hover */
-#fileList a.action,
 #fileList a.action.action-menu.permanent {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)" !important;
 	filter: alpha(opacity=30) !important;
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index c5507a1e268..0641304d211 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -43,6 +43,14 @@ table td.filename .nametext {
 #fileList a.action-share span {
 	display: none;
 }
+#fileList a.action.action-favorite {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
+	opacity: .7 !important;
+}
+#fileList a.action.action-favorite {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)" !important;
+	opacity: .3 !important;
+}
 
 /* ellipsis on file names */
 table td.filename .nametext .innernametext {
-- 
GitLab


From 49140865006046e8aaa7d861de45c06a2d6227b7 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 27 Aug 2015 23:16:53 +0200
Subject: [PATCH 061/783] fix png fallbacks of triangle icons

---
 core/img/actions/caret-dark.png | Bin 151 -> 128 bytes
 core/img/actions/caret.png      | Bin 147 -> 127 bytes
 core/img/actions/triangle-e.png | Bin 176 -> 149 bytes
 core/img/actions/triangle-n.png | Bin 147 -> 128 bytes
 core/img/actions/triangle-s.png | Bin 151 -> 128 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
index 8f25a9bbb4385c6e5f12fe25d1429638c51241ce..97c64c6a7203c89f8a0074a13bb53bb5a1d319ce 100644
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE09J8{(R4Sfqa&dAirRS
z@`etpv)y7qzKo}fV@L&K@&fsU6h`JW6TvhS(=#h}&6pwaf|EgYC4=M7mb_CSb39%B
KT-G@yGywoK&l{fr

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyLIFM@u0R?MJkXY01QcQ|3GxeO
zC~xTK+|;q=GEhL@)5S5Qf-za5CPBnt(;@~jCaoEqGY<M35KCivm!S3_D2=Hu@!0!l
fwPlXdf{Pg#4#+cFP1&`c6J)%ntDnm{r-UW|;0h%L

diff --git a/core/img/actions/caret.png b/core/img/actions/caret.png
index e5806aa627ab2b9078c2c5c0cfffebbf0949b224..3a8dd99176d6956dae065e0e274cb146382236d4 100644
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2VGmzZ%#=aj&@dx;XxB}__NTA>8UItKzr6kBN
zn4!F(!|H6e7?3aR>Eakt!I-STBN2I^LGoN$TetDyD+Y#!0?Z8j*BKncs}_N@F?hQA
KxvX<aXaWFY87K(=

literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQaLIFM@u0Z-fDzFP$YXuZ#EeY}q
zW+-py=-kw?<}y$~+tbA{q=GS7BICe`E~bbL9Y)E4r+bdFr0F~}O5WHjd6}2PkR>50
cNkWE!LFEmjRiDg@HlQ{JPgg&ebxsLQ0Qb%^s{jB1

diff --git a/core/img/actions/triangle-e.png b/core/img/actions/triangle-e.png
index 90897e0fecd6f46b993eef4bb077b1c375c47c9f..4ce1086f61d4f9ea9333f695407831e2b800819f 100644
GIT binary patch
literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDU1=3hSn7ND=P=dWA$S;_o
zzM;LN^Pi#A-CCfKs;7%%2uE~sf&!n!0g06cZo8O!0+~{$h#!(*3SjeTaAZ8Dz`~&A
V%OdgnTflCR;hwI3F6*2UngEeTAIty%

literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy(g8jpu0R?Wm=gF%0Vu~&666=m
zP~Xtr(fRjZ@A?u>pqP!Pi(^Q|t+%Ik@-is!9B}x|vg!YkCGID<A6z^BK2Kq-!GuHw
x=Z22CS49Gx95|WZ@;*tH|9#`Q-M5#2;$&ahF+LFB>wg2X*VEO{Wt~$(69B9}G>!lO

diff --git a/core/img/actions/triangle-n.png b/core/img/actions/triangle-n.png
index ca5e1868253a8176d748150be5be8a063002065e..2042d66532c01d7266d157a7c665bd7301321405 100644
GIT binary patch
delta 91
zcmbQt*ubdR8Q|y6%O%Cdz`(%k>ERLtqy<2jgBeI_=<)|oRMaz+@pN$vsbEZApq-H7
p_IUFKgT)^MU1l`IY~Z-dz@Tu7!O8a4g<U}P44$rjF6*2UngEVE7+nAW

delta 110
zcmZo*oXn`$8Q|y6%O%Cdz`(%k>ERLtq!mDzgBeJ=Ea^HnQBluD-_yl0q=ND7DMcor
z%+Y|7-T!Cmrq!u#_!X9XoA2P%2VNhZ?fA#BjwQTF+jQMq#`o_TSv|cAd4NVRc)I$z
JtaD0e0sx8jBWC~r

diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
index 8f25a9bbb4385c6e5f12fe25d1429638c51241ce..97c64c6a7203c89f8a0074a13bb53bb5a1d319ce 100644
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE09J8{(R4Sfqa&dAirRS
z@`etpv)y7qzKo}fV@L&K@&fsU6h`JW6TvhS(=#h}&6pwaf|EgYC4=M7mb_CSb39%B
KT-G@yGywoK&l{fr

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyLIFM@u0R?MJkXY01QcQ|3GxeO
zC~xTK+|;q=GEhL@)5S5Qf-za5CPBnt(;@~jCaoEqGY<M35KCivm!S3_D2=Hu@!0!l
fwPlXdf{Pg#4#+cFP1&`c6J)%ntDnm{r-UW|;0h%L

-- 
GitLab


From f967a1df6810daa6c05a8c1f3fcbb8bb3a99c58f Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 28 Aug 2015 00:53:27 +0200
Subject: [PATCH 062/783] fix filetype icons elsewhere, empty page, sidebar,
 apps menu

---
 apps/files/img/folder.png  | Bin 303 -> 135 bytes
 apps/files/img/folder.svg  |   4 ++--
 apps/files/img/star.png    | Bin 490 -> 492 bytes
 apps/files/img/star.svg    |   6 +++---
 core/css/icons.css         |   8 ++------
 core/img/places/file.png   | Bin 174 -> 0 bytes
 core/img/places/file.svg   |   5 -----
 core/img/places/files.png  | Bin 172 -> 155 bytes
 core/img/places/files.svg  |   4 +++-
 core/img/places/folder.png | Bin 326 -> 0 bytes
 core/img/places/folder.svg |   6 ------
 11 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 core/img/places/file.png
 delete mode 100644 core/img/places/file.svg
 delete mode 100644 core/img/places/folder.png
 delete mode 100644 core/img/places/folder.svg

diff --git a/apps/files/img/folder.png b/apps/files/img/folder.png
index 4a8861f25ca0bc4709493b03f005491a0ba571d3..3dfb4391f2cde95313b8fd10b3193604f95bbabf 100644
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=3+9Gee4Ig%*R5Hg9(&
zP>7`@$S;_oq2v8T&j}lVd}U7;#}JO0$q5G-&gkheC9rjOcMJD0GO-!7F)!swo6#u2
Zz@YU{_@S@KKP{kg22WQ%mvv4FO#rUjB!B<_

literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI13?%1G+4BcTB?S0{xB_XKf?xhGdVv<mmjw9*
zGcdDq2q-EktEijVxP->UCa2Xlt=PJ4_n}jdp1=I^ZMU*&0#IqZr;B4q#jUGnZt^)8
z2sm7HoVuti>;3=#OOF_FE_Ql!wAS`y>+U%g(Lz&}#05{8)GKAYRVLYE$wbA8d(=%>
z|IFyU(kMNbYwg^kPgByo{yW)<s9k!RpzwzE=hR&*#6DCSyS&z$aayht>}yX~KbLh*
G2~7Y(dQVsY

diff --git a/apps/files/img/folder.svg b/apps/files/img/folder.svg
index 4411b065c1c..e9d96d40490 100644
--- a/apps/files/img/folder.svg
+++ b/apps/files/img/folder.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="matrix(.86667 0 0 .86667 -172.04 -864.43)" fill-rule="evenodd">
-  <path style="" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2327 0.53125-0.5312l0.0004-8.1661c0-0.289-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.2771-0.30237 0.5638-0.57937 0.5638s-0.57447-0.2867-0.57447-0.5638l0.0004-7.0055c0-0.2771 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
+ <g fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.05 -864.43)" fill="#55739a">
+  <path d="m200.2 999.72c-0.28913 0-0.53125 0.2421-0.53125 0.53117v12.784c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53124-0.2327 0.53124-0.5312l0.0004-10.474c0-0.2889-0.24211-0.5338-0.53124-0.5338l-7.5457 0.0005-2.3076-2.3078z" fill-rule="evenodd" fill="#55739a"/>
  </g>
 </svg>
diff --git a/apps/files/img/star.png b/apps/files/img/star.png
index 3c66c49a8c4e07667790aa1e0597229a67ece20b..22e68c757e79535d4378a7e7539b5f6e99dfb401 100644
GIT binary patch
literal 492
zcmV<I0Tcd-P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX0005ANkl<ZIE}5<
zze|--9LMq3_tAt)iRluwG&E#LrB~76MkO>gv{XYyYlBNr&_5B;);}N(EeQ=S{Q*He
z71@t5C~61{1Q89do(3(iK9}w>`@rEm=lkRRd^zWPIFVA4r817`(rYA@IpN)TRD>z(
zYRCddR>gC%->Pruvf{8tTI`fk<osRJb@btYnyWb}dEjKK<@@IU0hiIhsTRwqS5e<P
zI9jURvURMwn<%`~=cj&!e(MG{=YC-Tmn&JxHD&z3{GX9F$Etaav>2&$2lo&itIt!y
z-HmoD<B~9q+8&`x!VUE_v(?9Cj0;b3=pUh96fPP`Z)rWevGhV=0v~pbOrC2R{|(&^
zhLQ9c4Lr++hG_>)nn>TbncH6JkI`e<g3f!s?2}$s(%Mc(`#xSVm;r^FqlVi#+JlqH
z4Csc|oyiAtu8nOO3l(cPn+cABO7N^TLz)I9k9YV^6P3$VJ-nAOtng-Y^;Ni~o}O%r
zDdU3h5Jy0A!dQC$_lm<Lnz*m#cm)b$Y1TeN!UL>{>ONPWrqCmds;9Y%uT>}05^j4P
ik0j?SnC!=Nm-+?#L4wF;-O0HC0000<MNUMnLSTZjo#>zd

literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F00004b3#c}2nYxW
zd<bNS00009a7bBm000&x000&x0ZCFM@Bjb+8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10cS}>K~zYIwbnmN98na9;b+$vf`V*}g(7ZaArXW$!NM4#jg^fl
z7wr_%`vFp<NNbncLeM}+;Rmp{NFityNk~K#Edt`AL6c%<$gs>Tb0<4LINbSj&Uw$h
zoSAzG*8rY`22~4yRw6512RK5dOvo$ziEOq^&~^f}Sr%j%w+T=agL#8PnqdvSiTg)b
z4v5dC2l(ONY+^gq<)&Clfy6eGCqV^IF@(pcMPvK*GmK^AIKfw3;5-^H+r~3kz^@J!
z|F1RCh^v~y_Yxo{c;3DQBiQdE<V%O;){oC!fb5_z3lgh>w*>+BcrUQ!-{5xu<QlI-
z07)GOfX+f^6005niESb)S*L&9e1YO#76Hu_02SJ!(mvoDyu&)KQr>?Hg^Z^p*~4VQ
zXB3}O{OTc~)kNT_)?p;8qZaWq;or#cOVt+cw6^O!N2?k(qL>dMpj}Ld1Vnm)k9nP|
g=qUh+^)T(>UjS6k{<<F%9smFU07*qoM6N<$f{HuFg#Z8m

diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg
index 3207f6f9a46..130bab366a2 100644
--- a/apps/files/img/star.svg
+++ b/apps/files/img/star.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="matrix(.049689 0 0 .049689 -7.3558 -36.792)">
-  <path style="" d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="matrix(.068322 0 0 .068322 -10.114 -50.902)">
+  <path d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)" fill="#FC0"/>
  </g>
 </svg>
diff --git a/core/css/icons.css b/core/css/icons.css
index e44f9880052..88b14449e46 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -227,18 +227,14 @@
 	background-image: url('../img/places/contacts-dark.svg');
 }
 
-.icon-file {
-	background-image: url('../img/places/file.svg');
-}
 .icon-files {
 	background-image: url('../img/places/files.svg');
 }
-.icon-folder {
-	background-image: url('../img/places/folder.svg');
-}
+.icon-file,
 .icon-filetype-text {
 	background-image: url('../img/filetypes/text.svg');
 }
+.icon-folder,
 .icon-filetype-folder {
 	background-image: url('../img/filetypes/folder.svg');
 }
diff --git a/core/img/places/file.png b/core/img/places/file.png
deleted file mode 100644
index e0f04c31731f10b7881e85d6bcbae6f8b795ff55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 174
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY{r~?zkckJ}El3FmN^_S4
z`2{lwNXp2UlvPw#HK=dxFaru3db&7<a6~63G%#-qT^**{C=ugutcaN-`Qa)tj^u-@
qrUnQe3k@(`z2ZOu>qT$DJ_ZIcN1X+#Ij_Hftn_sCb6Mw<&;$S?f-7(U

diff --git a/core/img/places/file.svg b/core/img/places/file.svg
deleted file mode 100644
index 7db9a201a9f..00000000000
--- a/core/img/places/file.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <path opacity=".5" style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m3.3501 1.002c-0.1975 0.0382-0.3535 0.2333-0.35 0.4374v13.123c0.0000047 0.22904 0.20522 0.43743 0.43077 0.43744h10.139c0.22555-0.000006 0.43076-0.2084 0.43077-0.43744v-10.143c-0.004-0.06684-0.022-0.13284-0.054-0.19134-0.966-1.3896-2.035-2.4191-3.312-3.1988-0.043-0.0164-0.088-0.0256-0.134-0.0274h-7.0695c-0.026843-0.0026-0.053928-0.0026-0.080774 0zm5.6499 2.498c0-0.2357 0.2643-0.5 0.5-0.5h0.5v2h2v0.5c0 0.2357-0.264 0.5-0.5 0.5h-2c-0.2357 0-0.5-0.2643-0.5-0.5 0-0.46411 0.0000019-1.4917 0.0000019-2z"/>
-</svg>
diff --git a/core/img/places/files.png b/core/img/places/files.png
index 0ff943b077b64301f8894f12ca1df0237b15d18a..e317fc3c722b9d2ff4d51286a5f8716c6a0dc99a 100644
GIT binary patch
delta 126
zcmZ3(IGb^TO1Wr&Plzi61H*p|;Bh{e1t`H*666=m(9p5}z(F~)t&@Nv`kpS1AsWHS
z2@5z2yqTF8RTu^Abva`dd>LaEIAa;OCS7E`<i^Uu-J<w8SmFc&gV(J}k^I-|IDuLj
NJYD@<);T3K0RXe!FZTcd

delta 144
zcmbQuxQ20pO1(sYPl)S(96(e1zzGHh2KJI5zhDOQppAR?9m-sz`T;0p<LTlUqH#Vs
zL4mntIuIywPibb5WD*GI(F^d~(!j9laKPFI4uvmM7I07D&tp_AX)Fq2y)^Ns>Jt}J
ahVHoLKQ98$3INUFWbkzLb6Mw<&;$T&eL|A}

diff --git a/core/img/places/files.svg b/core/img/places/files.svg
index 72605afcc14..8f61739bc4a 100644
--- a/core/img/places/files.svg
+++ b/core/img/places/files.svg
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path fill="#FFF" d="m2.92 3c-0.5012 0-0.9208 0.4197-0.9208 0.9208v24.158c0 0.51739 0.40324 0.92073 0.92082 0.92073h26.158c0.51756 0 0.92081-0.40316 0.92081-0.92073l0.00069-14.154c0-0.5011-0.41966-0.92524-0.92081-0.92524h-21.079l-0.0007 11.005c0 0.48012-0.52409 0.97706-1.0042 0.97706-0.48012 0-0.99573-0.49694-0.99573-0.97706l0.0007-12.143c0-0.48012 0.40484-0.86214 0.88497-0.86214h4.5944l14.521 0.00052-0.0007-2.9516c0-0.56713-0.42551-1.0481-0.99245-1.0481h-13.007v-3.0791c0-0.50118-0.40586-0.92081-0.90701-0.92081z" fill-rule="evenodd"/>
+ <g fill-rule="evenodd" transform="matrix(1.7333 0 0 1.7333 -344.09 -1727.8)" fill="#fff">
+  <path d="m200.2 999.72c-0.28913 0-0.53125 0.2421-0.53125 0.5312v12.784c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53124-0.2327 0.53124-0.5312l0.0004-10.474c0-0.2889-0.24211-0.5338-0.53124-0.5338l-7.5457 0.0005-2.3076-2.3078z" fill-rule="evenodd" fill="#fff"/>
+ </g>
 </svg>
diff --git a/core/img/places/folder.png b/core/img/places/folder.png
deleted file mode 100644
index e7882298a834ca9e6b6f65719c24c00df45e545c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 326
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!q5^zET>t<74`k8;Y?O~!0W?>(
zB*-tAfsvg<QN_&O!P(W*J0N7k>9glAUA}hX*4=v#9{#xI6i^0KSm){D7*fIb_JSoJ
zlOcn1VEcvx8xAuZe)KzjGSel2#wj~GTK@2V=;Hsr%KGEt#NJ7LXLhlQd`XBixghuB
zVxAt;oz)EPS^~T^?AwyBOl{zFQP{@b)fN|~bRb)R@t8dukAy)&0;A7LhFWuL4~J6@
o+zZk}zfWj*I#ZNa+T!~=&Z7?)d#<*<a|H#3r>mdKI;Vst0L_S7Z~y=R

diff --git a/core/img/places/folder.svg b/core/img/places/folder.svg
deleted file mode 100644
index 08633f60a80..00000000000
--- a/core/img/places/folder.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.04 -864.43)">
-  <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2327 0.53125-0.5312l0.0004-8.1661c0-0.289-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.2771-0.30237 0.5638-0.57937 0.5638s-0.57447-0.2867-0.57447-0.5638l0.0004-7.0055c0-0.2771 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
- </g>
-</svg>
-- 
GitLab


From 933ac14b767f78d99f4b45456467e7513c57ffa7 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 28 Aug 2015 01:55:25 -0400
Subject: [PATCH 063/783] [tx-robot] updated from transifex

---
 apps/files/l10n/es.js               |  2 +-
 apps/files/l10n/es.json             |  2 +-
 apps/files_external/l10n/da.js      |  1 +
 apps/files_external/l10n/da.json    |  1 +
 apps/files_external/l10n/es.js      |  4 ++--
 apps/files_external/l10n/es.json    |  4 ++--
 apps/files_external/l10n/nl.js      | 14 ++++++++++++++
 apps/files_external/l10n/nl.json    | 14 ++++++++++++++
 apps/files_external/l10n/pt_BR.js   | 13 +++++++++++++
 apps/files_external/l10n/pt_BR.json | 13 +++++++++++++
 apps/files_external/l10n/th_TH.js   | 23 +++++++++++++++++++++++
 apps/files_external/l10n/th_TH.json | 23 +++++++++++++++++++++++
 apps/user_ldap/l10n/es.js           |  2 +-
 apps/user_ldap/l10n/es.json         |  2 +-
 core/l10n/af_ZA.js                  |  1 -
 core/l10n/af_ZA.json                |  1 -
 core/l10n/ar.js                     |  1 -
 core/l10n/ar.json                   |  1 -
 core/l10n/ast.js                    |  1 -
 core/l10n/ast.json                  |  1 -
 core/l10n/az.js                     |  1 -
 core/l10n/az.json                   |  1 -
 core/l10n/bg_BG.js                  |  1 -
 core/l10n/bg_BG.json                |  1 -
 core/l10n/bn_BD.js                  |  1 -
 core/l10n/bn_BD.json                |  1 -
 core/l10n/bs.js                     |  1 -
 core/l10n/bs.json                   |  1 -
 core/l10n/ca.js                     |  1 -
 core/l10n/ca.json                   |  1 -
 core/l10n/cs_CZ.js                  |  1 -
 core/l10n/cs_CZ.json                |  1 -
 core/l10n/cy_GB.js                  |  1 -
 core/l10n/cy_GB.json                |  1 -
 core/l10n/da.js                     |  3 ++-
 core/l10n/da.json                   |  3 ++-
 core/l10n/de.js                     |  1 -
 core/l10n/de.json                   |  1 -
 core/l10n/de_DE.js                  |  1 -
 core/l10n/de_DE.json                |  1 -
 core/l10n/el.js                     |  3 ++-
 core/l10n/el.json                   |  3 ++-
 core/l10n/en_GB.js                  |  1 -
 core/l10n/en_GB.json                |  1 -
 core/l10n/eo.js                     |  1 -
 core/l10n/eo.json                   |  1 -
 core/l10n/es.js                     |  7 +++----
 core/l10n/es.json                   |  7 +++----
 core/l10n/es_AR.js                  |  1 -
 core/l10n/es_AR.json                |  1 -
 core/l10n/es_MX.js                  |  1 -
 core/l10n/es_MX.json                |  1 -
 core/l10n/et_EE.js                  |  1 -
 core/l10n/et_EE.json                |  1 -
 core/l10n/eu.js                     |  1 -
 core/l10n/eu.json                   |  1 -
 core/l10n/fa.js                     |  1 -
 core/l10n/fa.json                   |  1 -
 core/l10n/fi_FI.js                  |  3 ++-
 core/l10n/fi_FI.json                |  3 ++-
 core/l10n/fr.js                     |  1 -
 core/l10n/fr.json                   |  1 -
 core/l10n/gl.js                     |  1 -
 core/l10n/gl.json                   |  1 -
 core/l10n/he.js                     |  1 -
 core/l10n/he.json                   |  1 -
 core/l10n/hr.js                     |  1 -
 core/l10n/hr.json                   |  1 -
 core/l10n/hu_HU.js                  |  1 -
 core/l10n/hu_HU.json                |  1 -
 core/l10n/ia.js                     |  1 -
 core/l10n/ia.json                   |  1 -
 core/l10n/id.js                     |  1 -
 core/l10n/id.json                   |  1 -
 core/l10n/is.js                     |  2 +-
 core/l10n/is.json                   |  2 +-
 core/l10n/it.js                     |  3 ++-
 core/l10n/it.json                   |  3 ++-
 core/l10n/ja.js                     |  1 -
 core/l10n/ja.json                   |  1 -
 core/l10n/ka_GE.js                  |  1 -
 core/l10n/ka_GE.json                |  1 -
 core/l10n/km.js                     |  1 -
 core/l10n/km.json                   |  1 -
 core/l10n/ko.js                     |  1 -
 core/l10n/ko.json                   |  1 -
 core/l10n/lb.js                     |  1 -
 core/l10n/lb.json                   |  1 -
 core/l10n/lt_LT.js                  |  1 -
 core/l10n/lt_LT.json                |  1 -
 core/l10n/lv.js                     |  1 -
 core/l10n/lv.json                   |  1 -
 core/l10n/mk.js                     |  1 -
 core/l10n/mk.json                   |  1 -
 core/l10n/ms_MY.js                  |  3 +--
 core/l10n/ms_MY.json                |  3 +--
 core/l10n/my_MM.js                  |  3 +--
 core/l10n/my_MM.json                |  3 +--
 core/l10n/nb_NO.js                  |  1 -
 core/l10n/nb_NO.json                |  1 -
 core/l10n/nl.js                     |  4 +++-
 core/l10n/nl.json                   |  4 +++-
 core/l10n/nn_NO.js                  |  1 -
 core/l10n/nn_NO.json                |  1 -
 core/l10n/oc.js                     |  1 -
 core/l10n/oc.json                   |  1 -
 core/l10n/pl.js                     |  1 -
 core/l10n/pl.json                   |  1 -
 core/l10n/pt_BR.js                  |  3 ++-
 core/l10n/pt_BR.json                |  3 ++-
 core/l10n/pt_PT.js                  |  1 -
 core/l10n/pt_PT.json                |  1 -
 core/l10n/ro.js                     |  1 -
 core/l10n/ro.json                   |  1 -
 core/l10n/ru.js                     |  1 -
 core/l10n/ru.json                   |  1 -
 core/l10n/si_LK.js                  |  3 +--
 core/l10n/si_LK.json                |  3 +--
 core/l10n/sk_SK.js                  |  1 -
 core/l10n/sk_SK.json                |  1 -
 core/l10n/sl.js                     |  1 -
 core/l10n/sl.json                   |  1 -
 core/l10n/sq.js                     |  1 -
 core/l10n/sq.json                   |  1 -
 core/l10n/sr.js                     |  1 -
 core/l10n/sr.json                   |  1 -
 core/l10n/sr@latin.js               |  1 -
 core/l10n/sr@latin.json             |  1 -
 core/l10n/sv.js                     |  1 -
 core/l10n/sv.json                   |  1 -
 core/l10n/ta_LK.js                  |  3 +--
 core/l10n/ta_LK.json                |  3 +--
 core/l10n/th_TH.js                  |  4 +++-
 core/l10n/th_TH.json                |  4 +++-
 core/l10n/tr.js                     |  1 -
 core/l10n/tr.json                   |  1 -
 core/l10n/uk.js                     |  1 -
 core/l10n/uk.json                   |  1 -
 core/l10n/ur_PK.js                  |  1 -
 core/l10n/ur_PK.json                |  1 -
 core/l10n/vi.js                     |  1 -
 core/l10n/vi.json                   |  1 -
 core/l10n/zh_CN.js                  |  1 -
 core/l10n/zh_CN.json                |  1 -
 core/l10n/zh_HK.js                  |  3 +--
 core/l10n/zh_HK.json                |  3 +--
 core/l10n/zh_TW.js                  |  1 -
 core/l10n/zh_TW.json                |  1 -
 lib/l10n/es.js                      |  2 +-
 lib/l10n/es.json                    |  2 +-
 lib/l10n/nl.js                      |  1 +
 lib/l10n/nl.json                    |  1 +
 lib/l10n/th_TH.js                   |  1 +
 lib/l10n/th_TH.json                 |  1 +
 settings/l10n/es.js                 |  6 +++---
 settings/l10n/es.json               |  6 +++---
 settings/l10n/nl.js                 |  7 +++++++
 settings/l10n/nl.json               |  7 +++++++
 settings/l10n/th_TH.js              |  7 +++++++
 settings/l10n/th_TH.json            |  7 +++++++
 160 files changed, 200 insertions(+), 166 deletions(-)

diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index 64df2a8491d..39f4b8d0569 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -7,7 +7,7 @@ OC.L10N.register(
     "Could not move %s - File with this name already exists" : "No se pudo mover %s - Ya existe un archivo con ese nombre.",
     "Could not move %s" : "No se pudo mover %s",
     "Permission denied" : "Permiso denegado",
-    "The target folder has been moved or deleted." : "La carpeta destino fue movida o eliminada.",
+    "The target folder has been moved or deleted." : "La carpeta de destino fue movida o eliminada.",
     "The name %s is already used in the folder %s. Please choose a different name." : "El nombre %s ya está en uso por la carpeta %s. Por favor elija uno diferente.",
     "Error when creating the file" : "Error al crear el archivo",
     "Error when creating the folder" : "Error al crear la carpeta.",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index c074a882129..064ffe3785d 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -5,7 +5,7 @@
     "Could not move %s - File with this name already exists" : "No se pudo mover %s - Ya existe un archivo con ese nombre.",
     "Could not move %s" : "No se pudo mover %s",
     "Permission denied" : "Permiso denegado",
-    "The target folder has been moved or deleted." : "La carpeta destino fue movida o eliminada.",
+    "The target folder has been moved or deleted." : "La carpeta de destino fue movida o eliminada.",
     "The name %s is already used in the folder %s. Please choose a different name." : "El nombre %s ya está en uso por la carpeta %s. Por favor elija uno diferente.",
     "Error when creating the file" : "Error al crear el archivo",
     "Error when creating the folder" : "Error al crear la carpeta.",
diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js
index 31f0776d875..946ea94169c 100644
--- a/apps/files_external/l10n/da.js
+++ b/apps/files_external/l10n/da.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Storage with id \"%i\" not found" : "Lager med ID'et \"%i% er ikke fundet",
     "Invalid backend or authentication mechanism class" : "Ugyldig backend eller klasse for godkendelsesmekanisme",
     "Invalid mount point" : "Fokert monteringspunkt",
+    "Objectstore forbidden" : "Objectstore er forbudt",
     "Invalid storage backend \"%s\"" : "Forkert lager til backend \"%s\"en",
     "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre",
     "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme",
diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json
index a9380e5f052..6a291b2b149 100644
--- a/apps/files_external/l10n/da.json
+++ b/apps/files_external/l10n/da.json
@@ -25,6 +25,7 @@
     "Storage with id \"%i\" not found" : "Lager med ID'et \"%i% er ikke fundet",
     "Invalid backend or authentication mechanism class" : "Ugyldig backend eller klasse for godkendelsesmekanisme",
     "Invalid mount point" : "Fokert monteringspunkt",
+    "Objectstore forbidden" : "Objectstore er forbudt",
     "Invalid storage backend \"%s\"" : "Forkert lager til backend \"%s\"en",
     "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre",
     "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme",
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
index f4960136af3..16d87d8d2f2 100644
--- a/apps/files_external/l10n/es.js
+++ b/apps/files_external/l10n/es.js
@@ -28,8 +28,8 @@ OC.L10N.register(
     "System" : "Sistema",
     "Grant access" : "Conceder acceso",
     "Access granted" : "Acceso concedido",
-    "Error configuring OAuth1" : "Error configurando OAuth1",
-    "Error configuring OAuth2" : "Error configurando OAuth2",
+    "Error configuring OAuth1" : "Error al configurar OAuth1",
+    "Error configuring OAuth2" : "Error al configurar OAuth2",
     "Enable encryption" : "Habilitar cifrado",
     "Enable previews" : "Habilitar previsualizaciones",
     "Check for changes" : "Comprobar si hay cambios",
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
index b44592016dc..fe20eca13d2 100644
--- a/apps/files_external/l10n/es.json
+++ b/apps/files_external/l10n/es.json
@@ -26,8 +26,8 @@
     "System" : "Sistema",
     "Grant access" : "Conceder acceso",
     "Access granted" : "Acceso concedido",
-    "Error configuring OAuth1" : "Error configurando OAuth1",
-    "Error configuring OAuth2" : "Error configurando OAuth2",
+    "Error configuring OAuth1" : "Error al configurar OAuth1",
+    "Error configuring OAuth2" : "Error al configurar OAuth2",
     "Enable encryption" : "Habilitar cifrado",
     "Enable previews" : "Habilitar previsualizaciones",
     "Check for changes" : "Comprobar si hay cambios",
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index dc136969fd8..a9a66934753 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -28,6 +28,8 @@ OC.L10N.register(
     "System" : "Systeem",
     "Grant access" : "Sta toegang toe",
     "Access granted" : "Toegang toegestaan",
+    "Error configuring OAuth1" : "Fout bij configureren OAuth1",
+    "Error configuring OAuth2" : "Fout bij configureren OAuth2",
     "Enable encryption" : "Versleuteling inschakelen",
     "Enable previews" : "Activeren voorbeelden",
     "Check for changes" : "Controleren op wijzigingen",
@@ -39,12 +41,19 @@ OC.L10N.register(
     "Saved" : "Bewaard",
     "Generate keys" : "Genereer sleutels",
     "Error generating key pair" : "Fout bij genereren sleutelpaar",
+    "Access key" : "Access Key",
+    "Secret key" : "Geheime sleutel",
+    "Builtin" : "Ingebouwd",
     "None" : "Geen",
+    "OAuth1" : "OAuth1",
     "App key" : "App key",
     "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "Username and password" : "Gebruikersnaam en wachtwoord",
     "Password" : "Wachtwoord",
+    "Session credentials" : "Sessie inloggegevens",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Hostnaam",
     "Port" : "Poort",
@@ -55,11 +64,15 @@ OC.L10N.register(
     "URL" : "URL",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Lokaal",
     "Location" : "Locatie",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Let op:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
@@ -71,6 +84,7 @@ OC.L10N.register(
     "Scope" : "Scope",
     "External Storage" : "Externe opslag",
     "Folder name" : "Mapnaam",
+    "Authentication" : "Authenticatie",
     "Configuration" : "Configuratie",
     "Available for" : "Beschikbaar voor",
     "Advanced settings" : "Geavanceerde instellingen",
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index 7d5279afbc2..bd3fd953a26 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -26,6 +26,8 @@
     "System" : "Systeem",
     "Grant access" : "Sta toegang toe",
     "Access granted" : "Toegang toegestaan",
+    "Error configuring OAuth1" : "Fout bij configureren OAuth1",
+    "Error configuring OAuth2" : "Fout bij configureren OAuth2",
     "Enable encryption" : "Versleuteling inschakelen",
     "Enable previews" : "Activeren voorbeelden",
     "Check for changes" : "Controleren op wijzigingen",
@@ -37,12 +39,19 @@
     "Saved" : "Bewaard",
     "Generate keys" : "Genereer sleutels",
     "Error generating key pair" : "Fout bij genereren sleutelpaar",
+    "Access key" : "Access Key",
+    "Secret key" : "Geheime sleutel",
+    "Builtin" : "Ingebouwd",
     "None" : "Geen",
+    "OAuth1" : "OAuth1",
     "App key" : "App key",
     "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "Username and password" : "Gebruikersnaam en wachtwoord",
     "Password" : "Wachtwoord",
+    "Session credentials" : "Sessie inloggegevens",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Hostnaam",
     "Port" : "Poort",
@@ -53,11 +62,15 @@
     "URL" : "URL",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Lokaal",
     "Location" : "Locatie",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Let op:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
@@ -69,6 +82,7 @@
     "Scope" : "Scope",
     "External Storage" : "Externe opslag",
     "Folder name" : "Mapnaam",
+    "Authentication" : "Authenticatie",
     "Configuration" : "Configuratie",
     "Available for" : "Beschikbaar voor",
     "Advanced settings" : "Geavanceerde instellingen",
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index 8140d8be980..ae9a08fac6b 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -1,6 +1,8 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de requesição falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de acesso falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
     "Please provide a valid app key and secret." : "Por favor forneça uma chave e segurança válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
@@ -23,12 +25,19 @@ OC.L10N.register(
     "SFTP with secret key login" : "SFTP com chave secreta de login",
     "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Armazenamento com id \"%i\" não encontrado",
+    "Invalid backend or authentication mechanism class" : "Backend inválido ou classe de mecanismo de autenticação",
     "Invalid mount point" : "Ponto de montagem inválido",
+    "Objectstore forbidden" : "Proibido armazenamento de objetos",
     "Invalid storage backend \"%s\"" : "Armazenamento backend inválido \"%s\"",
+    "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
+    "Admin-only storage backend \"%s\"" : "Backend de armazenamento somente de administrador \"%s\"",
     "Personal" : "Pessoal",
     "System" : "Sistema",
     "Grant access" : "Permitir acesso",
     "Access granted" : "Acesso concedido",
+    "Error configuring OAuth1" : "Erro configurando OAuth1",
+    "Error configuring OAuth2" : "Erro configurando OAuth2",
     "Enable encryption" : "Ativar criptografia",
     "Enable previews" : "Habilitar visualizações prévias",
     "Check for changes" : "Verifique se há alterações",
@@ -40,7 +49,11 @@ OC.L10N.register(
     "Saved" : "Salvo",
     "Generate keys" : "Gerar chaves",
     "Error generating key pair" : "Erro ao gerar um par de chaves",
+    "Access key" : "Chave da acesso",
+    "Secret key" : "Chave secreta",
+    "Builtin" : "Construídas em",
     "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
     "App key" : "Chave do Aplicativo",
     "App secret" : "Segredo da Aplicação",
     "OAuth2" : "OAuth2",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index 13ce808ba84..2cf6c696112 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -1,4 +1,6 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de requesição falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de acesso falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
     "Please provide a valid app key and secret." : "Por favor forneça uma chave e segurança válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
@@ -21,12 +23,19 @@
     "SFTP with secret key login" : "SFTP com chave secreta de login",
     "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Armazenamento com id \"%i\" não encontrado",
+    "Invalid backend or authentication mechanism class" : "Backend inválido ou classe de mecanismo de autenticação",
     "Invalid mount point" : "Ponto de montagem inválido",
+    "Objectstore forbidden" : "Proibido armazenamento de objetos",
     "Invalid storage backend \"%s\"" : "Armazenamento backend inválido \"%s\"",
+    "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
+    "Admin-only storage backend \"%s\"" : "Backend de armazenamento somente de administrador \"%s\"",
     "Personal" : "Pessoal",
     "System" : "Sistema",
     "Grant access" : "Permitir acesso",
     "Access granted" : "Acesso concedido",
+    "Error configuring OAuth1" : "Erro configurando OAuth1",
+    "Error configuring OAuth2" : "Erro configurando OAuth2",
     "Enable encryption" : "Ativar criptografia",
     "Enable previews" : "Habilitar visualizações prévias",
     "Check for changes" : "Verifique se há alterações",
@@ -38,7 +47,11 @@
     "Saved" : "Salvo",
     "Generate keys" : "Gerar chaves",
     "Error generating key pair" : "Erro ao gerar um par de chaves",
+    "Access key" : "Chave da acesso",
+    "Secret key" : "Chave secreta",
+    "Builtin" : "Construídas em",
     "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
     "App key" : "Chave do Aplicativo",
     "App secret" : "Segredo da Aplicação",
     "OAuth2" : "OAuth2",
diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js
index b8fc2a054cb..5926a806437 100644
--- a/apps/files_external/l10n/th_TH.js
+++ b/apps/files_external/l10n/th_TH.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับให้ถูกต้อง",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
+    "Please provide a valid app key and secret." : "โปรดระบุคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
     "Step 1 failed. Exception: %s" : "ขั้นตอนที่ 1 ล้มเหลว ข้อยกเว้น: %s",
     "Step 2 failed. Exception: %s" : "ขั้นตอนที่ 2 ล้มเหลว ข้อยกเว้น: %s",
     "External storage" : "จัดเก็บข้อมูลภายนอก",
@@ -22,12 +25,19 @@ OC.L10N.register(
     "SFTP with secret key login" : "SFTP กับคีย์ลับสำหรับเข้าสู่ระบบ",
     "Public key" : "คีย์สาธารณะ",
     "Storage with id \"%i\" not found" : "ไม่พบจัดการเก็บข้อมูลของ ID \"%i\"",
+    "Invalid backend or authentication mechanism class" : "แบ็กเอนด์ไม่ถูกต้องหรือระดับการรับรองความถูกต้องไม่เพียงพอ",
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
+    "Objectstore forbidden" : "เก็บวัตถุต้องห้าม",
     "Invalid storage backend \"%s\"" : "การจัดเก็บข้อมูลแบ็กเอนด์ไม่ถูกต้อง \"%s\"",
+    "Unsatisfied backend parameters" : "พารามิเตอร์แบ็กเอนด์ไม่ได้รับอนุญาต",
+    "Unsatisfied authentication mechanism parameters" : "การรับรองความถูกต้องไม่เพียงพอ",
+    "Admin-only storage backend \"%s\"" : "จัดเก็บแบ็กเอนด์ของผู้ดูแลระบบเท่านั้น \"%s\"",
     "Personal" : "ส่วนตัว",
     "System" : "ระบบ",
     "Grant access" : "อนุญาตให้เข้าถึงได้",
     "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
+    "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1",
+    "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "Enable previews" : "เปิดใช้งานการแสดงตัวอย่าง",
     "Check for changes" : "ตรวจสอบการเปลี่ยนแปลง",
@@ -39,12 +49,19 @@ OC.L10N.register(
     "Saved" : "บันทึกแล้ว",
     "Generate keys" : "สร้างคีย์",
     "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
+    "Access key" : "คีย์การเข้าถึง",
+    "Secret key" : "คีย์ลับ",
+    "Builtin" : "ในตัว",
     "None" : "ไม่มี",
+    "OAuth1" : "OAuth1",
     "App key" : "App key",
     "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
     "Password" : "รหัสผ่าน",
+    "Session credentials" : "ข้อมูลของเซสชั่น",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "ชื่อโฮสต์",
     "Port" : "พอร์ต",
@@ -55,10 +72,15 @@ OC.L10N.register(
     "URL" : "URL",
     "Secure https://" : "โหมดปลอดภัย https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "โหมดปลอดภัย ftps://",
+    "Google Drive" : "กูเกิ้ลไดร์ฟ",
     "Local" : "ต้นทาง",
     "Location" : "ตำแหน่งที่อยู่",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "รูท",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>หมายเหตุ:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน FTP ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
@@ -70,6 +92,7 @@ OC.L10N.register(
     "Scope" : "ขอบเขต",
     "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
     "Folder name" : "ชื่อโฟลเดอร์",
+    "Authentication" : "รับรองความถูกต้อง",
     "Configuration" : "การกำหนดค่า",
     "Available for" : "สามารถใช้ได้สำหรับ",
     "Advanced settings" : "ตั้งค่าขั้นสูง",
diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json
index 2b65013f584..c927a5980b9 100644
--- a/apps/files_external/l10n/th_TH.json
+++ b/apps/files_external/l10n/th_TH.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับให้ถูกต้อง",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
+    "Please provide a valid app key and secret." : "โปรดระบุคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
     "Step 1 failed. Exception: %s" : "ขั้นตอนที่ 1 ล้มเหลว ข้อยกเว้น: %s",
     "Step 2 failed. Exception: %s" : "ขั้นตอนที่ 2 ล้มเหลว ข้อยกเว้น: %s",
     "External storage" : "จัดเก็บข้อมูลภายนอก",
@@ -20,12 +23,19 @@
     "SFTP with secret key login" : "SFTP กับคีย์ลับสำหรับเข้าสู่ระบบ",
     "Public key" : "คีย์สาธารณะ",
     "Storage with id \"%i\" not found" : "ไม่พบจัดการเก็บข้อมูลของ ID \"%i\"",
+    "Invalid backend or authentication mechanism class" : "แบ็กเอนด์ไม่ถูกต้องหรือระดับการรับรองความถูกต้องไม่เพียงพอ",
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
+    "Objectstore forbidden" : "เก็บวัตถุต้องห้าม",
     "Invalid storage backend \"%s\"" : "การจัดเก็บข้อมูลแบ็กเอนด์ไม่ถูกต้อง \"%s\"",
+    "Unsatisfied backend parameters" : "พารามิเตอร์แบ็กเอนด์ไม่ได้รับอนุญาต",
+    "Unsatisfied authentication mechanism parameters" : "การรับรองความถูกต้องไม่เพียงพอ",
+    "Admin-only storage backend \"%s\"" : "จัดเก็บแบ็กเอนด์ของผู้ดูแลระบบเท่านั้น \"%s\"",
     "Personal" : "ส่วนตัว",
     "System" : "ระบบ",
     "Grant access" : "อนุญาตให้เข้าถึงได้",
     "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
+    "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1",
+    "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "Enable previews" : "เปิดใช้งานการแสดงตัวอย่าง",
     "Check for changes" : "ตรวจสอบการเปลี่ยนแปลง",
@@ -37,12 +47,19 @@
     "Saved" : "บันทึกแล้ว",
     "Generate keys" : "สร้างคีย์",
     "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
+    "Access key" : "คีย์การเข้าถึง",
+    "Secret key" : "คีย์ลับ",
+    "Builtin" : "ในตัว",
     "None" : "ไม่มี",
+    "OAuth1" : "OAuth1",
     "App key" : "App key",
     "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
     "Password" : "รหัสผ่าน",
+    "Session credentials" : "ข้อมูลของเซสชั่น",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "ชื่อโฮสต์",
     "Port" : "พอร์ต",
@@ -53,10 +70,15 @@
     "URL" : "URL",
     "Secure https://" : "โหมดปลอดภัย https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "โหมดปลอดภัย ftps://",
+    "Google Drive" : "กูเกิ้ลไดร์ฟ",
     "Local" : "ต้นทาง",
     "Location" : "ตำแหน่งที่อยู่",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "รูท",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>หมายเหตุ:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน FTP ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
@@ -68,6 +90,7 @@
     "Scope" : "ขอบเขต",
     "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
     "Folder name" : "ชื่อโฟลเดอร์",
+    "Authentication" : "รับรองความถูกต้อง",
     "Configuration" : "การกำหนดค่า",
     "Available for" : "สามารถใช้ได้สำหรับ",
     "Advanced settings" : "ตั้งค่าขั้นสูง",
diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js
index b423d5a8fa1..c73f54b5489 100644
--- a/apps/user_ldap/l10n/es.js
+++ b/apps/user_ldap/l10n/es.js
@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Failed to clear the mappings." : "Ocurrió un fallo al borrar las asignaciones.",
     "Failed to delete the server configuration" : "No se pudo borrar la configuración del servidor",
-    "The configuration is invalid: anonymous bind is not allowed." : "La configuración no es válida: enlaces anónimos no están permitido.",
+    "The configuration is invalid: anonymous bind is not allowed." : "La configuración no es válida: no están permitidos enlaces anónimos.",
     "The configuration is valid and the connection could be established!" : "¡La configuración es válida y la conexión puede establecerse!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero falló el nexo. Por favor, compruebe la configuración del servidor y las credenciales.",
     "The configuration is invalid. Please have a look at the logs for further details." : "La configuración no es válida. Por favor, revise el registro para más detalles.",
diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json
index c8244f41a6e..8666d1efdd9 100644
--- a/apps/user_ldap/l10n/es.json
+++ b/apps/user_ldap/l10n/es.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Failed to clear the mappings." : "Ocurrió un fallo al borrar las asignaciones.",
     "Failed to delete the server configuration" : "No se pudo borrar la configuración del servidor",
-    "The configuration is invalid: anonymous bind is not allowed." : "La configuración no es válida: enlaces anónimos no están permitido.",
+    "The configuration is invalid: anonymous bind is not allowed." : "La configuración no es válida: no están permitidos enlaces anónimos.",
     "The configuration is valid and the connection could be established!" : "¡La configuración es válida y la conexión puede establecerse!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero falló el nexo. Por favor, compruebe la configuración del servidor y las credenciales.",
     "The configuration is invalid. Please have a look at the logs for further details." : "La configuración no es válida. Por favor, revise el registro para más detalles.",
diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
index d96aa5cf465..7c95b0a0db4 100644
--- a/core/l10n/af_ZA.js
+++ b/core/l10n/af_ZA.js
@@ -110,7 +110,6 @@ OC.L10N.register(
     "Finish setup" : "Maak opstelling klaar",
     "Log out" : "Teken uit",
     "remember" : "onthou",
-    "Log in" : "Teken aan",
     "Alternative Logins" : "Alternatiewe aantekeninge",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
 },
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
index 362255fe50a..a040afc6962 100644
--- a/core/l10n/af_ZA.json
+++ b/core/l10n/af_ZA.json
@@ -108,7 +108,6 @@
     "Finish setup" : "Maak opstelling klaar",
     "Log out" : "Teken uit",
     "remember" : "onthou",
-    "Log in" : "Teken aan",
     "Alternative Logins" : "Alternatiewe aantekeninge",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index 55d87c826e4..e4bde6b47ed 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -131,7 +131,6 @@ OC.L10N.register(
     "Log out" : "الخروج",
     "Search" : "البحث",
     "remember" : "تذكر",
-    "Log in" : "أدخل",
     "Alternative Logins" : "اسماء دخول بديلة"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index 70e95257980..90168479a9b 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -129,7 +129,6 @@
     "Log out" : "الخروج",
     "Search" : "البحث",
     "remember" : "تذكر",
-    "Log in" : "أدخل",
     "Alternative Logins" : "اسماء دخول بديلة"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index 22d3ad472c2..675b3bd00a1 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -169,7 +169,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Falló l'autenticación nel sirvidor!",
     "Please contact your administrator." : "Por favor, contauta col to alministrador",
     "remember" : "recordar",
-    "Log in" : "Aniciar sesión",
     "Alternative Logins" : "Anicios de sesión alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instalación d'ownCloud ta en mou d'usuariu únicu.",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index e7f87e94f25..5479fb6a524 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -167,7 +167,6 @@
     "Server side authentication failed!" : "Falló l'autenticación nel sirvidor!",
     "Please contact your administrator." : "Por favor, contauta col to alministrador",
     "remember" : "recordar",
-    "Log in" : "Aniciar sesión",
     "Alternative Logins" : "Anicios de sesión alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instalación d'ownCloud ta en mou d'usuariu únicu.",
diff --git a/core/l10n/az.js b/core/l10n/az.js
index e94203c372c..29e643c665a 100644
--- a/core/l10n/az.js
+++ b/core/l10n/az.js
@@ -83,7 +83,6 @@ OC.L10N.register(
     "Username" : "İstifadəçi adı",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Xüsusilə fayl sinxronizasiyası üçün desktop client-dən istifadə edilərsə, SQLite məsləhət görülmür.",
     "Search" : "Axtarış",
-    "Log in" : "Giriş",
     "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
 },
diff --git a/core/l10n/az.json b/core/l10n/az.json
index 8dc93029ed1..6827838c944 100644
--- a/core/l10n/az.json
+++ b/core/l10n/az.json
@@ -81,7 +81,6 @@
     "Username" : "İstifadəçi adı",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Xüsusilə fayl sinxronizasiyası üçün desktop client-dən istifadə edilərsə, SQLite məsləhət görülmür.",
     "Search" : "Axtarış",
-    "Log in" : "Giriş",
     "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
index efc40bfed21..52fdcccf13b 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -212,7 +212,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Удостоверяването от страна на сървъра е неуспешно!",
     "Please contact your administrator." : "Моля, свържете се с администратора.",
     "remember" : "запомняне",
-    "Log in" : "Вписване",
     "Alternative Logins" : "Алтернативни методи на вписване",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.",
     "This ownCloud instance is currently in single user mode." : "В момента този ownCloud е в режим допускащ само един потребител.",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index bb9651af481..0d8b4a21a19 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -210,7 +210,6 @@
     "Server side authentication failed!" : "Удостоверяването от страна на сървъра е неуспешно!",
     "Please contact your administrator." : "Моля, свържете се с администратора.",
     "remember" : "запомняне",
-    "Log in" : "Вписване",
     "Alternative Logins" : "Алтернативни методи на вписване",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.",
     "This ownCloud instance is currently in single user mode." : "В момента този ownCloud е в режим допускащ само един потребител.",
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
index a2b94ff8029..d9bce487f45 100644
--- a/core/l10n/bn_BD.js
+++ b/core/l10n/bn_BD.js
@@ -126,7 +126,6 @@ OC.L10N.register(
     "Log out" : "প্রস্থান",
     "Search" : "অনুসন্ধান",
     "remember" : "মনে রাখ",
-    "Log in" : "প্রবেশ",
     "Alternative Logins" : "বিকল্প লগইন"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
index 305f1e60d15..8474fa61f1c 100644
--- a/core/l10n/bn_BD.json
+++ b/core/l10n/bn_BD.json
@@ -124,7 +124,6 @@
     "Log out" : "প্রস্থান",
     "Search" : "অনুসন্ধান",
     "remember" : "মনে রাখ",
-    "Log in" : "প্রবেশ",
     "Alternative Logins" : "বিকল্প লগইন"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
index e2c5bd8e0e4..f237de9d8ce 100644
--- a/core/l10n/bs.js
+++ b/core/l10n/bs.js
@@ -190,7 +190,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Autentikacija na strani servera nije uspjela!",
     "Please contact your administrator." : "Molim kontaktirajte svog administratora.",
     "remember" : "zapamti",
-    "Log in" : "Prijava",
     "Alternative Logins" : "Alternativne Prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> upravo vam javljam da je %s s vama podijelio <strong>%s</strong>.<br><a href=\"%s\">Pogledajte!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u jednokorisničkom načinu rada.",
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
index 10d79cb2b45..c4f7962b14e 100644
--- a/core/l10n/bs.json
+++ b/core/l10n/bs.json
@@ -188,7 +188,6 @@
     "Server side authentication failed!" : "Autentikacija na strani servera nije uspjela!",
     "Please contact your administrator." : "Molim kontaktirajte svog administratora.",
     "remember" : "zapamti",
-    "Log in" : "Prijava",
     "Alternative Logins" : "Alternativne Prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> upravo vam javljam da je %s s vama podijelio <strong>%s</strong>.<br><a href=\"%s\">Pogledajte!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u jednokorisničkom načinu rada.",
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index e2bed36c3d4..853cd662472 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -228,7 +228,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.",
     "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?",
     "remember" : "recorda'm",
-    "Log in" : "Inici de sessió",
     "Alternative Logins" : "Acreditacions alternatives",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ei, <br><br>només fer-vos saber que %s us ha comparti <strong>%s</strong>. <br><a href=\"%s\">Mireu-ho!</a>",
     "This ownCloud instance is currently in single user mode." : "La instància ownCloud està en mode d'usuari únic.",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index 8afd3826038..56006bc7d17 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -226,7 +226,6 @@
     "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.",
     "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?",
     "remember" : "recorda'm",
-    "Log in" : "Inici de sessió",
     "Alternative Logins" : "Acreditacions alternatives",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ei, <br><br>només fer-vos saber que %s us ha comparti <strong>%s</strong>. <br><a href=\"%s\">Mireu-ho!</a>",
     "This ownCloud instance is currently in single user mode." : "La instància ownCloud està en mode d'usuari únic.",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 845ea68b0f6..8d57e0e76c0 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -246,7 +246,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.",
     "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?",
     "remember" : "zapamatovat",
-    "Log in" : "Přihlásit",
     "Alternative Logins" : "Alternativní přihlášení",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 57e8d974e4d..e9f52cfa46d 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -244,7 +244,6 @@
     "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.",
     "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?",
     "remember" : "zapamatovat",
-    "Log in" : "Přihlásit",
     "Alternative Logins" : "Alternativní přihlášení",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
index efc9aaa10c2..5afe9c94ae5 100644
--- a/core/l10n/cy_GB.js
+++ b/core/l10n/cy_GB.js
@@ -101,7 +101,6 @@ OC.L10N.register(
     "Log out" : "Allgofnodi",
     "Search" : "Chwilio",
     "remember" : "cofio",
-    "Log in" : "Mewngofnodi",
     "Alternative Logins" : "Mewngofnodiadau Amgen"
 },
 "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
index b873c9d84ad..1e37b240bc9 100644
--- a/core/l10n/cy_GB.json
+++ b/core/l10n/cy_GB.json
@@ -99,7 +99,6 @@
     "Log out" : "Allgofnodi",
     "Search" : "Chwilio",
     "remember" : "cofio",
-    "Log in" : "Mewngofnodi",
     "Alternative Logins" : "Mewngofnodiadau Amgen"
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/core/l10n/da.js b/core/l10n/da.js
index da1e2106a30..0482ceff99e 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Kunne ikke sende mail til følgende brugere: %s",
+    "Preparing update" : "Forbereder opdatering",
     "Turned on maintenance mode" : "Startede vedligeholdelsestilstand",
     "Turned off maintenance mode" : "standsede vedligeholdelsestilstand",
     "Maintenance mode is kept active" : "Vedligeholdelsestilstanden holdes kørende",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Reparationsfejl:",
     "Following incompatible apps have been disabled: %s" : "Følgende inkompatible apps er blevet deaktiveret: %s",
     "Following apps have been disabled: %s" : "Følgende apps er blevet deaktiveret: %s",
+    "Already up to date" : "Allerede opdateret",
     "File is too big" : "Filen er for stor",
     "Invalid file provided" : "Der er angivet en ugyldig fil",
     "No image or file provided" : "Ingen fil eller billede givet",
@@ -248,7 +250,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Kontakt venligst din administrator.",
     "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?",
     "remember" : "husk",
-    "Log in" : "Log ind",
     "Alternative Logins" : "Alternative logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denne ownCloud instans er lige nu i enkeltbruger tilstand.",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 287bc96afdc..2396b997877 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Kunne ikke sende mail til følgende brugere: %s",
+    "Preparing update" : "Forbereder opdatering",
     "Turned on maintenance mode" : "Startede vedligeholdelsestilstand",
     "Turned off maintenance mode" : "standsede vedligeholdelsestilstand",
     "Maintenance mode is kept active" : "Vedligeholdelsestilstanden holdes kørende",
@@ -11,6 +12,7 @@
     "Repair error: " : "Reparationsfejl:",
     "Following incompatible apps have been disabled: %s" : "Følgende inkompatible apps er blevet deaktiveret: %s",
     "Following apps have been disabled: %s" : "Følgende apps er blevet deaktiveret: %s",
+    "Already up to date" : "Allerede opdateret",
     "File is too big" : "Filen er for stor",
     "Invalid file provided" : "Der er angivet en ugyldig fil",
     "No image or file provided" : "Ingen fil eller billede givet",
@@ -246,7 +248,6 @@
     "Please try again or contact your administrator." : "Kontakt venligst din administrator.",
     "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?",
     "remember" : "husk",
-    "Log in" : "Log ind",
     "Alternative Logins" : "Alternative logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denne ownCloud instans er lige nu i enkeltbruger tilstand.",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 1361a970a42..2662e0d895f 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -239,7 +239,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.",
     "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "remember" : "merken",
-    "Log in" : "Einloggen",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass %s <strong>%s</strong> mit Dir geteilt hat.<br><a href=\"%s\">Sieh es Dir an!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 3eee17db65e..2da213c6116 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -237,7 +237,6 @@
     "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.",
     "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "remember" : "merken",
-    "Log in" : "Einloggen",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass %s <strong>%s</strong> mit Dir geteilt hat.<br><a href=\"%s\">Sieh es Dir an!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 0feca899f9d..6a77c3952c3 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -238,7 +238,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.",
     "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "remember" : "merken",
-    "Log in" : "Einloggen",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Sehen Sie es sich an!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 83359463920..fc6dc12aa17 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -236,7 +236,6 @@
     "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.",
     "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "remember" : "merken",
-    "Log in" : "Einloggen",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Sehen Sie es sich an!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 0eb62981306..03ecc018c05 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
+    "Preparing update" : "Προετοιμασία ενημέρωσης",
     "Turned on maintenance mode" : "Η κατάσταση συντήρησης ενεργοποιήθηκε",
     "Turned off maintenance mode" : "Η κατάσταση συντήρησης απενεργοποιήθηκε",
     "Maintenance mode is kept active" : "Η λειτουργία συντήρησης διατηρήθηκε ενεργή",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Σφάλμα διόρθωσης:",
     "Following incompatible apps have been disabled: %s" : "Οι παρακάτω εφαρμογές έχουν απενεργοποιηθεί: %s",
     "Following apps have been disabled: %s" : "Οι ακόλουθες εφαρμογές έχουν απενεργοποιηθεί: %s",
+    "Already up to date" : "Ήδη ενημερωμένο",
     "File is too big" : "Το αρχείο είναι πολύ μεγάλο",
     "Invalid file provided" : "Έχει δοθεί μη έγκυρο αρχείο",
     "No image or file provided" : "Δεν δόθηκε εικόνα ή αρχείο",
@@ -248,7 +250,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.",
     "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;",
     "remember" : "απομνημόνευση",
-    "Log in" : "Είσοδος",
     "Alternative Logins" : "Εναλλακτικές Συνδέσεις",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 507da1690ea..4e901e6606b 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
+    "Preparing update" : "Προετοιμασία ενημέρωσης",
     "Turned on maintenance mode" : "Η κατάσταση συντήρησης ενεργοποιήθηκε",
     "Turned off maintenance mode" : "Η κατάσταση συντήρησης απενεργοποιήθηκε",
     "Maintenance mode is kept active" : "Η λειτουργία συντήρησης διατηρήθηκε ενεργή",
@@ -11,6 +12,7 @@
     "Repair error: " : "Σφάλμα διόρθωσης:",
     "Following incompatible apps have been disabled: %s" : "Οι παρακάτω εφαρμογές έχουν απενεργοποιηθεί: %s",
     "Following apps have been disabled: %s" : "Οι ακόλουθες εφαρμογές έχουν απενεργοποιηθεί: %s",
+    "Already up to date" : "Ήδη ενημερωμένο",
     "File is too big" : "Το αρχείο είναι πολύ μεγάλο",
     "Invalid file provided" : "Έχει δοθεί μη έγκυρο αρχείο",
     "No image or file provided" : "Δεν δόθηκε εικόνα ή αρχείο",
@@ -246,7 +248,6 @@
     "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.",
     "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;",
     "remember" : "απομνημόνευση",
-    "Log in" : "Είσοδος",
     "Alternative Logins" : "Εναλλακτικές Συνδέσεις",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index 7730ff8a530..e3760b6f2bc 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -231,7 +231,6 @@ OC.L10N.register(
     "An internal error occured." : "An internal error occured.",
     "Please try again or contact your administrator." : "Please try again or contact your administrator.",
     "remember" : "remember",
-    "Log in" : "Log in",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "This ownCloud instance is currently in single user mode.",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index a2bd71be34d..4c76d47111e 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -229,7 +229,6 @@
     "An internal error occured." : "An internal error occured.",
     "Please try again or contact your administrator." : "Please try again or contact your administrator.",
     "remember" : "remember",
-    "Log in" : "Log in",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "This ownCloud instance is currently in single user mode.",
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
index 0b32ad7339d..78a571a798a 100644
--- a/core/l10n/eo.js
+++ b/core/l10n/eo.js
@@ -130,7 +130,6 @@ OC.L10N.register(
     "Search" : "Serĉi",
     "Please contact your administrator." : "Bonvolu kontakti vian administranton.",
     "remember" : "memori",
-    "Log in" : "Ensaluti",
     "Alternative Logins" : "Alternativaj ensalutoj",
     "Thank you for your patience." : "Dankon pro via pacienco."
 },
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
index 383e50a010f..401e9327560 100644
--- a/core/l10n/eo.json
+++ b/core/l10n/eo.json
@@ -128,7 +128,6 @@
     "Search" : "Serĉi",
     "Please contact your administrator." : "Bonvolu kontakti vian administranton.",
     "remember" : "memori",
-    "Log in" : "Ensaluti",
     "Alternative Logins" : "Alternativaj ensalutoj",
     "Thank you for your patience." : "Dankon pro via pacienco."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 376fd97dc94..303e0707402 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -105,7 +105,7 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "La cabecera HTTP \"Strict-Transport-Security\" no está configurada en al menos \"{segundos}\" segundos. Para una mejor seguridad recomendamos que habilite HSTS como es descripta en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
-    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Esta ingresando a este sitio de internet vía HTTP. Sugerimos fuertemente que configure su servidor que utilice HTTPS como es descripto en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está ingresando a este sitio de internet vía HTTP. Le sugerimos enérgicamente que configure su servidor que utilice HTTPS como se describe en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
     "Shared" : "Compartido",
     "Shared with {recipients}" : "Compartido con {recipients}",
     "Error" : "Error",
@@ -115,7 +115,7 @@ OC.L10N.register(
     "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido contigo por {owner}",
     "Share with users or groups …" : "Compartir con usuarios o grupos ...",
-    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos ...",
+    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos...",
     "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
     "Share link" : "Enlace compartido",
@@ -234,7 +234,7 @@ OC.L10N.register(
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
     "Finish setup" : "Completar la instalación",
     "Finishing …" : "Finalizando...",
-    "Need help?" : "Necesita ayuda?",
+    "Need help?" : "¿Necesita ayuda?",
     "See the documentation" : "Vea la documentación",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicación requiere JavaScript para operar correctamente. Por favor, {linkstart}habilite JavaScript{linkend} y recargue la página.",
     "Log out" : "Salir",
@@ -245,7 +245,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.",
     "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?",
     "remember" : "recordar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Inicios de sesión alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola:<br><br>Te comentamos que %s compartió <strong>%s</strong> contigo.<br><a href=\"%s\">¡Échale un vistazo!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 6975ce15c6a..34547fff630 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -103,7 +103,7 @@
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "La cabecera HTTP \"Strict-Transport-Security\" no está configurada en al menos \"{segundos}\" segundos. Para una mejor seguridad recomendamos que habilite HSTS como es descripta en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
-    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Esta ingresando a este sitio de internet vía HTTP. Sugerimos fuertemente que configure su servidor que utilice HTTPS como es descripto en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está ingresando a este sitio de internet vía HTTP. Le sugerimos enérgicamente que configure su servidor que utilice HTTPS como se describe en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
     "Shared" : "Compartido",
     "Shared with {recipients}" : "Compartido con {recipients}",
     "Error" : "Error",
@@ -113,7 +113,7 @@
     "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido contigo por {owner}",
     "Share with users or groups …" : "Compartir con usuarios o grupos ...",
-    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos ...",
+    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos...",
     "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
     "Share link" : "Enlace compartido",
@@ -232,7 +232,7 @@
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
     "Finish setup" : "Completar la instalación",
     "Finishing …" : "Finalizando...",
-    "Need help?" : "Necesita ayuda?",
+    "Need help?" : "¿Necesita ayuda?",
     "See the documentation" : "Vea la documentación",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicación requiere JavaScript para operar correctamente. Por favor, {linkstart}habilite JavaScript{linkend} y recargue la página.",
     "Log out" : "Salir",
@@ -243,7 +243,6 @@
     "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.",
     "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?",
     "remember" : "recordar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Inicios de sesión alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola:<br><br>Te comentamos que %s compartió <strong>%s</strong> contigo.<br><a href=\"%s\">¡Échale un vistazo!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
index 43ef513c434..5cc18198864 100644
--- a/core/l10n/es_AR.js
+++ b/core/l10n/es_AR.js
@@ -150,7 +150,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "¡Falló la autenticación del servidor!",
     "Please contact your administrator." : "Por favor, contacte a su administrador.",
     "remember" : "recordame",
-    "Log in" : "Iniciar sesión",
     "Alternative Logins" : "Nombre alternativos de usuarios",
     "This ownCloud instance is currently in single user mode." : "Esta instancia de ownCloud está en modo de usuario único.",
     "This means only administrators can use the instance." : "Esto significa que solo administradores pueden usar esta instancia.",
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
index 09b42de22bc..8ccb4cedb4b 100644
--- a/core/l10n/es_AR.json
+++ b/core/l10n/es_AR.json
@@ -148,7 +148,6 @@
     "Server side authentication failed!" : "¡Falló la autenticación del servidor!",
     "Please contact your administrator." : "Por favor, contacte a su administrador.",
     "remember" : "recordame",
-    "Log in" : "Iniciar sesión",
     "Alternative Logins" : "Nombre alternativos de usuarios",
     "This ownCloud instance is currently in single user mode." : "Esta instancia de ownCloud está en modo de usuario único.",
     "This means only administrators can use the instance." : "Esto significa que solo administradores pueden usar esta instancia.",
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index 9b71d4a5aaa..7c4ca4a2d61 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -144,7 +144,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
     "Please contact your administrator." : "Por favor, contacte con el administrador.",
     "remember" : "recordar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Accesos Alternativos",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
     "This means only administrators can use the instance." : "Esto quiere decir que solo un administrador puede usarla.",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index 8d95cef6c26..45b55e8f283 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -142,7 +142,6 @@
     "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
     "Please contact your administrator." : "Por favor, contacte con el administrador.",
     "remember" : "recordar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Accesos Alternativos",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
     "This means only administrators can use the instance." : "Esto quiere decir que solo un administrador puede usarla.",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 1cff2557cb0..3e517277f53 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -218,7 +218,6 @@ OC.L10N.register(
     "An internal error occured." : "Tekkis sisemine tõrge.",
     "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.",
     "remember" : "pea meeles",
-    "Log in" : "Logi sisse",
     "Alternative Logins" : "Alternatiivsed sisselogimisviisid",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "See ownCloud on momendil seadistatud ühe kasutaja jaoks.",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 94ebd08dece..73839f889ca 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -216,7 +216,6 @@
     "An internal error occured." : "Tekkis sisemine tõrge.",
     "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.",
     "remember" : "pea meeles",
-    "Log in" : "Logi sisse",
     "Alternative Logins" : "Alternatiivsed sisselogimisviisid",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "See ownCloud on momendil seadistatud ühe kasutaja jaoks.",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index 0d965759770..e215b870125 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -200,7 +200,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
     "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.",
     "remember" : "gogoratu",
-    "Log in" : "Hasi saioa",
     "Alternative Logins" : "Beste erabiltzaile izenak",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
     "This ownCloud instance is currently in single user mode." : "ownCloud instantzia hau erabiltzaile bakar moduan dago.",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index 9206ed66d71..9af46ca9cfb 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -198,7 +198,6 @@
     "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
     "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.",
     "remember" : "gogoratu",
-    "Log in" : "Hasi saioa",
     "Alternative Logins" : "Beste erabiltzaile izenak",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
     "This ownCloud instance is currently in single user mode." : "ownCloud instantzia hau erabiltzaile bakar moduan dago.",
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index bfb76506984..12bdd37eaba 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -146,7 +146,6 @@ OC.L10N.register(
     "Log out" : "خروج",
     "Search" : "جست‌و‌جو",
     "remember" : "بیاد آوری",
-    "Log in" : "ورود",
     "Alternative Logins" : "ورود متناوب",
     "Thank you for your patience." : "از صبر شما متشکریم",
     "Start update" : "اغاز به روز رسانی"
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index a1af42495ab..22a8e2eb0f5 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -144,7 +144,6 @@
     "Log out" : "خروج",
     "Search" : "جست‌و‌جو",
     "remember" : "بیاد آوری",
-    "Log in" : "ورود",
     "Alternative Logins" : "ورود متناوب",
     "Thank you for your patience." : "از صبر شما متشکریم",
     "Start update" : "اغاز به روز رسانی"
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 29839e4d3fe..2893ce8ae2a 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
+    "Preparing update" : "Valmistellaan päivitystä",
     "Turned on maintenance mode" : "Siirrytty huoltotilaan",
     "Turned off maintenance mode" : "Huoltotila asetettu pois päältä",
     "Maintenance mode is kept active" : "Huoltotila pidetään aktiivisena",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Korjausvirhe:",
     "Following incompatible apps have been disabled: %s" : "Seuraavat yhteensopimattomat sovellukset on poistettu käytöstä: %s",
     "Following apps have been disabled: %s" : "Seuraavat sovellukset on poistettu käytöstä: %s",
+    "Already up to date" : "Kaikki on jo ajan tasalla",
     "File is too big" : "Tiedosto on liian suuri",
     "Invalid file provided" : "Määritetty virheellinen tiedosto",
     "No image or file provided" : "Kuvaa tai tiedostoa ei määritelty",
@@ -248,7 +250,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.",
     "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?",
     "remember" : "muista",
-    "Log in" : "Kirjaudu sisään",
     "Alternative Logins" : "Vaihtoehtoiset kirjautumiset",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei!<br><br>%s jakoi kanssasi kohteen <strong>%s</strong>.<br><a href=\"%s\">Tutustu siihen!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Tämä ownCloud-asennus on parhaillaan single user -tilassa.",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 01e11ab7e48..21316024e73 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
+    "Preparing update" : "Valmistellaan päivitystä",
     "Turned on maintenance mode" : "Siirrytty huoltotilaan",
     "Turned off maintenance mode" : "Huoltotila asetettu pois päältä",
     "Maintenance mode is kept active" : "Huoltotila pidetään aktiivisena",
@@ -11,6 +12,7 @@
     "Repair error: " : "Korjausvirhe:",
     "Following incompatible apps have been disabled: %s" : "Seuraavat yhteensopimattomat sovellukset on poistettu käytöstä: %s",
     "Following apps have been disabled: %s" : "Seuraavat sovellukset on poistettu käytöstä: %s",
+    "Already up to date" : "Kaikki on jo ajan tasalla",
     "File is too big" : "Tiedosto on liian suuri",
     "Invalid file provided" : "Määritetty virheellinen tiedosto",
     "No image or file provided" : "Kuvaa tai tiedostoa ei määritelty",
@@ -246,7 +248,6 @@
     "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.",
     "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?",
     "remember" : "muista",
-    "Log in" : "Kirjaudu sisään",
     "Alternative Logins" : "Vaihtoehtoiset kirjautumiset",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei!<br><br>%s jakoi kanssasi kohteen <strong>%s</strong>.<br><a href=\"%s\">Tutustu siihen!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Tämä ownCloud-asennus on parhaillaan single user -tilassa.",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index fc5881d83fe..8b0fbdbe836 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -247,7 +247,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.",
     "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?",
     "remember" : "se souvenir de moi",
-    "Log in" : "Connexion",
     "Alternative Logins" : "Identifiants alternatifs",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjour,<br><br>Nous vous informons que %s a partagé <strong>%s</strong> avec vous.<br><a href=\"%s\">Cliquez ici pour y accéder !</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 7ee6a35ae20..2eb2a722298 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -245,7 +245,6 @@
     "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.",
     "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?",
     "remember" : "se souvenir de moi",
-    "Log in" : "Connexion",
     "Alternative Logins" : "Identifiants alternatifs",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjour,<br><br>Nous vous informons que %s a partagé <strong>%s</strong> avec vous.<br><a href=\"%s\">Cliquez ici pour y accéder !</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index c3cd6303631..f53866cdc08 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -244,7 +244,6 @@ OC.L10N.register(
     "An internal error occured." : "Produciuse un erro interno.",
     "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.",
     "remember" : "lembrar",
-    "Log in" : "Conectar",
     "Alternative Logins" : "Accesos alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instancia do ownCloud está actualmente en modo de usuario único.",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index 72bb146e0e3..1542d83210c 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -242,7 +242,6 @@
     "An internal error occured." : "Produciuse un erro interno.",
     "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.",
     "remember" : "lembrar",
-    "Log in" : "Conectar",
     "Alternative Logins" : "Accesos alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instancia do ownCloud está actualmente en modo de usuario único.",
diff --git a/core/l10n/he.js b/core/l10n/he.js
index 4ca06adfc53..4692495cccb 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -104,7 +104,6 @@ OC.L10N.register(
     "Log out" : "התנתקות",
     "Search" : "חיפוש",
     "remember" : "שמירת הססמה",
-    "Log in" : "כניסה",
     "Alternative Logins" : "כניסות אלטרנטיביות"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/he.json b/core/l10n/he.json
index f2013f1f621..fe873e0b02c 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -102,7 +102,6 @@
     "Log out" : "התנתקות",
     "Search" : "חיפוש",
     "remember" : "שמירת הססמה",
-    "Log in" : "כניסה",
     "Alternative Logins" : "כניסות אלטרנטיביות"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index d79d0a2e455..9d0c1ddeb49 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -200,7 +200,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!",
     "Please contact your administrator." : "Molimo kontaktirajte svog administratora.",
     "remember" : "Sjetite se",
-    "Log in" : "Prijavite se",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u načinu rada za jednog korisnika.",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index 19637fb27a0..1472b8aaa0d 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -198,7 +198,6 @@
     "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!",
     "Please contact your administrator." : "Molimo kontaktirajte svog administratora.",
     "remember" : "Sjetite se",
-    "Log in" : "Prijavite se",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u načinu rada za jednog korisnika.",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 25a0caad57f..ff04fe9900c 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -247,7 +247,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.",
     "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?",
     "remember" : "emlékezzen",
-    "Log in" : "Bejelentkezés",
     "Alternative Logins" : "Alternatív bejelentkezés",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Üdvözöljük!<br><br>\n\nÉrtesítjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 9fe7b6e5d23..d7c20ae181b 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -245,7 +245,6 @@
     "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.",
     "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?",
     "remember" : "emlékezzen",
-    "Log in" : "Bejelentkezés",
     "Alternative Logins" : "Alternatív bejelentkezés",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Üdvözöljük!<br><br>\n\nÉrtesítjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.",
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
index 201585e9890..15842447aa8 100644
--- a/core/l10n/ia.js
+++ b/core/l10n/ia.js
@@ -157,7 +157,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Il falleva authentication de latere servitor!",
     "Please contact your administrator." : "Pro favor continge tu administrator.",
     "remember" : "memora",
-    "Log in" : "Aperir session",
     "Alternative Logins" : "Accessos de autorisation alternative",
     "Thank you for your patience." : "Gratias pro tu patientia.",
     "Start update" : "Initia actualisation"
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
index 2f4d11bfcf8..649e667bdcb 100644
--- a/core/l10n/ia.json
+++ b/core/l10n/ia.json
@@ -155,7 +155,6 @@
     "Server side authentication failed!" : "Il falleva authentication de latere servitor!",
     "Please contact your administrator." : "Pro favor continge tu administrator.",
     "remember" : "memora",
-    "Log in" : "Aperir session",
     "Alternative Logins" : "Accessos de autorisation alternative",
     "Thank you for your patience." : "Gratias pro tu patientia.",
     "Start update" : "Initia actualisation"
diff --git a/core/l10n/id.js b/core/l10n/id.js
index ea5f96015d0..9af2d3bad0c 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -247,7 +247,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.",
     "Wrong password. Reset it?" : "Sandi salah. Atur ulang?",
     "remember" : "selalu masuk",
-    "Log in" : "Masuk",
     "Alternative Logins" : "Cara Alternatif untuk Masuk",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hai,<br><br>hanya memberi tahu jika %s membagikan <strong>%s</strong> dengan Anda.<br><a href=\"%s\">Lihat!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ownCloud ini sedang dalam mode pengguna tunggal.",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 606cdb063a8..79a84db45c5 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -245,7 +245,6 @@
     "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.",
     "Wrong password. Reset it?" : "Sandi salah. Atur ulang?",
     "remember" : "selalu masuk",
-    "Log in" : "Masuk",
     "Alternative Logins" : "Cara Alternatif untuk Masuk",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hai,<br><br>hanya memberi tahu jika %s membagikan <strong>%s</strong> dengan Anda.<br><a href=\"%s\">Lihat!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ownCloud ini sedang dalam mode pengguna tunggal.",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 16860e5afcb..346e4f5306f 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Gat ekki sent póst á eftirfarandi notanda: %s",
+    "Preparing update" : "Undirbúa uppfærslu",
     "Turned on maintenance mode" : "Kveikt á viðhaldsham",
     "Turned off maintenance mode" : "Slökkt á viðhaldsham",
     "Maintenance mode is kept active" : "viðhaldshami er haldið virkur",
@@ -248,7 +249,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Vinsamlegast reyndu aftur eða hafðu samband við kerfisstjóra.",
     "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?",
     "remember" : "muna eftir mér",
-    "Log in" : "Skrá inn",
     "Alternative Logins" : "Aðrar Innskráningar",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Sælir ,<br><br>bara láta þig vita að %s deildi <strong>%s</strong> með þér.<br><a href=\"%s\">Skoða það!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Þetta ownCloud eintak er nú í einnar notandaham.",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index 7fb3457de9c..a89b268d760 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Gat ekki sent póst á eftirfarandi notanda: %s",
+    "Preparing update" : "Undirbúa uppfærslu",
     "Turned on maintenance mode" : "Kveikt á viðhaldsham",
     "Turned off maintenance mode" : "Slökkt á viðhaldsham",
     "Maintenance mode is kept active" : "viðhaldshami er haldið virkur",
@@ -246,7 +247,6 @@
     "Please try again or contact your administrator." : "Vinsamlegast reyndu aftur eða hafðu samband við kerfisstjóra.",
     "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?",
     "remember" : "muna eftir mér",
-    "Log in" : "Skrá inn",
     "Alternative Logins" : "Aðrar Innskráningar",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Sælir ,<br><br>bara láta þig vita að %s deildi <strong>%s</strong> með þér.<br><a href=\"%s\">Skoða það!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Þetta ownCloud eintak er nú í einnar notandaham.",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 9c84001e666..3b540014655 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s",
+    "Preparing update" : "Preparazione aggiornamento",
     "Turned on maintenance mode" : "Modalità di manutenzione attivata",
     "Turned off maintenance mode" : "Modalità di manutenzione disattivata",
     "Maintenance mode is kept active" : "La modalità di manutenzione è lasciata attiva",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Errore di riparazione:",
     "Following incompatible apps have been disabled: %s" : "Le seguenti applicazioni incompatibili sono state disabilitate: %s",
     "Following apps have been disabled: %s" : "Le seguenti applicazioni sono state disabilitate: %s",
+    "Already up to date" : "Già aggiornato",
     "File is too big" : "Il file è troppo grande",
     "Invalid file provided" : "File non valido fornito",
     "No image or file provided" : "Non è stata fornita alcun immagine o file",
@@ -248,7 +250,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.",
     "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?",
     "remember" : "ricorda",
-    "Log in" : "Accedi",
     "Alternative Logins" : "Accessi alternativi",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ciao,<br><br>volevo informarti che %s ha condiviso <strong>%s</strong> con te.<br><a href=\"%s\">Guarda!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Questa istanza di ownCloud è in modalità utente singolo.",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 003ed1883d9..30543ce8a6e 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s",
+    "Preparing update" : "Preparazione aggiornamento",
     "Turned on maintenance mode" : "Modalità di manutenzione attivata",
     "Turned off maintenance mode" : "Modalità di manutenzione disattivata",
     "Maintenance mode is kept active" : "La modalità di manutenzione è lasciata attiva",
@@ -11,6 +12,7 @@
     "Repair error: " : "Errore di riparazione:",
     "Following incompatible apps have been disabled: %s" : "Le seguenti applicazioni incompatibili sono state disabilitate: %s",
     "Following apps have been disabled: %s" : "Le seguenti applicazioni sono state disabilitate: %s",
+    "Already up to date" : "Già aggiornato",
     "File is too big" : "Il file è troppo grande",
     "Invalid file provided" : "File non valido fornito",
     "No image or file provided" : "Non è stata fornita alcun immagine o file",
@@ -246,7 +248,6 @@
     "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.",
     "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?",
     "remember" : "ricorda",
-    "Log in" : "Accedi",
     "Alternative Logins" : "Accessi alternativi",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ciao,<br><br>volevo informarti che %s ha condiviso <strong>%s</strong> con te.<br><a href=\"%s\">Guarda!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Questa istanza di ownCloud è in modalità utente singolo.",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 6d8ad2362ab..fbdd112cb08 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -247,7 +247,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。",
     "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？",
     "remember" : "パスワードを保存",
-    "Log in" : "ログイン",
     "Alternative Logins" : "代替ログイン",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "このownCloudインスタンスは、現在シングルユーザーモードです。",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index a849a4e58fb..c31bd5aba9e 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -245,7 +245,6 @@
     "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。",
     "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？",
     "remember" : "パスワードを保存",
-    "Log in" : "ログイン",
     "Alternative Logins" : "代替ログイン",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "このownCloudインスタンスは、現在シングルユーザーモードです。",
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
index 43e86870ff0..eef607f316d 100644
--- a/core/l10n/ka_GE.js
+++ b/core/l10n/ka_GE.js
@@ -103,7 +103,6 @@ OC.L10N.register(
     "Log out" : "გამოსვლა",
     "Search" : "ძებნა",
     "remember" : "დამახსოვრება",
-    "Log in" : "შესვლა",
     "Alternative Logins" : "ალტერნატიული Login–ი"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
index 26b7073a722..dad6746fe94 100644
--- a/core/l10n/ka_GE.json
+++ b/core/l10n/ka_GE.json
@@ -101,7 +101,6 @@
     "Log out" : "გამოსვლა",
     "Search" : "ძებნა",
     "remember" : "დამახსოვრება",
-    "Log in" : "შესვლა",
     "Alternative Logins" : "ალტერნატიული Login–ი"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/km.js b/core/l10n/km.js
index 28fb959d4e6..b2d3fa069e8 100644
--- a/core/l10n/km.js
+++ b/core/l10n/km.js
@@ -110,7 +110,6 @@ OC.L10N.register(
     "Log out" : "ចាក​ចេញ",
     "Search" : "ស្វែង​រក",
     "remember" : "ចងចាំ",
-    "Log in" : "ចូល",
     "Alternative Logins" : "ការ​ចូល​ជំនួស"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/km.json b/core/l10n/km.json
index ba7e82ff633..b8307fb08de 100644
--- a/core/l10n/km.json
+++ b/core/l10n/km.json
@@ -108,7 +108,6 @@
     "Log out" : "ចាក​ចេញ",
     "Search" : "ស្វែង​រក",
     "remember" : "ចងចាំ",
-    "Log in" : "ចូល",
     "Alternative Logins" : "ការ​ចូល​ជំនួស"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index 98a86efe543..c5aef4258d2 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -236,7 +236,6 @@ OC.L10N.register(
     "An internal error occured." : "내부 오류가 발생하였습니다.",
     "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.",
     "remember" : "기억하기",
-    "Log in" : "로그인",
     "Alternative Logins" : "대체 로그인",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "안녕하세요,<br><br>%s 님이 <strong>%s</strong>을(를) 공유하였음을 알려 드립니다.<br><a href=\"%s\">보러 가기!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ownCloud 인스턴스가 현재 단일 사용자 모드로 동작 중입니다.",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index 5b3ddabc168..b1e133d76ca 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -234,7 +234,6 @@
     "An internal error occured." : "내부 오류가 발생하였습니다.",
     "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.",
     "remember" : "기억하기",
-    "Log in" : "로그인",
     "Alternative Logins" : "대체 로그인",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "안녕하세요,<br><br>%s 님이 <strong>%s</strong>을(를) 공유하였음을 알려 드립니다.<br><a href=\"%s\">보러 가기!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ownCloud 인스턴스가 현재 단일 사용자 모드로 동작 중입니다.",
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index a24c350a926..6bbc675150e 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -121,7 +121,6 @@ OC.L10N.register(
     "Log out" : "Ofmellen",
     "Search" : "Sichen",
     "remember" : "verhalen",
-    "Log in" : "Umellen",
     "Alternative Logins" : "Alternativ Umeldungen",
     "Thank you for your patience." : "Merci fir deng Gedold."
 },
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index 699ee25fd29..4a8fcce1136 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -119,7 +119,6 @@
     "Log out" : "Ofmellen",
     "Search" : "Sichen",
     "remember" : "verhalen",
-    "Log in" : "Umellen",
     "Alternative Logins" : "Alternativ Umeldungen",
     "Thank you for your patience." : "Merci fir deng Gedold."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index f444d28b43a..41f012b6f07 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -157,7 +157,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Autentikacija serveryje nepavyko!",
     "Please contact your administrator." : "Kreipkitės į savo sistemos administratorių.",
     "remember" : "prisiminti",
-    "Log in" : "Prisijungti",
     "Alternative Logins" : "Alternatyvūs prisijungimai",
     "This ownCloud instance is currently in single user mode." : "Ši ownCloud sistema yra vieno naudotojo veiksenoje.",
     "This means only administrators can use the instance." : "Tai reiškia, kad tik administratorius gali naudotis sistema.",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index dc915cb05fa..7b6ad9e4907 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -155,7 +155,6 @@
     "Server side authentication failed!" : "Autentikacija serveryje nepavyko!",
     "Please contact your administrator." : "Kreipkitės į savo sistemos administratorių.",
     "remember" : "prisiminti",
-    "Log in" : "Prisijungti",
     "Alternative Logins" : "Alternatyvūs prisijungimai",
     "This ownCloud instance is currently in single user mode." : "Ši ownCloud sistema yra vieno naudotojo veiksenoje.",
     "This means only administrators can use the instance." : "Tai reiškia, kad tik administratorius gali naudotis sistema.",
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index 3f63ab03ed2..526ef6846c0 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "Log out" : "Izrakstīties",
     "Search" : "Meklēt",
     "remember" : "atcerēties",
-    "Log in" : "Ierakstīties",
     "Alternative Logins" : "Alternatīvās pieteikšanās"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index 15b9bd5f75a..c40bb4757d8 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -118,7 +118,6 @@
     "Log out" : "Izrakstīties",
     "Search" : "Meklēt",
     "remember" : "atcerēties",
-    "Log in" : "Ierakstīties",
     "Alternative Logins" : "Alternatīvās pieteikšanās"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
index 7c132dec81c..bbc073bce0b 100644
--- a/core/l10n/mk.js
+++ b/core/l10n/mk.js
@@ -169,7 +169,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!",
     "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.",
     "remember" : "запамти",
-    "Log in" : "Најава",
     "Alternative Logins" : "Алтернативни најавувања",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.",
     "Thank you for your patience." : "Благодариме на вашето трпение."
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
index 1056ad0b21e..88a4ee81934 100644
--- a/core/l10n/mk.json
+++ b/core/l10n/mk.json
@@ -167,7 +167,6 @@
     "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!",
     "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.",
     "remember" : "запамти",
-    "Log in" : "Најава",
     "Alternative Logins" : "Алтернативни најавувања",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.",
     "Thank you for your patience." : "Благодариме на вашето трпение."
diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js
index 1cdb18d72b2..cd2c54abf4a 100644
--- a/core/l10n/ms_MY.js
+++ b/core/l10n/ms_MY.js
@@ -75,7 +75,6 @@ OC.L10N.register(
     "Finish setup" : "Setup selesai",
     "Log out" : "Log keluar",
     "Search" : "Cari",
-    "remember" : "ingat",
-    "Log in" : "Log masuk"
+    "remember" : "ingat"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
index 3de546e03c9..7e8fa3e0856 100644
--- a/core/l10n/ms_MY.json
+++ b/core/l10n/ms_MY.json
@@ -73,7 +73,6 @@
     "Finish setup" : "Setup selesai",
     "Log out" : "Log keluar",
     "Search" : "Cari",
-    "remember" : "ingat",
-    "Log in" : "Log masuk"
+    "remember" : "ingat"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
index a800e908dcd..a885e55a228 100644
--- a/core/l10n/my_MM.js
+++ b/core/l10n/my_MM.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "Database password" : "Database စကားဝှက်",
     "Database name" : "Database အမည်",
     "Finish setup" : "တပ်ဆင်ခြင်းပြီးပါပြီ။",
-    "remember" : "မှတ်မိစေသည်",
-    "Log in" : "ဝင်ရောက်ရန်"
+    "remember" : "မှတ်မိစေသည်"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
index 329fd194319..a505042f7e1 100644
--- a/core/l10n/my_MM.json
+++ b/core/l10n/my_MM.json
@@ -37,7 +37,6 @@
     "Database password" : "Database စကားဝှက်",
     "Database name" : "Database အမည်",
     "Finish setup" : "တပ်ဆင်ခြင်းပြီးပါပြီ။",
-    "remember" : "မှတ်မိစေသည်",
-    "Log in" : "ဝင်ရောက်ရန်"
+    "remember" : "မှတ်မိစေသည်"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index 1c1e7a2458f..352a0ce78a9 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -236,7 +236,6 @@ OC.L10N.register(
     "An internal error occured." : "Det oppstod en intern feil.",
     "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.",
     "remember" : "husk",
-    "Log in" : "Logg inn",
     "Alternative Logins" : "Alternative innlogginger",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>Dette er en beskjed om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis den!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index d2ee6c14a7d..22afa2b9c92 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -234,7 +234,6 @@
     "An internal error occured." : "Det oppstod en intern feil.",
     "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.",
     "remember" : "husk",
-    "Log in" : "Logg inn",
     "Alternative Logins" : "Alternative innlogginger",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>Dette er en beskjed om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis den!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 80e0ef332fd..b7606ec84cb 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s",
+    "Preparing update" : "Update voorbereiden",
     "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
     "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
     "Maintenance mode is kept active" : "Onderhoudsmodus blijft actief",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Reparatiefout:",
     "Following incompatible apps have been disabled: %s" : "De volgende incompatibele apps zijn uitgeschakeld: %s",
     "Following apps have been disabled: %s" : "De volgende apps zijn gedeactiveerd: %s",
+    "Already up to date" : "Al bijgewerkt",
     "File is too big" : "Bestand te groot",
     "Invalid file provided" : "Ongeldig bestand opgegeven",
     "No image or file provided" : "Geen afbeelding of bestand opgegeven",
@@ -172,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "De update is geslaagd. Er zijn wel waarschuwingen.",
     "The update was successful. Redirecting you to ownCloud now." : "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
     "Couldn't reset password because the token is invalid" : "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
+    "Couldn't reset password because the token is expired" : "Kon het wachtwoord niet herstellen, omdat het token verlopen is",
     "Couldn't send reset email. Please make sure your username is correct." : "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.",
     "%s password reset" : "%s wachtwoord reset",
@@ -247,7 +250,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.",
     "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?",
     "remember" : "onthoud gegevens",
-    "Log in" : "Meld u aan",
     "Alternative Logins" : "Alternatieve inlogs",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk hier!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index 828d78bb4ce..1a3b8a40ad6 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s",
+    "Preparing update" : "Update voorbereiden",
     "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
     "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
     "Maintenance mode is kept active" : "Onderhoudsmodus blijft actief",
@@ -11,6 +12,7 @@
     "Repair error: " : "Reparatiefout:",
     "Following incompatible apps have been disabled: %s" : "De volgende incompatibele apps zijn uitgeschakeld: %s",
     "Following apps have been disabled: %s" : "De volgende apps zijn gedeactiveerd: %s",
+    "Already up to date" : "Al bijgewerkt",
     "File is too big" : "Bestand te groot",
     "Invalid file provided" : "Ongeldig bestand opgegeven",
     "No image or file provided" : "Geen afbeelding of bestand opgegeven",
@@ -170,6 +172,7 @@
     "The update was successful. There were warnings." : "De update is geslaagd. Er zijn wel waarschuwingen.",
     "The update was successful. Redirecting you to ownCloud now." : "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
     "Couldn't reset password because the token is invalid" : "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
+    "Couldn't reset password because the token is expired" : "Kon het wachtwoord niet herstellen, omdat het token verlopen is",
     "Couldn't send reset email. Please make sure your username is correct." : "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.",
     "%s password reset" : "%s wachtwoord reset",
@@ -245,7 +248,6 @@
     "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.",
     "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?",
     "remember" : "onthoud gegevens",
-    "Log in" : "Meld u aan",
     "Alternative Logins" : "Alternatieve inlogs",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk hier!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
index bcc8592e029..7466a7d9a96 100644
--- a/core/l10n/nn_NO.js
+++ b/core/l10n/nn_NO.js
@@ -128,7 +128,6 @@ OC.L10N.register(
     "Log out" : "Logg ut",
     "Search" : "Søk",
     "remember" : "hugs",
-    "Log in" : "Logg inn",
     "Alternative Logins" : "Alternative innloggingar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
index 7505fb85282..ae90139ddca 100644
--- a/core/l10n/nn_NO.json
+++ b/core/l10n/nn_NO.json
@@ -126,7 +126,6 @@
     "Log out" : "Logg ut",
     "Search" : "Søk",
     "remember" : "hugs",
-    "Log in" : "Logg inn",
     "Alternative Logins" : "Alternative innloggingar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index f1448aa9de0..910f5a2265e 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -230,7 +230,6 @@ OC.L10N.register(
     "An internal error occured." : "Una error intèrna s'es produsida.",
     "Please try again or contact your administrator." : "Reensajatz o contactatz vòstre administrator.",
     "remember" : "se remembrar de ieu",
-    "Log in" : "Connexion",
     "Alternative Logins" : "Identificants alternatius",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjorn,<br><br>Vos informam que %s a partejat <strong>%s</strong> amb vos.<br><a href=\"%s\">Clicatz aicí per i accedir !</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Aquesta instància de ownCloud es actualament en mòde utilizaire unic.",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index fedd7ec6c81..6c859cd0c7a 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -228,7 +228,6 @@
     "An internal error occured." : "Una error intèrna s'es produsida.",
     "Please try again or contact your administrator." : "Reensajatz o contactatz vòstre administrator.",
     "remember" : "se remembrar de ieu",
-    "Log in" : "Connexion",
     "Alternative Logins" : "Identificants alternatius",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjorn,<br><br>Vos informam que %s a partejat <strong>%s</strong> amb vos.<br><a href=\"%s\">Clicatz aicí per i accedir !</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Aquesta instància de ownCloud es actualament en mòde utilizaire unic.",
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index 61ce9378891..a26c2b1e2bd 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -207,7 +207,6 @@ OC.L10N.register(
     "Please contact your administrator." : "Skontaktuj się z administratorem",
     "Please try again or contact your administrator." : "Spróbuj ponownie lub skontaktuj się z administratorem.",
     "remember" : "pamiętaj",
-    "Log in" : "Zaloguj",
     "Alternative Logins" : "Alternatywne loginy",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ta instalacja ownCloud działa obecnie w trybie pojedynczego użytkownika.",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index 0ad9d091421..0c3524c5cc4 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -205,7 +205,6 @@
     "Please contact your administrator." : "Skontaktuj się z administratorem",
     "Please try again or contact your administrator." : "Spróbuj ponownie lub skontaktuj się z administratorem.",
     "remember" : "pamiętaj",
-    "Log in" : "Zaloguj",
     "Alternative Logins" : "Alternatywne loginy",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ta instalacja ownCloud działa obecnie w trybie pojedynczego użytkownika.",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 9ecf345d7c1..ad5cf69a798 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s",
+    "Preparing update" : "Preparando atualização",
     "Turned on maintenance mode" : "Ativar modo de manutenção",
     "Turned off maintenance mode" : "Desligar o modo de manutenção",
     "Maintenance mode is kept active" : "O modo de manutenção está sendo mantido como ativo",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Reparação de erro:",
     "Following incompatible apps have been disabled: %s" : "Seguir aplicativos incompatíveis foi desativado: %s",
     "Following apps have been disabled: %s" : "Os seguintes aplicativos foram desabilitados: %s",
+    "Already up to date" : "Já está atualizado",
     "File is too big" : "O arquivo é muito grande",
     "Invalid file provided" : "Arquivo fornecido inválido",
     "No image or file provided" : "Nenhuma imagem ou arquivo fornecido",
@@ -248,7 +250,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.",
     "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?",
     "remember" : "lembrar",
-    "Log in" : "Fazer login",
     "Alternative Logins" : "Logins Alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>só para seu conhecimento que %s compartilhou <strong>%s</strong> com você. <br><a href=\"%s\">Verificar!</a><br><br> ",
     "This ownCloud instance is currently in single user mode." : "Nesta instância ownCloud está em modo de usuário único.",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index b82874a826e..bcc3522c430 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s",
+    "Preparing update" : "Preparando atualização",
     "Turned on maintenance mode" : "Ativar modo de manutenção",
     "Turned off maintenance mode" : "Desligar o modo de manutenção",
     "Maintenance mode is kept active" : "O modo de manutenção está sendo mantido como ativo",
@@ -11,6 +12,7 @@
     "Repair error: " : "Reparação de erro:",
     "Following incompatible apps have been disabled: %s" : "Seguir aplicativos incompatíveis foi desativado: %s",
     "Following apps have been disabled: %s" : "Os seguintes aplicativos foram desabilitados: %s",
+    "Already up to date" : "Já está atualizado",
     "File is too big" : "O arquivo é muito grande",
     "Invalid file provided" : "Arquivo fornecido inválido",
     "No image or file provided" : "Nenhuma imagem ou arquivo fornecido",
@@ -246,7 +248,6 @@
     "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.",
     "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?",
     "remember" : "lembrar",
-    "Log in" : "Fazer login",
     "Alternative Logins" : "Logins Alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>só para seu conhecimento que %s compartilhou <strong>%s</strong> com você. <br><a href=\"%s\">Verificar!</a><br><br> ",
     "This ownCloud instance is currently in single user mode." : "Nesta instância ownCloud está em modo de usuário único.",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index 1dceca1fdad..537efc34728 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -234,7 +234,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
     "Wrong password. Reset it?" : "Senha errada. Repô-la?",
     "remember" : "lembrar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Contas de acesso alternativas",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 3eabc73b287..17c5b5dd587 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -232,7 +232,6 @@
     "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
     "Wrong password. Reset it?" : "Senha errada. Repô-la?",
     "remember" : "lembrar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Contas de acesso alternativas",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index 5b54c4a4297..054c5fcb187 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -149,7 +149,6 @@ OC.L10N.register(
     "Log out" : "Ieșire",
     "Search" : "Căutare",
     "remember" : "amintește",
-    "Log in" : "Autentificare",
     "Alternative Logins" : "Conectări alternative",
     "Thank you for your patience." : "Îți mulțumim pentru răbrade.",
     "Start update" : "Începe actualizarea"
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index 90888980ee6..41f9e9ab0f1 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -147,7 +147,6 @@
     "Log out" : "Ieșire",
     "Search" : "Căutare",
     "remember" : "amintește",
-    "Log in" : "Autentificare",
     "Alternative Logins" : "Conectări alternative",
     "Thank you for your patience." : "Îți mulțumim pentru răbrade.",
     "Start update" : "Începe actualizarea"
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 9de31c69e8d..5b114a933fc 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -240,7 +240,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором",
     "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?",
     "remember" : "запомнить",
-    "Log in" : "Войти",
     "Alternative Logins" : "Альтернативные имена пользователя",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здравствуйте,<br><br>%s поделился с вами <strong>%s</strong>.<br>Перейдите по <a href=\"%s\">ссылке</a>, чтобы посмотреть<br><br>",
     "This ownCloud instance is currently in single user mode." : "Сервер ownCloud в настоящее время работает в однопользовательском режиме.",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index a1f22cb9dd1..b9b2bc4e1ce 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -238,7 +238,6 @@
     "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором",
     "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?",
     "remember" : "запомнить",
-    "Log in" : "Войти",
     "Alternative Logins" : "Альтернативные имена пользователя",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здравствуйте,<br><br>%s поделился с вами <strong>%s</strong>.<br>Перейдите по <a href=\"%s\">ссылке</a>, чтобы посмотреть<br><br>",
     "This ownCloud instance is currently in single user mode." : "Сервер ownCloud в настоящее время работает в однопользовательском режиме.",
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
index 5f20a83a275..be29a54e7b4 100644
--- a/core/l10n/si_LK.js
+++ b/core/l10n/si_LK.js
@@ -82,7 +82,6 @@ OC.L10N.register(
     "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න",
     "Log out" : "නික්මීම",
     "Search" : "සොයන්න",
-    "remember" : "මතක තබාගන්න",
-    "Log in" : "ප්‍රවේශවන්න"
+    "remember" : "මතක තබාගන්න"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
index 8d1a02c4ded..68638609324 100644
--- a/core/l10n/si_LK.json
+++ b/core/l10n/si_LK.json
@@ -80,7 +80,6 @@
     "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න",
     "Log out" : "නික්මීම",
     "Search" : "සොයන්න",
-    "remember" : "මතක තබාගන්න",
-    "Log in" : "ප්‍රවේශවන්න"
+    "remember" : "මතක තබාගන්න"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 8b17371774e..a08bc9d09f3 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -228,7 +228,6 @@ OC.L10N.register(
     "An internal error occured." : "Vyskytla sa vnútorná chyba.",
     "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.",
     "remember" : "zapamätať",
-    "Log in" : "Prihlásiť sa",
     "Alternative Logins" : "Alternatívne prihlásenie",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Táto inštancia ownCloudu je teraz v jednopoužívateľskom móde.",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index c36ee19839f..fcb358cdf9c 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -226,7 +226,6 @@
     "An internal error occured." : "Vyskytla sa vnútorná chyba.",
     "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.",
     "remember" : "zapamätať",
-    "Log in" : "Prihlásiť sa",
     "Alternative Logins" : "Alternatívne prihlásenie",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Táto inštancia ownCloudu je teraz v jednopoužívateľskom móde.",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index f6599d5c2eb..cc7633c0623 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -201,7 +201,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
     "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
     "remember" : "zapomni si",
-    "Log in" : "Prijava",
     "Alternative Logins" : "Druge prijavne možnosti",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index b886b8cd484..96945519caa 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -199,7 +199,6 @@
     "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
     "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
     "remember" : "zapomni si",
-    "Log in" : "Prijava",
     "Alternative Logins" : "Druge prijavne možnosti",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index b3f23289c0c..8e5eda15f06 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -191,7 +191,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Verifikimi në krahun e serverit dështoi!",
     "Please contact your administrator." : "Ju lutem kontaktoni administratorin.",
     "remember" : "kujto",
-    "Log in" : "Hyrje",
     "Alternative Logins" : "Hyrje alternative",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Tungjatjeta,<br><br>dëshirojmë t'ju njoftojmë se %s ka ndarë <strong>%s</strong> me ju.<br><a href=\"%s\">Klikoni këtu për ta shikuar!</a><br>",
     "This ownCloud instance is currently in single user mode." : "Kjo instancë ownCloud është aktualisht në gjendje me përdorues të vetëm.",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index 6005136d8e7..24d73ab8228 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -189,7 +189,6 @@
     "Server side authentication failed!" : "Verifikimi në krahun e serverit dështoi!",
     "Please contact your administrator." : "Ju lutem kontaktoni administratorin.",
     "remember" : "kujto",
-    "Log in" : "Hyrje",
     "Alternative Logins" : "Hyrje alternative",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Tungjatjeta,<br><br>dëshirojmë t'ju njoftojmë se %s ka ndarë <strong>%s</strong> me ju.<br><a href=\"%s\">Klikoni këtu për ta shikuar!</a><br>",
     "This ownCloud instance is currently in single user mode." : "Kjo instancë ownCloud është aktualisht në gjendje me përdorues të vetëm.",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index b32e4467c63..ac11270c8bf 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -234,7 +234,6 @@ OC.L10N.register(
     "An internal error occured." : "Дошло је до интерне грешке.",
     "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.",
     "remember" : "упамти",
-    "Log in" : "Пријава",
     "Alternative Logins" : "Алтернативне пријаве",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да %s дели <strong>%s</strong> са вама.<br><a href=\"%s\">Погледајте!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Овај оунКлауд тренутно ради у режиму једног корисника.",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index ffb7d87c7e4..ceee884de1b 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -232,7 +232,6 @@
     "An internal error occured." : "Дошло је до интерне грешке.",
     "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.",
     "remember" : "упамти",
-    "Log in" : "Пријава",
     "Alternative Logins" : "Алтернативне пријаве",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да %s дели <strong>%s</strong> са вама.<br><a href=\"%s\">Погледајте!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Овај оунКлауд тренутно ради у режиму једног корисника.",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index 36a69cfb9f0..5108f16d996 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -197,7 +197,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Provera identiteta na stani servera nije uspela!",
     "Please contact your administrator." : "Molimo Vas da kontaktirate Vašeg administratora.",
     "remember" : "upamti",
-    "Log in" : "Prijavi se",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej,<br><br>samo ti javljamo da je %s delio <strong>%s</strong> sa tobom.<br><a href=\"%s\">Pogledaj!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova instanca ownCloud-a je trenutno u režimu rada jednog korisnika.",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index 4402ff3e6af..5bc49c7e58a 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -195,7 +195,6 @@
     "Server side authentication failed!" : "Provera identiteta na stani servera nije uspela!",
     "Please contact your administrator." : "Molimo Vas da kontaktirate Vašeg administratora.",
     "remember" : "upamti",
-    "Log in" : "Prijavi se",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej,<br><br>samo ti javljamo da je %s delio <strong>%s</strong> sa tobom.<br><a href=\"%s\">Pogledaj!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova instanca ownCloud-a je trenutno u režimu rada jednog korisnika.",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index 8852d1ca237..a5a7895b2cc 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -202,7 +202,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Servern misslyckades med autentisering!",
     "Please contact your administrator." : "Kontakta din administratör.",
     "remember" : "kom ihåg",
-    "Log in" : "Logga in",
     "Alternative Logins" : "Alternativa inloggningar",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denna ownCloud instans är för närvarande i enanvändarläge",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index f49900f04a8..307fd6afc78 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -200,7 +200,6 @@
     "Server side authentication failed!" : "Servern misslyckades med autentisering!",
     "Please contact your administrator." : "Kontakta din administratör.",
     "remember" : "kom ihåg",
-    "Log in" : "Logga in",
     "Alternative Logins" : "Alternativa inloggningar",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denna ownCloud instans är för närvarande i enanvändarläge",
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
index a22802bee0e..21025db2fa0 100644
--- a/core/l10n/ta_LK.js
+++ b/core/l10n/ta_LK.js
@@ -93,7 +93,6 @@ OC.L10N.register(
     "Finish setup" : "அமைப்பை முடிக்க",
     "Log out" : "விடுபதிகை செய்க",
     "Search" : "தேடுதல்",
-    "remember" : "ஞாபகப்படுத்துக",
-    "Log in" : "புகுபதிகை"
+    "remember" : "ஞாபகப்படுத்துக"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
index 07d08aa9d72..a7f28999023 100644
--- a/core/l10n/ta_LK.json
+++ b/core/l10n/ta_LK.json
@@ -91,7 +91,6 @@
     "Finish setup" : "அமைப்பை முடிக்க",
     "Log out" : "விடுபதிகை செய்க",
     "Search" : "தேடுதல்",
-    "remember" : "ஞாபகப்படுத்துக",
-    "Log in" : "புகுபதிகை"
+    "remember" : "ஞாபகப்படுத்துக"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index 65a7de7705c..142895dd1d0 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "ไม่สามารถส่งอีเมลไปยังผู้ใช้: %s",
+    "Preparing update" : "เตรียมอัพเดท",
     "Turned on maintenance mode" : "เปิดโหมดการบำรุงรักษา",
     "Turned off maintenance mode" : "ปิดโหมดการบำรุงรักษา",
     "Maintenance mode is kept active" : "โหมดการบำรุงรักษาจะถูกเก็บไว้ใช้งาน",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:",
     "Following incompatible apps have been disabled: %s" : "แอพพลิเคชันต่อไปนี้เข้ากันไม่ได้มันจะถูกปิดการใช้งาน: %s",
     "Following apps have been disabled: %s" : "แอพฯดังต่อไปนี้ถูกปิดการใช้งาน: %s",
+    "Already up to date" : "มีอยู่แล้วถึงวันที่",
     "File is too big" : "ไฟล์มีขนาดใหญ่เกินไป",
     "Invalid file provided" : "ระบุไฟล์ไม่ถูกต้อง",
     "No image or file provided" : "ไม่มีรูปภาพหรือไฟล์ที่ระบุ",
@@ -172,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "การอัพเดทสำเร็จ แต่มีคำเตือนอยู่",
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อย กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Couldn't reset password because the token is invalid" : "ไม่สามารถตั้งรหัสผ่านใหม่เพราะโทเค็นไม่ถูกต้อง",
+    "Couldn't reset password because the token is expired" : "ไม่สามารถตั้งค่ารหัสผ่านเพราะโทเค็นหมดอายุ",
     "Couldn't send reset email. Please make sure your username is correct." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่ กรุณาตรวจสอบชื่อผู้ใช้ของคุณให้ถูกต้อง",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่เพราะไม่มีที่อยู่อีเมลนี้ กรุณาติดต่อผู้ดูแลระบบ",
     "%s password reset" : "%s ตั้งรหัสผ่านใหม่",
@@ -247,7 +250,6 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ",
     "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?",
     "remember" : "จดจำฉัน",
-    "Log in" : "เข้าสู่ระบบ",
     "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "นี่คุณ,<br><br>อยากให้คุณทราบว่า %s ได้แชร์ <strong>%s</strong> กับคุณ <br><a href=\"%s\">คลิกดูที่นี่</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ขณะนี้ ownCloud อยู่ในโหมดผู้ใช้คนเดียว",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index a10ff461855..88c74d1eb4c 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "ไม่สามารถส่งอีเมลไปยังผู้ใช้: %s",
+    "Preparing update" : "เตรียมอัพเดท",
     "Turned on maintenance mode" : "เปิดโหมดการบำรุงรักษา",
     "Turned off maintenance mode" : "ปิดโหมดการบำรุงรักษา",
     "Maintenance mode is kept active" : "โหมดการบำรุงรักษาจะถูกเก็บไว้ใช้งาน",
@@ -11,6 +12,7 @@
     "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:",
     "Following incompatible apps have been disabled: %s" : "แอพพลิเคชันต่อไปนี้เข้ากันไม่ได้มันจะถูกปิดการใช้งาน: %s",
     "Following apps have been disabled: %s" : "แอพฯดังต่อไปนี้ถูกปิดการใช้งาน: %s",
+    "Already up to date" : "มีอยู่แล้วถึงวันที่",
     "File is too big" : "ไฟล์มีขนาดใหญ่เกินไป",
     "Invalid file provided" : "ระบุไฟล์ไม่ถูกต้อง",
     "No image or file provided" : "ไม่มีรูปภาพหรือไฟล์ที่ระบุ",
@@ -170,6 +172,7 @@
     "The update was successful. There were warnings." : "การอัพเดทสำเร็จ แต่มีคำเตือนอยู่",
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อย กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Couldn't reset password because the token is invalid" : "ไม่สามารถตั้งรหัสผ่านใหม่เพราะโทเค็นไม่ถูกต้อง",
+    "Couldn't reset password because the token is expired" : "ไม่สามารถตั้งค่ารหัสผ่านเพราะโทเค็นหมดอายุ",
     "Couldn't send reset email. Please make sure your username is correct." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่ กรุณาตรวจสอบชื่อผู้ใช้ของคุณให้ถูกต้อง",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่เพราะไม่มีที่อยู่อีเมลนี้ กรุณาติดต่อผู้ดูแลระบบ",
     "%s password reset" : "%s ตั้งรหัสผ่านใหม่",
@@ -245,7 +248,6 @@
     "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ",
     "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?",
     "remember" : "จดจำฉัน",
-    "Log in" : "เข้าสู่ระบบ",
     "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "นี่คุณ,<br><br>อยากให้คุณทราบว่า %s ได้แชร์ <strong>%s</strong> กับคุณ <br><a href=\"%s\">คลิกดูที่นี่</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ขณะนี้ ownCloud อยู่ในโหมดผู้ใช้คนเดียว",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index df0509bd271..bedc5ce7e26 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -236,7 +236,6 @@ OC.L10N.register(
     "An internal error occured." : "Dahili bir hata oluştu.",
     "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.",
     "remember" : "hatırla",
-    "Log in" : "Giriş yap",
     "Alternative Logins" : "Alternatif Girişler",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Bu ownCloud örneği şu anda tek kullanıcı kipinde.",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index b421d140092..3925a97627d 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -234,7 +234,6 @@
     "An internal error occured." : "Dahili bir hata oluştu.",
     "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.",
     "remember" : "hatırla",
-    "Log in" : "Giriş yap",
     "Alternative Logins" : "Alternatif Girişler",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Bu ownCloud örneği şu anda tek kullanıcı kipinde.",
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index 580126e39c8..ab5689e64f1 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -230,7 +230,6 @@ OC.L10N.register(
     "An internal error occured." : "Виникла внутрішня помилка.",
     "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.",
     "remember" : "запам'ятати",
-    "Log in" : "Увійти",
     "Alternative Logins" : "Альтернативні імена користувача",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто повідомляємо вам, що %s поділився »%s« з вами.<br><a href=\"%s\">Перегляньте!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Сервер ownCloud в даний час працює в однокористувацькому режимі.",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index 188b0436949..7d92acb3cc9 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -228,7 +228,6 @@
     "An internal error occured." : "Виникла внутрішня помилка.",
     "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.",
     "remember" : "запам'ятати",
-    "Log in" : "Увійти",
     "Alternative Logins" : "Альтернативні імена користувача",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто повідомляємо вам, що %s поділився »%s« з вами.<br><a href=\"%s\">Перегляньте!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Сервер ownCloud в даний час працює в однокористувацькому режимі.",
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
index a89d990eeab..bae6b156867 100644
--- a/core/l10n/ur_PK.js
+++ b/core/l10n/ur_PK.js
@@ -111,7 +111,6 @@ OC.L10N.register(
     "Log out" : "لاگ آؤٹ",
     "Search" : "تلاش",
     "remember" : "یاد رکھیں",
-    "Log in" : "لاگ ان",
     "Alternative Logins" : "متبادل لاگ ان ",
     "Thank you for your patience." : "آپ کے صبر کا شکریہ"
 },
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
index 2cb01f2aedb..b2166dfa3b1 100644
--- a/core/l10n/ur_PK.json
+++ b/core/l10n/ur_PK.json
@@ -109,7 +109,6 @@
     "Log out" : "لاگ آؤٹ",
     "Search" : "تلاش",
     "remember" : "یاد رکھیں",
-    "Log in" : "لاگ ان",
     "Alternative Logins" : "متبادل لاگ ان ",
     "Thank you for your patience." : "آپ کے صبر کا شکریہ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index fe5d79f46b5..c51c1563fe4 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -142,7 +142,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!",
     "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.",
     "remember" : "ghi nhớ",
-    "Log in" : "Đăng nhập",
     "Alternative Logins" : "Đăng nhập khác",
     "This ownCloud instance is currently in single user mode." : "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.",
     "This means only administrators can use the instance." : "Điều này có nghĩa chỉ có người quản trị có thể sử dụng trong trường hợp này.",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index 7080777480b..ba8015cafb4 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -140,7 +140,6 @@
     "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!",
     "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.",
     "remember" : "ghi nhớ",
-    "Log in" : "Đăng nhập",
     "Alternative Logins" : "Đăng nhập khác",
     "This ownCloud instance is currently in single user mode." : "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.",
     "This means only administrators can use the instance." : "Điều này có nghĩa chỉ có người quản trị có thể sử dụng trong trường hợp này.",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 7f502f307e2..e82635fe946 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -237,7 +237,6 @@ OC.L10N.register(
     "An internal error occured." : "发生了内部错误。",
     "Please try again or contact your administrator." : "请重试或联系管理员。",
     "remember" : "记住",
-    "Log in" : "登录",
     "Alternative Logins" : "其他登录方式",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<br><a href=\"%s\">现在查看！</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "当前ownCloud实例运行在单用户模式下。",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index f0e45555f04..d47be1b0c5d 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -235,7 +235,6 @@
     "An internal error occured." : "发生了内部错误。",
     "Please try again or contact your administrator." : "请重试或联系管理员。",
     "remember" : "记住",
-    "Log in" : "登录",
     "Alternative Logins" : "其他登录方式",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<br><a href=\"%s\">现在查看！</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "当前ownCloud实例运行在单用户模式下。",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index c4fb9b3486d..fc1bef316a9 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -68,7 +68,6 @@ OC.L10N.register(
     "Database name" : "資料庫名稱",
     "Log out" : "登出",
     "Search" : "尋找",
-    "remember" : "記住",
-    "Log in" : "登入"
+    "remember" : "記住"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index 5aedf688dc4..2a6230797c1 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -66,7 +66,6 @@
     "Database name" : "資料庫名稱",
     "Log out" : "登出",
     "Search" : "尋找",
-    "remember" : "記住",
-    "Log in" : "登入"
+    "remember" : "記住"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index d93f3a8ec8e..29ef83f2614 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -187,7 +187,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "伺服器端認證失敗！",
     "Please contact your administrator." : "請聯絡系統管理員。",
     "remember" : "記住",
-    "Log in" : "登入",
     "Alternative Logins" : "其他登入方法",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "這個 ownCloud 伺服器目前運作於單一使用者模式",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index 0bfc3e619e7..bf1e1a5ff5b 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -185,7 +185,6 @@
     "Server side authentication failed!" : "伺服器端認證失敗！",
     "Please contact your administrator." : "請聯絡系統管理員。",
     "remember" : "記住",
-    "Log in" : "登入",
     "Alternative Logins" : "其他登入方法",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "這個 ownCloud 伺服器目前運作於單一使用者模式",
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index 5c66377bc56..e08ed66f1b5 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -116,7 +116,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
     "The username is already being used" : "El nombre de usuario ya está en uso",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "No están instalados los drivers de BBDD  (sqlite, mysql, o postgresql)",
-    "Microsoft Windows Platform is not supported" : "Plataforma Microsoft Windows no está soportada",
+    "Microsoft Windows Platform is not supported" : "La plataforma Microsoft Windows no está soportada",
     "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Ejecutar el servidor ownCloud en la plataforma Microsoft Windows no está soportada. Sugerimos que utilice un servidor Linux en una máquina virtual si no posee opción de migrar de servidor. Encuentre paquetes de Linux así como implementar máquinas virtuales en <a href=\"%s\">%s</a>. Para migrar instalaciones actuales hacia Linux puede encontrar algunos consejos y un script de migración en <a href=\"%s\">nuestra documentación</a>.",
     "Cannot write into \"config\" directory" : "No se puede escribir el el directorio de configuración",
     "Cannot write into \"apps\" directory" : "No se puede escribir en el directorio de \"apps\"",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index 57b4f936e8a..f9bca103231 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -114,7 +114,7 @@
     "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
     "The username is already being used" : "El nombre de usuario ya está en uso",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "No están instalados los drivers de BBDD  (sqlite, mysql, o postgresql)",
-    "Microsoft Windows Platform is not supported" : "Plataforma Microsoft Windows no está soportada",
+    "Microsoft Windows Platform is not supported" : "La plataforma Microsoft Windows no está soportada",
     "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Ejecutar el servidor ownCloud en la plataforma Microsoft Windows no está soportada. Sugerimos que utilice un servidor Linux en una máquina virtual si no posee opción de migrar de servidor. Encuentre paquetes de Linux así como implementar máquinas virtuales en <a href=\"%s\">%s</a>. Para migrar instalaciones actuales hacia Linux puede encontrar algunos consejos y un script de migración en <a href=\"%s\">nuestra documentación</a>.",
     "Cannot write into \"config\" directory" : "No se puede escribir el el directorio de configuración",
     "Cannot write into \"apps\" directory" : "No se puede escribir en el directorio de \"apps\"",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index c7a68c9000f..d08e8294dfb 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Kan bestand niet lezen",
     "App directory already exists" : "App directory bestaat al",
     "Can't create app folder. Please fix permissions. %s" : "Kan de app map niet aanmaken, Herstel de permissies. %s",
+    "Archive does not contain a directory named %s" : "Archief bevat geen directory genaamd %s",
     "No source specified when installing app" : "Geen bron opgegeven bij installatie van de app",
     "No href specified when installing app from http" : "Geen href opgegeven bij installeren van de app vanaf http",
     "No path specified when installing app from local file" : "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 560e20fbd4f..8d0b5dc7169 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Kan bestand niet lezen",
     "App directory already exists" : "App directory bestaat al",
     "Can't create app folder. Please fix permissions. %s" : "Kan de app map niet aanmaken, Herstel de permissies. %s",
+    "Archive does not contain a directory named %s" : "Archief bevat geen directory genaamd %s",
     "No source specified when installing app" : "Geen bron opgegeven bij installatie van de app",
     "No href specified when installing app from http" : "Geen href opgegeven bij installeren van de app vanaf http",
     "No path specified when installing app from local file" : "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand",
diff --git a/lib/l10n/th_TH.js b/lib/l10n/th_TH.js
index c2d327e22d5..2ff86f599e9 100644
--- a/lib/l10n/th_TH.js
+++ b/lib/l10n/th_TH.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "ไม่สามารถอ่านไฟล์",
     "App directory already exists" : "มีไดเรกทอรีแอพฯอยู่แล้ว",
     "Can't create app folder. Please fix permissions. %s" : "ไม่สามารถสร้างโฟลเดอร์แอพพลิเคชัน โปรดแก้ไขการอนุญาต: %s",
+    "Archive does not contain a directory named %s" : "เอกสารไม่สามารถประกอบด้วยไดเรกทอรีชื่อ %s",
     "No source specified when installing app" : "ไม่ได้ระบุแหล่งที่มาเมื่อติดตั้งแอพพลิเคชัน",
     "No href specified when installing app from http" : "ไม่ได้ระบุ href เมื่อกำลังติดตั้งแอพพลิเคชันจาก http",
     "No path specified when installing app from local file" : "ไม่ได้ระบุเส้นทางไว้เมื่อกำลังติดตั้งแอพฯจากไฟล์ต้นทาง",
diff --git a/lib/l10n/th_TH.json b/lib/l10n/th_TH.json
index d6ffcb5f73d..a215b67a180 100644
--- a/lib/l10n/th_TH.json
+++ b/lib/l10n/th_TH.json
@@ -47,6 +47,7 @@
     "Can't read file" : "ไม่สามารถอ่านไฟล์",
     "App directory already exists" : "มีไดเรกทอรีแอพฯอยู่แล้ว",
     "Can't create app folder. Please fix permissions. %s" : "ไม่สามารถสร้างโฟลเดอร์แอพพลิเคชัน โปรดแก้ไขการอนุญาต: %s",
+    "Archive does not contain a directory named %s" : "เอกสารไม่สามารถประกอบด้วยไดเรกทอรีชื่อ %s",
     "No source specified when installing app" : "ไม่ได้ระบุแหล่งที่มาเมื่อติดตั้งแอพพลิเคชัน",
     "No href specified when installing app from http" : "ไม่ได้ระบุ href เมื่อกำลังติดตั้งแอพพลิเคชันจาก http",
     "No path specified when installing app from local file" : "ไม่ได้ระบุเส้นทางไว้เมื่อกำลังติดตั้งแอพฯจากไฟล์ต้นทาง",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 96baa987a8d..51c22653ad8 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -123,8 +123,8 @@ OC.L10N.register(
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
-    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
-    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "nueva versión %1$s, la version %2$s está instalada, por cuestiones de estabilidad y rendimiento , recomendamos actualizar a la nueva versión %1$s .",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
+    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "nueva versión %1$s, la version %2$s está instalada, por cuestiones de estabilidad y rendimiento recomendamos actualizar a la nueva versión %1$s .",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
     "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.",
@@ -213,7 +213,7 @@ OC.L10N.register(
     "Cheers!" : "¡Saludos!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, ¿qué tal?,\n\nEste mensaje es para hacerle saber que ahora tiene una cuenta %s.\n\nSu nombre de usuario: %s\nAcceda en: %s\n\n",
     "Administrator documentation" : "Documentación del adminsitrador",
-    "Online documentation" : "Documentación en linea",
+    "Online documentation" : "Documentación en línea",
     "Forum" : "Foro",
     "Issue tracker" : "Seguidor de problemas:",
     "Commercial support" : "Soporte Comercial",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index f2e3b2ebd3b..3c0fefc7cfa 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -121,8 +121,8 @@
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
-    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
-    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "nueva versión %1$s, la version %2$s está instalada, por cuestiones de estabilidad y rendimiento , recomendamos actualizar a la nueva versión %1$s .",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
+    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "nueva versión %1$s, la version %2$s está instalada, por cuestiones de estabilidad y rendimiento recomendamos actualizar a la nueva versión %1$s .",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
     "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.",
@@ -211,7 +211,7 @@
     "Cheers!" : "¡Saludos!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, ¿qué tal?,\n\nEste mensaje es para hacerle saber que ahora tiene una cuenta %s.\n\nSu nombre de usuario: %s\nAcceda en: %s\n\n",
     "Administrator documentation" : "Documentación del adminsitrador",
-    "Online documentation" : "Documentación en linea",
+    "Online documentation" : "Documentación en línea",
     "Forum" : "Foro",
     "Issue tracker" : "Seguidor de problemas:",
     "Commercial support" : "Soporte Comercial",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 0b029043441..6fef65aabc4 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -132,6 +132,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de <a href='%s'>installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.",
+    "All checks passed." : "Alle checks geslaagd",
     "Open documentation" : "Open documentatie",
     "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken",
     "Allow users to share via link" : "Sta gebruikers toe om te delen via een link",
@@ -154,6 +155,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
     "Enable server-side encryption" : "Server-side versleuteling inschakelen",
+    "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Versleuteling van de server is een eenrichtingsproces. Als versleuteling is ingeschakeld, worden alle bestanden vanaf dat moment versleuteld op de server en is het niet meer mogelijk versleuteling later uit te schakelen.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Iedereen met toegang met hoge autorisaties op uw ownCloud server kan ue bestanden ontcijferen door aanvragen af te luisteren of de wachtwoorden van gebruikers die in leesbare tekst in sessie bestanden zijn opgeslagen uit te lezen. Versleuteling van de server beschermt dus niet tegen kwaadwillende beheerders, maar is praktisch om uw data op externe opslag te beveiligen.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhankelijk van de gebruikte cryptomodule, zal de bestandsomvang gemiddeld toenemen (35%% of meer bij gebruik van de standaardmodule)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "U zou regelmatig uw cryptosleutels moeten backuppen om permanent gegevensverlies te voorkomen (data/<user>/files_encryption en data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wilt u versleuteling echt inschakelen?",
     "Enable encryption" : "Versleuteling inschakelen",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
     "Select default encryption module:" : "Selecteer de standaard cryptomodule:",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index ff0964a8215..978b70e7996 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -130,6 +130,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de <a href='%s'>installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.",
+    "All checks passed." : "Alle checks geslaagd",
     "Open documentation" : "Open documentatie",
     "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken",
     "Allow users to share via link" : "Sta gebruikers toe om te delen via een link",
@@ -152,6 +153,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
     "Enable server-side encryption" : "Server-side versleuteling inschakelen",
+    "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Versleuteling van de server is een eenrichtingsproces. Als versleuteling is ingeschakeld, worden alle bestanden vanaf dat moment versleuteld op de server en is het niet meer mogelijk versleuteling later uit te schakelen.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Iedereen met toegang met hoge autorisaties op uw ownCloud server kan ue bestanden ontcijferen door aanvragen af te luisteren of de wachtwoorden van gebruikers die in leesbare tekst in sessie bestanden zijn opgeslagen uit te lezen. Versleuteling van de server beschermt dus niet tegen kwaadwillende beheerders, maar is praktisch om uw data op externe opslag te beveiligen.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhankelijk van de gebruikte cryptomodule, zal de bestandsomvang gemiddeld toenemen (35%% of meer bij gebruik van de standaardmodule)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "U zou regelmatig uw cryptosleutels moeten backuppen om permanent gegevensverlies te voorkomen (data/<user>/files_encryption en data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wilt u versleuteling echt inschakelen?",
     "Enable encryption" : "Versleuteling inschakelen",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
     "Select default encryption module:" : "Selecteer de standaard cryptomodule:",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index a66c907be01..043f3429bf3 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -132,6 +132,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "หากการติดตั้งของคุณไม่ได้ติดตั้งในรากของโดเมนและใช้ระบบ cron อาจมีปัญหาเกี่ยวกับการสร้าง URL เพื่อหลีกเลี่ยงปัญหาเหล่านี้โปรดไปตั้งค่า \"overwrite.cli.url\" ในไฟล์ config.php ของคุณไปยังเส้นทาง webroot ของการติดตั้งของคุณ (แนะนำ: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "มันเป็นไปไม่ได้ที่จะดำเนินการ cronjob ผ่านทาง CLI ข้อผิดพลาดทางเทคนิคต่อไปนี้จะปรากฏ:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "กรุณาตรวจสอบ <a target=\"_blank\" href=\"%s\">คู่มือการติดตั้ง</a> และตรวจสอบข้อผิดพลาดหรือคำเตือนใน <a href=\"#log-section\">บันทึก</a>",
+    "All checks passed." : "ผ่านการตรวจสอบทั้งหมด",
     "Open documentation" : "เปิดเอกสาร",
     "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
     "Allow users to share via link" : "อนุญาตให้ผู้ใช้สามารถแชร์ผ่านทางลิงค์",
@@ -154,6 +155,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php มีการลงทะเบียนให้บริการ Webcron เรียก cron.php ทุกๆ 15 นาที บน Http",
     "Use system's cron service to call the cron.php file every 15 minutes." : "บริการ cron ของระบบจะเรียกไฟล์ cron.php ทุกq 15 นาที",
     "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
+    "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "การเข้ารหัสฝั่งเซิร์ฟเวอร์เป็นกระบวนการหนึ่ง เมื่อมีการเปิดใช้การเข้ารหัสไฟล์ทั้งหมดและมันจะเป็นไปไม่ได้ที่จะปิดการใช้งานการเข้ารหัสในภายหลัง",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ทุกคนที่มีสิทธิในการเข้าถึงเซิร์ฟเวอร์ ownCloud คุณสามารถถอดรหัสไฟล์ของคุณโดยการสกัดกั้นการร้องขอหรือการอ่านรหัสผ่านของผู้ใช้ซึ่งจะถูกเก็บไว้ในเซสชั่นไฟล์ข้อความธรรมดา การเข้ารหัสฝั่งเซิร์ฟเวอร์จึงไม่ได้ป้องกันผู้ดูแลระบบที่เป็นอันตราย แต่จะเป็นประโยชน์สำหรับการปกป้องข้อมูลของคุณในการจัดเก็บข้อมูลจากภายนอก",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "ทั้งนี้ขึ้นอยู่กับโมดูลการเข้ารหัสที่เกิดขึ้นจริงขนาดไฟล์ทั่วไปจะเพิ่มขึ้น (35%% หรือมากกว่าเมื่อใช้โมดูลเริ่มต้น)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "คุณควรสำรองข้อมูลคีย์การเข้ารหัสอย่างสม่ำเสมอ เพื่อป้องกันการสูญเสียข้อมูลอย่างถาวร (data/<user>/files_encryption และ data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
     "Select default encryption module:" : "เลือกค่าเริ่มต้นโมดูลการเข้ารหัส:",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index 17ccd3c3bd0..e67cc01f279 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -130,6 +130,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "หากการติดตั้งของคุณไม่ได้ติดตั้งในรากของโดเมนและใช้ระบบ cron อาจมีปัญหาเกี่ยวกับการสร้าง URL เพื่อหลีกเลี่ยงปัญหาเหล่านี้โปรดไปตั้งค่า \"overwrite.cli.url\" ในไฟล์ config.php ของคุณไปยังเส้นทาง webroot ของการติดตั้งของคุณ (แนะนำ: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "มันเป็นไปไม่ได้ที่จะดำเนินการ cronjob ผ่านทาง CLI ข้อผิดพลาดทางเทคนิคต่อไปนี้จะปรากฏ:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "กรุณาตรวจสอบ <a target=\"_blank\" href=\"%s\">คู่มือการติดตั้ง</a> และตรวจสอบข้อผิดพลาดหรือคำเตือนใน <a href=\"#log-section\">บันทึก</a>",
+    "All checks passed." : "ผ่านการตรวจสอบทั้งหมด",
     "Open documentation" : "เปิดเอกสาร",
     "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
     "Allow users to share via link" : "อนุญาตให้ผู้ใช้สามารถแชร์ผ่านทางลิงค์",
@@ -152,6 +153,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php มีการลงทะเบียนให้บริการ Webcron เรียก cron.php ทุกๆ 15 นาที บน Http",
     "Use system's cron service to call the cron.php file every 15 minutes." : "บริการ cron ของระบบจะเรียกไฟล์ cron.php ทุกq 15 นาที",
     "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
+    "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "การเข้ารหัสฝั่งเซิร์ฟเวอร์เป็นกระบวนการหนึ่ง เมื่อมีการเปิดใช้การเข้ารหัสไฟล์ทั้งหมดและมันจะเป็นไปไม่ได้ที่จะปิดการใช้งานการเข้ารหัสในภายหลัง",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ทุกคนที่มีสิทธิในการเข้าถึงเซิร์ฟเวอร์ ownCloud คุณสามารถถอดรหัสไฟล์ของคุณโดยการสกัดกั้นการร้องขอหรือการอ่านรหัสผ่านของผู้ใช้ซึ่งจะถูกเก็บไว้ในเซสชั่นไฟล์ข้อความธรรมดา การเข้ารหัสฝั่งเซิร์ฟเวอร์จึงไม่ได้ป้องกันผู้ดูแลระบบที่เป็นอันตราย แต่จะเป็นประโยชน์สำหรับการปกป้องข้อมูลของคุณในการจัดเก็บข้อมูลจากภายนอก",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "ทั้งนี้ขึ้นอยู่กับโมดูลการเข้ารหัสที่เกิดขึ้นจริงขนาดไฟล์ทั่วไปจะเพิ่มขึ้น (35%% หรือมากกว่าเมื่อใช้โมดูลเริ่มต้น)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "คุณควรสำรองข้อมูลคีย์การเข้ารหัสอย่างสม่ำเสมอ เพื่อป้องกันการสูญเสียข้อมูลอย่างถาวร (data/<user>/files_encryption และ data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
     "Select default encryption module:" : "เลือกค่าเริ่มต้นโมดูลการเข้ารหัส:",
-- 
GitLab


From a12d3547627611a933b3e70ab5b51c2e130b0e24 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 28 Aug 2015 12:04:52 +0200
Subject: [PATCH 064/783] Deprecate OC_L10N::get()

---
 lib/private/l10n.php | 9 +++------
 lib/public/il10n.php | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 17acaac1692..168011cfcec 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -81,14 +81,11 @@ class OC_L10N implements \OCP\IL10N {
 	 * get an L10N instance
 	 * @param string $app
 	 * @param string|null $lang
-	 * @return \OC_L10N
+	 * @return \OCP\IL10N
+	 * @deprecated Use \OC::$server->getL10NFactory()->get() instead
 	 */
 	public static function get($app, $lang=null) {
-		if (is_null($lang)) {
-			return OC::$server->getL10N($app);
-		} else {
-			return new \OC_L10N($app, $lang);
-		}
+		return \OC::$server->getL10NFactory()->get($app, $lang);
 	}
 
 	/**
diff --git a/lib/public/il10n.php b/lib/public/il10n.php
index e1d0102105b..c6e076a21f8 100644
--- a/lib/public/il10n.php
+++ b/lib/public/il10n.php
@@ -100,7 +100,7 @@ interface IL10N {
 
 
 	/**
-	 * The code (en, de, ...) of the language that is used for this OC_L10N object
+	 * The code (en, de, ...) of the language that is used for this IL10N object
 	 *
 	 * @return string language
 	 * @since 7.0.0
-- 
GitLab


From bd1215c1dd0955bc8c99a8d6d9005a6fd6bdc8aa Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 28 Aug 2015 12:08:54 +0200
Subject: [PATCH 065/783] Add a test for the interface

---
 tests/lib/server.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/lib/server.php b/tests/lib/server.php
index bc44c50a22a..e73fc8b3ab1 100644
--- a/tests/lib/server.php
+++ b/tests/lib/server.php
@@ -90,6 +90,7 @@ class Server extends \Test\TestCase {
 			['JobList', '\OCP\BackgroundJob\IJobList'],
 
 			['L10NFactory', '\OC\L10N\Factory'],
+			['L10NFactory', '\OCP\L10N\IFactory'],
 			['LockingProvider', '\OCP\Lock\ILockingProvider'],
 			['Logger', '\OC\Log'],
 			['Logger', '\OCP\ILogger'],
-- 
GitLab


From 7303b68577979bfe53859157f60659bfb3c6000e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 28 Aug 2015 12:23:57 +0200
Subject: [PATCH 066/783] Fix controls bar calculation

Controls bar calculation needs to take the sidebar visibility into
account.

Recalculation is now triggered when sidebar is toggled, using a new
app-content event "appresized".
---
 core/js/apps.js |  6 +++---
 core/js/js.js   | 12 +++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/js/apps.js b/core/js/apps.js
index f148de3b2e9..d8f4bfdf1c5 100644
--- a/core/js/apps.js
+++ b/core/js/apps.js
@@ -27,8 +27,8 @@
 	 */
 	exports.Apps.showAppSidebar = function($el) {
 		var $appSidebar = $el || $('#app-sidebar');
-		$appSidebar.removeClass('disappear')
-		$('#app-content').addClass('with-app-sidebar');
+		$appSidebar.removeClass('disappear');
+		$('#app-content').addClass('with-app-sidebar').trigger(new $.Event('appresized'));
 
 	};
 
@@ -41,7 +41,7 @@
 	exports.Apps.hideAppSidebar = function($el) {
 		var $appSidebar = $el || $('#app-sidebar');
 		$appSidebar.addClass('disappear');
-		$('#app-content').removeClass('with-app-sidebar');
+		$('#app-content').removeClass('with-app-sidebar').trigger(new $.Event('appresized'));
 	};
 
 	/**
diff --git a/core/js/js.js b/core/js/js.js
index 52cf076472a..8d3756ae2ec 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1393,13 +1393,19 @@ function initCore() {
 				// if there is a scrollbar …
 				if($('#app-content').get(0).scrollHeight > $('#app-content').height()) {
 					if($(window).width() > 768) {
-						controlsWidth = $('#content').width() - $('#app-navigation').width() - $('#app-sidebar').width() - getScrollBarWidth();
+						controlsWidth = $('#content').width() - $('#app-navigation').width() - getScrollBarWidth();
+						if (!$('#app-sidebar').hasClass('hidden') && !$('#app-sidebar').hasClass('disappear')) {
+							controlsWidth -= $('#app-sidebar').width();
+						}
 					} else {
 						controlsWidth = $('#content').width() - getScrollBarWidth();
 					}
 				} else { // if there is none
 					if($(window).width() > 768) {
-						controlsWidth = $('#content').width() - $('#app-navigation').width() - $('#app-sidebar').width();
+						controlsWidth = $('#content').width() - $('#app-navigation').width();
+						if (!$('#app-sidebar').hasClass('hidden') && !$('#app-sidebar').hasClass('disappear')) {
+							controlsWidth -= $('#app-sidebar').width();
+						}
 					} else {
 						controlsWidth = $('#content').width();
 					}
@@ -1411,7 +1417,7 @@ function initCore() {
 
 		$(window).resize(_.debounce(adjustControlsWidth, 250));
 
-		$('body').delegate('#app-content', 'apprendered', adjustControlsWidth);
+		$('body').delegate('#app-content', 'apprendered appresized', adjustControlsWidth);
 
 	}
 
-- 
GitLab


From 30d2283bedb804350bd8641307c34a9b490ee0fb Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 28 Aug 2015 13:30:20 +0200
Subject: [PATCH 067/783] compress icons in navigation, move to monochrome
 again

---
 apps/files/img/delete.png | Bin 243 -> 208 bytes
 apps/files/img/folder.png | Bin 135 -> 151 bytes
 apps/files/img/folder.svg |   4 ++--
 apps/files/img/public.svg |   4 ++--
 apps/files/img/star.png   | Bin 492 -> 422 bytes
 apps/files/img/star.svg   |   2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/files/img/delete.png b/apps/files/img/delete.png
index e891b370cca7b3d83e937863dbbc9578c5b8b1bd..20e894c7f740da793d98590fa12e998749ae2ad3 100644
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHF4e$wZ{r~?zkVzysV6}MxP$^$Y
zkY6wZvyN+A`Ggfa4jepu>+=mQw;Mni7f%<*5RT~HlM8tp3`86bX4|%T&X^)NW2G_!
z*BO6tjR&*5{PsREypgxT%_U|ML-GHUB@bdYiLZLo7<+Aj#I^MrTUPyMxG`DgbVqi-
PKFCp?u6{1-oD!M<K4Lwe

delta 227
zcmcb>_?dBnL_G%^0|SHn=l_X7ilx}eGlT;OYB*9lfPBsZkH}&M2Hxu+%;=;sy8<XE
zS>hT|5}cn_Ql40p%1~Zju9umYU7Va)kgAtols@~NjTBH(fv1aOh(+(&Nr7Ak6nLB`
zSN{L~L$hMW+xyHZ_NPKLN`%{5>u%aj7V?TY<RyEJ`J_wG*2$g|T2?7BP1u}#J9)Fi
zr>WweEFT!`!Y2ng9#!1`#rm_L|MB^U&(t-XW|T<#w)um70$&irgv53YW{$t-il*cn
XUC&$i?88QNpydpnu6{1-oD!M<Gdoqr

diff --git a/apps/files/img/folder.png b/apps/files/img/folder.png
index 3dfb4391f2cde95313b8fd10b3193604f95bbabf..287a0c9ba6df4317e00aebd4464d05d78606228d 100644
GIT binary patch
delta 122
zcmZo?oX$8wrC2(^C&ZNjH<%LmNC7CzQ4-`A%)r>t@$UVHe<6aJ>wsd)o-U3d95a&>
y4lpFi%5o*NxwyL<_b@W?8MrYn<q4e8D8ayx@KAk!@HAC#kOiKuelF{r5}E+&G90l0

delta 106
zcmbQv*v>dXC7D0KC&ZP3fg!A9W=PSj&|(nM=IyQo3bB*~`2{mHbiAMFIbj2kuk7jK
z7{W0#IpF}q89hCw1h($(Zs8tACN_gM=A}GoGa4lr7_|NgKlC;Erv+5b;OXk;vd$@?
F2>{sIAhiGh

diff --git a/apps/files/img/folder.svg b/apps/files/img/folder.svg
index e9d96d40490..0cf4b3499dc 100644
--- a/apps/files/img/folder.svg
+++ b/apps/files/img/folder.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.05 -864.43)" fill="#55739a">
-  <path d="m200.2 999.72c-0.28913 0-0.53125 0.2421-0.53125 0.53117v12.784c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53124-0.2327 0.53124-0.5312l0.0004-10.474c0-0.2889-0.24211-0.5338-0.53124-0.5338l-7.5457 0.0005-2.3076-2.3078z" fill-rule="evenodd" fill="#55739a"/>
+ <g fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.05 -864.43)">
+  <path d="m200.2 999.72c-0.28913 0-0.53125 0.2421-0.53125 0.53117v12.784c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53124-0.2327 0.53124-0.5312l0.0004-10.474c0-0.2889-0.24211-0.5338-0.53124-0.5338l-7.5457 0.0005-2.3076-2.3078z" fill-rule="evenodd"/>
  </g>
 </svg>
diff --git a/apps/files/img/public.svg b/apps/files/img/public.svg
index 99a71c6cb5b..7721c9e3408 100644
--- a/apps/files/img/public.svg
+++ b/apps/files/img/public.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
  <g transform="matrix(.67042 -.67042 .67042 .67042 .62542 93.143)">
-  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m69.5-61.5c-1.9217 0-3.5 1.5783-3.5 3.5 0 0.17425 0.0062 0.33232 0.03125 0.5h2.0625c-0.053-0.156-0.094-0.323-0.094-0.5 0-0.8483 0.6517-1.5 1.5-1.5h5c0.8483 0 1.5 0.6517 1.5 1.5s-0.6517 1.5-1.5 1.5h-1.6875c-0.28733 0.79501-0.78612 1.4793-1.4375 2h3.125c1.9217 0 3.5-1.5783 3.5-3.5s-1.5783-3.5-3.5-3.5h-5z"/>
-  <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m68.5-54.5c1.9217 0 3.5-1.5783 3.5-3.5 0-0.17425-0.0062-0.33232-0.03125-0.5h-2.0625c0.053 0.156 0.094 0.323 0.094 0.5 0 0.8483-0.6517 1.5-1.5 1.5h-5c-0.8483 0-1.5-0.6517-1.5-1.5s0.6517-1.5 1.5-1.5h1.6875c0.28733-0.79501 0.78612-1.4793 1.4375-2h-3.125c-1.9217 0-3.5 1.5783-3.5 3.5s1.5783 3.5 3.5 3.5h5z"/>
+  <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m69.5-61.5c-1.9217 0-3.5 1.5783-3.5 3.5 0 0.17425 0.0062 0.33232 0.03125 0.5h2.0625c-0.053-0.156-0.094-0.323-0.094-0.5 0-0.8483 0.6517-1.5 1.5-1.5h5c0.8483 0 1.5 0.6517 1.5 1.5s-0.6517 1.5-1.5 1.5h-1.6875c-0.28733 0.79501-0.78612 1.4793-1.4375 2h3.125c1.9217 0 3.5-1.5783 3.5-3.5s-1.5783-3.5-3.5-3.5h-5z"/>
+  <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m68.5-54.5c1.9217 0 3.5-1.5783 3.5-3.5 0-0.17425-0.0062-0.33232-0.03125-0.5h-2.0625c0.053 0.156 0.094 0.323 0.094 0.5 0 0.8483-0.6517 1.5-1.5 1.5h-5c-0.8483 0-1.5-0.6517-1.5-1.5s0.6517-1.5 1.5-1.5h1.6875c0.28733-0.79501 0.78612-1.4793 1.4375-2h-3.125c-1.9217 0-3.5 1.5783-3.5 3.5s1.5783 3.5 3.5 3.5h5z"/>
  </g>
 </svg>
diff --git a/apps/files/img/star.png b/apps/files/img/star.png
index 22e68c757e79535d4378a7e7539b5f6e99dfb401..8b24c4441cfa2877a37c9275b800edb4b08dfe4a 100644
GIT binary patch
delta 397
zcmV;80doHA1EvFzBYyw{b3#c}2nYxWd<bNS00009a7bBm000fw000fw0YWI7cmMzZ
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10V7F7K~y-6t<<|p15p%(
z;g6soF@jnNVl5KH3#5!-ZKbVZBZ8^DfNx+c_yiV$t+fweqkrHV2$D)8C~69?MP^`(
zljJ0s1&cW_YyYe{Fq?1{F&`SvbpftmyNi5~3V6l~MzRD~@Dq6}OYm(1e3ccnoPfq&
z$O3$p0zT<9G!Q+<5*|&Q$FY_&w}B_r@EG|aaejw=e5JJN)!*2Q8?53j185!V&7U`i
z`#zvmlv1t@On>6K2j~r^T0vtKaM1<y9QjVrSc7;CfYzhzKebvyGZ+piFr>xCYXx2o
zfW}(t7hKoaaLp=*HpprGRmr=&#55*w+Vrm0rr;kfCWflmOv$X^E|DvSfOqkMW9^rE
r9!L1ZP6+rAvmwDqB^-2-?@zz=e2+K`#rM?!0000<MFvhpu0mjfy(p$|

delta 467
zcmV;^0WAKe1MCBkBYy$2Nkl<ZIE}5<ze|--9LMq3_tAt)iRluwG&E#LrB~76MkO>g
zv{XYyYlBNr&_5B;);}N(EeQ=S{Q*He71@t5C~61{1Q89do(3(iK9}w>`@rEm=lkRR
zd^zWPIFVA4r817`(rYA@IpN)TRD>z(YRCddR>gC%->PruvVY>RMq2EYQsn$y({=RW
zfSRj0DS6;zs^$CU{{ffLz^N9?s8><nJ2+aZ-LiG8x|=Ax)90stg?{S>Hs^j}0GBIS
z$u(vC!2F+)Hpi-YjkFl4bO-kk9jnh%!rhH_E8~(djoKceOTrEHG_%#mWsD0?ap)hR
zUlcAHNpERAynnIuLSX_Qc8yG)Ya0Iz-42G4^cf92%Z7$&2Thtt-?y3DUg?j~W7&ev
zd%o<GURToEPDlGbUNM*fg_@&=+d0~UlgSL|hSr_Q2Xn5CZ5ay{YdD(;j)F??tTjWL
z1|^So_)Zg*%T+zRmocpHW^?sbxTT(+Y>O%5g76SWKumJNSbG2Wio+zDxUc4T1qx$n
z);>eR1FVVaK3AWn&?Ahhr@4x+RVULDZhIY%B<Cxb?8kJM`UU(!g2-mw$+-Xk002ov
JPDHLkV1lo#=Y9YH

diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg
index 130bab366a2..ba0f54f8eba 100644
--- a/apps/files/img/star.svg
+++ b/apps/files/img/star.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
  <g transform="matrix(.068322 0 0 .068322 -10.114 -50.902)">
-  <path d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)" fill="#FC0"/>
+  <path d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)"/>
  </g>
 </svg>
-- 
GitLab


From 19bc5a452a97788c9153c05523cf6dd61d9c111c Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 12 Aug 2015 22:10:30 +0100
Subject: [PATCH 068/783] Migrate Swift external storage to new API

The Rackspace/OpenStack differences have been split into separate auth
mechanisms, with correct legacy migration
---
 apps/files_external/appinfo/app.php           | 18 ------
 apps/files_external/appinfo/application.php   |  5 ++
 .../lib/auth/openstack/openstack.php          | 48 +++++++++++++++
 .../lib/auth/openstack/rackspace.php          | 46 ++++++++++++++
 apps/files_external/lib/backend/swift.php     | 60 +++++++++++++++++++
 5 files changed, 159 insertions(+), 18 deletions(-)
 create mode 100644 apps/files_external/lib/auth/openstack/openstack.php
 create mode 100644 apps/files_external/lib/auth/openstack/rackspace.php
 create mode 100644 apps/files_external/lib/backend/swift.php

diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 9db4b0a6330..da24dfd819a 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -70,24 +70,6 @@ if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == '
 OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC_Mount_Config', 'initMountPointsHook');
 OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login');
 
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', [
-	'backend' => (string)$l->t('OpenStack Object Storage'),
-	'priority' => 100,
-	'configuration' => [
-		'user' => (string)$l->t('Username'),
-		'bucket' => (string)$l->t('Bucket'),
-		'region' => '&'.$l->t('Region (optional for OpenStack Object Storage)'),
-		'key' => '&*'.$l->t('API Key (required for Rackspace Cloud Files)'),
-		'tenant' => '&'.$l->t('Tenantname (required for OpenStack Object Storage)'),
-		'password' => '&*'.$l->t('Password (required for OpenStack Object Storage)'),
-		'service_name' => '&'.$l->t('Service Name (required for OpenStack Object Storage)'),
-		'url' => '&'.$l->t('URL of identity endpoint (required for OpenStack Object Storage)'),
-		'timeout' => '&'.$l->t('Timeout of HTTP requests in seconds'),
-	],
-	'has_dependencies' => true,
-]);
-
-
 if (!OC_Util::runningOnWindows()) {
 	OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', [
 			'backend' => (string)$l->t('SMB / CIFS using OC login'),
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index 1e43c737408..81e60658c8c 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -68,6 +68,7 @@ class Application extends App {
 			$container->query('OCA\Files_External\Lib\Backend\AmazonS3'),
 			$container->query('OCA\Files_External\Lib\Backend\Dropbox'),
 			$container->query('OCA\Files_External\Lib\Backend\Google'),
+			$container->query('OCA\Files_External\Lib\Backend\Swift'),
 		]);
 
 		if (!\OC_Util::runningOnWindows()) {
@@ -101,6 +102,10 @@ class Application extends App {
 			// AuthMechanism::SCHEME_OAUTH2 mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\OAuth2\OAuth2'),
 
+			// AuthMechanism::SCHEME_OPENSTACK mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\OpenStack\OpenStack'),
+			$container->query('OCA\Files_External\Lib\Auth\OpenStack\Rackspace'),
+
 			// Specialized mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\AmazonS3\AccessKey'),
 		]);
diff --git a/apps/files_external/lib/auth/openstack/openstack.php b/apps/files_external/lib/auth/openstack/openstack.php
new file mode 100644
index 00000000000..faf356bcf2e
--- /dev/null
+++ b/apps/files_external/lib/auth/openstack/openstack.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\OpenStack;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * OpenStack Keystone authentication
+ */
+class OpenStack extends AuthMechanism {
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('openstack::openstack')
+			->setScheme(self::SCHEME_OPENSTACK)
+			->setText($l->t('OpenStack'))
+			->addParameters([
+				(new DefinitionParameter('user', $l->t('Username'))),
+				(new DefinitionParameter('password', $l->t('Password')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+				(new DefinitionParameter('tenant', $l->t('Tenant name'))),
+				(new DefinitionParameter('url', $l->t('Identity endpoint URL'))),
+			])
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/auth/openstack/rackspace.php b/apps/files_external/lib/auth/openstack/rackspace.php
new file mode 100644
index 00000000000..9268f3aad87
--- /dev/null
+++ b/apps/files_external/lib/auth/openstack/rackspace.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\OpenStack;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * Rackspace authentication
+ */
+class Rackspace extends AuthMechanism {
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('openstack::rackspace')
+			->setScheme(self::SCHEME_OPENSTACK)
+			->setText($l->t('Rackspace'))
+			->addParameters([
+				(new DefinitionParameter('user', $l->t('Username'))),
+				(new DefinitionParameter('key', $l->t('API key')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+			])
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/backend/swift.php b/apps/files_external/lib/backend/swift.php
new file mode 100644
index 00000000000..9f01a923638
--- /dev/null
+++ b/apps/files_external/lib/backend/swift.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Auth\OpenStack\OpenStack;
+use \OCA\Files_External\Lib\Auth\OpenStack\Rackspace;
+
+class Swift extends Backend {
+
+	public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
+		$this
+			->setIdentifier('swift')
+			->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
+			->setStorageClass('\OC\Files\Storage\Swift')
+			->setText($l->t('OpenStack Object Storage'))
+			->addParameters([
+				(new DefinitionParameter('service_name', $l->t('Service name')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('region', $l->t('Region')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('bucket', $l->t('Bucket'))),
+				(new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+			])
+			->setDependencyCheck('\OC\Files\Storage\Swift::checkDependencies')
+			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
+			->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
+				if (isset($params['key'])) {
+					return $rackspaceAuth;
+				}
+				return $openstackAuth;
+			})
+		;
+	}
+
+}
-- 
GitLab


From cb1ef827028126dd55c21fc3f3720723e5cc25a6 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 12 Aug 2015 22:14:42 +0100
Subject: [PATCH 069/783] Migrate SMB_OC external storage to new API

SMB_OC has been merged with SMB, via the identifier aliases mechanism.
Legacy migration is done to the Session Credentials password mechanism
---
 apps/files_external/appinfo/app.php         |  16 ---
 apps/files_external/appinfo/application.php |   1 +
 apps/files_external/lib/backend/smb_oc.php  |  67 +++++++++++
 apps/files_external/lib/smb_oc.php          | 126 --------------------
 4 files changed, 68 insertions(+), 142 deletions(-)
 create mode 100644 apps/files_external/lib/backend/smb_oc.php
 delete mode 100644 apps/files_external/lib/smb_oc.php

diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index da24dfd819a..351b87c4c8b 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -37,7 +37,6 @@ OC::$CLASSPATH['OC\Files\Storage\OwnCloud'] = 'files_external/lib/owncloud.php';
 OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php';
 OC::$CLASSPATH['OC\Files\Storage\Swift'] = 'files_external/lib/swift.php';
 OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php';
-OC::$CLASSPATH['OC\Files\Storage\SMB_OC'] = 'files_external/lib/smb_oc.php';
 OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php';
 OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php';
 OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php';
@@ -68,21 +67,6 @@ if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == '
 
 // connecting hooks
 OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC_Mount_Config', 'initMountPointsHook');
-OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login');
-
-if (!OC_Util::runningOnWindows()) {
-	OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', [
-			'backend' => (string)$l->t('SMB / CIFS using OC login'),
-			'priority' => 90,
-			'configuration' => [
-				'host' => (string)$l->t('Host'),
-				'username_as_share' => '!'.$l->t('Username as share'),
-				'share' => '&'.$l->t('Share'),
-				'root' => '&'.$l->t('Remote subfolder'),
-			],
-		'has_dependencies' => true,
-	]);
-}
 
 OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP_Key', [
 	'backend' => (string)$l->t('SFTP with secret key login'),
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index 81e60658c8c..e5275c29b39 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -74,6 +74,7 @@ class Application extends App {
 		if (!\OC_Util::runningOnWindows()) {
 			$service->registerBackends([
 				$container->query('OCA\Files_External\Lib\Backend\SMB'),
+				$container->query('OCA\Files_External\Lib\Backend\SMB_OC'),
 			]);
 		}
 	}
diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php
new file mode 100644
index 00000000000..cae3818c76c
--- /dev/null
+++ b/apps/files_external/lib/backend/smb_oc.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Auth\Password\SessionCredentials;
+use \OCA\Files_External\Lib\StorageConfig;
+
+/**
+ * Deprecated SMB_OC class - use SMB with the password::sessioncredentials auth mechanism
+ */
+class SMB_OC extends Backend {
+
+	public function __construct(IL10N $l, SessionCredentials $legacyAuth) {
+		$this
+			->setIdentifier('\OC\Files\Storage\SMB_OC')
+			->setStorageClass('\OC\Files\Storage\SMB')
+			->setText($l->t('SMB / CIFS using OC login [DEPRECATED]'))
+			->addParameters([
+				(new DefinitionParameter('host', $l->t('Host'))),
+				(new DefinitionParameter('username_as_share', $l->t('Username as share')))
+					->setType(DefinitionParameter::VALUE_BOOLEAN),
+				(new DefinitionParameter('share', $l->t('Share')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('root', $l->t('Remote subfolder')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+			])
+			->setDependencyCheck('\OC\Files\Storage\SMB::checkDependencies')
+			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
+			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+	public function manipulateStorageConfig(StorageConfig &$storage) {
+		$username_as_share = ($storage->getBackendOption('username_as_share') === 'true');
+
+		if ($this->username_as_share) {
+			$share = '/' . $storage->getBackendOption('user');
+			$storage->setBackendOption('share', $share);
+		}
+	}
+
+}
diff --git a/apps/files_external/lib/smb_oc.php b/apps/files_external/lib/smb_oc.php
deleted file mode 100644
index 547caa5ecbf..00000000000
--- a/apps/files_external/lib/smb_oc.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OC\Files\Storage;
-
-
-use Icewind\SMB\Exception\AccessDeniedException;
-use Icewind\SMB\Exception\Exception;
-use Icewind\SMB\Server;
-
-class SMB_OC extends SMB {
-	private $username_as_share;
-
-	/**
-	 * @param array $params
-	 * @throws \Exception
-	 */
-	public function __construct($params) {
-		if (isset($params['host'])) {
-			$host = $params['host'];
-			$this->username_as_share = ($params['username_as_share'] === true);
-
-			// dummy credentials, unused, to satisfy constructor
-			$user = 'foo';
-			$password = 'bar';
-			if (\OC::$server->getSession()->exists('smb-credentials')) {
-				$params_auth = json_decode(\OC::$server->getCrypto()->decrypt(\OC::$server->getSession()->get('smb-credentials')), true);
-				$user = \OC::$server->getSession()->get('loginname');
-				$password = $params_auth['password'];
-			} else {
-				// assume we are testing from the admin section
-			}
-
-			$root = isset($params['root']) ? $params['root'] : '/';
-			$share = '';
-
-			if ($this->username_as_share) {
-				$share = '/' . $user;
-			} elseif (isset($params['share'])) {
-				$share = $params['share'];
-			} else {
-				throw new \Exception();
-			}
-			parent::__construct(array(
-				"user" => $user,
-				"password" => $password,
-				"host" => $host,
-				"share" => $share,
-				"root" => $root
-			));
-		} else {
-			throw new \Exception();
-		}
-	}
-
-
-	/**
-	 * Intercepts the user credentials on login and stores them
-	 * encrypted inside the session if SMB_OC storage is enabled.
-	 * @param array $params
-	 */
-	public static function login($params) {
-		$mountpoints = \OC_Mount_Config::getAbsoluteMountPoints($params['uid']);
-		$mountpointClasses = array();
-		foreach($mountpoints as $mountpoint) {
-			$mountpointClasses[$mountpoint['class']] = true;
-		}
-		if(isset($mountpointClasses['\OC\Files\Storage\SMB_OC'])) {
-			\OC::$server->getSession()->set('smb-credentials', \OC::$server->getCrypto()->encrypt(json_encode($params)));
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return boolean
-	 */
-	public function isSharable($path) {
-		return false;
-	}
-
-	/**
-	 * @param bool $isPersonal
-	 * @return bool
-	 */
-	public function test($isPersonal = true) {
-		if ($isPersonal) {
-			if ($this->stat('')) {
-				return true;
-			}
-			return false;
-		} else {
-			$server = new Server($this->server->getHost(), '', '');
-
-			try {
-				$server->listShares();
-				return true;
-			} catch (AccessDeniedException $e) {
-				// expected due to anonymous login
-				return true;
-			} catch (Exception $e) {
-				return false;
-			}
-		}
-	}
-}
-- 
GitLab


From 1084e3adc7636787a139b68335112715b187b3bb Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 12 Aug 2015 22:20:08 +0100
Subject: [PATCH 070/783] Migrate SFTP_Key external storage to new API

The SFTP backend now supports public key authentication alongside
password authentication.
---
 apps/files_external/appinfo/app.php           |  13 --
 apps/files_external/appinfo/application.php   |   4 +
 apps/files_external/appinfo/routes.php        |   2 +-
 apps/files_external/js/public_key.js          |  46 ++++
 apps/files_external/js/sftp_key.js            |  53 -----
 .../files_external/lib/auth/publickey/rsa.php |  65 ++++++
 apps/files_external/lib/backend/sftp.php      |   1 +
 apps/files_external/lib/backend/sftp_key.php  |  48 ++++
 apps/files_external/lib/sftp.php              |  17 +-
 apps/files_external/lib/sftp_key.php          | 215 ------------------
 10 files changed, 177 insertions(+), 287 deletions(-)
 create mode 100644 apps/files_external/js/public_key.js
 delete mode 100644 apps/files_external/js/sftp_key.js
 create mode 100644 apps/files_external/lib/auth/publickey/rsa.php
 create mode 100644 apps/files_external/lib/backend/sftp_key.php
 delete mode 100644 apps/files_external/lib/sftp_key.php

diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 351b87c4c8b..f33012b5f09 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -40,7 +40,6 @@ OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php';
 OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php';
 OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php';
 OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php';
-OC::$CLASSPATH['OC\Files\Storage\SFTP_Key'] = 'files_external/lib/sftp_key.php';
 OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 OC::$CLASSPATH['OCA\Files\External\Api'] = 'files_external/lib/api.php';
 
@@ -68,17 +67,5 @@ if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == '
 // connecting hooks
 OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC_Mount_Config', 'initMountPointsHook');
 
-OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP_Key', [
-	'backend' => (string)$l->t('SFTP with secret key login'),
-	'priority' => 100,
-	'configuration' => array(
-		'host' => (string)$l->t('Host'),
-		'user' => (string)$l->t('Username'),
-		'public_key' => (string)$l->t('Public key'),
-		'private_key' => '#private_key',
-		'root' => '&'.$l->t('Remote subfolder')),
-	'custom' => 'sftp_key',
-	]
-);
 $mountProvider = $appContainer->query('OCA\Files_External\Config\ConfigAdapter');
 \OC::$server->getMountProviderCollection()->registerProvider($mountProvider);
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index e5275c29b39..ed236af0ec5 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -69,6 +69,7 @@ class Application extends App {
 			$container->query('OCA\Files_External\Lib\Backend\Dropbox'),
 			$container->query('OCA\Files_External\Lib\Backend\Google'),
 			$container->query('OCA\Files_External\Lib\Backend\Swift'),
+			$container->query('OCA\Files_External\Lib\Backend\SFTP_Key'),
 		]);
 
 		if (!\OC_Util::runningOnWindows()) {
@@ -103,6 +104,9 @@ class Application extends App {
 			// AuthMechanism::SCHEME_OAUTH2 mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\OAuth2\OAuth2'),
 
+			// AuthMechanism::SCHEME_PUBLICKEY mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\PublicKey\RSA'),
+
 			// AuthMechanism::SCHEME_OPENSTACK mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\OpenStack\OpenStack'),
 			$container->query('OCA\Files_External\Lib\Auth\OpenStack\Rackspace'),
diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
index 5d7018c3476..a371273e74e 100644
--- a/apps/files_external/appinfo/routes.php
+++ b/apps/files_external/appinfo/routes.php
@@ -38,7 +38,7 @@ namespace OCA\Files_External\AppInfo;
 		'routes' => array(
 			array(
 				'name' => 'Ajax#getSshKeys',
-				'url' => '/ajax/sftp_key.php',
+				'url' => '/ajax/public_key.php',
 				'verb' => 'POST',
 				'requirements' => array()
 			)
diff --git a/apps/files_external/js/public_key.js b/apps/files_external/js/public_key.js
new file mode 100644
index 00000000000..a8546067452
--- /dev/null
+++ b/apps/files_external/js/public_key.js
@@ -0,0 +1,46 @@
+$(document).ready(function() {
+
+	OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme) {
+		if (scheme === 'publickey') {
+			var config = $tr.find('.configuration');
+			if ($(config).find('[name="public_key_generate"]').length === 0) {
+				setupTableRow($tr, config);
+			}
+		}
+	});
+
+	$('#externalStorage').on('click', '[name="public_key_generate"]', function(event) {
+		event.preventDefault();
+		var tr = $(this).parent().parent();
+		generateKeys(tr);
+	});
+
+	function setupTableRow(tr, config) {
+		$(config).append($(document.createElement('input'))
+			.addClass('button auth-param')
+			.attr('type', 'button')
+			.attr('value', t('files_external', 'Generate keys'))
+			.attr('name', 'public_key_generate')
+		);
+		// If there's no private key, build one
+		if (0 === $(config).find('[data-parameter="private_key"]').val().length) {
+			generateKeys(tr);
+		}
+	}
+
+	function generateKeys(tr) {
+		var config = $(tr).find('.configuration');
+
+		$.post(OC.filePath('files_external', 'ajax', 'public_key.php'), {}, function(result) {
+			if (result && result.status === 'success') {
+				$(config).find('[data-parameter="public_key"]').val(result.data.public_key);
+				$(config).find('[data-parameter="private_key"]').val(result.data.private_key);
+				OCA.External.Settings.mountConfig.saveStorageConfig(tr, function() {
+					// Nothing to do
+				});
+			} else {
+				OC.dialogs.alert(result.data.message, t('files_external', 'Error generating key pair') );
+			}
+		});
+	}
+});
diff --git a/apps/files_external/js/sftp_key.js b/apps/files_external/js/sftp_key.js
deleted file mode 100644
index 55b11b1fac9..00000000000
--- a/apps/files_external/js/sftp_key.js
+++ /dev/null
@@ -1,53 +0,0 @@
-$(document).ready(function() {
-
-	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\SFTP_Key').each(function() {
-		var tr = $(this);
-		var config = $(tr).find('.configuration');
-		if ($(config).find('.sftp_key').length === 0) {
-			setupTableRow(tr, config);
-		}
-	});
-
-	// We can't catch the DOM elements being added, but we can pick up when
-	// they receive focus
-	$('#externalStorage').on('focus', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\SFTP_Key', function() {
-		var tr = $(this);
-		var config = $(tr).find('.configuration');
-
-		if ($(config).find('.sftp_key').length === 0) {
-			setupTableRow(tr, config);
-		}
-	});
-
-	$('#externalStorage').on('click', '.sftp_key', function(event) {
-		event.preventDefault();
-		var tr = $(this).parent().parent();
-		generateKeys(tr);
-	});
-
-	function setupTableRow(tr, config) {
-		$(config).append($(document.createElement('input')).addClass('button sftp_key')
-			.attr('type', 'button')
-			.attr('value', t('files_external', 'Generate keys')));
-		// If there's no private key, build one
-		if (0 === $(config).find('[data-parameter="private_key"]').val().length) {
-			generateKeys(tr);
-		}
-	}
-
-	function generateKeys(tr) {
-		var config = $(tr).find('.configuration');
-
-		$.post(OC.filePath('files_external', 'ajax', 'sftp_key.php'), {}, function(result) {
-			if (result && result.status === 'success') {
-				$(config).find('[data-parameter="public_key"]').val(result.data.public_key);
-				$(config).find('[data-parameter="private_key"]').val(result.data.private_key);
-				OCA.External.mountConfig.saveStorageConfig(tr, function() {
-					// Nothing to do
-				});
-			} else {
-				OC.dialogs.alert(result.data.message, t('files_external', 'Error generating key pair') );
-			}
-		});
-	}
-});
diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/auth/publickey/rsa.php
new file mode 100644
index 00000000000..b5eecb42712
--- /dev/null
+++ b/apps/files_external/lib/auth/publickey/rsa.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Auth\PublicKey;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Lib\StorageConfig;
+use \OCP\IConfig;
+use \phpseclib\Crypt\RSA as RSACrypt;
+
+/**
+ * RSA public key authentication
+ */
+class RSA extends AuthMechanism {
+
+	/** @var IConfig */
+	private $config;
+
+	public function __construct(IL10N $l, IConfig $config) {
+		$this->config = $config;
+
+		$this
+			->setIdentifier('publickey::rsa')
+			->setScheme(self::SCHEME_PUBLICKEY)
+			->setText($l->t('RSA public key'))
+			->addParameters([
+				(new DefinitionParameter('user', $l->t('Username'))),
+				(new DefinitionParameter('public_key', $l->t('Public key'))),
+				(new DefinitionParameter('private_key', 'private_key'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+			])
+			->setCustomJs('public_key')
+		;
+	}
+
+	public function manipulateStorageConfig(StorageConfig &$storage) {
+		$auth = new RSACrypt();
+		$auth->setPassword($this->config->getSystemValue('secret', ''));
+		if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
+			throw new \RuntimeException('unable to load private key');
+		}
+		$storage->setBackendOption('public_key_auth', $auth);
+	}
+
+}
diff --git a/apps/files_external/lib/backend/sftp.php b/apps/files_external/lib/backend/sftp.php
index dd0f5d8e2e0..c0bcd27c54b 100644
--- a/apps/files_external/lib/backend/sftp.php
+++ b/apps/files_external/lib/backend/sftp.php
@@ -43,6 +43,7 @@ class SFTP extends Backend {
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
 	}
diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/backend/sftp_key.php
new file mode 100644
index 00000000000..4a7f565eb19
--- /dev/null
+++ b/apps/files_external/lib/backend/sftp_key.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Auth\PublicKey\RSA;
+
+class SFTP_Key extends Backend {
+
+	public function __construct(IL10N $l, RSA $legacyAuth) {
+		$this
+			->setIdentifier('\OC\Files\Storage\SFTP_Key')
+			->setStorageClass('\OC\Files\Storage\SFTP')
+			->setText($l->t('SFTP with secret key login [DEPRECATED]'))
+			->addParameters([
+				(new DefinitionParameter('host', $l->t('Host'))),
+				(new DefinitionParameter('root', $l->t('Remote subfolder')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+			])
+			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 7f921b5342f..921e7283c66 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -40,10 +40,11 @@ use phpseclib\Net\SFTP\Stream;
 class SFTP extends \OC\Files\Storage\Common {
 	private $host;
 	private $user;
-	private $password;
 	private $root;
 	private $port = 22;
 
+	private $auth;
+
 	/**
 	* @var SFTP
 	*/
@@ -73,8 +74,15 @@ class SFTP extends \OC\Files\Storage\Common {
 		}
 
 		$this->user = $params['user'];
-		$this->password
-			= isset($params['password']) ? $params['password'] : '';
+
+		if (isset($params['public_key_auth'])) {
+			$this->auth = $params['public_key_auth'];
+		} elseif (isset($params['password'])) {
+			$this->auth = $params['password'];
+		} else {
+			throw new \UnexpectedValueException('no authentication parameters specified');
+		}
+
 		$this->root
 			= isset($params['root']) ? $this->cleanPath($params['root']) : '/';
 
@@ -112,7 +120,7 @@ class SFTP extends \OC\Files\Storage\Common {
 			$this->writeHostKeys($hostKeys);
 		}
 
-		if (!$this->client->login($this->user, $this->password)) {
+		if (!$this->client->login($this->user, $this->auth)) {
 			throw new \Exception('Login failed');
 		}
 		return $this->client;
@@ -125,7 +133,6 @@ class SFTP extends \OC\Files\Storage\Common {
 		if (
 			!isset($this->host)
 			|| !isset($this->user)
-			|| !isset($this->password)
 		) {
 			return false;
 		}
diff --git a/apps/files_external/lib/sftp_key.php b/apps/files_external/lib/sftp_key.php
deleted file mode 100644
index a193b323678..00000000000
--- a/apps/files_external/lib/sftp_key.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Ross Nicoll <jrn@jrn.me.uk>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-namespace OC\Files\Storage;
-
-use phpseclib\Crypt\RSA;
-
-class SFTP_Key extends \OC\Files\Storage\SFTP {
-	private $publicKey;
-	private $privateKey;
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function __construct($params) {
-		parent::__construct($params);
-		$this->publicKey = $params['public_key'];
-		$this->privateKey = $params['private_key'];
-	}
-
-	/**
-	 * Returns the connection.
-	 *
-	 * @return \phpseclib\Net\SFTP connected client instance
-	 * @throws \Exception when the connection failed
-	 */
-	public function getConnection() {
-		if (!is_null($this->client)) {
-			return $this->client;
-		}
-
-		$hostKeys = $this->readHostKeys();
-		$this->client = new \phpseclib\Net\SFTP($this->getHost());
-
-		// The SSH Host Key MUST be verified before login().
-		$currentHostKey = $this->client->getServerPublicHostKey();
-		if (array_key_exists($this->getHost(), $hostKeys)) {
-			if ($hostKeys[$this->getHost()] !== $currentHostKey) {
-				throw new \Exception('Host public key does not match known key');
-			}
-		} else {
-			$hostKeys[$this->getHost()] = $currentHostKey;
-			$this->writeHostKeys($hostKeys);
-		}
-
-		$key = $this->getPrivateKey();
-		if (is_null($key)) {
-			throw new \Exception('Secret key could not be loaded');
-		}
-		if (!$this->client->login($this->getUser(), $key)) {
-			throw new \Exception('Login failed');
-		}
-		return $this->client;
-	}
-
-	/**
-	 * Returns the private key to be used for authentication to the remote server.
-	 *
-	 * @return RSA instance or null in case of a failure to load the key.
-	 */
-	private function getPrivateKey() {
-		$key = new RSA();
-		$key->setPassword(\OC::$server->getConfig()->getSystemValue('secret', ''));
-		if (!$key->loadKey($this->privateKey)) {
-			// Should this exception rather than return null?
-			return null;
-		}
-		return $key;
-	}
-
-	/**
-	 * Throws an exception if the provided host name/address is invalid (cannot be resolved
-	 * and is not an IPv4 address).
-	 *
-	 * @return true; never returns in case of a problem, this return value is used just to
-	 * make unit tests happy.
-	 */
-	public function assertHostAddressValid($hostname) {
-		// TODO: Should handle IPv6 addresses too
-		if (!preg_match('/^\d+\.\d+\.\d+\.\d+$/', $hostname) && gethostbyname($hostname) === $hostname) {
-			// Hostname is not an IPv4 address and cannot be resolved via DNS
-			throw new \InvalidArgumentException('Cannot resolve hostname.');
-		}
-		return true;
-	}
-
-	/**
-	 * Throws an exception if the provided port number is invalid (cannot be resolved
-	 * and is not an IPv4 address).
-	 *
-	 * @return true; never returns in case of a problem, this return value is used just to
-	 * make unit tests happy.
-	 */
-	public function assertPortNumberValid($port) {
-		if (!preg_match('/^\d+$/', $port)) {
-			throw new \InvalidArgumentException('Port number must be a number.');
-		}
-		if ($port < 0 || $port > 65535) {
-			throw new \InvalidArgumentException('Port number must be between 0 and 65535 inclusive.');
-		}
-		return true;
-	}
-
-	/**
-	 * Replaces anything that's not an alphanumeric character or "." in a hostname
-	 * with "_", to make it safe for use as part of a file name.
-	 */
-	protected function sanitizeHostName($name) {
-		return preg_replace('/[^\d\w\._]/', '_', $name);
-	}
-
-	/**
-	 * Replaces anything that's not an alphanumeric character or "_" in a username
-	 * with "_", to make it safe for use as part of a file name.
-	 */
-	protected function sanitizeUserName($name) {
-		return preg_replace('/[^\d\w_]/', '_', $name);
-	}
-
-	public function test() {
-
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		$host = $this->getHost();
-		if (empty($host)) {
-			\OC::$server->getLogger()->warning('Hostname has not been specified');
-			return false;
-		}
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		$user = $this->getUser();
-		if (empty($user)) {
-			\OC::$server->getLogger()->warning('Username has not been specified');
-			return false;
-		}
-		if (!isset($this->privateKey)) {
-			\OC::$server->getLogger()->warning('Private key was missing from the request');
-			return false;
-		}
-
-		// Sanity check the host
-		$hostParts = explode(':', $this->getHost());
-		try {
-			if (count($hostParts) == 1) {
-				$hostname = $hostParts[0];
-				$this->assertHostAddressValid($hostname);
-			} else if (count($hostParts) == 2) {
-				$hostname = $hostParts[0];
-				$this->assertHostAddressValid($hostname);
-				$this->assertPortNumberValid($hostParts[1]);
-			} else {
-				throw new \Exception('Host connection string is invalid.');
-			}
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->warning($e->getMessage());
-			return false;
-		}
-
-		// Validate the key
-		$key = $this->getPrivateKey();
-		if (is_null($key)) {
-			\OC::$server->getLogger()->warning('Secret key could not be loaded');
-			return false;
-		}
-
-		try {
-			if ($this->getConnection()->nlist() === false) {
-				return false;
-			}
-		} catch(\Exception $e) {
-			// We should be throwing a more specific error, so we're not just catching
-			// Exception here
-			\OC::$server->getLogger()->warning($e->getMessage());
-			return false;
-		}
-
-		// Save the key somewhere it can easily be extracted later
-		if (\OC::$server->getUserSession()->getUser()) {
-			$view = new \OC\Files\View('/'.\OC::$server->getUserSession()->getUser()->getUId().'/files_external/sftp_keys');
-			if (!$view->is_dir('')) {
-				if (!$view->mkdir('')) {
-					\OC::$server->getLogger()->warning('Could not create secret key directory.');
-					return false;
-				}
-			}
-			$key_filename = $this->sanitizeUserName($this->getUser()).'@'.$this->sanitizeHostName($hostname).'.pub';
-			$key_file = $view->fopen($key_filename, "w");
-			if ($key_file) {
-				fwrite($key_file, $this->publicKey);
-				fclose($key_file);
-			} else {
-				\OC::$server->getLogger()->warning('Could not write secret key file.');
-			}
-		}
-
-		return true;
-	}
-}
-- 
GitLab


From 080fafe63a980f6a485027fd4216864adf764e1e Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 19 Aug 2015 21:13:16 +0100
Subject: [PATCH 071/783] AjaxController uses RSA auth mechanism

---
 apps/files_external/appinfo/application.php       | 13 -------------
 apps/files_external/controller/ajaxcontroller.php | 14 +++++++-------
 apps/files_external/lib/auth/publickey/rsa.php    | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index ed236af0ec5..c00ae3ee019 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -24,7 +24,6 @@
 
 namespace OCA\Files_External\AppInfo;
 
-use \OCA\Files_External\Controller\AjaxController;
 use \OCP\AppFramework\App;
 use \OCP\IContainer;
 use \OCA\Files_External\Service\BackendService;
@@ -36,18 +35,6 @@ class Application extends App {
 	public function __construct(array $urlParams=array()) {
 		parent::__construct('files_external', $urlParams);
 
-		$container = $this->getContainer();
-
-		/**
-		 * Controllers
-		 */
-		$container->registerService('AjaxController', function (IContainer $c) {
-			return new AjaxController(
-				$c->query('AppName'),
-				$c->query('Request')
-			);
-		});
-
 		$this->loadBackends();
 		$this->loadAuthMechanisms();
 	}
diff --git a/apps/files_external/controller/ajaxcontroller.php b/apps/files_external/controller/ajaxcontroller.php
index cb2de432286..c285cd34e70 100644
--- a/apps/files_external/controller/ajaxcontroller.php
+++ b/apps/files_external/controller/ajaxcontroller.php
@@ -25,19 +25,19 @@ namespace OCA\Files_External\Controller;
 use OCP\AppFramework\Controller;
 use OCP\IRequest;
 use OCP\AppFramework\Http\JSONResponse;
-use phpseclib\Crypt\RSA;
+use OCA\Files_External\Lib\Auth\PublicKey\RSA;
 
 class AjaxController extends Controller {
-	public function __construct($appName, IRequest $request) {
+	/** @var RSA */
+	private $rsaMechanism;
+
+	public function __construct($appName, IRequest $request, RSA $rsaMechanism) {
 		parent::__construct($appName, $request);
+		$this->rsaMechanism = $rsaMechanism;
 	}
 
 	private function generateSshKeys() {
-		$rsa = new RSA();
-		$rsa->setPublicKeyFormat(RSA::PUBLIC_FORMAT_OPENSSH);
-		$rsa->setPassword(\OC::$server->getConfig()->getSystemValue('secret', ''));
-
-		$key = $rsa->createKey();
+		$key = $this->rsaMechanism->createKey();
 		// Replace the placeholder label with a more meaningful one
 		$key['publicKey'] = str_replace('phpseclib-generated-key', gethostname(), $key['publickey']);
 
diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/auth/publickey/rsa.php
index b5eecb42712..f40136dda01 100644
--- a/apps/files_external/lib/auth/publickey/rsa.php
+++ b/apps/files_external/lib/auth/publickey/rsa.php
@@ -33,6 +33,8 @@ use \phpseclib\Crypt\RSA as RSACrypt;
  */
 class RSA extends AuthMechanism {
 
+	const CREATE_KEY_BITS = 1024;
+
 	/** @var IConfig */
 	private $config;
 
@@ -62,4 +64,17 @@ class RSA extends AuthMechanism {
 		$storage->setBackendOption('public_key_auth', $auth);
 	}
 
+	/**
+	 * Generate a keypair
+	 *
+	 * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey]
+	 */
+	public function createKey() {
+		$rsa = new RSACrypt();
+		$rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH);
+		$rsa->setPassword($this->config->getSystemValue('secret', ''));
+
+		return $rsa->createKey(self::CREATE_KEY_BITS);
+	}
+
 }
-- 
GitLab


From 37b00b7443bec09aac84b359a1c2f77caf143b30 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 28 Aug 2015 15:46:55 +0200
Subject: [PATCH 072/783] Add since tag

---
 lib/public/l10n/ifactory.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/public/l10n/ifactory.php b/lib/public/l10n/ifactory.php
index e2dc1c313cc..b784505a68b 100644
--- a/lib/public/l10n/ifactory.php
+++ b/lib/public/l10n/ifactory.php
@@ -20,6 +20,9 @@
  */
 namespace OCP\L10N;
 
+/**
+ * @since 8.2.0
+ */
 interface IFactory {
 	/**
 	 * Get a language instance
@@ -27,6 +30,7 @@ interface IFactory {
 	 * @param string $app
 	 * @param string|null $lang
 	 * @return \OCP\IL10N
+	 * @since 8.2.0
 	 */
 	public function get($app, $lang = null);
 }
-- 
GitLab


From d14252d9c75f39e8a35faff91127a430e9a3bf37 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 28 Aug 2015 16:13:19 +0200
Subject: [PATCH 073/783] make sure we actually have an object store

---
 apps/files_external/lib/config/configadapter.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index a15d9e06a5f..a255a7b3d25 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -74,6 +74,9 @@ class ConfigAdapter implements IMountProvider {
 		$objectStore = $storage->getBackendOption('objectstore');
 		if ($objectStore) {
 			$objectClass = $objectStore['class'];
+			if (!is_subclass_of($objectClass, '\OCP\Files\ObjectStore\IObjectStore')) {
+				throw new \InvalidArgumentException('Invalid object store');
+			}
 			$storage->setBackendOption('objectstore', new $objectClass($objectStore));
 		}
 
-- 
GitLab


From 59273a8863ecc0aa570f56e024cb1a22d424111a Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 27 Aug 2015 13:22:58 +0200
Subject: [PATCH 074/783] Combine upload action into the "New" menu

Refactored the new menu to be encapsulated in the NewFileMenu JS class
---
 apps/files/css/files.css                | 135 ++++++--------
 apps/files/css/upload.css               |  14 --
 apps/files/index.php                    |   1 +
 apps/files/js/file-upload.js            | 149 ---------------
 apps/files/js/fileactionsmenu.js        |   4 +-
 apps/files/js/filelist.js               | 145 +++++++++++++++
 apps/files/js/newfilemenu.js            | 237 ++++++++++++++++++++++++
 apps/files/templates/list.php           |  52 +++---
 apps/files_sharing/templates/public.php |   1 +
 core/css/apps.css                       |  73 ++++++++
 core/css/styles.css                     |  10 +
 11 files changed, 551 insertions(+), 270 deletions(-)
 create mode 100644 apps/files/js/newfilemenu.js

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index a9c85127c66..97b2a0c451e 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -18,11 +18,6 @@
 	z-index: -30;
 }
 
-#new {
-	z-index: 1010;
-	float: left;
-	padding: 0 !important; /* override default control bar button padding */
-}
 #trash {
 	margin-right: 8px;
 	float: right;
@@ -30,49 +25,8 @@
 	padding: 10px;
 	font-weight: normal;
 }
-#new > a {
-	padding: 14px 10px;
-	position: relative;
-	top: 7px;
-}
-#new.active {
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-	border-bottom: none;
-	background: #f8f8f8;
-}
-#new > ul {
-	display: none;
-	position: fixed;
-	min-width: 112px;
-	z-index: -10;
-	padding: 8px;
-	padding-bottom: 0;
-	margin-top: 13.5px;
-	margin-left: -1px;
-	text-align: left;
-	background: #f8f8f8;
-	border: 1px solid #ddd;
-	border: 1px solid rgba(240, 240, 240, 0.9);
-	border-radius: 5px;
-	border-top-left-radius: 0;
-	box-shadow: 0 2px 7px rgba(170,170,170,.4);
-}
-#new > ul > li {
-	height: 36px;
-	margin: 5px;
-	padding-left: 42px;
-	padding-bottom: 2px;
-	background-position: left center;
-	cursor: pointer;
-}
-#new > ul > li > p {
-	cursor: pointer;
-	padding-top: 7px;
-	padding-bottom: 7px;
-}
 
-#new .error, #fileList .error {
+.newFileMenu .error, #fileList .error {
 	color: #e9322d;
 	border-color: #e9322d;
 	-webkit-box-shadow: 0 0 6px #f8b9b7;
@@ -143,6 +97,30 @@
 	margin-bottom: 44px;
 }
 
+#app-navigation .nav-files a.nav-icon-files {
+	width: auto;
+}
+/* button needs overrides due to navigation styles */
+#app-navigation .nav-files a.new {
+	width: 40px;
+	height: 32px;
+	padding: 0 10px;
+	margin: 0;
+	cursor: pointer;
+}
+
+#app-navigation .nav-files a {
+	display: inline-block;
+}
+
+#app-navigation .nav-files a.new.hidden {
+	display: none;
+}
+
+#app-navigation .nav-files a.new.disabled {
+	opacity: 0.3;
+}
+
 #filestable tbody tr {
 	background-color: #fff;
 	height: 40px;
@@ -599,7 +577,8 @@ a.action > img {
 #fileList a.action.action-menu {
 	padding: 17px 14px;
 }
-#fileList .fileActionsMenu {
+
+#fileList .popovermenu {
 	margin-right: 21px;
 }
 
@@ -654,13 +633,13 @@ a.action > img {
 }
 
 /* properly display actions in the popover menu */
-#fileList .fileActionsMenu .action {
+#fileList .popovermenu .action {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)" !important;
 	filter: alpha(opacity=50) !important;
 	opacity: .5 !important;
 }
-#fileList .fileActionsMenu .action:hover,
-#fileList .fileActionsMenu .action:focus {
+#fileList .popovermenu .action:hover,
+#fileList .popovermenu .action:focus {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
 	filter: alpha(opacity=100) !important;
 	opacity: 1 !important;
@@ -744,43 +723,49 @@ table.dragshadow td.size {
 	opacity: 0;
 }
 
-.fileActionsMenu {
-	padding: 4px 12px;
-}
-.fileActionsMenu li {
-	padding: 5px 0;
-}
-#fileList .fileActionsMenu a.action img {
+#fileList .popovermenu a.action img {
 	padding: initial;
 }
-#fileList .fileActionsMenu a.action {
+
+#fileList .popovermenu a.action {
 	padding: 10px;
 	margin: -10px;
 }
 
-.fileActionsMenu.hidden {
-	display: none;
+.newFileMenu {
+	width: 140px;
+	margin-left: -56px;
+	margin-top: 25px;
 }
 
-#fileList .fileActionsMenu .action {
-	display: block;
-	line-height: 30px;
-	padding-left: 5px;
-	color: #000;
-	padding: 0;
+.newFileMenu .menuitem {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.newFileMenu.bubble:after {
+	left: 75px;
+	right: auto;
+}
+.newFileMenu.bubble:before {
+	left: 75px;
+	right: auto;
 }
 
-.fileActionsMenu .action img,
-.fileActionsMenu .action .no-icon {
+.newFileMenu .filenameform {
 	display: inline-block;
-	width: 16px;
-	margin-right: 5px;
 }
 
-.fileActionsMenu .action {
-	opacity: 0.5;
+.newFileMenu .filenameform input {
+	width: 100px;
 }
 
-.fileActionsMenu li:hover .action {
-	opacity: 1;
+#fileList .popovermenu .action {
+	display: block;
+	line-height: 30px;
+	padding-left: 5px;
+	color: #000;
+	padding: 0;
 }
+
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index bd60f831388..07b788b937f 100644
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -24,20 +24,6 @@
 }
 .file_upload_target { display:none; }
 .file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
-#file_upload_start {
-	position: relative;
-	left: 0;
-	top: 0;
-	width: 44px;
-	height: 44px;
-	margin: -5px -3px;
-	padding: 0;
-	font-size: 16px;
-	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
-	z-index: 20;
-	cursor: pointer;
-	overflow: hidden;
-}
 
 #uploadprogresswrapper, #uploadprogresswrapper * {
 	-moz-box-sizing: border-box;
diff --git a/apps/files/index.php b/apps/files/index.php
index a73caa50fbe..cc007ebdb07 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -38,6 +38,7 @@ OCP\Util::addStyle('files', 'upload');
 OCP\Util::addStyle('files', 'mobile');
 OCP\Util::addscript('files', 'app');
 OCP\Util::addscript('files', 'file-upload');
+OCP\Util::addscript('files', 'newfilemenu');
 OCP\Util::addscript('files', 'jquery.iframe-transport');
 OCP\Util::addscript('files', 'jquery.fileupload');
 OCP\Util::addscript('files', 'jquery-visibility');
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 6b6acdb5e01..17f0f777169 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -551,155 +551,6 @@ OC.Upload = {
 			$('#file_upload_start').attr('multiple', 'multiple');
 		}
 
-		$(document).click(function(ev) {
-			// do not close when clicking in the dropdown
-			if ($(ev.target).closest('#new').length){
-				return;
-			}
-			$('#new>ul').hide();
-			$('#new').removeClass('active');
-			if ($('#new .error').length > 0) {
-				$('#new .error').tipsy('hide');
-			}
-			$('#new li').each(function(i,element) {
-				if ($(element).children('p').length === 0) {
-					$(element).children('form').remove();
-					$(element).append('<p>' + $(element).data('text') + '</p>');
-				}
-			});
-		});
-		$('#new').click(function(event) {
-			event.stopPropagation();
-		});
-		$('#new>a').click(function() {
-			$('#new>ul').toggle();
-			$('#new').toggleClass('active');
-		});
-		$('#new li').click(function() {
-			if ($(this).children('p').length === 0) {
-				return;
-			}
-
-			$('#new .error').tipsy('hide');
-
-			$('#new li').each(function(i, element) {
-				if ($(element).children('p').length === 0) {
-					$(element).children('form').remove();
-					$(element).append('<p>' + $(element).data('text') + '</p>');
-				}
-			});
-
-			var type = $(this).data('type');
-			var text = $(this).children('p').text();
-			$(this).data('text', text);
-			$(this).children('p').remove();
-
-			// add input field
-			var form = $('<form></form>');
-			var input = $('<input type="text">');
-			var newName = $(this).attr('data-newname') || '';
-			var fileType = 'input-' + $(this).attr('data-type');
-			if (newName) {
-				input.val(newName);
-				input.attr('id', fileType);
-			}
-			var label = $('<label class="hidden-visually" for="">' + escapeHTML(newName) + '</label>');
-			label.attr('for', fileType);
-
-			form.append(label).append(input);
-			$(this).append(form);
-			var lastPos;
-			var checkInput = function () {
-				var filename = input.val();
-				if (!Files.isFileNameValid(filename)) {
-					// Files.isFileNameValid(filename) throws an exception itself
-				} else if (FileList.inList(filename)) {
-					throw t('files', '{new_name} already exists', {new_name: filename});
-				} else {
-					return true;
-				}
-			};
-
-			// verify filename on typing
-			input.keyup(function(event) {
-				try {
-					checkInput();
-					input.tipsy('hide');
-					input.removeClass('error');
-				} catch (error) {
-					input.attr('title', error);
-					input.tipsy({gravity: 'w', trigger: 'manual'});
-					input.tipsy('show');
-					input.addClass('error');
-				}
-			});
-
-			input.focus();
-			// pre select name up to the extension
-			lastPos = newName.lastIndexOf('.');
-			if (lastPos === -1) {
-				lastPos = newName.length;
-			}
-			input.selectRange(0, lastPos);
-			form.submit(function(event) {
-				event.stopPropagation();
-				event.preventDefault();
-				try {
-					checkInput();
-					var newname = input.val();
-					if (FileList.lastAction) {
-						FileList.lastAction();
-					}
-					var name = FileList.getUniqueName(newname);
-					switch(type) {
-						case 'file':
-							$.post(
-								OC.filePath('files', 'ajax', 'newfile.php'),
-								{
-									dir: FileList.getCurrentDirectory(),
-									filename: name
-								},
-								function(result) {
-									if (result.status === 'success') {
-										FileList.add(result.data, {animate: true, scrollTo: true});
-									} else {
-										OC.dialogs.alert(result.data.message, t('core', 'Could not create file'));
-									}
-								}
-							);
-							break;
-						case 'folder':
-							$.post(
-								OC.filePath('files','ajax','newfolder.php'),
-								{
-									dir: FileList.getCurrentDirectory(),
-									foldername: name
-								},
-								function(result) {
-									if (result.status === 'success') {
-										FileList.add(result.data, {animate: true, scrollTo: true});
-									} else {
-										OC.dialogs.alert(result.data.message, t('core', 'Could not create folder'));
-									}
-								}
-							);
-							break;
-					}
-					var li = form.parent();
-					form.remove();
-					/* workaround for IE 9&10 click event trap, 2 lines: */
-					$('input').first().focus();
-					$('#content').focus();
-					li.append('<p>' + li.data('text') + '</p>');
-					$('#new>a').click();
-				} catch (error) {
-					input.attr('title', error);
-					input.tipsy({gravity: 'w', trigger: 'manual'});
-					input.tipsy('show');
-					input.addClass('error');
-				}
-			});
-		});
 		window.file_upload_param = file_upload_param;
 		return file_upload_param;
 	}
diff --git a/apps/files/js/fileactionsmenu.js b/apps/files/js/fileactionsmenu.js
index 623ebde5442..5ab0e42f93e 100644
--- a/apps/files/js/fileactionsmenu.js
+++ b/apps/files/js/fileactionsmenu.js
@@ -14,7 +14,7 @@
 		'<ul>' +
 		'{{#each items}}' +
 		'<li>' +
-		'<a href="#" class="action action-{{nameLowerCase}} permanent" data-action="{{name}}">{{#if icon}}<img src="{{icon}}"/>{{else}}<span class="no-icon"></span>{{/if}}<span>{{displayName}}</span></a>' +
+		'<a href="#" class="menuitem action action-{{nameLowerCase}} permanent" data-action="{{name}}">{{#if icon}}<img class="icon" src="{{icon}}"/>{{else}}<span class="no-icon"></span>{{/if}}<span>{{displayName}}</span></a>' +
 		'</li>' +
 		'{{/each}}' +
 		'</ul>';
@@ -26,7 +26,7 @@
 	 */
 	var FileActionsMenu = OC.Backbone.View.extend({
 		tagName: 'div',
-		className: 'fileActionsMenu bubble hidden open menu',
+		className: 'fileActionsMenu popovermenu bubble hidden open menu',
 
 		/**
 		 * Current context
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index ac96d587015..5f55d421430 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -9,6 +9,9 @@
  */
 
 (function() {
+
+	var TEMPLATE_ADDBUTTON = '<a href="#" class="button new" title="{{addText}}"><img src="{{iconUrl}}"></img></a>';
+
 	/**
 	 * @class OCA.Files.FileList
 	 * @classdesc
@@ -220,6 +223,8 @@
 
 			this.$el.find('#controls').prepend(this.breadcrumb.$el);
 
+			this._renderNewButton();
+
 			this.$el.find('thead th .columntitle').click(_.bind(this._onClickHeader, this));
 
 			this._onResize = _.debounce(_.bind(this._onResize, this), 100);
@@ -262,6 +267,9 @@
 		 * Destroy / uninitialize this instance.
 		 */
 		destroy: function() {
+			if (this._newFileMenu) {
+				this._newFileMenu.remove();
+			}
 			// TODO: also unregister other event handlers
 			this.fileActions.off('registerAction', this._onFileActionsUpdated);
 			this.fileActions.off('setDefault', this._onFileActionsUpdated);
@@ -1679,6 +1687,102 @@
 				form.trigger('submit');
 			});
 		},
+
+		/**
+		 * Create an empty file inside the current directory.
+		 *
+		 * @param {string} name name of the file
+		 *
+		 * @return {Promise} promise that will be resolved after the
+		 * file was created
+		 */
+		createFile: function(name) {
+			var self = this;
+			var deferred = $.Deferred();
+			var promise = deferred.promise();
+
+			OCA.Files.Files.isFileNameValid(name);
+			name = this.getUniqueName(name);
+
+			if (this.lastAction) {
+				this.lastAction();
+			}
+
+			$.post(
+				OC.filePath('files', 'ajax', 'newfile.php'),
+				{
+					dir: this.getCurrentDirectory(),
+					filename: name
+				},
+				function(result) {
+					if (result.status === 'success') {
+						self.add(result.data, {animate: true, scrollTo: true});
+						deferred.resolve(result.status, result.data);
+					} else {
+						if (result.data && result.data.message) {
+							OC.Notification.showTemporary(result.data.message);
+						} else {
+							OC.Notification.showTemporary(t('core', 'Could not create file'));
+						}
+						deferred.reject(result.status, result.data);
+					}
+				}
+			);
+
+			return promise;
+		},
+
+		/**
+		 * Create a directory inside the current directory.
+		 *
+		 * @param {string} name name of the directory
+		 *
+		 * @return {Promise} promise that will be resolved after the
+		 * directory was created
+		 */
+		createDirectory: function(name) {
+			var self = this;
+			var deferred = $.Deferred();
+			var promise = deferred.promise();
+
+			OCA.Files.Files.isFileNameValid(name);
+			name = this.getUniqueName(name);
+
+			if (this.lastAction) {
+				this.lastAction();
+			}
+
+			$.post(
+				OC.filePath('files','ajax','newfolder.php'),
+				{
+					dir: this.getCurrentDirectory(),
+					foldername: name
+				},
+				function(result) {
+					if (result.status === 'success') {
+						self.add(result.data, {animate: true, scrollTo: true});
+						deferred.resolve(result.status, result.data);
+					} else {
+						if (result.data && result.data.message) {
+							OC.Notification.showTemporary(result.data.message);
+						} else {
+							OC.Notification.showTemporary(t('core', 'Could not create folder'));
+						}
+						deferred.reject(result.status);
+					}
+				}
+			);
+
+			return promise;
+		},
+
+		/**
+		 * Returns whether the given file name exists in the list
+		 *
+		 * @param {string} file file name
+		 *
+		 * @return {bool} true if the file exists in the list, false otherwise
+		 */
 		inList:function(file) {
 			return this.findFileEl(file).length;
 		},
@@ -2340,6 +2444,47 @@
 			});
 		},
 
+		_renderNewButton: function() {
+			// if an upload button (legacy) already exists, skip
+			if ($('#controls .button.upload').length) {
+				return;
+			}
+			if (!this._addButtonTemplate) {
+				this._addButtonTemplate = Handlebars.compile(TEMPLATE_ADDBUTTON);
+			}
+			var $newButton = $(this._addButtonTemplate({
+				addText: t('files', 'New'),
+				iconUrl: OC.imagePath('core', 'actions/add')
+			}));
+
+			$('#controls .actions').prepend($newButton);
+			$newButton.tooltip({'placement': 'bottom'});
+
+			$newButton.click(_.bind(this._onClickNewButton, this));
+			this._newButton = $newButton;
+		},
+
+		_onClickNewButton: function(event) {
+			var $target = $(event.target);
+			if (!$target.hasClass('.button')) {
+				$target = $target.closest('.button');
+			}
+			this._newButton.tooltip('hide');
+			event.preventDefault();
+			if ($target.hasClass('disabled')) {
+				return false;
+			}
+			if (!this._newFileMenu) {
+				this._newFileMenu = new OCA.Files.NewFileMenu({
+					fileList: this
+				});
+				$('body').append(this._newFileMenu.$el);
+			}
+			this._newFileMenu.showAt($target);
+
+			return false;
+		},
+
 		/**
 		 * Register a tab view to be added to all views
 		 */
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
new file mode 100644
index 00000000000..c851096bd8f
--- /dev/null
+++ b/apps/files/js/newfilemenu.js
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/* global Files */
+
+(function() {
+
+	var TEMPLATE_MENU =
+		'<ul>' +
+		'<li>' +
+		'<label for="file_upload_start" class="menuitem" data-action="upload" title="{{uploadMaxHumanFilesize}}"><span class="svg icon icon-upload"></span><span class="displayname">{{uploadLabel}}</span></label>' +
+		'</li>' +
+		'{{#each items}}' +
+		'<li>' +
+		'<a href="#" class="menuitem" data-templatename="{{templateName}}" data-filetype="{{fileType}}" data-action="{{id}}"><span class="icon {{iconClass}} svg"></span><span class="displayname">{{displayName}}</span></a>' +
+		'</li>' +
+		'{{/each}}' +
+		'</ul>';
+
+	var TEMPLATE_FILENAME_FORM =
+		'<form class="filenameform">' +
+		'<label class="hidden-visually" for="{{cid}}-input-{{fileType}}">{{fileName}}</label>' +
+		'<input id="{{cid}}-input-{{fileType}}" type="text" value="{{fileName}}">' +
+		'</form>';
+
+	/**
+	 * Construct a new NewFileMenu instance
+	 * @constructs NewFileMenu
+	 *
+	 * @memberof OCA.Files
+	 */
+	var NewFileMenu = OC.Backbone.View.extend({
+		tagName: 'div',
+		className: 'newFileMenu popovermenu bubble hidden open menu',
+
+		events: {
+			'click .menuitem': '_onClickAction'
+		},
+
+		initialize: function(options) {
+			var self = this;
+			var $uploadEl = $('#file_upload_start');
+			if ($uploadEl.length) {
+				$uploadEl.on('fileuploadstart', function() {
+					self.trigger('actionPerformed', 'upload');
+				});
+			} else {
+				console.warn('Missing upload element "file_upload_start"');
+			}
+
+			this._fileList = options && options.fileList;
+		},
+
+		template: function(data) {
+			if (!OCA.Files.NewFileMenu._TEMPLATE) {
+				OCA.Files.NewFileMenu._TEMPLATE = Handlebars.compile(TEMPLATE_MENU);
+			}
+			return OCA.Files.NewFileMenu._TEMPLATE(data);
+		},
+
+		/**
+		 * Event handler whenever an action has been clicked within the menu
+		 *
+		 * @param {Object} event event object
+		 */
+		_onClickAction: function(event) {
+			var $target = $(event.target);
+			if (!$target.hasClass('menuitem')) {
+				$target = $target.closest('.menuitem');
+			}
+			var action = $target.attr('data-action');
+			// note: clicking the upload label will automatically
+			// set the focus on the "file_upload_start" hidden field
+			// which itself triggers the upload dialog.
+			// Currently the upload logic is still in file-upload.js and filelist.js
+			if (action === 'upload') {
+				OC.hideMenus();
+			} else {
+				event.preventDefault();
+				this._promptFileName($target);
+			}
+		},
+
+		_promptFileName: function($target) {
+			var self = this;
+			if (!OCA.Files.NewFileMenu._TEMPLATE_FORM) {
+				OCA.Files.NewFileMenu._TEMPLATE_FORM = Handlebars.compile(TEMPLATE_FILENAME_FORM);
+			}
+
+			if ($target.find('form').length) {
+				$target.find('input').focus();
+				return;
+			}
+
+			// discard other forms
+			this.$el.find('form').remove();
+			this.$el.find('.displayname').removeClass('hidden');
+
+			$target.find('.displayname').addClass('hidden');
+
+			var newName = $target.attr('data-templatename');
+			var fileType = $target.attr('data-filetype');
+			var $form = $(OCA.Files.NewFileMenu._TEMPLATE_FORM({
+				fileName: newName,
+				cid: this.cid,
+				fileType: fileType
+			}));
+
+			//this.trigger('actionPerformed', action);
+			$target.append($form); 
+
+			// here comes the OLD code
+			var $input = $form.find('input');
+
+			var lastPos;
+			var checkInput = function () {
+				var filename = $input.val();
+				try {
+					if (!Files.isFileNameValid(filename)) {
+						// Files.isFileNameValid(filename) throws an exception itself
+					} else if (self._fileList.inList(filename)) {
+						throw t('files', '{newname} already exists', {newname: filename});
+					} else {
+						return true;
+					}
+				} catch (error) {
+					$input.attr('title', error);
+					$input.tooltip({placement: 'right', trigger: 'manual'});
+					$input.tooltip('show');
+					$input.addClass('error');
+				}
+				return false;
+			};
+
+			// verify filename on typing
+			$input.keyup(function() {
+				if (checkInput()) {
+					$input.tooltip('hide');
+					$input.removeClass('error');
+				}
+			});
+
+			$input.focus();
+			// pre select name up to the extension
+			lastPos = newName.lastIndexOf('.');
+			if (lastPos === -1) {
+				lastPos = newName.length;
+			}
+			$input.selectRange(0, lastPos);
+
+			$form.submit(function(event) {
+				event.stopPropagation();
+				event.preventDefault();
+
+				if (checkInput()) {
+					var newname = $input.val();
+					self._createFile(fileType, newname);
+					$form.remove();
+					$('#content').focus();
+					$target.find('.displayname').removeClass('hidden');
+					OC.hideMenus();
+				}
+			});
+		},
+
+		/**
+		 * Creates a file with the given type and name.
+		 * This calls the matching methods on the attached file list.
+		 *
+		 * @param {string} fileType file type
+		 * @param {string} name file name
+		 */
+		_createFile: function(fileType, name) {
+			switch(fileType) {
+				case 'file':
+					this._fileList.createFile(name);
+					break;
+				case 'folder':
+					this._fileList.createDirectory(name);
+					break;
+				default:
+					console.warn('Unknown file type "' + fileType + '"');
+			}
+		},
+
+		/**
+		 * Renders the menu with the currently set items
+		 */
+		render: function() {
+			this.$el.html(this.template({
+				uploadMaxHumanFileSize: 'TODO',
+				uploadLabel: t('files', 'Upload'),
+				items: [{
+					id: 'file',
+					displayName: t('files', 'Text file'),
+					templateName: t('files', 'New text file.txt'),
+					iconClass: 'icon-text',
+					fileType: 'file'
+				}, {
+					id: 'folder',
+					displayName: t('files', 'Folder'),
+					templateName: t('files', 'New folder'),
+					iconClass: 'icon-folder',
+					fileType: 'folder'
+				}]
+			}));
+		},
+
+		/**
+		 * Displays the menu under the given element
+		 *
+		 * @param {Object} $target target element
+		 */
+		showAt: function($target) {
+			this.render();
+			var targetOffset = $target.offset();
+			this.$el.css({
+				left: targetOffset.left,
+				top: targetOffset.top + $target.height()
+			});
+			this.$el.removeClass('hidden');
+
+			OC.showMenu(null, this.$el);
+		}
+	});
+
+	OCA.Files.NewFileMenu = NewFileMenu;
+
+})();
+
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 32651b261da..15af1970dc3 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -1,40 +1,16 @@
 <div id="controls">
 		<div class="actions creatable hidden">
-			<?php if(!isset($_['dirToken'])):?>
-			<div id="new" class="button">
-				<a><?php p($l->t('New'));?></a>
-				<ul>
-					<li class="icon-filetype-text svg"
-						data-type="file" data-newname="<?php p($l->t('New text file')) ?>.txt">
-						<p><?php p($l->t('Text file'));?></p>
-					</li>
-					<li class="icon-filetype-folder svg"
-						data-type="folder" data-newname="<?php p($l->t('New folder')) ?>">
-						<p><?php p($l->t('Folder'));?></p>
-					</li>
-				</ul>
-			</div>
-			<?php endif;?>
-			<?php /* Note: the template attributes are here only for the public page. These are normally loaded
-					 through ajax instead (updateStorageStatistics).
-			*/ ?>
-			<div id="upload" class="button"
+		<?php /*
+			Only show upload button for public page
+		*/ ?>
+		<?php if(isset($_['dirToken'])):?>
+			<div id="upload" class="button upload"
 				 title="<?php isset($_['uploadMaxHumanFilesize']) ? p($l->t('Upload (max. %s)', array($_['uploadMaxHumanFilesize']))) : '' ?>">
-					<input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php isset($_['uploadMaxFilesize']) ? p($_['uploadMaxFilesize']) : '' ?>">
-					<input type="hidden" id="upload_limit" value="<?php isset($_['uploadLimit']) ? p($_['uploadLimit']) : '' ?>">
-					<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
-					<?php if(isset($_['dirToken'])):?>
-					<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
-					<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
-					<?php endif;?>
-					<input type="hidden" class="max_human_file_size"
-						   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
-					<input type="file" id="file_upload_start" name='files[]'
-						   data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
 					<label for="file_upload_start" class="svg icon-upload">
 						<span class="hidden-visually"><?php p($l->t('Upload'))?></span>
 					</label>
 			</div>
+		<?php endif; ?>
 			<div id="uploadprogresswrapper">
 				<div id="uploadprogressbar"></div>
 				<button class="stop icon-close" style="display:none">
@@ -48,7 +24,19 @@
 		<div class="notCreatable notPublic hidden">
 			<?php p($l->t('You don’t have permission to upload or create files here'))?>
 		</div>
+	<?php /* Note: the template attributes are here only for the public page. These are normally loaded
+			 through ajax instead (updateStorageStatistics).
+	*/ ?>
 	<input type="hidden" name="permissions" value="" id="permissions">
+	<input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php isset($_['uploadMaxFilesize']) ? p($_['uploadMaxFilesize']) : '' ?>">
+	<input type="hidden" id="upload_limit" value="<?php isset($_['uploadLimit']) ? p($_['uploadLimit']) : '' ?>">
+	<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
+	<?php if(isset($_['dirToken'])):?>
+	<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
+	<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
+	<?php endif;?>
+	<input type="hidden" class="max_human_file_size"
+		   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
 </div>
 
 <div id="emptycontent" class="hidden">
@@ -101,6 +89,10 @@
 	</tfoot>
 </table>
 <input type="hidden" name="dir" id="dir" value="" />
+<div class="hiddenuploadfield">
+	<input type="file" id="file_upload_start" class="hiddenuploadfield" name="files[]"
+		data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
+</div>
 <div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
 <div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
 	<p>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 43c76125e16..cde28c80fc4 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -17,6 +17,7 @@ OCP\Util::addStyle('files', 'upload');
 OCP\Util::addScript('files', 'filesummary');
 OCP\Util::addScript('files', 'breadcrumb');
 OCP\Util::addScript('files', 'fileinfomodel');
+OCP\Util::addScript('files', 'newfilemenu');
 OCP\Util::addScript('files', 'files');
 OCP\Util::addScript('files', 'filelist');
 OCP\Util::addscript('files', 'keyboardshortcuts');
diff --git a/core/css/apps.css b/core/css/apps.css
index 846eba8e4bf..c11bfb3cadf 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -624,3 +624,76 @@ em {
 .tabsContainer .tab {
 	padding: 15px;
 }
+
+/* popover menu styles (use together with "bubble" class) */
+.popovermenu .menuitem,
+.popovermenu .menuitem>span {
+	cursor: pointer;
+}
+
+.popovermenu .menuitem {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+	filter: alpha(opacity=50);
+	opacity: .5;
+}
+
+.popovermenu .menuitem {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+	filter: alpha(opacity=50);
+	opacity: .5;
+}
+
+.popovermenu .menuitem:hover,
+.popovermenu .menuitem:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter: alpha(opacity=100);
+	opacity: 1;
+}
+
+.popovermenu {
+	padding: 4px 12px;
+}
+
+.popovermenu li {
+	padding: 5px 0;
+}
+
+.popovermenu .menuitem img {
+	padding: initial;
+}
+
+.popovermenu a.menuitem,
+.popovermenu label.menuitem,
+.popovermenu .menuitem {
+	padding: 10px;
+	margin: -10px;
+}
+
+.popovermenu.hidden {
+	display: none;
+}
+
+.popovermenu .menuitem {
+	display: block;
+	line-height: 30px;
+	padding-left: 5px;
+	color: #000;
+	padding: 0;
+}
+
+
+.popovermenu .menuitem .icon,
+.popovermenu .menuitem .no-icon {
+	display: inline-block;
+	width: 16px;
+	margin-right: 5px;
+}
+
+.popovermenu .menuitem {
+	opacity: 0.5;
+}
+
+.popovermenu li:hover .menuitem {
+	opacity: 1;
+}
+
diff --git a/core/css/styles.css b/core/css/styles.css
index bf6ca519146..e52d15bcb90 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -944,6 +944,7 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 
 .ui-icon-circle-triangle-e{ background-image:url('../img/actions/play-next.svg'); }
 .ui-icon-circle-triangle-w{ background-image:url('../img/actions/play-previous.svg'); }
+
 .ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }
 
 /* ---- DIALOGS ---- */
@@ -1130,3 +1131,12 @@ fieldset.warning legend + p, fieldset.update legend + p {
 @-ms-viewport {
 	width: device-width;
 }
+
+/* hidden input type=file field */
+.hiddenuploadfield {
+   width: 0;
+   height: 0;
+   opacity: 0;
+   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+}
+
-- 
GitLab


From cc88c5f4b84da57c425cbdb7dc8b391b1942b503 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Fri, 28 Aug 2015 15:52:29 +0100
Subject: [PATCH 075/783] Implement more fine-grained external storage
 permissions model

VisibilityTrait -> PermissionsTrait

PermissionsTrait stores two sets of data, $permissions and
$allowedPermissions (analogous to $visibility and $allowedVisibility of
VisibilityTrait). Each set is a map of user type ('admin' or 'personal')
to permissions (mounting permission, create permission).

The result is that a backend can now be restricted for creation, while
still allowing it to be mounted. This is useful for deprecating backends
or auth mechanisms, preventing new storages being created, while still
allowing existing storages to be mounted.
---
 .../controller/userstoragescontroller.php     |   2 +-
 .../files_external/lib/auth/authmechanism.php |   6 +-
 apps/files_external/lib/backend/backend.php   |   6 +-
 apps/files_external/lib/backend/local.php     |   2 +-
 apps/files_external/lib/permissionstrait.php  | 164 ++++++++++++++++++
 apps/files_external/lib/visibilitytrait.php   | 136 ---------------
 apps/files_external/personal.php              |   8 +-
 .../files_external/service/backendservice.php |  68 ++------
 apps/files_external/settings.php              |  16 +-
 apps/files_external/templates/settings.php    |   2 +-
 .../controller/storagescontrollertest.php     |   8 +-
 .../controller/userstoragescontrollertest.php |   4 +-
 .../tests/service/backendservicetest.php      |  28 +--
 13 files changed, 212 insertions(+), 238 deletions(-)
 create mode 100644 apps/files_external/lib/permissionstrait.php
 delete mode 100644 apps/files_external/lib/visibilitytrait.php

diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php
index 0d41e088a76..9baac3a8031 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/controller/userstoragescontroller.php
@@ -79,7 +79,7 @@ class UserStoragesController extends StoragesController {
 		// Prevent non-admin users from mounting local storage and other disabled backends
 		/** @var Backend */
 		$backend = $storage->getBackend();
-		if (!$backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
+		if (!$backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT)) {
 			return new DataResponse(
 				array(
 					'message' => (string)$this->l10n->t('Admin-only storage backend "%s"', [
diff --git a/apps/files_external/lib/auth/authmechanism.php b/apps/files_external/lib/auth/authmechanism.php
index 11d99bb330d..ddc0c6a4dca 100644
--- a/apps/files_external/lib/auth/authmechanism.php
+++ b/apps/files_external/lib/auth/authmechanism.php
@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Lib\Auth;
 
 use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\VisibilityTrait;
+use \OCA\Files_External\Lib\PermissionsTrait;
 use \OCA\Files_External\Lib\IdentifierTrait;
 use \OCA\Files_External\Lib\FrontendDefinitionTrait;
 use \OCA\Files_External\Lib\StorageModifierTrait;
@@ -40,7 +40,7 @@ use \OCA\Files_External\Lib\StorageModifierTrait;
  * scheme, which are provided from the authentication mechanism.
  *
  * This class uses the following traits:
- *  - VisibilityTrait
+ *  - PermissionsTrait
  *      Restrict usage to admin-only/none
  *  - FrontendDefinitionTrait
  *      Specify configuration parameters and other definitions
@@ -58,7 +58,7 @@ class AuthMechanism implements \JsonSerializable {
 	const SCHEME_PUBLICKEY = 'publickey';
 	const SCHEME_OPENSTACK = 'openstack';
 
-	use VisibilityTrait;
+	use PermissionsTrait;
 	use FrontendDefinitionTrait;
 	use StorageModifierTrait;
 	use IdentifierTrait;
diff --git a/apps/files_external/lib/backend/backend.php b/apps/files_external/lib/backend/backend.php
index 90d5d38ed94..2a2add3ac59 100644
--- a/apps/files_external/lib/backend/backend.php
+++ b/apps/files_external/lib/backend/backend.php
@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\VisibilityTrait;
+use \OCA\Files_External\Lib\PermissionsTrait;
 use \OCA\Files_External\Lib\FrontendDefinitionTrait;
 use \OCA\Files_External\Lib\PriorityTrait;
 use \OCA\Files_External\Lib\DependencyTrait;
@@ -43,7 +43,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  * scheme, which are provided from the authentication mechanism.
  *
  * This class uses the following traits:
- *  - VisibilityTrait
+ *  - PermissionsTrait
  *      Restrict usage to admin-only/none
  *  - FrontendDefinitionTrait
  *      Specify configuration parameters and other definitions
@@ -56,7 +56,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  */
 class Backend implements \JsonSerializable {
 
-	use VisibilityTrait;
+	use PermissionsTrait;
 	use FrontendDefinitionTrait;
 	use PriorityTrait;
 	use DependencyTrait;
diff --git a/apps/files_external/lib/backend/local.php b/apps/files_external/lib/backend/local.php
index a80b437fab7..a6635491b6e 100644
--- a/apps/files_external/lib/backend/local.php
+++ b/apps/files_external/lib/backend/local.php
@@ -39,7 +39,7 @@ class Local extends Backend {
 			->addParameters([
 				(new DefinitionParameter('datadir', $l->t('Location'))),
 			])
-			->setAllowedVisibility(BackendService::VISIBILITY_ADMIN)
+			->setAllowedPermissions(BackendService::USER_PERSONAL, BackendService::PERMISSION_NONE)
 			->setPriority(BackendService::PRIORITY_DEFAULT + 50)
 			->addAuthScheme(AuthMechanism::SCHEME_NULL)
 			->setLegacyAuthMechanism($legacyAuth)
diff --git a/apps/files_external/lib/permissionstrait.php b/apps/files_external/lib/permissionstrait.php
new file mode 100644
index 00000000000..8509a01e422
--- /dev/null
+++ b/apps/files_external/lib/permissionstrait.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib;
+
+use \OCA\Files_External\Service\BackendService;
+
+/**
+ * Trait to implement backend and auth mechanism permissions
+ *
+ * For user type constants, see BackendService::USER_*
+ * For permission constants, see BackendService::PERMISSION_*
+ */
+trait PermissionsTrait {
+
+	/** @var array [user type => permissions] */
+	protected $permissions = [
+		BackendService::USER_PERSONAL => BackendService::PERMISSION_DEFAULT,
+		BackendService::USER_ADMIN => BackendService::PERMISSION_DEFAULT,
+	];
+
+	/** @var array [user type => allowed permissions] */
+	protected $allowedPermissions = [
+		BackendService::USER_PERSONAL => BackendService::PERMISSION_DEFAULT,
+		BackendService::USER_ADMIN => BackendService::PERMISSION_DEFAULT,
+	];
+
+	/**
+	 * @param string $userType
+	 * @return int
+	 */
+	public function getPermissions($userType) {
+		if (isset($this->permissions[$userType])) {
+			return $this->permissions[$userType];
+		}
+		return BackendService::PERMISSION_NONE;
+	}
+
+	/**
+	 * Check if the user type has permission
+	 *
+	 * @param string $userType
+	 * @param int $permission
+	 * @return bool
+	 */
+	public function isPermitted($userType, $permission) {
+		if ($this->getPermissions($userType) & $permission) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permissions
+	 * @return self
+	 */
+	public function setPermissions($userType, $permissions) {
+		$this->permissions[$userType] = $permissions;
+		$this->allowedPermissions[$userType] =
+			$this->getAllowedPermissions($userType) | $permissions;
+		return $this;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function addPermission($userType, $permission) {
+		return $this->setPermissions($userType,
+			$this->getPermissions($userType) | $permission
+		);
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function removePermission($userType, $permission) {
+		return $this->setPermissions($userType,
+			$this->getPermissions($userType) & ~$permission
+		);
+	}
+
+	/**
+	 * @param string $userType
+	 * @return int
+	 */
+	public function getAllowedPermissions($userType) {
+		if (isset($this->allowedPermissions[$userType])) {
+			return $this->allowedPermissions[$userType];
+		}
+		return BackendService::PERMISSION_NONE;
+	}
+
+	/**
+	 * Check if the user type has an allowed permission
+	 *
+	 * @param string $userType
+	 * @param int $permission
+	 * @return bool
+	 */
+	public function isAllowedPermitted($userType, $permission) {
+		if ($this->getAllowedPermissions($userType) & $permission) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permissions
+	 * @return self
+	 */
+	public function setAllowedPermissions($userType, $permissions) {
+		$this->allowedPermissions[$userType] = $permissions;
+		$this->permissions[$userType] =
+			$this->getPermissions($userType) & $permissions;
+		return $this;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function addAllowedPermission($userType, $permission) {
+		return $this->setAllowedPermissions($userType,
+			$this->getAllowedPermissions($userType) | $permission
+		);
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function removeAllowedPermission($userType, $permission) {
+		return $this->setAllowedPermissions($userType,
+			$this->getAllowedPermissions($userType) & ~$permission
+		);
+	}
+
+}
diff --git a/apps/files_external/lib/visibilitytrait.php b/apps/files_external/lib/visibilitytrait.php
deleted file mode 100644
index dfd2d323ca6..00000000000
--- a/apps/files_external/lib/visibilitytrait.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Files_External\Lib;
-
-use \OCA\Files_External\Service\BackendService;
-
-/**
- * Trait to implement visibility mechanics for a configuration class
- *
- * The standard visibility defines which users/groups can use or see the
- * object. The allowed visibility defines the maximum visibility allowed to be
- * set on the object. The standard visibility is often set dynamically by
- * stored configuration parameters that can be modified by the administrator,
- * while the allowed visibility is set directly by the object and cannot be
- * modified by the administrator.
- */
-trait VisibilityTrait {
-
-	/** @var int visibility */
-	protected $visibility = BackendService::VISIBILITY_DEFAULT;
-
-	/** @var int allowed visibilities */
-	protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
-
-	/**
-	 * @return int
-	 */
-	public function getVisibility() {
-		return $this->visibility;
-	}
-
-	/**
-	 * Check if the backend is visible for a user type
-	 *
-	 * @param int $visibility
-	 * @return bool
-	 */
-	public function isVisibleFor($visibility) {
-		if ($this->visibility & $visibility) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function setVisibility($visibility) {
-		$this->visibility = $visibility;
-		$this->allowedVisibility |= $visibility;
-		return $this;
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function addVisibility($visibility) {
-		return $this->setVisibility($this->visibility | $visibility);
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function removeVisibility($visibility) {
-		return $this->setVisibility($this->visibility & ~$visibility);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getAllowedVisibility() {
-		return $this->allowedVisibility;
-	}
-
-	/**
-	 * Check if the backend is allowed to be visible for a user type
-	 *
-	 * @param int $allowedVisibility
-	 * @return bool
-	 */
-	public function isAllowedVisibleFor($allowedVisibility) {
-		if ($this->allowedVisibility & $allowedVisibility) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function setAllowedVisibility($allowedVisibility) {
-		$this->allowedVisibility = $allowedVisibility;
-		$this->visibility &= $allowedVisibility;
-		return $this;
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function addAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function removeAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
-	}
-
-}
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 8717d91d4f1..d47f983b357 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -34,8 +34,12 @@ $userStoragesService = $appContainer->query('OCA\Files_external\Service\UserStor
 OCP\Util::addScript('files_external', 'settings');
 OCP\Util::addStyle('files_external', 'settings');
 
-$backends = $backendService->getBackendsVisibleFor(BackendService::VISIBILITY_PERSONAL);
-$authMechanisms = $backendService->getAuthMechanismsVisibleFor(BackendService::VISIBILITY_PERSONAL);
+$backends = array_filter($backendService->getAvailableBackends(), function($backend) {
+	return $backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE);
+});
+$authMechanisms = array_filter($backendService->getAuthMechanisms(), function($authMechanism) {
+	return $authMechanism->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE);
+});
 foreach ($backends as $backend) {
 	if ($backend->getCustomJs()) {
 		\OCP\Util::addScript('files_external', $backend->getCustomJs());
diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/service/backendservice.php
index 382834b4c19..d9a3e316ce4 100644
--- a/apps/files_external/service/backendservice.php
+++ b/apps/files_external/service/backendservice.php
@@ -31,13 +31,16 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  */
 class BackendService {
 
-	/** Visibility constants for VisibilityTrait */
-	const VISIBILITY_NONE = 0;
-	const VISIBILITY_PERSONAL = 1;
-	const VISIBILITY_ADMIN = 2;
-	//const VISIBILITY_ALIENS = 4;
+	/** Permission constants for PermissionsTrait */
+	const PERMISSION_NONE = 0;
+	const PERMISSION_MOUNT = 1;
+	const PERMISSION_CREATE = 2;
 
-	const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN
+	const PERMISSION_DEFAULT = 3; // MOUNT | CREATE
+
+	/** User contants */
+	const USER_ADMIN = 'admin';
+	const USER_PERSONAL = 'personal';
 
 	/** Priority constants for PriorityTrait */
 	const PRIORITY_DEFAULT = 100;
@@ -81,7 +84,7 @@ class BackendService {
 	 */
 	public function registerBackend(Backend $backend) {
 		if (!$this->isAllowedUserBackend($backend)) {
-			$backend->removeVisibility(BackendService::VISIBILITY_PERSONAL);
+			$backend->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT);
 		}
 		foreach ($backend->getIdentifierAliases() as $alias) {
 			$this->backends[$alias] = $backend;
@@ -103,7 +106,7 @@ class BackendService {
 	 */
 	public function registerAuthMechanism(AuthMechanism $authMech) {
 		if (!$this->isAllowedAuthMechanism($authMech)) {
-			$authMech->removeVisibility(BackendService::VISIBILITY_PERSONAL);
+			$authMech->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT);
 		}
 		foreach ($authMech->getIdentifierAliases() as $alias) {
 			$this->authMechanisms[$alias] = $authMech;
@@ -144,30 +147,6 @@ class BackendService {
 		});
 	}
 
-	/**
-	 * Get backends visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return Backend[]
-	 */
-	public function getBackendsVisibleFor($visibleFor) {
-		return array_filter($this->getAvailableBackends(), function($backend) use ($visibleFor) {
-			return $backend->isVisibleFor($visibleFor);
-		});
-	}
-
-	/**
-	 * Get backends allowed to be visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return Backend[]
-	 */
-	public function getBackendsAllowedVisibleFor($visibleFor) {
-		return array_filter($this->getAvailableBackends(), function($backend) use ($visibleFor) {
-			return $backend->isAllowedVisibleFor($visibleFor);
-		});
-	}
-
 	/**
 	 * @param string $identifier
 	 * @return Backend|null
@@ -205,31 +184,6 @@ class BackendService {
 		});
 	}
 
-	/**
-	 * Get authentication mechanisms visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return AuthMechanism[]
-	 */
-	public function getAuthMechanismsVisibleFor($visibleFor) {
-		return array_filter($this->getAuthMechanisms(), function($authMechanism) use ($visibleFor) {
-			return $authMechanism->isVisibleFor($visibleFor);
-		});
-	}
-
-	/**
-	 * Get authentication mechanisms allowed to be visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return AuthMechanism[]
-	 */
-	public function getAuthMechanismsAllowedVisibleFor($visibleFor) {
-		return array_filter($this->getAuthMechanisms(), function($authMechanism) use ($visibleFor) {
-			return $authMechanism->isAllowedVisibleFor($visibleFor);
-		});
-	}
-
-
 	/**
 	 * @param string $identifier
 	 * @return AuthMechanism|null
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 29c0553158f..840f1325fb5 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -41,8 +41,12 @@ OCP\Util::addStyle('files_external', 'settings');
 \OC_Util::addVendorScript('select2/select2');
 \OC_Util::addVendorStyle('select2/select2');
 
-$backends = $backendService->getBackendsVisibleFor(BackendService::VISIBILITY_ADMIN);
-$authMechanisms = $backendService->getAuthMechanismsVisibleFor(BackendService::VISIBILITY_ADMIN);
+$backends = array_filter($backendService->getAvailableBackends(), function($backend) {
+	return $backend->isPermitted(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE);
+});
+$authMechanisms = array_filter($backendService->getAuthMechanisms(), function($authMechanism) {
+	return $authMechanism->isPermitted(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE);
+});
 foreach ($backends as $backend) {
 	if ($backend->getCustomJs()) {
 		\OCP\Util::addScript('files_external', $backend->getCustomJs());
@@ -54,13 +58,19 @@ foreach ($authMechanisms as $authMechanism) {
 	}
 }
 
+$userBackends = array_filter($backendService->getAvailableBackends(), function($backend) {
+	return $backend->isAllowedPermitted(
+		BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT
+	);
+});
+
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled());
 $tmpl->assign('isAdminPage', true);
 $tmpl->assign('storages', $globalStoragesService->getAllStorages());
 $tmpl->assign('backends', $backends);
 $tmpl->assign('authMechanisms', $authMechanisms);
-$tmpl->assign('userBackends', $backendService->getBackendsAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL));
+$tmpl->assign('userBackends', $userBackends);
 $tmpl->assign('dependencies', OC_Mount_Config::dependencyMessage($backendService->getBackends()));
 $tmpl->assign('allowUserMounting', $backendService->isUserMountingAllowed());
 return $tmpl->fetchPage();
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 5b79edf6cf7..63a3a19de2f 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -197,7 +197,7 @@
 		<p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
 			<?php p($l->t('Allow users to mount the following external storage')); ?><br />
 			<?php $i = 0; foreach ($_['userBackends'] as $backend): ?>
-				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
+				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT)) print_unescaped(' checked="checked"'); ?> />
 				<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
 				<?php $i++; ?>
 			<?php endforeach; ?>
diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php
index 2b0ee7a14ea..5a2cff99244 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/controller/storagescontrollertest.php
@@ -78,7 +78,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -117,7 +117,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -248,7 +248,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(255);
@@ -332,7 +332,7 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn($backendValidate);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$authMech = $this->getAuthMechMock();
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index 9f1a8df8d2e..b9668064e33 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -50,8 +50,8 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 
 	public function testAddOrUpdateStorageDisallowedBackend() {
 		$backend = $this->getBackendMock();
-		$backend->method('isVisibleFor')
-			->with(BackendService::VISIBILITY_PERSONAL)
+		$backend->method('isPermitted')
+			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT)
 			->willReturn(false);
 		$authMech = $this->getAuthMechMock();
 
diff --git a/apps/files_external/tests/service/backendservicetest.php b/apps/files_external/tests/service/backendservicetest.php
index 08f6b9bf988..b37b5e9b466 100644
--- a/apps/files_external/tests/service/backendservicetest.php
+++ b/apps/files_external/tests/service/backendservicetest.php
@@ -83,11 +83,11 @@ class BackendServiceTest extends \Test\TestCase {
 
 		$backendAllowed = $this->getBackendMock('\User\Mount\Allowed');
 		$backendAllowed->expects($this->never())
-			->method('removeVisibility');
+			->method('removePermission');
 		$backendNotAllowed = $this->getBackendMock('\User\Mount\NotAllowed');
 		$backendNotAllowed->expects($this->once())
-			->method('removeVisibility')
-			->with(BackendService::VISIBILITY_PERSONAL);
+			->method('removePermission')
+			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE | BackendService::PERMISSION_MOUNT);
 
 		$backendAlias = $this->getMockBuilder('\OCA\Files_External\Lib\Backend\Backend')
 			->disableOriginalConstructor()
@@ -126,27 +126,5 @@ class BackendServiceTest extends \Test\TestCase {
 		$this->assertArrayNotHasKey('identifier:\Backend\NotAvailable', $availableBackends);
 	}
 
-	public function testGetUserBackends() {
-		$service = new BackendService($this->config, $this->l10n);
-
-		$backendAllowed = $this->getBackendMock('\User\Mount\Allowed');
-		$backendAllowed->expects($this->once())
-			->method('isVisibleFor')
-			->with(BackendService::VISIBILITY_PERSONAL)
-			->will($this->returnValue(true));
-		$backendNotAllowed = $this->getBackendMock('\User\Mount\NotAllowed');
-		$backendNotAllowed->expects($this->once())
-			->method('isVisibleFor')
-			->with(BackendService::VISIBILITY_PERSONAL)
-			->will($this->returnValue(false));
-
-		$service->registerBackend($backendAllowed);
-		$service->registerBackend($backendNotAllowed);
-
-		$userBackends = $service->getBackendsVisibleFor(BackendService::VISIBILITY_PERSONAL);
-		$this->assertArrayHasKey('identifier:\User\Mount\Allowed', $userBackends);
-		$this->assertArrayNotHasKey('identifier:\User\Mount\NotAllowed', $userBackends);
-	}
-
 }
 
-- 
GitLab


From f0c8cfa9a6a5db7134a2490cc562ff2623ce685d Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Fri, 28 Aug 2015 16:15:21 +0100
Subject: [PATCH 076/783] Validate permissions for created admin storages, auth
 mechanism

Backend and auth mechanism permissions are checked on storage creation,
both for personal storages and for admin storages
---
 .../controller/globalstoragescontroller.php   | 11 +++++
 .../controller/storagescontroller.php         | 34 ++++++++++++++-
 .../controller/userstoragescontroller.php     | 42 +++++--------------
 .../controller/storagescontrollertest.php     |  8 ++++
 .../controller/userstoragescontrollertest.php |  2 +-
 5 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php
index 756a34fc5d4..32408420039 100644
--- a/apps/files_external/controller/globalstoragescontroller.php
+++ b/apps/files_external/controller/globalstoragescontroller.php
@@ -32,6 +32,7 @@ use \OCP\AppFramework\Http;
 use \OCA\Files_external\Service\GlobalStoragesService;
 use \OCA\Files_external\NotFoundException;
 use \OCA\Files_external\Lib\StorageConfig;
+use \OCA\Files_External\Service\BackendService;
 
 /**
  * Global storages controller
@@ -178,4 +179,14 @@ class GlobalStoragesController extends StoragesController {
 
 	}
 
+	/**
+	 * Get the user type for this controller, used in validation
+	 *
+	 * @return string BackendService::USER_* constants
+	 */
+	protected function getUserType() {
+		return BackendService::USER_ADMIN;
+	}
+
+
 }
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php
index 613f22c0331..d99b8b5f2c5 100644
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/controller/storagescontroller.php
@@ -36,6 +36,7 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCP\Files\StorageNotAvailableException;
 use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
+use \OCA\Files_External\Service\BackendService;
 
 /**
  * Base class for storages controllers
@@ -157,12 +158,36 @@ abstract class StoragesController extends Controller {
 			return new DataResponse(
 				array(
 					'message' => (string)$this->l10n->t('Invalid storage backend "%s"', [
-						$storage->getBackend()->getIdentifier()
+						$backend->getIdentifier()
 					])
 				),
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
 		}
+
+		if (!$backend->isPermitted($this->getUserType(), BackendService::PERMISSION_CREATE)) {
+			// not permitted to use backend
+			return new DataResponse(
+				array(
+					'message' => (string)$this->l10n->t('Not permitted to use backend "%s"', [
+						$backend->getIdentifier()
+					])
+				),
+				Http::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
+		if (!$authMechanism->isPermitted($this->getUserType(), BackendService::PERMISSION_CREATE)) {
+			// not permitted to use auth mechanism
+			return new DataResponse(
+				array(
+					'message' => (string)$this->l10n->t('Not permitted to use authentication mechanism "%s"', [
+						$authMechanism->getIdentifier()
+					])
+				),
+				Http::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
+
 		if (!$backend->validateStorage($storage)) {
 			// unsatisfied parameters
 			return new DataResponse(
@@ -185,6 +210,13 @@ abstract class StoragesController extends Controller {
 		return null;
 	}
 
+	/**
+	 * Get the user type for this controller, used in validation
+	 *
+	 * @return string BackendService::USER_* constants
+	 */
+	abstract protected function getUserType();
+
 	/**
 	 * Check whether the given storage is available / valid.
 	 *
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php
index 9baac3a8031..585ff8eeb00 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/controller/userstoragescontroller.php
@@ -61,38 +61,6 @@ class UserStoragesController extends StoragesController {
 		);
 	}
 
-	/**
-	 * Validate storage config
-	 *
-	 * @param StorageConfig $storage storage config
-	 *
-	 * @return DataResponse|null returns response in case of validation error
-	 */
-	protected function validate(StorageConfig $storage) {
-		$result = parent::validate($storage);
-
-		if ($result !== null) {
-			return $result;
-		}
-
-		// Verify that the mount point applies for the current user
-		// Prevent non-admin users from mounting local storage and other disabled backends
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		if (!$backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT)) {
-			return new DataResponse(
-				array(
-					'message' => (string)$this->l10n->t('Admin-only storage backend "%s"', [
-						$storage->getBackend()->getIdentifier()
-					])
-				),
-				Http::STATUS_UNPROCESSABLE_ENTITY
-			);
-		}
-
-		return null;
-	}
-
 	/**
 	 * Return storage
 	 *
@@ -218,4 +186,14 @@ class UserStoragesController extends StoragesController {
 	public function destroy($id) {
 		return parent::destroy($id);
 	}
+
+	/**
+	 * Get the user type for this controller, used in validation
+	 *
+	 * @return string BackendService::USER_* constants
+	 */
+	protected function getUserType() {
+		return BackendService::USER_PERSONAL;
+	}
+
 }
diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php
index 5a2cff99244..c43761f3bcb 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/controller/storagescontrollertest.php
@@ -75,6 +75,8 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
+		$authMech->method('isPermitted')
+			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
@@ -114,6 +116,8 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
+		$authMech->method('isPermitted')
+			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
@@ -245,6 +249,8 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
+		$authMech->method('isPermitted')
+			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
@@ -338,6 +344,8 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->will($this->returnValue($authMechValidate));
+		$authMech->method('isPermitted')
+			->willReturn(true);
 
 		$storageConfig = new StorageConfig();
 		$storageConfig->setMountPoint('mount');
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index b9668064e33..720e59cff93 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -51,7 +51,7 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 	public function testAddOrUpdateStorageDisallowedBackend() {
 		$backend = $this->getBackendMock();
 		$backend->method('isPermitted')
-			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT)
+			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
 			->willReturn(false);
 		$authMech = $this->getAuthMechMock();
 
-- 
GitLab


From 42f0651b8324be31d1ff31dad82194f81d748900 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 28 Aug 2015 18:40:50 +0200
Subject: [PATCH 077/783] Sticky the notification types of files and sharing

---
 lib/private/activitymanager.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php
index a973db7206f..fc250173536 100644
--- a/lib/private/activitymanager.php
+++ b/lib/private/activitymanager.php
@@ -244,15 +244,27 @@ class ActivityManager implements IManager {
 	 * @return array
 	 */
 	public function getNotificationTypes($languageCode) {
+		$filesNotificationTypes = [];
+		$sharingNotificationTypes = [];
+
 		$notificationTypes = array();
 		foreach ($this->getExtensions() as $c) {
 			$result = $c->getNotificationTypes($languageCode);
 			if (is_array($result)) {
+				if (class_exists('\OCA\Files\Activity') && $c instanceof \OCA\Files\Activity) {
+					$filesNotificationTypes = $result;
+					continue;
+				}
+				if (class_exists('\OCA\Files_Sharing\Activity') && $c instanceof \OCA\Files_Sharing\Activity) {
+					$sharingNotificationTypes = $result;
+					continue;
+				}
+
 				$notificationTypes = array_merge($notificationTypes, $result);
 			}
 		}
 
-		return $notificationTypes;
+		return array_merge($filesNotificationTypes, $sharingNotificationTypes, $notificationTypes);
 	}
 
 	/**
-- 
GitLab


From d2e3c17c0000bc0020f1ff641190452f370434de Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Fri, 28 Aug 2015 16:50:10 +0100
Subject: [PATCH 078/783] Introduce MODIFY permission for external storages

---
 .../controller/globalstoragescontroller.php        |  4 ++--
 .../controller/storagescontroller.php              |  7 ++++---
 .../controller/userstoragescontroller.php          |  4 ++--
 apps/files_external/service/backendservice.php     |  3 ++-
 .../controller/userstoragescontrollertest.php      | 14 +++++++++++---
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php
index 32408420039..7d97fdbb4f4 100644
--- a/apps/files_external/controller/globalstoragescontroller.php
+++ b/apps/files_external/controller/globalstoragescontroller.php
@@ -98,7 +98,7 @@ class GlobalStoragesController extends StoragesController {
 			return $newStorage;
 		}
 
-		$response = $this->validate($newStorage);
+		$response = $this->validate($newStorage, BackendService::PERMISSION_CREATE);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -154,7 +154,7 @@ class GlobalStoragesController extends StoragesController {
 		}
 		$storage->setId($id);
 
-		$response = $this->validate($storage);
+		$response = $this->validate($storage, BackendService::PERMISSION_MODIFY);
 		if (!empty($response)) {
 			return $response;
 		}
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php
index d99b8b5f2c5..46202c8ba4a 100644
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/controller/storagescontroller.php
@@ -125,10 +125,11 @@ abstract class StoragesController extends Controller {
 	 * Validate storage config
 	 *
 	 * @param StorageConfig $storage storage config
+	 * @param int $permissionCheck permission to check
 	 *
 	 * @return DataResponse|null returns response in case of validation error
 	 */
-	protected function validate(StorageConfig $storage) {
+	protected function validate(StorageConfig $storage, $permissionCheck = BackendService::PERMISSION_CREATE) {
 		$mountPoint = $storage->getMountPoint();
 		if ($mountPoint === '' || $mountPoint === '/') {
 			return new DataResponse(
@@ -165,7 +166,7 @@ abstract class StoragesController extends Controller {
 			);
 		}
 
-		if (!$backend->isPermitted($this->getUserType(), BackendService::PERMISSION_CREATE)) {
+		if (!$backend->isPermitted($this->getUserType(), $permissionCheck)) {
 			// not permitted to use backend
 			return new DataResponse(
 				array(
@@ -176,7 +177,7 @@ abstract class StoragesController extends Controller {
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
 		}
-		if (!$authMechanism->isPermitted($this->getUserType(), BackendService::PERMISSION_CREATE)) {
+		if (!$authMechanism->isPermitted($this->getUserType(), $permissionCheck)) {
 			// not permitted to use auth mechanism
 			return new DataResponse(
 				array(
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php
index 585ff8eeb00..801c9ab0aae 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/controller/userstoragescontroller.php
@@ -103,7 +103,7 @@ class UserStoragesController extends StoragesController {
 			return $newStorage;
 		}
 
-		$response = $this->validate($newStorage);
+		$response = $this->validate($newStorage, BackendService::PERMISSION_CREATE);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -151,7 +151,7 @@ class UserStoragesController extends StoragesController {
 		}
 		$storage->setId($id);
 
-		$response = $this->validate($storage);
+		$response = $this->validate($storage, BackendService::PERMISSION_MODIFY);
 		if (!empty($response)) {
 			return $response;
 		}
diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/service/backendservice.php
index d9a3e316ce4..70cb9291660 100644
--- a/apps/files_external/service/backendservice.php
+++ b/apps/files_external/service/backendservice.php
@@ -35,8 +35,9 @@ class BackendService {
 	const PERMISSION_NONE = 0;
 	const PERMISSION_MOUNT = 1;
 	const PERMISSION_CREATE = 2;
+	const PERMISSION_MODIFY = 4;
 
-	const PERMISSION_DEFAULT = 3; // MOUNT | CREATE
+	const PERMISSION_DEFAULT = 7; // MOUNT | CREATE | MODIFY
 
 	/** User contants */
 	const USER_ADMIN = 'admin';
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index 720e59cff93..b61174b0797 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -49,15 +49,21 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 	}
 
 	public function testAddOrUpdateStorageDisallowedBackend() {
-		$backend = $this->getBackendMock();
-		$backend->method('isPermitted')
+		$backend1 = $this->getBackendMock();
+		$backend1->expects($this->once())
+			->method('isPermitted')
 			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
 			->willReturn(false);
+		$backend2 = $this->getBackendMock();
+		$backend2->expects($this->once())
+			->method('isPermitted')
+			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_MODIFY)
+			->willReturn(false);
 		$authMech = $this->getAuthMechMock();
 
 		$storageConfig = new StorageConfig(1);
 		$storageConfig->setMountPoint('mount');
-		$storageConfig->setBackend($backend);
+		$storageConfig->setBackend($backend1);
 		$storageConfig->setAuthMechanism($authMech);
 		$storageConfig->setBackendOptions([]);
 
@@ -82,6 +88,8 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 
 		$this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus());
 
+		$storageConfig->setBackend($backend2);
+
 		$response = $this->controller->update(
 			1,
 			'mount',
-- 
GitLab


From 0b97a05e7bd631d66de1c2aee115113ada8a5f63 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Fri, 28 Aug 2015 16:16:48 +0100
Subject: [PATCH 079/783] Prevent creation of deprecated backends

---
 apps/files_external/lib/backend/sftp_key.php | 2 ++
 apps/files_external/lib/backend/smb_oc.php   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/backend/sftp_key.php
index 4a7f565eb19..6a75172026d 100644
--- a/apps/files_external/lib/backend/sftp_key.php
+++ b/apps/files_external/lib/backend/sftp_key.php
@@ -40,6 +40,8 @@ class SFTP_Key extends Backend {
 				(new DefinitionParameter('root', $l->t('Remote subfolder')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
+			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
+			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
 			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php
index cae3818c76c..67fa8ffb2c4 100644
--- a/apps/files_external/lib/backend/smb_oc.php
+++ b/apps/files_external/lib/backend/smb_oc.php
@@ -49,6 +49,8 @@ class SMB_OC extends Backend {
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
 			->setDependencyCheck('\OC\Files\Storage\SMB::checkDependencies')
+			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
+			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
 			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
-- 
GitLab


From 4adc002428a3b1d9494e1bd433e128a59c1433a4 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 28 Aug 2015 18:53:43 +0200
Subject: [PATCH 080/783] fix size of filetype icons in filepicker

---
 core/css/styles.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/css/styles.css b/core/css/styles.css
index bf6ca519146..da4dc8b4d4d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -977,6 +977,7 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 }
 #oc-dialog-filepicker-content .filelist img {
 	margin: 2px 1em 0 4px;
+	width: 32px;
 }
 #oc-dialog-filepicker-content .filelist .date {
 	float: right;
-- 
GitLab


From 503abb36a23dc8bb0ae5c08ede44e31712b12e53 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 28 Aug 2015 19:10:47 +0200
Subject: [PATCH 081/783] Sort languages with a name before those with language
 code only

---
 settings/personal.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/settings/personal.php b/settings/personal.php
index bbbba3b5b8d..8a1a8af55c1 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -94,6 +94,15 @@ ksort($commonlanguages);
 
 // sort now by displayed language not the iso-code
 usort( $languages, function ($a, $b) {
+	if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
+		// If a doesn't have a name, but b does, list b before a
+		return 1;
+	}
+	if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
+		// If a does have a name, but b doesn't, list a before b
+		return -1;
+	}
+	// Otherwise compare the names
 	return strcmp($a['name'], $b['name']);
 });
 
-- 
GitLab


From 64652b300081e2f7090b19bb8467bb89ae6b2faa Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 29 Aug 2015 01:55:05 -0400
Subject: [PATCH 082/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/ast.js        | 2 ++
 apps/encryption/l10n/ast.json      | 2 ++
 apps/encryption/l10n/az.js         | 1 +
 apps/encryption/l10n/az.json       | 1 +
 apps/encryption/l10n/bg_BG.js      | 2 ++
 apps/encryption/l10n/bg_BG.json    | 2 ++
 apps/encryption/l10n/bn_BD.js      | 1 +
 apps/encryption/l10n/bn_BD.json    | 1 +
 apps/encryption/l10n/bs.js         | 2 ++
 apps/encryption/l10n/bs.json       | 2 ++
 apps/encryption/l10n/ca.js         | 2 ++
 apps/encryption/l10n/ca.json       | 2 ++
 apps/encryption/l10n/cs_CZ.js      | 2 ++
 apps/encryption/l10n/cs_CZ.json    | 2 ++
 apps/encryption/l10n/da.js         | 2 ++
 apps/encryption/l10n/da.json       | 2 ++
 apps/encryption/l10n/de.js         | 2 ++
 apps/encryption/l10n/de.json       | 2 ++
 apps/encryption/l10n/de_DE.js      | 2 ++
 apps/encryption/l10n/de_DE.json    | 2 ++
 apps/encryption/l10n/el.js         | 2 ++
 apps/encryption/l10n/el.json       | 2 ++
 apps/encryption/l10n/en_GB.js      | 2 ++
 apps/encryption/l10n/en_GB.json    | 2 ++
 apps/encryption/l10n/es.js         | 2 ++
 apps/encryption/l10n/es.json       | 2 ++
 apps/encryption/l10n/es_AR.js      | 2 ++
 apps/encryption/l10n/es_AR.json    | 2 ++
 apps/encryption/l10n/es_MX.js      | 2 ++
 apps/encryption/l10n/es_MX.json    | 2 ++
 apps/encryption/l10n/et_EE.js      | 2 ++
 apps/encryption/l10n/et_EE.json    | 2 ++
 apps/encryption/l10n/eu.js         | 2 ++
 apps/encryption/l10n/eu.json       | 2 ++
 apps/encryption/l10n/fa.js         | 1 +
 apps/encryption/l10n/fa.json       | 1 +
 apps/encryption/l10n/fi_FI.js      | 2 ++
 apps/encryption/l10n/fi_FI.json    | 2 ++
 apps/encryption/l10n/fr.js         | 2 ++
 apps/encryption/l10n/fr.json       | 2 ++
 apps/encryption/l10n/gl.js         | 2 ++
 apps/encryption/l10n/gl.json       | 2 ++
 apps/encryption/l10n/hr.js         | 2 ++
 apps/encryption/l10n/hr.json       | 2 ++
 apps/encryption/l10n/hu_HU.js      | 2 ++
 apps/encryption/l10n/hu_HU.json    | 2 ++
 apps/encryption/l10n/ia.js         | 7 +++++++
 apps/encryption/l10n/ia.json       | 5 +++++
 apps/encryption/l10n/id.js         | 2 ++
 apps/encryption/l10n/id.json       | 2 ++
 apps/encryption/l10n/is.js         | 7 +++++++
 apps/encryption/l10n/is.json       | 5 +++++
 apps/encryption/l10n/it.js         | 2 ++
 apps/encryption/l10n/it.json       | 2 ++
 apps/encryption/l10n/ja.js         | 2 ++
 apps/encryption/l10n/ja.json       | 2 ++
 apps/encryption/l10n/kn.js         | 1 +
 apps/encryption/l10n/kn.json       | 1 +
 apps/encryption/l10n/ko.js         | 2 ++
 apps/encryption/l10n/ko.json       | 2 ++
 apps/encryption/l10n/lb.js         | 1 +
 apps/encryption/l10n/lb.json       | 1 +
 apps/encryption/l10n/lt_LT.js      | 2 ++
 apps/encryption/l10n/lt_LT.json    | 2 ++
 apps/encryption/l10n/mk.js         | 1 +
 apps/encryption/l10n/mk.json       | 1 +
 apps/encryption/l10n/nb_NO.js      | 2 ++
 apps/encryption/l10n/nb_NO.json    | 2 ++
 apps/encryption/l10n/nl.js         | 2 ++
 apps/encryption/l10n/nl.json       | 2 ++
 apps/encryption/l10n/oc.js         | 2 ++
 apps/encryption/l10n/oc.json       | 2 ++
 apps/encryption/l10n/pl.js         | 2 ++
 apps/encryption/l10n/pl.json       | 2 ++
 apps/encryption/l10n/pt_BR.js      | 2 ++
 apps/encryption/l10n/pt_BR.json    | 2 ++
 apps/encryption/l10n/pt_PT.js      | 2 ++
 apps/encryption/l10n/pt_PT.json    | 2 ++
 apps/encryption/l10n/ro.js         | 1 +
 apps/encryption/l10n/ro.json       | 1 +
 apps/encryption/l10n/ru.js         | 2 ++
 apps/encryption/l10n/ru.json       | 2 ++
 apps/encryption/l10n/sk_SK.js      | 2 ++
 apps/encryption/l10n/sk_SK.json    | 2 ++
 apps/encryption/l10n/sl.js         | 2 ++
 apps/encryption/l10n/sl.json       | 2 ++
 apps/encryption/l10n/sq.js         | 2 ++
 apps/encryption/l10n/sq.json       | 2 ++
 apps/encryption/l10n/sr.js         | 2 ++
 apps/encryption/l10n/sr.json       | 2 ++
 apps/encryption/l10n/sr@latin.js   | 2 ++
 apps/encryption/l10n/sr@latin.json | 2 ++
 apps/encryption/l10n/sv.js         | 2 ++
 apps/encryption/l10n/sv.json       | 2 ++
 apps/encryption/l10n/th_TH.js      | 2 ++
 apps/encryption/l10n/th_TH.json    | 2 ++
 apps/encryption/l10n/tr.js         | 2 ++
 apps/encryption/l10n/tr.json       | 2 ++
 apps/encryption/l10n/uk.js         | 2 ++
 apps/encryption/l10n/uk.json       | 2 ++
 apps/encryption/l10n/ur_PK.js      | 6 ++++++
 apps/encryption/l10n/ur_PK.json    | 4 ++++
 apps/encryption/l10n/vi.js         | 2 ++
 apps/encryption/l10n/vi.json       | 2 ++
 apps/encryption/l10n/zh_CN.js      | 2 ++
 apps/encryption/l10n/zh_CN.json    | 2 ++
 apps/encryption/l10n/zh_TW.js      | 2 ++
 apps/encryption/l10n/zh_TW.json    | 2 ++
 core/l10n/es.js                    | 5 +++++
 core/l10n/es.json                  | 5 +++++
 core/l10n/is.js                    | 1 +
 core/l10n/is.json                  | 1 +
 112 files changed, 236 insertions(+)
 create mode 100644 apps/encryption/l10n/ia.js
 create mode 100644 apps/encryption/l10n/ia.json
 create mode 100644 apps/encryption/l10n/is.js
 create mode 100644 apps/encryption/l10n/is.json
 create mode 100644 apps/encryption/l10n/ur_PK.js
 create mode 100644 apps/encryption/l10n/ur_PK.json

diff --git a/apps/encryption/l10n/ast.js b/apps/encryption/l10n/ast.js
index 94a164ff65d..eb732bada56 100644
--- a/apps/encryption/l10n/ast.js
+++ b/apps/encryption/l10n/ast.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
+    "The share will expire on %s." : "La compartición va caducar el %s.",
+    "Cheers!" : "¡Salú!",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
     "Change Password" : "Camudar contraseña",
diff --git a/apps/encryption/l10n/ast.json b/apps/encryption/l10n/ast.json
index ecd1c2ff2e3..501e4757acf 100644
--- a/apps/encryption/l10n/ast.json
+++ b/apps/encryption/l10n/ast.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
+    "The share will expire on %s." : "La compartición va caducar el %s.",
+    "Cheers!" : "¡Salú!",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
     "Change Password" : "Camudar contraseña",
diff --git a/apps/encryption/l10n/az.js b/apps/encryption/l10n/az.js
index a8897f9ec18..0b429f903fa 100644
--- a/apps/encryption/l10n/az.js
+++ b/apps/encryption/l10n/az.js
@@ -20,6 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifrələnmə proqramı üçün yalnış şəxsi açar. Xahiş olunur öz şəxsi quraşdırmalarınızda şəxsi açarınızı yeniləyəsiniz ki, şifrələnmiş fayllara yetki ala biləsiniz.   ",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu faylı deşifrə etmək olmur və ola bilər ki, bu paylaşımda olan fayldır. Xahiş olunur faylın sahibinə həmin faylı sizinlə yenidən paylaşım etməsini bildirəsiniz. ",
+    "Cheers!" : "Şərəfə!",
     "Recovery key password" : "Açar şifrənin bərpa edilməsi",
     "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
     "Change Password" : "Şifrəni dəyişdir",
diff --git a/apps/encryption/l10n/az.json b/apps/encryption/l10n/az.json
index 1dae4fbeaf9..fc5ab73b8b4 100644
--- a/apps/encryption/l10n/az.json
+++ b/apps/encryption/l10n/az.json
@@ -18,6 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifrələnmə proqramı üçün yalnış şəxsi açar. Xahiş olunur öz şəxsi quraşdırmalarınızda şəxsi açarınızı yeniləyəsiniz ki, şifrələnmiş fayllara yetki ala biləsiniz.   ",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu faylı deşifrə etmək olmur və ola bilər ki, bu paylaşımda olan fayldır. Xahiş olunur faylın sahibinə həmin faylı sizinlə yenidən paylaşım etməsini bildirəsiniz. ",
+    "Cheers!" : "Şərəfə!",
     "Recovery key password" : "Açar şifrənin bərpa edilməsi",
     "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
     "Change Password" : "Şifrəni dəyişdir",
diff --git a/apps/encryption/l10n/bg_BG.js b/apps/encryption/l10n/bg_BG.js
index 0a5de0eab85..f099d9462b7 100644
--- a/apps/encryption/l10n/bg_BG.js
+++ b/apps/encryption/l10n/bg_BG.js
@@ -20,6 +20,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
+    "The share will expire on %s." : "Споделянето ще изтече на %s.",
+    "Cheers!" : "Поздрави!",
     "Recovery key password" : "Парола за възстановяане на ключа",
     "Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
     "Change Password" : "Промени Паролата",
diff --git a/apps/encryption/l10n/bg_BG.json b/apps/encryption/l10n/bg_BG.json
index 12729417191..d4aa2e521c9 100644
--- a/apps/encryption/l10n/bg_BG.json
+++ b/apps/encryption/l10n/bg_BG.json
@@ -18,6 +18,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
+    "The share will expire on %s." : "Споделянето ще изтече на %s.",
+    "Cheers!" : "Поздрави!",
     "Recovery key password" : "Парола за възстановяане на ключа",
     "Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
     "Change Password" : "Промени Паролата",
diff --git a/apps/encryption/l10n/bn_BD.js b/apps/encryption/l10n/bn_BD.js
index f91008e2408..2d20f4caa26 100644
--- a/apps/encryption/l10n/bn_BD.js
+++ b/apps/encryption/l10n/bn_BD.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
     "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
     "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
+    "Cheers!" : "শুভেচ্ছা!",
     "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
     "Change Password" : "কূটশব্দ পরিবর্তন করুন",
     "Enabled" : "কার্যকর",
diff --git a/apps/encryption/l10n/bn_BD.json b/apps/encryption/l10n/bn_BD.json
index 375bbd517a7..4c2c9c14b95 100644
--- a/apps/encryption/l10n/bn_BD.json
+++ b/apps/encryption/l10n/bn_BD.json
@@ -2,6 +2,7 @@
     "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
     "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
     "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
+    "Cheers!" : "শুভেচ্ছা!",
     "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
     "Change Password" : "কূটশব্দ পরিবর্তন করুন",
     "Enabled" : "কার্যকর",
diff --git a/apps/encryption/l10n/bs.js b/apps/encryption/l10n/bs.js
index bd38f94486e..41d7074d5a4 100644
--- a/apps/encryption/l10n/bs.js
+++ b/apps/encryption/l10n/bs.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
     "Enabled" : "Aktivirano",
     "Disabled" : "Onemogućeno"
 },
diff --git a/apps/encryption/l10n/bs.json b/apps/encryption/l10n/bs.json
index 4d858dbb966..0beb35f1558 100644
--- a/apps/encryption/l10n/bs.json
+++ b/apps/encryption/l10n/bs.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
     "Enabled" : "Aktivirano",
     "Disabled" : "Onemogućeno"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/encryption/l10n/ca.js b/apps/encryption/l10n/ca.js
index e160a23b722..9a318f2d4c2 100644
--- a/apps/encryption/l10n/ca.js
+++ b/apps/encryption/l10n/ca.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.",
+    "The share will expire on %s." : "La compartició venç el %s.",
+    "Cheers!" : "Salut!",
     "Recovery key password" : "Clau de recuperació de la contrasenya",
     "Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
     "Change Password" : "Canvia la contrasenya",
diff --git a/apps/encryption/l10n/ca.json b/apps/encryption/l10n/ca.json
index 464c6e86342..b172da4a0df 100644
--- a/apps/encryption/l10n/ca.json
+++ b/apps/encryption/l10n/ca.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.",
+    "The share will expire on %s." : "La compartició venç el %s.",
+    "Cheers!" : "Salut!",
     "Recovery key password" : "Clau de recuperació de la contrasenya",
     "Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
     "Change Password" : "Canvia la contrasenya",
diff --git a/apps/encryption/l10n/cs_CZ.js b/apps/encryption/l10n/cs_CZ.js
index 7b138c80086..e9477dd54db 100644
--- a/apps/encryption/l10n/cs_CZ.js
+++ b/apps/encryption/l10n/cs_CZ.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Aplikace šifrování je již povolena",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.",
+    "The share will expire on %s." : "Sdílení vyprší %s.",
+    "Cheers!" : "Ať slouží!",
     "Enable recovery key" : "Povolit záchranný klíč",
     "Disable recovery key" : "Vypnout záchranný klíč",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.",
diff --git a/apps/encryption/l10n/cs_CZ.json b/apps/encryption/l10n/cs_CZ.json
index ab0fd8b2e4f..ed75239894e 100644
--- a/apps/encryption/l10n/cs_CZ.json
+++ b/apps/encryption/l10n/cs_CZ.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Aplikace šifrování je již povolena",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.",
+    "The share will expire on %s." : "Sdílení vyprší %s.",
+    "Cheers!" : "Ať slouží!",
     "Enable recovery key" : "Povolit záchranný klíč",
     "Disable recovery key" : "Vypnout záchranný klíč",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.",
diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index 5d97843f77c..80b1496573c 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.",
+    "The share will expire on %s." : "Delingen vil udløbe om %s.",
+    "Cheers!" : "Hej!",
     "Enable recovery key" : "Aktivér gendannelsesnøgle",
     "Disable recovery key" : "Deaktivér gendannelsesnøgle",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.",
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index d90d030f45b..23a9201bc9b 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.",
+    "The share will expire on %s." : "Delingen vil udløbe om %s.",
+    "Cheers!" : "Hej!",
     "Enable recovery key" : "Aktivér gendannelsesnøgle",
     "Disable recovery key" : "Deaktivér gendannelsesnøgle",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.",
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index df1566adb28..18e74fb9ed1 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein oder ihr Passwort vergessen hat.",
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index 1fe237562f2..e15fe7e1cd1 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein oder ihr Passwort vergessen hat.",
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index 5d5911c91eb..eb87c998259 100644
--- a/apps/encryption/l10n/de_DE.js
+++ b/apps/encryption/l10n/de_DE.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.",
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index f67d5dfd4c5..8971978dd78 100644
--- a/apps/encryption/l10n/de_DE.json
+++ b/apps/encryption/l10n/de_DE.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.",
diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js
index 078b66d6784..1c9178831b6 100644
--- a/apps/encryption/l10n/el.js
+++ b/apps/encryption/l10n/el.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Η Εφαρμογή Κρυπτογράφησης είναι ενεργοποιημένη και έτοιμη.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Αδυναμία ανάγνωσης αυτού του αρχείου, πιθανό να είναι διαμοιραζόμενο αρχείο. Παρακαλώ ρωτήστε τον κάτοχο του αρχείου να το διαμοιράσει ξανά μαζί σας.",
+    "The share will expire on %s." : "Ο διαμοιρασμός θα λήξει σε %s.",
+    "Cheers!" : "Χαιρετισμούς!",
     "Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης",
     "Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.",
diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json
index c50f4cf938b..1fdf329d852 100644
--- a/apps/encryption/l10n/el.json
+++ b/apps/encryption/l10n/el.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Η Εφαρμογή Κρυπτογράφησης είναι ενεργοποιημένη και έτοιμη.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Αδυναμία ανάγνωσης αυτού του αρχείου, πιθανό να είναι διαμοιραζόμενο αρχείο. Παρακαλώ ρωτήστε τον κάτοχο του αρχείου να το διαμοιράσει ξανά μαζί σας.",
+    "The share will expire on %s." : "Ο διαμοιρασμός θα λήξει σε %s.",
+    "Cheers!" : "Χαιρετισμούς!",
     "Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης",
     "Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.",
diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js
index 13b103dee12..50835a334f2 100644
--- a/apps/encryption/l10n/en_GB.js
+++ b/apps/encryption/l10n/en_GB.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Encryption App is enabled and ready",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.",
+    "The share will expire on %s." : "The share will expire on %s.",
+    "Cheers!" : "Cheers!",
     "Enable recovery key" : "Enable recovery key",
     "Disable recovery key" : "Disable recovery key",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.",
diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json
index e1d20385f6e..3c2e115290d 100644
--- a/apps/encryption/l10n/en_GB.json
+++ b/apps/encryption/l10n/en_GB.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Encryption App is enabled and ready",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.",
+    "The share will expire on %s." : "The share will expire on %s.",
+    "Cheers!" : "Cheers!",
     "Enable recovery key" : "Enable recovery key",
     "Disable recovery key" : "Disable recovery key",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.",
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index cd800250be2..516722cdc0f 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Cifrado App está habilitada y lista",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 69c14e008c2..b070b9393a3 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Cifrado App está habilitada y lista",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
diff --git a/apps/encryption/l10n/es_AR.js b/apps/encryption/l10n/es_AR.js
index e2fed7c3d38..bff5b7c593e 100644
--- a/apps/encryption/l10n/es_AR.js
+++ b/apps/encryption/l10n/es_AR.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo.",
+    "The share will expire on %s." : "El compartir expirará en %s.",
+    "Cheers!" : "¡Saludos!",
     "Recovery key password" : "Contraseña de recuperación de clave",
     "Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
     "Change Password" : "Cambiar contraseña",
diff --git a/apps/encryption/l10n/es_AR.json b/apps/encryption/l10n/es_AR.json
index b938c1d6e38..0cdcd9cd121 100644
--- a/apps/encryption/l10n/es_AR.json
+++ b/apps/encryption/l10n/es_AR.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo.",
+    "The share will expire on %s." : "El compartir expirará en %s.",
+    "Cheers!" : "¡Saludos!",
     "Recovery key password" : "Contraseña de recuperación de clave",
     "Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
     "Change Password" : "Cambiar contraseña",
diff --git a/apps/encryption/l10n/es_MX.js b/apps/encryption/l10n/es_MX.js
index 12836faa54d..ad94a24e114 100644
--- a/apps/encryption/l10n/es_MX.js
+++ b/apps/encryption/l10n/es_MX.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
     "Change Password" : "Cambiar contraseña",
diff --git a/apps/encryption/l10n/es_MX.json b/apps/encryption/l10n/es_MX.json
index f8332799f15..5a64c7c8777 100644
--- a/apps/encryption/l10n/es_MX.json
+++ b/apps/encryption/l10n/es_MX.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
     "Change Password" : "Cambiar contraseña",
diff --git a/apps/encryption/l10n/et_EE.js b/apps/encryption/l10n/et_EE.js
index 0c33015cdf1..f7e7e1de12c 100644
--- a/apps/encryption/l10n/et_EE.js
+++ b/apps/encryption/l10n/et_EE.js
@@ -21,6 +21,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
+    "The share will expire on %s." : "Jagamine aegub %s.",
+    "Cheers!" : "Terekest!",
     "Recovery key password" : "Taastevõtme parool",
     "Change recovery key password:" : "Muuda taastevõtme parooli:",
     "Change Password" : "Muuda parooli",
diff --git a/apps/encryption/l10n/et_EE.json b/apps/encryption/l10n/et_EE.json
index 1f8f74dc7fe..ab02c63a71e 100644
--- a/apps/encryption/l10n/et_EE.json
+++ b/apps/encryption/l10n/et_EE.json
@@ -19,6 +19,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
+    "The share will expire on %s." : "Jagamine aegub %s.",
+    "Cheers!" : "Terekest!",
     "Recovery key password" : "Taastevõtme parool",
     "Change recovery key password:" : "Muuda taastevõtme parooli:",
     "Change Password" : "Muuda parooli",
diff --git a/apps/encryption/l10n/eu.js b/apps/encryption/l10n/eu.js
index 1e0cffe4662..1c8bdf4fa04 100644
--- a/apps/encryption/l10n/eu.js
+++ b/apps/encryption/l10n/eu.js
@@ -20,6 +20,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
+    "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
+    "Cheers!" : "Ongi izan!",
     "Recovery key password" : "Berreskuratze gako pasahitza",
     "Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
     "Change Password" : "Aldatu Pasahitza",
diff --git a/apps/encryption/l10n/eu.json b/apps/encryption/l10n/eu.json
index b896698f6d6..0c07ebd477f 100644
--- a/apps/encryption/l10n/eu.json
+++ b/apps/encryption/l10n/eu.json
@@ -18,6 +18,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
+    "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
+    "Cheers!" : "Ongi izan!",
     "Recovery key password" : "Berreskuratze gako pasahitza",
     "Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
     "Change Password" : "Aldatu Pasahitza",
diff --git a/apps/encryption/l10n/fa.js b/apps/encryption/l10n/fa.js
index 493b3992a62..706491f45a4 100644
--- a/apps/encryption/l10n/fa.js
+++ b/apps/encryption/l10n/fa.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
     "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
+    "Cheers!" : "سلامتی!",
     "Recovery key password" : "رمزعبور کلید بازیابی",
     "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
     "Change Password" : "تغییر رمزعبور",
diff --git a/apps/encryption/l10n/fa.json b/apps/encryption/l10n/fa.json
index ccb7949e7e5..1071fd6e110 100644
--- a/apps/encryption/l10n/fa.json
+++ b/apps/encryption/l10n/fa.json
@@ -6,6 +6,7 @@
     "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
     "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
+    "Cheers!" : "سلامتی!",
     "Recovery key password" : "رمزعبور کلید بازیابی",
     "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
     "Change Password" : "تغییر رمزعبور",
diff --git a/apps/encryption/l10n/fi_FI.js b/apps/encryption/l10n/fi_FI.js
index a3ea0bf761e..92e3b132e99 100644
--- a/apps/encryption/l10n/fi_FI.js
+++ b/apps/encryption/l10n/fi_FI.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Salaussovellus on käytössä ja valmis",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.",
+    "The share will expire on %s." : "Jakaminen päättyy %s.",
+    "Cheers!" : "Kiitos!",
     "Enable recovery key" : "Ota palautusavain käyttöön",
     "Disable recovery key" : "Poista palautusavain käytöstä",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Palautusavain on ylimääräinen salausavain, jota käytetään tiedostojen salaamiseen. Sen avulla on mahdollista palauttaa käyttäjien tiedostot, vaikka käyttäjä unohtaisi oman salasanansa.",
diff --git a/apps/encryption/l10n/fi_FI.json b/apps/encryption/l10n/fi_FI.json
index 1c0faa5921a..b8547c9dc8b 100644
--- a/apps/encryption/l10n/fi_FI.json
+++ b/apps/encryption/l10n/fi_FI.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Salaussovellus on käytössä ja valmis",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.",
+    "The share will expire on %s." : "Jakaminen päättyy %s.",
+    "Cheers!" : "Kiitos!",
     "Enable recovery key" : "Ota palautusavain käyttöön",
     "Disable recovery key" : "Poista palautusavain käytöstä",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Palautusavain on ylimääräinen salausavain, jota käytetään tiedostojen salaamiseen. Sen avulla on mahdollista palauttaa käyttäjien tiedostot, vaikka käyttäjä unohtaisi oman salasanansa.",
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index 6eaf7b125a5..68063f083fc 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "L'application de chiffrement est activée et prête",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous.  ",
+    "The share will expire on %s." : "Le partage expirera le %s.",
+    "Cheers!" : "À bientôt !",
     "Enable recovery key" : "Activer la clé de récupération",
     "Disable recovery key" : "Désactiver la clé de récupération",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index 8e319e87fde..49616502217 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "L'application de chiffrement est activée et prête",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous.  ",
+    "The share will expire on %s." : "Le partage expirera le %s.",
+    "Cheers!" : "À bientôt !",
     "Enable recovery key" : "Activer la clé de récupération",
     "Disable recovery key" : "Désactiver la clé de récupération",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
diff --git a/apps/encryption/l10n/gl.js b/apps/encryption/l10n/gl.js
index b1c38910786..d6a5d03e938 100644
--- a/apps/encryption/l10n/gl.js
+++ b/apps/encryption/l10n/gl.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : " A aplicación de cifrado está activada e lista",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel descifrar o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que  volva compartir o ficheiro con vostede.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel ler o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que  volva compartir o ficheiro con vostede.",
+    "The share will expire on %s." : "Esta compartición caduca o %s.",
+    "Cheers!" : "Saúdos!",
     "Enable recovery key" : "Activar a chave de recuperación",
     "Disable recovery key" : "Desactivar a chave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperación é unha chave de cifrado adicional que se utiliza para cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se o usuario esquece o seu contrasinal.",
diff --git a/apps/encryption/l10n/gl.json b/apps/encryption/l10n/gl.json
index 4fa779248fe..78c781acaa9 100644
--- a/apps/encryption/l10n/gl.json
+++ b/apps/encryption/l10n/gl.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : " A aplicación de cifrado está activada e lista",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel descifrar o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que  volva compartir o ficheiro con vostede.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel ler o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que  volva compartir o ficheiro con vostede.",
+    "The share will expire on %s." : "Esta compartición caduca o %s.",
+    "Cheers!" : "Saúdos!",
     "Enable recovery key" : "Activar a chave de recuperación",
     "Disable recovery key" : "Desactivar a chave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperación é unha chave de cifrado adicional que se utiliza para cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se o usuario esquece o seu contrasinal.",
diff --git a/apps/encryption/l10n/hr.js b/apps/encryption/l10n/hr.js
index f6cf942edfb..2965961be00 100644
--- a/apps/encryption/l10n/hr.js
+++ b/apps/encryption/l10n/hr.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molimo ažurirajte lozinku svoga privatnog ključa u svojim osobnimpostavkama da biste obnovili pristup svojim šifriranim datotekama.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće dešifrirati, vjerojatno je riječ o zajedničkoj datoteci. Molimopitajte vlasnika datoteke da je ponovo podijeli s vama.",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
     "Recovery key password" : "Lozinka ključa za oporavak",
     "Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
     "Change Password" : "Promijenite lozinku",
diff --git a/apps/encryption/l10n/hr.json b/apps/encryption/l10n/hr.json
index acfd057ec62..f5260508404 100644
--- a/apps/encryption/l10n/hr.json
+++ b/apps/encryption/l10n/hr.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molimo ažurirajte lozinku svoga privatnog ključa u svojim osobnimpostavkama da biste obnovili pristup svojim šifriranim datotekama.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće dešifrirati, vjerojatno je riječ o zajedničkoj datoteci. Molimopitajte vlasnika datoteke da je ponovo podijeli s vama.",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
     "Recovery key password" : "Lozinka ključa za oporavak",
     "Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
     "Change Password" : "Promijenite lozinku",
diff --git a/apps/encryption/l10n/hu_HU.js b/apps/encryption/l10n/hu_HU.js
index 15611a77d05..d13459e4902 100644
--- a/apps/encryption/l10n/hu_HU.js
+++ b/apps/encryption/l10n/hu_HU.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!",
+    "The share will expire on %s." : "A megosztás lejár ekkor %s",
+    "Cheers!" : "Üdv.",
     "Recovery key password" : "A helyreállítási kulcs jelszava",
     "Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
     "Change Password" : "Jelszó megváltoztatása",
diff --git a/apps/encryption/l10n/hu_HU.json b/apps/encryption/l10n/hu_HU.json
index 3214000e1a1..2e77ff30182 100644
--- a/apps/encryption/l10n/hu_HU.json
+++ b/apps/encryption/l10n/hu_HU.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!",
+    "The share will expire on %s." : "A megosztás lejár ekkor %s",
+    "Cheers!" : "Üdv.",
     "Recovery key password" : "A helyreállítási kulcs jelszava",
     "Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
     "Change Password" : "Jelszó megváltoztatása",
diff --git a/apps/encryption/l10n/ia.js b/apps/encryption/l10n/ia.js
new file mode 100644
index 00000000000..27932deb15e
--- /dev/null
+++ b/apps/encryption/l10n/ia.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "The share will expire on %s." : "Le compartir expirara le %s.",
+    "Cheers!" : "Acclamationes!"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ia.json b/apps/encryption/l10n/ia.json
new file mode 100644
index 00000000000..a935ab07c57
--- /dev/null
+++ b/apps/encryption/l10n/ia.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "The share will expire on %s." : "Le compartir expirara le %s.",
+    "Cheers!" : "Acclamationes!"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/id.js b/apps/encryption/l10n/id.js
index e1de33fe156..c0eb1576f11 100644
--- a/apps/encryption/l10n/id.js
+++ b/apps/encryption/l10n/id.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Apl Enkripsi telah diaktifkan dan siap",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat membaca berkas ini, kemungkinan merupakan berkas berbagi. Silakan minta pemilik berkas untuk membagikan ulang kepada Anda.",
+    "The share will expire on %s." : "Pembagian akan berakhir pada %s.",
+    "Cheers!" : "Horee!",
     "Enable recovery key" : "Aktifkan kunci pemulihan",
     "Disable recovery key" : "Nonaktifkan kunci pemulihan",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kunci pemulihan adalah kunci enkripsi tambahan yang digunakan untuk mengenkripsi berkas. Kunci pemulihan memungkinkan untuk memulihkan berkas-berkas pengguna ketika pengguna tersebut melupakan sandi mereka.",
diff --git a/apps/encryption/l10n/id.json b/apps/encryption/l10n/id.json
index 66d7f6c8991..59f39b2ea3a 100644
--- a/apps/encryption/l10n/id.json
+++ b/apps/encryption/l10n/id.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Apl Enkripsi telah diaktifkan dan siap",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat membaca berkas ini, kemungkinan merupakan berkas berbagi. Silakan minta pemilik berkas untuk membagikan ulang kepada Anda.",
+    "The share will expire on %s." : "Pembagian akan berakhir pada %s.",
+    "Cheers!" : "Horee!",
     "Enable recovery key" : "Aktifkan kunci pemulihan",
     "Disable recovery key" : "Nonaktifkan kunci pemulihan",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kunci pemulihan adalah kunci enkripsi tambahan yang digunakan untuk mengenkripsi berkas. Kunci pemulihan memungkinkan untuk memulihkan berkas-berkas pengguna ketika pengguna tersebut melupakan sandi mereka.",
diff --git a/apps/encryption/l10n/is.js b/apps/encryption/l10n/is.js
new file mode 100644
index 00000000000..afdf2b02f4c
--- /dev/null
+++ b/apps/encryption/l10n/is.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
+    "Cheers!" : "Skál!"
+},
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/encryption/l10n/is.json b/apps/encryption/l10n/is.json
new file mode 100644
index 00000000000..6c56e00be82
--- /dev/null
+++ b/apps/encryption/l10n/is.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
+    "Cheers!" : "Skál!"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
index 9980396f6e9..adfd542d263 100644
--- a/apps/encryption/l10n/it.js
+++ b/apps/encryption/l10n/it.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile leggere questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
+    "The share will expire on %s." : "La condivisione scadrà il %s.",
+    "Cheers!" : "Saluti!",
     "Enable recovery key" : "Abilita chiave di ripristino",
     "Disable recovery key" : "Disabilita chiave di ripristino",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.",
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
index 69b31b7d3da..25fcd34bd1b 100644
--- a/apps/encryption/l10n/it.json
+++ b/apps/encryption/l10n/it.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile leggere questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
+    "The share will expire on %s." : "La condivisione scadrà il %s.",
+    "Cheers!" : "Saluti!",
     "Enable recovery key" : "Abilita chiave di ripristino",
     "Disable recovery key" : "Disabilita chiave di ripristino",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.",
diff --git a/apps/encryption/l10n/ja.js b/apps/encryption/l10n/ja.js
index f76b215fe1f..5c4f470def8 100644
--- a/apps/encryption/l10n/ja.js
+++ b/apps/encryption/l10n/ja.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "暗号化アプリは有効になっており、準備が整いました",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを読み取ることができません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
+    "The share will expire on %s." : "共有は %s で有効期限が切れます。",
+    "Cheers!" : "それでは！",
     "Enable recovery key" : "復旧キーを有効にする",
     "Disable recovery key" : "復旧キーを無効にする",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザのファイルを復元することができます。",
diff --git a/apps/encryption/l10n/ja.json b/apps/encryption/l10n/ja.json
index 58b32ebdd2e..9e04dd87f83 100644
--- a/apps/encryption/l10n/ja.json
+++ b/apps/encryption/l10n/ja.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "暗号化アプリは有効になっており、準備が整いました",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを読み取ることができません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
+    "The share will expire on %s." : "共有は %s で有効期限が切れます。",
+    "Cheers!" : "それでは！",
     "Enable recovery key" : "復旧キーを有効にする",
     "Disable recovery key" : "復旧キーを無効にする",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザのファイルを復元することができます。",
diff --git a/apps/encryption/l10n/kn.js b/apps/encryption/l10n/kn.js
index aca1cf249b1..3f0108db173 100644
--- a/apps/encryption/l10n/kn.js
+++ b/apps/encryption/l10n/kn.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "encryption",
     {
+    "Cheers!" : "ಆನಂದಿಸಿ !",
     "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
     "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
 },
diff --git a/apps/encryption/l10n/kn.json b/apps/encryption/l10n/kn.json
index 8387e3890da..3b78ba1f13e 100644
--- a/apps/encryption/l10n/kn.json
+++ b/apps/encryption/l10n/kn.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Cheers!" : "ಆನಂದಿಸಿ !",
     "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
     "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/encryption/l10n/ko.js b/apps/encryption/l10n/ko.js
index 891265e8c91..d99e639da44 100644
--- a/apps/encryption/l10n/ko.js
+++ b/apps/encryption/l10n/ko.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "암호화 앱이 활성화되었고 준비됨",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 읽을 수 없습니다. 공유된 파일이라면 파일 소유자에게 연락하여 다시 공유해 달라고 요청하십시오.",
+    "The share will expire on %s." : "이 공유는 %s 까지 유지됩니다.",
+    "Cheers!" : "감사합니다!",
     "Enable recovery key" : "복구 키 활성화",
     "Disable recovery key" : "복구 키 비활성화",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "복구 키는 파일을 암호화하는 추가 키입니다. 사용자가 암호를 잊었을 때 복구할 수 있도록 해 줍니다.",
diff --git a/apps/encryption/l10n/ko.json b/apps/encryption/l10n/ko.json
index 0231412e29a..e495de4c0e1 100644
--- a/apps/encryption/l10n/ko.json
+++ b/apps/encryption/l10n/ko.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "암호화 앱이 활성화되었고 준비됨",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 읽을 수 없습니다. 공유된 파일이라면 파일 소유자에게 연락하여 다시 공유해 달라고 요청하십시오.",
+    "The share will expire on %s." : "이 공유는 %s 까지 유지됩니다.",
+    "Cheers!" : "감사합니다!",
     "Enable recovery key" : "복구 키 활성화",
     "Disable recovery key" : "복구 키 비활성화",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "복구 키는 파일을 암호화하는 추가 키입니다. 사용자가 암호를 잊었을 때 복구할 수 있도록 해 줍니다.",
diff --git a/apps/encryption/l10n/lb.js b/apps/encryption/l10n/lb.js
index 0e57555bb19..478426b6a1c 100644
--- a/apps/encryption/l10n/lb.js
+++ b/apps/encryption/l10n/lb.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "encryption",
     {
+    "Cheers!" : "Prost!",
     "Change Password" : "Passwuert änneren",
     "Enabled" : "Aktivéiert",
     "Disabled" : "Deaktivéiert"
diff --git a/apps/encryption/l10n/lb.json b/apps/encryption/l10n/lb.json
index 08afbc43c83..53692b969e1 100644
--- a/apps/encryption/l10n/lb.json
+++ b/apps/encryption/l10n/lb.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Cheers!" : "Prost!",
     "Change Password" : "Passwuert änneren",
     "Enabled" : "Aktivéiert",
     "Disabled" : "Deaktivéiert"
diff --git a/apps/encryption/l10n/lt_LT.js b/apps/encryption/l10n/lt_LT.js
index 03a825d1e3a..627be83860b 100644
--- a/apps/encryption/l10n/lt_LT.js
+++ b/apps/encryption/l10n/lt_LT.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
+    "The share will expire on %s." : "Bendrinimo laikas baigsis %s.",
+    "Cheers!" : "Sveikinimai!",
     "Recovery key password" : "Atkūrimo rakto slaptažodis",
     "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
     "Change Password" : "Pakeisti slaptažodį",
diff --git a/apps/encryption/l10n/lt_LT.json b/apps/encryption/l10n/lt_LT.json
index fcfee0f3e5e..7a38dca5a97 100644
--- a/apps/encryption/l10n/lt_LT.json
+++ b/apps/encryption/l10n/lt_LT.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
+    "The share will expire on %s." : "Bendrinimo laikas baigsis %s.",
+    "Cheers!" : "Sveikinimai!",
     "Recovery key password" : "Atkūrimo rakto slaptažodis",
     "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
     "Change Password" : "Pakeisti slaptažodį",
diff --git a/apps/encryption/l10n/mk.js b/apps/encryption/l10n/mk.js
index f1abdd2f518..c2f503a4495 100644
--- a/apps/encryption/l10n/mk.js
+++ b/apps/encryption/l10n/mk.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Password successfully changed." : "Лозинката е успешно променета.",
     "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
+    "Cheers!" : "Поздрав!",
     "Change Password" : "Смени лозинка",
     "Old log-in password" : "Старата лозинка за најавување",
     "Current log-in password" : "Тековната лозинка за најавување",
diff --git a/apps/encryption/l10n/mk.json b/apps/encryption/l10n/mk.json
index 112d818347c..fb521ea75fb 100644
--- a/apps/encryption/l10n/mk.json
+++ b/apps/encryption/l10n/mk.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Password successfully changed." : "Лозинката е успешно променета.",
     "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
+    "Cheers!" : "Поздрав!",
     "Change Password" : "Смени лозинка",
     "Old log-in password" : "Старата лозинка за најавување",
     "Current log-in password" : "Тековната лозинка за најавување",
diff --git a/apps/encryption/l10n/nb_NO.js b/apps/encryption/l10n/nb_NO.js
index 295621f9caa..460b8190488 100644
--- a/apps/encryption/l10n/nb_NO.js
+++ b/apps/encryption/l10n/nb_NO.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Krypterings-appen er aktivert og klar",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke lese denne filen, som sannsynligvis er en delt fil. Be eieren av filen om å dele den med deg på nytt.",
+    "The share will expire on %s." : "Delingen vil opphøre %s.",
+    "Cheers!" : "Ha det!",
     "Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
     "Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt.",
diff --git a/apps/encryption/l10n/nb_NO.json b/apps/encryption/l10n/nb_NO.json
index bb95014e967..8efde0eb05b 100644
--- a/apps/encryption/l10n/nb_NO.json
+++ b/apps/encryption/l10n/nb_NO.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Krypterings-appen er aktivert og klar",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke lese denne filen, som sannsynligvis er en delt fil. Be eieren av filen om å dele den med deg på nytt.",
+    "The share will expire on %s." : "Delingen vil opphøre %s.",
+    "Cheers!" : "Ha det!",
     "Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
     "Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt.",
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
index 4a3115d46a7..ec7da324218 100644
--- a/apps/encryption/l10n/nl.js
+++ b/apps/encryption/l10n/nl.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Encryptie app is geactiveerd en gereed",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met u te delen.",
+    "The share will expire on %s." : "De share vervalt op %s.",
+    "Cheers!" : "Proficiat!",
     "Enable recovery key" : "Activeer herstelsleutel",
     "Disable recovery key" : "Deactiveer herstelsleutel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt om bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker zijn of haar wachtwoord vergeet.",
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
index 1689a418f98..40ac3349e14 100644
--- a/apps/encryption/l10n/nl.json
+++ b/apps/encryption/l10n/nl.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Encryptie app is geactiveerd en gereed",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met u te delen.",
+    "The share will expire on %s." : "De share vervalt op %s.",
+    "Cheers!" : "Proficiat!",
     "Enable recovery key" : "Activeer herstelsleutel",
     "Disable recovery key" : "Deactiveer herstelsleutel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt om bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker zijn of haar wachtwoord vergeet.",
diff --git a/apps/encryption/l10n/oc.js b/apps/encryption/l10n/oc.js
index 34d8782b2f8..8715fd378b8 100644
--- a/apps/encryption/l10n/oc.js
+++ b/apps/encryption/l10n/oc.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "L'aplicacion de chiframent es activada e prèsta",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de deschifrar aqueste fichièr : s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo partejar tornamai amb vos.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de legir aqueste fichièr, s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo repartejar amb vos.  ",
+    "The share will expire on %s." : "Lo partiment expirarà lo %s.",
+    "Cheers!" : "A lèu !",
     "Enable recovery key" : "Activar la clau de recuperacion",
     "Disable recovery key" : "Desactivar la clau de recuperacion",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clau de recuperacion es una clau suplementària utilizada per chifrar los fichièrs. Permet de recuperar los fichièrs dels utilizaires se doblidan lor senhal.",
diff --git a/apps/encryption/l10n/oc.json b/apps/encryption/l10n/oc.json
index e3afad2db1b..ec4406dd77e 100644
--- a/apps/encryption/l10n/oc.json
+++ b/apps/encryption/l10n/oc.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "L'aplicacion de chiframent es activada e prèsta",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de deschifrar aqueste fichièr : s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo partejar tornamai amb vos.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de legir aqueste fichièr, s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo repartejar amb vos.  ",
+    "The share will expire on %s." : "Lo partiment expirarà lo %s.",
+    "Cheers!" : "A lèu !",
     "Enable recovery key" : "Activar la clau de recuperacion",
     "Disable recovery key" : "Desactivar la clau de recuperacion",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clau de recuperacion es una clau suplementària utilizada per chifrar los fichièrs. Permet de recuperar los fichièrs dels utilizaires se doblidan lor senhal.",
diff --git a/apps/encryption/l10n/pl.js b/apps/encryption/l10n/pl.js
index 016671e88b7..fda41f57147 100644
--- a/apps/encryption/l10n/pl.js
+++ b/apps/encryption/l10n/pl.js
@@ -20,6 +20,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnianie pliku Tobie.",
+    "The share will expire on %s." : "Ten zasób wygaśnie %s",
+    "Cheers!" : "Pozdrawiam!",
     "Recovery key password" : "Hasło klucza odzyskiwania",
     "Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
     "Change Password" : "Zmień hasło",
diff --git a/apps/encryption/l10n/pl.json b/apps/encryption/l10n/pl.json
index 3b6e4a18e49..7de8c5ad595 100644
--- a/apps/encryption/l10n/pl.json
+++ b/apps/encryption/l10n/pl.json
@@ -18,6 +18,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnianie pliku Tobie.",
+    "The share will expire on %s." : "Ten zasób wygaśnie %s",
+    "Cheers!" : "Pozdrawiam!",
     "Recovery key password" : "Hasło klucza odzyskiwania",
     "Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
     "Change Password" : "Zmień hasło",
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index faac7ca03a6..d5af4a40b8d 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Aplicativo de criptografia está ativado e pronto",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Por favor peça ao dono do arquivo para compartilha-lo com você.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este arquivo, provavelmente este é um arquivo compartilhado. Por favor, pergunte o dono do arquivo para recompartilhar o arquivo com você.",
+    "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
+    "Cheers!" : "Saúde!",
     "Enable recovery key" : "Habilitar recuperação de chave",
     "Disable recovery key" : "Dasabilitar chave de recuperação",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar arquivos. Ela permite a recuperação de arquivos de um usuário esquecer sua senha.",
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index fd8fd33d8c9..69a0d0a020c 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Aplicativo de criptografia está ativado e pronto",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Por favor peça ao dono do arquivo para compartilha-lo com você.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este arquivo, provavelmente este é um arquivo compartilhado. Por favor, pergunte o dono do arquivo para recompartilhar o arquivo com você.",
+    "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
+    "Cheers!" : "Saúde!",
     "Enable recovery key" : "Habilitar recuperação de chave",
     "Disable recovery key" : "Dasabilitar chave de recuperação",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar arquivos. Ela permite a recuperação de arquivos de um usuário esquecer sua senha.",
diff --git a/apps/encryption/l10n/pt_PT.js b/apps/encryption/l10n/pt_PT.js
index 48730b91b12..fc93818e9ec 100644
--- a/apps/encryption/l10n/pt_PT.js
+++ b/apps/encryption/l10n/pt_PT.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "A aplicação de encriptação está ativa e pronta",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível desencriptar este ficheiro, provavelmente é um ficheiro partilhado. Por favor, peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este ficheiro, provavelmente isto é um ficheiro compartilhado. Por favor, peça ao dono do ficheiro para voltar a partilhar o ficheiro consigo.",
+    "The share will expire on %s." : "Esta partilha irá expirar em %s.",
+    "Cheers!" : "Parabéns!",
     "Enable recovery key" : "Ativar a chave de recuperação",
     "Disable recovery key" : "Desativar a chave de recuperação",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar os ficheiros. Esta permite a recuperação dos ficheiros do utilizador se este esquecer a sua senha.",
diff --git a/apps/encryption/l10n/pt_PT.json b/apps/encryption/l10n/pt_PT.json
index 3a63d95bea2..de139edfffa 100644
--- a/apps/encryption/l10n/pt_PT.json
+++ b/apps/encryption/l10n/pt_PT.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "A aplicação de encriptação está ativa e pronta",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível desencriptar este ficheiro, provavelmente é um ficheiro partilhado. Por favor, peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este ficheiro, provavelmente isto é um ficheiro compartilhado. Por favor, peça ao dono do ficheiro para voltar a partilhar o ficheiro consigo.",
+    "The share will expire on %s." : "Esta partilha irá expirar em %s.",
+    "Cheers!" : "Parabéns!",
     "Enable recovery key" : "Ativar a chave de recuperação",
     "Disable recovery key" : "Desativar a chave de recuperação",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar os ficheiros. Esta permite a recuperação dos ficheiros do utilizador se este esquecer a sua senha.",
diff --git a/apps/encryption/l10n/ro.js b/apps/encryption/l10n/ro.js
index 3f699577243..88af06692ac 100644
--- a/apps/encryption/l10n/ro.js
+++ b/apps/encryption/l10n/ro.js
@@ -17,6 +17,7 @@ OC.L10N.register(
     "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
+    "The share will expire on %s." : "Partajarea va expira în data de %s.",
     "Change Password" : "Schimbă parola",
     "ownCloud basic encryption module" : "modul de ecnriptie bazic ownCloud",
     "Enabled" : "Activat",
diff --git a/apps/encryption/l10n/ro.json b/apps/encryption/l10n/ro.json
index e546b400935..9251037e35f 100644
--- a/apps/encryption/l10n/ro.json
+++ b/apps/encryption/l10n/ro.json
@@ -15,6 +15,7 @@
     "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
+    "The share will expire on %s." : "Partajarea va expira în data de %s.",
     "Change Password" : "Schimbă parola",
     "ownCloud basic encryption module" : "modul de ecnriptie bazic ownCloud",
     "Enabled" : "Activat",
diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
index 7907c8aaeb9..2b64fa66ed9 100644
--- a/apps/encryption/l10n/ru.js
+++ b/apps/encryption/l10n/ru.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Приложение шифрования включено и готово",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удалось расшифровать файл, возможно это опубликованный файл. Попросите владельца файла повторно открыть к нему доступ.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удается прочитать файл, возможно это публичный файл. Пожалуйста попросите владельца открыть доступ снова.",
+    "The share will expire on %s." : "Доступ будет закрыт %s",
+    "Cheers!" : "Всего наилучшего!",
     "Enable recovery key" : "Включить ключ восстановления",
     "Disable recovery key" : "Отключить ключ восстановления",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Ключ восстановления это дополнительный ключ, который используется для шифрования файлов. Он позволяет восстановить пользовательские файлы в случае утери пароля.",
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
index 87378952dba..229d4e32dee 100644
--- a/apps/encryption/l10n/ru.json
+++ b/apps/encryption/l10n/ru.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Приложение шифрования включено и готово",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удалось расшифровать файл, возможно это опубликованный файл. Попросите владельца файла повторно открыть к нему доступ.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удается прочитать файл, возможно это публичный файл. Пожалуйста попросите владельца открыть доступ снова.",
+    "The share will expire on %s." : "Доступ будет закрыт %s",
+    "Cheers!" : "Всего наилучшего!",
     "Enable recovery key" : "Включить ключ восстановления",
     "Disable recovery key" : "Отключить ключ восстановления",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Ключ восстановления это дополнительный ключ, который используется для шифрования файлов. Он позволяет восстановить пользовательские файлы в случае утери пароля.",
diff --git a/apps/encryption/l10n/sk_SK.js b/apps/encryption/l10n/sk_SK.js
index 3f3b93f043e..6b97ef32683 100644
--- a/apps/encryption/l10n/sk_SK.js
+++ b/apps/encryption/l10n/sk_SK.js
@@ -23,6 +23,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor sa nepodarilo dešifrovať, pravdepodobne je zdieľaný. Požiadajte majiteľa súboru, aby ho s vami znovu vyzdieľal.",
+    "The share will expire on %s." : "Zdieľanie vyprší %s.",
+    "Cheers!" : "Pekný deň!",
     "Enable recovery key" : "Povoliť obnovovací kľúč",
     "Disable recovery key" : "Zakázať obnovovací kľúč",
     "Recovery key password" : "Heslo obnovovacieho kľúča",
diff --git a/apps/encryption/l10n/sk_SK.json b/apps/encryption/l10n/sk_SK.json
index 05371299dbc..92ef811db23 100644
--- a/apps/encryption/l10n/sk_SK.json
+++ b/apps/encryption/l10n/sk_SK.json
@@ -21,6 +21,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor sa nepodarilo dešifrovať, pravdepodobne je zdieľaný. Požiadajte majiteľa súboru, aby ho s vami znovu vyzdieľal.",
+    "The share will expire on %s." : "Zdieľanie vyprší %s.",
+    "Cheers!" : "Pekný deň!",
     "Enable recovery key" : "Povoliť obnovovací kľúč",
     "Disable recovery key" : "Zakázať obnovovací kľúč",
     "Recovery key password" : "Heslo obnovovacieho kľúča",
diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js
index 7c90ba7e9a7..4e4e9998b0d 100644
--- a/apps/encryption/l10n/sl.js
+++ b/apps/encryption/l10n/sl.js
@@ -23,6 +23,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.",
+    "The share will expire on %s." : "Povezava souporabe bo potekla %s.",
+    "Cheers!" : "Na zdravje!",
     "Enable recovery key" : "Omogoči obnovitev gesla",
     "Disable recovery key" : "Onemogoči obnovitev gesla",
     "Recovery key password" : "Ključ za obnovitev gesla",
diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json
index 82d23fc6e74..34829a2280e 100644
--- a/apps/encryption/l10n/sl.json
+++ b/apps/encryption/l10n/sl.json
@@ -21,6 +21,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.",
+    "The share will expire on %s." : "Povezava souporabe bo potekla %s.",
+    "Cheers!" : "Na zdravje!",
     "Enable recovery key" : "Omogoči obnovitev gesla",
     "Disable recovery key" : "Onemogoči obnovitev gesla",
     "Recovery key password" : "Ključ za obnovitev gesla",
diff --git a/apps/encryption/l10n/sq.js b/apps/encryption/l10n/sq.js
index be24512a35c..9a9230e86fb 100644
--- a/apps/encryption/l10n/sq.js
+++ b/apps/encryption/l10n/sq.js
@@ -2,6 +2,8 @@ OC.L10N.register(
     "encryption",
     {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Çelësi privat për Aplikacionin e Shifrimit është i pavlefshëm. Ju lutem përditësoni fjalëkalimin e çelësit tuaj privat në parametrat tuaj për të rimarrë qasje në skedarët tuaj të shifruar.",
+    "The share will expire on %s." : "Ndarja do të skadojë në %s.",
+    "Cheers!" : "Gjithë të mirat",
     "Enabled" : "Aktivizuar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sq.json b/apps/encryption/l10n/sq.json
index 48f32535ac0..87481aa3349 100644
--- a/apps/encryption/l10n/sq.json
+++ b/apps/encryption/l10n/sq.json
@@ -1,5 +1,7 @@
 { "translations": {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Çelësi privat për Aplikacionin e Shifrimit është i pavlefshëm. Ju lutem përditësoni fjalëkalimin e çelësit tuaj privat në parametrat tuaj për të rimarrë qasje në skedarët tuaj të shifruar.",
+    "The share will expire on %s." : "Ndarja do të skadojë në %s.",
+    "Cheers!" : "Gjithë të mirat",
     "Enabled" : "Aktivizuar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/encryption/l10n/sr.js b/apps/encryption/l10n/sr.js
index 9c37a8a3b30..e351a739234 100644
--- a/apps/encryption/l10n/sr.js
+++ b/apps/encryption/l10n/sr.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Апликација шифровања је укључена и спремна",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу да дешифрујем фајл. Вероватно је то дељен фајл. Затражите од власника фајла да га поново подели са вама.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу да читам фајл. Вероватно је дељен. Питајте власника да га поново подели са вама.",
+    "The share will expire on %s." : "Дељење истиче %s.",
+    "Cheers!" : "Здраво!",
     "Enable recovery key" : "Омогући кључ за опоравак",
     "Disable recovery key" : "Онемогући кључ за опоравак",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Кључ за опоравак је додатни шифрарски кључ који се користи за шифровање фајлова. Он омогућава опоравак корисничких фајлова ако корисник заборави своју лозинку.",
diff --git a/apps/encryption/l10n/sr.json b/apps/encryption/l10n/sr.json
index cd648279e9e..7fe6e1672d2 100644
--- a/apps/encryption/l10n/sr.json
+++ b/apps/encryption/l10n/sr.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Апликација шифровања је укључена и спремна",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу да дешифрујем фајл. Вероватно је то дељен фајл. Затражите од власника фајла да га поново подели са вама.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу да читам фајл. Вероватно је дељен. Питајте власника да га поново подели са вама.",
+    "The share will expire on %s." : "Дељење истиче %s.",
+    "Cheers!" : "Здраво!",
     "Enable recovery key" : "Омогући кључ за опоравак",
     "Disable recovery key" : "Онемогући кључ за опоравак",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Кључ за опоравак је додатни шифрарски кључ који се користи за шифровање фајлова. Он омогућава опоравак корисничких фајлова ако корисник заборави своју лозинку.",
diff --git a/apps/encryption/l10n/sr@latin.js b/apps/encryption/l10n/sr@latin.js
index b078b50fce7..d784912394c 100644
--- a/apps/encryption/l10n/sr@latin.js
+++ b/apps/encryption/l10n/sr@latin.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
+    "The share will expire on %s." : "Deljeni sadržaj će isteći: %s",
+    "Cheers!" : "U zdravlje!",
     "Disabled" : "Onemogućeno"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/sr@latin.json b/apps/encryption/l10n/sr@latin.json
index 08f90ad5912..cb3a38ecf72 100644
--- a/apps/encryption/l10n/sr@latin.json
+++ b/apps/encryption/l10n/sr@latin.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
+    "The share will expire on %s." : "Deljeni sadržaj će isteći: %s",
+    "Cheers!" : "U zdravlje!",
     "Disabled" : "Onemogućeno"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/encryption/l10n/sv.js b/apps/encryption/l10n/sv.js
index d68e3274ad6..16f9d00cd3b 100644
--- a/apps/encryption/l10n/sv.js
+++ b/apps/encryption/l10n/sv.js
@@ -20,6 +20,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägaren av filen att dela den med dig.",
+    "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
+    "Cheers!" : "Ha de fint!",
     "Recovery key password" : "Lösenord för återställningsnyckel",
     "Change recovery key password:" : "Ändra lösenord för återställningsnyckel:",
     "Change Password" : "Byt lösenord",
diff --git a/apps/encryption/l10n/sv.json b/apps/encryption/l10n/sv.json
index 2ab5025fb25..c8f65966705 100644
--- a/apps/encryption/l10n/sv.json
+++ b/apps/encryption/l10n/sv.json
@@ -18,6 +18,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägaren av filen att dela den med dig.",
+    "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
+    "Cheers!" : "Ha de fint!",
     "Recovery key password" : "Lösenord för återställningsnyckel",
     "Change recovery key password:" : "Ändra lösenord för återställningsnyckel:",
     "Change Password" : "Byt lösenord",
diff --git a/apps/encryption/l10n/th_TH.js b/apps/encryption/l10n/th_TH.js
index d6a2d00d123..82db7a6e8b3 100644
--- a/apps/encryption/l10n/th_TH.js
+++ b/apps/encryption/l10n/th_TH.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "เข้ารหัสแอพถูกเปิดใช้งานและพร้อมทำงาน",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถถอดรหัสไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาถามเจ้าของไฟล์เพื่อยกเลิกการใช้งานร่วมกัน ",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถอ่านไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาสอบถามเจ้าของไฟล์เพื่อแชร์ไฟล์กับคุณ",
+    "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s",
+    "Cheers!" : "ไชโย!",
     "Enable recovery key" : "เปิดใช้งานการกู้คืนรหัส",
     "Disable recovery key" : "ปิดใช้งานรหัสการกู้คืนรหัส",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "รหัสการกู้คืนเป็นการเข้ารหัสลับพิเศษจะใช้ในการเข้ารหัสไฟล์ มันจะช่วยเรื่องการกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่าน",
diff --git a/apps/encryption/l10n/th_TH.json b/apps/encryption/l10n/th_TH.json
index 5c904340983..11fd75b87e1 100644
--- a/apps/encryption/l10n/th_TH.json
+++ b/apps/encryption/l10n/th_TH.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "เข้ารหัสแอพถูกเปิดใช้งานและพร้อมทำงาน",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถถอดรหัสไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาถามเจ้าของไฟล์เพื่อยกเลิกการใช้งานร่วมกัน ",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถอ่านไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาสอบถามเจ้าของไฟล์เพื่อแชร์ไฟล์กับคุณ",
+    "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s",
+    "Cheers!" : "ไชโย!",
     "Enable recovery key" : "เปิดใช้งานการกู้คืนรหัส",
     "Disable recovery key" : "ปิดใช้งานรหัสการกู้คืนรหัส",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "รหัสการกู้คืนเป็นการเข้ารหัสลับพิเศษจะใช้ในการเข้ารหัสไฟล์ มันจะช่วยเรื่องการกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่าน",
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 065c0d16d1c..2c8eff7e62b 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Şifreleme Uygulaması etkin ve hazır",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan okunamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
+    "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
+    "Cheers!" : "Hoşçakalın!",
     "Enable recovery key" : "Kurtarma anahtarını etkinleştir",
     "Disable recovery key" : "Kurtarma anahtarını devre dışı bırak",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kurtarma anahtarı, dosyaların şifrelenmesi için daha fazla \nşifreleme sunar. Bu kullanıcının dosyasının şifresini unuttuğunda kurtarmasına imkan verir.",
diff --git a/apps/encryption/l10n/tr.json b/apps/encryption/l10n/tr.json
index b21a019bb64..a1bb9b6a5d9 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Şifreleme Uygulaması etkin ve hazır",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan okunamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
+    "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
+    "Cheers!" : "Hoşçakalın!",
     "Enable recovery key" : "Kurtarma anahtarını etkinleştir",
     "Disable recovery key" : "Kurtarma anahtarını devre dışı bırak",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kurtarma anahtarı, dosyaların şifrelenmesi için daha fazla \nşifreleme sunar. Bu kullanıcının dosyasının şifresini unuttuğunda kurtarmasına imkan verir.",
diff --git a/apps/encryption/l10n/uk.js b/apps/encryption/l10n/uk.js
index 4c7143800d8..553478a7f4c 100644
--- a/apps/encryption/l10n/uk.js
+++ b/apps/encryption/l10n/uk.js
@@ -25,6 +25,8 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
     "Encryption App is enabled and ready" : "Додаток кодування дозволений і готовий",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
+    "The share will expire on %s." : "Спільний доступ закінчиться %s.",
+    "Cheers!" : "Будьмо!",
     "Enable recovery key" : "Увімкнути ключ відновлення",
     "Disable recovery key" : "Вимкнути ключ відновлення",
     "Recovery key password" : "Пароль ключа відновлення",
diff --git a/apps/encryption/l10n/uk.json b/apps/encryption/l10n/uk.json
index 3be3a35b2f1..e474e25cea4 100644
--- a/apps/encryption/l10n/uk.json
+++ b/apps/encryption/l10n/uk.json
@@ -23,6 +23,8 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
     "Encryption App is enabled and ready" : "Додаток кодування дозволений і готовий",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
+    "The share will expire on %s." : "Спільний доступ закінчиться %s.",
+    "Cheers!" : "Будьмо!",
     "Enable recovery key" : "Увімкнути ключ відновлення",
     "Disable recovery key" : "Вимкнути ключ відновлення",
     "Recovery key password" : "Пароль ключа відновлення",
diff --git a/apps/encryption/l10n/ur_PK.js b/apps/encryption/l10n/ur_PK.js
new file mode 100644
index 00000000000..9fbed2e780f
--- /dev/null
+++ b/apps/encryption/l10n/ur_PK.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "Cheers!" : "واہ!"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ur_PK.json b/apps/encryption/l10n/ur_PK.json
new file mode 100644
index 00000000000..f798bdf2a7b
--- /dev/null
+++ b/apps/encryption/l10n/ur_PK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Cheers!" : "واہ!"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/vi.js b/apps/encryption/l10n/vi.js
index b9956551622..d325fc71661 100644
--- a/apps/encryption/l10n/vi.js
+++ b/apps/encryption/l10n/vi.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
     "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
+    "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
+    "Cheers!" : "Chúc mừng!",
     "Change Password" : "Đổi Mật khẩu",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
     "Old log-in password" : "Mật khẩu đăng nhập cũ",
diff --git a/apps/encryption/l10n/vi.json b/apps/encryption/l10n/vi.json
index eaaa3d1c038..78ed43b7047 100644
--- a/apps/encryption/l10n/vi.json
+++ b/apps/encryption/l10n/vi.json
@@ -9,6 +9,8 @@
     "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
     "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
+    "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
+    "Cheers!" : "Chúc mừng!",
     "Change Password" : "Đổi Mật khẩu",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
     "Old log-in password" : "Mật khẩu đăng nhập cũ",
diff --git a/apps/encryption/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js
index bf09eab2ca3..93a1b13996a 100644
--- a/apps/encryption/l10n/zh_CN.js
+++ b/apps/encryption/l10n/zh_CN.js
@@ -19,6 +19,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。",
+    "The share will expire on %s." : "此分享将在 %s 过期。",
+    "Cheers!" : "干杯！",
     "Recovery key password" : "恢复密钥密码",
     "Change recovery key password:" : "更改恢复密钥密码",
     "Change Password" : "修改密码",
diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json
index c9c58b0dee4..0fb653b232c 100644
--- a/apps/encryption/l10n/zh_CN.json
+++ b/apps/encryption/l10n/zh_CN.json
@@ -17,6 +17,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。",
+    "The share will expire on %s." : "此分享将在 %s 过期。",
+    "Cheers!" : "干杯！",
     "Recovery key password" : "恢复密钥密码",
     "Change recovery key password:" : "更改恢复密钥密码",
     "Change Password" : "修改密码",
diff --git a/apps/encryption/l10n/zh_TW.js b/apps/encryption/l10n/zh_TW.js
index 01b35d4661a..17893b44b67 100644
--- a/apps/encryption/l10n/zh_TW.js
+++ b/apps/encryption/l10n/zh_TW.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案，也許這是分享的檔案。請詢問檔案所有人重新分享檔案給您。",
+    "The share will expire on %s." : "這個分享將會於 %s 過期",
+    "Cheers!" : "太棒了！",
     "Recovery key password" : "還原金鑰密碼",
     "Change recovery key password:" : "變更還原金鑰密碼:",
     "Change Password" : "變更密碼",
diff --git a/apps/encryption/l10n/zh_TW.json b/apps/encryption/l10n/zh_TW.json
index a1617eec761..ce2e07228fc 100644
--- a/apps/encryption/l10n/zh_TW.json
+++ b/apps/encryption/l10n/zh_TW.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案，也許這是分享的檔案。請詢問檔案所有人重新分享檔案給您。",
+    "The share will expire on %s." : "這個分享將會於 %s 過期",
+    "Cheers!" : "太棒了！",
     "Recovery key password" : "還原金鑰密碼",
     "Change recovery key password:" : "變更還原金鑰密碼:",
     "Change Password" : "變更密碼",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 303e0707402..d525319995a 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "No se pudo enviar el mensaje a los siguientes usuarios: %s",
+    "Preparing update" : "Preparando la actualización",
     "Turned on maintenance mode" : "Modo mantenimiento activado",
     "Turned off maintenance mode" : "Modo mantenimiento desactivado",
     "Maintenance mode is kept active" : "El modo mantenimiento aún está activo.",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Error que reparar:",
     "Following incompatible apps have been disabled: %s" : "Las siguientes apps incompatibles se han deshabilitado: %s",
     "Following apps have been disabled: %s" : "Siguiendo aplicaciones ha sido deshabilitado: %s",
+    "Already up to date" : "Ya actualizado",
     "File is too big" : "El archivo es demasiado grande",
     "Invalid file provided" : "Archivo inválido",
     "No image or file provided" : "No se especificó ningún archivo o imagen",
@@ -102,6 +104,8 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Su directorio de datos y sus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La memoria caché no ha sido configurada. Para aumentar su performance por favor configure memcache si está disponible. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom no es legible por PHP el mismo es altamente desalentado por razones de seguridad. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Su versión PHP ({version}) ya no es  <a href=\"{phpLink}\">respaldada por PHP</a>.  Recomendamos actualizar su versión de PHP para aprovechar las actualizaciones de rendimiento y seguridad proporcionadas por PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configuración de las cabeceras inversas del proxy son incorrectas, o está accediendo a ownCloud desde un proxy confiable. Si no está accediendo a ownCloud desde un proxy certificado y confiable, este es un problema de seguridad y puede permitirle a un hacker camuflar su dirección IP a ownCloud. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "La cabecera HTTP \"Strict-Transport-Security\" no está configurada en al menos \"{segundos}\" segundos. Para una mejor seguridad recomendamos que habilite HSTS como es descripta en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
@@ -170,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "La actualización fue exitosa. Había advertencias.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "Couldn't reset password because the token is invalid" : "No se puede restablecer la contraseña porque el vale de identificación es inválido.",
+    "Couldn't reset password because the token is expired" : "No se puede restablecer la contraseña porque el vale de identificación ha caducado.",
     "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar el correo electrónico para el restablecimiento. Por favor, asegúrese de que su nombre de usuario es el correcto.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar el correo electrónico para el restablecimiento, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.",
     "%s password reset" : "%s restablecer contraseña",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 34547fff630..6deffb731fb 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "No se pudo enviar el mensaje a los siguientes usuarios: %s",
+    "Preparing update" : "Preparando la actualización",
     "Turned on maintenance mode" : "Modo mantenimiento activado",
     "Turned off maintenance mode" : "Modo mantenimiento desactivado",
     "Maintenance mode is kept active" : "El modo mantenimiento aún está activo.",
@@ -11,6 +12,7 @@
     "Repair error: " : "Error que reparar:",
     "Following incompatible apps have been disabled: %s" : "Las siguientes apps incompatibles se han deshabilitado: %s",
     "Following apps have been disabled: %s" : "Siguiendo aplicaciones ha sido deshabilitado: %s",
+    "Already up to date" : "Ya actualizado",
     "File is too big" : "El archivo es demasiado grande",
     "Invalid file provided" : "Archivo inválido",
     "No image or file provided" : "No se especificó ningún archivo o imagen",
@@ -100,6 +102,8 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Su directorio de datos y sus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La memoria caché no ha sido configurada. Para aumentar su performance por favor configure memcache si está disponible. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom no es legible por PHP el mismo es altamente desalentado por razones de seguridad. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Su versión PHP ({version}) ya no es  <a href=\"{phpLink}\">respaldada por PHP</a>.  Recomendamos actualizar su versión de PHP para aprovechar las actualizaciones de rendimiento y seguridad proporcionadas por PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configuración de las cabeceras inversas del proxy son incorrectas, o está accediendo a ownCloud desde un proxy confiable. Si no está accediendo a ownCloud desde un proxy certificado y confiable, este es un problema de seguridad y puede permitirle a un hacker camuflar su dirección IP a ownCloud. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "La cabecera HTTP \"Strict-Transport-Security\" no está configurada en al menos \"{segundos}\" segundos. Para una mejor seguridad recomendamos que habilite HSTS como es descripta en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
@@ -168,6 +172,7 @@
     "The update was successful. There were warnings." : "La actualización fue exitosa. Había advertencias.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "Couldn't reset password because the token is invalid" : "No se puede restablecer la contraseña porque el vale de identificación es inválido.",
+    "Couldn't reset password because the token is expired" : "No se puede restablecer la contraseña porque el vale de identificación ha caducado.",
     "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar el correo electrónico para el restablecimiento. Por favor, asegúrese de que su nombre de usuario es el correcto.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar el correo electrónico para el restablecimiento, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.",
     "%s password reset" : "%s restablecer contraseña",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 346e4f5306f..c8fec41dc8f 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Viðgerðar villa:",
     "Following incompatible apps have been disabled: %s" : "Eftirfarandi forrit eru ósamhæfð hafa verið gerð óvirk: %s",
     "Following apps have been disabled: %s" : "Eftirfarandi forrit hafa verið gerð óvirk: %s",
+    "Already up to date" : "Allt uppfært nú þegar",
     "File is too big" : "Skrá er of stór",
     "Invalid file provided" : "Ógild skrá veitt",
     "No image or file provided" : "Engin mynd eða skrá veitt",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index a89b268d760..638e5267ea0 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -12,6 +12,7 @@
     "Repair error: " : "Viðgerðar villa:",
     "Following incompatible apps have been disabled: %s" : "Eftirfarandi forrit eru ósamhæfð hafa verið gerð óvirk: %s",
     "Following apps have been disabled: %s" : "Eftirfarandi forrit hafa verið gerð óvirk: %s",
+    "Already up to date" : "Allt uppfært nú þegar",
     "File is too big" : "Skrá er of stór",
     "Invalid file provided" : "Ógild skrá veitt",
     "No image or file provided" : "Engin mynd eða skrá veitt",
-- 
GitLab


From fc64ea670d63b125d277ddcacc0b48253b62c28d Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 29 Aug 2015 12:39:47 +0200
Subject: [PATCH 083/783] Allow to directly set the expireDate on a new
 (link)share

Since this extends the API we now properly parse the date. We only
accept valid ISO 8601 Dates (YYYY-MM-DD).

Currently this only works for link shares (it is just ignored for other
shares). Since we do not have user/group/federated expiring shares yet.

* Tests added
---
 apps/files_sharing/api/local.php | 38 ++++++++++++++++++++--
 apps/files_sharing/tests/api.php | 56 ++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php
index eb0e0e0d846..eeb31899830 100644
--- a/apps/files_sharing/api/local.php
+++ b/apps/files_sharing/api/local.php
@@ -258,6 +258,7 @@ class Local {
 		$itemSource = self::getFileId($path);
 		$itemSourceName = $itemSource;
 		$itemType = self::getItemType($path);
+		$expirationDate = null;
 
 		if($itemSource === null) {
 			return new \OC_OCS_Result(null, 404, "wrong path, file/folder doesn't exist.");
@@ -286,6 +287,14 @@ class Local {
 				// read, create, update (7) if public upload is enabled or
 				// read (1) if public upload is disabled
 				$permissions = $publicUpload === 'true' ? 7 : 1;
+
+				// Get the expiration date
+				try {
+					$expirationDate = isset($_POST['expireDate']) ? self::parseDate($_POST['expireDate']) : null;
+				} catch (\Exception $e) {
+					return new \OC_OCS_Result(null, 404, 'Invalid Date');
+				}
+
 				break;
 			default:
 				return new \OC_OCS_Result(null, 400, "unknown share type");
@@ -302,8 +311,9 @@ class Local {
 					$shareType,
 					$shareWith,
 					$permissions,
-					$itemSourceName
-					);
+					$itemSourceName,
+					$expirationDate
+			);
 		} catch (HintException $e) {
 			return new \OC_OCS_Result(null, 400, $e->getHint());
 		} catch (\Exception $e) {
@@ -537,6 +547,30 @@ class Local {
 		}
 	}
 
+	/**
+	 * Make sure that the passed date is valid ISO 8601
+	 * So YYYY-MM-DD
+	 * If not throw an exception
+	 *
+	 * @param string $expireDate
+	 *
+	 * @throws \Exception
+	 * @return \DateTime
+	 */
+	private static function parseDate($expireDate) {
+		if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $expireDate) === 0) {
+			throw new \Exception();
+		}
+
+		$date = new \DateTime($expireDate);
+
+		if ($date === false) {
+			throw new \Exception();
+		}
+
+		return $date;
+	}
+
 	/**
 	 * get file ID from a given path
 	 * @param string $path
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 3bd568e47af..a9b6ee9f64e 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -1487,4 +1487,60 @@ class Test_Files_Sharing_Api extends TestCase {
 		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'no');
 
 	}
+
+	public function datesProvider() {
+		$date = new \DateTime();
+		$date->add(new \DateInterval('P5D'));
+
+		$year = (int)$date->format('Y');
+
+		return [
+			[$date->format('Y-m-d'), true],
+			[$year+1 . '-1-1', false],
+			[$date->format('Y-m-dTH:m'), false],
+			['abc', false],
+			[$date->format('Y-m-d') . 'xyz', false],
+		];
+	}
+
+	/**
+	 * Make sure only ISO 8601 dates are accepted
+	 *
+	 * @dataProvider datesProvider
+	 */
+	public function testPublicLinkExpireDate($date, $valid) {
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['expireDate'] = $date;
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		if ($valid === false) {
+			$this->assertFalse($result->succeeded());
+			$this->assertEquals(404, $result->getStatusCode());
+			$this->assertEquals('Invalid Date', $result->getMeta()['message']);
+			return;
+		}
+
+		$this->assertTrue($result->succeeded());
+
+		$data = $result->getData();
+		$this->assertTrue(is_string($data['token']));
+
+		// check for correct link
+		$url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']);
+		$this->assertEquals($url, $data['url']);
+
+
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
+
+		$item = reset($items);
+		$this->assertTrue(is_array($item));
+		$this->assertEquals($date, substr($item['expiration'], 0, 10));
+
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+	}
 }
-- 
GitLab


From b67d39508909e72913c97a050b25b51a9b1bd707 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 29 Aug 2015 14:52:37 +0200
Subject: [PATCH 084/783] allow streamed responses in http client

---
 lib/private/http/client/client.php   |  3 ++-
 lib/private/http/client/response.php | 15 ++++++++++++---
 lib/public/http/client/iresponse.php |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/private/http/client/client.php b/lib/private/http/client/client.php
index 323fc0d324f..b0aff10a413 100644
--- a/lib/private/http/client/client.php
+++ b/lib/private/http/client/client.php
@@ -120,7 +120,8 @@ class Client implements IClient {
 	 */
 	public function get($uri, array $options = []) {
 		$response = $this->client->get($uri, $options);
-		return new Response($response);
+		$isStream = isset($options['stream']) && $options['stream'];
+		return new Response($response, $isStream);
 	}
 
 	/**
diff --git a/lib/private/http/client/response.php b/lib/private/http/client/response.php
index 4e9df51d77f..558482491d1 100644
--- a/lib/private/http/client/response.php
+++ b/lib/private/http/client/response.php
@@ -33,18 +33,27 @@ class Response implements IResponse {
 	/** @var GuzzleResponse */
 	private $response;
 
+	/**
+	 * @var bool
+	 */
+	private $stream;
+
 	/**
 	 * @param GuzzleResponse $response
+	 * @param bool $stream
 	 */
-	public function __construct(GuzzleResponse $response) {
+	public function __construct(GuzzleResponse $response, $stream = false) {
 		$this->response = $response;
+		$this->stream = $stream;
 	}
 
 	/**
-	 * @return string
+	 * @return string|resource
 	 */
 	public function getBody() {
-		return $this->response->getBody()->getContents();
+		return $this->stream ?
+			$this->response->getBody()->detach():
+			$this->response->getBody()->getContents();
 	}
 
 	/**
diff --git a/lib/public/http/client/iresponse.php b/lib/public/http/client/iresponse.php
index 0e0ef4c5014..92bb7af82dd 100644
--- a/lib/public/http/client/iresponse.php
+++ b/lib/public/http/client/iresponse.php
@@ -30,7 +30,7 @@ namespace OCP\Http\Client;
  */
 interface IResponse {
 	/**
-	 * @return string
+	 * @return string|resource
 	 * @since 8.1.0
 	 */
 	public function getBody();
-- 
GitLab


From df8cb2cc638bdd8fe0c82604b4347502b2fdb1c3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 29 Aug 2015 14:53:59 +0200
Subject: [PATCH 085/783] stream webdav downloads using http client

---
 lib/private/files/storage/dav.php | 44 +++++++++++--------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 6e89dcccbcd..2b6262f3720 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -40,6 +40,7 @@ use OC\Files\Filesystem;
 use OC\Files\Stream\Close;
 use Icewind\Streams\IteratorDirectory;
 use OC\MemCache\ArrayCache;
+use OCP\AppFramework\Http;
 use OCP\Constants;
 use OCP\Files;
 use OCP\Files\FileInfo;
@@ -337,38 +338,23 @@ class DAV extends Common {
 				if (!$this->file_exists($path)) {
 					return false;
 				}
-				//straight up curl instead of sabredav here, sabredav put's the entire get result in memory
-				$curl = curl_init();
-				$fp = fopen('php://temp', 'r+');
-				curl_setopt($curl, CURLOPT_USERPWD, $this->user . ':' . $this->password);
-				curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . $this->encodePath($path));
-				curl_setopt($curl, CURLOPT_FILE, $fp);
-				curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-				if(defined('CURLOPT_PROTOCOLS')) {
-					curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-				}
-				if(defined('CURLOPT_REDIR_PROTOCOLS')) {
-					curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-				}
-				if ($this->secure === true) {
-					curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
-					curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
-					if ($this->certPath) {
-						curl_setopt($curl, CURLOPT_CAINFO, $this->certPath);
-					}
-				}
-
-				curl_exec($curl);
-				$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-				if ($statusCode !== 200) {
-					Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, Util::ERROR);
-					if ($statusCode === 423) {
+				$httpClient = \OC::$server->getHTTPClientService();
+				$response = $httpClient
+					->newClient()
+					->get($this->createBaseUri() . $this->encodePath($path), [
+						'auth' => [$this->user, $this->password],
+						'stream' => true
+					]);
+
+				if ($response->getStatusCode() !== Http::STATUS_OK) {
+					if ($response->getStatusCode() === Http::STATUS_LOCKED) {
 						throw new \OCP\Lock\LockedException($path);
+					} else {
+						Util::writeLog("webdav client", 'Guzzle get returned status code ' . $response->getStatusCode(), Util::ERROR);
 					}
 				}
-				curl_close($curl);
-				rewind($fp);
-				return $fp;
+
+				return $response->getBody();
 			case 'w':
 			case 'wb':
 			case 'a':
-- 
GitLab


From ae62537adf19e4c83bf4ed336d2a21e931f6d330 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 28 Jul 2015 12:41:32 +0200
Subject: [PATCH 086/783] Allow remote avatars

---
 core/avatar/avatarcontroller.php           |  6 ++++-
 tests/core/avatar/avatarcontrollertest.php | 29 +++++++++++++---------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index 945e022600a..0c270bee53e 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -90,14 +90,18 @@ class AvatarController extends Controller {
 	}
 
 	/**
-	 * @NoAdminRequired
 	 * @NoCSRFRequired
+	 * @PublicPage
 	 *
 	 * @param string $userId
 	 * @param int $size
 	 * @return DataResponse|DataDisplayResponse
 	 */
 	public function getAvatar($userId, $size) {
+		if (!$this->userManager->userExists($userId)) {
+			return new DataResponse([], Http::STATUS_NOT_FOUND);
+		}
+
 		if ($size > 2048) {
 			$size = 2048;
 		} elseif ($size <= 0) {
diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/avatar/avatarcontrollertest.php
index e8fb977fae1..9accd5181c6 100644
--- a/tests/core/avatar/avatarcontrollertest.php
+++ b/tests/core/avatar/avatarcontrollertest.php
@@ -96,8 +96,12 @@ class AvatarControllerTest extends \Test\TestCase {
 		// Configure userMock
 		$this->userMock->method('getDisplayName')->willReturn($this->user);
 		$this->userMock->method('getUID')->willReturn($this->user);
-		$this->container['UserManager']->method('get')
+		$this->container['UserManager']
+			->method('get')
 			->willReturnMap([[$this->user, $this->userMock]]);
+		$this->container['UserManager']
+			->method('userExists')
+			->willReturnMap([[$this->user, true]]);
 		$this->container['UserSession']->method('getUser')->willReturn($this->userMock);
 
 	}
@@ -120,11 +124,10 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * Fetch an avatar if a user has no avatar
 	 */
 	public function testGetAvatarNoAvatar() {
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->container['UserManager']->expects($this->once())->method('userExists');
+		$this->container['AvatarManager']->expects($this->once())->method('getAvatar')->willReturn($this->avatarMock);
 		$response = $this->avatarController->getAvatar($this->user, 32);
 
-		//Comment out until JS is fixed
-		//$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
 		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
 		$this->assertEquals($this->user, $response->getData()['data']['displayname']);
 	}
@@ -133,9 +136,11 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * Fetch the user's avatar
 	 */
 	public function testGetAvatar() {
+		$this->container['UserManager']->expects($this->once())->method('userExists');
+
 		$image = new Image(OC::$SERVERROOT.'/tests/data/testimage.jpg');
-		$this->avatarMock->method('get')->willReturn($image);
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarMock->expects($this->once())->method('get')->willReturn($image);
+		$this->container['AvatarManager']->expects($this->once())->method('getAvatar')->willReturn($this->avatarMock);
 
 		$response = $this->avatarController->getAvatar($this->user, 32);
 
@@ -150,21 +155,19 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * Fetch the avatar of a non-existing user
 	 */
 	public function testGetAvatarNoUser() {
-		$this->avatarMock->method('get')->willReturn(null);
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
-
+		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$response = $this->avatarController->getAvatar($this->user . 'doesnotexist', 32);
 
 		//Comment out until JS is fixed
-		//$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-		$this->assertEquals('', $response->getData()['data']['displayname']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+		$this->assertEquals([], $response->getData());
 	}
 
 	/**
 	 * Make sure we get the correct size
 	 */
 	public function testGetAvatarSize() {
+		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$this->avatarMock->expects($this->once())
 						 ->method('get')
 						 ->with($this->equalTo(32));
@@ -178,6 +181,7 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * We cannot get avatars that are 0 or negative
 	 */
 	public function testGetAvatarSizeMin() {
+		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$this->avatarMock->expects($this->once())
 						 ->method('get')
 						 ->with($this->equalTo(64));
@@ -191,6 +195,7 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * We do not support avatars larger than 2048*2048
 	 */
 	public function testGetAvatarSizeMax() {
+		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$this->avatarMock->expects($this->once())
 						 ->method('get')
 						 ->with($this->equalTo(2048));
-- 
GitLab


From acae208f2fc6b80fbf9af615661e3905f9cab0a0 Mon Sep 17 00:00:00 2001
From: root <martin.mattel@diemattels.at>
Date: Fri, 29 May 2015 21:56:08 +0200
Subject: [PATCH 087/783] moved code to /lib/private/tempmanager.php

fix for unit test

some fixes
---
 lib/base.php                | 17 ++---------
 lib/private/server.php      |  2 +-
 lib/private/tempmanager.php | 60 +++++++++++++++++++++++++++++++++++--
 tests/lib/tempmanager.php   |  5 ++--
 4 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index aceac2e53c3..f1f8a0f92ca 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -1108,27 +1108,16 @@ class OC {
 		}
 		return true;
 	}
-}
 
-if (!function_exists('get_temp_dir')) {
 	/**
 	 * Get the temporary dir to store uploaded data
 	 * @return null|string Path to the temporary directory or null
 	 */
 	function get_temp_dir() {
-		if ($temp = ini_get('upload_tmp_dir')) return $temp;
-		if ($temp = getenv('TMP')) return $temp;
-		if ($temp = getenv('TEMP')) return $temp;
-		if ($temp = getenv('TMPDIR')) return $temp;
-		$temp = tempnam(__FILE__, '');
-		if (file_exists($temp)) {
-			unlink($temp);
-			return dirname($temp);
-		}
-		if ($temp = sys_get_temp_dir()) return $temp;
-
-		return null;
+		return \OC::$server->getTempManager()->t_get_temp_dir();
 	}
+
 }
 
+
 OC::init();
diff --git a/lib/private/server.php b/lib/private/server.php
index a47fa2e43f9..229fae843cc 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -344,7 +344,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			}
 		});
 		$this->registerService('TempManager', function (Server $c) {
-			return new TempManager(get_temp_dir(), $c->getLogger());
+			return new TempManager($c->getLogger());
 		});
 		$this->registerService('AppManager', function(Server $c) {
 			return new \OC\App\AppManager(
diff --git a/lib/private/tempmanager.php b/lib/private/tempmanager.php
index b8cef8e036e..b1b98751607 100644
--- a/lib/private/tempmanager.php
+++ b/lib/private/tempmanager.php
@@ -38,11 +38,10 @@ class TempManager implements ITempManager {
 	const TMP_PREFIX = 'oc_tmp_';
 
 	/**
-	 * @param string $baseDir
 	 * @param \OCP\ILogger $logger
 	 */
-	public function __construct($baseDir, ILogger $logger) {
-		$this->tmpBaseDir = $baseDir;
+	public function __construct(ILogger $logger) {
+		$this->tmpBaseDir = $this->t_get_temp_dir();
 		$this->log = $logger;
 	}
 
@@ -190,4 +189,59 @@ class TempManager implements ITempManager {
 		}
 		return $files;
 	}
+
+	/**
+	 * Get the temporary directory to store transfer data
+	 * @return null|string Path to the temporary directory or null
+	 */
+	public function t_get_temp_dir() {
+		// Get the temporary directory and log the path if loglevel is set to debug
+		// Info: based on the temp dir, further directories may be created unique to the instance
+		$temp = self::gather_temp_dir();
+		\OCP\Util::writeLog('Core', 'Temporary directory set to: ' . ($temp ? $temp : 'NULL'), \OCP\Util::DEBUG);
+		return $temp;
+	}
+
+	/**
+	 * Get a temporary directory from possible sources
+	 * If a temporary directory is set in config.php, use this one
+	 * @return null|string Path to the temporary directory or null
+	 */
+	private function gather_temp_dir() {
+		if ($temp = self::get_config_temp_dir()) return $temp;
+		if ($temp = ini_get('upload_tmp_dir')) return $temp;
+		if ($temp = getenv('TMP')) return $temp;
+		if ($temp = getenv('TEMP')) return $temp;
+		if ($temp = getenv('TMPDIR')) return $temp;
+		$temp = tempnam(__FILE__, '');
+		if (file_exists($temp)) {
+			unlink($temp);
+			return dirname($temp);
+		}
+		if ($temp = sys_get_temp_dir()) return $temp;
+		return null;
+	}
+
+	/**
+	 * Check if the temporary directory is defined in config.php and is present and writable
+	 * @return bool|string Path to the temporary directory or false
+	 */
+	private function get_config_temp_dir() {
+		$temp = \OC::$server->getConfig()->getSystemValue('tempdirectory', false);
+		// surpress any possible errors caused by is_writable
+		// checks missing or invalid path or characters, wrong permissions ect
+		if ($temp) {
+			try {
+				if (is_writeable($temp)) {
+					return $temp;
+				} else {
+					\OCP\Util::writeLog('Core', 'Manually set temporary directory in config.php is not present or writable: ' . $temp, \OCP\Util::WARN);
+					return false;
+				}
+			} catch (Exception $e) {
+				return false;
+			}
+		}
+	}
+
 }
diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php
index 0fa025d44c8..89625ac62f2 100644
--- a/tests/lib/tempmanager.php
+++ b/tests/lib/tempmanager.php
@@ -22,12 +22,11 @@ class NullLogger extends Log {
 }
 
 class TempManager extends \Test\TestCase {
-	protected $baseDir;
 
 	protected function setUp() {
 		parent::setUp();
 
-		$this->baseDir = get_temp_dir() . $this->getUniqueID('/oc_tmp_test');
+		$this->baseDir = $this->getManager()->t_get_temp_dir() . $this->getUniqueID('/oc_tmp_test');
 		if (!is_dir($this->baseDir)) {
 			mkdir($this->baseDir);
 		}
@@ -46,7 +45,7 @@ class TempManager extends \Test\TestCase {
 		if (!$logger) {
 			$logger = new NullLogger();
 		}
-		return new \OC\TempManager($this->baseDir, $logger);
+		return new \OC\TempManager($logger);
 	}
 
 	public function testGetFile() {
-- 
GitLab


From 114d1acd2ca9f254b7e6639a2e1f0a1748e4c254 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 30 Aug 2015 01:54:51 -0400
Subject: [PATCH 088/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/da.js       | 3 +++
 apps/encryption/l10n/da.json     | 3 +++
 apps/encryption/l10n/fi_FI.js    | 1 +
 apps/encryption/l10n/fi_FI.json  | 1 +
 apps/encryption/l10n/it.js       | 5 ++++-
 apps/encryption/l10n/it.json     | 5 ++++-
 apps/encryption/l10n/pt_BR.js    | 3 +++
 apps/encryption/l10n/pt_BR.json  | 3 +++
 apps/files_external/l10n/it.js   | 1 +
 apps/files_external/l10n/it.json | 1 +
 10 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index 80b1496573c..b1b2b778e94 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
     "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar",
+    "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hejsa,\n\nadministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
     "The share will expire on %s." : "Delingen vil udløbe om %s.",
     "Cheers!" : "Hej!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hejsa,<br><br>administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet <strong>%s</strong>.<br><br>Venligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.<br><br>",
     "Enable recovery key" : "Aktivér gendannelsesnøgle",
     "Disable recovery key" : "Deaktivér gendannelsesnøgle",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.",
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index 23a9201bc9b..8f6b202d590 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
     "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar",
+    "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hejsa,\n\nadministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
     "The share will expire on %s." : "Delingen vil udløbe om %s.",
     "Cheers!" : "Hej!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hejsa,<br><br>administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet <strong>%s</strong>.<br><br>Venligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.<br><br>",
     "Enable recovery key" : "Aktivér gendannelsesnøgle",
     "Disable recovery key" : "Deaktivér gendannelsesnøgle",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.",
diff --git a/apps/encryption/l10n/fi_FI.js b/apps/encryption/l10n/fi_FI.js
index 92e3b132e99..cac43eae16f 100644
--- a/apps/encryption/l10n/fi_FI.js
+++ b/apps/encryption/l10n/fi_FI.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
     "Encryption App is enabled and ready" : "Salaussovellus on käytössä ja valmis",
+    "one-time password for server-side-encryption" : "kertakäyttöinen salasana palvelinpään salausta varten",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.",
     "The share will expire on %s." : "Jakaminen päättyy %s.",
diff --git a/apps/encryption/l10n/fi_FI.json b/apps/encryption/l10n/fi_FI.json
index b8547c9dc8b..7f5bec24f8b 100644
--- a/apps/encryption/l10n/fi_FI.json
+++ b/apps/encryption/l10n/fi_FI.json
@@ -23,6 +23,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
     "Encryption App is enabled and ready" : "Salaussovellus on käytössä ja valmis",
+    "one-time password for server-side-encryption" : "kertakäyttöinen salasana palvelinpään salausta varten",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.",
     "The share will expire on %s." : "Jakaminen päättyy %s.",
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
index adfd542d263..c0d42e17f74 100644
--- a/apps/encryption/l10n/it.js
+++ b/apps/encryption/l10n/it.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
     "Encryption App is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
+    "one-time password for server-side-encryption" : "password monouso per la cifratura lato server",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile leggere questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Ciao,\n\nl'amministratore ha abilitato la cifratura lato server. I tuoi file sono stati\ncifrati utilizzando la password '%s'.\n\nAccedi all'interfaccia web, vai alla sezione 'modulo di cifratura base di ownCloud' dalle nelle tue impostazioni personali e aggiorna la tua password di cifratura digitando la password nel campo 'vecchia password di accesso' e la tua nuova password.\n\n",
     "The share will expire on %s." : "La condivisione scadrà il %s.",
     "Cheers!" : "Saluti!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Ciao,<br><br>l'amministratore ha abilitato la cifratura lato server. I tuoi file sono stati cifrati utilizzando la password <strong>%s</strong>.<br><br>Accedi all'interfaccia web, vai alla sezione \"modulo di cifratura base di ownCloud\" dalle nelle tue impostazioni personali e aggiorna la tua password di cifratura digitando la password nel campo \"vecchia password di accesso\" e la tua nuova password.",
     "Enable recovery key" : "Abilita chiave di ripristino",
     "Disable recovery key" : "Disabilita chiave di ripristino",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.",
@@ -39,7 +42,7 @@ OC.L10N.register(
     "New recovery key password" : "Nuova password della chiave di ripristino",
     "Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino",
     "Change Password" : "Modifica password",
-    "ownCloud basic encryption module" : "Modulo di cifratura di base di ownCloud",
+    "ownCloud basic encryption module" : "Modulo di cifratura base di ownCloud",
     "Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
     "Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
index 25fcd34bd1b..ee3f487c54f 100644
--- a/apps/encryption/l10n/it.json
+++ b/apps/encryption/l10n/it.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
     "Encryption App is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
+    "one-time password for server-side-encryption" : "password monouso per la cifratura lato server",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile leggere questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Ciao,\n\nl'amministratore ha abilitato la cifratura lato server. I tuoi file sono stati\ncifrati utilizzando la password '%s'.\n\nAccedi all'interfaccia web, vai alla sezione 'modulo di cifratura base di ownCloud' dalle nelle tue impostazioni personali e aggiorna la tua password di cifratura digitando la password nel campo 'vecchia password di accesso' e la tua nuova password.\n\n",
     "The share will expire on %s." : "La condivisione scadrà il %s.",
     "Cheers!" : "Saluti!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Ciao,<br><br>l'amministratore ha abilitato la cifratura lato server. I tuoi file sono stati cifrati utilizzando la password <strong>%s</strong>.<br><br>Accedi all'interfaccia web, vai alla sezione \"modulo di cifratura base di ownCloud\" dalle nelle tue impostazioni personali e aggiorna la tua password di cifratura digitando la password nel campo \"vecchia password di accesso\" e la tua nuova password.",
     "Enable recovery key" : "Abilita chiave di ripristino",
     "Disable recovery key" : "Disabilita chiave di ripristino",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.",
@@ -37,7 +40,7 @@
     "New recovery key password" : "Nuova password della chiave di ripristino",
     "Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino",
     "Change Password" : "Modifica password",
-    "ownCloud basic encryption module" : "Modulo di cifratura di base di ownCloud",
+    "ownCloud basic encryption module" : "Modulo di cifratura base di ownCloud",
     "Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
     "Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index d5af4a40b8d..09ed1910c1a 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave do App de Criptografia é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
     "Encryption App is enabled and ready" : "Aplicativo de criptografia está ativado e pronto",
+    "one-time password for server-side-encryption" : "senha de uso único para criptografia-lado-servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Por favor peça ao dono do arquivo para compartilha-lo com você.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este arquivo, provavelmente este é um arquivo compartilhado. Por favor, pergunte o dono do arquivo para recompartilhar o arquivo com você.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Olá,\n\nO administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha '%s'.\n\nPor favor faça o login para a interface da Web, vá para a seção 'ownCloud módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login.\n\n",
     "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
     "Cheers!" : "Saúde!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Olá,<br><br>o administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha <strong>%s</strong>.<br><br>Por favor faça o login para a interface da Web, vá para a seção 'ownCloud módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login..<br><br>",
     "Enable recovery key" : "Habilitar recuperação de chave",
     "Disable recovery key" : "Dasabilitar chave de recuperação",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar arquivos. Ela permite a recuperação de arquivos de um usuário esquecer sua senha.",
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index 69a0d0a020c..1682ec44b28 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave do App de Criptografia é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
     "Encryption App is enabled and ready" : "Aplicativo de criptografia está ativado e pronto",
+    "one-time password for server-side-encryption" : "senha de uso único para criptografia-lado-servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Por favor peça ao dono do arquivo para compartilha-lo com você.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este arquivo, provavelmente este é um arquivo compartilhado. Por favor, pergunte o dono do arquivo para recompartilhar o arquivo com você.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Olá,\n\nO administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha '%s'.\n\nPor favor faça o login para a interface da Web, vá para a seção 'ownCloud módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login.\n\n",
     "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
     "Cheers!" : "Saúde!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Olá,<br><br>o administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha <strong>%s</strong>.<br><br>Por favor faça o login para a interface da Web, vá para a seção 'ownCloud módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login..<br><br>",
     "Enable recovery key" : "Habilitar recuperação de chave",
     "Disable recovery key" : "Dasabilitar chave de recuperação",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar arquivos. Ela permite a recuperação de arquivos de um usuário esquecer sua senha.",
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index 42cd6429bc4..deeb824f57f 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "Storage with id \"%i\" not found" : "Archiviazione con ID \"%i\" non trovata",
     "Invalid backend or authentication mechanism class" : "Motore o classe del meccanismo di autenticazione non valido",
     "Invalid mount point" : "Punto di mount non valido",
+    "Objectstore forbidden" : "Objectstore vietato",
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
     "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
     "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 27e33f9adad..f1282447100 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -25,6 +25,7 @@
     "Storage with id \"%i\" not found" : "Archiviazione con ID \"%i\" non trovata",
     "Invalid backend or authentication mechanism class" : "Motore o classe del meccanismo di autenticazione non valido",
     "Invalid mount point" : "Punto di mount non valido",
+    "Objectstore forbidden" : "Objectstore vietato",
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
     "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
     "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
-- 
GitLab


From 4cb8ca186097de43e48c1d99f83f30704313dab3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 28 Aug 2015 20:48:42 +0200
Subject: [PATCH 089/783] Check result of storage wrappers

---
 lib/private/files/storage/storagefactory.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/private/files/storage/storagefactory.php b/lib/private/files/storage/storagefactory.php
index 62b393c845c..e8df5090f09 100644
--- a/lib/private/files/storage/storagefactory.php
+++ b/lib/private/files/storage/storagefactory.php
@@ -99,6 +99,9 @@ class StorageFactory implements IStorageFactory {
 		}, $wrappers);
 		foreach ($wrappers as $wrapper) {
 			$storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint);
+			if (!($storage instanceof \OCP\Files\Storage)) {
+				throw new \Exception('Invalid result from storage wrapper');
+			}
 		}
 		return $storage;
 	}
-- 
GitLab


From 2aff11c80bbc7fb0524c52d17824d68bda43aac5 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 29 Aug 2015 13:31:18 +0200
Subject: [PATCH 090/783] Actually validate the expire date on share

* Added more intergration tests
---
 apps/files_sharing/api/local.php | 12 +++--
 apps/files_sharing/tests/api.php | 88 +++++++++++++++++++++++++++++++-
 lib/private/share/share.php      | 15 ++++++
 3 files changed, 110 insertions(+), 5 deletions(-)

diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php
index eeb31899830..87025998b3d 100644
--- a/apps/files_sharing/api/local.php
+++ b/apps/files_sharing/api/local.php
@@ -292,7 +292,7 @@ class Local {
 				try {
 					$expirationDate = isset($_POST['expireDate']) ? self::parseDate($_POST['expireDate']) : null;
 				} catch (\Exception $e) {
-					return new \OC_OCS_Result(null, 404, 'Invalid Date');
+					return new \OC_OCS_Result(null, 404, 'Invalid Date. Format must be YYYY-MM-DD.');
 				}
 
 				break;
@@ -315,7 +315,11 @@ class Local {
 					$expirationDate
 			);
 		} catch (HintException $e) {
-			return new \OC_OCS_Result(null, 400, $e->getHint());
+			if ($e->getCode() === 0) {
+				return new \OC_OCS_Result(null, 400, $e->getHint());
+			} else {
+				return new \OC_OCS_Result(null, $e->getCode(), $e->getHint());
+			}
 		} catch (\Exception $e) {
 			return new \OC_OCS_Result(null, 403, $e->getMessage());
 		}
@@ -559,13 +563,13 @@ class Local {
 	 */
 	private static function parseDate($expireDate) {
 		if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $expireDate) === 0) {
-			throw new \Exception();
+			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
 		}
 
 		$date = new \DateTime($expireDate);
 
 		if ($date === false) {
-			throw new \Exception();
+			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
 		}
 
 		return $date;
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index a9b6ee9f64e..d0ee71cec5a 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -1518,7 +1518,7 @@ class Test_Files_Sharing_Api extends TestCase {
 		if ($valid === false) {
 			$this->assertFalse($result->succeeded());
 			$this->assertEquals(404, $result->getStatusCode());
-			$this->assertEquals('Invalid Date', $result->getMeta()['message']);
+			$this->assertEquals('Invalid Date. Format must be YYYY-MM-DD.', $result->getMeta()['message']);
 			return;
 		}
 
@@ -1543,4 +1543,90 @@ class Test_Files_Sharing_Api extends TestCase {
 		$fileinfo = $this->view->getFileInfo($this->folder);
 		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
 	}
+
+	public function testCreatePublicLinkExpireDateValid() {
+		$config = \OC::$server->getConfig();
+
+		// enforce expire date, by default 7 days after the file was shared
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'yes');
+		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'yes');
+
+		$date = new \DateTime();
+		$date->add(new \DateInterval('P5D'));
+
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['expireDate'] = $date->format('Y-m-d');
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertTrue($result->succeeded());
+
+		$data = $result->getData();
+		$this->assertTrue(is_string($data['token']));
+
+		// check for correct link
+		$url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']);
+		$this->assertEquals($url, $data['url']);
+
+
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
+
+		$item = reset($items);
+		$this->assertTrue(is_array($item));
+		$this->assertEquals($date->format('Y-m-d'), substr($item['expiration'], 0, 10));
+
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'no');
+		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'no');
+	}
+
+	public function testCreatePublicLinkExpireDateInvalidFuture() {
+		$config = \OC::$server->getConfig();
+
+		// enforce expire date, by default 7 days after the file was shared
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'yes');
+		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'yes');
+
+		$date = new \DateTime();
+		$date->add(new \DateInterval('P8D'));
+
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['expireDate'] = $date->format('Y-m-d');
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertFalse($result->succeeded());
+		$this->assertEquals(404, $result->getStatusCode());
+		$this->assertEquals('Cannot set expiration date. Shares cannot expire later than 7 after they have been shared', $result->getMeta()['message']);
+
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'no');
+		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'no');
+	}
+
+	public function testCreatePublicLinkExpireDateInvalidPast() {
+		$config = \OC::$server->getConfig();
+
+		$date = new \DateTime();
+		$date->sub(new \DateInterval('P8D'));
+
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['expireDate'] = $date->format('Y-m-d');
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertFalse($result->succeeded());
+		$this->assertEquals(404, $result->getStatusCode());
+		$this->assertEquals('Cannot set expiration date. Expiration date is in the past', $result->getMeta()['message']);
+
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'no');
+		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'no');
+	}
+
 }
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 9aea4677b5b..7b052483ac3 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -649,6 +649,21 @@ class Share extends Constants {
 			$permissions = (int)$permissions & ~\OCP\Constants::PERMISSION_DELETE;
 		}
 
+		//Validate expirationDate
+		if ($expirationDate !== null) {
+			try {
+				/*
+				 * Reuse the validateExpireDate.
+				 * We have to pass time() since the second arg is the time
+				 * the file was shared, since it is not shared yet we just use
+				 * the current time.
+				 */
+				$expirationDate = self::validateExpireDate($expirationDate->format('Y-m-d'), time(), $itemType, $itemSource);
+			} catch (\Exception $e) {
+				throw new \OC\HintException($e->getMessage(), $e->getMessage(), 404);
+			}
+		}
+
 		// Verify share type and sharing conditions are met
 		if ($shareType === self::SHARE_TYPE_USER) {
 			if ($shareWith == $uidOwner) {
-- 
GitLab


From 468bde67ff310d097b79e52a69001988554a562b Mon Sep 17 00:00:00 2001
From: Raghu Nayyar <hey@raghunayyar.com>
Date: Sun, 30 Aug 2015 14:17:18 +0200
Subject: [PATCH 091/783] Removes unecessary divs and adds max width to longer
 names.

---
 apps/files/css/detailsView.css          | 15 +++++++++++++++
 apps/files/js/detailsview.js            | 17 ++++++-----------
 apps/files/js/mainfileinfodetailview.js | 19 +++++++++++--------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index dafd8c24573..ffead923124 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -9,11 +9,20 @@
 
 #app-sidebar .mainFileInfoView {
 	margin-right: 20px; /* accomodate for close icon */
+	float:left;
+	display:block;
+	width: 100%;
+}
+
+#app-sidebar .file-details-container {
+	display: inline-block;
+	float: left;
 }
 
 #app-sidebar .thumbnail {
 	width: 75px;
 	height: 75px;
+	display: inline-block;
 	float: left;
 	margin-right: 10px;
 	background-size: 75px;
@@ -31,10 +40,16 @@
 	padding-bottom: 3px;
 }
 
+#app-sidebar .fileName h3 {
+	max-width: 300px;
+	float:left;
+}
+
 #app-sidebar .file-details {
 	margin-top: 3px;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
 	opacity: .5;
+	float:left;
 }
 #app-sidebar .action-favorite {
 	vertical-align: text-bottom;
diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index a4ebe90cd64..83d7fd4a178 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -10,24 +10,20 @@
 
 (function() {
 	var TEMPLATE =
-		'<div>' +
 		'	<div class="detailFileInfoContainer">' +
 		'	</div>' +
-		'	<div>' +
-		'		{{#if tabHeaders}}' +
-		'		<ul class="tabHeaders">' +
+		'	{{#if tabHeaders}}' +
+		'	<ul class="tabHeaders">' +
 		'		{{#each tabHeaders}}' +
 		'		<li class="tabHeader" data-tabid="{{tabId}}" data-tabindex="{{tabIndex}}">' +
 		'			<a href="#">{{label}}</a>' +
 		'		</li>' +
 		'		{{/each}}' +
-		'		</ul>' +
-		'		{{/if}}' +
-		'		<div class="tabsContainer">' +
-		'		</div>' +
+		'	</ul>' +
+		'	{{/if}}' +
+		'	<div class="tabsContainer">' +
 		'	</div>' +
-		'	<a class="close icon-close" href="#" alt="{{closeLabel}}"></a>' +
-		'</div>';
+		'	<a class="close icon-close" href="#" alt="{{closeLabel}}"></a>';
 
 	/**
 	 * @class OCA.Files.DetailsView
@@ -268,4 +264,3 @@
 
 	OCA.Files.DetailsView = DetailsView;
 })();
-
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 513f833299a..f647a0de2a9 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -10,14 +10,17 @@
 
 (function() {
 	var TEMPLATE =
-		'<a href="#" class="thumbnail action-default"></a><div title="{{name}}" class="fileName ellipsis">{{name}}</div>' +
-		'<div class="file-details ellipsis">' +
-		'    <a href="#" ' +
-		'    alt="{{starAltText}}"' +
-		'    class="action action-favorite favorite">' +
-		'    <img class="svg" src="{{starIcon}}" />' +
-		'    </a>' +
-		'    {{#if hasSize}}<span class="size" title="{{altSize}}">{{size}}</span>, {{/if}}<span class="date" title="{{altDate}}">{{date}}</span>' +
+		'<a href="#" class="thumbnail action-default"></a>' +
+		'<div class="file-details-container">' +
+		'<div class="fileName"><h3 title="{{name}}" class="ellipsis">{{name}}</h3></div>' +
+		'	<div class="file-details ellipsis">' +
+		'		<a href="#" ' +
+		'		alt="{{starAltText}}"' +
+		'		class="action action-favorite favorite">' +
+		'			<img class="svg" src="{{starIcon}}" />' +
+		'		</a>' +
+		'		{{#if hasSize}}<span class="size" title="{{altSize}}">{{size}}</span>, {{/if}}<span class="date" title="{{altDate}}">{{date}}</span>' +
+		'	</div>' +
 		'</div>';
 
 	/**
-- 
GitLab


From f893de413670877aa91af2559a1eee369b4590d6 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 25 Aug 2015 15:05:55 +0200
Subject: [PATCH 092/783] use login name for password reset

---
 apps/encryption/appinfo/application.php       |  3 +-
 .../controller/settingscontroller.php         | 16 +++++++++-
 .../controller/SettingsControllerTest.php     | 32 +++++++++++++------
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index cba8964eefb..75107b2723c 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -198,7 +198,8 @@ class Application extends \OCP\AppFramework\App {
 				$server->getUserSession(),
 				$c->query('KeyManager'),
 				$c->query('Crypt'),
-				$c->query('Session')
+				$c->query('Session'),
+				$server->getSession()
 			);
 		});
 
diff --git a/apps/encryption/controller/settingscontroller.php b/apps/encryption/controller/settingscontroller.php
index 2a668f7cd4a..8e6de19e784 100644
--- a/apps/encryption/controller/settingscontroller.php
+++ b/apps/encryption/controller/settingscontroller.php
@@ -31,6 +31,7 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IL10N;
 use OCP\IRequest;
+use OCP\ISession;
 use OCP\IUserManager;
 use OCP\IUserSession;
 
@@ -54,6 +55,9 @@ class SettingsController extends Controller {
 	/** @var Session */
 	private $session;
 
+	/** @var ISession  */
+	private $ocSession;
+
 	/**
 	 * @param string $AppName
 	 * @param IRequest $request
@@ -63,6 +67,7 @@ class SettingsController extends Controller {
 	 * @param KeyManager $keyManager
 	 * @param Crypt $crypt
 	 * @param Session $session
+	 * @param ISession $ocSession
 	 */
 	public function __construct($AppName,
 								IRequest $request,
@@ -71,7 +76,8 @@ class SettingsController extends Controller {
 								IUserSession $userSession,
 								KeyManager $keyManager,
 								Crypt $crypt,
-								Session $session) {
+								Session $session,
+								ISession $ocSession) {
 		parent::__construct($AppName, $request);
 		$this->l = $l10n;
 		$this->userSession = $userSession;
@@ -79,6 +85,7 @@ class SettingsController extends Controller {
 		$this->keyManager = $keyManager;
 		$this->crypt = $crypt;
 		$this->session = $session;
+		$this->ocSession = $ocSession;
 	}
 
 
@@ -97,6 +104,13 @@ class SettingsController extends Controller {
 
 		//check if password is correct
 		$passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
+		if ($passwordCorrect === false) {
+			// if check with uid fails we need to check the password with the login name
+			// e.g. in the ldap case. For local user we need to check the password with
+			// the uid because in this case the login name is case insensitive
+			$loginName = $this->ocSession->get('loginname');
+			$passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
+		}
 
 		if ($passwordCorrect !== false) {
 			$encryptedKey = $this->keyManager->getPrivateKey($uid);
diff --git a/apps/encryption/tests/controller/SettingsControllerTest.php b/apps/encryption/tests/controller/SettingsControllerTest.php
index d985c7d7d25..34aa5a27a75 100644
--- a/apps/encryption/tests/controller/SettingsControllerTest.php
+++ b/apps/encryption/tests/controller/SettingsControllerTest.php
@@ -54,6 +54,9 @@ class SettingsControllerTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	private $sessionMock;
 
+	/** @var  \PHPUnit_Framework_MockObject_MockObject */
+	private $ocSessionMock;
+
 	protected function setUp() {
 
 		parent::setUp();
@@ -91,9 +94,11 @@ class SettingsControllerTest extends TestCase {
 			])
 			->getMock();
 
+		$this->ocSessionMock = $this->getMockBuilder('\OCP\ISession')->disableOriginalConstructor()->getMock();
+
 		$this->userSessionMock->expects($this->any())
 			->method('getUID')
-			->willReturn('testUser');
+			->willReturn('testUserUid');
 
 		$this->userSessionMock->expects($this->any())
 			->method($this->anything())
@@ -110,7 +115,8 @@ class SettingsControllerTest extends TestCase {
 			$this->userSessionMock,
 			$this->keyManagerMock,
 			$this->cryptMock,
-			$this->sessionMock
+			$this->sessionMock,
+			$this->ocSessionMock
 		);
 	}
 
@@ -122,8 +128,10 @@ class SettingsControllerTest extends TestCase {
 		$oldPassword = 'old';
 		$newPassword = 'new';
 
+		$this->userSessionMock->expects($this->once())->method('getUID')->willReturn('uid');
+
 		$this->userManagerMock
-			->expects($this->once())
+			->expects($this->exactly(2))
 			->method('checkPassword')
 			->willReturn(false);
 
@@ -171,16 +179,22 @@ class SettingsControllerTest extends TestCase {
 		$oldPassword = 'old';
 		$newPassword = 'new';
 
-		$this->userSessionMock
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('testUser');
+		$this->ocSessionMock->expects($this->once())
+			->method('get')->with('loginname')->willReturn('testUser');
 
 		$this->userManagerMock
-			->expects($this->once())
+			->expects($this->at(0))
+			->method('checkPassword')
+			->with('testUserUid', 'new')
+			->willReturn(false);
+		$this->userManagerMock
+			->expects($this->at(1))
 			->method('checkPassword')
+			->with('testUser', 'new')
 			->willReturn(true);
 
+
+
 		$this->cryptMock
 			->expects($this->once())
 			->method('decryptPrivateKey')
@@ -200,7 +214,7 @@ class SettingsControllerTest extends TestCase {
 		$this->keyManagerMock
 			->expects($this->once())
 			->method('setPrivateKey')
-			->with($this->equalTo('testUser'), $this->equalTo('header.encryptedKey'));
+			->with($this->equalTo('testUserUid'), $this->equalTo('header.encryptedKey'));
 
 		$this->sessionMock
 			->expects($this->once())
-- 
GitLab


From 166e57cf611b659892748fc7799e85a82553b042 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 25 Aug 2015 15:58:07 +0200
Subject: [PATCH 093/783] return false if private key is not valid

---
 apps/encryption/lib/crypto/crypt.php           |  2 +-
 apps/encryption/tests/lib/crypto/cryptTest.php | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php
index 6c4c108f50a..5d1bb92460a 100644
--- a/apps/encryption/lib/crypto/crypt.php
+++ b/apps/encryption/lib/crypto/crypt.php
@@ -398,7 +398,7 @@ class Crypt {
 			}
 		}
 
-		return true;
+		return false;
 	}
 
 	/**
diff --git a/apps/encryption/tests/lib/crypto/cryptTest.php b/apps/encryption/tests/lib/crypto/cryptTest.php
index 3c7767a8908..c6f16e952d7 100644
--- a/apps/encryption/tests/lib/crypto/cryptTest.php
+++ b/apps/encryption/tests/lib/crypto/cryptTest.php
@@ -363,4 +363,19 @@ class cryptTest extends TestCase {
 		];
 	}
 
+	public function testIsValidPrivateKey() {
+		$res = openssl_pkey_new();
+		openssl_pkey_export($res, $privateKey);
+
+		// valid private key
+		$this->assertTrue(
+			$this->invokePrivate($this->crypt, 'isValidPrivateKey', [$privateKey])
+		);
+
+		// invalid private key
+		$this->assertFalse(
+			$this->invokePrivate($this->crypt, 'isValidPrivateKey', ['foo'])
+		);
+	}
+
 }
-- 
GitLab


From d54b497ade049bb1dc2394d8e989827057e20acb Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 28 Aug 2015 17:44:40 +0200
Subject: [PATCH 094/783] Return permissions and expiration on create share
 responses

Updated and added unit tests
---
 apps/files_sharing/api/local.php |   4 +
 apps/files_sharing/tests/api.php | 138 ++++++++++++++++++++++++++-----
 2 files changed, 120 insertions(+), 22 deletions(-)

diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php
index 87025998b3d..61b8b47d2d3 100644
--- a/apps/files_sharing/api/local.php
+++ b/apps/files_sharing/api/local.php
@@ -346,6 +346,10 @@ class Local {
 					}
 				}
 			}
+
+			$data['permissions'] = $share['permissions'];
+			$data['expiration'] = $share['expiration'];
+
 			return new \OC_OCS_Result($data);
 		} else {
 			return new \OC_OCS_Result(null, 404, "couldn't share file");
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index d0ee71cec5a..3809b812051 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -73,40 +73,108 @@ class Test_Files_Sharing_Api extends TestCase {
 	/**
 	 * @medium
 	 */
-	function testCreateShare() {
+	function testCreateShareUserFile() {
+		// simulate a post request
+		$_POST['path'] = $this->filename;
+		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertTrue($result->succeeded());
+		$data = $result->getData();
+		$this->assertEquals(23, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
+
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
 
-		// share to user
+		$fileinfo = $this->view->getFileInfo($this->filename);
+		\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+	}
 
+	function testCreateShareUserFolder() {
 		// simulate a post request
-		$_POST['path'] = $this->filename;
+		$_POST['path'] = $this->folder;
 		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
 		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
 
-		$result = \OCA\Files_Sharing\API\Local::createShare(array());
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
 
 		$this->assertTrue($result->succeeded());
 		$data = $result->getData();
+		$this->assertEquals(31, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
 
 		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
+
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+	}
+
+
+	function testCreateShareGroupFile() {
+		// simulate a post request
+		$_POST['path'] = $this->filename;
+		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_GROUP;
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
 
+		$this->assertTrue($result->succeeded());
+		$data = $result->getData();
+		$this->assertEquals(23, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
+
+		$share = $this->getShareFromId($data['id']);
 		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
+
+		$fileinfo = $this->view->getFileInfo($this->filename);
+		\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1);
+	}
+
+	function testCreateShareGroupFolder() {
+		// simulate a post request
+		$_POST['path'] = $this->folder;
+		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_GROUP;
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertTrue($result->succeeded());
+		$data = $result->getData();
+		$this->assertEquals(31, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
 
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
 		$this->assertTrue(!empty($items));
 
-		// share link
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1);
+	}
 
+	public function testCreateShareLink() {
 		// simulate a post request
 		$_POST['path'] = $this->folder;
 		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
 
-		$result = \OCA\Files_Sharing\API\Local::createShare(array());
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
 
 		// check if API call was successful
 		$this->assertTrue($result->succeeded());
 
 		$data = $result->getData();
-
-		// check if we have a token
+		$this->assertEquals(1, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
 		$this->assertTrue(is_string($data['token']));
 
 		// check for correct link
@@ -115,18 +183,39 @@ class Test_Files_Sharing_Api extends TestCase {
 
 
 		$share = $this->getShareFromId($data['id']);
-
 		$items = \OCP\Share::getItemShared('file', $share['item_source']);
-
 		$this->assertTrue(!empty($items));
 
-		$fileinfo = $this->view->getFileInfo($this->filename);
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+	}
 
-		\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
-				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+	public function testCreateShareLinkPublicUpload() {
+		// simulate a post request
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['publicUpload'] = 'true';
 
-		$fileinfo = $this->view->getFileInfo($this->folder);
+		$result = \OCA\Files_Sharing\API\Local::createShare(array());
+
+		// check if API call was successful
+		$this->assertTrue($result->succeeded());
+
+		$data = $result->getData();
+		$this->assertEquals(7, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
+		$this->assertTrue(is_string($data['token']));
 
+		// check for correct link
+		$url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']);
+		$this->assertEquals($url, $data['url']);
+
+
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
+
+		$fileinfo = $this->view->getFileInfo($this->folder);
 		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
 	}
 
@@ -287,7 +376,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
 	 */
 	function testGetAllShares() {
 
@@ -334,7 +423,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareLink
 	 */
 	function testPublicLinkUrl() {
 		// simulate a post request
@@ -379,7 +468,8 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
+	 * @depends testCreateShareLink
 	 */
 	function testGetShareFromSource() {
 
@@ -409,7 +499,8 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
+	 * @depends testCreateShareLink
 	 */
 	function testGetShareFromSourceWithReshares() {
 
@@ -463,7 +554,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
 	 */
 	function testGetShareFromId() {
 
@@ -911,7 +1002,8 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
+	 * @depends testCreateShareLink
 	 */
 	function testUpdateShare() {
 
@@ -1037,7 +1129,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
 	 */
 	public function testUpdateShareInvalidPermissions() {
 
@@ -1232,7 +1324,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
 	 */
 	function testDeleteShare() {
 
@@ -1526,6 +1618,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 		$data = $result->getData();
 		$this->assertTrue(is_string($data['token']));
+		$this->assertEquals($date, substr($data['expiration'], 0, 10));
 
 		// check for correct link
 		$url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']);
@@ -1564,6 +1657,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 		$data = $result->getData();
 		$this->assertTrue(is_string($data['token']));
+		$this->assertEquals($date->format('Y-m-d') . ' 00:00:00', $data['expiration']);
 
 		// check for correct link
 		$url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']);
-- 
GitLab


From a808837ec9143df3c7f000f150c1f1c6420ad535 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Sun, 30 Aug 2015 17:14:57 +0200
Subject: [PATCH 095/783] Add apps unit test

---
 core/js/tests/specs/appsSpec.js | 48 +++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 core/js/tests/specs/appsSpec.js

diff --git a/core/js/tests/specs/appsSpec.js b/core/js/tests/specs/appsSpec.js
new file mode 100644
index 00000000000..536d41c7f10
--- /dev/null
+++ b/core/js/tests/specs/appsSpec.js
@@ -0,0 +1,48 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2015 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+describe('Apps base tests', function() {
+	describe('Sidebar utility functions', function() {
+		beforeEach(function() {
+			$('#testArea').append('<div id="app-content">Content</div><div id="app-sidebar">The sidebar</div>');
+		});
+		it('shows sidebar', function() {
+			var $el = $('#app-sidebar');
+			OC.Apps.showAppSidebar();
+			expect($el.hasClass('disappear')).toEqual(false);
+		});
+		it('hides sidebar', function() {
+			var $el = $('#app-sidebar');
+			OC.Apps.showAppSidebar();
+			OC.Apps.hideAppSidebar();
+			expect($el.hasClass('disappear')).toEqual(true);
+		});
+		it('triggers appresize event when visibility changed', function() {
+			var eventStub = sinon.stub();
+			$('#app-content').on('appresized', eventStub);
+			OC.Apps.showAppSidebar();
+			expect(eventStub.calledOnce).toEqual(true);
+			OC.Apps.hideAppSidebar();
+			expect(eventStub.calledTwice).toEqual(true);
+		});
+	});
+});
+
-- 
GitLab


From 2b08659f7d18d458339bcd89687469d8926f4941 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Sun, 30 Aug 2015 16:21:55 +0200
Subject: [PATCH 096/783] Restrict upgrades to explicit allowed version

version.php now contains the previous ownCloud version from which
upgrades are allowed. Any other upgrades will show a message that the
upgrade/downgrade is not supported.
---
 lib/private/updater.php | 40 ++++++++++++++++++----
 tests/lib/updater.php   | 74 +++++++++++++++++++++++++++++++++++------
 version.php             | 11 +++---
 3 files changed, 105 insertions(+), 20 deletions(-)

diff --git a/lib/private/updater.php b/lib/private/updater.php
index f73fa8ff655..0f9ecfe93de 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -211,20 +211,47 @@ class Updater extends BasicEmitter {
 		return $success;
 	}
 
+	/**
+	 * Return version from which this version is allowed to upgrade from
+	 *
+	 * @return string allowed previous version
+	 */
+	private function getAllowedPreviousVersion() {
+		// this should really be a JSON file
+		require \OC::$SERVERROOT . '/version.php';
+		return implode('.', $OC_VersionCanBeUpgradedFrom);
+	}
+
 	/**
 	 * Whether an upgrade to a specified version is possible
 	 * @param string $oldVersion
 	 * @param string $newVersion
+	 * @param string $allowedPreviousVersion
 	 * @return bool
 	 */
-	public function isUpgradePossible($oldVersion, $newVersion) {
+	public function isUpgradePossible($oldVersion, $newVersion, $allowedPreviousVersion) {
+		// downgrade is never allowed
+		if (version_compare($oldVersion, $newVersion, '>')) {
+			return false;
+		}
+
 		$oldVersion = explode('.', $oldVersion);
 		$newVersion = explode('.', $newVersion);
 
-		if($newVersion[0] > ($oldVersion[0] + 1) || $oldVersion[0] > $newVersion[0]) {
-			return false;
+		while (count($oldVersion) > 2) {
+			array_pop($oldVersion);
+		}
+
+		while (count($newVersion) > 2) {
+			array_pop($newVersion);
 		}
-		return true;
+
+		$oldVersion = implode('.', $oldVersion);
+		$newVersion = implode('.', $newVersion);
+
+		// either we're updating from an allowed version or the current version
+		return (version_compare($allowedPreviousVersion, $oldVersion) === 0
+			|| version_compare($newVersion, $oldVersion) === 0);
 	}
 
 	/**
@@ -259,8 +286,9 @@ class Updater extends BasicEmitter {
 	 */
 	private function doUpgrade($currentVersion, $installedVersion) {
 		// Stop update if the update is over several major versions
-		if (!self::isUpgradePossible($installedVersion, $currentVersion)) {
-			throw new \Exception('Updates between multiple major versions are unsupported.');
+		$allowedPreviousVersion = $this->getAllowedPreviousVersion();
+		if (!self::isUpgradePossible($installedVersion, $currentVersion, $allowedPreviousVersion)) {
+			throw new \Exception('Updates between multiple major versions and downgrades are unsupported.');
 		}
 
 		// Update .htaccess files
diff --git a/tests/lib/updater.php b/tests/lib/updater.php
index 28577071b4c..763858acf5d 100644
--- a/tests/lib/updater.php
+++ b/tests/lib/updater.php
@@ -67,14 +67,68 @@ class UpdaterTest extends \Test\TestCase {
 	 */
 	public function versionCompatibilityTestData() {
 		return [
-			['1.0.0.0', '2.2.0', true],
-			['1.1.1.1', '2.0.0', true],
-			['5.0.3', '4.0.3', false],
-			['12.0.3', '13.4.5', true],
-			['1', '2', true],
-			['2', '2', true],
-			['6.0.5', '6.0.6', true],
-			['5.0.6', '7.0.4', false],
+			['1', '2', '1', true],
+			['2', '2', '2', true],
+			['6.0.5.0', '6.0.6.0', '5.0', true],
+			['5.0.6.0', '7.0.4.0', '6.0', false],
+			// allow upgrading within the same major release
+			['8.0.0.0', '8.0.0.0', '8.0', true],
+			['8.0.0.0', '8.0.0.4', '8.0', true],
+			['8.0.0.0', '8.0.1.0', '8.0', true],
+			['8.0.0.0', '8.0.2.0', '8.0', true],
+			// does not allow downgrading within the same major release
+			['8.0.1.0', '8.0.0.0', '8.0', false],
+			['8.0.2.0', '8.0.1.0', '8.0', false],
+			['8.0.0.4', '8.0.0.0', '8.0', false],
+			// allows upgrading within the patch version
+			['8.0.0.0', '8.0.0.1', '8.0', true],
+			['8.0.0.0', '8.0.0.2', '8.0', true],
+			// does not allow downgrading within the same major release
+			['8.0.0.1', '8.0.0.0', '8.0', false],
+			['8.0.0.2', '8.0.0.0', '8.0', false],
+			// allow upgrading to the next major release
+			['8.0.0.0', '8.1.0.0', '8.0', true],
+			['8.0.0.0', '8.1.1.0', '8.0', true],
+			['8.0.0.0', '8.1.1.5', '8.0', true],
+			['8.0.0.2', '8.1.1.5', '8.0', true],
+			['8.1.0.0', '8.2.0.0', '8.1', true],
+			['8.1.0.2', '8.2.0.4', '8.1', true],
+			['8.1.0.5', '8.2.0.1', '8.1', true],
+			['8.1.0.0', '8.2.1.0', '8.1', true],
+			['8.1.0.2', '8.2.1.5', '8.1', true],
+			['8.1.0.5', '8.2.1.1', '8.1', true],
+			// does not allow downgrading to the previous major release
+			['8.1.0.0', '8.0.0.0', '7.0', false],
+			['8.1.1.0', '8.0.0.0', '7.0', false],
+			// does not allow skipping major releases
+			['8.0.0.0', '8.2.0.0', '8.1', false],
+			['8.0.0.0', '8.2.1.0', '8.1', false],
+			['8.0.0.0', '9.0.1.0', '8.2', false],
+			['8.0.0.0', '10.0.0.0', '9.3', false],
+			// allows updating to the next major release
+			['8.2.0.0', '9.0.0.0', '8.2', true],
+			['8.2.0.0', '9.0.0.0', '8.2', true],
+			['8.2.0.0', '9.0.1.0', '8.2', true],
+			['8.2.0.0', '9.0.1.1', '8.2', true],
+			['8.2.0.2', '9.0.1.1', '8.2', true],
+			['8.2.2.0', '9.0.1.0', '8.2', true],
+			['8.2.2.2', '9.0.1.1', '8.2', true],
+			['9.0.0.0', '9.1.0.0', '9.0', true],
+			['9.0.0.0', '9.1.0.2', '9.0', true],
+			['9.0.0.2', '9.1.0.1', '9.0', true],
+			['9.1.0.0', '9.2.0.0', '9.1', true],
+			['9.2.0.0', '9.3.0.0', '9.2', true],
+			['9.3.0.0', '10.0.0.0', '9.3', true],
+			// does not allow updating to the next major release (first number)
+			['9.0.0.0', '8.2.0.0', '8.1', false],
+			// other cases
+			['8.0.0.0', '8.1.5.0', '8.0', true],
+			['8.2.0.0', '9.0.0.0', '8.2', true],
+			['8.2.0.0', '9.1.0.0', '9.0', false],
+			['9.0.0.0', '8.1.0.0', '8.0', false],
+			['9.0.0.0', '8.0.0.0', '7.0', false],
+			['9.1.0.0', '8.0.0.0', '7.0', false],
+			['8.2.0.0', '8.1.0.0', '8.0', false],
 		];
 	}
 
@@ -106,9 +160,9 @@ class UpdaterTest extends \Test\TestCase {
 	 * @param string $newVersion
 	 * @param bool $result
 	 */
-	public function testIsUpgradePossible($oldVersion, $newVersion, $result) {
+	public function testIsUpgradePossible($oldVersion, $newVersion, $allowedVersion, $result) {
 		$updater = new Updater($this->httpHelper, $this->config);
-		$this->assertSame($result, $updater->isUpgradePossible($oldVersion, $newVersion));
+		$this->assertSame($result, $updater->isUpgradePossible($oldVersion, $newVersion, $allowedVersion));
 	}
 
 	public function testCheckInCache() {
diff --git a/version.php b/version.php
index a115f4b26be..a6b49d9dc74 100644
--- a/version.php
+++ b/version.php
@@ -2,6 +2,7 @@
 /**
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
@@ -22,14 +23,16 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version=array(8, 2, 0, 4);
+$OC_Version = [8, 2, 0, 4];
 
 // The human readable string
-$OC_VersionString='8.2 pre alpha';
+$OC_VersionString = '8.2 pre alpha';
+
+$OC_VersionCanBeUpgradedFrom = [8, 1];
 
 // The ownCloud channel
-$OC_Channel='git';
+$OC_Channel = 'git';
 
 // The build number
-$OC_Build='';
+$OC_Build = '';
 
-- 
GitLab


From d5b0b55eefe6c397df2eafabc67514b4a38175fc Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Sun, 30 Aug 2015 18:03:33 +0200
Subject: [PATCH 097/783] Throw exception on downgrade attempt

---
 lib/private/util.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/private/util.php b/lib/private/util.php
index edd375b5c36..47e42d8b7d3 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1448,8 +1448,12 @@ class OC_Util {
 		if ($config->getSystemValue('installed', false)) {
 			$installedVersion = $config->getSystemValue('version', '0.0.0');
 			$currentVersion = implode('.', OC_Util::getVersion());
-			if (version_compare($currentVersion, $installedVersion, '>')) {
+			$versionDiff = version_compare($currentVersion, $installedVersion);
+			if ($versionDiff > 0) {
 				return true;
+			} else if ($versionDiff < 0) {
+				// downgrade attempt, throw exception
+				throw new \OC\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
 			}
 
 			// also check for upgrades for apps (independently from the user)
-- 
GitLab


From 289e9130f35334a6f0cffcedee82da7d9f5082d0 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 24 Jul 2015 12:24:18 +0200
Subject: [PATCH 098/783] make system root of key storage configurable

---
 .../encryption/changekeystorageroot.php       | 270 +++++++++++++
 .../command/encryption/showkeystorageroot.php |  58 +++
 core/register_command.php                     |  17 +
 lib/private/encryption/keys/storage.php       |  25 +-
 lib/private/encryption/manager.php            |  53 ++-
 lib/private/encryption/util.php               |  42 +-
 lib/private/server.php                        |  27 +-
 .../encryption/changekeystorageroottest.php   | 381 ++++++++++++++++++
 tests/lib/encryption/keys/storage.php         |  59 ++-
 tests/lib/encryption/managertest.php          |  10 +-
 tests/lib/encryption/utiltest.php             |  19 +-
 11 files changed, 919 insertions(+), 42 deletions(-)
 create mode 100644 core/command/encryption/changekeystorageroot.php
 create mode 100644 core/command/encryption/showkeystorageroot.php
 create mode 100644 tests/core/command/encryption/changekeystorageroottest.php

diff --git a/core/command/encryption/changekeystorageroot.php b/core/command/encryption/changekeystorageroot.php
new file mode 100644
index 00000000000..662e0a3161a
--- /dev/null
+++ b/core/command/encryption/changekeystorageroot.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace OC\Core\Command\Encryption;
+
+use OC\Encryption\Keys\Storage;
+use OC\Encryption\Util;
+use OC\Files\Filesystem;
+use OC\Files\View;
+use OCP\IConfig;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+class ChangeKeyStorageRoot extends Command {
+
+	/** @var View  */
+	protected $rootView;
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var IConfig  */
+	protected $config;
+
+	/** @var Util  */
+	protected $util;
+
+	/** @var QuestionHelper */
+	protected $questionHelper;
+
+	/**
+	 * @param View $view
+	 * @param IUserManager $userManager
+	 * @param IConfig $config
+	 * @param Util $util
+	 * @param QuestionHelper $questionHelper
+	 */
+	public function __construct(View $view, IUserManager $userManager, IConfig $config, Util $util, QuestionHelper $questionHelper) {
+		parent::__construct();
+		$this->rootView = $view;
+		$this->userManager = $userManager;
+		$this->config = $config;
+		$this->util = $util;
+		$this->questionHelper = $questionHelper;
+	}
+
+	protected function configure() {
+		parent::configure();
+		$this
+			->setName('encryption:change-key-storage-root')
+			->setDescription('Change key storage root')
+			->addArgument(
+				'newRoot',
+				InputArgument::OPTIONAL,
+				'new root of the key storage relative to the data folder'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$oldRoot = $this->util->getKeyStorageRoot();
+		$newRoot = $input->getArgument('newRoot');
+
+		if ($newRoot === null) {
+			$question = new ConfirmationQuestion('No storage root given, do you want to reset the key storage root to the default location? (y/n) ', false);
+			if (!$this->questionHelper->ask($input, $output, $question)) {
+				return;
+			}
+			$newRoot = '';
+		}
+
+		$oldRootDescription = $oldRoot !== '' ? $oldRoot : 'default storage location';
+		$newRootDescription = $newRoot !== '' ? $newRoot : 'default storage location';
+		$output->writeln("Change key storage root from <info>$oldRootDescription</info> to <info>$newRootDescription</info>");
+		$success = $this->moveAllKeys($oldRoot, $newRoot, $output);
+		if ($success) {
+			$this->util->setKeyStorageRoot($newRoot);
+			$output->writeln('');
+			$output->writeln("Key storage root successfully changed to <info>$newRootDescription</info>");
+		}
+	}
+
+	/**
+	 * move keys to new key storage root
+	 *
+	 * @param string $oldRoot
+	 * @param string $newRoot
+	 * @param OutputInterface $output
+	 * @return bool
+	 * @throws \Exception
+	 */
+	protected function moveAllKeys($oldRoot, $newRoot, OutputInterface $output) {
+
+		$output->writeln("Start to move keys:");
+
+		if ($this->rootView->is_dir(($oldRoot)) === false) {
+			$output->writeln("No old keys found: Nothing needs to be moved");
+			return false;
+		}
+
+		$this->prepareNewRoot($newRoot);
+		$this->moveSystemKeys($oldRoot, $newRoot);
+		$this->moveUserKeys($oldRoot, $newRoot, $output);
+
+		return true;
+	}
+
+	/**
+	 * prepare new key storage
+	 *
+	 * @param string $newRoot
+	 * @throws \Exception
+	 */
+	protected function prepareNewRoot($newRoot) {
+		if ($this->rootView->is_dir($newRoot) === false) {
+			throw new \Exception("New root folder doesn't exist. Please create the folder or check the permissions and try again.");
+		}
+
+		$result = $this->rootView->file_put_contents(
+			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
+			'ownCloud will detect this folder as key storage root only if this file exists'
+		);
+
+		if ($result === false) {
+			throw new \Exception("Can't write to new root folder. Please check the permissions and try again");
+		}
+
+	}
+
+
+	/**
+	 * move system key folder
+	 *
+	 * @param string $oldRoot
+	 * @param string $newRoot
+	 */
+	protected function moveSystemKeys($oldRoot, $newRoot) {
+		if (
+			$this->rootView->is_dir($oldRoot . '/files_encryption') &&
+			$this->targetExists($newRoot . '/files_encryption') === false
+		) {
+			$this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
+		}
+	}
+
+
+	/**
+	 * setup file system for the given user
+	 *
+	 * @param string $uid
+	 */
+	protected function setupUserFS($uid) {
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($uid);
+	}
+
+
+	/**
+	 * iterate over each user and move the keys to the new storage
+	 *
+	 * @param string $oldRoot
+	 * @param string $newRoot
+	 * @param OutputInterface $output
+	 */
+	protected function moveUserKeys($oldRoot, $newRoot, OutputInterface $output) {
+
+		$progress = new ProgressBar($output);
+		$progress->start();
+
+
+		foreach($this->userManager->getBackends() as $backend) {
+			$limit = 500;
+			$offset = 0;
+			do {
+				$users = $backend->getUsers('', $limit, $offset);
+				foreach ($users as $user) {
+					$progress->advance();
+					$this->setupUserFS($user);
+					$this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
+				}
+				$offset += $limit;
+			} while(count($users) >= $limit);
+		}
+		$progress->finish();
+	}
+
+	/**
+	 * move user encryption folder to new root folder
+	 *
+	 * @param string $user
+	 * @param string $oldRoot
+	 * @param string $newRoot
+	 * @throws \Exception
+	 */
+	protected function moveUserEncryptionFolder($user, $oldRoot, $newRoot) {
+
+		if ($this->userManager->userExists($user)) {
+
+			$source = $oldRoot . '/' . $user . '/files_encryption';
+			$target = $newRoot . '/' . $user . '/files_encryption';
+			if (
+				$this->rootView->is_dir($source) &&
+				$this->targetExists($target) === false
+			) {
+				$this->prepareParentFolder($newRoot . '/' . $user);
+				$this->rootView->rename($source, $target);
+			}
+		}
+	}
+
+	/**
+	 * Make preparations to filesystem for saving a key file
+	 *
+	 * @param string $path relative to data/
+	 */
+	protected function prepareParentFolder($path) {
+		$path = Filesystem::normalizePath($path);
+		// If the file resides within a subdirectory, create it
+		if ($this->rootView->file_exists($path) === false) {
+			$sub_dirs = explode('/', ltrim($path, '/'));
+			$dir = '';
+			foreach ($sub_dirs as $sub_dir) {
+				$dir .= '/' . $sub_dir;
+				if ($this->rootView->file_exists($dir) === false) {
+					$this->rootView->mkdir($dir);
+				}
+			}
+		}
+	}
+
+	/**
+	 * check if target already exists
+	 *
+	 * @param $path
+	 * @return bool
+	 * @throws \Exception
+	 */
+	protected function targetExists($path) {
+		if ($this->rootView->file_exists($path)) {
+			throw new \Exception("new folder '$path' already exists");
+		}
+
+		return false;
+	}
+
+}
diff --git a/core/command/encryption/showkeystorageroot.php b/core/command/encryption/showkeystorageroot.php
new file mode 100644
index 00000000000..acb2e75a6ae
--- /dev/null
+++ b/core/command/encryption/showkeystorageroot.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace OC\Core\Command\Encryption;
+
+use OC\Encryption\Util;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ShowKeyStorageRoot extends Command{
+
+	/** @var Util  */
+	protected $util;
+
+	/**
+	 * @param Util $util
+	 */
+	public function __construct(Util $util) {
+		parent::__construct();
+		$this->util = $util;
+	}
+
+	protected function configure() {
+		parent::configure();
+		$this
+			->setName('encryption:show-key-storage-root')
+			->setDescription('Show current key storage root');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$currentRoot = $this->util->getKeyStorageRoot();
+
+		$rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)';
+
+		$output->writeln("Current key storage root:  <info>$rootDescription</info>");
+	}
+
+}
diff --git a/core/register_command.php b/core/register_command.php
index 984e1b97f67..72c7b28e9ae 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -62,6 +62,23 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Log\OwnCloud(\OC::$server->getConfig()));
 
+	$view = new \OC\Files\View();
+	$util = new \OC\Encryption\Util(
+		$view,
+		\OC::$server->getUserManager(),
+		\OC::$server->getGroupManager(),
+		\OC::$server->getConfig()
+	);
+	$application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
+			$view,
+			\OC::$server->getUserManager(),
+			\OC::$server->getConfig(),
+			$util,
+			new \Symfony\Component\Console\Helper\QuestionHelper()
+		)
+	);
+	$application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
+
 	$application->add(new OC\Core\Command\Maintenance\MimeTypesJS());
 	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair(\OC\Repair::getRepairSteps()), \OC::$server->getConfig()));
diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php
index b754462d9b0..d0c094538b0 100644
--- a/lib/private/encryption/keys/storage.php
+++ b/lib/private/encryption/keys/storage.php
@@ -27,11 +27,13 @@ namespace OC\Encryption\Keys;
 use OC\Encryption\Util;
 use OC\Files\Filesystem;
 use OC\Files\View;
-use OCP\Encryption\Exceptions\GenericEncryptionException;
 use OCP\Encryption\Keys\IStorage;
 
 class Storage implements IStorage {
 
+	// hidden file which indicate that the folder is a valid key storage
+	const KEY_STORAGE_MARKER = '.oc_key_storage';
+
 	/** @var View */
 	private $view;
 
@@ -42,6 +44,10 @@ class Storage implements IStorage {
 	/** @var string */
 	private $keys_base_dir;
 
+	// root of the key storage default is empty which means that we use the data folder
+	/** @var string */
+	private $root_dir;
+
 	/** @var string */
 	private $encryption_base_dir;
 
@@ -58,6 +64,7 @@ class Storage implements IStorage {
 
 		$this->encryption_base_dir = '/files_encryption';
 		$this->keys_base_dir = $this->encryption_base_dir .'/keys';
+		$this->root_dir = $this->util->getKeyStorageRoot();
 	}
 
 	/**
@@ -162,13 +169,13 @@ class Storage implements IStorage {
 	protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
 
 		if ($uid === null) {
-			$path = $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
+			$path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
 		} else {
-			$path = '/' . $uid . $this->encryption_base_dir . '/'
+			$path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
 				. $encryptionModuleId . '/' . $uid . '.' . $keyId;
 		}
 
-		return $path;
+		return \OC\Files\Filesystem::normalizePath($path);
 	}
 
 	/**
@@ -227,9 +234,9 @@ class Storage implements IStorage {
 
 		// in case of system wide mount points the keys are stored directly in the data directory
 		if ($this->util->isSystemWideMountPoint($filename, $owner)) {
-			$keyPath = $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
 		} else {
-			$keyPath = '/' . $owner . $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
 		}
 
 		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
@@ -290,12 +297,12 @@ class Storage implements IStorage {
 		$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
 
 		if ($systemWideMountPoint) {
-			$systemPath = $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
 		} else {
-			$systemPath = '/' . $owner . $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
 		}
 
-		return $systemPath;
+		return  Filesystem::normalizePath($systemPath, false);
 	}
 
 	/**
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index 1e0a065e25a..c004dfda0d9 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -25,14 +25,12 @@
 
 namespace OC\Encryption;
 
+use OC\Encryption\Keys\Storage;
 use OC\Files\Filesystem;
-use OC\Files\Storage\Shared;
-use OC\Files\Storage\Wrapper\Encryption;
 use OC\Files\View;
-use OC\Search\Provider\File;
+use OC\ServiceUnavailableException;
 use OCP\Encryption\IEncryptionModule;
 use OCP\Encryption\IManager;
-use OCP\Files\Mount\IMountPoint;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
@@ -51,16 +49,26 @@ class Manager implements IManager {
 	/** @var Il10n */
 	protected $l;
 
+	/** @var View  */
+	protected $rootView;
+
+	/** @var Util  */
+	protected $util;
+
 	/**
 	 * @param IConfig $config
 	 * @param ILogger $logger
 	 * @param IL10N $l10n
+	 * @param View $rootView
+	 * @param Util $util
 	 */
-	public function __construct(IConfig $config, ILogger $logger, IL10N $l10n) {
+	public function __construct(IConfig $config, ILogger $logger, IL10N $l10n, View $rootView, Util $util) {
 		$this->encryptionModules = array();
 		$this->config = $config;
 		$this->logger = $logger;
 		$this->l = $l10n;
+		$this->rootView = $rootView;
+		$this->util = $util;
 	}
 
 	/**
@@ -82,7 +90,8 @@ class Manager implements IManager {
 	/**
 	 * check if new encryption is ready
 	 *
-	 * @return boolean
+	 * @return bool
+	 * @throws ServiceUnavailableException
 	 */
 	public function isReady() {
 		// check if we are still in transit between the old and the new encryption
@@ -94,6 +103,11 @@ class Manager implements IManager {
 			$this->logger->warning($warning);
 			return false;
 		}
+
+		if ($this->isKeyStorageReady() === false) {
+			throw new ServiceUnavailableException('Key Storage is not ready');
+		}
+
 		return true;
 	}
 
@@ -221,6 +235,31 @@ class Manager implements IManager {
 			\OC::$server->getGroupManager(),
 			\OC::$server->getConfig()
 		);
-		\OC\Files\Filesystem::addStorageWrapper('oc_encryption', array($util, 'wrapStorage'), 2);
+		Filesystem::addStorageWrapper('oc_encryption', array($util, 'wrapStorage'), 2);
 	}
+
+
+	/**
+	 * check if key storage is ready
+	 *
+	 * @return bool
+	 */
+	protected function isKeyStorageReady() {
+
+		$rootDir = $this->util->getKeyStorageRoot();
+
+		// the default root is always valid
+		if ($rootDir === '') {
+			return true;
+		}
+
+		// check if key storage is mounted correctly
+		if ($this->rootView->file_exists($rootDir . '/' . Storage::KEY_STORAGE_MARKER)) {
+			return true;
+		}
+
+		return false;
+	}
+
+
 }
diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php
index d0733941a35..90ae8259972 100644
--- a/lib/private/encryption/util.php
+++ b/lib/private/encryption/util.php
@@ -59,7 +59,7 @@ class Util {
 	protected $blockSize = 8192;
 
 	/** @var View */
-	protected $view;
+	protected $rootView;
 
 	/** @var array */
 	protected $ocHeaderKeys;
@@ -78,13 +78,13 @@ class Util {
 
 	/**
 	 *
-	 * @param \OC\Files\View $view
+	 * @param View $rootView
 	 * @param \OC\User\Manager $userManager
 	 * @param \OC\Group\Manager $groupManager
 	 * @param IConfig $config
 	 */
 	public function __construct(
-		\OC\Files\View $view,
+		View $rootView,
 		\OC\User\Manager $userManager,
 		\OC\Group\Manager $groupManager,
 		IConfig $config) {
@@ -93,7 +93,7 @@ class Util {
 			self::HEADER_ENCRYPTION_MODULE_KEY
 		];
 
-		$this->view = $view;
+		$this->rootView = $rootView;
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
 		$this->config = $config;
@@ -167,7 +167,7 @@ class Util {
 
 		while ($dirList) {
 			$dir = array_pop($dirList);
-			$content = $this->view->getDirectoryContent($dir);
+			$content = $this->rootView->getDirectoryContent($dir);
 
 			foreach ($content as $c) {
 				if ($c->getType() === 'dir') {
@@ -332,10 +332,22 @@ class Util {
 	 * @return boolean
 	 */
 	public function isExcluded($path) {
-		$normalizedPath = \OC\Files\Filesystem::normalizePath($path);
+		$normalizedPath = Filesystem::normalizePath($path);
 		$root = explode('/', $normalizedPath, 4);
 		if (count($root) > 1) {
 
+			// detect alternative key storage root
+			$rootDir = $this->getKeyStorageRoot();
+			if ($rootDir !== '' &&
+				0 === strpos(
+					Filesystem::normalizePath($path),
+					Filesystem::normalizePath($rootDir)
+				)
+			) {
+				return true;
+			}
+
+
 			//detect system wide folders
 			if (in_array($root[1], $this->excludedPaths)) {
 				return true;
@@ -363,6 +375,24 @@ class Util {
 		return ($enabled === '1') ? true : false;
 	}
 
+	/**
+	 * set new key storage root
+	 *
+	 * @param string $root new key store root relative to the data folder
+	 */
+	public function setKeyStorageRoot($root) {
+		$this->config->setAppValue('core', 'encryption_key_storage_root', $root);
+	}
+
+	/**
+	 * get key storage root
+	 *
+	 * @return string key storage root
+	 */
+	public function getKeyStorageRoot() {
+		return $this->config->getAppValue('core', 'encryption_key_storage_root', '');
+	}
+
 	/**
 	 * Wraps the given storage when it is not a shared storage
 	 *
diff --git a/lib/private/server.php b/lib/private/server.php
index a47fa2e43f9..6aab3d26df4 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -91,12 +91,25 @@ class Server extends SimpleContainer implements IServerContainer {
 		});
 
 		$this->registerService('EncryptionManager', function (Server $c) {
-			return new Encryption\Manager($c->getConfig(), $c->getLogger(), $c->getL10N('core'));
+			$view = new View();
+			$util = new Encryption\Util(
+				$view,
+				$c->getUserManager(),
+				$c->getGroupManager(),
+				$c->getConfig()
+			);
+			return new Encryption\Manager(
+				$c->getConfig(),
+				$c->getLogger(),
+				$c->getL10N('core'),
+				new View(),
+				$util
+			);
 		});
 
 		$this->registerService('EncryptionFileHelper', function (Server $c) {
-			$util = new \OC\Encryption\Util(
-				new \OC\Files\View(),
+			$util = new Encryption\Util(
+				new View(),
 				$c->getUserManager(),
 				$c->getGroupManager(),
 				$c->getConfig()
@@ -105,8 +118,8 @@ class Server extends SimpleContainer implements IServerContainer {
 		});
 
 		$this->registerService('EncryptionKeyStorage', function (Server $c) {
-			$view = new \OC\Files\View();
-			$util = new \OC\Encryption\Util(
+			$view = new View();
+			$util = new Encryption\Util(
 				$view,
 				$c->getUserManager(),
 				$c->getGroupManager(),
@@ -326,7 +339,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			$uid = $user ? $user : null;
 			return new ClientService(
 				$c->getConfig(),
-				new \OC\Security\CertificateManager($uid, new \OC\Files\View())
+				new \OC\Security\CertificateManager($uid, new View())
 			);
 		});
 		$this->registerService('EventLogger', function (Server $c) {
@@ -839,7 +852,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			}
 			$userId = $user->getUID();
 		}
-		return new CertificateManager($userId, new \OC\Files\View());
+		return new CertificateManager($userId, new View());
 	}
 
 	/**
diff --git a/tests/core/command/encryption/changekeystorageroottest.php b/tests/core/command/encryption/changekeystorageroottest.php
new file mode 100644
index 00000000000..6cb52cdea99
--- /dev/null
+++ b/tests/core/command/encryption/changekeystorageroottest.php
@@ -0,0 +1,381 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace Tests\Core\Command\Encryption;
+
+
+use OC\Core\Command\Encryption\ChangeKeyStorageRoot;
+use OC\Encryption\Util;
+use OC\Files\View;
+use OCP\IConfig;
+use OCP\IUserManager;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Test\TestCase;
+
+class ChangeKeyStorageRootTest extends TestCase {
+
+	/** @var ChangeKeyStorageRoot */
+	protected $changeKeyStorageRoot;
+
+	/** @var View | \PHPUnit_Framework_MockObject_MockObject */
+	protected $view;
+
+	/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject */
+	protected $userManager;
+
+	/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
+	protected $config;
+
+	/**  @var Util | \PHPUnit_Framework_MockObject_MockObject */
+	protected $util;
+
+	/** @var QuestionHelper | \PHPUnit_Framework_MockObject_MockObject */
+	protected $questionHelper;
+
+	/** @var InputInterface | \PHPUnit_Framework_MockObject_MockObject */
+	protected $inputInterface;
+
+	/** @var OutputInterface | \PHPUnit_Framework_MockObject_MockObject */
+	protected $outputInterface;
+
+	/** @var \OCP\UserInterface |  \PHPUnit_Framework_MockObject_MockObject */
+	protected $userInterface;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->view = $this->getMock('\OC\Files\View');
+		$this->userManager = $this->getMock('\OCP\IUserManager');
+		$this->config = $this->getMock('\OCP\IConfig');
+		$this->util = $this->getMockBuilder('OC\Encryption\Util')->disableOriginalConstructor()->getMock();
+		$this->questionHelper = $this->getMock('Symfony\Component\Console\Helper\QuestionHelper');
+		$this->inputInterface = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$this->outputInterface = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+		$this->userInterface = $this->getMock('\OCP\UserInterface');
+
+		$outputFormaterInterface = $this->getMock('Symfony\Component\Console\Formatter\OutputFormatterInterface');
+		$this->outputInterface->expects($this->any())->method('getFormatter')
+			->willReturn($outputFormaterInterface);
+
+		$this->changeKeyStorageRoot = new ChangeKeyStorageRoot(
+			$this->view,
+			$this->userManager,
+			$this->config,
+			$this->util,
+			$this->questionHelper
+		);
+
+	}
+
+	/**
+	 * @dataProvider dataTestExecute
+	 */
+	public function testExecute($newRoot, $answer, $successMoveKey) {
+
+		$changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot')
+			->setConstructorArgs(
+				[
+					$this->view,
+					$this->userManager,
+					$this->config,
+					$this->util,
+					$this->questionHelper
+				]
+			)->setMethods(['moveAllKeys'])->getMock();
+
+		$this->util->expects($this->once())->method('getKeyStorageRoot')
+			->willReturn('');
+		$this->inputInterface->expects($this->once())->method('getArgument')
+			->with('newRoot')->willReturn($newRoot);
+
+		if ($answer === true || $newRoot !== null) {
+			$changeKeyStorageRoot->expects($this->once())->method('moveAllKeys')
+				->willReturn($successMoveKey);
+		} else {
+			$changeKeyStorageRoot->expects($this->never())->method('moveAllKeys');
+		}
+
+		if ($successMoveKey === true) {
+			$this->util->expects($this->once())->method('setKeyStorageRoot');
+		} else {
+			$this->util->expects($this->never())->method('setKeyStorageRoot');
+		}
+
+		if ($newRoot === null) {
+			$this->questionHelper->expects($this->once())->method('ask')->willReturn($answer);
+		} else {
+			$this->questionHelper->expects($this->never())->method('ask');
+		}
+
+		$this->invokePrivate(
+			$changeKeyStorageRoot,
+			'execute',
+			[$this->inputInterface, $this->outputInterface]
+		);
+	}
+
+	public function dataTestExecute() {
+		return [
+			[null, true, true],
+			[null, true, false],
+			[null, false, null],
+			['/newRoot', null, true],
+			['/newRoot', null, false]
+		];
+	}
+
+	public function testMoveAllKeys() {
+
+		/** @var \OC\Core\Command\Encryption\ChangeKeyStorageRoot $changeKeyStorageRoot */
+		$changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot')
+			->setConstructorArgs(
+				[
+					$this->view,
+					$this->userManager,
+					$this->config,
+					$this->util,
+					$this->questionHelper
+				]
+			)->setMethods(['prepareNewRoot', 'moveSystemKeys', 'moveUserKeys'])->getMock();
+
+		$changeKeyStorageRoot->expects($this->at(0))->method('prepareNewRoot')->with('newRoot');
+		$changeKeyStorageRoot->expects($this->at(1))->method('moveSystemKeys')->with('oldRoot', 'newRoot');
+		$changeKeyStorageRoot->expects($this->at(2))->method('moveUserKeys')->with('oldRoot', 'newRoot', $this->outputInterface);
+
+		$this->invokePrivate($changeKeyStorageRoot, 'moveAllKeys', ['oldRoot', 'newRoot', $this->outputInterface]);
+
+	}
+
+	public function testPrepareNewRoot() {
+		$this->view->expects($this->once())->method('is_dir')->with('newRoot')
+			->willReturn(true);
+
+		$this->view->expects($this->once())->method('file_put_contents')
+			->with('newRoot/' . \OC\Encryption\Keys\Storage::KEY_STORAGE_MARKER,
+				'ownCloud will detect this folder as key storage root only if this file exists');
+
+		$this->invokePrivate($this->changeKeyStorageRoot, 'prepareNewRoot', ['newRoot']);
+	}
+
+	/**
+	 * @dataProvider dataTestPrepareNewRootException
+	 * @expectedException \Exception
+	 *
+	 * @param bool $dirExists
+	 * @param bool $couldCreateFile
+	 */
+	public function testPrepareNewRootException($dirExists, $couldCreateFile) {
+		$this->view->expects($this->once())->method('is_dir')->with('newRoot')
+			->willReturn($dirExists);
+		$this->view->expects($this->any())->method('file_put_contents')->willReturn($couldCreateFile);
+
+		$this->invokePrivate($this->changeKeyStorageRoot, 'prepareNewRoot', ['newRoot']);
+	}
+
+	public function dataTestPrepareNewRootException() {
+		return [
+			[true, false],
+			[false, true]
+		];
+	}
+
+	/**
+	 * @dataProvider dataTestMoveSystemKeys
+	 *
+	 * @param bool $dirExists
+	 * @param bool $targetExists
+	 * @param bool $executeRename
+	 */
+	public function testMoveSystemKeys($dirExists, $targetExists, $executeRename) {
+
+		$changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot')
+			->setConstructorArgs(
+				[
+					$this->view,
+					$this->userManager,
+					$this->config,
+					$this->util,
+					$this->questionHelper
+				]
+			)->setMethods(['targetExists'])->getMock();
+
+		$this->view->expects($this->once())->method('is_dir')
+			->with('oldRoot/files_encryption')->willReturn($dirExists);
+		$changeKeyStorageRoot->expects($this->any())->method('targetExists')
+			->with('newRoot/files_encryption')->willReturn($targetExists);
+
+		if ($executeRename) {
+			$this->view->expects($this->once())->method('rename')
+			->with('oldRoot/files_encryption', 'newRoot/files_encryption');
+		} else {
+			$this->view->expects($this->never())->method('rename');
+		}
+
+		$this->invokePrivate($changeKeyStorageRoot, 'moveSystemKeys', ['oldRoot', 'newRoot']);
+
+	}
+
+	public function dataTestMoveSystemKeys() {
+		return [
+			[true, false, true],
+			[false, true, false],
+			[true, true, false],
+			[false, false, false]
+		];
+	}
+
+
+	public function testMoveUserKeys() {
+
+		$changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot')
+			->setConstructorArgs(
+				[
+					$this->view,
+					$this->userManager,
+					$this->config,
+					$this->util,
+					$this->questionHelper
+				]
+			)->setMethods(['setupUserFS', 'moveUserEncryptionFolder'])->getMock();
+
+		$this->userManager->expects($this->once())->method('getBackends')
+			->willReturn([$this->userInterface]);
+		$this->userInterface->expects($this->once())->method('getUsers')
+			->willReturn(['user1', 'user2']);
+		$changeKeyStorageRoot->expects($this->exactly(2))->method('setupUserFS');
+		$changeKeyStorageRoot->expects($this->exactly(2))->method('moveUserEncryptionFolder');
+
+		$this->invokePrivate($changeKeyStorageRoot, 'moveUserKeys', ['oldRoot', 'newRoot', $this->outputInterface]);
+	}
+
+	/**
+	 * @dataProvider dataTestMoveUserEncryptionFolder
+	 *
+	 * @param bool $userExists
+	 * @param bool $isDir
+	 * @param bool $targetExists
+	 * @param bool $shouldRename
+	 */
+	public function testMoveUserEncryptionFolder($userExists, $isDir, $targetExists, $shouldRename) {
+
+		$changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot')
+			->setConstructorArgs(
+				[
+					$this->view,
+					$this->userManager,
+					$this->config,
+					$this->util,
+					$this->questionHelper
+				]
+			)->setMethods(['targetExists', 'prepareParentFolder'])->getMock();
+
+		$this->userManager->expects($this->once())->method('userExists')
+			->willReturn($userExists);
+		$this->view->expects($this->any())->method('is_dir')
+			->willReturn($isDir);
+		$changeKeyStorageRoot->expects($this->any())->method('targetExists')
+			->willReturn($targetExists);
+
+		if ($shouldRename) {
+			$changeKeyStorageRoot->expects($this->once())->method('prepareParentFolder')
+				->with('newRoot/user1');
+			$this->view->expects($this->once())->method('rename')
+				->with('oldRoot/user1/files_encryption', 'newRoot/user1/files_encryption');
+		} else {
+			$changeKeyStorageRoot->expects($this->never())->method('prepareParentFolder');
+			$this->view->expects($this->never())->method('rename');
+		}
+
+		$this->invokePrivate($changeKeyStorageRoot, 'moveUserEncryptionFolder', ['user1', 'oldRoot', 'newRoot']);
+
+	}
+
+	public function dataTestMoveUserEncryptionFolder() {
+		return [
+			[true, true, false, true],
+			[true, false, true, false],
+			[false, true, true, false],
+			[false, false, true, false],
+			[false, true, false, false],
+			[false, true, true, false],
+			[false, false, false, false]
+		];
+	}
+
+
+	/**
+	 * @dataProvider dataTestPrepareParentFolder
+	 */
+	public function testPrepareParentFolder($path, $pathExists) {
+		$this->view->expects($this->any())->method('file_exists')
+			->willReturnCallback(
+				function($fileExistsPath) use ($path, $pathExists) {
+					if ($path === $fileExistsPath) {
+						return $pathExists;
+					}
+					return false;
+				}
+			);
+
+		if ($pathExists === false) {
+			$subDirs = explode('/', ltrim($path, '/'));
+			$this->view->expects($this->exactly(count($subDirs)))->method('mkdir');
+		} else {
+			$this->view->expects($this->never())->method('mkdir');
+		}
+
+		$this->invokePrivate(
+			$this->changeKeyStorageRoot,
+			'prepareParentFolder',
+			[$path]
+		);
+	}
+
+	public function dataTestPrepareParentFolder() {
+		return [
+			['/user/folder/sub_folder/keystorage', true],
+			['/user/folder/sub_folder/keystorage', false]
+		];
+	}
+
+	public function testTargetExists() {
+		$this->view->expects($this->once())->method('file_exists')->with('path')
+			->willReturn(false);
+
+		$this->assertFalse(
+			$this->invokePrivate($this->changeKeyStorageRoot, 'targetExists', ['path'])
+		);
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testTargetExistsException() {
+		$this->view->expects($this->once())->method('file_exists')->with('path')
+			->willReturn(true);
+
+		$this->invokePrivate($this->changeKeyStorageRoot, 'targetExists', ['path']);
+	}
+
+}
diff --git a/tests/lib/encryption/keys/storage.php b/tests/lib/encryption/keys/storage.php
index 2f3aa3527b9..b5b91f886a3 100644
--- a/tests/lib/encryption/keys/storage.php
+++ b/tests/lib/encryption/keys/storage.php
@@ -37,6 +37,9 @@ class StorageTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	protected $view;
 
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $config;
+
 	public function setUp() {
 		parent::setUp();
 
@@ -48,6 +51,10 @@ class StorageTest extends TestCase {
 			->disableOriginalConstructor()
 			->getMock();
 
+		$this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+
 		$this->storage = new Storage($this->view, $this->util);
 	}
 
@@ -88,7 +95,7 @@ class StorageTest extends TestCase {
 	 * @param bool $originalKeyExists
 	 * @param string $expectedKeyContent
 	 */
-	public function testGetFileKey2($path, $strippedPartialName, $originalKeyExists, $expectedKeyContent) {
+	public function testGetFileKey($path, $strippedPartialName, $originalKeyExists, $expectedKeyContent) {
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
 			->willReturnMap([
@@ -414,9 +421,12 @@ class StorageTest extends TestCase {
 	 *
 	 * @param string $path
 	 * @param boolean $systemWideMountPoint
+	 * @param string $storageRoot
 	 * @param string $expected
 	 */
-	public function testGetPathToKeys($path, $systemWideMountPoint, $expected) {
+	public function testGetPathToKeys($path, $systemWideMountPoint, $storageRoot, $expected) {
+
+		$this->invokePrivate($this->storage, 'root_dir', [$storageRoot]);
 
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
@@ -431,10 +441,12 @@ class StorageTest extends TestCase {
 	}
 
 	public function dataTestGetPathToKeys() {
-		return array(
-			array('/user1/files/source.txt', false, '/user1/files_encryption/keys/files/source.txt/'),
-			array('/user1/files/source.txt', true, '/files_encryption/keys/files/source.txt/')
-		);
+		return [
+			['/user1/files/source.txt', false, '', '/user1/files_encryption/keys/files/source.txt/'],
+			['/user1/files/source.txt', true, '', '/files_encryption/keys/files/source.txt/'],
+			['/user1/files/source.txt', false, 'storageRoot', '/storageRoot/user1/files_encryption/keys/files/source.txt/'],
+			['/user1/files/source.txt', true, 'storageRoot', '/storageRoot/files_encryption/keys/files/source.txt/'],
+		];
 	}
 
 	public function testKeySetPreparation() {
@@ -463,4 +475,39 @@ class StorageTest extends TestCase {
 		$this->assertSame($expected, $args[0]);
 	}
 
+	/**
+	 * @dataProvider dataTestGetFileKeyDir
+	 *
+	 * @param bool $isSystemWideMountPoint
+	 * @param string $storageRoot
+	 * @param string $expected
+	 */
+	public function testGetFileKeyDir($isSystemWideMountPoint, $storageRoot, $expected) {
+
+		$path = '/user1/files/foo/bar.txt';
+		$owner = 'user1';
+		$relativePath = '/foo/bar.txt';
+
+		$this->invokePrivate($this->storage, 'root_dir', [$storageRoot]);
+
+		$this->util->expects($this->once())->method('isSystemWideMountPoint')
+			->willReturn($isSystemWideMountPoint);
+		$this->util->expects($this->once())->method('getUidAndFilename')
+			->with($path)->willReturn([$owner, $relativePath]);
+
+		$this->assertSame($expected,
+			$this->invokePrivate($this->storage, 'getFileKeyDir', ['OC_DEFAULT_MODULE', $path])
+		);
+
+	}
+
+	public function dataTestGetFileKeyDir() {
+		return [
+			[false, '', '/user1/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+			[true, '', '/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+			[false, 'newStorageRoot', '/newStorageRoot/user1/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+			[true, 'newStorageRoot', '/newStorageRoot/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+		];
+	}
+
 }
diff --git a/tests/lib/encryption/managertest.php b/tests/lib/encryption/managertest.php
index 9af7bc2c134..6355c706b61 100644
--- a/tests/lib/encryption/managertest.php
+++ b/tests/lib/encryption/managertest.php
@@ -19,12 +19,20 @@ class ManagerTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	private $l10n;
 
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	private $view;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	private $util;
+
 	public function setUp() {
 		parent::setUp();
 		$this->config = $this->getMock('\OCP\IConfig');
 		$this->logger = $this->getMock('\OCP\ILogger');
 		$this->l10n = $this->getMock('\OCP\Il10n');
-		$this->manager = new Manager($this->config, $this->logger, $this->l10n);
+		$this->view = $this->getMock('\OC\Files\View');
+		$this->util = $this->getMockBuilder('\OC\Encryption\Util')->disableOriginalConstructor()->getMock();
+		$this->manager = new Manager($this->config, $this->logger, $this->l10n, $this->view, $this->util);
 	}
 
 	public function testManagerIsDisabled() {
diff --git a/tests/lib/encryption/utiltest.php b/tests/lib/encryption/utiltest.php
index 5aadb4e857f..449326bb351 100644
--- a/tests/lib/encryption/utiltest.php
+++ b/tests/lib/encryption/utiltest.php
@@ -109,7 +109,11 @@ class UtilTest extends TestCase {
 	/**
 	 * @dataProvider providePathsForTestIsExcluded
 	 */
-	public function testIsExcluded($path, $expected) {
+	public function testIsExcluded($path, $keyStorageRoot, $expected) {
+		$this->config->expects($this->once())
+			->method('getAppValue')
+			->with('core', 'encryption_key_storage_root', '')
+			->willReturn($keyStorageRoot);
 		$this->userManager
 			->expects($this->any())
 			->method('userExists')
@@ -122,11 +126,14 @@ class UtilTest extends TestCase {
 
 	public function providePathsForTestIsExcluded() {
 		return array(
-			array('/files_encryption', true),
-			array('files_encryption/foo.txt', true),
-			array('test/foo.txt', false),
-			array('/user1/files_encryption/foo.txt', true),
-			array('/user1/files/foo.txt', false),
+			array('/files_encryption', '', true),
+			array('files_encryption/foo.txt', '', true),
+			array('test/foo.txt', '', false),
+			array('/user1/files_encryption/foo.txt', '', true),
+			array('/user1/files/foo.txt', '', false),
+			array('/keyStorage/user1/files/foo.txt', 'keyStorage', true),
+			array('/keyStorage/files_encryption', '/keyStorage', true),
+			array('keyStorage/user1/files_encryption', '/keyStorage/', true),
 
 		);
 	}
-- 
GitLab


From 37513f9411035f6edcb78f9f89ceb4f8433f0aa5 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 6 Aug 2015 16:51:31 +0200
Subject: [PATCH 099/783] don't read certificates if ownCloud is not installed

---
 lib/private/security/certificatemanager.php | 15 ++++++++++++++-
 lib/private/server.php                      |  4 ++--
 lib/private/util.php                        |  1 +
 tests/lib/security/certificatemanager.php   |  6 +++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/lib/private/security/certificatemanager.php b/lib/private/security/certificatemanager.php
index d61c7f29327..4d470f69a66 100644
--- a/lib/private/security/certificatemanager.php
+++ b/lib/private/security/certificatemanager.php
@@ -27,6 +27,7 @@ namespace OC\Security;
 
 use OC\Files\Filesystem;
 use OCP\ICertificateManager;
+use OCP\IConfig;
 
 /**
  * Manage trusted certificates for users
@@ -42,13 +43,20 @@ class CertificateManager implements ICertificateManager {
 	 */
 	protected $view;
 
+	/**
+	 * @var IConfig
+	 */
+	protected $config;
+
 	/**
 	 * @param string $uid
 	 * @param \OC\Files\View $view relative zu data/
+	 * @param IConfig $config
 	 */
-	public function __construct($uid, \OC\Files\View $view) {
+	public function __construct($uid, \OC\Files\View $view, IConfig $config) {
 		$this->uid = $uid;
 		$this->view = $view;
+		$this->config = $config;
 	}
 
 	/**
@@ -57,6 +65,11 @@ class CertificateManager implements ICertificateManager {
 	 * @return \OCP\ICertificate[]
 	 */
 	public function listCertificates() {
+
+		if (!$this->config->getSystemValue('installed', false)) {
+			return array();
+		}
+
 		$path = $this->getPathToCertificates() . 'uploads/';
 		if (!$this->view->is_dir($path)) {
 			return array();
diff --git a/lib/private/server.php b/lib/private/server.php
index 6aab3d26df4..a741f33eb3d 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -339,7 +339,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			$uid = $user ? $user : null;
 			return new ClientService(
 				$c->getConfig(),
-				new \OC\Security\CertificateManager($uid, new View())
+				new \OC\Security\CertificateManager($uid, new View(), $c->getConfig())
 			);
 		});
 		$this->registerService('EventLogger', function (Server $c) {
@@ -852,7 +852,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			}
 			$userId = $user->getUID();
 		}
-		return new CertificateManager($userId, new View());
+		return new CertificateManager($userId, new View(), $this->getConfig());
 	}
 
 	/**
diff --git a/lib/private/util.php b/lib/private/util.php
index edd375b5c36..0fda55496dc 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1145,6 +1145,7 @@ class OC_Util {
 	 * @throws \OC\HintException If the test file can't get written.
 	 */
 	public function isHtaccessWorking(\OCP\IConfig $config) {
+
 		if (\OC::$CLI || !$config->getSystemValue('check_for_working_htaccess', true)) {
 			return true;
 		}
diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/certificatemanager.php
index fab1c208443..092f9efdd18 100644
--- a/tests/lib/security/certificatemanager.php
+++ b/tests/lib/security/certificatemanager.php
@@ -26,7 +26,11 @@ class CertificateManagerTest extends \Test\TestCase {
 		\OC\Files\Filesystem::tearDown();
 		\OC_Util::setupFS($this->username);
 
-		$this->certificateManager = new CertificateManager($this->username, new \OC\Files\View());
+		$config = $this->getMock('OCP\IConfig');
+		$config->expects($this->any())->method('getSystemValue')
+			->with('installed', false)->willReturn(true);
+
+		$this->certificateManager = new CertificateManager($this->username, new \OC\Files\View(), $config);
 	}
 
 	protected function tearDown() {
-- 
GitLab


From 5d1fb8cb1191a278402e6c37959f4e0ac45c515b Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Sun, 30 Aug 2015 20:47:22 +0200
Subject: [PATCH 100/783] Introduce small line for navigation sidebar

---
 apps/files/css/files.css | 1 +
 core/css/apps.css        | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index a9c85127c66..375666141ba 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -137,6 +137,7 @@
 	bottom: 44px;
 	width: inherit !important;
 	background-color: #fff;
+	border-right: 1px solid #eee;
 }
 /* double padding to account for Deleted files entry, issue with Firefox */
 .app-files #app-navigation > ul li:nth-last-child(2) {
diff --git a/core/css/apps.css b/core/css/apps.css
index 846eba8e4bf..4118e6ea668 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -28,6 +28,7 @@
 	-moz-user-select: none;
 	-ms-user-select: none;
 	user-select: none;
+	border-right: 1px solid #eee;
 }
 #app-navigation > ul {
 	position: relative;
@@ -482,6 +483,10 @@
 	max-height: 300px;
 	overflow-y: auto;
 }
+#app-settings-content,
+#app-settings-header {
+	border-right: 1px solid #eee;
+}
 
 /* display input fields at full width */
 #app-settings-content input[type='text'] {
-- 
GitLab


From c6053daf43397e39fb6e15317f1539a51a223e83 Mon Sep 17 00:00:00 2001
From: Raghu Nayyar <hey@raghunayyar.com>
Date: Mon, 31 Aug 2015 00:14:07 +0200
Subject: [PATCH 101/783] Fixes failing tests

---
 apps/files/tests/js/mainfileinfodetailviewSpec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/files/tests/js/mainfileinfodetailviewSpec.js b/apps/files/tests/js/mainfileinfodetailviewSpec.js
index 582824585b5..3d78312c86e 100644
--- a/apps/files/tests/js/mainfileinfodetailviewSpec.js
+++ b/apps/files/tests/js/mainfileinfodetailviewSpec.js
@@ -55,8 +55,8 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 			var clock = sinon.useFakeTimers(Date.UTC(2015, 6, 17, 1, 2, 0, 3));
 			var dateExpected = OC.Util.formatDate(Date(Date.UTC(2015, 6, 17, 1, 2, 0, 0)));
 			view.setFileInfo(testFileInfo);
-			expect(view.$el.find('.fileName').text()).toEqual('One.txt');
-			expect(view.$el.find('.fileName').attr('title')).toEqual('One.txt');
+			expect(view.$el.find('.fileName h3').text()).toEqual('One.txt');
+			expect(view.$el.find('.fileName h3').attr('title')).toEqual('One.txt');
 			expect(view.$el.find('.size').text()).toEqual('117.7 MB');
 			expect(view.$el.find('.size').attr('title')).toEqual('123456789 bytes');
 			expect(view.$el.find('.date').text()).toEqual('a few seconds ago');
@@ -110,8 +110,8 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 			testFileInfo.set('displayName', 'hello.txt');
 			view.setFileInfo(testFileInfo);
 
-			expect(view.$el.find('.fileName').text()).toEqual('hello.txt');
-			expect(view.$el.find('.fileName').attr('title')).toEqual('hello.txt');
+			expect(view.$el.find('.fileName h3').text()).toEqual('hello.txt');
+			expect(view.$el.find('.fileName h3').attr('title')).toEqual('hello.txt');
 		});
 		it('rerenders when changes are made on the model', function() {
 			view.setFileInfo(testFileInfo);
-- 
GitLab


From a0dfaf9be36d35192cb797489740ec1008258e64 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Sat, 29 Aug 2015 17:36:21 +0100
Subject: [PATCH 102/783] Clean up TempManager to follow code guidelines

tmpBaseDir can be overridden for unit testing purposes
---
 lib/private/server.php      |   5 +-
 lib/private/tempmanager.php | 104 ++++++++++++++++++++++--------------
 lib/public/itempmanager.php |   8 +++
 tests/lib/tempmanager.php   |  17 ++++--
 4 files changed, 91 insertions(+), 43 deletions(-)

diff --git a/lib/private/server.php b/lib/private/server.php
index 229fae843cc..518b0cb2d92 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -344,7 +344,10 @@ class Server extends SimpleContainer implements IServerContainer {
 			}
 		});
 		$this->registerService('TempManager', function (Server $c) {
-			return new TempManager($c->getLogger());
+			return new TempManager(
+				$c->getLogger(),
+				$c->getConfig()
+			);
 		});
 		$this->registerService('AppManager', function(Server $c) {
 			return new \OC\App\AppManager(
diff --git a/lib/private/tempmanager.php b/lib/private/tempmanager.php
index b1b98751607..cc7c51d8568 100644
--- a/lib/private/tempmanager.php
+++ b/lib/private/tempmanager.php
@@ -25,6 +25,7 @@
 namespace OC;
 
 use OCP\ILogger;
+use OCP\IConfig;
 use OCP\ITempManager;
 
 class TempManager implements ITempManager {
@@ -34,15 +35,20 @@ class TempManager implements ITempManager {
 	protected $tmpBaseDir;
 	/** @var ILogger */
 	protected $log;
+	/** @var IConfig */
+	protected $config;
+
 	/** Prefix */
 	const TMP_PREFIX = 'oc_tmp_';
 
 	/**
 	 * @param \OCP\ILogger $logger
+	 * @param \OCP\IConfig $config
 	 */
-	public function __construct(ILogger $logger) {
-		$this->tmpBaseDir = $this->t_get_temp_dir();
+	public function __construct(ILogger $logger, IConfig $config) {
 		$this->log = $logger;
+		$this->config = $config;
+		$this->tmpBaseDir = $this->getTempBaseDir();
 	}
 
 	/**
@@ -191,57 +197,77 @@ class TempManager implements ITempManager {
 	}
 
 	/**
-	 * Get the temporary directory to store transfer data
-	 * @return null|string Path to the temporary directory or null
+	 * Get the temporary base directory configured on the server
+	 *
+	 * @return string Path to the temporary directory or null
+	 * @throws \UnexpectedValueException
 	 */
-	public function t_get_temp_dir() {
-		// Get the temporary directory and log the path if loglevel is set to debug
-		// Info: based on the temp dir, further directories may be created unique to the instance
-		$temp = self::gather_temp_dir();
-		\OCP\Util::writeLog('Core', 'Temporary directory set to: ' . ($temp ? $temp : 'NULL'), \OCP\Util::DEBUG);
-		return $temp;
-	}
+	public function getTempBaseDir() {
+		if ($this->tmpBaseDir) {
+			return $this->tmpBaseDir;
+		}
 
-	/**
-	 * Get a temporary directory from possible sources
-	 * If a temporary directory is set in config.php, use this one
-	 * @return null|string Path to the temporary directory or null
-	 */
-	private function gather_temp_dir() {
-		if ($temp = self::get_config_temp_dir()) return $temp;
-		if ($temp = ini_get('upload_tmp_dir')) return $temp;
-		if ($temp = getenv('TMP')) return $temp;
-		if ($temp = getenv('TEMP')) return $temp;
-		if ($temp = getenv('TMPDIR')) return $temp;
+		$directories = [];
+		if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
+			$directories[] = $temp;
+		}
+		if ($temp = ini_get('upload_tmp_dir')) {
+			$directories[] = $temp;
+		}
+		if ($temp = getenv('TMP')) {
+			$directories[] = $temp;
+		}
+		if ($temp = getenv('TEMP')) {
+			$directories[] = $temp;
+		}
+		if ($temp = getenv('TMPDIR')) {
+			$directories[] = $temp;
+		}
 		$temp = tempnam(__FILE__, '');
 		if (file_exists($temp)) {
 			unlink($temp);
-			return dirname($temp);
+			$directories[] = dirname($temp);
 		}
-		if ($temp = sys_get_temp_dir()) return $temp;
-		return null;
+		if ($temp = sys_get_temp_dir()) {
+			$directories[] = $temp;
+		}
+
+		foreach ($directories as $dir) {
+			if ($this->checkTemporaryDirectory($dir)) {
+				return $dir;
+			}
+		}
+		throw new \UnexpectedValueException('Unable to detect system temporary directory');
 	}
 
 	/**
-	 * Check if the temporary directory is defined in config.php and is present and writable
-	 * @return bool|string Path to the temporary directory or false
+	 * Check if a temporary directory is ready for use
+	 *
+	 * @param mixed $directory
+	 * @return bool
 	 */
-	private function get_config_temp_dir() {
-		$temp = \OC::$server->getConfig()->getSystemValue('tempdirectory', false);
+	private function checkTemporaryDirectory($directory) {
 		// surpress any possible errors caused by is_writable
 		// checks missing or invalid path or characters, wrong permissions ect
-		if ($temp) {
-			try {
-				if (is_writeable($temp)) {
-					return $temp;
-				} else {
-					\OCP\Util::writeLog('Core', 'Manually set temporary directory in config.php is not present or writable: ' . $temp, \OCP\Util::WARN);
-					return false;
-				}
-			} catch (Exception $e) {
-				return false;
+		try {
+			if (is_writeable($directory)) {
+				return true;
 			}
+		} catch (Exception $e) {
 		}
+		$this->log->warning('Temporary directory {dir} is not present or writable',
+			['dir' => $directory]
+		);
+		return false;
+	}
+
+	/**
+	 * Override the temporary base directory
+	 *
+	 * @param string $directory
+	 */
+	public function overrideTempBaseDir($directory) {
+		$this->tmpBaseDir = $directory;
 	}
 
 }
diff --git a/lib/public/itempmanager.php b/lib/public/itempmanager.php
index 7ba5b1e7bff..6364fa71913 100644
--- a/lib/public/itempmanager.php
+++ b/lib/public/itempmanager.php
@@ -58,4 +58,12 @@ interface ITempManager {
 	 * @since 8.0.0
 	 */
 	public function cleanOld();
+
+	/**
+	 * Get the temporary base directory
+	 *
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getTempBaseDir();
 }
diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php
index 89625ac62f2..04e14c335bd 100644
--- a/tests/lib/tempmanager.php
+++ b/tests/lib/tempmanager.php
@@ -23,10 +23,12 @@ class NullLogger extends Log {
 
 class TempManager extends \Test\TestCase {
 
+	protected $baseDir = null;
+
 	protected function setUp() {
 		parent::setUp();
 
-		$this->baseDir = $this->getManager()->t_get_temp_dir() . $this->getUniqueID('/oc_tmp_test');
+		$this->baseDir = $this->getManager()->getTempBaseDir() . $this->getUniqueID('/oc_tmp_test');
 		if (!is_dir($this->baseDir)) {
 			mkdir($this->baseDir);
 		}
@@ -34,18 +36,27 @@ class TempManager extends \Test\TestCase {
 
 	protected function tearDown() {
 		\OC_Helper::rmdirr($this->baseDir);
+		$this->baseDir = null;
 		parent::tearDown();
 	}
 
 	/**
 	 * @param  \OCP\ILogger $logger
+	 * @param  \OCP\IConfig $config
 	 * @return \OC\TempManager
 	 */
-	protected function getManager($logger = null) {
+	protected function getManager($logger = null, $config = null) {
 		if (!$logger) {
 			$logger = new NullLogger();
 		}
-		return new \OC\TempManager($logger);
+		if (!$config) {
+			$config = \OC::$server->getConfig();
+		}
+		$manager = new \OC\TempManager($logger, $config);
+		if ($this->baseDir) {
+			$manager->overrideTempBaseDir($this->baseDir);
+		}
+		return $manager;
 	}
 
 	public function testGetFile() {
-- 
GitLab


From 5a1619d80d1d0c80cc668a31526474c39bba0619 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Sat, 29 Aug 2015 17:42:20 +0100
Subject: [PATCH 103/783] Unit test getting temp dir from config

---
 tests/lib/tempmanager.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php
index 04e14c335bd..8faf804a203 100644
--- a/tests/lib/tempmanager.php
+++ b/tests/lib/tempmanager.php
@@ -50,7 +50,10 @@ class TempManager extends \Test\TestCase {
 			$logger = new NullLogger();
 		}
 		if (!$config) {
-			$config = \OC::$server->getConfig();
+			$config = $this->getMock('\OCP\IConfig');
+			$config->method('getSystemValue')
+				->with('tempdirectory', null)
+				->willReturn('/tmp');
 		}
 		$manager = new \OC\TempManager($logger, $config);
 		if ($this->baseDir) {
@@ -195,4 +198,19 @@ class TempManager extends \Test\TestCase {
 		$this->assertStringEndsNotWith('./Traversal\\../FileName', $tmpManager);
 		$this->assertStringEndsWith('.Traversal..FileName', $tmpManager);
 	}
+
+	public function testGetTempBaseDirFromConfig() {
+		$dir = $this->getManager()->getTemporaryFolder();
+
+		$config = $this->getMock('\OCP\IConfig');
+		$config->expects($this->once())
+			->method('getSystemValue')
+			->with('tempdirectory', null)
+			->willReturn($dir);
+
+		$this->baseDir = null; // prevent override
+		$tmpManager = $this->getManager(null, $config);
+
+		$this->assertEquals($dir, $tmpManager->getTempBaseDir());
+	}
 }
-- 
GitLab


From e60c4bada151d9c3e0e3ebadf25b1c7d15a88aef Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Sat, 29 Aug 2015 15:46:10 +0100
Subject: [PATCH 104/783] Decode request content only on getContent

---
 lib/private/appframework/http/request.php | 83 +++++++++++++----------
 1 file changed, 49 insertions(+), 34 deletions(-)

diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index a2109439177..b430673f9a9 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -9,6 +9,7 @@
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Vincent Petry <pvince81@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
@@ -71,6 +72,9 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 	/** @var ICrypto */
 	protected $crypto;
 
+	/** @var bool */
+	protected $contentDecoded = false;
+
 	/**
 	 * @param array $vars An associative array with the following optional values:
 	 *        - array 'urlParams' the parameters which were matched from the URL
@@ -109,27 +113,6 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 				: array();
 		}
 
-		// 'application/json' must be decoded manually.
-		if (strpos($this->getHeader('Content-Type'), 'application/json') !== false) {
-			$params = json_decode(file_get_contents($this->inputStream), true);
-			if(count($params) > 0) {
-				$this->items['params'] = $params;
-				if($vars['method'] === 'POST') {
-					$this->items['post'] = $params;
-				}
-			}
-		// Handle application/x-www-form-urlencoded for methods other than GET
-		// or post correctly
-		} elseif($vars['method'] !== 'GET'
-				&& $vars['method'] !== 'POST'
-				&& strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') !== false) {
-
-			parse_str(file_get_contents($this->inputStream), $params);
-			if(is_array($params)) {
-				$this->items['params'] = $params;
-			}
-		}
-
 		$this->items['parameters'] = array_merge(
 			$this->items['get'],
 			$this->items['post'],
@@ -237,24 +220,19 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 				if($this->method !== strtoupper($name)) {
 					throw new \LogicException(sprintf('%s cannot be accessed in a %s request.', $name, $this->method));
 				}
+				return $this->getContent();
 			case 'files':
 			case 'server':
 			case 'env':
 			case 'cookies':
-			case 'parameters':
-			case 'params':
 			case 'urlParams':
-				if(in_array($name, array('put', 'patch'))) {
-					return $this->getContent();
-				} else {
-					return isset($this->items[$name])
-						? $this->items[$name]
-						: null;
-				}
-				break;
 			case 'method':
-				return $this->items['method'];
-				break;
+				return isset($this->items[$name])
+					? $this->items[$name]
+					: null;
+			case 'parameters':
+			case 'params':
+				return $this->getContent();
 			default;
 				return isset($this[$name])
 					? $this[$name]
@@ -396,10 +374,47 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 			$this->content = false;
 			return fopen($this->inputStream, 'rb');
 		} else {
-			return $this->parameters;
+			$this->decodeContent();
+			return $this->items['parameters'];
 		}
 	}
 
+	/**
+	 * Attempt to decode the content and populate parameters
+	 */
+	protected function decodeContent() {
+		if ($this->contentDecoded) {
+			return;
+		}
+		$params = [];
+
+		// 'application/json' must be decoded manually.
+		if (strpos($this->getHeader('Content-Type'), 'application/json') !== false) {
+			$params = json_decode(file_get_contents($this->inputStream), true);
+			if(count($params) > 0) {
+				$this->items['params'] = $params;
+				if($this->method === 'POST') {
+					$this->items['post'] = $params;
+				}
+			}
+
+		// Handle application/x-www-form-urlencoded for methods other than GET
+		// or post correctly
+		} elseif($this->method !== 'GET'
+				&& $this->method !== 'POST'
+				&& strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') !== false) {
+
+			parse_str(file_get_contents($this->inputStream), $params);
+			if(is_array($params)) {
+				$this->items['params'] = $params;
+			}
+		}
+
+		$this->items['parameters'] = array_merge($this->items['parameters'], $params);
+		$this->contentDecoded = true;
+	}
+
+
 	/**
 	 * Checks if the CSRF check was correct
 	 * @return bool true if CSRF check passed
-- 
GitLab


From 74c3ef95083863925f28e724e097f7516d1eb7ed Mon Sep 17 00:00:00 2001
From: fuhaoshih <fuhaoshih@gmail.com>
Date: Mon, 31 Aug 2015 12:55:20 +0800
Subject: [PATCH 105/783] Update apps.css

Scroll more smoothly for Webkit browser(mobile).
---
 core/css/apps.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/css/apps.css b/core/css/apps.css
index 4118e6ea668..5396b8ba466 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -417,6 +417,7 @@
 	position: relative;
 	height: 100%;
 	overflow-y: auto;
+	-webkit-overflow-scrolling: touch;
 }
 
 #app-content-wrapper {
-- 
GitLab


From 65784227d6460a9464b287cc698d3e0a54f6d0d3 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 31 Aug 2015 01:54:45 -0400
Subject: [PATCH 106/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/el.js       | 3 +++
 apps/encryption/l10n/el.json     | 3 +++
 apps/encryption/l10n/nl.js       | 3 +++
 apps/encryption/l10n/nl.json     | 3 +++
 apps/files_external/l10n/it.js   | 1 +
 apps/files_external/l10n/it.json | 1 +
 apps/files_external/l10n/nl.js   | 8 ++++++++
 apps/files_external/l10n/nl.json | 8 ++++++++
 8 files changed, 30 insertions(+)

diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js
index 1c9178831b6..d27098ddb04 100644
--- a/apps/encryption/l10n/el.js
+++ b/apps/encryption/l10n/el.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
     "Encryption App is enabled and ready" : "Η Εφαρμογή Κρυπτογράφησης είναι ενεργοποιημένη και έτοιμη.",
+    "one-time password for server-side-encryption" : "κωδικός μιας χρήσης για κρυπτογράφηση στο διακομιστή",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Αδυναμία ανάγνωσης αυτού του αρχείου, πιθανό να είναι διαμοιραζόμενο αρχείο. Παρακαλώ ρωτήστε τον κάτοχο του αρχείου να το διαμοιράσει ξανά μαζί σας.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Χαίρετε,\n\nο διαχειριστής ενεργοποίηση την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό '%s'.\n\nΠαρακαλούμε συνδεθείτε στη διεπαφή ιστού, πηγαίνετε στην ενότητα 'μονάδα βασικής κρυπτογράφησης ownCloud' στις προσωπικές σας ρυθμίσεις και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο 'παλιός κωδικός σύνδεσης' και τον τωρινό σας κωδικό σύνδεσης.\n",
     "The share will expire on %s." : "Ο διαμοιρασμός θα λήξει σε %s.",
     "Cheers!" : "Χαιρετισμούς!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Χαίρετε,<br><br>ο διαχειριστής ενεργοποίησε την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό <strong>%s</strong>.<br><br>Παρακαλούμε συνδεθείτε στη διεπαφή ιστού, πηγαίνετε στην ενότητα \"μονάδα βασικής κρυπτογράφησης ownCloud\" τωνπ ροσωπικών σας ρυθμίσεων και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο \"παλιός κωδικός σύνδεσης\" και τον τωρινό σας κωδικό σύνδεσης.",
     "Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης",
     "Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.",
diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json
index 1fdf329d852..3ed5e39b7c0 100644
--- a/apps/encryption/l10n/el.json
+++ b/apps/encryption/l10n/el.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
     "Encryption App is enabled and ready" : "Η Εφαρμογή Κρυπτογράφησης είναι ενεργοποιημένη και έτοιμη.",
+    "one-time password for server-side-encryption" : "κωδικός μιας χρήσης για κρυπτογράφηση στο διακομιστή",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Αδυναμία ανάγνωσης αυτού του αρχείου, πιθανό να είναι διαμοιραζόμενο αρχείο. Παρακαλώ ρωτήστε τον κάτοχο του αρχείου να το διαμοιράσει ξανά μαζί σας.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Χαίρετε,\n\nο διαχειριστής ενεργοποίηση την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό '%s'.\n\nΠαρακαλούμε συνδεθείτε στη διεπαφή ιστού, πηγαίνετε στην ενότητα 'μονάδα βασικής κρυπτογράφησης ownCloud' στις προσωπικές σας ρυθμίσεις και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο 'παλιός κωδικός σύνδεσης' και τον τωρινό σας κωδικό σύνδεσης.\n",
     "The share will expire on %s." : "Ο διαμοιρασμός θα λήξει σε %s.",
     "Cheers!" : "Χαιρετισμούς!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Χαίρετε,<br><br>ο διαχειριστής ενεργοποίησε την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό <strong>%s</strong>.<br><br>Παρακαλούμε συνδεθείτε στη διεπαφή ιστού, πηγαίνετε στην ενότητα \"μονάδα βασικής κρυπτογράφησης ownCloud\" τωνπ ροσωπικών σας ρυθμίσεων και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο \"παλιός κωδικός σύνδεσης\" και τον τωρινό σας κωδικό σύνδεσης.",
     "Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης",
     "Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.",
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
index ec7da324218..0655b6d29bd 100644
--- a/apps/encryption/l10n/nl.js
+++ b/apps/encryption/l10n/nl.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
     "Encryption App is enabled and ready" : "Encryptie app is geactiveerd en gereed",
+    "one-time password for server-side-encryption" : "eenmalig wachtwoord voor server-side versleuteling",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met u te delen.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hallo daar,\n\nde beheerder heeft server-side versleuteling ingeschakeld. Uw bestanden werden versleuteld met het wachtwoord '%s'.\n\nLogin op de webinterface, ga naar 'ownCloud basis cryptomodule' in uw persoonlijke instellingen en pas uw cryptowachtwoord aan door dit wachtwoord in het 'oude inlog wachtwoord' veld in te vullen alsmede in uw huidige inlogwachtwoord.\n",
     "The share will expire on %s." : "De share vervalt op %s.",
     "Cheers!" : "Proficiat!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hallo daar,<br><br>de beheerder heeft server-side versleuteling ingeschakeld. Uw bestanden werden versleuteld met het wachtwoord <strong>%s</strong>.<br><br>Login op de webinterface, ga naar 'ownCloud basis cryptomodule' in uw persoonlijke instellingen en pas uw cryptowachtwoord aan door dit wachtwoord in het \"oude inlog wachtwoord\" veld in te vullen alsmede in uw huidige inlogwachtwoord.<br><br>",
     "Enable recovery key" : "Activeer herstelsleutel",
     "Disable recovery key" : "Deactiveer herstelsleutel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt om bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker zijn of haar wachtwoord vergeet.",
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
index 40ac3349e14..00f6e67822e 100644
--- a/apps/encryption/l10n/nl.json
+++ b/apps/encryption/l10n/nl.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
     "Encryption App is enabled and ready" : "Encryptie app is geactiveerd en gereed",
+    "one-time password for server-side-encryption" : "eenmalig wachtwoord voor server-side versleuteling",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met u te delen.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hallo daar,\n\nde beheerder heeft server-side versleuteling ingeschakeld. Uw bestanden werden versleuteld met het wachtwoord '%s'.\n\nLogin op de webinterface, ga naar 'ownCloud basis cryptomodule' in uw persoonlijke instellingen en pas uw cryptowachtwoord aan door dit wachtwoord in het 'oude inlog wachtwoord' veld in te vullen alsmede in uw huidige inlogwachtwoord.\n",
     "The share will expire on %s." : "De share vervalt op %s.",
     "Cheers!" : "Proficiat!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hallo daar,<br><br>de beheerder heeft server-side versleuteling ingeschakeld. Uw bestanden werden versleuteld met het wachtwoord <strong>%s</strong>.<br><br>Login op de webinterface, ga naar 'ownCloud basis cryptomodule' in uw persoonlijke instellingen en pas uw cryptowachtwoord aan door dit wachtwoord in het \"oude inlog wachtwoord\" veld in te vullen alsmede in uw huidige inlogwachtwoord.<br><br>",
     "Enable recovery key" : "Activeer herstelsleutel",
     "Disable recovery key" : "Deactiveer herstelsleutel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt om bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker zijn of haar wachtwoord vergeet.",
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index deeb824f57f..6e3596e197d 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -31,6 +31,7 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
     "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
     "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
+    "Admin-only storage backend \"%s\"" : "Motore di archiviazione per soli amministratori \"%s\"",
     "Personal" : "Personale",
     "System" : "Sistema",
     "Grant access" : "Concedi l'accesso",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index f1282447100..1c64b7dbadd 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -29,6 +29,7 @@
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
     "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
     "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
+    "Admin-only storage backend \"%s\"" : "Motore di archiviazione per soli amministratori \"%s\"",
     "Personal" : "Personale",
     "System" : "Sistema",
     "Grant access" : "Concedi l'accesso",
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index a9a66934753..d43bb0f9794 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ophalen toegangstokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Please provide a valid app key and secret." : "Geef een geldige app sleutel en geheime sleutel op.",
     "Step 1 failed. Exception: %s" : "Stap 1 is mislukt. Uitzondering: %s",
     "Step 2 failed. Exception: %s" : "Stap 2 is mislukt. Uitzondering: %s",
     "External storage" : "Externe opslag",
@@ -22,8 +25,13 @@ OC.L10N.register(
     "SFTP with secret key login" : "SFTP met geheime sleutel inlog",
     "Public key" : "Publieke sleutel",
     "Storage with id \"%i\" not found" : "Opslag met id \"%i\" niet gevonden",
+    "Invalid backend or authentication mechanism class" : "Ongeldige backend of authenticatie mechanisme klasse",
     "Invalid mount point" : "Ongeldig aankoppelpunt",
+    "Objectstore forbidden" : "Objectopslag verboden",
     "Invalid storage backend \"%s\"" : "Ongeldig opslagsysteem \"%s\"",
+    "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
+    "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
+    "Admin-only storage backend \"%s\"" : "Alleen voor beheerders opslagbackend '%s\"",
     "Personal" : "Persoonlijk",
     "System" : "Systeem",
     "Grant access" : "Sta toegang toe",
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index bd3fd953a26..b5c0bf78542 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ophalen toegangstokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Please provide a valid app key and secret." : "Geef een geldige app sleutel en geheime sleutel op.",
     "Step 1 failed. Exception: %s" : "Stap 1 is mislukt. Uitzondering: %s",
     "Step 2 failed. Exception: %s" : "Stap 2 is mislukt. Uitzondering: %s",
     "External storage" : "Externe opslag",
@@ -20,8 +23,13 @@
     "SFTP with secret key login" : "SFTP met geheime sleutel inlog",
     "Public key" : "Publieke sleutel",
     "Storage with id \"%i\" not found" : "Opslag met id \"%i\" niet gevonden",
+    "Invalid backend or authentication mechanism class" : "Ongeldige backend of authenticatie mechanisme klasse",
     "Invalid mount point" : "Ongeldig aankoppelpunt",
+    "Objectstore forbidden" : "Objectopslag verboden",
     "Invalid storage backend \"%s\"" : "Ongeldig opslagsysteem \"%s\"",
+    "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
+    "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
+    "Admin-only storage backend \"%s\"" : "Alleen voor beheerders opslagbackend '%s\"",
     "Personal" : "Persoonlijk",
     "System" : "Systeem",
     "Grant access" : "Sta toegang toe",
-- 
GitLab


From 1e2e5abe268c501c38c1d776d4cddb076ab24110 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 31 Aug 2015 13:23:23 +0100
Subject: [PATCH 107/783] Allow an empty mount point

---
 apps/files_external/service/storagesservice.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 947e544d88f..703f277d84e 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -172,7 +172,7 @@ abstract class StoragesService {
 
 					// the root mount point is in the format "/$user/files/the/mount/point"
 					// we remove the "/$user/files" prefix
-					$parts = explode('/', trim($rootMountPath, '/'), 3);
+					$parts = explode('/', ltrim($rootMountPath, '/'), 3);
 					if (count($parts) < 3) {
 						// something went wrong, skip
 						\OCP\Util::writeLog(
@@ -183,7 +183,7 @@ abstract class StoragesService {
 						continue;
 					}
 
-					$relativeMountPath = $parts[2];
+					$relativeMountPath = rtrim($parts[2], '/');
 
 					// note: we cannot do this after the loop because the decrypted config
 					// options might be needed for the config hash
-- 
GitLab


From 3b37c203193b91253f814fa76257352279f5b6f3 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 31 Aug 2015 14:31:17 +0200
Subject: [PATCH 108/783] Simplify comparison algo

---
 lib/private/updater.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/lib/private/updater.php b/lib/private/updater.php
index 0f9ecfe93de..639571e8f70 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -235,22 +235,8 @@ class Updater extends BasicEmitter {
 			return false;
 		}
 
-		$oldVersion = explode('.', $oldVersion);
-		$newVersion = explode('.', $newVersion);
-
-		while (count($oldVersion) > 2) {
-			array_pop($oldVersion);
-		}
-
-		while (count($newVersion) > 2) {
-			array_pop($newVersion);
-		}
-
-		$oldVersion = implode('.', $oldVersion);
-		$newVersion = implode('.', $newVersion);
-
 		// either we're updating from an allowed version or the current version
-		return (version_compare($allowedPreviousVersion, $oldVersion) === 0
+		return (version_compare($allowedPreviousVersion, $oldVersion, '<=')
 			|| version_compare($newVersion, $oldVersion) === 0);
 	}
 
-- 
GitLab


From d64bdc0fef896496f27c07208a9cfcc66c9ce476 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 31 Aug 2015 14:01:05 +0100
Subject: [PATCH 109/783] Unit test storages with an empty mount point

---
 .../service/globalstoragesservicetest.php     | 28 +++++++++++++++++++
 .../service/userglobalstoragesservicetest.php |  5 ++++
 2 files changed, 33 insertions(+)

diff --git a/apps/files_external/tests/service/globalstoragesservicetest.php b/apps/files_external/tests/service/globalstoragesservicetest.php
index 2bc480ca312..94c34c221fc 100644
--- a/apps/files_external/tests/service/globalstoragesservicetest.php
+++ b/apps/files_external/tests/service/globalstoragesservicetest.php
@@ -914,4 +914,32 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
 		$this->assertEquals('identifier:\Auth\Mechanism', $storage2->getAuthMechanism()->getIdentifier());
 	}
 
+	public function testReadEmptyMountPoint() {
+		$configFile = $this->dataDir . '/mount.json';
+
+		$json = [
+			'user' => [
+				'user1' => [
+					'/$user/files/' => [
+						'backend' => 'identifier:\OCA\Files_External\Lib\Backend\SFTP',
+						'authMechanism' => 'identifier:\Auth\Mechanism',
+						'options' => [],
+						'mountOptions' => [],
+					],
+				]
+			]
+		];
+
+		file_put_contents($configFile, json_encode($json));
+
+		$allStorages = $this->service->getAllStorages();
+
+		$this->assertCount(1, $allStorages);
+
+		$storage1 = $allStorages[1];
+
+		$this->assertEquals('/', $storage1->getMountPoint());
+	}
+
+
 }
diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php
index 49a02453840..b9e2c08c932 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php
@@ -212,4 +212,9 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$this->assertTrue(true);
 	}
 
+	public function testReadEmptyMountPoint() {
+		// we don't test this here
+		$this->assertTrue(true);
+	}
+
 }
-- 
GitLab


From f6b1d3506f63518da7f5df250ef95f925adfb933 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 31 Aug 2015 14:22:02 +0100
Subject: [PATCH 110/783] Allow easy XDEBUG debugging with autotest

Debugging scripts needs the environment variable XDEBUG_CONFIG to be
set, which initiates a connection to a listening debugger. But if that
env is set and one of the PHP setup steps occurs (e.g. occ install), the
debugging session is 'completed' and the debugger no longer listens
during the actual tests. This saves the XDEBUG_CONFIG env so it only
applies during the PHPUnit execution, so only the real tests trigger the
debugging.
---
 autotest-external.sh | 6 ++++++
 autotest.sh          | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/autotest-external.sh b/autotest-external.sh
index 65d53aaa95d..cb5a3dad503 100755
--- a/autotest-external.sh
+++ b/autotest-external.sh
@@ -17,6 +17,9 @@ BASEDIR=$PWD
 DBCONFIGS="sqlite mysql pgsql oci"
 PHPUNIT=$(which phpunit)
 
+_XDEBUG_CONFIG=$XDEBUG_CONFIG
+unset XDEBUG_CONFIG
+
 function print_syntax {
 	echo -e "Syntax: ./autotest-external.sh [dbconfigname] [startfile]\n" >&2
 	echo -e "\t\"dbconfigname\" can be one of: $DBCONFIGS" >&2
@@ -159,6 +162,9 @@ EOF
 	mkdir "coverage-external-html-$1"
 	# just enable files_external
 	php ../occ app:enable files_external
+	if [[ "$_XDEBUG_CONFIG" ]]; then
+		export XDEBUG_CONFIG=$_XDEBUG_CONFIG
+	fi
 	if [ -z "$NOCOVERAGE" ]; then
 		"$PHPUNIT" --configuration phpunit-autotest-external.xml --log-junit "autotest-external-results-$1.xml" --coverage-clover "autotest-external-clover-$1.xml" --coverage-html "coverage-external-html-$1"
 		RESULT=$?
diff --git a/autotest.sh b/autotest.sh
index 0e112bfda32..6a09fbfabac 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -32,6 +32,9 @@ fi
 PHP=$(which "$PHP_EXE")
 PHPUNIT=$(which phpunit)
 
+_XDEBUG_CONFIG=$XDEBUG_CONFIG
+unset XDEBUG_CONFIG
+
 function print_syntax {
 	echo -e "Syntax: ./autotest.sh [dbconfigname] [testfile]\n" >&2
 	echo -e "\t\"dbconfigname\" can be one of: $DBCONFIGS" >&2
@@ -217,6 +220,9 @@ function execute_tests {
 	rm -rf "coverage-html-$DB"
 	mkdir "coverage-html-$DB"
 	"$PHP" -f enable_all.php | grep -i -C9999 error && echo "Error during setup" && exit 101
+	if [[ "$_XDEBUG_CONFIG" ]]; then
+		export XDEBUG_CONFIG=$_XDEBUG_CONFIG
+	fi
 	if [ -z "$NOCOVERAGE" ]; then
 		"${PHPUNIT[@]}" --configuration phpunit-autotest.xml --log-junit "autotest-results-$DB.xml" --coverage-clover "autotest-clover-$DB.xml" --coverage-html "coverage-html-$DB" "$2" "$3"
 		RESULT=$?
-- 
GitLab


From 82d9829c973ee78d0389c3372c93d418afd34c54 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Sun, 30 Aug 2015 15:00:22 +0100
Subject: [PATCH 111/783] Fire event when BackendService is available

---
 apps/files_external/appinfo/application.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index 1e43c737408..aa9e4fd913e 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -50,6 +50,11 @@ class Application extends App {
 
 		$this->loadBackends();
 		$this->loadAuthMechanisms();
+
+		// app developers: do NOT depend on this! it will disappear with oC 9.0!
+		\OC::$server->getEventDispatcher()->dispatch(
+			'OCA\\Files_External::loadAdditionalBackends'
+		);
 	}
 
 	/**
-- 
GitLab


From 3142a20f25343ad3956c204559ec71850242993d Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 31 Aug 2015 15:18:26 +0100
Subject: [PATCH 112/783] Expose files_external services from Server

Not exposed to OCP yet
---
 lib/private/server.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/lib/private/server.php b/lib/private/server.php
index a741f33eb3d..acafb7b2dff 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -1035,4 +1035,36 @@ class Server extends SimpleContainer implements IServerContainer {
 	public function getSessionCryptoWrapper() {
 		return $this->query('CryptoWrapper');
 	}
+
+	/**
+	 * Not a public API as of 8.2, wait for 9.0
+	 * @return \OCA\Files_External\Service\BackendService
+	 */
+	public function getStoragesBackendService() {
+		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\BackendService');
+	}
+
+	/**
+	 * Not a public API as of 8.2, wait for 9.0
+	 * @return \OCA\Files_External\Service\GlobalStoragesService
+	 */
+	public function getGlobalStoragesService() {
+		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\GlobalStoragesService');
+	}
+
+	/**
+	 * Not a public API as of 8.2, wait for 9.0
+	 * @return \OCA\Files_External\Service\UserGlobalStoragesService
+	 */
+	public function getUserGlobalStoragesService() {
+		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
+	}
+
+	/**
+	 * Not a public API as of 8.2, wait for 9.0
+	 * @return \OCA\Files_External\Service\UserStoragesService
+	 */
+	public function getUserStoragesService() {
+		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserStoragesService');
+	}
 }
-- 
GitLab


From eef707043cf9444bfd42071a11e1748694ad0eb8 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 31 Aug 2015 17:41:20 +0200
Subject: [PATCH 113/783] add english language code translation

---
 settings/languageCodes.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index 729cc3c6af3..8c58079c2cb 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -26,6 +26,7 @@
 
 return array(
 'el'=>'Ελληνικά',
+'en'=>'English',
 'fa'=>'فارسى',
 'fi_FI'=>'Suomi',
 'hi'=>'हिन्दी',
-- 
GitLab


From 6ccbf4bce64bc7016d65f270c22f37fdbca8e21f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 31 Aug 2015 18:34:44 +0200
Subject: [PATCH 114/783] Improved update version detection logic

---
 lib/private/updater.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/private/updater.php b/lib/private/updater.php
index 639571e8f70..71e9732c307 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -230,14 +230,8 @@ class Updater extends BasicEmitter {
 	 * @return bool
 	 */
 	public function isUpgradePossible($oldVersion, $newVersion, $allowedPreviousVersion) {
-		// downgrade is never allowed
-		if (version_compare($oldVersion, $newVersion, '>')) {
-			return false;
-		}
-
-		// either we're updating from an allowed version or the current version
 		return (version_compare($allowedPreviousVersion, $oldVersion, '<=')
-			|| version_compare($newVersion, $oldVersion) === 0);
+			&& version_compare($oldVersion, $newVersion, '<='));
 	}
 
 	/**
-- 
GitLab


From f12caf930eb375ef60b741265fb331da4d615504 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 1 Sep 2015 10:40:44 +0200
Subject: [PATCH 115/783] Properly return 304

The ETag set in the IF_NONE_MODIFIED header is wraped in quotes (").
However the ETag that is set in response is not (yet). Also we need to
cast the ETag to a string.

* Added unit test
---
 lib/private/appframework/http.php        | 2 +-
 tests/lib/appframework/http/HttpTest.php | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php
index e7b0d1e2cab..dee9818f4bc 100644
--- a/lib/private/appframework/http.php
+++ b/lib/private/appframework/http.php
@@ -121,7 +121,7 @@ class Http extends BaseHttp {
 
 		// if etag or lastmodified have not changed, return a not modified
 		if ((isset($this->server['HTTP_IF_NONE_MATCH'])
-			&& trim($this->server['HTTP_IF_NONE_MATCH']) === $ETag) 
+			&& trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
 
 			||
 
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
index e9be3e73904..4bcc8305db4 100644
--- a/tests/lib/appframework/http/HttpTest.php
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -65,6 +65,14 @@ class HttpTest extends \Test\TestCase {
 	}
 
 
+	public function testQuotedEtagMatchReturnsNotModified() {
+		$http = new Http(array('HTTP_IF_NONE_MATCH' => '"hi"'));
+
+		$header = $http->getStatusHeader(Http::STATUS_OK, null, 'hi');
+		$this->assertEquals('HTTP/1.1 304 Not Modified', $header);
+	}
+
+
 	public function testLastModifiedMatchReturnsNotModified() {
 		$dateTime = new \DateTime(null, new \DateTimeZone('GMT'));
 		$dateTime->setTimestamp('12');
-- 
GitLab


From cd506f210de329853e6df625fd8c36d13f333dce Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Tue, 1 Sep 2015 10:25:33 +0100
Subject: [PATCH 116/783] Make checkDependencies a real method

Replace ->setDependencyCheck(callable) with a real method
checkDependencies(). A polyfill is available for legacy storages.
---
 apps/files_external/lib/backend/amazons3.php  |  5 +-
 apps/files_external/lib/backend/dav.php       |  4 +-
 apps/files_external/lib/backend/dropbox.php   |  5 +-
 apps/files_external/lib/backend/ftp.php       |  4 +-
 apps/files_external/lib/backend/google.php    |  5 +-
 .../lib/backend/legacybackend.php             | 21 +++++-
 apps/files_external/lib/backend/smb.php       |  4 +-
 apps/files_external/lib/dependencytrait.php   | 47 +------------
 .../lib/legacydependencycheckpolyfill.php     | 70 +++++++++++++++++++
 .../tests/backend/legacybackendtest.php       | 20 +++++-
 ... => legacydependencycheckpolyfilltest.php} | 23 +++---
 11 files changed, 144 insertions(+), 64 deletions(-)
 create mode 100644 apps/files_external/lib/legacydependencycheckpolyfill.php
 rename apps/files_external/tests/{dependencytraittest.php => legacydependencycheckpolyfilltest.php} (69%)

diff --git a/apps/files_external/lib/backend/amazons3.php b/apps/files_external/lib/backend/amazons3.php
index 880d47621f3..1cf62d7cb09 100644
--- a/apps/files_external/lib/backend/amazons3.php
+++ b/apps/files_external/lib/backend/amazons3.php
@@ -26,10 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
 use \OCA\Files_External\Lib\Auth\AmazonS3\AccessKey;
 
 class AmazonS3 extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, AccessKey $legacyAuth) {
 		$this
 			->setIdentifier('amazons3')
@@ -49,7 +53,6 @@ class AmazonS3 extends Backend {
 				(new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
 					->setType(DefinitionParameter::VALUE_BOOLEAN),
 			])
-			->setDependencyCheck('\OC\Files\Storage\AmazonS3::checkDependencies')
 			->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/dav.php b/apps/files_external/lib/backend/dav.php
index 5ae6d122588..c4f446548e1 100644
--- a/apps/files_external/lib/backend/dav.php
+++ b/apps/files_external/lib/backend/dav.php
@@ -26,11 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class DAV extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, Password $legacyAuth) {
 		$this
 			->setIdentifier('dav')
@@ -44,7 +47,6 @@ class DAV extends Backend {
 				(new DefinitionParameter('secure', $l->t('Secure https://')))
 					->setType(DefinitionParameter::VALUE_BOOLEAN),
 			])
-			->setDependencyCheck('\OC\Files\Storage\DAV::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/dropbox.php b/apps/files_external/lib/backend/dropbox.php
index bfd2e4cddc4..3e595cb0a9c 100644
--- a/apps/files_external/lib/backend/dropbox.php
+++ b/apps/files_external/lib/backend/dropbox.php
@@ -26,10 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
 use \OCA\Files_External\Lib\Auth\OAuth1\OAuth1;
 
 class Dropbox extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, OAuth1 $legacyAuth) {
 		$this
 			->setIdentifier('dropbox')
@@ -39,7 +43,6 @@ class Dropbox extends Backend {
 			->addParameters([
 				// all parameters handled in OAuth1 mechanism
 			])
-			->setDependencyCheck('\OC\Files\Storage\Dropbox::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_OAUTH1)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/ftp.php b/apps/files_external/lib/backend/ftp.php
index df6ca37679e..1caf3a8fcb8 100644
--- a/apps/files_external/lib/backend/ftp.php
+++ b/apps/files_external/lib/backend/ftp.php
@@ -26,11 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class FTP extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, Password $legacyAuth) {
 		$this
 			->setIdentifier('ftp')
@@ -44,7 +47,6 @@ class FTP extends Backend {
 				(new DefinitionParameter('secure', $l->t('Secure ftps://')))
 					->setType(DefinitionParameter::VALUE_BOOLEAN),
 			])
-			->setDependencyCheck('\OC\Files\Storage\FTP::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/google.php b/apps/files_external/lib/backend/google.php
index b46b2f653a6..bc0b52c464b 100644
--- a/apps/files_external/lib/backend/google.php
+++ b/apps/files_external/lib/backend/google.php
@@ -26,10 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
 use \OCA\Files_External\Lib\Auth\OAuth2\OAuth2;
 
 class Google extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, OAuth2 $legacyAuth) {
 		$this
 			->setIdentifier('googledrive')
@@ -39,7 +43,6 @@ class Google extends Backend {
 			->addParameters([
 				// all parameters handled in OAuth2 mechanism
 			])
-			->setDependencyCheck('\OC\Files\Storage\Google::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_OAUTH2)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/legacybackend.php b/apps/files_external/lib/backend/legacybackend.php
index 0f60c2caa47..83a5b45940d 100644
--- a/apps/files_external/lib/backend/legacybackend.php
+++ b/apps/files_external/lib/backend/legacybackend.php
@@ -24,12 +24,21 @@ namespace OCA\Files_External\Lib\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\Builtin;
+use \OCA\Files_External\Lib\MissingDependency;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 /**
  * Legacy compatibility for OC_Mount_Config::registerBackend()
  */
 class LegacyBackend extends Backend {
 
+	use LegacyDependencyCheckPolyfill {
+		LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
+	}
+
+	/** @var bool */
+	protected $hasDependencies = false;
+
 	/**
 	 * @param string $class
 	 * @param array $definition
@@ -78,8 +87,18 @@ class LegacyBackend extends Backend {
 			$this->setCustomJs($definition['custom']);
 		}
 		if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
-			$this->setDependencyCheck($class . '::checkDependencies');
+			$this->hasDependencies = true;
+		}
+	}
+
+	/**
+	 * @return MissingDependency[]
+	 */
+	public function checkDependencies() {
+		if ($this->hasDependencies) {
+			return $this->doCheckDependencies();
 		}
+		return [];
 	}
 
 }
diff --git a/apps/files_external/lib/backend/smb.php b/apps/files_external/lib/backend/smb.php
index 3d950a80c31..350eca1de34 100644
--- a/apps/files_external/lib/backend/smb.php
+++ b/apps/files_external/lib/backend/smb.php
@@ -26,11 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class SMB extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, Password $legacyAuth) {
 		$this
 			->setIdentifier('smb')
@@ -43,7 +46,6 @@ class SMB extends Backend {
 				(new DefinitionParameter('root', $l->t('Remote subfolder')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
-			->setDependencyCheck('\OC\Files\Storage\SMB::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/dependencytrait.php b/apps/files_external/lib/dependencytrait.php
index 116421eab14..f0d6d6080e5 100644
--- a/apps/files_external/lib/dependencytrait.php
+++ b/apps/files_external/lib/dependencytrait.php
@@ -28,58 +28,13 @@ use \OCA\Files_External\Lib\MissingDependency;
  */
 trait DependencyTrait {
 
-	/** @var callable|null dependency check */
-	private $dependencyCheck = null;
-
-	/**
-	 * @return bool
-	 */
-	public function hasDependencies() {
-		return !is_null($this->dependencyCheck);
-	}
-
-	/**
-	 * @param callable $dependencyCheck
-	 * @return self
-	 */
-	public function setDependencyCheck(callable $dependencyCheck) {
-		$this->dependencyCheck = $dependencyCheck;
-		return $this;
-	}
-
 	/**
 	 * Check if object is valid for use
 	 *
 	 * @return MissingDependency[] Unsatisfied dependencies
 	 */
 	public function checkDependencies() {
-		$ret = [];
-
-		if ($this->hasDependencies()) {
-			$result = call_user_func($this->dependencyCheck);
-			if ($result !== true) {
-				if (!is_array($result)) {
-					$result = [$result];
-				}
-				foreach ($result as $key => $value) {
-					if (!($value instanceof MissingDependency)) {
-						$module = null;
-						$message = null;
-						if (is_numeric($key)) {
-							$module = $value;
-						} else {
-							$module = $key;
-							$message = $value;
-						}
-						$value = new MissingDependency($module, $this);
-						$value->setMessage($message);
-					}
-					$ret[] = $value;
-				}
-			}
-		}
-
-		return $ret;
+		return []; // no dependencies by default
 	}
 
 }
diff --git a/apps/files_external/lib/legacydependencycheckpolyfill.php b/apps/files_external/lib/legacydependencycheckpolyfill.php
new file mode 100644
index 00000000000..7bb137fb3e1
--- /dev/null
+++ b/apps/files_external/lib/legacydependencycheckpolyfill.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib;
+
+use \OCA\Files_External\Lib\MissingDependency;
+
+/**
+ * Polyfill for checking dependencies using legacy Storage::checkDependencies()
+ */
+trait LegacyDependencyCheckPolyfill {
+
+	/**
+	 * @return string
+	 */
+	abstract public function getStorageClass();
+
+	/**
+	 * Check if object is valid for use
+	 *
+	 * @return MissingDependency[] Unsatisfied dependencies
+	 */
+	public function checkDependencies() {
+		$ret = [];
+
+		$result = call_user_func([$this->getStorageClass(), 'checkDependencies']);
+		if ($result !== true) {
+			if (!is_array($result)) {
+				$result = [$result];
+			}
+			foreach ($result as $key => $value) {
+				if (!($value instanceof MissingDependency)) {
+					$module = null;
+					$message = null;
+					if (is_numeric($key)) {
+						$module = $value;
+					} else {
+						$module = $key;
+						$message = $value;
+					}
+					$value = new MissingDependency($module, $this);
+					$value->setMessage($message);
+				}
+				$ret[] = $value;
+			}
+		}
+
+		return $ret;
+	}
+
+}
+
diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/backend/legacybackendtest.php
index 44cb16a4986..4db8ac5d8df 100644
--- a/apps/files_external/tests/backend/legacybackendtest.php
+++ b/apps/files_external/tests/backend/legacybackendtest.php
@@ -23,15 +23,25 @@ namespace OCA\Files_External\Tests\Backend;
 
 use \OCA\Files_External\Lib\Backend\LegacyBackend;
 use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\MissingDependency;
 
 class LegacyBackendTest extends \Test\TestCase {
 
+	/**
+	 * @return MissingDependency[]
+	 */
+	public static function checkDependencies() {
+		return [
+			(new MissingDependency('abc'))->setMessage('foobar')
+		];
+	}
+
 	public function testConstructor() {
 		$auth = $this->getMockBuilder('\OCA\Files_External\Lib\Auth\Builtin')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$class = '\OC\Files\Storage\SMB';
+		$class = '\OCA\Files_External\Tests\Backend\LegacyBackendTest';
 		$definition = [
 			'configuration' => [
 				'textfield' => 'Text field',
@@ -49,14 +59,18 @@ class LegacyBackendTest extends \Test\TestCase {
 
 		$backend = new LegacyBackend($class, $definition, $auth);
 
-		$this->assertEquals('\OC\Files\Storage\SMB', $backend->getStorageClass());
+		$this->assertEquals('\OCA\Files_External\Tests\Backend\LegacyBackendTest', $backend->getStorageClass());
 		$this->assertEquals('Backend text', $backend->getText());
 		$this->assertEquals(123, $backend->getPriority());
 		$this->assertEquals('foo/bar.js', $backend->getCustomJs());
-		$this->assertEquals(true, $backend->hasDependencies());
 		$this->assertArrayHasKey('builtin', $backend->getAuthSchemes());
 		$this->assertEquals($auth, $backend->getLegacyAuthMechanism());
 
+		$dependencies = $backend->checkDependencies();
+		$this->assertCount(1, $dependencies);
+		$this->assertEquals('abc', $dependencies[0]->getDependency());
+		$this->assertEquals('foobar', $dependencies[0]->getMessage());
+
 		$parameters = $backend->getParameters();
 		$this->assertEquals('Text field', $parameters['textfield']->getText());
 		$this->assertEquals(DefinitionParameter::VALUE_TEXT, $parameters['textfield']->getType());
diff --git a/apps/files_external/tests/dependencytraittest.php b/apps/files_external/tests/legacydependencycheckpolyfilltest.php
similarity index 69%
rename from apps/files_external/tests/dependencytraittest.php
rename to apps/files_external/tests/legacydependencycheckpolyfilltest.php
index 5706d97053d..49d825d77aa 100644
--- a/apps/files_external/tests/dependencytraittest.php
+++ b/apps/files_external/tests/legacydependencycheckpolyfilltest.php
@@ -23,16 +23,23 @@ namespace OCA\Files_External\Tests;
 
 use \OCA\Files_External\Lib\MissingDependency;
 
-class DependencyTraitTest extends \Test\TestCase {
+class LegacyDependencyCheckPolyfillTest extends \Test\TestCase {
+
+	/**
+	 * @return MissingDependency[]
+	 */
+	public static function checkDependencies() {
+		return [
+			(new MissingDependency('dependency'))->setMessage('missing dependency'),
+			(new MissingDependency('program'))->setMessage('cannot find program'),
+		];
+	}
 
 	public function testCheckDependencies() {
-		$trait = $this->getMockForTrait('\OCA\Files_External\Lib\DependencyTrait');
-		$trait->setDependencyCheck(function() {
-			return [
-				(new MissingDependency('dependency'))->setMessage('missing dependency'),
-				(new MissingDependency('program'))->setMessage('cannot find program'),
-			];
-		});
+		$trait = $this->getMockForTrait('\OCA\Files_External\Lib\LegacyDependencyCheckPolyfill');
+		$trait->expects($this->once())
+			->method('getStorageClass')
+			->willReturn('\OCA\Files_External\Tests\LegacyDependencyCheckPolyfillTest');
 
 		$dependencies = $trait->checkDependencies();
 		$this->assertCount(2, $dependencies);
-- 
GitLab


From 23e4b6e0c2e46a7f35d1256555d3d213292c9fa1 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Tue, 1 Sep 2015 10:29:49 +0100
Subject: [PATCH 117/783] Test legacy backend with no dependency check

---
 .../tests/backend/legacybackendtest.php        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/backend/legacybackendtest.php
index 4db8ac5d8df..d57810de29b 100644
--- a/apps/files_external/tests/backend/legacybackendtest.php
+++ b/apps/files_external/tests/backend/legacybackendtest.php
@@ -92,4 +92,22 @@ class LegacyBackendTest extends \Test\TestCase {
 		$this->assertEquals(DefinitionParameter::FLAG_OPTIONAL, $parameters['optionalpassword']->getFlags());
 	}
 
+	public function testNoDependencies() {
+		$auth = $this->getMockBuilder('\OCA\Files_External\Lib\Auth\Builtin')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$class = '\OCA\Files_External\Tests\Backend\LegacyBackendTest';
+		$definition = [
+			'configuration' => [
+			],
+			'backend' => 'Backend text',
+		];
+
+		$backend = new LegacyBackend($class, $definition, $auth);
+
+		$dependencies = $backend->checkDependencies();
+		$this->assertCount(0, $dependencies);
+	}
+
 }
-- 
GitLab


From e9b91b1798fde385aafc0512865b1c11b0249069 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 18 Aug 2015 15:35:02 +0200
Subject: [PATCH 118/783] verify the path in the autoloader

---
 lib/autoloader.php       | 33 +++++++++++++++++-
 lib/base.php             | 19 ++++++++---
 tests/bootstrap.php      |  2 ++
 tests/lib/autoloader.php |  2 +-
 tests/lib/template.php   | 72 ++++++++++++++++++++--------------------
 5 files changed, 86 insertions(+), 42 deletions(-)

diff --git a/lib/autoloader.php b/lib/autoloader.php
index 23285f61e73..010318a65be 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -34,12 +34,33 @@ class Autoloader {
 
 	private $classPaths = array();
 
+	private $validRoots = [];
+
 	/**
 	 * Optional low-latency memory cache for class to path mapping.
+	 *
 	 * @var \OC\Memcache\Cache
 	 */
 	protected $memoryCache;
 
+	/**
+	 * Autoloader constructor.
+	 *
+	 * @param string[] $validRoots
+	 */
+	public function __construct(array $validRoots) {
+		$this->validRoots = $validRoots;
+	}
+
+	/**
+	 * Add a path to the list of valid php roots for auto loading
+	 *
+	 * @param string $root
+	 */
+	public function addValidRoot($root) {
+		$this->validRoots[] = $root;
+	}
+
 	/**
 	 * disable the usage of the global classpath \OC::$CLASSPATH
 	 */
@@ -102,6 +123,15 @@ class Autoloader {
 		return $paths;
 	}
 
+	protected function isValidPath($fullPath) {
+		foreach ($this->validRoots as $root) {
+			if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
+				return true;
+			}
+		}
+		throw new \Exception('Path not allowed');
+	}
+
 	/**
 	 * Load the specified class
 	 *
@@ -119,7 +149,7 @@ class Autoloader {
 			$pathsToRequire = array();
 			foreach ($this->findClass($class) as $path) {
 				$fullPath = stream_resolve_include_path($path);
-				if ($fullPath) {
+				if ($fullPath && $this->isValidPath($fullPath)) {
 					$pathsToRequire[] = $fullPath;
 				}
 			}
@@ -138,6 +168,7 @@ class Autoloader {
 
 	/**
 	 * Sets the optional low-latency cache for class to path mapping.
+	 *
 	 * @param \OC\Memcache\Cache $memoryCache Instance of memory cache.
 	 */
 	public function setMemoryCache(\OC\Memcache\Cache $memoryCache = null) {
diff --git a/lib/base.php b/lib/base.php
index aceac2e53c3..9cf0228bbd9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -115,9 +115,6 @@ class OC {
 	 * the app path list is empty or contains an invalid path
 	 */
 	public static function initPaths() {
-		// calculate the root directories
-		OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
-
 		// ensure we can find OC_Config
 		set_include_path(
 			OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
@@ -519,10 +516,20 @@ class OC {
 	}
 
 	public static function init() {
+		// calculate the root directories
+		OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
+
 		// register autoloader
 		$loaderStart = microtime(true);
 		require_once __DIR__ . '/autoloader.php';
-		self::$loader = new \OC\Autoloader();
+		self::$loader = new \OC\Autoloader([
+			OC::$SERVERROOT . '/lib',
+			OC::$SERVERROOT . '/core',
+			OC::$SERVERROOT . '/settings',
+			OC::$SERVERROOT . '/ocs',
+			OC::$SERVERROOT . '/ocs-provider',
+			OC::$SERVERROOT . '/3rdparty'
+		]);
 		spl_autoload_register(array(self::$loader, 'load'));
 		$loaderEnd = microtime(true);
 
@@ -545,6 +552,10 @@ class OC {
 			exit();
 		}
 
+		foreach(OC::$APPSROOTS as $appRoot) {
+			self::$loader->addValidRoot($appRoot['path']);
+		}
+
 		// setup the basic server
 		self::$server = new \OC\Server(\OC::$WEBROOT);
 		\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index bd94ca67754..8bca05b1a18 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,6 +8,8 @@ if ($configDir) {
 
 require_once __DIR__ . '/../lib/base.php';
 
+\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+
 // load minimum set of apps
 OC_App::loadApps(array('authentication'));
 OC_App::loadApps(array('filesystem', 'logging'));
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
index bf63094a9ef..6d9d3bd8eba 100644
--- a/tests/lib/autoloader.php
+++ b/tests/lib/autoloader.php
@@ -16,7 +16,7 @@ class AutoLoader extends TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$this->loader = new \OC\AutoLoader();
+		$this->loader = new \OC\AutoLoader([]);
 	}
 
 	public function testLeadingSlashOnClassName() {
diff --git a/tests/lib/template.php b/tests/lib/template.php
index db58238eae8..6e62d3955f1 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -1,31 +1,31 @@
 <?php
-/**
-* ownCloud
-*
-* @author Bernhard Posselt
-* @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
 
+/**
+ * ownCloud
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 class Test_TemplateFunctions extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
 
-		$loader = new \OC\Autoloader();
+		$loader = new \OC\Autoloader([OC::$SERVERROOT . '/lib']);
 		$loader->load('OC_Template');
 	}
 
@@ -60,7 +60,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 	// ---------------------------------------------------------------------------
 	// Test relative_modified_date with dates only
 	// ---------------------------------------------------------------------------
-	public function testRelativeDateToday(){
+	public function testRelativeDateToday() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -74,7 +74,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('today', $result);
 	}
 
-	public function testRelativeDateYesterday(){
+	public function testRelativeDateYesterday() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 24 * 3600;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -88,7 +88,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('yesterday', $result);
 	}
 
-	public function testRelativeDate2DaysAgo(){
+	public function testRelativeDate2DaysAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 48 * 3600;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -102,7 +102,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('2 days ago', $result);
 	}
 
-	public function testRelativeDateLastMonth(){
+	public function testRelativeDateLastMonth() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 31;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -115,7 +115,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('last month', $result);
 	}
 
-	public function testRelativeDateMonthsAgo(){
+	public function testRelativeDateMonthsAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 65;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -128,7 +128,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('4 months ago', $result);
 	}
 
-	public function testRelativeDateLastYear(){
+	public function testRelativeDateLastYear() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 365;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -141,7 +141,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('last year', $result);
 	}
 
-	public function testRelativeDateYearsAgo(){
+	public function testRelativeDateYearsAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 365.25 * 2;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -158,7 +158,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 	// Test relative_modified_date with timestamps only (date + time value)
 	// ---------------------------------------------------------------------------
 
-	public function testRelativeTimeSecondsAgo(){
+	public function testRelativeTimeSecondsAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 5;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -166,7 +166,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('seconds ago', $result);
 	}
 
-	public function testRelativeTimeMinutesAgo(){
+	public function testRelativeTimeMinutesAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 190;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -174,7 +174,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('3 minutes ago', $result);
 	}
 
-	public function testRelativeTimeHoursAgo(){
+	public function testRelativeTimeHoursAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 7500;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -182,7 +182,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('2 hours ago', $result);
 	}
 
-	public function testRelativeTime2DaysAgo(){
+	public function testRelativeTime2DaysAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 48 * 3600;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -196,7 +196,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('2 days ago', $result);
 	}
 
-	public function testRelativeTimeLastMonth(){
+	public function testRelativeTimeLastMonth() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 31;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -209,7 +209,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('last month', $result);
 	}
 
-	public function testRelativeTimeMonthsAgo(){
+	public function testRelativeTimeMonthsAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 65;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -222,7 +222,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('4 months ago', $result);
 	}
 
-	public function testRelativeTimeLastYear(){
+	public function testRelativeTimeLastYear() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 365;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -235,7 +235,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('last year', $result);
 	}
 
-	public function testRelativeTimeYearsAgo(){
+	public function testRelativeTimeYearsAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 365.25 * 2;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
-- 
GitLab


From 9e9ffb1356ed30b92d19e9cb36b9848ea057970b Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Tue, 1 Sep 2015 14:07:14 +0100
Subject: [PATCH 119/783] Allow access to full alias and mapping arrays

---
 lib/private/files/type/detection.php | 30 ++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index ba286637df3..3dc3975fb2a 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -6,6 +6,7 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Tanghus <thomas@tanghus.net>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
@@ -101,15 +102,22 @@ class Detection implements IMimeTypeDetector {
 			return;
 		}
 
-		$file = file_get_contents($this->configDir . '/mimetypealiases.dist.json');
-		$this->mimeTypeAlias = get_object_vars(json_decode($file));
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->configDir . '/mimetypealiases.dist.json'), true);
 
 		if (file_exists($this->configDir . '/mimetypealiases.json')) {
-			$custom = get_object_vars(json_decode(file_get_contents($this->configDir . '/mimetypealiases.json')));
+			$custom = json_decode(file_get_contents($this->configDir . '/mimetypealiases.json'), true);
 			$this->mimeTypeAlias = array_merge($this->mimeTypeAlias, $custom);
 		}
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getAllAliases() {
+		$this->loadAliases();
+		return $this->mimeTypeAlias;
+	}
+
 	/**
 	 * Add mimetype mappings if they are not yet present
 	 */
@@ -118,19 +126,25 @@ class Detection implements IMimeTypeDetector {
 			return;
 		}
 
-		$dist = file_get_contents($this->configDir . '/mimetypemapping.dist.json');
-		$mimetypemapping = get_object_vars(json_decode($dist));
+		$mimetypemapping = json_decode(file_get_contents($this->configDir . '/mimetypemapping.dist.json'), true);
 
 		//Check if need to load custom mappings
 		if (file_exists($this->configDir . '/mimetypemapping.json')) {
-			$custom = file_get_contents($this->configDir . '/mimetypemapping.json');
-			$custom_mapping = get_object_vars(json_decode($custom));
-			$mimetypemapping = array_merge($mimetypemapping, $custom_mapping);
+			$custom = json_decode(file_get_contents($this->configDir . '/mimetypemapping.json'), true);
+			$mimetypemapping = array_merge($mimetypemapping, $custom);
 		}
 
 		$this->registerTypeArray($mimetypemapping);
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getAllMappings() {
+		$this->loadMappings();
+		return $this->mimetypes;
+	}
+
 	/**
 	 * detect mimetype only based on filename, content of file is not used
 	 *
-- 
GitLab


From 79fceeff338d262828cc977839b171999da0a7eb Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Tue, 1 Sep 2015 14:09:15 +0100
Subject: [PATCH 120/783] Move maintenance:mimetypesjs to sublocation, cleanup
 code

---
 .../updatejs.php}                             | 43 +++++++++++--------
 core/register_command.php                     |  2 +-
 2 files changed, 26 insertions(+), 19 deletions(-)
 rename core/command/maintenance/{mimetypesjs.php => mimetype/updatejs.php} (75%)

diff --git a/core/command/maintenance/mimetypesjs.php b/core/command/maintenance/mimetype/updatejs.php
similarity index 75%
rename from core/command/maintenance/mimetypesjs.php
rename to core/command/maintenance/mimetype/updatejs.php
index 8b01f0acf79..5de75d53a3f 100644
--- a/core/command/maintenance/mimetypesjs.php
+++ b/core/command/maintenance/mimetype/updatejs.php
@@ -18,27 +18,35 @@
  *
  */
 
-namespace OC\Core\Command\Maintenance;
+namespace OC\Core\Command\Maintenance\Mimetype;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class MimeTypesJS extends Command {
+use OCP\Files\IMimeTypeDetector;
+
+class UpdateJS extends Command {
+
+	/** @var IMimeTypeDetector */
+	protected $mimetypeDetector;
+
+	public function __construct(
+		IMimeTypeDetector $mimetypeDetector
+	) {
+		parent::__construct();
+		$this->mimetypeDetector = $mimetypeDetector;
+	}
+
 	protected function configure() {
 		$this
-			->setName('maintenance:mimetypesjs')
+			->setName('maintenance:mimetype:update-js')
 			->setDescription('Update mimetypelist.js');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		// Fetch all the aliases
-		$aliases = json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mimetypealiases.dist.json'), true);
-
-		if (file_exists(\OC::$SERVERROOT . '/config/mimetypealiases.json')) {
-			$custom = get_object_vars(json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mimetypealiases.json')));
-			$aliases = array_merge($aliases, $custom);
-		}
+		$aliases = $this->mimetypeDetector->getAllAliases();
 
 		// Remove comments
 		$keys = array_filter(array_keys($aliases), function($k) {
@@ -49,23 +57,22 @@ class MimeTypesJS extends Command {
 		}
 
 		// Fetch all files
-		$dir = new \DirectoryIterator(dirname(__DIR__) . '/../img/filetypes');
+		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
 
 		$files = [];
 		foreach($dir as $fileInfo) {
-		    if ($fileInfo->isFile()) {
-        		$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
-		        $files[] = $file;
-		    }  
+			if ($fileInfo->isFile()) {
+				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+				$files[] = $file;
+			}
 		}
 
 		//Remove duplicates
 		$files = array_values(array_unique($files));
 
-
 		// Fetch all themes!
 		$themes = [];
-		$dirs = new \DirectoryIterator(dirname(__DIR__) . '/../../themes/');
+		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
 		foreach($dirs as $dir) {
 			//Valid theme dir
 			if ($dir->isFile() || $dir->isDot()) {
@@ -84,7 +91,7 @@ class MimeTypesJS extends Command {
 			$themeIt = new \DirectoryIterator($themeDir);
 			foreach ($themeIt as $fileInfo) {
 				if ($fileInfo->isFile()) {
- 		       		$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+					$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
 					$themes[$theme][] = $file;
 				}
 			}
@@ -110,7 +117,7 @@ OC.MimeTypeList={
 ';
 
 		//Output the JS
-		file_put_contents(dirname(__DIR__) . '/../js/mimetypelist.js', $js);
+		file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $js);
 
 		$output->writeln('<info>mimetypelist.js is updated');
 	}
diff --git a/core/register_command.php b/core/register_command.php
index 72c7b28e9ae..b79c69c8fd5 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -79,10 +79,10 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	);
 	$application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
 
-	$application->add(new OC\Core\Command\Maintenance\MimeTypesJS());
 	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair(\OC\Repair::getRepairSteps()), \OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Maintenance\SingleUser(\OC::$server->getConfig()));
+	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
 
 	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig()));
 
-- 
GitLab


From 01dcf7f32c4aa9353c2a3f93ebd7c8ca415562c6 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 1 Sep 2015 15:43:23 +0200
Subject: [PATCH 121/783] Show the path as part of the exception for not
 allowed autoloading paths

---
 lib/autoloader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/autoloader.php b/lib/autoloader.php
index 010318a65be..d7649781ea1 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -129,7 +129,7 @@ class Autoloader {
 				return true;
 			}
 		}
-		throw new \Exception('Path not allowed');
+		throw new \Exception('Path not allowed: '. $fullPath);
 	}
 
 	/**
-- 
GitLab


From 5b2529b44803b80cc9eab9f356623650d5e5986f Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Tue, 1 Sep 2015 15:42:41 +0100
Subject: [PATCH 122/783] Delay adding OCS prefix to route collection until all
 is loaded

->addPrefix() iterates over all registered routes, so must be run after
all apps have had a chance to load their OCS routes.
---
 lib/private/route/router.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index 33669452f2d..7b7849a6da0 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -169,8 +169,9 @@ class Router implements IRouter {
 			$this->useCollection('root');
 			require_once 'settings/routes.php';
 			require_once 'core/routes.php';
-
-			// include ocs routes
+		}
+		if ($this->loaded) {
+			// include ocs routes, must be loaded last for /ocs prefix
 			require_once 'ocs/routes.php';
 			$collection = $this->getCollection('ocs');
 			$collection->addPrefix('/ocs');
-- 
GitLab


From 1c10fb5c9f583d562184097fd2fd97e1b121773f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 1 Sep 2015 18:01:27 +0200
Subject: [PATCH 123/783] also use httpclient for uploadFile

---
 lib/private/files/storage/dav.php | 53 +++++++++++--------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 2b6262f3720..c1cf17abdee 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -78,6 +78,8 @@ class DAV extends Common {
 	private $statCache;
 	/** @var array */
 	private static $tempFiles = [];
+	/** @var \OCP\Http\Client\IClientService */
+	private $httpClientService;
 
 	/**
 	 * @param array $params
@@ -85,6 +87,7 @@ class DAV extends Common {
 	 */
 	public function __construct($params) {
 		$this->statCache = new ArrayCache();
+		$this->httpClientService = \OC::$server->getHTTPClientService();
 		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
 			$host = $params['host'];
 			//remove leading http[s], will be generated in createBaseUri()
@@ -233,7 +236,7 @@ class DAV extends Common {
 	 * If not, request it from the server then store to cache.
 	 *
 	 * @param string $path path to propfind
-	 * 
+	 *
 	 * @return array propfind response
 	 *
 	 * @throws NotFound
@@ -338,8 +341,7 @@ class DAV extends Common {
 				if (!$this->file_exists($path)) {
 					return false;
 				}
-				$httpClient = \OC::$server->getHTTPClientService();
-				$response = $httpClient
+				$response = $this->httpClientService
 					->newClient()
 					->get($this->createBaseUri() . $this->encodePath($path), [
 						'auth' => [$this->user, $this->password],
@@ -464,38 +466,19 @@ class DAV extends Common {
 	 */
 	protected function uploadFile($path, $target) {
 		$this->init();
+
 		// invalidate
 		$target = $this->cleanPath($target);
 		$this->statCache->remove($target);
 		$source = fopen($path, 'r');
 
-		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_USERPWD, $this->user . ':' . $this->password);
-		curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . $this->encodePath($target));
-		curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
-		curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer
-		curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path));
-		curl_setopt($curl, CURLOPT_PUT, true);
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($curl, CURLOPT_PROTOCOLS,  CURLPROTO_HTTP | CURLPROTO_HTTPS);
-		curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS,  CURLPROTO_HTTP | CURLPROTO_HTTPS);
-		if ($this->secure === true) {
-			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
-			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
-			if ($this->certPath) {
-				curl_setopt($curl, CURLOPT_CAINFO, $this->certPath);
-			}
-		}
-		curl_exec($curl);
-		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		if ($statusCode !== 200) {
-			Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, Util::ERROR);
-			if ($statusCode === 423) {
-				throw new \OCP\Lock\LockedException($path);
-			}
-		}
-		curl_close($curl);
-		fclose($source);
+		$this->httpClientService
+			->newClient()
+			->put($this->createBaseUri() . $this->encodePath($target), [
+				'body' => $source,
+				'auth' => [$this->user, $this->password]
+			]);
+
 		$this->removeCachedFile($target);
 	}
 
@@ -754,7 +737,7 @@ class DAV extends Common {
 			if ($e->getHttpStatus() === 404 || $e->getHttpStatus() === 405) {
 				if ($path === '') {
 					// if root is gone it means the storage is not available
-					throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+					throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
 				}
 				return false;
 			}
@@ -788,19 +771,19 @@ class DAV extends Common {
 			}
 			if ($e->getHttpStatus() === 401) {
 				// either password was changed or was invalid all along
-				throw new StorageInvalidException(get_class($e).': '.$e->getMessage());
+				throw new StorageInvalidException(get_class($e) . ': ' . $e->getMessage());
 			} else if ($e->getHttpStatus() === 405) {
 				// ignore exception for MethodNotAllowed, false will be returned
 				return;
 			}
-			throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
 		} else if ($e instanceof ClientException) {
 			// connection timeout or refused, server could be temporarily down
-			throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
 		} else if ($e instanceof \InvalidArgumentException) {
 			// parse error because the server returned HTML instead of XML,
 			// possibly temporarily down
-			throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
 		} else if (($e instanceof StorageNotAvailableException) || ($e instanceof StorageInvalidException)) {
 			// rethrow
 			throw $e;
-- 
GitLab


From 310084cc25b63ce05b208a426d54e34a2790a6b4 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 1 Sep 2015 14:03:19 -0400
Subject: [PATCH 124/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/id.js       |  3 +++
 apps/encryption/l10n/id.json     |  3 +++
 apps/encryption/l10n/tr.js       |  3 +++
 apps/encryption/l10n/tr.json     |  3 +++
 apps/files/l10n/tr.js            |  3 +++
 apps/files/l10n/tr.json          |  3 +++
 apps/files/l10n/zh_TW.js         |  4 ++++
 apps/files/l10n/zh_TW.json       |  4 ++++
 apps/files_external/l10n/id.js   | 22 ++++++++++++++++++++++
 apps/files_external/l10n/id.json | 22 ++++++++++++++++++++++
 apps/files_external/l10n/tr.js   | 22 ++++++++++++++++++++++
 apps/files_external/l10n/tr.json | 22 ++++++++++++++++++++++
 apps/user_ldap/l10n/tr.js        | 12 ++++++++++++
 apps/user_ldap/l10n/tr.json      | 12 ++++++++++++
 core/l10n/fr.js                  |  2 ++
 core/l10n/fr.json                |  2 ++
 core/l10n/hu_HU.js               |  2 ++
 core/l10n/hu_HU.json             |  2 ++
 core/l10n/id.js                  |  3 +++
 core/l10n/id.json                |  3 +++
 core/l10n/tr.js                  | 18 ++++++++++++++++++
 core/l10n/tr.json                | 18 ++++++++++++++++++
 core/l10n/zh_TW.js               |  2 ++
 core/l10n/zh_TW.json             |  2 ++
 lib/l10n/id.js                   |  1 +
 lib/l10n/id.json                 |  1 +
 settings/l10n/hu_HU.js           |  6 ++++++
 settings/l10n/hu_HU.json         |  6 ++++++
 settings/l10n/id.js              |  7 +++++++
 settings/l10n/id.json            |  7 +++++++
 settings/l10n/it.js              |  2 +-
 settings/l10n/it.json            |  2 +-
 settings/l10n/tr.js              | 13 +++++++++++++
 settings/l10n/tr.json            | 13 +++++++++++++
 34 files changed, 248 insertions(+), 2 deletions(-)

diff --git a/apps/encryption/l10n/id.js b/apps/encryption/l10n/id.js
index c0eb1576f11..1247b35bad6 100644
--- a/apps/encryption/l10n/id.js
+++ b/apps/encryption/l10n/id.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
     "Encryption App is enabled and ready" : "Apl Enkripsi telah diaktifkan dan siap",
+    "one-time password for server-side-encryption" : "Sandi sekali pakai untuk server-side-encryption",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat membaca berkas ini, kemungkinan merupakan berkas berbagi. Silakan minta pemilik berkas untuk membagikan ulang kepada Anda.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hai,\n\nadmin mengaktifkan server-side-encryption. Berkas-berkas Anda dienkripsi menggunakan sandi '%s'.\n\nSilakan masuk di antarmuka web, pergi ke bagian 'modul enkripsi dasar ownCloud' pada pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini kedalam kolom 'sandi masuk yang lama' dan sandi-masuk saat ini.\n\n",
     "The share will expire on %s." : "Pembagian akan berakhir pada %s.",
     "Cheers!" : "Horee!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hai,<br><br>admin mengaktifkan server-side-encryption. Berkas-berkas Anda dienkripsi menggunakan sandi <strong>%s</strong>.<br><br>Silakan masuk di antarmuka web, pergi ke bagian 'modul enkripsi dasar ownCloud' pada pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini kedalam kolom 'sandi masuk yang lama' dan sandi masuk yang baru.<br><br>",
     "Enable recovery key" : "Aktifkan kunci pemulihan",
     "Disable recovery key" : "Nonaktifkan kunci pemulihan",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kunci pemulihan adalah kunci enkripsi tambahan yang digunakan untuk mengenkripsi berkas. Kunci pemulihan memungkinkan untuk memulihkan berkas-berkas pengguna ketika pengguna tersebut melupakan sandi mereka.",
diff --git a/apps/encryption/l10n/id.json b/apps/encryption/l10n/id.json
index 59f39b2ea3a..3771f7e935f 100644
--- a/apps/encryption/l10n/id.json
+++ b/apps/encryption/l10n/id.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
     "Encryption App is enabled and ready" : "Apl Enkripsi telah diaktifkan dan siap",
+    "one-time password for server-side-encryption" : "Sandi sekali pakai untuk server-side-encryption",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat membaca berkas ini, kemungkinan merupakan berkas berbagi. Silakan minta pemilik berkas untuk membagikan ulang kepada Anda.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hai,\n\nadmin mengaktifkan server-side-encryption. Berkas-berkas Anda dienkripsi menggunakan sandi '%s'.\n\nSilakan masuk di antarmuka web, pergi ke bagian 'modul enkripsi dasar ownCloud' pada pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini kedalam kolom 'sandi masuk yang lama' dan sandi-masuk saat ini.\n\n",
     "The share will expire on %s." : "Pembagian akan berakhir pada %s.",
     "Cheers!" : "Horee!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hai,<br><br>admin mengaktifkan server-side-encryption. Berkas-berkas Anda dienkripsi menggunakan sandi <strong>%s</strong>.<br><br>Silakan masuk di antarmuka web, pergi ke bagian 'modul enkripsi dasar ownCloud' pada pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini kedalam kolom 'sandi masuk yang lama' dan sandi masuk yang baru.<br><br>",
     "Enable recovery key" : "Aktifkan kunci pemulihan",
     "Disable recovery key" : "Nonaktifkan kunci pemulihan",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kunci pemulihan adalah kunci enkripsi tambahan yang digunakan untuk mengenkripsi berkas. Kunci pemulihan memungkinkan untuk memulihkan berkas-berkas pengguna ketika pengguna tersebut melupakan sandi mereka.",
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 2c8eff7e62b..96db8f91209 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
     "Encryption App is enabled and ready" : "Şifreleme Uygulaması etkin ve hazır",
+    "one-time password for server-side-encryption" : "sunucu tarafında şifleme için tek kullanımlık parola",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan okunamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Selam,\n\nsistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız '%s' parolası kullanılarak şifrelendi.\n\nLütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.\n\n",
     "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
     "Cheers!" : "Hoşçakalın!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Selam,<br><br>sistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız <strong>%s</strong> parolası kullanılarak şifrelendi.<br><br>Lütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.<br><br>",
     "Enable recovery key" : "Kurtarma anahtarını etkinleştir",
     "Disable recovery key" : "Kurtarma anahtarını devre dışı bırak",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kurtarma anahtarı, dosyaların şifrelenmesi için daha fazla \nşifreleme sunar. Bu kullanıcının dosyasının şifresini unuttuğunda kurtarmasına imkan verir.",
diff --git a/apps/encryption/l10n/tr.json b/apps/encryption/l10n/tr.json
index a1bb9b6a5d9..be6f6a5dfdd 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
     "Encryption App is enabled and ready" : "Şifreleme Uygulaması etkin ve hazır",
+    "one-time password for server-side-encryption" : "sunucu tarafında şifleme için tek kullanımlık parola",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan okunamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Selam,\n\nsistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız '%s' parolası kullanılarak şifrelendi.\n\nLütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.\n\n",
     "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
     "Cheers!" : "Hoşçakalın!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Selam,<br><br>sistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız <strong>%s</strong> parolası kullanılarak şifrelendi.<br><br>Lütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.<br><br>",
     "Enable recovery key" : "Kurtarma anahtarını etkinleştir",
     "Disable recovery key" : "Kurtarma anahtarını devre dışı bırak",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kurtarma anahtarı, dosyaların şifrelenmesi için daha fazla \nşifreleme sunar. Bu kullanıcının dosyasının şifresini unuttuğunda kurtarmasına imkan verir.",
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
index 345b9ffd9fb..2145fb5c9fc 100644
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@@ -67,6 +67,8 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : " {owner} depolama alanı neredeyse dolu ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}' ile eşleşiyor","'{filter}' ile eşleşiyor"],
+    "Path" : "Yol",
+    "_%n byte_::_%n bytes_" : ["%n bayt","%n bayt"],
     "Favorited" : "Sık kullanılanlara eklendi",
     "Favorite" : "Sık kullanılan",
     "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu",
@@ -90,6 +92,7 @@ OC.L10N.register(
     "File handling" : "Dosya işlemleri",
     "Maximum upload size" : "Azami yükleme boyutu",
     "max. possible: " : "mümkün olan en fazla: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM ile bu değerin kaydedildikten sonra etkili olabilmesi için 5 dakika gerekebilir.",
     "Save" : "Kaydet",
     "Can not be edited from here due to insufficient permissions." : "Yetersiz izinler buradan düzenlenemez.",
     "Settings" : "Ayarlar",
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
index fc4ca146881..5a1e5f9ec7a 100644
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@@ -65,6 +65,8 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : " {owner} depolama alanı neredeyse dolu ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}' ile eşleşiyor","'{filter}' ile eşleşiyor"],
+    "Path" : "Yol",
+    "_%n byte_::_%n bytes_" : ["%n bayt","%n bayt"],
     "Favorited" : "Sık kullanılanlara eklendi",
     "Favorite" : "Sık kullanılan",
     "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu",
@@ -88,6 +90,7 @@
     "File handling" : "Dosya işlemleri",
     "Maximum upload size" : "Azami yükleme boyutu",
     "max. possible: " : "mümkün olan en fazla: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM ile bu değerin kaydedildikten sonra etkili olabilmesi için 5 dakika gerekebilir.",
     "Save" : "Kaydet",
     "Can not be edited from here due to insufficient permissions." : "Yetersiz izinler buradan düzenlenemez.",
     "Settings" : "Ayarlar",
diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js
index 049b63814a6..eeefcd95884 100644
--- a/apps/files/l10n/zh_TW.js
+++ b/apps/files/l10n/zh_TW.js
@@ -65,7 +65,11 @@ OC.L10N.register(
     "Your storage is full, files can not be updated or synced anymore!" : "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} 的儲存空間快要滿了 ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的儲存空間快要滿了 ({usedSpacePercent}%)",
+    "Path" : "路徑",
+    "_%n byte_::_%n bytes_" : ["%n 位元組"],
+    "Favorited" : "已加入最愛",
     "Favorite" : "我的最愛",
+    "An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
     "A new file or folder has been <strong>created</strong>" : "新的檔案或目錄已被 <strong>建立</strong>",
     "A file or folder has been <strong>changed</strong>" : "檔案或目錄已被 <strong>變更</strong>",
     "A file or folder has been <strong>deleted</strong>" : "檔案或目錄已被 <strong>刪除</strong>",
diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json
index 7b047c3c012..84af9fae39e 100644
--- a/apps/files/l10n/zh_TW.json
+++ b/apps/files/l10n/zh_TW.json
@@ -63,7 +63,11 @@
     "Your storage is full, files can not be updated or synced anymore!" : "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} 的儲存空間快要滿了 ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的儲存空間快要滿了 ({usedSpacePercent}%)",
+    "Path" : "路徑",
+    "_%n byte_::_%n bytes_" : ["%n 位元組"],
+    "Favorited" : "已加入最愛",
     "Favorite" : "我的最愛",
+    "An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
     "A new file or folder has been <strong>created</strong>" : "新的檔案或目錄已被 <strong>建立</strong>",
     "A file or folder has been <strong>changed</strong>" : "檔案或目錄已被 <strong>變更</strong>",
     "A file or folder has been <strong>deleted</strong>" : "檔案或目錄已被 <strong>刪除</strong>",
diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js
index a15106a8f74..e26ad12f3a8 100644
--- a/apps/files_external/l10n/id.js
+++ b/apps/files_external/l10n/id.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Permintaan pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Akses pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Please provide a valid app key and secret." : "Silakan berikan kunci dan kerahasiaan aplikasi yang benar.",
     "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s",
     "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s",
     "External storage" : "Penyimpanan eksternal",
@@ -22,12 +25,19 @@ OC.L10N.register(
     "SFTP with secret key login" : "SFTP dengan kunci rahasia masuk",
     "Public key" : "Kunci Public",
     "Storage with id \"%i\" not found" : "Penyimpanan dengan id \"%i\" tidak ditemukan",
+    "Invalid backend or authentication mechanism class" : "Beckend atau kelas mekanisme otentikasi salah.",
     "Invalid mount point" : "Mount point salah",
+    "Objectstore forbidden" : "Objectstore terlarang",
     "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
+    "Unsatisfied backend parameters" : "Parameter backend tidak lengkap",
+    "Unsatisfied authentication mechanism parameters" : "Parameter mekanisme otentikasi tidak lengkap",
+    "Admin-only storage backend \"%s\"" : "Backend penyimpanan hanya-admin \"%s\"",
     "Personal" : "Pribadi",
     "System" : "Sistem",
     "Grant access" : "Berikan hak akses",
     "Access granted" : "Akses diberikan",
+    "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1",
+    "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2",
     "Enable encryption" : "Aktifkan enkripsi",
     "Enable previews" : "Aktifkan pratinjau",
     "Check for changes" : "Periksa perubahan",
@@ -39,12 +49,19 @@ OC.L10N.register(
     "Saved" : "Disimpan",
     "Generate keys" : "Hasilkan kunci",
     "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
+    "Access key" : "Kunci akses",
+    "Secret key" : "Kunci rahasia",
+    "Builtin" : "Internal",
     "None" : "Tidak ada",
+    "OAuth1" : "OAuth1",
     "App key" : "Kunci Apl",
     "App secret" : "Rahasia Apl",
+    "OAuth2" : "OAuth2",
     "Client ID" : "ID Klien",
     "Client secret" : "Rahasia klien",
+    "Username and password" : "Nama pengguna dan sandi",
     "Password" : "Sandi",
+    "Session credentials" : "Kredensial sesi",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Nama Host",
     "Port" : "Port",
@@ -55,11 +72,15 @@ OC.L10N.register(
     "URL" : "URL",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Lokal",
     "Location" : "lokasi",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
@@ -71,6 +92,7 @@ OC.L10N.register(
     "Scope" : "Skop",
     "External Storage" : "Penyimpanan Eksternal",
     "Folder name" : "Nama folder",
+    "Authentication" : "Otentikasi",
     "Configuration" : "Konfigurasi",
     "Available for" : "Tersedia untuk",
     "Advanced settings" : "Pengaturan Lanjutan",
diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json
index aa4990ec828..9c83475f756 100644
--- a/apps/files_external/l10n/id.json
+++ b/apps/files_external/l10n/id.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Permintaan pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Akses pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Please provide a valid app key and secret." : "Silakan berikan kunci dan kerahasiaan aplikasi yang benar.",
     "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s",
     "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s",
     "External storage" : "Penyimpanan eksternal",
@@ -20,12 +23,19 @@
     "SFTP with secret key login" : "SFTP dengan kunci rahasia masuk",
     "Public key" : "Kunci Public",
     "Storage with id \"%i\" not found" : "Penyimpanan dengan id \"%i\" tidak ditemukan",
+    "Invalid backend or authentication mechanism class" : "Beckend atau kelas mekanisme otentikasi salah.",
     "Invalid mount point" : "Mount point salah",
+    "Objectstore forbidden" : "Objectstore terlarang",
     "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
+    "Unsatisfied backend parameters" : "Parameter backend tidak lengkap",
+    "Unsatisfied authentication mechanism parameters" : "Parameter mekanisme otentikasi tidak lengkap",
+    "Admin-only storage backend \"%s\"" : "Backend penyimpanan hanya-admin \"%s\"",
     "Personal" : "Pribadi",
     "System" : "Sistem",
     "Grant access" : "Berikan hak akses",
     "Access granted" : "Akses diberikan",
+    "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1",
+    "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2",
     "Enable encryption" : "Aktifkan enkripsi",
     "Enable previews" : "Aktifkan pratinjau",
     "Check for changes" : "Periksa perubahan",
@@ -37,12 +47,19 @@
     "Saved" : "Disimpan",
     "Generate keys" : "Hasilkan kunci",
     "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
+    "Access key" : "Kunci akses",
+    "Secret key" : "Kunci rahasia",
+    "Builtin" : "Internal",
     "None" : "Tidak ada",
+    "OAuth1" : "OAuth1",
     "App key" : "Kunci Apl",
     "App secret" : "Rahasia Apl",
+    "OAuth2" : "OAuth2",
     "Client ID" : "ID Klien",
     "Client secret" : "Rahasia klien",
+    "Username and password" : "Nama pengguna dan sandi",
     "Password" : "Sandi",
+    "Session credentials" : "Kredensial sesi",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Nama Host",
     "Port" : "Port",
@@ -53,11 +70,15 @@
     "URL" : "URL",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Lokal",
     "Location" : "lokasi",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
@@ -69,6 +90,7 @@
     "Scope" : "Skop",
     "External Storage" : "Penyimpanan Eksternal",
     "Folder name" : "Nama folder",
+    "Authentication" : "Otentikasi",
     "Configuration" : "Konfigurasi",
     "Available for" : "Tersedia untuk",
     "Advanced settings" : "Pengaturan Lanjutan",
diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js
index 81418098ea0..68e69034857 100644
--- a/apps/files_external/l10n/tr.js
+++ b/apps/files_external/l10n/tr.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Getirme istek jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Getirme erişim jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Please provide a valid app key and secret." : "Lütfen geçerli bir uygulama anahtarı ve gizli bilgisini girin.",
     "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
     "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
     "External storage" : "Harici depolama",
@@ -22,12 +25,19 @@ OC.L10N.register(
     "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
     "Public key" : "Ortak anahtar",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
+    "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
+    "Objectstore forbidden" : "Nesne deposu yasaktır",
     "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"",
+    "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri",
+    "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri",
+    "Admin-only storage backend \"%s\"" : "Sadece yönetici erişimli depolama arkaucu \"%s\"",
     "Personal" : "Kişisel",
     "System" : "Sistem",
     "Grant access" : "Erişimi sağla",
     "Access granted" : "Giriş kabul edildi",
+    "Error configuring OAuth1" : "OAuth1 yapılandırma hatası",
+    "Error configuring OAuth2" : "OAuth2 yapılandırma hatası",
     "Enable encryption" : "Şifrelemeyi aç",
     "Enable previews" : "Önizlemeleri aç",
     "Check for changes" : "Değişiklikleri denetle",
@@ -39,12 +49,19 @@ OC.L10N.register(
     "Saved" : "Kaydedildi",
     "Generate keys" : "Anahtarlar üret",
     "Error generating key pair" : "Anahtar çifti üretirken hata",
+    "Access key" : "Erişim anahtarı",
+    "Secret key" : "Gizli anahtar",
+    "Builtin" : "Yerleşik",
     "None" : "Hiçbiri",
+    "OAuth1" : "OAuth1",
     "App key" : "Uyg. anahtarı",
     "App secret" : "Uyg. parolası",
+    "OAuth2" : "OAuth2",
     "Client ID" : "İstemci kimliği",
     "Client secret" : "İstemci parolası",
+    "Username and password" : "Kullanıcı adı ve parola",
     "Password" : "Parola",
+    "Session credentials" : "Oturum bilgileri",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Makine adı",
     "Port" : "Port",
@@ -55,11 +72,15 @@ OC.L10N.register(
     "URL" : "URL",
     "Secure https://" : "Güvenli https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Güvenli ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Yerel",
     "Location" : "Konum",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Kök",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Not:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
@@ -71,6 +92,7 @@ OC.L10N.register(
     "Scope" : "Kapsam",
     "External Storage" : "Harici Depolama",
     "Folder name" : "Klasör ismi",
+    "Authentication" : "Kimlik Doğrulama",
     "Configuration" : "Yapılandırma",
     "Available for" : "Kullanabilenler",
     "Advanced settings" : "Gelişmiş ayarlar",
diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json
index 48349335bf4..7859e8e08dc 100644
--- a/apps/files_external/l10n/tr.json
+++ b/apps/files_external/l10n/tr.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Getirme istek jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Getirme erişim jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Please provide a valid app key and secret." : "Lütfen geçerli bir uygulama anahtarı ve gizli bilgisini girin.",
     "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
     "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
     "External storage" : "Harici depolama",
@@ -20,12 +23,19 @@
     "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
     "Public key" : "Ortak anahtar",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
+    "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
+    "Objectstore forbidden" : "Nesne deposu yasaktır",
     "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"",
+    "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri",
+    "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri",
+    "Admin-only storage backend \"%s\"" : "Sadece yönetici erişimli depolama arkaucu \"%s\"",
     "Personal" : "Kişisel",
     "System" : "Sistem",
     "Grant access" : "Erişimi sağla",
     "Access granted" : "Giriş kabul edildi",
+    "Error configuring OAuth1" : "OAuth1 yapılandırma hatası",
+    "Error configuring OAuth2" : "OAuth2 yapılandırma hatası",
     "Enable encryption" : "Şifrelemeyi aç",
     "Enable previews" : "Önizlemeleri aç",
     "Check for changes" : "Değişiklikleri denetle",
@@ -37,12 +47,19 @@
     "Saved" : "Kaydedildi",
     "Generate keys" : "Anahtarlar üret",
     "Error generating key pair" : "Anahtar çifti üretirken hata",
+    "Access key" : "Erişim anahtarı",
+    "Secret key" : "Gizli anahtar",
+    "Builtin" : "Yerleşik",
     "None" : "Hiçbiri",
+    "OAuth1" : "OAuth1",
     "App key" : "Uyg. anahtarı",
     "App secret" : "Uyg. parolası",
+    "OAuth2" : "OAuth2",
     "Client ID" : "İstemci kimliği",
     "Client secret" : "İstemci parolası",
+    "Username and password" : "Kullanıcı adı ve parola",
     "Password" : "Parola",
+    "Session credentials" : "Oturum bilgileri",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Makine adı",
     "Port" : "Port",
@@ -53,11 +70,15 @@
     "URL" : "URL",
     "Secure https://" : "Güvenli https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Güvenli ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Yerel",
     "Location" : "Konum",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Kök",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Not:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
@@ -69,6 +90,7 @@
     "Scope" : "Kapsam",
     "External Storage" : "Harici Depolama",
     "Folder name" : "Klasör ismi",
+    "Authentication" : "Kimlik Doğrulama",
     "Configuration" : "Yapılandırma",
     "Available for" : "Kullanabilenler",
     "Advanced settings" : "Gelişmiş ayarlar",
diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js
index 8a4e0cad033..944d39928d0 100644
--- a/apps/user_ldap/l10n/tr.js
+++ b/apps/user_ldap/l10n/tr.js
@@ -32,11 +32,20 @@ OC.L10N.register(
     "Mappings cleared successfully!" : "Eşleştirmeler başarıyla temizlendi!",
     "Error while clearing the mappings." : "Eşleşmeler temizlenirken hata.",
     "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonim atamaya izin verilmiyor. Lütfen bir Kullanıcı DN ve Parola sağlayın.",
+    "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP İşlem hatası. Anonim bağlamaya izin verilmiyor.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Kaydetme başarısız oldu. Veritabanının işlemde olduğundan emin olun. Devam etmeden yeniden yükleyin.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Kipi değiştirmek otomatik LDAP sorgularını etkinleştirecektir. LDAP'ınızın boyutlarına göre bu bir süre alacaktır. Kipi yine de değiştirmek istiyor musunuz?",
     "Mode switch" : "Kip değişimi",
     "Select attributes" : "Nitelikleri seç",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Kullanıcı bulunamadı. Lütfen oturum açtığınız nitelikleri ve kullanıcı adını kontrol edin. Etkili filtre (komut satırı doğrulaması için kopyala-yapıştır için): <br/>",
+    "User found and settings verified." : "Kullanıcı bulundu ve ayarlar doğrulandı.",
     "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Ayarlar doğrulandı ancak tek kullanıcı bulundu. Sadece ilk kullanıcı oturum açabilecek. Lütfen daha dar bir filtre seçin.",
     "An unspecified error occurred. Please check the settings and the log." : "Belirtilmeyen bir hata oluştu. Lütfen ayarları ve günlüğü denetleyin.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Arama filtresi, eşleşmeyen parantez sayısı sebebiyle oluşabilen sözdizimi sorunlarından dolayı geçersiz. Lütfen gözden geçirin.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "LDAP / AD için bir bağlantı hatası oluştu, lütfen istemci, port ve kimlik bilgilerini kontrol edin.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "%uid yer tutucusu eksik. LDAP / AD sorgularında kullanıcı adı ile değiştirilecek.",
+    "Please provide a login name to test against" : "Lütfen deneme için kullanılacak bir kullanıcı adı girin",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "LDAP / AD sunucusu memberOf desteklemediğinden grup kutusu kapatıldı.",
     "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"],
     "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Görüntülenecek kullanıcı adı özelliği algılanamadı. Lütfen gelişmiş ldap ayarlarına girerek kendiniz belirleyin.",
@@ -60,6 +69,9 @@ OC.L10N.register(
     "Verify settings and count groups" : "Ayarları doğrula ve grupları say",
     "When logging in, %s will find the user based on the following attributes:" : "Oturum açılırken, %s, aşağıdaki özniteliklere bağlı kullanıcıyı bulacak:",
     "LDAP / AD Username:" : "LDAP / AD Kullanıcı Adı:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "LDAP / AD kullanıcı adı ile oturum açmaya izin verir.",
+    "LDAP / AD Email Address:" : "LDAP / AD Eposta Adresi:",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Bir eposta kimliği ile oturum açmaya izin verir. Mail ve mailPrimaryAddress'e izin verilir.",
     "Other Attributes:" : "Diğer Nitelikler:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"",
     "Test Loginname" : "Oturum açma adını sına",
diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json
index f3641a9a16d..553dfe6cdbd 100644
--- a/apps/user_ldap/l10n/tr.json
+++ b/apps/user_ldap/l10n/tr.json
@@ -30,11 +30,20 @@
     "Mappings cleared successfully!" : "Eşleştirmeler başarıyla temizlendi!",
     "Error while clearing the mappings." : "Eşleşmeler temizlenirken hata.",
     "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonim atamaya izin verilmiyor. Lütfen bir Kullanıcı DN ve Parola sağlayın.",
+    "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP İşlem hatası. Anonim bağlamaya izin verilmiyor.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Kaydetme başarısız oldu. Veritabanının işlemde olduğundan emin olun. Devam etmeden yeniden yükleyin.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Kipi değiştirmek otomatik LDAP sorgularını etkinleştirecektir. LDAP'ınızın boyutlarına göre bu bir süre alacaktır. Kipi yine de değiştirmek istiyor musunuz?",
     "Mode switch" : "Kip değişimi",
     "Select attributes" : "Nitelikleri seç",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Kullanıcı bulunamadı. Lütfen oturum açtığınız nitelikleri ve kullanıcı adını kontrol edin. Etkili filtre (komut satırı doğrulaması için kopyala-yapıştır için): <br/>",
+    "User found and settings verified." : "Kullanıcı bulundu ve ayarlar doğrulandı.",
     "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Ayarlar doğrulandı ancak tek kullanıcı bulundu. Sadece ilk kullanıcı oturum açabilecek. Lütfen daha dar bir filtre seçin.",
     "An unspecified error occurred. Please check the settings and the log." : "Belirtilmeyen bir hata oluştu. Lütfen ayarları ve günlüğü denetleyin.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Arama filtresi, eşleşmeyen parantez sayısı sebebiyle oluşabilen sözdizimi sorunlarından dolayı geçersiz. Lütfen gözden geçirin.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "LDAP / AD için bir bağlantı hatası oluştu, lütfen istemci, port ve kimlik bilgilerini kontrol edin.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "%uid yer tutucusu eksik. LDAP / AD sorgularında kullanıcı adı ile değiştirilecek.",
+    "Please provide a login name to test against" : "Lütfen deneme için kullanılacak bir kullanıcı adı girin",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "LDAP / AD sunucusu memberOf desteklemediğinden grup kutusu kapatıldı.",
     "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"],
     "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Görüntülenecek kullanıcı adı özelliği algılanamadı. Lütfen gelişmiş ldap ayarlarına girerek kendiniz belirleyin.",
@@ -58,6 +67,9 @@
     "Verify settings and count groups" : "Ayarları doğrula ve grupları say",
     "When logging in, %s will find the user based on the following attributes:" : "Oturum açılırken, %s, aşağıdaki özniteliklere bağlı kullanıcıyı bulacak:",
     "LDAP / AD Username:" : "LDAP / AD Kullanıcı Adı:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "LDAP / AD kullanıcı adı ile oturum açmaya izin verir.",
+    "LDAP / AD Email Address:" : "LDAP / AD Eposta Adresi:",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Bir eposta kimliği ile oturum açmaya izin verir. Mail ve mailPrimaryAddress'e izin verilir.",
     "Other Attributes:" : "Diğer Nitelikler:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"",
     "Test Loginname" : "Oturum açma adını sına",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 8b0fbdbe836..2ed3872dffb 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
+    "Preparing update" : "Préparation de la mise à jour",
     "Turned on maintenance mode" : "Mode de maintenance activé",
     "Turned off maintenance mode" : "Mode de maintenance désactivé",
     "Maintenance mode is kept active" : "Le mode de maintenance est laissé actif",
@@ -172,6 +173,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "La mise à jour a réussi, mais il y a eu des avertissements",
     "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé vers ownCloud.",
     "Couldn't reset password because the token is invalid" : "Impossible de réinitialiser le mot de passe car le jeton n'est pas valable.",
+    "Couldn't reset password because the token is expired" : "Impossible de réinitialiser le mot de passe car le jeton a expiré.",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
     "%s password reset" : "Réinitialisation de votre mot de passe %s",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 2eb2a722298..761132e4bde 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
+    "Preparing update" : "Préparation de la mise à jour",
     "Turned on maintenance mode" : "Mode de maintenance activé",
     "Turned off maintenance mode" : "Mode de maintenance désactivé",
     "Maintenance mode is kept active" : "Le mode de maintenance est laissé actif",
@@ -170,6 +171,7 @@
     "The update was successful. There were warnings." : "La mise à jour a réussi, mais il y a eu des avertissements",
     "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé vers ownCloud.",
     "Couldn't reset password because the token is invalid" : "Impossible de réinitialiser le mot de passe car le jeton n'est pas valable.",
+    "Couldn't reset password because the token is expired" : "Impossible de réinitialiser le mot de passe car le jeton a expiré.",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
     "%s password reset" : "Réinitialisation de votre mot de passe %s",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index ff04fe9900c..b465daa4212 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
+    "Preparing update" : "Felkészülés a frissítésre",
     "Turned on maintenance mode" : "A karbantartási mód bekapcsolva",
     "Turned off maintenance mode" : "A karbantartási mód kikapcsolva",
     "Maintenance mode is kept active" : "Karbantartási mód aktiválva marad",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Javítás hiba:",
     "Following incompatible apps have been disabled: %s" : "A következő nem kompatibilis applikációk lettek tiltva: %s",
     "Following apps have been disabled: %s" : "A következő applikációk lettek tiltva: %s",
+    "Already up to date" : "Már a legfrissebb változat",
     "File is too big" : "A fájl túl nagy",
     "Invalid file provided" : "Érvénytelen fájl van megadva",
     "No image or file provided" : "Nincs kép vagy fájl megadva",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index d7c20ae181b..e8b3e20c33e 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
+    "Preparing update" : "Felkészülés a frissítésre",
     "Turned on maintenance mode" : "A karbantartási mód bekapcsolva",
     "Turned off maintenance mode" : "A karbantartási mód kikapcsolva",
     "Maintenance mode is kept active" : "Karbantartási mód aktiválva marad",
@@ -11,6 +12,7 @@
     "Repair error: " : "Javítás hiba:",
     "Following incompatible apps have been disabled: %s" : "A következő nem kompatibilis applikációk lettek tiltva: %s",
     "Following apps have been disabled: %s" : "A következő applikációk lettek tiltva: %s",
+    "Already up to date" : "Már a legfrissebb változat",
     "File is too big" : "A fájl túl nagy",
     "Invalid file provided" : "Érvénytelen fájl van megadva",
     "No image or file provided" : "Nincs kép vagy fájl megadva",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index 9af2d3bad0c..0540b9ae0bd 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Tidak dapat mengirim Email ke pengguna berikut: %s",
+    "Preparing update" : "Mempersiapkan pembaruan",
     "Turned on maintenance mode" : "Hidupkan mode perawatan",
     "Turned off maintenance mode" : "Matikan mode perawatan",
     "Maintenance mode is kept active" : "Mode Pemeliharaan masih aktif",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Kesalahan perbaikan:",
     "Following incompatible apps have been disabled: %s" : "Aplikasi tidak kompatibel berikut telah dinonaktifkan: %s",
     "Following apps have been disabled: %s" : "Aplikasi berikut telah dinonaktifkan: %s",
+    "Already up to date" : "Sudah yang terbaru",
     "File is too big" : "Berkas terlalu besar",
     "Invalid file provided" : "Berkas yang diberikan tidak sah",
     "No image or file provided" : "Tidak ada gambar atau berkas yang disediakan",
@@ -172,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Pembaruan telah berhasil. Terdapat peringatan.",
     "The update was successful. Redirecting you to ownCloud now." : "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
     "Couldn't reset password because the token is invalid" : "Tidak dapat menyetel ulang sandi karena token tidak sah",
+    "Couldn't reset password because the token is expired" : "Tidak dapat menyetel ulang sandi karena token telah kadaluarsa",
     "Couldn't send reset email. Please make sure your username is correct." : "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.",
     "%s password reset" : "%s sandi disetel ulang",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 79a84db45c5..d03ae4ae4ec 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Tidak dapat mengirim Email ke pengguna berikut: %s",
+    "Preparing update" : "Mempersiapkan pembaruan",
     "Turned on maintenance mode" : "Hidupkan mode perawatan",
     "Turned off maintenance mode" : "Matikan mode perawatan",
     "Maintenance mode is kept active" : "Mode Pemeliharaan masih aktif",
@@ -11,6 +12,7 @@
     "Repair error: " : "Kesalahan perbaikan:",
     "Following incompatible apps have been disabled: %s" : "Aplikasi tidak kompatibel berikut telah dinonaktifkan: %s",
     "Following apps have been disabled: %s" : "Aplikasi berikut telah dinonaktifkan: %s",
+    "Already up to date" : "Sudah yang terbaru",
     "File is too big" : "Berkas terlalu besar",
     "Invalid file provided" : "Berkas yang diberikan tidak sah",
     "No image or file provided" : "Tidak ada gambar atau berkas yang disediakan",
@@ -170,6 +172,7 @@
     "The update was successful. There were warnings." : "Pembaruan telah berhasil. Terdapat peringatan.",
     "The update was successful. Redirecting you to ownCloud now." : "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
     "Couldn't reset password because the token is invalid" : "Tidak dapat menyetel ulang sandi karena token tidak sah",
+    "Couldn't reset password because the token is expired" : "Tidak dapat menyetel ulang sandi karena token telah kadaluarsa",
     "Couldn't send reset email. Please make sure your username is correct." : "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.",
     "%s password reset" : "%s sandi disetel ulang",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index bedc5ce7e26..2b319a8f8fe 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Şu kullanıcılara posta gönderilemedi: %s",
+    "Preparing update" : "Güncelleme hazırlanıyor",
     "Turned on maintenance mode" : "Bakım kipi etkinleştirildi",
     "Turned off maintenance mode" : "Bakım kipi kapatıldı",
     "Maintenance mode is kept active" : "Bakım kipi etkin tutuldu",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "Onarım hatası:",
     "Following incompatible apps have been disabled: %s" : "Aşağıdaki uyumsuz uygulamalar devre dışı bırakıldı: %s",
     "Following apps have been disabled: %s" : "Aşağıdaki uygulamalar devre dışı bırakıldı: %s",
+    "Already up to date" : "Zaten güncel",
+    "File is too big" : "Dosya çok büyük",
     "Invalid file provided" : "Geçersiz dosya sağlandı",
     "No image or file provided" : "Resim veya dosya belirtilmedi",
     "Unknown filetype" : "Bilinmeyen dosya türü",
@@ -35,6 +38,13 @@ OC.L10N.register(
     "Thu." : "Per.",
     "Fri." : "Cum.",
     "Sat." : "Cmt.",
+    "Su" : "Pa",
+    "Mo" : "Pt",
+    "Tu" : "Sa",
+    "We" : "Ça",
+    "Th" : "Pe",
+    "Fr" : "Cu",
+    "Sa" : "Ct",
     "January" : "Ocak",
     "February" : "Şubat",
     "March" : "Mart",
@@ -94,6 +104,8 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "data dizininiz ve dosyalarınız büyük ihtimalle İnternet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu belge dizini dışına almanızı şiddetle tavsiye ederiz.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Hafıza önbelleği ayarlanmamış. Performansın artması için mümkünse lütfen bir memcache ayarlayın. Detaylı bilgiye <a href=\"{docLink}\">belgelendirmemizden</a> ulaşabilirsiniz.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Güvenlik sebepleri ile şiddetle kaçınılması gereken /dev/urandom PHP tarafından okunamıyor. Daha fazla bilgi <a href=\"{docLink}\">belgelendirmemizde</a> bulunabilir.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Kullandığınız PHP sürümü ({version}) artık <a href=\"{phpLink}\">PHP tarafından desteklenmiyor</a>. PHP tarafından sağlanan performans ve güvenlik güncellemelerinden faydalanmak için PHP sürümünüzü güncellemenizi öneririz.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Ters vekil sunucu başlık yapılandırması hatalı veya ownCloud'a güvenilen bir vekil sunucusundan erişiyorsunuz. ownCloud'a güvenilen bir vekil sunucusundan erişmiyorsanız bu bir güvenlik problemidir ve bir saldırganın IP adresinizi taklit etmesine izin verebilir. Ayrıntılı bilgiyi <a href=\"{docLink}\">belgelendirmemizde</a> bulabilirsiniz.",
     "Error occurred while checking server setup" : "Sunucu yapılandırması denetlenirken hata oluştu",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP başlığı \"{expected}\" ile eşleşmek üzere yapılandırılmamış. Bu muhtemel bir güvenlik veya gizlilik riski olduğundan bu ayarı düzeltmenizi öneririz.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP başlığı en az \"{seconds}\" saniye olarak ayarlanmış. İyileştirilmiş güvenlik için <a href=\"{docUrl}\">güvenlik ipuçlarımızda</a> belirtilen HSTS etkinleştirmesini öneririz.",
@@ -162,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Güncelleme başarılı. Uyarılar mevcut.",
     "The update was successful. Redirecting you to ownCloud now." : "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
     "Couldn't reset password because the token is invalid" : "Belirteç geçersiz olduğundan parola sıfırlanamadı",
+    "Couldn't reset password because the token is expired" : "Jeton zaman aşımına uğradığından parola sıfırlanamadı",
     "Couldn't send reset email. Please make sure your username is correct." : "Sıfırlama e-postası gönderilemedi. Lütfen kullanıcı adınızın doğru olduğundan emin olun.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "%s password reset" : "%s parola sıfırlama",
@@ -235,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
     "An internal error occured." : "Dahili bir hata oluştu.",
     "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.",
+    "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?",
     "remember" : "hatırla",
     "Alternative Logins" : "Alternatif Girişler",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>",
@@ -246,6 +260,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Yapılandırmanıza bağlı olarak, bir yönetici olarak bu alan adına güvenmek için aşağıdaki düğmeyi de kullanabilirsiniz.",
     "Add \"%s\" as trusted domain" : "\"%s\" alan adını güvenilir olarak ekle",
+    "App update required" : "Uygulama güncellemesi gerekli",
+    "%s will be updated to version %s" : "%s, %s sürümüne güncellenecek",
+    "These apps will be updated:" : "Bu uygulamalar güncellenecek:",
+    "These incompatible apps will be disabled:" : "Bu uyumsuz uygulamalar kapatılacaklar:",
     "The theme %s has been disabled." : "%s teması devre dışı bırakıldı.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Devam etmeden önce lütfen veritabanının, yapılandırma ve veri klasörlerinin yedeklenmiş olduğundan emin olun.",
     "Start update" : "Güncellemeyi başlat",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index 3925a97627d..26f831b9262 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Şu kullanıcılara posta gönderilemedi: %s",
+    "Preparing update" : "Güncelleme hazırlanıyor",
     "Turned on maintenance mode" : "Bakım kipi etkinleştirildi",
     "Turned off maintenance mode" : "Bakım kipi kapatıldı",
     "Maintenance mode is kept active" : "Bakım kipi etkin tutuldu",
@@ -11,6 +12,8 @@
     "Repair error: " : "Onarım hatası:",
     "Following incompatible apps have been disabled: %s" : "Aşağıdaki uyumsuz uygulamalar devre dışı bırakıldı: %s",
     "Following apps have been disabled: %s" : "Aşağıdaki uygulamalar devre dışı bırakıldı: %s",
+    "Already up to date" : "Zaten güncel",
+    "File is too big" : "Dosya çok büyük",
     "Invalid file provided" : "Geçersiz dosya sağlandı",
     "No image or file provided" : "Resim veya dosya belirtilmedi",
     "Unknown filetype" : "Bilinmeyen dosya türü",
@@ -33,6 +36,13 @@
     "Thu." : "Per.",
     "Fri." : "Cum.",
     "Sat." : "Cmt.",
+    "Su" : "Pa",
+    "Mo" : "Pt",
+    "Tu" : "Sa",
+    "We" : "Ça",
+    "Th" : "Pe",
+    "Fr" : "Cu",
+    "Sa" : "Ct",
     "January" : "Ocak",
     "February" : "Şubat",
     "March" : "Mart",
@@ -92,6 +102,8 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "data dizininiz ve dosyalarınız büyük ihtimalle İnternet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu belge dizini dışına almanızı şiddetle tavsiye ederiz.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Hafıza önbelleği ayarlanmamış. Performansın artması için mümkünse lütfen bir memcache ayarlayın. Detaylı bilgiye <a href=\"{docLink}\">belgelendirmemizden</a> ulaşabilirsiniz.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Güvenlik sebepleri ile şiddetle kaçınılması gereken /dev/urandom PHP tarafından okunamıyor. Daha fazla bilgi <a href=\"{docLink}\">belgelendirmemizde</a> bulunabilir.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Kullandığınız PHP sürümü ({version}) artık <a href=\"{phpLink}\">PHP tarafından desteklenmiyor</a>. PHP tarafından sağlanan performans ve güvenlik güncellemelerinden faydalanmak için PHP sürümünüzü güncellemenizi öneririz.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Ters vekil sunucu başlık yapılandırması hatalı veya ownCloud'a güvenilen bir vekil sunucusundan erişiyorsunuz. ownCloud'a güvenilen bir vekil sunucusundan erişmiyorsanız bu bir güvenlik problemidir ve bir saldırganın IP adresinizi taklit etmesine izin verebilir. Ayrıntılı bilgiyi <a href=\"{docLink}\">belgelendirmemizde</a> bulabilirsiniz.",
     "Error occurred while checking server setup" : "Sunucu yapılandırması denetlenirken hata oluştu",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP başlığı \"{expected}\" ile eşleşmek üzere yapılandırılmamış. Bu muhtemel bir güvenlik veya gizlilik riski olduğundan bu ayarı düzeltmenizi öneririz.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP başlığı en az \"{seconds}\" saniye olarak ayarlanmış. İyileştirilmiş güvenlik için <a href=\"{docUrl}\">güvenlik ipuçlarımızda</a> belirtilen HSTS etkinleştirmesini öneririz.",
@@ -160,6 +172,7 @@
     "The update was successful. There were warnings." : "Güncelleme başarılı. Uyarılar mevcut.",
     "The update was successful. Redirecting you to ownCloud now." : "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
     "Couldn't reset password because the token is invalid" : "Belirteç geçersiz olduğundan parola sıfırlanamadı",
+    "Couldn't reset password because the token is expired" : "Jeton zaman aşımına uğradığından parola sıfırlanamadı",
     "Couldn't send reset email. Please make sure your username is correct." : "Sıfırlama e-postası gönderilemedi. Lütfen kullanıcı adınızın doğru olduğundan emin olun.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "%s password reset" : "%s parola sıfırlama",
@@ -233,6 +246,7 @@
     "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
     "An internal error occured." : "Dahili bir hata oluştu.",
     "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.",
+    "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?",
     "remember" : "hatırla",
     "Alternative Logins" : "Alternatif Girişler",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>",
@@ -244,6 +258,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Yapılandırmanıza bağlı olarak, bir yönetici olarak bu alan adına güvenmek için aşağıdaki düğmeyi de kullanabilirsiniz.",
     "Add \"%s\" as trusted domain" : "\"%s\" alan adını güvenilir olarak ekle",
+    "App update required" : "Uygulama güncellemesi gerekli",
+    "%s will be updated to version %s" : "%s, %s sürümüne güncellenecek",
+    "These apps will be updated:" : "Bu uygulamalar güncellenecek:",
+    "These incompatible apps will be disabled:" : "Bu uyumsuz uygulamalar kapatılacaklar:",
     "The theme %s has been disabled." : "%s teması devre dışı bırakıldı.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Devam etmeden önce lütfen veritabanının, yapılandırma ve veri klasörlerinin yedeklenmiş olduğundan emin olun.",
     "Start update" : "Güncellemeyi başlat",
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index 29ef83f2614..e7fcff74d76 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -2,8 +2,10 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "無法寄送郵件給這些使用者：%s",
+    "Preparing update" : "準備更新",
     "Turned on maintenance mode" : "已啓用維護模式",
     "Turned off maintenance mode" : "已停用維護模式",
+    "Maintenance mode is kept active" : "維護模式維持在開啟狀態",
     "Updated database" : "已更新資料庫",
     "Checked database schema update" : "已檢查資料庫格式更新",
     "Checked database schema update for apps" : "已檢查應用程式的資料庫格式更新",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index bf1e1a5ff5b..2b42231bd7b 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -1,7 +1,9 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "無法寄送郵件給這些使用者：%s",
+    "Preparing update" : "準備更新",
     "Turned on maintenance mode" : "已啓用維護模式",
     "Turned off maintenance mode" : "已停用維護模式",
+    "Maintenance mode is kept active" : "維護模式維持在開啟狀態",
     "Updated database" : "已更新資料庫",
     "Checked database schema update" : "已檢查資料庫格式更新",
     "Checked database schema update for apps" : "已檢查應用程式的資料庫格式更新",
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
index 432ea5c0192..2114b34eddd 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Tidak dapat membaca berkas",
     "App directory already exists" : "Direktori Apl sudah ada",
     "Can't create app folder. Please fix permissions. %s" : "Tidak dapat membuat folder apl. Silakan perbaiki perizinan. %s",
+    "Archive does not contain a directory named %s" : "Arsip tidak berisi direktori yang bernama %s",
     "No source specified when installing app" : "Tidak ada sumber yang ditentukan saat menginstal apl",
     "No href specified when installing app from http" : "Href tidak ditentukan saat menginstal apl dari http",
     "No path specified when installing app from local file" : "Lokasi tidak ditentukan saat menginstal apl dari berkas lokal",
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index 6aeffa363da..cdc17b6ce8e 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Tidak dapat membaca berkas",
     "App directory already exists" : "Direktori Apl sudah ada",
     "Can't create app folder. Please fix permissions. %s" : "Tidak dapat membuat folder apl. Silakan perbaiki perizinan. %s",
+    "Archive does not contain a directory named %s" : "Arsip tidak berisi direktori yang bernama %s",
     "No source specified when installing app" : "Tidak ada sumber yang ditentukan saat menginstal apl",
     "No href specified when installing app from http" : "Href tidak ditentukan saat menginstal apl dari http",
     "No path specified when installing app from local file" : "Lokasi tidak ditentukan saat menginstal apl dari berkas lokal",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index 4532c5c243e..cb0400e63b4 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "No user supplied" : "Nincs megadva felhasználó",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!",
     "Wrong admin recovery password. Please check the password and try again." : "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.",
     "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
     "Enabled" : "Engedélyezve",
     "Not enabled" : "Tiltva",
@@ -115,7 +116,10 @@ OC.L10N.register(
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése, mert ezzel lényegesen jobb a MIME-típusok felismerése.",
     "System locale can not be set to a one which supports UTF-8." : "A rendszer lokalizációs állományai között nem sikerült olyat beállítani, ami támogatja az UTF-8-at.",
     "This means that there might be problems with certain characters in file names." : "Ez azt jelenti, hogy probléma lehet bizonyos karakterekkel a fájlnevekben.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Feltétlenül javasoljuk, hogy telepítse a szükséges csomagokat ahhoz, hogy a rendszere támogassa a következő lokalizációk valamelyikét: %s",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ha a telepítése nem a webkiszolgáló gyökerében van, és a rendszer cron szolgáltatását használja, akkor problémák lehetnek az URL-ek képzésével. Ezek elkerülése érdekében állítsa be a config.php-ban az \"overwrite.cli.url\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Az ütemezett feladat (cronjob) nem futott le parancssorból. A következő hibák tűntek fel:",
+    "All checks passed." : "Minden ellenőrzés sikeres.",
     "Open documentation" : "Dokumentáció megnyitása",
     "Allow apps to use the Share API" : "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
     "Allow users to share via link" : "Engedjük meg az állományok linkekkel történő megosztását",
@@ -138,6 +142,8 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
     "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "A szerveroldali titkosítás egyirányú folyamat. Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később nem lehet visszafordítani.",
+    "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
     "Enable encryption" : "Titkosítás engedélyezése",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nincs titkosítási modul betöltve, kérjük engedélyezd a titkosítási modult az alkalmazások menüben.",
     "Select default encryption module:" : "Alapértelmezett titkosítási modul:",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index a416a2f33ed..34ea7fc681d 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -25,6 +25,7 @@
     "No user supplied" : "Nincs megadva felhasználó",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!",
     "Wrong admin recovery password. Please check the password and try again." : "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.",
     "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
     "Enabled" : "Engedélyezve",
     "Not enabled" : "Tiltva",
@@ -113,7 +114,10 @@
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése, mert ezzel lényegesen jobb a MIME-típusok felismerése.",
     "System locale can not be set to a one which supports UTF-8." : "A rendszer lokalizációs állományai között nem sikerült olyat beállítani, ami támogatja az UTF-8-at.",
     "This means that there might be problems with certain characters in file names." : "Ez azt jelenti, hogy probléma lehet bizonyos karakterekkel a fájlnevekben.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Feltétlenül javasoljuk, hogy telepítse a szükséges csomagokat ahhoz, hogy a rendszere támogassa a következő lokalizációk valamelyikét: %s",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ha a telepítése nem a webkiszolgáló gyökerében van, és a rendszer cron szolgáltatását használja, akkor problémák lehetnek az URL-ek képzésével. Ezek elkerülése érdekében állítsa be a config.php-ban az \"overwrite.cli.url\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Az ütemezett feladat (cronjob) nem futott le parancssorból. A következő hibák tűntek fel:",
+    "All checks passed." : "Minden ellenőrzés sikeres.",
     "Open documentation" : "Dokumentáció megnyitása",
     "Allow apps to use the Share API" : "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
     "Allow users to share via link" : "Engedjük meg az állományok linkekkel történő megosztását",
@@ -136,6 +140,8 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
     "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "A szerveroldali titkosítás egyirányú folyamat. Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később nem lehet visszafordítani.",
+    "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
     "Enable encryption" : "Titkosítás engedélyezése",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nincs titkosítási modul betöltve, kérjük engedélyezd a titkosítási modult az alkalmazások menüben.",
     "Select default encryption module:" : "Alapértelmezett titkosítási modul:",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index d0303b7b221..c36bd864138 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -132,6 +132,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak di root domain dan menggunakan sistem cron, hal tersebut dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah tersebut, mohon atur opsi \"overwrite.cli.url\" pada berkas config.php Anda ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Tidak mungkin untuk mengeksekusi cronjob via CLI. Kesalahan teknis berikut muncul:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon periksa dua kali <a target=\"_blank\" href=\"%s\">panduan instalasi ↗</a>, dan periksa segala kesalahan atau peringatan pada <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Semua pemeriksaan lulus.",
     "Open documentation" : "Buka dokumentasi",
     "Allow apps to use the Share API" : "Izinkan aplikasi untuk menggunakan API Pembagian",
     "Allow users to share via link" : "Izinkan pengguna untuk membagikan via tautan",
@@ -154,6 +155,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
     "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
+    "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Enkripsi server-side adalah proses sekali jalan. Setelah enkripsi diaktifkan, semua berkas mulai saat ini dan selanjutnya akan dienkripsi pada server dan tidak mungkin untuk menonaktifkan enkripsi di lain waktu",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Siapa saja yang memiliki hak akses pada server ownCloud dapat mendeskripsi berkas-berkas Anda dengan mencegat permintaan atau membaca sandi pengguna yang disimpan dalam berkas-berkas sesi teks biasa. Enkripsi server-side tidak serta merta melindungi dari administrator jahat tetapi akan berguna untuk melindungi data Anda pada penyimpanan eksternal.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Tergantung pada modul enkripsi yang sebenarnya, pada umumnya ukuran berkas akan bertambah (sekitar 35%% atau lebih ketika menggunakan modul standar)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Anda disarankan mencadangkan semua kunci enkripsi Anda secara berkala untuk mencegah kehilangan data pemanen (data/<user>/files_encryption dan data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
     "Enable encryption" : "Aktifkan enkripsi",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
     "Select default encryption module:" : "Pilih modul enkripsi baku:",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 11d6c52359c..5f6e21dd843 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -130,6 +130,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak di root domain dan menggunakan sistem cron, hal tersebut dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah tersebut, mohon atur opsi \"overwrite.cli.url\" pada berkas config.php Anda ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Tidak mungkin untuk mengeksekusi cronjob via CLI. Kesalahan teknis berikut muncul:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon periksa dua kali <a target=\"_blank\" href=\"%s\">panduan instalasi ↗</a>, dan periksa segala kesalahan atau peringatan pada <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Semua pemeriksaan lulus.",
     "Open documentation" : "Buka dokumentasi",
     "Allow apps to use the Share API" : "Izinkan aplikasi untuk menggunakan API Pembagian",
     "Allow users to share via link" : "Izinkan pengguna untuk membagikan via tautan",
@@ -152,6 +153,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
     "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
+    "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Enkripsi server-side adalah proses sekali jalan. Setelah enkripsi diaktifkan, semua berkas mulai saat ini dan selanjutnya akan dienkripsi pada server dan tidak mungkin untuk menonaktifkan enkripsi di lain waktu",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Siapa saja yang memiliki hak akses pada server ownCloud dapat mendeskripsi berkas-berkas Anda dengan mencegat permintaan atau membaca sandi pengguna yang disimpan dalam berkas-berkas sesi teks biasa. Enkripsi server-side tidak serta merta melindungi dari administrator jahat tetapi akan berguna untuk melindungi data Anda pada penyimpanan eksternal.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Tergantung pada modul enkripsi yang sebenarnya, pada umumnya ukuran berkas akan bertambah (sekitar 35%% atau lebih ketika menggunakan modul standar)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Anda disarankan mencadangkan semua kunci enkripsi Anda secara berkala untuk mencegah kehilangan data pemanen (data/<user>/files_encryption dan data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
     "Enable encryption" : "Aktifkan enkripsi",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
     "Select default encryption module:" : "Pilih modul enkripsi baku:",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 55493ffbcd6..5316867a882 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -256,7 +256,7 @@ OC.L10N.register(
     "Issued By" : "Emesso da",
     "Valid until %s" : "Valido fino al %s",
     "Import root certificate" : "Importa certificato radice",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è licenziato nei termini della {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
     "Show user backend" : "Mostra il motore utente",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index a3dd09a0b4b..c13d21bf4b7 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -254,7 +254,7 @@
     "Issued By" : "Emesso da",
     "Valid until %s" : "Valido fino al %s",
     "Import root certificate" : "Importa certificato radice",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è licenziato nei termini della {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
     "Show user backend" : "Mostra il motore utente",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 889b2c31d99..89395920948 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "E-posta sunucusu",
     "Log" : "Günlük",
+    "Server status" : "Sunucu durumu",
     "Tips & tricks" : "İpuçları ve hileler",
     "Updates" : "Güncellemeler",
     "Authentication error" : "Kimlik doğrulama hatası",
@@ -30,7 +31,9 @@ OC.L10N.register(
     "Unable to change password" : "Parola değiştirilemiyor",
     "Enabled" : "Etkin",
     "Not enabled" : "Etkin değil",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "uygulama mağazası ve Birleşmiş Bulut Paylaşımından uygulama kurma ve güncelleme",
     "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL eskide kalmış bir sürüm %s kullanıyor (%s). Lütfen işletim sisteminizi güncelleyin yoksa %s gibi özellikler düzgün çalışmayacaktır.",
     "A problem occurred, please check your log files (Error: %s)" : "Bir problem oluştu, lütfen log dosyalarını kontrol edin (Hata: %s)",
     "Migration Completed" : "Taşınma Tamamlandı",
     "Group already exists." : "Grup zaten mevcut.",
@@ -75,6 +78,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Kaldırılıyor ....",
     "Error while uninstalling app" : "Uygulama kaldırılırken hata",
     "Uninstall" : "Kaldır",
+    "An error occurred: {message}" : "Bir hata oluştu: {message}",
     "Select a profile picture" : "Bir profil fotoğrafı seçin",
     "Very weak password" : "Çok güçsüz parola",
     "Weak password" : "Güçsüz parola",
@@ -128,6 +132,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum rehberlerini ↗</a> iki kez denetleyip <a href=\"#log-section\">günlük</a> içerisindeki hata ve uyarılara bakın.",
+    "All checks passed." : "Tüm kontroller geçildi.",
     "Open documentation" : "Belgelendirmeyi aç",
     "Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
     "Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
@@ -150,6 +155,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
     "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
+    "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Sunucu tarafında şifreleme tek yönlü bir işlemdir. Bir defa etkinleştirildiğinde sunucudaki tüm dosyalar şifrelenir ve ileri bir tarihte şifrelemeyi iptal etmek mümkün değildir",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud sunucunuza erişimi olan biri isteklere müdahale ederek veya oturum dosyalarında düz metin olarak saklanan parolayı kullanarak dosyalarınızın şifrelenmesini çözebilir. Bu nedenle sunucu tarafında şifreleme işlemi kötü niyetli sistem yöneticisine karşı koruma sağlamaz ama verinizi harici depolamada tutmanız durumunda yararlıdır.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Gerçek şifreleme modülüne bağlı olarak genel dosya boyutu artar (35%% veya varsayılan modül kullanıldığında daha fazla)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Veri kaybının önüne geçmek için düzenli olarak tüm şifreleme anahtarlarınızı yedeklemelisiniz (data/<user>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
     "Enable encryption" : "Şifrelemeyi aç",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
     "Select default encryption module:" : "Öntanımlı şifreleme modülünü seçin:",
@@ -195,6 +206,7 @@ OC.L10N.register(
     "licensed" : "lisanslı",
     "Documentation:" : "Belgelendirme:",
     "User documentation" : "Kullanıcı belgelendirmesi",
+    "Admin documentation" : "Yönetici belgelendirmesi",
     "Show description …" : "Açıklamayı göster...",
     "Hide description …" : "Açıklamayı gizle...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu uygulama, aşağıdaki bağımlılıklar sağlanmadığından yüklenemiyor:",
@@ -233,6 +245,7 @@ OC.L10N.register(
     "Upload new" : "Yeni yükle",
     "Select new from Files" : "Dosyalardan seç",
     "Remove image" : "Resmi kaldır",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Png veya jpg'den biri olmalıdır. İdeal olanı karedir ama kırpmanıza izin verilecektir. Dosya boyutu 20MB'ı geçemez.",
     "Your avatar is provided by your original account." : "Görüntü resminiz, özgün hesabınız tarafından sağlanıyor.",
     "Cancel" : "İptal",
     "Choose as profile image" : "Profil resmi olarak seç",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index d4cc45eff69..51ec1a007e0 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -8,6 +8,7 @@
     "Cron" : "Cron",
     "Email server" : "E-posta sunucusu",
     "Log" : "Günlük",
+    "Server status" : "Sunucu durumu",
     "Tips & tricks" : "İpuçları ve hileler",
     "Updates" : "Güncellemeler",
     "Authentication error" : "Kimlik doğrulama hatası",
@@ -28,7 +29,9 @@
     "Unable to change password" : "Parola değiştirilemiyor",
     "Enabled" : "Etkin",
     "Not enabled" : "Etkin değil",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "uygulama mağazası ve Birleşmiş Bulut Paylaşımından uygulama kurma ve güncelleme",
     "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL eskide kalmış bir sürüm %s kullanıyor (%s). Lütfen işletim sisteminizi güncelleyin yoksa %s gibi özellikler düzgün çalışmayacaktır.",
     "A problem occurred, please check your log files (Error: %s)" : "Bir problem oluştu, lütfen log dosyalarını kontrol edin (Hata: %s)",
     "Migration Completed" : "Taşınma Tamamlandı",
     "Group already exists." : "Grup zaten mevcut.",
@@ -73,6 +76,7 @@
     "Uninstalling ...." : "Kaldırılıyor ....",
     "Error while uninstalling app" : "Uygulama kaldırılırken hata",
     "Uninstall" : "Kaldır",
+    "An error occurred: {message}" : "Bir hata oluştu: {message}",
     "Select a profile picture" : "Bir profil fotoğrafı seçin",
     "Very weak password" : "Çok güçsüz parola",
     "Weak password" : "Güçsüz parola",
@@ -126,6 +130,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum rehberlerini ↗</a> iki kez denetleyip <a href=\"#log-section\">günlük</a> içerisindeki hata ve uyarılara bakın.",
+    "All checks passed." : "Tüm kontroller geçildi.",
     "Open documentation" : "Belgelendirmeyi aç",
     "Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
     "Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
@@ -148,6 +153,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
     "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
+    "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Sunucu tarafında şifreleme tek yönlü bir işlemdir. Bir defa etkinleştirildiğinde sunucudaki tüm dosyalar şifrelenir ve ileri bir tarihte şifrelemeyi iptal etmek mümkün değildir",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud sunucunuza erişimi olan biri isteklere müdahale ederek veya oturum dosyalarında düz metin olarak saklanan parolayı kullanarak dosyalarınızın şifrelenmesini çözebilir. Bu nedenle sunucu tarafında şifreleme işlemi kötü niyetli sistem yöneticisine karşı koruma sağlamaz ama verinizi harici depolamada tutmanız durumunda yararlıdır.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Gerçek şifreleme modülüne bağlı olarak genel dosya boyutu artar (35%% veya varsayılan modül kullanıldığında daha fazla)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Veri kaybının önüne geçmek için düzenli olarak tüm şifreleme anahtarlarınızı yedeklemelisiniz (data/<user>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
     "Enable encryption" : "Şifrelemeyi aç",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
     "Select default encryption module:" : "Öntanımlı şifreleme modülünü seçin:",
@@ -193,6 +204,7 @@
     "licensed" : "lisanslı",
     "Documentation:" : "Belgelendirme:",
     "User documentation" : "Kullanıcı belgelendirmesi",
+    "Admin documentation" : "Yönetici belgelendirmesi",
     "Show description …" : "Açıklamayı göster...",
     "Hide description …" : "Açıklamayı gizle...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu uygulama, aşağıdaki bağımlılıklar sağlanmadığından yüklenemiyor:",
@@ -231,6 +243,7 @@
     "Upload new" : "Yeni yükle",
     "Select new from Files" : "Dosyalardan seç",
     "Remove image" : "Resmi kaldır",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Png veya jpg'den biri olmalıdır. İdeal olanı karedir ama kırpmanıza izin verilecektir. Dosya boyutu 20MB'ı geçemez.",
     "Your avatar is provided by your original account." : "Görüntü resminiz, özgün hesabınız tarafından sağlanıyor.",
     "Cancel" : "İptal",
     "Choose as profile image" : "Profil resmi olarak seç",
-- 
GitLab


From c86cac6a2b2c269df41f4133e8f918cbb8aca28a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 2 Sep 2015 08:16:27 +0200
Subject: [PATCH 125/783] use config.php value instead of version string

---
 settings/controller/checksetupcontroller.php  |  2 +-
 .../controller/CheckSetupControllerTest.php   | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index 33f94fe4238..ca4eb255f6b 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -143,7 +143,7 @@ class CheckSetupController extends Controller {
 		}
 
 		$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
-		if(OC_Util::getEditionString() !== '') {
+		if(!$this->config->getSystemValue('appstoreenabled', true)) {
 			$features = (string)$this->l10n->t('Federated Cloud Sharing');
 		}
 
diff --git a/tests/settings/controller/CheckSetupControllerTest.php b/tests/settings/controller/CheckSetupControllerTest.php
index 414b1b91e17..2a8a6548ebb 100644
--- a/tests/settings/controller/CheckSetupControllerTest.php
+++ b/tests/settings/controller/CheckSetupControllerTest.php
@@ -384,6 +384,11 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsUsedTlsLibOutdatedWithOlderOpenSsl() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->with('appstoreenabled', true)
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
@@ -391,7 +396,25 @@ class CheckSetupControllerTest extends TestCase {
 		$this->assertSame('cURL is using an outdated OpenSSL version (OpenSSL/1.0.1c). Please update your operating system or features such as installing and updating apps via the app store or Federated Cloud Sharing will not work reliably.', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
 	}
 
+	public function testIsUsedTlsLibOutdatedWithOlderOpenSslAndWithoutAppstore() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->with('appstoreenabled', true)
+			->will($this->returnValue(false));
+		$this->checkSetupController
+			->expects($this->once())
+			->method('getCurlVersion')
+			->will($this->returnValue(['ssl_version' => 'OpenSSL/1.0.1c']));
+		$this->assertSame('cURL is using an outdated OpenSSL version (OpenSSL/1.0.1c). Please update your operating system or features such as Federated Cloud Sharing will not work reliably.', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
+	}
+
 	public function testIsUsedTlsLibOutdatedWithOlderOpenSsl1() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->with('appstoreenabled', true)
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
@@ -416,6 +439,11 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsBuggyNss400() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->with('appstoreenabled', true)
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
-- 
GitLab


From 0f6df2e0b66581b0ff84094acb18d5517b4eb687 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 28 Aug 2015 17:50:40 +0200
Subject: [PATCH 126/783] Allow creating previewss that cover the specified
 dimensions

---
 core/ajax/preview.php   |  2 ++
 lib/private/preview.php | 74 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index fc98d80eb0e..baa0ed4ec61 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -31,6 +31,7 @@ $maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '36';
 $scalingUp = array_key_exists('scalingup', $_GET) ? (bool)$_GET['scalingup'] : true;
 $keepAspect = array_key_exists('a', $_GET) ? true : false;
 $always = array_key_exists('forceIcon', $_GET) ? (bool)$_GET['forceIcon'] : true;
+$mode = array_key_exists('mode', $_GET) ? $_GET['mode'] : 'fill';
 
 if ($file === '') {
 	//400 Bad Request
@@ -56,6 +57,7 @@ if (!$info instanceof OCP\Files\FileInfo || !$always && !\OC::$server->getPrevie
 	$preview->setMaxX($maxX);
 	$preview->setMaxY($maxY);
 	$preview->setScalingUp($scalingUp);
+	$preview->setMode($mode);
 	$preview->setKeepAspect($keepAspect);
 	$preview->showPreview();
 }
diff --git a/lib/private/preview.php b/lib/private/preview.php
index 5dcab476a4f..978da1161c2 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -38,6 +38,9 @@ class Preview {
 	//the thumbnail folder
 	const THUMBNAILS_FOLDER = 'thumbnails';
 
+	const MODE_FILL = 'fill';
+	const MODE_COVER = 'cover';
+
 	//config
 	private $maxScaleFactor;
 	/** @var int maximum width allowed for a preview */
@@ -56,6 +59,7 @@ class Preview {
 	private $scalingUp;
 	private $mimeType;
 	private $keepAspect = false;
+	private $mode = self::MODE_FILL;
 
 	//used to calculate the size of the preview to generate
 	/** @var int $maxPreviewWidth max width a preview can have */
@@ -331,6 +335,19 @@ class Preview {
 		return $this;
 	}
 
+	/**
+	 * Set whether to cover or fill the specified dimensions
+	 *
+	 * @param string $mode
+	 *
+	 * @return \OC\Preview
+	 */
+	public function setMode($mode) {
+		$this->mode = $mode;
+
+		return $this;
+	}
+
 	/**
 	 * Sets whether we need to generate a preview which keeps the aspect ratio of the original file
 	 *
@@ -531,14 +548,22 @@ class Preview {
 	 * @param int $askedWidth
 	 * @param int $askedHeight
 	 *
+	 * @param int $originalWidth
+	 * @param int $originalHeight
 	 * @return \int[]
 	 */
-	private function applyAspectRatio($askedWidth, $askedHeight) {
-		$originalRatio = $this->maxPreviewWidth / $this->maxPreviewHeight;
+	private function applyAspectRatio($askedWidth, $askedHeight, $originalWidth = 0, $originalHeight = 0) {
+		if(!$originalWidth){
+			$originalWidth= $this->maxPreviewWidth;
+		}
+		if (!$originalHeight) {
+			$originalHeight = $this->maxPreviewHeight;
+		}
+		$originalRatio = $originalWidth / $originalHeight;
 		// Defines the box in which the preview has to fit
 		$scaleFactor = $this->scalingUp ? $this->maxScaleFactor : 1;
-		$askedWidth = min($askedWidth, $this->maxPreviewWidth * $scaleFactor);
-		$askedHeight = min($askedHeight, $this->maxPreviewHeight * $scaleFactor);
+		$askedWidth = min($askedWidth, $originalWidth * $scaleFactor);
+		$askedHeight = min($askedHeight, $originalHeight * $scaleFactor);
 
 		if ($askedWidth / $originalRatio < $askedHeight) {
 			// width restricted
@@ -550,6 +575,32 @@ class Preview {
 		return [(int)$askedWidth, (int)$askedHeight];
 	}
 
+	/**
+	 * Resizes the boundaries to cover the area
+	 *
+	 * @param int $askedWidth
+	 * @param int $askedHeight
+	 * @param int $previewWidth
+	 * @param int $previewHeight
+	 * @return \int[]
+	 */
+	private function applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight) {
+		$originalRatio = $previewWidth / $previewHeight;
+		// Defines the box in which the preview has to fit
+		$scaleFactor = $this->scalingUp ? $this->maxScaleFactor : 1;
+		$askedWidth = min($askedWidth, $previewWidth * $scaleFactor);
+		$askedHeight = min($askedHeight, $previewHeight * $scaleFactor);
+
+		if ($askedWidth / $originalRatio > $askedHeight) {
+			// height restricted
+			$askedHeight = round($askedWidth / $originalRatio);
+		} else {
+			$askedWidth = round($askedHeight * $originalRatio);
+		}
+
+		return [(int)$askedWidth, (int)$askedHeight];
+	}
+
 	/**
 	 * Makes sure an upscaled preview doesn't end up larger than the max dimensions defined in the
 	 * config
@@ -791,7 +842,15 @@ class Preview {
 		 */
 		if ($this->keepAspect) {
 			list($askedWidth, $askedHeight) =
-				$this->applyAspectRatio($askedWidth, $askedHeight);
+				$this->applyAspectRatio($askedWidth, $askedHeight, $previewWidth, $previewHeight);
+		}
+
+		if ($this->mode === self::MODE_COVER) {
+			list($scaleWidth, $scaleHeight) =
+				$this->applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight);
+		} else {
+			$scaleWidth = $askedWidth;
+			$scaleHeight = $askedHeight;
 		}
 
 		/**
@@ -799,7 +858,7 @@ class Preview {
 		 * Takes the scaling ratio into consideration
 		 */
 		list($newPreviewWidth, $newPreviewHeight) = $this->scale(
-			$image, $askedWidth, $askedHeight, $previewWidth, $previewHeight
+			$image, $scaleWidth, $scaleHeight, $previewWidth, $previewHeight
 		);
 
 		// The preview has been resized and should now have the asked dimensions
@@ -1000,6 +1059,9 @@ class Preview {
 		if ($this->keepAspect && !$isMaxPreview) {
 			$previewPath .= '-with-aspect';
 		}
+		if ($this->mode === self::MODE_COVER) {
+			$previewPath .= '-cover';
+		}
 		$previewPath .= '.png';
 
 		return $previewPath;
-- 
GitLab


From c6060f53cd370dec1960a6bbf14a5788b75467d4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 28 Aug 2015 20:14:48 +0200
Subject: [PATCH 127/783] allow handling thumbnail errors

---
 apps/files/js/mainfileinfodetailview.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index f647a0de2a9..e33c0edb1d6 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -132,7 +132,10 @@
 						y: 75,
 						callback: function(previewUrl) {
 							$iconDiv.css('background-image', 'url("' + previewUrl + '")');
-						}
+						},
+						error: function() {
+							this.$el.find('.thumbnailContainer').removeClass('image'); //fall back to regular view
+						}.bind(this)
 					});
 				} else {
 					// TODO: special icons / shared / external
-- 
GitLab


From e85620ab69a0a6ef5cec5bd1e6d753e08379c43d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 28 Aug 2015 17:51:26 +0200
Subject: [PATCH 128/783] larger preview for images in the sidebar

---
 apps/files/css/detailsView.css          | 21 ++++++++++++
 apps/files/js/fileinfomodel.js          |  9 +++++
 apps/files/js/filelist.js               | 13 ++++++-
 apps/files/js/mainfileinfodetailview.js | 45 +++++++++++++++++++++----
 4 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index ffead923124..8eded7acda1 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -19,6 +19,27 @@
 	float: left;
 }
 
+#app-sidebar .thumbnailContainer.image {
+	margin-left: -15px;
+	margin-right: -35px; /* 15 + 20 for the close button */
+	margin-top: -15px;
+}
+
+#app-sidebar .image .thumbnail {
+	width:100%;
+	display:block;
+	height: 250px;
+	background-repeat: no-repeat;
+	background-position: 50% top;
+	background-size: 100%;
+	float: none;
+	margin: 0;
+}
+
+#app-sidebar .image.portrait .thumbnail {
+	background-size: contain;
+}
+
 #app-sidebar .thumbnail {
 	width: 75px;
 	height: 75px;
diff --git a/apps/files/js/fileinfomodel.js b/apps/files/js/fileinfomodel.js
index 05060854fba..1c850239cdc 100644
--- a/apps/files/js/fileinfomodel.js
+++ b/apps/files/js/fileinfomodel.js
@@ -52,6 +52,15 @@
 			return this.get('mimetype') === 'httpd/unix-directory';
 		},
 
+		/**
+		 * Returns whether this file is an image
+		 *
+		 * @return {boolean} true if this is an image, false otherwise
+		 */
+		isImage: function() {
+			return this.get('mimetype').substr(0, 6) === 'image/';
+		},
+
 		/**
 		 * Returns the full path to this file
 		 *
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index ac96d587015..9593ee79e66 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1359,6 +1359,12 @@
 			if (options.y) {
 				urlSpec.y = options.y;
 			}
+			if (options.a) {
+				urlSpec.a = options.a;
+			}
+			if (options.mode) {
+				urlSpec.mode = options.mode;
+			}
 
 			if (etag){
 				// use etag as cache buster
@@ -1377,9 +1383,14 @@
 			img.onload = function(){
 				// if loading the preview image failed (no preview for the mimetype) then img.width will < 5
 				if (img.width > 5) {
-					ready(previewURL);
+					ready(previewURL, img);
+				} else if (options.error) {
+					options.error();
 				}
 			};
+			if (options.error) {
+				img.onerror = options.error;
+			}
 			img.src = previewURL;
 		},
 
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index e33c0edb1d6..785eed8d712 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -10,7 +10,7 @@
 
 (function() {
 	var TEMPLATE =
-		'<a href="#" class="thumbnail action-default"></a>' +
+		'<div class="thumbnailContainer"><a href="#" class="thumbnail action-default"></a></div>' +
 		'<div class="file-details-container">' +
 		'<div class="fileName"><h3 title="{{name}}" class="ellipsis">{{name}}</h3></div>' +
 		'	<div class="file-details ellipsis">' +
@@ -106,6 +106,7 @@
 			if (this.model) {
 				var isFavorite = (this.model.get('tags') || []).indexOf(OC.TAG_FAVORITE) >= 0;
 				this.$el.html(this.template({
+					type: this.model.isImage()? 'image': '',
 					nameLabel: t('files', 'Name'),
 					name: this.model.get('displayName') || this.model.get('name'),
 					pathLabel: t('files', 'Path'),
@@ -123,18 +124,50 @@
 
 				// TODO: we really need OC.Previews
 				var $iconDiv = this.$el.find('.thumbnail');
+				$iconDiv.addClass('icon-loading');
+				$container = this.$el.find('.thumbnailContainer');
 				if (!this.model.isDirectory()) {
 					this._fileList.lazyLoadPreview({
 						path: this.model.getFullPath(),
 						mime: this.model.get('mimetype'),
 						etag: this.model.get('etag'),
-						x: 75,
-						y: 75,
-						callback: function(previewUrl) {
-							$iconDiv.css('background-image', 'url("' + previewUrl + '")');
-						},
+						y: this.model.isImage() ? 250: 75,
+						x: this.model.isImage() ? 99999 /* only limit on y */ : 75,
+						a: this.model.isImage() ? 1 : null,
+						callback: function(previewUrl, img) {
+							$iconDiv.previewImg = previewUrl;
+							if (img) {
+								$iconDiv.removeClass('icon-loading');
+								if(img.height > img.width) {
+									$container.addClass('portrait');
+								}
+							}
+							if (this.model.isImage() && img) {
+								$iconDiv.parent().addClass('image');
+								var targetHeight = img.height / window.devicePixelRatio;
+								if (targetHeight <= 75) {
+									$container.removeClass('image'); // small enough to fit in normaly
+									targetHeight = 75;
+								}
+							} else {
+								targetHeight = 75;
+							}
+
+							// only set background when we have an actual preview
+							// when we dont have a preview we show the mime icon in the error handler
+							if (img) {
+								$iconDiv.css({
+									'background-image': 'url("' + previewUrl + '")',
+									'height': targetHeight
+								});
+							}
+						}.bind(this),
 						error: function() {
+							$iconDiv.removeClass('icon-loading');
 							this.$el.find('.thumbnailContainer').removeClass('image'); //fall back to regular view
+							$iconDiv.css({
+								'background-image': 'url("' + $iconDiv.previewImg + '")'
+							});
 						}.bind(this)
 					});
 				} else {
-- 
GitLab


From 36e26c6f090ae3fa5ebc678cce216820ff21a3e7 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 2 Sep 2015 12:12:31 +0200
Subject: [PATCH 129/783] Use "json_encode" and "json_decode" instead of
 unserialize

---
 apps/user_ldap/lib/connection.php | 4 ++--
 apps/user_ldap/lib/proxy.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 6f2fdce1b5f..f6b123babd0 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -206,7 +206,7 @@ class Connection extends LDAPUtility {
 		}
 		$key = $this->getCacheKey($key);
 
-		return unserialize(base64_decode($this->cache->get($key)));
+		return json_decode(base64_decode($this->cache->get($key)));
 	}
 
 	/**
@@ -240,7 +240,7 @@ class Connection extends LDAPUtility {
 			return null;
 		}
 		$key   = $this->getCacheKey($key);
-		$value = base64_encode(serialize($value));
+		$value = base64_encode(json_encode($value));
 		$this->cache->set($key, $value, $this->configuration->ldapCacheTTL);
 	}
 
diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php
index ef01213990c..2a423cb0e4b 100644
--- a/apps/user_ldap/lib/proxy.php
+++ b/apps/user_ldap/lib/proxy.php
@@ -161,7 +161,7 @@ abstract class Proxy {
 		}
 		$key = $this->getCacheKey($key);
 
-		return unserialize(base64_decode($this->cache->get($key)));
+		return json_decode(base64_decode($this->cache->get($key)));
 	}
 
 	/**
@@ -185,7 +185,7 @@ abstract class Proxy {
 			return;
 		}
 		$key   = $this->getCacheKey($key);
-		$value = base64_encode(serialize($value));
+		$value = base64_encode(json_encode($value));
 		$this->cache->set($key, $value, '2592000');
 	}
 
-- 
GitLab


From ba9457264fb1dcc05e3cf4dd6b9b21ba47cb30f9 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Wed, 2 Sep 2015 12:32:16 +0200
Subject: [PATCH 130/783] add title attribute for the login button

---
 core/templates/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/templates/login.php b/core/templates/login.php
index 50ca6febf08..513988876e1 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -57,7 +57,7 @@ script('core', [
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 		</p>
 
-		<input type="submit" id="submit" class="login primary icon-confirm" value="" disabled="disabled"/>
+		<input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
 
 		<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
 		<a id="lost-password" class="warning" href="">
-- 
GitLab


From 772d39f006ddebc091d2be0af6153b66dd8d27a8 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 2 Sep 2015 07:08:44 -0400
Subject: [PATCH 131/783] [tx-robot] updated from transifex

---
 apps/files/l10n/zh_CN.js   |  3 ++
 apps/files/l10n/zh_CN.json |  3 ++
 core/l10n/zh_CN.js         | 17 ++++++++
 core/l10n/zh_CN.json       | 17 ++++++++
 settings/l10n/zh_CN.js     | 89 ++++++++++++++++++++++++++++++++++++++
 settings/l10n/zh_CN.json   | 89 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 218 insertions(+)

diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
index 92945f43ba5..9633e2961a9 100644
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@@ -67,6 +67,8 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} 的存储空间即将用完 ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的存储空间即将用完 ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["匹配“{filter}”"],
+    "Path" : "路径",
+    "_%n byte_::_%n bytes_" : ["%n 字节"],
     "Favorited" : "已收藏",
     "Favorite" : "收藏",
     "An error occurred while trying to update the tags" : "更新标签时出错",
@@ -90,6 +92,7 @@ OC.L10N.register(
     "File handling" : "文件处理",
     "Maximum upload size" : "最大上传大小",
     "max. possible: " : "最大允许: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "对于 PHP-FPM 这个值保存后可能需要长达5分钟才会生效。",
     "Save" : "保存",
     "Can not be edited from here due to insufficient permissions." : "由于权限不足无法在此编辑。",
     "Settings" : "设置",
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index 5bd652a3444..b803908729f 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -65,6 +65,8 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} 的存储空间即将用完 ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的存储空间即将用完 ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["匹配“{filter}”"],
+    "Path" : "路径",
+    "_%n byte_::_%n bytes_" : ["%n 字节"],
     "Favorited" : "已收藏",
     "Favorite" : "收藏",
     "An error occurred while trying to update the tags" : "更新标签时出错",
@@ -88,6 +90,7 @@
     "File handling" : "文件处理",
     "Maximum upload size" : "最大上传大小",
     "max. possible: " : "最大允许: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "对于 PHP-FPM 这个值保存后可能需要长达5分钟才会生效。",
     "Save" : "保存",
     "Can not be edited from here due to insufficient permissions." : "由于权限不足无法在此编辑。",
     "Settings" : "设置",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index e82635fe946..4af50e61c13 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "无法发送邮件到用户: %s ",
+    "Preparing update" : "正在准备更新",
     "Turned on maintenance mode" : "启用维护模式",
     "Turned off maintenance mode" : "关闭维护模式",
     "Maintenance mode is kept active" : "维护模式已被启用",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "修复错误：",
     "Following incompatible apps have been disabled: %s" : "下列不兼容应用已经被禁用：%s",
     "Following apps have been disabled: %s" : "下列应用已经被禁用：%s",
+    "Already up to date" : "已经是最新",
     "File is too big" : "文件太大",
     "Invalid file provided" : "提供了无效文件",
     "No image or file provided" : "没有提供图片或文件",
@@ -36,6 +38,13 @@ OC.L10N.register(
     "Thu." : "周四",
     "Fri." : "周五",
     "Sat." : "周六",
+    "Su" : "Su",
+    "Mo" : "Mo",
+    "Tu" : "Tu",
+    "We" : "We",
+    "Th" : "Th",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
     "January" : "一月",
     "February" : "二月",
     "March" : "三月",
@@ -95,6 +104,8 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "你的数据目录和你的文件可能从互联网被访问到。.htaccess 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a href=\"{docLink}\">文档</a> 。",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom 无法被 PHP 读取，处于安全原因，这是强烈不推荐的。请查看<a href=\"{docLink}\">文档</a>了解详情。",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "你的 PHP 版本 ({version}) 不再被 <a href=\"{phpLink}\"> PHP </a>支持。我们建议您升级您的PHP版本，以便获得 PHP 性能和安全提升。",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "反向代理头配置不正确，或者您正从一个受信任的代理访问ownCloud。如果你不是通过受信任的代理访问 ownCloud，这将引发一个安全问题，可能由于 ownCloud IP 地址可见导致欺骗攻击。更多信息可以查看我们的 <a href=\"{docLink}\">文档</a>。",
     "Error occurred while checking server setup" : "当检查服务器启动时出错",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 头部没有配置和 \"{expected}\" 的一样。这是一个潜在的安全或者隐私风险，我们调整这项设置。",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP 严格传输安全（Strict-Transport-Security）报头未配置到至少“{seconds}”秒。处于增强安全性考虑，我们推荐按照<a href=\"{docUrl}\">安全提示</a>启用 HSTS。",
@@ -163,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "更新成功。有警告。",
     "The update was successful. Redirecting you to ownCloud now." : "更新成功。正在重定向至 ownCloud。",
     "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码",
+    "Couldn't reset password because the token is expired" : "无法重设密码，因为令牌已过期",
     "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件，请检查您的用户名是否正确。",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
     "%s password reset" : "重置 %s 的密码",
@@ -236,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "请联系你的管理员。",
     "An internal error occured." : "发生了内部错误。",
     "Please try again or contact your administrator." : "请重试或联系管理员。",
+    "Wrong password. Reset it?" : "密码错误。要重置么？",
     "remember" : "记住",
     "Alternative Logins" : "其他登录方式",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<br><a href=\"%s\">现在查看！</a><br><br>",
@@ -247,6 +260,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
     "Add \"%s\" as trusted domain" : "添加 \"%s\"为信任域",
+    "App update required" : "必须的应用更新",
+    "%s will be updated to version %s" : "%s 将会更新至版本 %s",
+    "These apps will be updated:" : "以下应用将被更新：",
+    "These incompatible apps will be disabled:" : "这些不兼容的应用程序将被禁用：",
     "The theme %s has been disabled." : "%s 主题已被禁用。",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
     "Start update" : "开始更新",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index d47be1b0c5d..b485c703e36 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "无法发送邮件到用户: %s ",
+    "Preparing update" : "正在准备更新",
     "Turned on maintenance mode" : "启用维护模式",
     "Turned off maintenance mode" : "关闭维护模式",
     "Maintenance mode is kept active" : "维护模式已被启用",
@@ -11,6 +12,7 @@
     "Repair error: " : "修复错误：",
     "Following incompatible apps have been disabled: %s" : "下列不兼容应用已经被禁用：%s",
     "Following apps have been disabled: %s" : "下列应用已经被禁用：%s",
+    "Already up to date" : "已经是最新",
     "File is too big" : "文件太大",
     "Invalid file provided" : "提供了无效文件",
     "No image or file provided" : "没有提供图片或文件",
@@ -34,6 +36,13 @@
     "Thu." : "周四",
     "Fri." : "周五",
     "Sat." : "周六",
+    "Su" : "Su",
+    "Mo" : "Mo",
+    "Tu" : "Tu",
+    "We" : "We",
+    "Th" : "Th",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
     "January" : "一月",
     "February" : "二月",
     "March" : "三月",
@@ -93,6 +102,8 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "你的数据目录和你的文件可能从互联网被访问到。.htaccess 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a href=\"{docLink}\">文档</a> 。",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom 无法被 PHP 读取，处于安全原因，这是强烈不推荐的。请查看<a href=\"{docLink}\">文档</a>了解详情。",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "你的 PHP 版本 ({version}) 不再被 <a href=\"{phpLink}\"> PHP </a>支持。我们建议您升级您的PHP版本，以便获得 PHP 性能和安全提升。",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "反向代理头配置不正确，或者您正从一个受信任的代理访问ownCloud。如果你不是通过受信任的代理访问 ownCloud，这将引发一个安全问题，可能由于 ownCloud IP 地址可见导致欺骗攻击。更多信息可以查看我们的 <a href=\"{docLink}\">文档</a>。",
     "Error occurred while checking server setup" : "当检查服务器启动时出错",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 头部没有配置和 \"{expected}\" 的一样。这是一个潜在的安全或者隐私风险，我们调整这项设置。",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP 严格传输安全（Strict-Transport-Security）报头未配置到至少“{seconds}”秒。处于增强安全性考虑，我们推荐按照<a href=\"{docUrl}\">安全提示</a>启用 HSTS。",
@@ -161,6 +172,7 @@
     "The update was successful. There were warnings." : "更新成功。有警告。",
     "The update was successful. Redirecting you to ownCloud now." : "更新成功。正在重定向至 ownCloud。",
     "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码",
+    "Couldn't reset password because the token is expired" : "无法重设密码，因为令牌已过期",
     "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件，请检查您的用户名是否正确。",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
     "%s password reset" : "重置 %s 的密码",
@@ -234,6 +246,7 @@
     "Please contact your administrator." : "请联系你的管理员。",
     "An internal error occured." : "发生了内部错误。",
     "Please try again or contact your administrator." : "请重试或联系管理员。",
+    "Wrong password. Reset it?" : "密码错误。要重置么？",
     "remember" : "记住",
     "Alternative Logins" : "其他登录方式",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<br><a href=\"%s\">现在查看！</a><br><br>",
@@ -245,6 +258,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
     "Add \"%s\" as trusted domain" : "添加 \"%s\"为信任域",
+    "App update required" : "必须的应用更新",
+    "%s will be updated to version %s" : "%s 将会更新至版本 %s",
+    "These apps will be updated:" : "以下应用将被更新：",
+    "These incompatible apps will be disabled:" : "这些不兼容的应用程序将被禁用：",
     "The theme %s has been disabled." : "%s 主题已被禁用。",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
     "Start update" : "开始更新",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 36835692c25..6b6d50dccb2 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -3,12 +3,14 @@ OC.L10N.register(
     {
     "APCu" : "APCu",
     "Redis" : "Redis",
+    "Security & setup warnings" : "安全 & 设置警告",
     "Sharing" : "共享",
     "Server-side encryption" : "服务器端加密",
     "External Storage" : "外部存储",
     "Cron" : "计划任务",
     "Email server" : "电子邮件服务器",
     "Log" : "日志",
+    "Server status" : "服务器状态",
     "Tips & tricks" : "技巧提示",
     "Updates" : "更新",
     "Authentication error" : "认证错误",
@@ -25,20 +27,45 @@ OC.L10N.register(
     "No user supplied" : "没有满足的用户",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "请提供管理员恢复密码，否则所有用户的数据都将遗失。",
     "Wrong admin recovery password. Please check the password and try again." : "错误的管理员恢复密码。请检查密码并重试。",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "后端不支持密码更改，但用户的加密密钥已成功更新。",
     "Unable to change password" : "不能更改密码",
     "Enabled" : "开启",
     "Not enabled" : "未启用",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "通过应用程序商店或联合云共享安装和更新应用程序",
     "Federated Cloud Sharing" : "联合云共享",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL使用了过时 %s 版本 (%s)。请更新你的操作系统或功能比如 %s 将无法可靠地工作。",
+    "A problem occurred, please check your log files (Error: %s)" : "出现了故障，请检查你的日志文件 (错误: %s)",
     "Migration Completed" : "迁移完成",
+    "Group already exists." : "组已经存在。",
+    "Unable to add group." : "无法添加组。",
+    "Unable to delete group." : "无法删除组",
+    "log-level out of allowed range" : "日志级别超出允许的范围",
     "Saved" : "已保存",
     "test email settings" : "测试电子邮件设置",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "在发送电子邮件时出现问题。请修改您的设置。 (错误: %s)",
     "Email sent" : "邮件已发送",
     "You need to set your user email before being able to send test emails." : "在发送测试邮件前您需要设置您的用户电子邮件。",
+    "Invalid mail address" : "无效的电子邮件地址",
+    "A user with that name already exists." : "使用该名称的用户已存在。",
+    "Unable to create user." : "无法创建用户。",
+    "Your %s account was created" : "你的帐户 %s 已创建",
+    "Unable to delete user." : "不能删除用户",
+    "Forbidden" : "被禁止",
+    "Invalid user" : "用户无效",
+    "Unable to change mail address" : "无法更改邮箱地址",
     "Email saved" : "电子邮件已保存",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "你真的希望添加 \"{domain}\" 为信任域？",
     "Add trusted domain" : "添加信任域",
+    "Migration in progress. Please wait until the migration is finished" : "迁移正在进行中。请等待，直到完成迁移",
+    "Migration started …" : "迁移开始...",
     "Sending..." : "正在发送...",
+    "Official" : "官方",
+    "Approved" : "已认可",
+    "Experimental" : "实验",
     "All" : "全部",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方应用是由 ownCloud 社区开发。他们提供 ownCloud 的功能核心并准备用于生产。",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "已认可的应用是由值得信赖的开发商开发，并已通过了一个粗略的安全检查。他们放在一个开放的代码库并且维护人员认为他们是稳定的差不多可以正常使用。",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "此应用未检查安全问题，它是新的或已知是不稳定的。安装风险自担。",
     "Update to %s" : "更新为 %s",
     "Please wait...." : "请稍等....",
     "Error while disabling app" : "禁用 app 时出错",
@@ -51,6 +78,7 @@ OC.L10N.register(
     "Uninstalling ...." : "卸载中....",
     "Error while uninstalling app" : "卸载应用时发生了一个错误",
     "Uninstall" : "卸载",
+    "An error occurred: {message}" : "发生错误： {message}",
     "Select a profile picture" : "选择头像",
     "Very weak password" : "非常弱的密码",
     "Weak password" : "弱密码",
@@ -59,18 +87,22 @@ OC.L10N.register(
     "Strong password" : "强密码",
     "Valid until {date}" : "有效期至 {date}",
     "Delete" : "删除",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。",
     "Groups" : "组",
     "Unable to delete {objName}" : "无法删除 {objName}",
     "Error creating group" : "创建组时出错",
     "A valid group name must be provided" : "请提供一个有效的组名称",
     "deleted {groupName}" : "已删除 {groupName}",
     "undo" : "撤销",
+    "no group" : "没有组",
     "never" : "从不",
     "deleted {userName}" : "已删除 {userName}",
     "add group" : "增加组",
+    "Changing the password will result in data loss, because data recovery is not available for this user" : "更改密码会导致数据丢失，因为数据恢复不适用于此用户",
     "A valid username must be provided" : "必须提供合法的用户名",
     "Error creating user" : "创建用户出错",
     "A valid password must be provided" : "必须提供合法的密码",
+    "A valid email must be provided" : "必须提供合法的用户名",
     "__language_name__" : "简体中文",
     "Sync clients" : "客户端",
     "Personal info" : "个人信息",
@@ -86,11 +118,21 @@ OC.L10N.register(
     "NT LAN Manager" : "NT LAN 管理器",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 似乎没有设置好查询的系统环境变量。 用 getenv(\\\"PATH\\\") 测试只返回一个空值。",
+    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "请检查PHP配置说明和服务器的 PHP 配置的安装文档，使用 PHP-FPM 时尤其如此。",
+    "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "只读配置已启用。这样可防止通过 WEB 接口设置一些配置。此外，每次更新后该文件需要手动设置为可写。",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "你的服务器是运行于 Microsoft Windows 系统。我们强烈推荐使用 Linux 系统以获得最佳的用户体验。比如中文文件夹和文件名支持。",
+    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s 下版本 %2$s 已安装。基于稳定和性能的原因，我们强烈建议更新至 %1$s 版本。",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
     "System locale can not be set to a one which supports UTF-8." : "系统语系无法设置为支持 UTF-8 的语系。",
     "This means that there might be problems with certain characters in file names." : "这意味着一些文件名中的特定字符可能有问题。",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "我们强烈建议安装在系统上所需的软件包支持以下区域设置之一： %s.",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你不是安装在网域根目录而且又使用系统定时计划任务，那么可以导致 URL 链接生成问题。为了避免这些问题，请在你的 Config.php 文件中设置 \\\"overwrite.cli.url\\\" 选项为 webroot 安装根目录 (建议: \\\"%s\\\")",
+    "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "由于下面的错误，无法通过 CLI 执行定时计划任务:",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "请点击检查 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 安装向导 ↗</a>, 点击 <a href=\\\"#log-section\\\"> 日志 </a>查看详细错误和警告。",
+    "All checks passed." : "所有检查已通过。",
     "Open documentation" : "打开文档",
     "Allow apps to use the Share API" : "允许应用软件使用共享API",
     "Allow users to share via link" : "允许用户通过链接分享文件",
@@ -106,12 +148,25 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "允许用户发送共享文件的邮件通知给其他用户",
     "Exclude groups from sharing" : "在分享中排除组",
     "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
+    "Last cron job execution: %s." : "上次定时任务执行于： %s.",
+    "Last cron job execution: %s. Something seems wrong." : "上次定时任务执行于: %s. 似乎有些问题。",
     "Cron was not executed yet!" : "定时任务还未被执行！",
     "Execute one task with each page loaded" : "每个页面加载后执行一个任务",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。",
     "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
     "Enable server-side encryption" : "启用服务器端加密",
+    "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "服务器端加密是一个单向的过程。一旦启用加密，从该点向前所有文件都将在服务器上进行加密，它将无法在以后禁用加密",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "只要有权访问您的 ownCloud 服务器就可能解密你的文件，通过截获请求或读出以纯文本会话文件存储的用户密码。服务端加密。它不仅让你免遭恶意的管理员查看隐私，在保护你在外部托管的存储中的数据也非常有用。",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "根据实际加密模块上的一般文件大小而增加 (使用默认的模块时，35%% 以上)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "你应该定期备份所有加密密钥，以防数据永久丢失 (data/<user>/files_encryption 和 data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
     "Enable encryption" : "启用加密",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "没有加载加密模块，请在 APP 应用菜单中启用加密模块。",
+    "Select default encryption module:" : "选择默认的加密模块：",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "你需要升级你的加密密钥 (旧版 ownCloud <= 8.0) 。 请在应用中启用 \\\"Default encryption module\\\" 并运行 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "您需要将加密密钥从旧版(ownCloud<=8.0)迁移到新版。",
+    "Start migration" : "开始迁移",
     "This is used for sending out notifications." : "这被用于发送通知。",
     "Send mode" : "发送模式",
     "Encryption" : "加密",
@@ -124,26 +179,49 @@ OC.L10N.register(
     "Credentials" : "凭证",
     "SMTP Username" : "SMTP 用户名",
     "SMTP Password" : "SMTP 密码",
+    "Store credentials" : "存储凭据",
     "Test email settings" : "测试电子邮件设置",
     "Send email" : "发送邮件",
     "Log level" : "日志级别",
+    "Download logfile" : "下载日志文件",
     "More" : "更多",
     "Less" : "更少",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "日志文件超过 100 MB。下载可能需要一些时间！",
+    "Transactional File Locking is enabled." : "事务文件锁定已启用。",
+    "Transactional File Locking is disabled." : "事务文件锁定已禁用。",
+    "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite 被用作数据库。对于较大数据量的安装和使用，我们建议您切换到不同的数据库后端。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite 。",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "要迁移到另一个数据库请使用命令行工具: 'occ db:convert-type', 或者查看 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 相关文档 ↗</a>.",
+    "How to do backups" : "如何做备份",
     "Advanced monitoring" : "高级监控",
     "Performance tuning" : "性能优化",
     "Improving the config.php" : "正在优化 config.php",
     "Theming" : "主题",
+    "Hardening and security guidance" : "强化和安全指南",
     "Version" : "版本",
+    "Developer documentation" : "开发者文档",
+    "Experimental applications ahead" : "未来的实验应用",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "实验应用程序没有在安全性的问题上作过多检查，新的或已知的不稳定 BUG 都在开发中。安装它们可能会导致数据丢失或安全漏洞。",
     "by" : "被",
+    "licensed" : "许可",
     "Documentation:" : "文档：",
     "User documentation" : "用户文档",
+    "Admin documentation" : "管理员文档",
+    "Show description …" : "显示描述...",
+    "Hide description …" : "隐藏描述...",
+    "This app cannot be installed because the following dependencies are not fulfilled:" : "此应用程序无法安装，因为以下依赖性不满足：",
     "Enable only for specific groups" : "仅对特定的组开放",
     "Uninstall App" : "卸载应用",
+    "Enable experimental apps" : "启用实验性应用程序",
+    "No apps found for your version" : "未找到适合当前版本的应用",
+    "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "亲，<br><br>现在我们为你开通了 %s 私有云帐户。<br><br>你的用户名： %s<br>访问网址： <a href=\\\"%s\\\">%s</a><br><br>",
     "Cheers!" : "干杯！",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "亲，\\n\\n 现在我们为你开通了 %s 私有去帐户。\\n\\n 你的用户名： %s\\n 访问网址： %s\\n 你的初始密码需要咨询系统管理员。或者你也可以在登录页面输入任意密码登录，\\n登录窗口将出现忘记密码链接，点击通过注册邮箱重设初始密码。\\n\\n",
     "Administrator documentation" : "管理员文档",
     "Online documentation" : "在线文档",
     "Forum" : "论坛",
+    "Issue tracker" : "问题跟踪",
+    "Commercial support" : "商业支持",
     "Get the apps to sync your files" : "安装应用进行文件同步",
     "Desktop client" : "桌面客户端",
     "Android app" : "Android 应用",
@@ -156,13 +234,18 @@ OC.L10N.register(
     "Current password" : "当前密码",
     "New password" : "新密码",
     "Change password" : "修改密码",
+    "Full name" : "全名",
+    "No display name set" : "不显示名称设置",
     "Email" : "电子邮件",
     "Your email address" : "您的电子邮件",
     "Fill in an email address to enable password recovery and receive notifications" : "填入电子邮件地址从而启用密码恢复和接收通知",
+    "No email address set" : "尚未设置 Email 地址",
+    "You are member of the following groups:" : "您是以下组的成员：",
     "Profile picture" : "联系人图片",
     "Upload new" : "上传新的",
     "Select new from Files" : "从文件中选择一个新的",
     "Remove image" : "移除图片",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "png 或 jpg。正方形比较理想但你也可以之后对其进行裁剪。文件大小最大不允许超过 20MB。",
     "Your avatar is provided by your original account." : "您的头像由您的原始账户所提供。",
     "Cancel" : "取消",
     "Choose as profile image" : "用作头像",
@@ -172,10 +255,15 @@ OC.L10N.register(
     "Valid until" : "有效期至",
     "Issued By" : "授权由",
     "Valid until %s" : "有效期至 %s",
+    "Import root certificate" : "导入根证书",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社区{linkclose}开发，{githubopen}源代码{linkclose}在 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr> 许可证{linkclose}下发布。",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
+    "Show user backend" : "显示用户后端",
+    "Send email to new user" : "发送电子邮件给新用户",
+    "Show email address" : "显示邮件地址",
     "Username" : "用户名",
+    "E-Mail" : "E-Mail",
     "Create" : "创建",
     "Admin Recovery Password" : "管理恢复密码",
     "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
@@ -188,6 +276,7 @@ OC.L10N.register(
     "Unlimited" : "无限",
     "Other" : "其它",
     "Full Name" : "全名",
+    "Group Admin for" : "设为以下组管理员",
     "Quota" : "配额",
     "Storage Location" : "存储空间位置",
     "User Backend" : "用户后端",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index e965deb8be7..41025e81a7d 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -1,12 +1,14 @@
 { "translations": {
     "APCu" : "APCu",
     "Redis" : "Redis",
+    "Security & setup warnings" : "安全 & 设置警告",
     "Sharing" : "共享",
     "Server-side encryption" : "服务器端加密",
     "External Storage" : "外部存储",
     "Cron" : "计划任务",
     "Email server" : "电子邮件服务器",
     "Log" : "日志",
+    "Server status" : "服务器状态",
     "Tips & tricks" : "技巧提示",
     "Updates" : "更新",
     "Authentication error" : "认证错误",
@@ -23,20 +25,45 @@
     "No user supplied" : "没有满足的用户",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "请提供管理员恢复密码，否则所有用户的数据都将遗失。",
     "Wrong admin recovery password. Please check the password and try again." : "错误的管理员恢复密码。请检查密码并重试。",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "后端不支持密码更改，但用户的加密密钥已成功更新。",
     "Unable to change password" : "不能更改密码",
     "Enabled" : "开启",
     "Not enabled" : "未启用",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "通过应用程序商店或联合云共享安装和更新应用程序",
     "Federated Cloud Sharing" : "联合云共享",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL使用了过时 %s 版本 (%s)。请更新你的操作系统或功能比如 %s 将无法可靠地工作。",
+    "A problem occurred, please check your log files (Error: %s)" : "出现了故障，请检查你的日志文件 (错误: %s)",
     "Migration Completed" : "迁移完成",
+    "Group already exists." : "组已经存在。",
+    "Unable to add group." : "无法添加组。",
+    "Unable to delete group." : "无法删除组",
+    "log-level out of allowed range" : "日志级别超出允许的范围",
     "Saved" : "已保存",
     "test email settings" : "测试电子邮件设置",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "在发送电子邮件时出现问题。请修改您的设置。 (错误: %s)",
     "Email sent" : "邮件已发送",
     "You need to set your user email before being able to send test emails." : "在发送测试邮件前您需要设置您的用户电子邮件。",
+    "Invalid mail address" : "无效的电子邮件地址",
+    "A user with that name already exists." : "使用该名称的用户已存在。",
+    "Unable to create user." : "无法创建用户。",
+    "Your %s account was created" : "你的帐户 %s 已创建",
+    "Unable to delete user." : "不能删除用户",
+    "Forbidden" : "被禁止",
+    "Invalid user" : "用户无效",
+    "Unable to change mail address" : "无法更改邮箱地址",
     "Email saved" : "电子邮件已保存",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "你真的希望添加 \"{domain}\" 为信任域？",
     "Add trusted domain" : "添加信任域",
+    "Migration in progress. Please wait until the migration is finished" : "迁移正在进行中。请等待，直到完成迁移",
+    "Migration started …" : "迁移开始...",
     "Sending..." : "正在发送...",
+    "Official" : "官方",
+    "Approved" : "已认可",
+    "Experimental" : "实验",
     "All" : "全部",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方应用是由 ownCloud 社区开发。他们提供 ownCloud 的功能核心并准备用于生产。",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "已认可的应用是由值得信赖的开发商开发，并已通过了一个粗略的安全检查。他们放在一个开放的代码库并且维护人员认为他们是稳定的差不多可以正常使用。",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "此应用未检查安全问题，它是新的或已知是不稳定的。安装风险自担。",
     "Update to %s" : "更新为 %s",
     "Please wait...." : "请稍等....",
     "Error while disabling app" : "禁用 app 时出错",
@@ -49,6 +76,7 @@
     "Uninstalling ...." : "卸载中....",
     "Error while uninstalling app" : "卸载应用时发生了一个错误",
     "Uninstall" : "卸载",
+    "An error occurred: {message}" : "发生错误： {message}",
     "Select a profile picture" : "选择头像",
     "Very weak password" : "非常弱的密码",
     "Weak password" : "弱密码",
@@ -57,18 +85,22 @@
     "Strong password" : "强密码",
     "Valid until {date}" : "有效期至 {date}",
     "Delete" : "删除",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。",
     "Groups" : "组",
     "Unable to delete {objName}" : "无法删除 {objName}",
     "Error creating group" : "创建组时出错",
     "A valid group name must be provided" : "请提供一个有效的组名称",
     "deleted {groupName}" : "已删除 {groupName}",
     "undo" : "撤销",
+    "no group" : "没有组",
     "never" : "从不",
     "deleted {userName}" : "已删除 {userName}",
     "add group" : "增加组",
+    "Changing the password will result in data loss, because data recovery is not available for this user" : "更改密码会导致数据丢失，因为数据恢复不适用于此用户",
     "A valid username must be provided" : "必须提供合法的用户名",
     "Error creating user" : "创建用户出错",
     "A valid password must be provided" : "必须提供合法的密码",
+    "A valid email must be provided" : "必须提供合法的用户名",
     "__language_name__" : "简体中文",
     "Sync clients" : "客户端",
     "Personal info" : "个人信息",
@@ -84,11 +116,21 @@
     "NT LAN Manager" : "NT LAN 管理器",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 似乎没有设置好查询的系统环境变量。 用 getenv(\\\"PATH\\\") 测试只返回一个空值。",
+    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "请检查PHP配置说明和服务器的 PHP 配置的安装文档，使用 PHP-FPM 时尤其如此。",
+    "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "只读配置已启用。这样可防止通过 WEB 接口设置一些配置。此外，每次更新后该文件需要手动设置为可写。",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "你的服务器是运行于 Microsoft Windows 系统。我们强烈推荐使用 Linux 系统以获得最佳的用户体验。比如中文文件夹和文件名支持。",
+    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s 下版本 %2$s 已安装。基于稳定和性能的原因，我们强烈建议更新至 %1$s 版本。",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
     "System locale can not be set to a one which supports UTF-8." : "系统语系无法设置为支持 UTF-8 的语系。",
     "This means that there might be problems with certain characters in file names." : "这意味着一些文件名中的特定字符可能有问题。",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "我们强烈建议安装在系统上所需的软件包支持以下区域设置之一： %s.",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你不是安装在网域根目录而且又使用系统定时计划任务，那么可以导致 URL 链接生成问题。为了避免这些问题，请在你的 Config.php 文件中设置 \\\"overwrite.cli.url\\\" 选项为 webroot 安装根目录 (建议: \\\"%s\\\")",
+    "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "由于下面的错误，无法通过 CLI 执行定时计划任务:",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "请点击检查 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 安装向导 ↗</a>, 点击 <a href=\\\"#log-section\\\"> 日志 </a>查看详细错误和警告。",
+    "All checks passed." : "所有检查已通过。",
     "Open documentation" : "打开文档",
     "Allow apps to use the Share API" : "允许应用软件使用共享API",
     "Allow users to share via link" : "允许用户通过链接分享文件",
@@ -104,12 +146,25 @@
     "Allow users to send mail notification for shared files to other users" : "允许用户发送共享文件的邮件通知给其他用户",
     "Exclude groups from sharing" : "在分享中排除组",
     "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
+    "Last cron job execution: %s." : "上次定时任务执行于： %s.",
+    "Last cron job execution: %s. Something seems wrong." : "上次定时任务执行于: %s. 似乎有些问题。",
     "Cron was not executed yet!" : "定时任务还未被执行！",
     "Execute one task with each page loaded" : "每个页面加载后执行一个任务",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。",
     "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
     "Enable server-side encryption" : "启用服务器端加密",
+    "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "服务器端加密是一个单向的过程。一旦启用加密，从该点向前所有文件都将在服务器上进行加密，它将无法在以后禁用加密",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "只要有权访问您的 ownCloud 服务器就可能解密你的文件，通过截获请求或读出以纯文本会话文件存储的用户密码。服务端加密。它不仅让你免遭恶意的管理员查看隐私，在保护你在外部托管的存储中的数据也非常有用。",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "根据实际加密模块上的一般文件大小而增加 (使用默认的模块时，35%% 以上)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "你应该定期备份所有加密密钥，以防数据永久丢失 (data/<user>/files_encryption 和 data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
     "Enable encryption" : "启用加密",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "没有加载加密模块，请在 APP 应用菜单中启用加密模块。",
+    "Select default encryption module:" : "选择默认的加密模块：",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "你需要升级你的加密密钥 (旧版 ownCloud <= 8.0) 。 请在应用中启用 \\\"Default encryption module\\\" 并运行 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "您需要将加密密钥从旧版(ownCloud<=8.0)迁移到新版。",
+    "Start migration" : "开始迁移",
     "This is used for sending out notifications." : "这被用于发送通知。",
     "Send mode" : "发送模式",
     "Encryption" : "加密",
@@ -122,26 +177,49 @@
     "Credentials" : "凭证",
     "SMTP Username" : "SMTP 用户名",
     "SMTP Password" : "SMTP 密码",
+    "Store credentials" : "存储凭据",
     "Test email settings" : "测试电子邮件设置",
     "Send email" : "发送邮件",
     "Log level" : "日志级别",
+    "Download logfile" : "下载日志文件",
     "More" : "更多",
     "Less" : "更少",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "日志文件超过 100 MB。下载可能需要一些时间！",
+    "Transactional File Locking is enabled." : "事务文件锁定已启用。",
+    "Transactional File Locking is disabled." : "事务文件锁定已禁用。",
+    "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite 被用作数据库。对于较大数据量的安装和使用，我们建议您切换到不同的数据库后端。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite 。",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "要迁移到另一个数据库请使用命令行工具: 'occ db:convert-type', 或者查看 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 相关文档 ↗</a>.",
+    "How to do backups" : "如何做备份",
     "Advanced monitoring" : "高级监控",
     "Performance tuning" : "性能优化",
     "Improving the config.php" : "正在优化 config.php",
     "Theming" : "主题",
+    "Hardening and security guidance" : "强化和安全指南",
     "Version" : "版本",
+    "Developer documentation" : "开发者文档",
+    "Experimental applications ahead" : "未来的实验应用",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "实验应用程序没有在安全性的问题上作过多检查，新的或已知的不稳定 BUG 都在开发中。安装它们可能会导致数据丢失或安全漏洞。",
     "by" : "被",
+    "licensed" : "许可",
     "Documentation:" : "文档：",
     "User documentation" : "用户文档",
+    "Admin documentation" : "管理员文档",
+    "Show description …" : "显示描述...",
+    "Hide description …" : "隐藏描述...",
+    "This app cannot be installed because the following dependencies are not fulfilled:" : "此应用程序无法安装，因为以下依赖性不满足：",
     "Enable only for specific groups" : "仅对特定的组开放",
     "Uninstall App" : "卸载应用",
+    "Enable experimental apps" : "启用实验性应用程序",
+    "No apps found for your version" : "未找到适合当前版本的应用",
+    "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "亲，<br><br>现在我们为你开通了 %s 私有云帐户。<br><br>你的用户名： %s<br>访问网址： <a href=\\\"%s\\\">%s</a><br><br>",
     "Cheers!" : "干杯！",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "亲，\\n\\n 现在我们为你开通了 %s 私有去帐户。\\n\\n 你的用户名： %s\\n 访问网址： %s\\n 你的初始密码需要咨询系统管理员。或者你也可以在登录页面输入任意密码登录，\\n登录窗口将出现忘记密码链接，点击通过注册邮箱重设初始密码。\\n\\n",
     "Administrator documentation" : "管理员文档",
     "Online documentation" : "在线文档",
     "Forum" : "论坛",
+    "Issue tracker" : "问题跟踪",
+    "Commercial support" : "商业支持",
     "Get the apps to sync your files" : "安装应用进行文件同步",
     "Desktop client" : "桌面客户端",
     "Android app" : "Android 应用",
@@ -154,13 +232,18 @@
     "Current password" : "当前密码",
     "New password" : "新密码",
     "Change password" : "修改密码",
+    "Full name" : "全名",
+    "No display name set" : "不显示名称设置",
     "Email" : "电子邮件",
     "Your email address" : "您的电子邮件",
     "Fill in an email address to enable password recovery and receive notifications" : "填入电子邮件地址从而启用密码恢复和接收通知",
+    "No email address set" : "尚未设置 Email 地址",
+    "You are member of the following groups:" : "您是以下组的成员：",
     "Profile picture" : "联系人图片",
     "Upload new" : "上传新的",
     "Select new from Files" : "从文件中选择一个新的",
     "Remove image" : "移除图片",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "png 或 jpg。正方形比较理想但你也可以之后对其进行裁剪。文件大小最大不允许超过 20MB。",
     "Your avatar is provided by your original account." : "您的头像由您的原始账户所提供。",
     "Cancel" : "取消",
     "Choose as profile image" : "用作头像",
@@ -170,10 +253,15 @@
     "Valid until" : "有效期至",
     "Issued By" : "授权由",
     "Valid until %s" : "有效期至 %s",
+    "Import root certificate" : "导入根证书",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社区{linkclose}开发，{githubopen}源代码{linkclose}在 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr> 许可证{linkclose}下发布。",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
+    "Show user backend" : "显示用户后端",
+    "Send email to new user" : "发送电子邮件给新用户",
+    "Show email address" : "显示邮件地址",
     "Username" : "用户名",
+    "E-Mail" : "E-Mail",
     "Create" : "创建",
     "Admin Recovery Password" : "管理恢复密码",
     "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
@@ -186,6 +274,7 @@
     "Unlimited" : "无限",
     "Other" : "其它",
     "Full Name" : "全名",
+    "Group Admin for" : "设为以下组管理员",
     "Quota" : "配额",
     "Storage Location" : "存储空间位置",
     "User Backend" : "用户后端",
-- 
GitLab


From c9c246a3f5cad7907e5659a8657842adc1d84c69 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 2 Sep 2015 14:50:07 +0100
Subject: [PATCH 132/783] Soft fail when deleting and no entry found

---
 lib/private/files/cache/cache.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 8cf097421d4..274d97822f5 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -466,6 +466,10 @@ class Cache {
 	 */
 	public function remove($file) {
 		$entry = $this->get($file);
+		if (!isset($entry['fileid'])) {
+			// perhaps file was deleted in the mean time?
+			return;
+		}
 		$sql = 'DELETE FROM `*PREFIX*filecache` WHERE `fileid` = ?';
 		\OC_DB::executeAudited($sql, array($entry['fileid']));
 		if ($entry['mimetype'] === 'httpd/unix-directory') {
-- 
GitLab


From 4880d7729bf6442280be71ce91771ef3e077c54c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 2 Sep 2015 16:55:37 +0200
Subject: [PATCH 133/783] enable transational locking by default

---
 lib/private/server.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/private/server.php b/lib/private/server.php
index a741f33eb3d..24674d2e3c7 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -451,13 +451,13 @@ class Server extends SimpleContainer implements IServerContainer {
 			);
 		});
 		$this->registerService('LockingProvider', function (Server $c) {
-			if ($c->getConfig()->getSystemValue('filelocking.enabled', false) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+			if ($c->getConfig()->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
 				/** @var \OC\Memcache\Factory $memcacheFactory */
 				$memcacheFactory = $c->getMemCacheFactory();
 				$memcache = $memcacheFactory->createLocking('lock');
-//				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-//					return new MemcacheLockingProvider($memcache);
-//				}
+				if (!($memcache instanceof \OC\Memcache\NullCache)) {
+					return new MemcacheLockingProvider($memcache);
+				}
 				return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger());
 			}
 			return new NoopLockingProvider();
-- 
GitLab


From 389c8077b06f166f9ad7ac2dc2063a74d9fe6738 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 2 Sep 2015 17:31:02 +0200
Subject: [PATCH 134/783] update config sample

---
 config/config.sample.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 234bf8e0fa3..f5e36e66cc4 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1053,17 +1053,15 @@ $CONFIG = array(
 
 /**
  * Enables transactional file locking.
- * This is disabled by default as it is still beta.
+ * This is enabled by default.
  *
  * Prevents concurrent processes from accessing the same files
  * at the same time. Can help prevent side effects that would
  * be caused by concurrent operations. Mainly relevant for
  * very large installations with many users working with
  * shared files.
- *
- * WARNING: BETA quality
  */
-'filelocking.enabled' => false,
+'filelocking.enabled' => true,
 
 /**
  * Memory caching backend for file locking
-- 
GitLab


From cea8cc73c801f1980a15d5d109f9e9394eff0642 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 2 Sep 2015 19:18:05 +0200
Subject: [PATCH 135/783] Move registration of LDAP background jobs to the
 install and update

---
 apps/user_ldap/appinfo/app.php     | 3 ---
 apps/user_ldap/appinfo/install.php | 3 +++
 apps/user_ldap/appinfo/update.php  | 3 +++
 apps/user_ldap/appinfo/version     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 68fd1b698e0..60c2accdccb 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -59,9 +59,6 @@ if(count($configPrefixes) > 0) {
 	OC_Group::useBackend($groupBackend);
 }
 
-OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
-OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp');
-
 \OCP\Util::connectHook(
 	'\OCA\Files_Sharing\API\Server2Server',
 	'preLoginNameUsedAsUserName',
diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php
index 0b3f84b8baf..f70eb746480 100644
--- a/apps/user_ldap/appinfo/install.php
+++ b/apps/user_ldap/appinfo/install.php
@@ -23,3 +23,6 @@ $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet');
 if($state === 'doSet') {
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
 }
+
+OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
+OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp');
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 4907db0cdae..33a7219644b 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -34,3 +34,6 @@ if(version_compare($installedVersion, '0.6.2', '<')) {
 		\OC::$server->getConfig()->deleteAppValue('user_ldap', $prefix . "ldap_nocase");
 	}
 }
+
+OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
+OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp');
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index b6160487433..844f6a91acb 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.6.2
+0.6.3
-- 
GitLab


From 068ff09cfed6081ed794cf899830911f72c3e4fb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 2 Sep 2015 19:22:46 +0200
Subject: [PATCH 136/783] fallback for isimage

---
 apps/files/js/fileinfomodel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/fileinfomodel.js b/apps/files/js/fileinfomodel.js
index 1c850239cdc..ab205b2efb4 100644
--- a/apps/files/js/fileinfomodel.js
+++ b/apps/files/js/fileinfomodel.js
@@ -58,7 +58,7 @@
 		 * @return {boolean} true if this is an image, false otherwise
 		 */
 		isImage: function() {
-			return this.get('mimetype').substr(0, 6) === 'image/';
+			return this.get('mimetype')? this.get('mimetype').substr(0, 6) === 'image/' : false;
 		},
 
 		/**
-- 
GitLab


From 49b98abc25f33da9e37e57a64b033de3e2edad36 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 2 Sep 2015 19:26:22 +0200
Subject: [PATCH 137/783] Move registration of background job to install/update

---
 apps/files_sharing/appinfo/app.php     |  4 ----
 apps/files_sharing/appinfo/install.php | 22 ++++++++++++++++++++++
 apps/files_sharing/appinfo/update.php  |  1 +
 apps/files_sharing/appinfo/version     |  2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 apps/files_sharing/appinfo/install.php

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 9000fafd8dd..295d013beff 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -58,10 +58,6 @@ $application->setupPropagation();
 \OCP\Util::addScript('files_sharing', 'external');
 \OCP\Util::addStyle('files_sharing', 'sharetabview');
 
-// FIXME: registering a job here will cause additional useless SQL queries
-// when the route is not cron.php, needs a better way
-\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob');
-
 \OC::$server->getActivityManager()->registerExtension(function() {
 		return new \OCA\Files_Sharing\Activity(
 			\OC::$server->query('L10NFactory'),
diff --git a/apps/files_sharing/appinfo/install.php b/apps/files_sharing/appinfo/install.php
new file mode 100644
index 00000000000..f076a17e444
--- /dev/null
+++ b/apps/files_sharing/appinfo/install.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob');
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index e98b60ea36d..66b8b78cacf 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -28,3 +28,4 @@ if (version_compare($installedVersion, '0.6.0', '<')) {
 	$m->addAcceptRow();
 }
 
+\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob');
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index b6160487433..844f6a91acb 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.6.2
+0.6.3
-- 
GitLab


From 8f2110e5dae67b23ff2454051c20cf843cb37755 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 2 Sep 2015 19:52:45 +0200
Subject: [PATCH 138/783] Revert "Soft fail when deleting and no entry found"

---
 lib/private/files/cache/cache.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 274d97822f5..8cf097421d4 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -466,10 +466,6 @@ class Cache {
 	 */
 	public function remove($file) {
 		$entry = $this->get($file);
-		if (!isset($entry['fileid'])) {
-			// perhaps file was deleted in the mean time?
-			return;
-		}
 		$sql = 'DELETE FROM `*PREFIX*filecache` WHERE `fileid` = ?';
 		\OC_DB::executeAudited($sql, array($entry['fileid']));
 		if ($entry['mimetype'] === 'httpd/unix-directory') {
-- 
GitLab


From 59cf11c61256157cf41f8e17e4d7b0937f4d3734 Mon Sep 17 00:00:00 2001
From: Raghu Nayyar <hey@raghunayyar.com>
Date: Sun, 30 Aug 2015 17:43:09 +0200
Subject: [PATCH 139/783] Makes settings select like multiselect

---
 core/css/styles.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/css/styles.css b/core/css/styles.css
index da4dc8b4d4d..f3fc478aee1 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -12,7 +12,17 @@ table, td, th { vertical-align:middle; }
 a { border:0; color:#000; text-decoration:none;}
 a, a *, input, input *, select, .button span, label { cursor:pointer; }
 ul { list-style:none; }
+select {
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	appearance: none;
+	background: url('../../core/img/actions/triangle-s.svg') no-repeat right 8px center rgba(240, 240, 240, 0.90);
+	outline: 0;
+}
 
+select:hover {
+	background-color: #fefefe;
+}
 
 body {
 	background-color: #ffffff;
-- 
GitLab


From a55f81e7746411be3a721a3a15ee3da7bb9f41f7 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 3 Sep 2015 00:27:07 +0200
Subject: [PATCH 140/783] use proper triangle for multiselect dropdowns as well

---
 core/css/multiselect.css | 3 ++-
 core/css/styles.css      | 1 +
 core/js/multiselect.js   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index 17fd81bf6c3..a9451964f59 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -93,7 +93,8 @@ div.multiselect>span:first-child {
 
 div.multiselect>span:last-child {
 	position: absolute;
-	right: 13px;
+	right: 8px;
+	top: 8px;
 }
 
 ul.multiselectoptions input.new {
diff --git a/core/css/styles.css b/core/css/styles.css
index f3fc478aee1..020c2702a10 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -18,6 +18,7 @@ select {
 	appearance: none;
 	background: url('../../core/img/actions/triangle-s.svg') no-repeat right 8px center rgba(240, 240, 240, 0.90);
 	outline: 0;
+	padding-right: 24px !important;
 }
 
 select:hover {
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 96144d39ee0..41dc68ac051 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -53,7 +53,7 @@
 				settings.labels.push($(option).text().trim());
 			}
 		});
-		var button=$('<div class="multiselect button"><span>'+settings.title+'</span><span>▾</span></div>');
+		var button=$('<div class="multiselect button"><span>'+settings.title+'</span><span class="icon-triangle-s"></span></div>');
 		var span=$('<span/>');
 		span.append(button);
 		button.data('id',multiSelectId);
-- 
GitLab


From f9e90e92d4f97a3f00bf598800f829ea6d7f068d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 3 Sep 2015 00:44:46 +0200
Subject: [PATCH 141/783] Encode HTML tags in JSON

While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time.
---
 lib/private/json.php                          |  2 +-
 lib/public/appframework/http/jsonresponse.php |  2 +-
 .../appframework/http/JSONResponseTest.php    | 26 ++++++++++++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/lib/private/json.php b/lib/private/json.php
index e32e937c01a..ac72f02f609 100644
--- a/lib/private/json.php
+++ b/lib/private/json.php
@@ -167,6 +167,6 @@ class OC_JSON{
 		if (is_array($data)) {
 			array_walk_recursive($data, array('OC_JSON', 'to_string'));
 		}
-		return json_encode($data);
+		return json_encode($data, JSON_HEX_TAG);
 	}
 }
diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
index 456a5616d4d..1a509200dd7 100644
--- a/lib/public/appframework/http/jsonresponse.php
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -64,7 +64,7 @@ class JSONResponse extends Response {
 	 * @throws \Exception If data could not get encoded
 	 */
 	public function render() {
-		$response = json_encode($this->data);
+		$response = json_encode($this->data, JSON_HEX_TAG);
 		if($response === false) {
 			throw new \Exception(sprintf('Could not json_encode due to invalid ' .
 				'non UTF-8 characters in the array: %s', var_export($this->data, true)));
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index 692237f57b2..253c523934b 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -66,13 +66,27 @@ class JSONResponseTest extends \Test\TestCase {
 		$this->assertEquals($expected, $this->json->render());
 	}
 
+	/**
+	 * @return array
+	 */
+	public function testRenderProvider() {
+		return [
+			[
+				['test' => 'hi'], '{"test":"hi"}',
+			],
+			[
+				['<h1>test' => '<h1>hi'], '{"\u003Ch1\u003Etest":"\u003Ch1\u003Ehi"}',
+			],
+		];
+	}
 
-	public function testRender() {
-		$params = array('test' => 'hi');
-		$this->json->setData($params);
-
-		$expected = '{"test":"hi"}';
-
+	/**
+	 * @dataProvider testRenderProvider
+	 * @param array $input
+	 * @param string $expected
+	 */
+	public function testRender(array $input, $expected) {
+		$this->json->setData($input);
 		$this->assertEquals($expected, $this->json->render());
 	}
 
-- 
GitLab


From 69b6358df67e667bd1553ab6c9be2fa30db7c57c Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 3 Sep 2015 00:58:03 +0200
Subject: [PATCH 142/783] fix icon and layout details for new menu

---
 apps/files/css/files.css     | 10 +++++++++-
 apps/files/js/newfilemenu.js |  5 ++---
 core/css/apps.css            | 10 +---------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 97b2a0c451e..5c27515f26a 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -743,6 +743,15 @@ table.dragshadow td.size {
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
+.newFileMenu.popovermenu .menuitem .icon {
+	margin-bottom: -2px;
+}
+.newFileMenu.popovermenu a.menuitem,
+.newFileMenu.popovermenu label.menuitem,
+.newFileMenu.popovermenu .menuitem {
+	padding: 0;
+	margin: 0;
+}
 
 .newFileMenu.bubble:after {
 	left: 75px;
@@ -768,4 +777,3 @@ table.dragshadow td.size {
 	color: #000;
 	padding: 0;
 }
-
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
index c851096bd8f..c7c02bd65f1 100644
--- a/apps/files/js/newfilemenu.js
+++ b/apps/files/js/newfilemenu.js
@@ -114,7 +114,7 @@
 			}));
 
 			//this.trigger('actionPerformed', action);
-			$target.append($form); 
+			$target.append($form);
 
 			// here comes the OLD code
 			var $input = $form.find('input');
@@ -201,7 +201,7 @@
 					id: 'file',
 					displayName: t('files', 'Text file'),
 					templateName: t('files', 'New text file.txt'),
-					iconClass: 'icon-text',
+					iconClass: 'icon-filetype-text',
 					fileType: 'file'
 				}, {
 					id: 'folder',
@@ -234,4 +234,3 @@
 	OCA.Files.NewFileMenu = NewFileMenu;
 
 })();
-
diff --git a/core/css/apps.css b/core/css/apps.css
index c11bfb3cadf..7380a44011a 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -637,12 +637,6 @@ em {
 	opacity: .5;
 }
 
-.popovermenu .menuitem {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-	filter: alpha(opacity=50);
-	opacity: .5;
-}
-
 .popovermenu .menuitem:hover,
 .popovermenu .menuitem:focus {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
@@ -681,12 +675,11 @@ em {
 	padding: 0;
 }
 
-
 .popovermenu .menuitem .icon,
 .popovermenu .menuitem .no-icon {
 	display: inline-block;
 	width: 16px;
-	margin-right: 5px;
+	margin-right: 10px;
 }
 
 .popovermenu .menuitem {
@@ -696,4 +689,3 @@ em {
 .popovermenu li:hover .menuitem {
 	opacity: 1;
 }
-
-- 
GitLab


From 189f4044dd0018b01e8863d409e841cc536c9738 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 3 Sep 2015 01:55:23 -0400
Subject: [PATCH 143/783] [tx-robot] updated from transifex

---
 core/l10n/ca.js          | 23 ++++++++++++++++++++
 core/l10n/ca.json        | 23 ++++++++++++++++++++
 core/l10n/zh_TW.js       | 34 ++++++++++++++++++++++++++++-
 core/l10n/zh_TW.json     | 34 ++++++++++++++++++++++++++++-
 settings/l10n/zh_TW.js   | 47 ++++++++++++++++++++++++++++++++++------
 settings/l10n/zh_TW.json | 47 ++++++++++++++++++++++++++++++++++------
 6 files changed, 192 insertions(+), 16 deletions(-)

diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index 853cd662472..a3133be76eb 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "No s'ha pogut enviar correu als usuaris següents: %s",
+    "Preparing update" : "Preparant l'actualització",
     "Turned on maintenance mode" : "Activat el mode de manteniment",
     "Turned off maintenance mode" : "Desactivat el mode de manteniment",
     "Maintenance mode is kept active" : "El mode de manteniment es manté activat",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Error de reparació:",
     "Following incompatible apps have been disabled: %s" : "Les següents apps incompatibles s'han deshabilitat: %s",
     "Following apps have been disabled: %s" : "Les aplicacions següents s'han deshabilitat: %s",
+    "Already up to date" : "Ja actualitzat",
     "File is too big" : "El fitxer és massa gran",
     "Invalid file provided" : "L'arxiu proporcionat no és vàlid",
     "No image or file provided" : "No s'han proporcionat imatges o fitxers",
@@ -36,6 +38,13 @@ OC.L10N.register(
     "Thu." : "Dj.",
     "Fri." : "Dv.",
     "Sat." : "Ds.",
+    "Su" : "Dg",
+    "Mo" : "Dl",
+    "Tu" : "Dm",
+    "We" : "Dc",
+    "Th" : "Dj",
+    "Fr" : "Dv",
+    "Sa" : "Ds",
     "January" : "Gener",
     "February" : "Febrer",
     "March" : "Març",
@@ -90,7 +99,14 @@ OC.L10N.register(
     "So-so password" : "Contrasenya passable",
     "Good password" : "Contrasenya bona",
     "Strong password" : "Contrasenya forta",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Aquest servidor no té connexió a internet. Això significa que algunes de les característiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les característiques.",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "La carpeta de dades i els vostres fitxers probablement són accessibles des d'Internet. El fitxer .htaccess no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "No hi ha configurada cap memòria cau. Per millorar el rendiment configureu una memòria cau si està disponible. Podeu trobar més informació a la <a href=\"{docLink}\">documentació</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "PHP no pot llegir /dev/urandom, cosa poc recomanable per raons de seguretat. Podeu trobar més informació a la <a href=\"{docLink}\">documentació</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La versió de PHP ({version}) ja no està <a href=\"{phpLink}\">mantinguda per PHP</a>. Us recomanem que actualitzeu la versió per gaudir de les millores de rendiment i seguretat proporcionades per PHP.",
     "Error occurred while checking server setup" : "Hi ha hagut un error en comprovar la configuració del servidor",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Esteu accedint aquesta web a través de HTTP. Us recomanem que configureu el servidor per requerir HTTPS tal i com es descriu als <a href=\"{docUrl}\">consells de seguretat</a>",
     "Shared" : "Compartit",
     "Shared with {recipients}" : "Compartit amb {recipients}",
     "Error" : "Error",
@@ -155,6 +171,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "La actualització ha estat exitosa. Hi ha alertes.",
     "The update was successful. Redirecting you to ownCloud now." : "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
     "Couldn't reset password because the token is invalid" : "No es pot restablir la contrasenya perquè el testimoni no és vàlid",
+    "Couldn't reset password because the token is expired" : "No es pot restablir la contrasenya perquè el testimoni ha vençut",
     "Couldn't send reset email. Please make sure your username is correct." : "No s'ha pogut enviar el correu de restabliment. Assegureu-vos que el vostre nom d'usuari és correcte.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.",
     "%s password reset" : "restableix la contrasenya %s",
@@ -196,6 +213,7 @@ OC.L10N.register(
     "Message: %s" : "Missatge: %s",
     "File: %s" : "Fitxer: %s",
     "Line: %s" : "Línia: %s",
+    "Trace" : "Traça",
     "Security warning" : "Advertiment de seguretat",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
@@ -205,6 +223,7 @@ OC.L10N.register(
     "Data folder" : "Carpeta de dades",
     "Configure the database" : "Configura la base de dades",
     "Only %s is available." : "Només hi ha disponible %s",
+    "Install and activate additional PHP modules to choose other database types." : "Instal·la i activa mòduls PHP addicionals per seleccionar altres tipus de bases de dades.",
     "For more details check out the documentation." : "Per més detalls consulteu la documentació.",
     "Database user" : "Usuari de la base de dades",
     "Database password" : "Contrasenya de la base de dades",
@@ -238,6 +257,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En funció de la teva configuració, com a administrador podries utilitzar el botó d'abaix per confiar en aquest domini.",
     "Add \"%s\" as trusted domain" : "Afegeix \"%s\" com a domini de confiança",
+    "App update required" : "Cal que actualitzeu la aplicació",
+    "%s will be updated to version %s" : "%s s'actualitzarà a la versió %s",
+    "These apps will be updated:" : "Aquestes aplicacions s'actualitzaran:",
+    "These incompatible apps will be disabled:" : "Aquestes aplicacions incompatibles es desactivaran:",
     "The theme %s has been disabled." : "S'ha desactivat el tema %s",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assegureu-vos que heu fet una còpia de seguretat de la base de dades, del fitxer de configuració i de la carpeta de dades abans de continuar.",
     "Start update" : "Inicia l'actualització",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index 56006bc7d17..8af4766eaa1 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "No s'ha pogut enviar correu als usuaris següents: %s",
+    "Preparing update" : "Preparant l'actualització",
     "Turned on maintenance mode" : "Activat el mode de manteniment",
     "Turned off maintenance mode" : "Desactivat el mode de manteniment",
     "Maintenance mode is kept active" : "El mode de manteniment es manté activat",
@@ -11,6 +12,7 @@
     "Repair error: " : "Error de reparació:",
     "Following incompatible apps have been disabled: %s" : "Les següents apps incompatibles s'han deshabilitat: %s",
     "Following apps have been disabled: %s" : "Les aplicacions següents s'han deshabilitat: %s",
+    "Already up to date" : "Ja actualitzat",
     "File is too big" : "El fitxer és massa gran",
     "Invalid file provided" : "L'arxiu proporcionat no és vàlid",
     "No image or file provided" : "No s'han proporcionat imatges o fitxers",
@@ -34,6 +36,13 @@
     "Thu." : "Dj.",
     "Fri." : "Dv.",
     "Sat." : "Ds.",
+    "Su" : "Dg",
+    "Mo" : "Dl",
+    "Tu" : "Dm",
+    "We" : "Dc",
+    "Th" : "Dj",
+    "Fr" : "Dv",
+    "Sa" : "Ds",
     "January" : "Gener",
     "February" : "Febrer",
     "March" : "Març",
@@ -88,7 +97,14 @@
     "So-so password" : "Contrasenya passable",
     "Good password" : "Contrasenya bona",
     "Strong password" : "Contrasenya forta",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Aquest servidor no té connexió a internet. Això significa que algunes de les característiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les característiques.",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "La carpeta de dades i els vostres fitxers probablement són accessibles des d'Internet. El fitxer .htaccess no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "No hi ha configurada cap memòria cau. Per millorar el rendiment configureu una memòria cau si està disponible. Podeu trobar més informació a la <a href=\"{docLink}\">documentació</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "PHP no pot llegir /dev/urandom, cosa poc recomanable per raons de seguretat. Podeu trobar més informació a la <a href=\"{docLink}\">documentació</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La versió de PHP ({version}) ja no està <a href=\"{phpLink}\">mantinguda per PHP</a>. Us recomanem que actualitzeu la versió per gaudir de les millores de rendiment i seguretat proporcionades per PHP.",
     "Error occurred while checking server setup" : "Hi ha hagut un error en comprovar la configuració del servidor",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Esteu accedint aquesta web a través de HTTP. Us recomanem que configureu el servidor per requerir HTTPS tal i com es descriu als <a href=\"{docUrl}\">consells de seguretat</a>",
     "Shared" : "Compartit",
     "Shared with {recipients}" : "Compartit amb {recipients}",
     "Error" : "Error",
@@ -153,6 +169,7 @@
     "The update was successful. There were warnings." : "La actualització ha estat exitosa. Hi ha alertes.",
     "The update was successful. Redirecting you to ownCloud now." : "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
     "Couldn't reset password because the token is invalid" : "No es pot restablir la contrasenya perquè el testimoni no és vàlid",
+    "Couldn't reset password because the token is expired" : "No es pot restablir la contrasenya perquè el testimoni ha vençut",
     "Couldn't send reset email. Please make sure your username is correct." : "No s'ha pogut enviar el correu de restabliment. Assegureu-vos que el vostre nom d'usuari és correcte.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.",
     "%s password reset" : "restableix la contrasenya %s",
@@ -194,6 +211,7 @@
     "Message: %s" : "Missatge: %s",
     "File: %s" : "Fitxer: %s",
     "Line: %s" : "Línia: %s",
+    "Trace" : "Traça",
     "Security warning" : "Advertiment de seguretat",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
@@ -203,6 +221,7 @@
     "Data folder" : "Carpeta de dades",
     "Configure the database" : "Configura la base de dades",
     "Only %s is available." : "Només hi ha disponible %s",
+    "Install and activate additional PHP modules to choose other database types." : "Instal·la i activa mòduls PHP addicionals per seleccionar altres tipus de bases de dades.",
     "For more details check out the documentation." : "Per més detalls consulteu la documentació.",
     "Database user" : "Usuari de la base de dades",
     "Database password" : "Contrasenya de la base de dades",
@@ -236,6 +255,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En funció de la teva configuració, com a administrador podries utilitzar el botó d'abaix per confiar en aquest domini.",
     "Add \"%s\" as trusted domain" : "Afegeix \"%s\" com a domini de confiança",
+    "App update required" : "Cal que actualitzeu la aplicació",
+    "%s will be updated to version %s" : "%s s'actualitzarà a la versió %s",
+    "These apps will be updated:" : "Aquestes aplicacions s'actualitzaran:",
+    "These incompatible apps will be disabled:" : "Aquestes aplicacions incompatibles es desactivaran:",
     "The theme %s has been disabled." : "S'ha desactivat el tema %s",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assegureu-vos que heu fet una còpia de seguretat de la base de dades, del fitxer de configuració i de la carpeta de dades abans de continuar.",
     "Start update" : "Inicia l'actualització",
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index e7fcff74d76..beab7ca0e17 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -10,11 +10,20 @@ OC.L10N.register(
     "Checked database schema update" : "已檢查資料庫格式更新",
     "Checked database schema update for apps" : "已檢查應用程式的資料庫格式更新",
     "Updated \"%s\" to %s" : "已更新 %s 到 %s",
+    "Repair warning: " : "修復警告：",
+    "Repair error: " : "修復錯誤",
+    "Following incompatible apps have been disabled: %s" : "以下不相容的應用程式已經被停用：%s",
+    "Following apps have been disabled: %s" : "以下應用程式已經被停用：%s",
+    "Already up to date" : "已經是最新版",
+    "File is too big" : "檔案太大",
+    "Invalid file provided" : "提供的檔案無效",
     "No image or file provided" : "未提供圖片或檔案",
     "Unknown filetype" : "未知的檔案類型",
     "Invalid image" : "無效的圖片",
     "No temporary profile picture available, try again" : "沒有臨時用的大頭貼，請再試一次",
     "No crop data provided" : "未設定剪裁",
+    "No valid crop data provided" : "未提供有效的剪裁設定",
+    "Crop is not square" : "剪裁設定不是正方形",
     "Sunday" : "週日",
     "Monday" : "週一",
     "Tuesday" : "週二",
@@ -29,6 +38,13 @@ OC.L10N.register(
     "Thu." : "四",
     "Fri." : "五",
     "Sat." : "六",
+    "Su" : "日",
+    "Mo" : "一",
+    "Tu" : "二",
+    "We" : "三",
+    "Th" : "四",
+    "Fr" : "五",
+    "Sa" : "六",
     "January" : "一月",
     "February" : "二月",
     "March" : "三月",
@@ -83,7 +99,9 @@ OC.L10N.register(
     "So-so password" : "普通的密碼",
     "Good password" : "好的密碼",
     "Strong password" : "很強的密碼",
-    "Error occurred while checking server setup" : "檢查伺服器配置時發生錯誤",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "您的網頁伺服器無法提供檔案同步功能，因為 WebDAV 界面有問題",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "伺服器沒有網際網路連線，有些功能，像是外部儲存、更新版通知將無法運作。從遠端存取資料或是寄送 email 通知可能也無法運作。建議您設定好網際網路連線以使用所有功能。",
+    "Error occurred while checking server setup" : "檢查伺服器設定時發生錯誤",
     "Shared" : "已分享",
     "Shared with {recipients}" : "與 {recipients} 分享",
     "Error" : "錯誤",
@@ -103,8 +121,10 @@ OC.L10N.register(
     "Set expiration date" : "指定到期日",
     "Expiration" : "過期",
     "Expiration date" : "到期日",
+    "An error occured. Please try again" : "發生錯誤，請重試",
     "Adding user..." : "新增使用者……",
     "group" : "群組",
+    "remote" : "遠端",
     "Resharing is not allowed" : "不允許重新分享",
     "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
     "Unshare" : "取消分享",
@@ -113,6 +133,7 @@ OC.L10N.register(
     "can edit" : "可編輯",
     "access control" : "存取控制",
     "create" : "建立",
+    "change" : "更動",
     "delete" : "刪除",
     "Password protected" : "受密碼保護",
     "Error unsetting expiration date" : "取消到期日設定失敗",
@@ -129,8 +150,11 @@ OC.L10N.register(
     "No tags selected for deletion." : "沒有選擇要刪除的標籤",
     "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候",
     "Please reload the page." : "請重新整理頁面",
+    "The update was unsuccessful. " : "更新失敗",
+    "The update was successful. There were warnings." : "更新成功，有警告訊息",
     "The update was successful. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。",
     "Couldn't reset password because the token is invalid" : "無法重設密碼因為 token 無效",
+    "Couldn't reset password because the token is expired" : "無法重設密碼，因為 token 過期",
     "Couldn't send reset email. Please make sure your username is correct." : "無法寄送重設 email ，請確認您的帳號輸入正確",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
     "%s password reset" : "%s 密碼重設",
@@ -188,6 +212,9 @@ OC.L10N.register(
     "Search" : "搜尋",
     "Server side authentication failed!" : "伺服器端認證失敗！",
     "Please contact your administrator." : "請聯絡系統管理員。",
+    "An internal error occured." : "發生內部錯誤",
+    "Please try again or contact your administrator." : "請重試或聯絡系統管理員",
+    "Wrong password. Reset it?" : "密碼錯誤，重設密碼？",
     "remember" : "記住",
     "Alternative Logins" : "其他登入方法",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
@@ -199,10 +226,15 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域",
     "Add \"%s\" as trusted domain" : "將 %s 加入到信任的網域",
+    "App update required" : "需要更新應用程式",
+    "%s will be updated to version %s" : "%s 將會更新至版本 %s",
+    "These apps will be updated:" : "將會更新這些應用程式",
+    "These incompatible apps will be disabled:" : "將會停用這些不相容的應用程式",
     "The theme %s has been disabled." : "主題 %s 已經被停用",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在繼續之前，請備份資料庫、config 目錄及資料目錄",
     "Start update" : "開始升級",
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "在大型安裝上，為了避免升級請求逾時，你也可以在安裝目錄執行下列指令：",
+    "This %s instance is currently in maintenance mode, which may take a while." : "這個 %s 安裝目前處於維護模式，需要一段時間恢復。",
     "This page will refresh itself when the %s instance is available again." : "%s 安裝恢復可用之後，本頁會自動重新整理"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index 2b42231bd7b..81af556d8f3 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -8,11 +8,20 @@
     "Checked database schema update" : "已檢查資料庫格式更新",
     "Checked database schema update for apps" : "已檢查應用程式的資料庫格式更新",
     "Updated \"%s\" to %s" : "已更新 %s 到 %s",
+    "Repair warning: " : "修復警告：",
+    "Repair error: " : "修復錯誤",
+    "Following incompatible apps have been disabled: %s" : "以下不相容的應用程式已經被停用：%s",
+    "Following apps have been disabled: %s" : "以下應用程式已經被停用：%s",
+    "Already up to date" : "已經是最新版",
+    "File is too big" : "檔案太大",
+    "Invalid file provided" : "提供的檔案無效",
     "No image or file provided" : "未提供圖片或檔案",
     "Unknown filetype" : "未知的檔案類型",
     "Invalid image" : "無效的圖片",
     "No temporary profile picture available, try again" : "沒有臨時用的大頭貼，請再試一次",
     "No crop data provided" : "未設定剪裁",
+    "No valid crop data provided" : "未提供有效的剪裁設定",
+    "Crop is not square" : "剪裁設定不是正方形",
     "Sunday" : "週日",
     "Monday" : "週一",
     "Tuesday" : "週二",
@@ -27,6 +36,13 @@
     "Thu." : "四",
     "Fri." : "五",
     "Sat." : "六",
+    "Su" : "日",
+    "Mo" : "一",
+    "Tu" : "二",
+    "We" : "三",
+    "Th" : "四",
+    "Fr" : "五",
+    "Sa" : "六",
     "January" : "一月",
     "February" : "二月",
     "March" : "三月",
@@ -81,7 +97,9 @@
     "So-so password" : "普通的密碼",
     "Good password" : "好的密碼",
     "Strong password" : "很強的密碼",
-    "Error occurred while checking server setup" : "檢查伺服器配置時發生錯誤",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "您的網頁伺服器無法提供檔案同步功能，因為 WebDAV 界面有問題",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "伺服器沒有網際網路連線，有些功能，像是外部儲存、更新版通知將無法運作。從遠端存取資料或是寄送 email 通知可能也無法運作。建議您設定好網際網路連線以使用所有功能。",
+    "Error occurred while checking server setup" : "檢查伺服器設定時發生錯誤",
     "Shared" : "已分享",
     "Shared with {recipients}" : "與 {recipients} 分享",
     "Error" : "錯誤",
@@ -101,8 +119,10 @@
     "Set expiration date" : "指定到期日",
     "Expiration" : "過期",
     "Expiration date" : "到期日",
+    "An error occured. Please try again" : "發生錯誤，請重試",
     "Adding user..." : "新增使用者……",
     "group" : "群組",
+    "remote" : "遠端",
     "Resharing is not allowed" : "不允許重新分享",
     "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
     "Unshare" : "取消分享",
@@ -111,6 +131,7 @@
     "can edit" : "可編輯",
     "access control" : "存取控制",
     "create" : "建立",
+    "change" : "更動",
     "delete" : "刪除",
     "Password protected" : "受密碼保護",
     "Error unsetting expiration date" : "取消到期日設定失敗",
@@ -127,8 +148,11 @@
     "No tags selected for deletion." : "沒有選擇要刪除的標籤",
     "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候",
     "Please reload the page." : "請重新整理頁面",
+    "The update was unsuccessful. " : "更新失敗",
+    "The update was successful. There were warnings." : "更新成功，有警告訊息",
     "The update was successful. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。",
     "Couldn't reset password because the token is invalid" : "無法重設密碼因為 token 無效",
+    "Couldn't reset password because the token is expired" : "無法重設密碼，因為 token 過期",
     "Couldn't send reset email. Please make sure your username is correct." : "無法寄送重設 email ，請確認您的帳號輸入正確",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
     "%s password reset" : "%s 密碼重設",
@@ -186,6 +210,9 @@
     "Search" : "搜尋",
     "Server side authentication failed!" : "伺服器端認證失敗！",
     "Please contact your administrator." : "請聯絡系統管理員。",
+    "An internal error occured." : "發生內部錯誤",
+    "Please try again or contact your administrator." : "請重試或聯絡系統管理員",
+    "Wrong password. Reset it?" : "密碼錯誤，重設密碼？",
     "remember" : "記住",
     "Alternative Logins" : "其他登入方法",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
@@ -197,10 +224,15 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域",
     "Add \"%s\" as trusted domain" : "將 %s 加入到信任的網域",
+    "App update required" : "需要更新應用程式",
+    "%s will be updated to version %s" : "%s 將會更新至版本 %s",
+    "These apps will be updated:" : "將會更新這些應用程式",
+    "These incompatible apps will be disabled:" : "將會停用這些不相容的應用程式",
     "The theme %s has been disabled." : "主題 %s 已經被停用",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在繼續之前，請備份資料庫、config 目錄及資料目錄",
     "Start update" : "開始升級",
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "在大型安裝上，為了避免升級請求逾時，你也可以在安裝目錄執行下列指令：",
+    "This %s instance is currently in maintenance mode, which may take a while." : "這個 %s 安裝目前處於維護模式，需要一段時間恢復。",
     "This page will refresh itself when the %s instance is available again." : "%s 安裝恢復可用之後，本頁會自動重新整理"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index dcb8b512597..c386c8e3c3c 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -1,11 +1,15 @@
 OC.L10N.register(
     "settings",
     {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "Security & setup warnings" : "安全及設定警告",
     "Sharing" : "分享",
+    "Server-side encryption" : "伺服器端加密",
     "External Storage" : "外部儲存",
     "Cron" : "工作排程",
     "Email server" : "郵件伺服器",
-    "Log" : "紀錄",
+    "Log" : "紀錄檔",
     "Server status" : "伺服器狀態",
     "Tips & tricks" : "技巧 & 提示",
     "Updates" : "更新",
@@ -28,13 +32,28 @@ OC.L10N.register(
     "Not enabled" : "無啟動",
     "Migration Completed" : "遷移已完成",
     "Group already exists." : "群組已存在",
+    "Unable to add group." : "無法新增群組",
+    "Unable to delete group." : "無法刪除群組",
+    "log-level out of allowed range" : "log-level 超過允許範圍",
     "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "寄出郵件時發生問題，請檢查您的設定。（錯誤訊息：%s）",
     "Email sent" : "Email 已寄出",
     "You need to set your user email before being able to send test emails." : "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
-    "Email saved" : "Email已儲存",
+    "Invalid mail address" : "無效的 email 地址",
+    "A user with that name already exists." : "同名的使用者已經存在",
+    "Unable to create user." : "無法建立使用者",
+    "Your %s account was created" : "您的 %s 帳號已經建立",
+    "Unable to delete user." : "無法移除使用者",
+    "Forbidden" : "存取被拒",
+    "Invalid user" : "無效的使用者",
+    "Unable to change mail address" : "無法更改 email 地址",
+    "Email saved" : "Email 已儲存",
     "Migration started …" : "遷移開始中 ...",
     "Sending..." : "寄送中...",
+    "Official" : "官方",
+    "Approved" : "已批准",
+    "Experimental" : "實驗性質",
     "All" : "所有",
     "Please wait...." : "請稍候...",
     "Error while disabling app" : "停用應用程式錯誤",
@@ -44,12 +63,17 @@ OC.L10N.register(
     "Updating...." : "更新中...",
     "Error while updating app" : "更新應用程式錯誤",
     "Updated" : "已更新",
+    "Uninstalling ...." : "正在解除安裝…",
+    "Error while uninstalling app" : "移除應用程式錯誤",
+    "Uninstall" : "解除安裝",
+    "An error occurred: {message}" : "發生錯誤：{message}",
     "Select a profile picture" : "選擇大頭貼",
     "Very weak password" : "非常弱的密碼",
     "Weak password" : "弱的密碼",
     "So-so password" : "普通的密碼",
     "Good password" : "好的密碼",
     "Strong password" : "很強的密碼",
+    "Valid until {date}" : "{date} 前有效",
     "Delete" : "刪除",
     "Groups" : "群組",
     "undo" : "復原",
@@ -79,10 +103,10 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知",
     "days" : "天",
     "Allow resharing" : "允許轉貼分享",
-    "Cron was not executed yet!" : "排程沒有執行!",
+    "Cron was not executed yet!" : "排程沒有執行！",
     "Execute one task with each page loaded" : "當頁面載入時，執行",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
-    "This is used for sending out notifications." : "這是使用於寄送通知。",
+    "This is used for sending out notifications." : "寄送通知用",
     "Send mode" : "寄送模式",
     "Encryption" : "加密",
     "From address" : "寄件地址",
@@ -90,17 +114,25 @@ OC.L10N.register(
     "Authentication required" : "必須驗證",
     "Server address" : "伺服器位址",
     "Port" : "連接埠",
-    "Credentials" : "認證",
+    "Credentials" : "帳密",
     "SMTP Username" : "SMTP 帳號",
     "SMTP Password" : "SMTP 密碼",
+    "Store credentials" : "儲存帳密",
     "Test email settings" : "測試郵件設定",
     "Send email" : "寄送郵件",
     "Log level" : "紀錄層級",
+    "Download logfile" : "下載記錄檔",
     "More" : "更多",
     "Less" : "更少",
-    "How to do backups" : "如何輩分",
+    "How to do backups" : "如何備份",
+    "Advanced monitoring" : "進階監控",
+    "Performance tuning" : "效能調校",
+    "Improving the config.php" : "改進 config.php",
+    "Theming" : "佈景主題",
+    "Hardening and security guidance" : "增強安全性",
     "Version" : "版本",
     "Developer documentation" : "開發者說明文件",
+    "Experimental applications ahead" : "以下是實驗性質的應用程式",
     "by" : "由",
     "licensed" : "許可證",
     "Documentation:" : "文件:",
@@ -148,6 +180,7 @@ OC.L10N.register(
     "Choose as profile image" : "設定為大頭貼",
     "Language" : "語言",
     "Help translate" : "幫助翻譯",
+    "Common Name" : "Common Name",
     "Show storage location" : "顯示儲存位置",
     "Show last log in" : "顯示最近登入",
     "Show user backend" : "顯示用戶後台",
@@ -170,7 +203,7 @@ OC.L10N.register(
     "Quota" : "容量限制",
     "Storage Location" : "儲存位置",
     "User Backend" : "用戶後台",
-    "Last Login" : "最近登入",
+    "Last Login" : "上次登入",
     "change full name" : "變更全名",
     "set new password" : "設定新密碼",
     "change email address" : "更改電子郵件地址",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index 372265a8d36..40433325edc 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -1,9 +1,13 @@
 { "translations": {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "Security & setup warnings" : "安全及設定警告",
     "Sharing" : "分享",
+    "Server-side encryption" : "伺服器端加密",
     "External Storage" : "外部儲存",
     "Cron" : "工作排程",
     "Email server" : "郵件伺服器",
-    "Log" : "紀錄",
+    "Log" : "紀錄檔",
     "Server status" : "伺服器狀態",
     "Tips & tricks" : "技巧 & 提示",
     "Updates" : "更新",
@@ -26,13 +30,28 @@
     "Not enabled" : "無啟動",
     "Migration Completed" : "遷移已完成",
     "Group already exists." : "群組已存在",
+    "Unable to add group." : "無法新增群組",
+    "Unable to delete group." : "無法刪除群組",
+    "log-level out of allowed range" : "log-level 超過允許範圍",
     "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "寄出郵件時發生問題，請檢查您的設定。（錯誤訊息：%s）",
     "Email sent" : "Email 已寄出",
     "You need to set your user email before being able to send test emails." : "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
-    "Email saved" : "Email已儲存",
+    "Invalid mail address" : "無效的 email 地址",
+    "A user with that name already exists." : "同名的使用者已經存在",
+    "Unable to create user." : "無法建立使用者",
+    "Your %s account was created" : "您的 %s 帳號已經建立",
+    "Unable to delete user." : "無法移除使用者",
+    "Forbidden" : "存取被拒",
+    "Invalid user" : "無效的使用者",
+    "Unable to change mail address" : "無法更改 email 地址",
+    "Email saved" : "Email 已儲存",
     "Migration started …" : "遷移開始中 ...",
     "Sending..." : "寄送中...",
+    "Official" : "官方",
+    "Approved" : "已批准",
+    "Experimental" : "實驗性質",
     "All" : "所有",
     "Please wait...." : "請稍候...",
     "Error while disabling app" : "停用應用程式錯誤",
@@ -42,12 +61,17 @@
     "Updating...." : "更新中...",
     "Error while updating app" : "更新應用程式錯誤",
     "Updated" : "已更新",
+    "Uninstalling ...." : "正在解除安裝…",
+    "Error while uninstalling app" : "移除應用程式錯誤",
+    "Uninstall" : "解除安裝",
+    "An error occurred: {message}" : "發生錯誤：{message}",
     "Select a profile picture" : "選擇大頭貼",
     "Very weak password" : "非常弱的密碼",
     "Weak password" : "弱的密碼",
     "So-so password" : "普通的密碼",
     "Good password" : "好的密碼",
     "Strong password" : "很強的密碼",
+    "Valid until {date}" : "{date} 前有效",
     "Delete" : "刪除",
     "Groups" : "群組",
     "undo" : "復原",
@@ -77,10 +101,10 @@
     "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知",
     "days" : "天",
     "Allow resharing" : "允許轉貼分享",
-    "Cron was not executed yet!" : "排程沒有執行!",
+    "Cron was not executed yet!" : "排程沒有執行！",
     "Execute one task with each page loaded" : "當頁面載入時，執行",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
-    "This is used for sending out notifications." : "這是使用於寄送通知。",
+    "This is used for sending out notifications." : "寄送通知用",
     "Send mode" : "寄送模式",
     "Encryption" : "加密",
     "From address" : "寄件地址",
@@ -88,17 +112,25 @@
     "Authentication required" : "必須驗證",
     "Server address" : "伺服器位址",
     "Port" : "連接埠",
-    "Credentials" : "認證",
+    "Credentials" : "帳密",
     "SMTP Username" : "SMTP 帳號",
     "SMTP Password" : "SMTP 密碼",
+    "Store credentials" : "儲存帳密",
     "Test email settings" : "測試郵件設定",
     "Send email" : "寄送郵件",
     "Log level" : "紀錄層級",
+    "Download logfile" : "下載記錄檔",
     "More" : "更多",
     "Less" : "更少",
-    "How to do backups" : "如何輩分",
+    "How to do backups" : "如何備份",
+    "Advanced monitoring" : "進階監控",
+    "Performance tuning" : "效能調校",
+    "Improving the config.php" : "改進 config.php",
+    "Theming" : "佈景主題",
+    "Hardening and security guidance" : "增強安全性",
     "Version" : "版本",
     "Developer documentation" : "開發者說明文件",
+    "Experimental applications ahead" : "以下是實驗性質的應用程式",
     "by" : "由",
     "licensed" : "許可證",
     "Documentation:" : "文件:",
@@ -146,6 +178,7 @@
     "Choose as profile image" : "設定為大頭貼",
     "Language" : "語言",
     "Help translate" : "幫助翻譯",
+    "Common Name" : "Common Name",
     "Show storage location" : "顯示儲存位置",
     "Show last log in" : "顯示最近登入",
     "Show user backend" : "顯示用戶後台",
@@ -168,7 +201,7 @@
     "Quota" : "容量限制",
     "Storage Location" : "儲存位置",
     "User Backend" : "用戶後台",
-    "Last Login" : "最近登入",
+    "Last Login" : "上次登入",
     "change full name" : "變更全名",
     "set new password" : "設定新密碼",
     "change email address" : "更改電子郵件地址",
-- 
GitLab


From 3ea9f97c3644d30e03a28eaedd63350346536579 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 3 Sep 2015 08:24:50 +0200
Subject: [PATCH 144/783] Fix sidebar thumbnail loading JS unit tests

---
 apps/files/js/fileinfomodel.js                | 13 ++--
 .../tests/js/mainfileinfodetailviewSpec.js    | 66 ++++++++++++++++---
 2 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/apps/files/js/fileinfomodel.js b/apps/files/js/fileinfomodel.js
index ab205b2efb4..22b1ca9ff0c 100644
--- a/apps/files/js/fileinfomodel.js
+++ b/apps/files/js/fileinfomodel.js
@@ -31,16 +31,15 @@
 	 */
 	var FileInfoModel = OC.Backbone.Model.extend({
 
+		defaults: {
+			mimetype: 'application/octet-stream',
+			path: ''
+		},
+
 		initialize: function(data) {
 			if (!_.isUndefined(data.id)) {
 				data.id = parseInt(data.id, 10);
 			}
-
-			// TODO: normalize path
-			data.path = data.path || '';
-			data.name = data.name;
-
-			data.mimetype = data.mimetype || 'application/octet-stream';
 		},
 
 		/**
@@ -58,7 +57,7 @@
 		 * @return {boolean} true if this is an image, false otherwise
 		 */
 		isImage: function() {
-			return this.get('mimetype')? this.get('mimetype').substr(0, 6) === 'image/' : false;
+			return this.has('mimetype') ? this.get('mimetype').substr(0, 6) === 'image/' : false;
 		},
 
 		/**
diff --git a/apps/files/tests/js/mainfileinfodetailviewSpec.js b/apps/files/tests/js/mainfileinfodetailviewSpec.js
index 3d78312c86e..2b9e2b23f93 100644
--- a/apps/files/tests/js/mainfileinfodetailviewSpec.js
+++ b/apps/files/tests/js/mainfileinfodetailviewSpec.js
@@ -20,11 +20,10 @@
 */
 
 describe('OCA.Files.MainFileInfoDetailView tests', function() {
-	var view, tooltipStub, fileListMock, fileActions, fileList, testFileInfo;
+	var view, tooltipStub, fileActions, fileList, testFileInfo;
 
 	beforeEach(function() {
 		tooltipStub = sinon.stub($.fn, 'tooltip');
-		fileListMock = sinon.mock(OCA.Files.FileList.prototype);
 		fileActions = new OCA.Files.FileActions();
 		fileList = new OCA.Files.FileList($('<table></table>'), {
 			fileActions: fileActions
@@ -40,6 +39,7 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 			permissions: 31,
 			path: '/subdir',
 			size: 123456789,
+			etag: 'abcdefg',
 			mtime: Date.UTC(2015, 6, 17, 1, 2, 0, 0)
 		});
 	});
@@ -47,7 +47,6 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 		view.remove();
 		view = undefined;
 		tooltipStub.restore();
-		fileListMock.restore();
 
 	});
 	describe('rendering', function() {
@@ -76,9 +75,31 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 		});
 		it('displays mime icon', function() {
 			// File
+			var lazyLoadPreviewStub = sinon.stub(fileList, 'lazyLoadPreview');
 			testFileInfo.set('mimetype', 'text/calendar');
 			view.setFileInfo(testFileInfo);
 
+			expect(lazyLoadPreviewStub.calledOnce).toEqual(true);
+			var previewArgs = lazyLoadPreviewStub.getCall(0).args;
+			expect(previewArgs[0].mime).toEqual('text/calendar');
+			expect(previewArgs[0].path).toEqual('/subdir/One.txt');
+			expect(previewArgs[0].etag).toEqual('abcdefg');
+
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(true);
+
+			// returns mime icon first without img parameter
+			previewArgs[0].callback(
+				OC.imagePath('core', 'filetypes/text-calendar.svg')
+			);
+
+			// still loading
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(true);
+
+			// preview loading failed, no prview
+			previewArgs[0].error();
+
+			// loading stopped, the mimetype icon gets displayed
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(false);
 			expect(view.$el.find('.thumbnail').css('background-image'))
 				.toContain('filetypes/text-calendar.svg');
 
@@ -88,17 +109,46 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 
 			expect(view.$el.find('.thumbnail').css('background-image'))
 				.toContain('filetypes/folder.svg');
+
+			lazyLoadPreviewStub.restore();
 		});
 		it('displays thumbnail', function() {
-			testFileInfo.set('mimetype', 'test/plain');
+			var lazyLoadPreviewStub = sinon.stub(fileList, 'lazyLoadPreview');
+
+			testFileInfo.set('mimetype', 'text/plain');
 			view.setFileInfo(testFileInfo);
 
-			var expectation = fileListMock.expects('lazyLoadPreview');
-			expectation.once();
+			expect(lazyLoadPreviewStub.calledOnce).toEqual(true);
+			var previewArgs = lazyLoadPreviewStub.getCall(0).args;
+			expect(previewArgs[0].mime).toEqual('text/plain');
+			expect(previewArgs[0].path).toEqual('/subdir/One.txt');
+			expect(previewArgs[0].etag).toEqual('abcdefg');
 
-			view.setFileInfo(testFileInfo);
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(true);
+
+			// returns mime icon first without img parameter
+			previewArgs[0].callback(
+				OC.imagePath('core', 'filetypes/text-plain.svg')
+			);
+
+			// still loading
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(true);
+
+			// return an actual (simulated) image
+			previewArgs[0].callback(
+				'testimage', {
+					width: 100,
+					height: 200
+				}
+			);
+
+			// loading stopped, image got displayed
+			expect(view.$el.find('.thumbnail').css('background-image'))
+				.toContain('testimage');
+
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(false);
 
-			fileListMock.verify();
+			lazyLoadPreviewStub.restore();
 		});
 		it('does not show size if no size available', function() {
 			testFileInfo.unset('size');
-- 
GitLab


From cd0a5372ee70a4bd5abd953c62332370555405d8 Mon Sep 17 00:00:00 2001
From: Individual IT Services <info@individual-it.net>
Date: Thu, 3 Sep 2015 12:44:35 +0545
Subject: [PATCH 145/783] reuse existing $systemConfig variable

---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 9cf0228bbd9..2852c1443c0 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -674,7 +674,7 @@ class OC {
 
 		self::registerCacheHooks();
 		self::registerFilesystemHooks();
-		if (\OC::$server->getSystemConfig()->getValue('enable_previews', true)) {
+		if ($systemConfig->getValue('enable_previews', true)) {
 			self::registerPreviewHooks();
 		}	
 		self::registerShareHooks();
-- 
GitLab


From e33d7b34fa14541b6d757e7cb2551870c939d15e Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 3 Sep 2015 09:39:14 +0100
Subject: [PATCH 146/783] Fix typo in SMB_OC

---
 apps/files_external/lib/backend/smb_oc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php
index 67fa8ffb2c4..3621682fb8f 100644
--- a/apps/files_external/lib/backend/smb_oc.php
+++ b/apps/files_external/lib/backend/smb_oc.php
@@ -58,9 +58,9 @@ class SMB_OC extends Backend {
 	}
 
 	public function manipulateStorageConfig(StorageConfig &$storage) {
-		$username_as_share = ($storage->getBackendOption('username_as_share') === 'true');
+		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
 
-		if ($this->username_as_share) {
+		if ($username_as_share) {
 			$share = '/' . $storage->getBackendOption('user');
 			$storage->setBackendOption('share', $share);
 		}
-- 
GitLab


From 442f5269ef229afa09cbe1e06b2a73bb9656e8c4 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 3 Sep 2015 09:50:45 +0100
Subject: [PATCH 147/783] Fix Swift legacy auth mechanism fallback

---
 apps/files_external/lib/backend/swift.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/lib/backend/swift.php b/apps/files_external/lib/backend/swift.php
index 9f01a923638..c0ac7c08345 100644
--- a/apps/files_external/lib/backend/swift.php
+++ b/apps/files_external/lib/backend/swift.php
@@ -49,7 +49,7 @@ class Swift extends Backend {
 			->setDependencyCheck('\OC\Files\Storage\Swift::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
 			->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
-				if (isset($params['key'])) {
+				if (isset($params['options']['key']) && $params['options']['key']) {
 					return $rackspaceAuth;
 				}
 				return $openstackAuth;
-- 
GitLab


From d4104ed9f7b0b7dd497e01fe1f8558cbdb3abf00 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 3 Sep 2015 10:57:34 +0200
Subject: [PATCH 148/783] Remove ellipsis on new file menu items

---
 apps/files/css/files.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 5c27515f26a..5045d8dd1d3 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -740,7 +740,6 @@ table.dragshadow td.size {
 
 .newFileMenu .menuitem {
 	white-space: nowrap;
-	text-overflow: ellipsis;
 	overflow: hidden;
 }
 .newFileMenu.popovermenu .menuitem .icon {
-- 
GitLab


From 21ba3b8737dc61dcee974e0179c11cad7ee1ae6a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 2 Sep 2015 18:56:17 +0200
Subject: [PATCH 149/783] Only query the appconfig once

---
 lib/private/appconfig.php | 213 +++++++++---------
 tests/lib/appconfig.php   | 451 +++++++++++++++++++++-----------------
 2 files changed, 349 insertions(+), 315 deletions(-)

diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index b88df10dddd..b9b5dacb168 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -28,23 +28,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-/*
- *
- * The following SQL statement is just a help for developers and will not be
- * executed!
- *
- * CREATE TABLE  `appconfig` (
- * `appid` VARCHAR( 255 ) NOT NULL ,
- * `configkey` VARCHAR( 255 ) NOT NULL ,
- * `configvalue` VARCHAR( 255 ) NOT NULL
- * )
- *
- */
 
 namespace OC;
 
-use OC\DB\Connection;
 use OCP\IAppConfig;
+use OCP\IDBConnection;
 
 /**
  * This class provides an easy way for apps to store config values in the
@@ -52,54 +40,32 @@ use OCP\IAppConfig;
  */
 class AppConfig implements IAppConfig {
 	/**
-	 * @var \OC\DB\Connection $conn
+	 * @var \OCP\IDBConnection $conn
 	 */
 	protected $conn;
 
 	private $cache = array();
 
-	private $appsLoaded = array();
-
 	/**
-	 * @var string[]
+	 * @param IDBConnection $conn
 	 */
-	private $apps = null;
-
-	/**
-	 * @param Connection $conn
-	 */
-	public function __construct(Connection $conn) {
+	public function __construct(IDBConnection $conn) {
 		$this->conn = $conn;
+		$this->configLoaded = false;
 	}
 
 	/**
 	 * @param string $app
-	 * @return string[]
-	 */
-	private function getAppCache($app) {
-		if (!isset($this->cache[$app])) {
-			$this->cache[$app] = array();
-		}
-		return $this->cache[$app];
-	}
-
-	/**
-	 * @param string $app
-	 * @return \string[]
+	 * @return array
 	 */
 	private function getAppValues($app) {
-		$appCache = $this->getAppCache($app);
-		if (array_search($app, $this->appsLoaded) === false) {
-			$query = 'SELECT `configvalue`, `configkey` FROM `*PREFIX*appconfig`'
-				. ' WHERE `appid` = ?';
-			$result = $this->conn->executeQuery($query, array($app));
-			while ($row = $result->fetch()) {
-				$appCache[$row['configkey']] = $row['configvalue'];
-			}
-			$this->appsLoaded[] = $app;
+		$this->loadConfigValues();
+
+		if (isset($this->cache[$app])) {
+			return $this->cache[$app];
 		}
-		$this->cache[$app] = $appCache;
-		return $appCache;
+
+		return [];
 	}
 
 	/**
@@ -111,18 +77,9 @@ class AppConfig implements IAppConfig {
 	 * entry in the appconfig table.
 	 */
 	public function getApps() {
-		if (is_array($this->apps)) {
-			return $this->apps;
-		}
-		$query = 'SELECT DISTINCT `appid` FROM `*PREFIX*appconfig` ORDER BY `appid`';
-		$result = $this->conn->executeQuery($query);
+		$this->loadConfigValues();
 
-		$apps = array();
-		while ($appid = $result->fetchColumn()) {
-			$apps[] = $appid;
-		}
-		$this->apps = $apps;
-		return $apps;
+		return $this->getSortedKeys($this->cache);
 	}
 
 	/**
@@ -135,8 +92,17 @@ class AppConfig implements IAppConfig {
 	 * not returned.
 	 */
 	public function getKeys($app) {
-		$values = $this->getAppValues($app);
-		$keys = array_keys($values);
+		$this->loadConfigValues();
+
+		if (isset($this->cache[$app])) {
+			return $this->getSortedKeys($this->cache[$app]);
+		}
+
+		return [];
+	}
+
+	public function getSortedKeys($data) {
+		$keys = array_keys($data);
 		sort($keys);
 		return $keys;
 	}
@@ -153,12 +119,13 @@ class AppConfig implements IAppConfig {
 	 * not exist the default value will be returned
 	 */
 	public function getValue($app, $key, $default = null) {
-		$values = $this->getAppValues($app);
-		if (isset($values[$key])) {
-			return $values[$key];
-		} else {
-			return $default;
+		$this->loadConfigValues();
+
+		if ($this->hasKey($app, $key)) {
+			return $this->cache[$app][$key];
 		}
+
+		return $default;
 	}
 
 	/**
@@ -169,8 +136,9 @@ class AppConfig implements IAppConfig {
 	 * @return bool
 	 */
 	public function hasKey($app, $key) {
-		$values = $this->getAppValues($app);
-		return array_key_exists($key, $values);
+		$this->loadConfigValues();
+
+		return isset($this->cache[$app][$key]);
 	}
 
 	/**
@@ -179,11 +147,9 @@ class AppConfig implements IAppConfig {
 	 * @param string $app app
 	 * @param string $key key
 	 * @param string $value value
-	 * @return void
+	 * @return bool True if the value was inserted or updated, false if the value was the same
 	 */
 	public function setValue($app, $key, $value) {
-		$inserted = false;
-		// Does the key exist? no: insert, yes: update.
 		if (!$this->hasKey($app, $key)) {
 			$inserted = (bool) $this->conn->insertIfNotExist('*PREFIX*appconfig', [
 				'appid' => $app,
@@ -193,29 +159,28 @@ class AppConfig implements IAppConfig {
 				'appid',
 				'configkey',
 			]);
-		}
 
-		if (!$inserted) {
-			$oldValue = $this->getValue($app, $key);
-			if($oldValue === strval($value)) {
-				return;
+			if ($inserted) {
+				$this->cache[$app][$key] = $value;
+				return true;
 			}
-			$data = array(
-				'configvalue' => $value,
-			);
-			$where = array(
-				'appid' => $app,
-				'configkey' => $key,
-			);
-			$this->conn->update('*PREFIX*appconfig', $data, $where);
-		}
-		if (!isset($this->cache[$app])) {
-			$this->cache[$app] = array();
-		}
-		if (is_array($this->apps) and array_search($app, $this->apps) === false) {
-			$this->apps[$app] = $app;
 		}
+
+		$sql = $this->conn->getQueryBuilder();
+		$sql->update('appconfig')
+			->set('configvalue', $sql->createParameter('configvalue'))
+			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+			->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue')))
+			->setParameter('configvalue', $value)
+			->setParameter('app', $app)
+			->setParameter('configkey', $key)
+			->setParameter('configvalue', $value);
+		$changedRow = (bool) $sql->execute();
+
 		$this->cache[$app][$key] = $value;
+
+		return $changedRow;
 	}
 
 	/**
@@ -226,14 +191,17 @@ class AppConfig implements IAppConfig {
 	 * @return boolean|null
 	 */
 	public function deleteKey($app, $key) {
-		$where = array(
-			'appid' => $app,
-			'configkey' => $key,
-		);
-		$this->conn->delete('*PREFIX*appconfig', $where);
-		if (isset($this->cache[$app]) and isset($this->cache[$app][$key])) {
-			unset($this->cache[$app][$key]);
-		}
+		$this->loadConfigValues();
+
+		$sql = $this->conn->getQueryBuilder();
+		$sql->delete('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+			->setParameter('app', $app)
+			->setParameter('configkey', $key);
+		$sql->execute();
+
+		unset($this->cache[$app][$key]);
 	}
 
 	/**
@@ -245,38 +213,61 @@ class AppConfig implements IAppConfig {
 	 * Removes all keys in appconfig belonging to the app.
 	 */
 	public function deleteApp($app) {
-		$where = array(
-			'appid' => $app,
-		);
-		$this->conn->delete('*PREFIX*appconfig', $where);
+		$this->loadConfigValues();
+
+		$sql = $this->conn->getQueryBuilder();
+		$sql->delete('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+			->setParameter('app', $app);
+		$sql->execute();
+
 		unset($this->cache[$app]);
-		unset($this->apps[$app]);
 	}
 
 	/**
-	 * get multiply values, either the app or key can be used as wildcard by setting it to false
+	 * get multiple values, either the app or key can be used as wildcard by setting it to false
 	 *
 	 * @param string|false $app
 	 * @param string|false $key
 	 * @return array|false
 	 */
 	public function getValues($app, $key) {
-		if (($app !== false) == ($key !== false)) {
+		if (($app !== false) === ($key !== false)) {
 			return false;
 		}
 
-		if ($app !== false) {
+		if ($key === false) {
 			return $this->getAppValues($app);
 		} else {
-			$query = 'SELECT `configvalue`, `appid` FROM `*PREFIX*appconfig` WHERE `configkey` = ?';
-			$result = $this->conn->executeQuery($query, array($key));
-
-			$values = array();
-			while ($row = $result->fetch((\PDO::FETCH_ASSOC))) {
-				$values[$row['appid']] = $row['configvalue'];
+			$configs = [];
+			foreach ($this->getApps() as $appId) {
+				if ($this->hasKey($appId, $key)) {
+					$configs[$appId] = $this->getValue($appId, $key);
+				}
 			}
 
-			return $values;
+			return $configs;
 		}
 	}
+
+	/**
+	 * Load all the app config values
+	 */
+	protected function loadConfigValues() {
+		if ($this->configLoaded) return;
+
+		$this->cache = [];
+
+		$sql = $this->conn->getQueryBuilder();
+		$sql->select('*')
+			->from('appconfig');
+		$result = $sql->execute();
+
+		while ($row = $result->fetch()) {
+			$this->cache[$row['appid']][$row['configkey']] = $row['configvalue'];
+		}
+		$result->closeCursor();
+
+		$this->configLoaded = true;
+	}
 }
diff --git a/tests/lib/appconfig.php b/tests/lib/appconfig.php
index 5a2cb3f88fc..5ea446aee51 100644
--- a/tests/lib/appconfig.php
+++ b/tests/lib/appconfig.php
@@ -7,49 +7,123 @@
  * See the COPYING-README file.
  */
 
-class Test_Appconfig extends \Test\TestCase {
+namespace Test\Lib;
+
+use Test\TestCase;
+
+class AppConfig extends TestCase {
 	/** @var \OCP\IAppConfig */
 	protected $appConfig;
 
 	/** @var \OCP\IDBConnection */
 	protected $connection;
 
+	protected $originalConfig;
+
 	public function setUp() {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->registerAppConfig(new \OC\AppConfig(\OC::$server->getDatabaseConnection()));
-
-		$query = $this->connection->prepare('DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ?');
-		$query->execute(array('testapp'));
-		$query->execute(array('someapp'));
-		$query->execute(array('123456'));
-		$query->execute(array('anotherapp'));
-
-		$query = $this->connection->prepare('INSERT INTO `*PREFIX*appconfig` VALUES (?, ?, ?)');
-
-		$query->execute(array('testapp', 'enabled', 'true'));
-		$query->execute(array('testapp', 'installed_version', '1.2.3'));
-		$query->execute(array('testapp', 'depends_on', 'someapp'));
-		$query->execute(array('testapp', 'deletethis', 'deletethis'));
-		$query->execute(array('testapp', 'key', 'value'));
-
-		$query->execute(array('someapp', 'key', 'value'));
-		$query->execute(array('someapp', 'otherkey', 'othervalue'));
-
-		$query->execute(array('123456', 'key', 'value'));
-		$query->execute(array('123456', 'enabled', 'false'));
-
-		$query->execute(array('anotherapp', 'key', 'value'));
-		$query->execute(array('anotherapp', 'enabled', 'false'));
+		$sql = $this->connection->getQueryBuilder();
+		$sql->select('*')
+			->from('appconfig');
+		$result = $sql->execute();
+		$this->originalConfig = $result->fetchAll();
+		$result->closeCursor();
+
+		$sql = $this->connection->getQueryBuilder();
+		$sql->delete('appconfig');
+		$sql->execute();
+
+		$this->registerAppConfig(new \OC\AppConfig($this->connection));
+
+		$sql = $this->connection->getQueryBuilder();
+		$sql->insert('appconfig')
+			->values([
+				'appid' => $sql->createParameter('appid'),
+				'configkey' => $sql->createParameter('configkey'),
+				'configvalue' => $sql->createParameter('configvalue'),
+			]);
+
+		$sql->setParameters([
+			'appid' => 'testapp',
+			'configkey' => 'enabled',
+			'configvalue' => 'true',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'testapp',
+			'configkey' => 'installed_version',
+			'configvalue' => '1.2.3',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'testapp',
+			'configkey' => 'depends_on',
+			'configvalue' => 'someapp',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'testapp',
+			'configkey' => 'deletethis',
+			'configvalue' => 'deletethis',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'testapp',
+			'configkey' => 'key',
+			'configvalue' => 'value',
+		])->execute();
+
+		$sql->setParameters([
+			'appid' => 'someapp',
+			'configkey' => 'key',
+			'configvalue' => 'value',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'someapp',
+			'configkey' => 'otherkey',
+			'configvalue' => 'othervalue',
+		])->execute();
+
+		$sql->setParameters([
+			'appid' => '123456',
+			'configkey' => 'key',
+			'configvalue' => 'value',
+		])->execute();
+		$sql->setParameters([
+			'appid' => '123456',
+			'configkey' => 'enabled',
+			'configvalue' => 'false',
+		])->execute();
+
+		$sql->setParameters([
+			'appid' => 'anotherapp',
+			'configkey' => 'key',
+			'configvalue' => 'value',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'anotherapp',
+			'configkey' => 'enabled',
+			'configvalue' => 'false',
+		])->execute();
 	}
 
 	public function tearDown() {
-		$query = $this->connection->prepare('DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ?');
-		$query->execute(array('testapp'));
-		$query->execute(array('someapp'));
-		$query->execute(array('123456'));
-		$query->execute(array('anotherapp'));
+		$sql = $this->connection->getQueryBuilder();
+		$sql->delete('appconfig');
+		$sql->execute();
+
+		$sql = $this->connection->getQueryBuilder();
+		$sql->insert('appconfig')
+			->values([
+				'appid' => $sql->createParameter('appid'),
+				'configkey' => $sql->createParameter('configkey'),
+				'configvalue' => $sql->createParameter('configvalue'),
+			]);
+
+		foreach ($this->originalConfig as $configs) {
+			$sql->setParameter('appid', $configs['appid'])
+				->setParameter('configkey', $configs['configkey'])
+				->setParameter('configvalue', $configs['configvalue']);
+			$sql->execute();
+		}
 
 		$this->registerAppConfig(new \OC\AppConfig(\OC::$server->getDatabaseConnection()));
 		parent::tearDown();
@@ -61,217 +135,179 @@ class Test_Appconfig extends \Test\TestCase {
 	 * @param \OCP\IAppConfig $appConfig
 	 */
 	protected function registerAppConfig($appConfig) {
-		\OC::$server->registerService('AppConfig', function ($c) use ($appConfig) {
+		\OC::$server->registerService('AppConfig', function () use ($appConfig) {
 			return $appConfig;
 		});
 	}
 
-	public function getAppConfigs() {
-		return [
-			[new \OC\AppConfig(\OC::$server->getDatabaseConnection())],
-		];
-	}
+	public function testGetApps() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testGetApps($callable) {
-		$query = \OC_DB::prepare('SELECT DISTINCT `appid` FROM `*PREFIX*appconfig` ORDER BY `appid`');
-		$result = $query->execute();
-		$expected = array();
-		while ($row = $result->fetchRow()) {
-			$expected[] = $row['appid'];
-		}
-		sort($expected);
-		$apps = call_user_func([$callable, 'getApps']);
-		$this->assertEquals($expected, $apps);
+		$this->assertEquals([
+			'anotherapp',
+			'someapp',
+			'testapp',
+			'123456',
+		], $config->getApps());
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testGetKeys($callable) {
-		$query = \OC_DB::prepare('SELECT `configkey` FROM `*PREFIX*appconfig` WHERE `appid` = ?');
-		$result = $query->execute(array('testapp'));
-		$expected = array();
-		while($row = $result->fetchRow()) {
-			$expected[] = $row["configkey"];
-		}
-		sort($expected);
-		$keys = call_user_func([$callable, 'getKeys'], 'testapp');
-		$this->assertEquals($expected, $keys);
+	public function testGetKeys() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$keys = $config->getKeys('testapp');
+		$this->assertEquals([
+			'deletethis',
+			'depends_on',
+			'enabled',
+			'installed_version',
+			'key',
+		], $keys);
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testGetValue($callable) {
-		$value = call_user_func([$callable, 'getValue'], 'testapp', 'installed_version');
+	public function testGetValue() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$value = $config->getValue('testapp', 'installed_version');
 		$this->assertConfigKey('testapp', 'installed_version', $value);
 
-		$value = call_user_func([$callable, 'getValue'], 'testapp', 'nonexistant');
+		$value = $config->getValue('testapp', 'nonexistant');
 		$this->assertNull($value);
 
-		$value = call_user_func([$callable, 'getValue'], 'testapp', 'nonexistant', 'default');
+		$value = $config->getValue('testapp', 'nonexistant', 'default');
 		$this->assertEquals('default', $value);
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testHasKey($callable) {
-		$value = call_user_func([$callable, 'hasKey'], 'testapp', 'installed_version');
-		$this->assertTrue($value);
+	public function testHasKey() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
 
-		$value = call_user_func([$callable, 'hasKey'], 'nonexistant', 'nonexistant');
-		$this->assertFalse($value);
+		$this->assertTrue($config->hasKey('testapp', 'installed_version'));
+		$this->assertFalse($config->hasKey('testapp', 'nonexistant'));
+		$this->assertFalse($config->hasKey('nonexistant', 'nonexistant'));
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testSetValue($callable) {
-		call_user_func([$callable, 'setValue'], 'testapp', 'installed_version', '1.33.7');
+	public function testSetValueUpdate() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$this->assertEquals('1.2.3', $config->getValue('testapp', 'installed_version'));
+		$this->assertConfigKey('testapp', 'installed_version', '1.2.3');
+
+		$this->assertFalse($config->setValue('testapp', 'installed_version', '1.2.3'));
+
+		$this->assertEquals('1.2.3', $config->getValue('testapp', 'installed_version'));
+		$this->assertConfigKey('testapp', 'installed_version', '1.2.3');
+
+		$this->assertTrue($config->setValue('testapp', 'installed_version', '1.33.7'));
+
+
+		$this->assertEquals('1.33.7', $config->getValue('testapp', 'installed_version'));
 		$this->assertConfigKey('testapp', 'installed_version', '1.33.7');
 
-		call_user_func([$callable, 'setValue'], 'someapp', 'somekey', 'somevalue');
+		$config->setValue('someapp', 'somekey', 'somevalue');
 		$this->assertConfigKey('someapp', 'somekey', 'somevalue');
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testDeleteKey($callable) {
-		call_user_func([$callable, 'deleteKey'], 'testapp', 'deletethis');
-		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?');
-		$query->execute(array('testapp', 'deletethis'));
-		$result = (bool)$query->fetchRow();
+	public function testSetValueInsert() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$this->assertFalse($config->hasKey('someapp', 'somekey'));
+		$this->assertNull($config->getValue('someapp', 'somekey'));
+
+		$this->assertTrue($config->setValue('someapp', 'somekey', 'somevalue'));
+
+		$this->assertTrue($config->hasKey('someapp', 'somekey'));
+		$this->assertEquals('somevalue', $config->getValue('someapp', 'somekey'));
+		$this->assertConfigKey('someapp', 'somekey', 'somevalue');
+
+		$this->assertFalse($config->setValue('someapp', 'somekey', 'somevalue'));
+	}
+
+	public function testDeleteKey() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$this->assertTrue($config->hasKey('testapp', 'deletethis'));
+
+		$config->deleteKey('testapp', 'deletethis');
+
+		$this->assertFalse($config->hasKey('testapp', 'deletethis'));
+
+		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$sql->select('configvalue')
+			->from('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('appid')))
+			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+			->setParameter('appid', 'testapp')
+			->setParameter('configkey', 'deletethis');
+		$query = $sql->execute();
+		$result = $query->fetch();
+		$query->closeCursor();
 		$this->assertFalse($result);
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testDeleteApp($callable) {
-		call_user_func([$callable, 'deleteApp'], 'someapp');
-		$query = \OC_DB::prepare('SELECT `configkey` FROM `*PREFIX*appconfig` WHERE `appid` = ?');
-		$query->execute(array('someapp'));
-		$result = (bool)$query->fetchRow();
+	public function testDeleteApp() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$this->assertTrue($config->hasKey('someapp', 'otherkey'));
+
+		$config->deleteApp('someapp');
+
+		$this->assertFalse($config->hasKey('someapp', 'otherkey'));
+
+		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$sql->select('configvalue')
+			->from('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('appid')))
+			->setParameter('appid', 'someapp');
+		$query = $sql->execute();
+		$result = $query->fetch();
+		$query->closeCursor();
 		$this->assertFalse($result);
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testGetValues($callable) {
-		$this->assertFalse(call_user_func([$callable, 'getValues'], 'testapp', 'enabled'));
+	public function testGetValuesNotAllowed() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
 
-		$query = \OC_DB::prepare('SELECT `configkey`, `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ?');
-		$query->execute(array('testapp'));
-		$expected = array();
-		while ($row = $query->fetchRow()) {
+		$this->assertFalse($config->getValues('testapp', 'enabled'));
+
+		$this->assertFalse($config->getValues(false, false));
+	}
+
+	public function testGetValues() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$sql->select(['configkey', 'configvalue'])
+			->from('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('appid')))
+			->setParameter('appid', 'testapp');
+		$query = $sql->execute();
+		$expected = [];
+		while ($row = $query->fetch()) {
 			$expected[$row['configkey']] = $row['configvalue'];
 		}
-		$values = call_user_func([$callable, 'getValues'], 'testapp', false);
+		$query->closeCursor();
+
+		$values = $config->getValues('testapp', false);
 		$this->assertEquals($expected, $values);
 
-		$query = \OC_DB::prepare('SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig` WHERE `configkey` = ?');
-		$query->execute(array('enabled'));
-		$expected = array();
-		while ($row = $query->fetchRow()) {
+		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$sql->select(['appid', 'configvalue'])
+			->from('appconfig')
+			->where($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+			->setParameter('configkey', 'enabled');
+		$query = $sql->execute();
+		$expected = [];
+		while ($row = $query->fetch()) {
 			$expected[$row['appid']] = $row['configvalue'];
 		}
-		$values = call_user_func([$callable, 'getValues'], false, 'enabled');
-		$this->assertEquals($expected, $values);
-	}
+		$query->closeCursor();
 
-	public function testSetValueUnchanged() {
-		$statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false);
-		$statementMock->expects($this->once())
-			->method('fetch')
-			->will($this->returnValue(false));
-
-		$connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
-		$connectionMock->expects($this->once())
-			->method('executeQuery')
-			->with($this->equalTo('SELECT `configvalue`, `configkey` FROM `*PREFIX*appconfig`'
-				.' WHERE `appid` = ?'), $this->equalTo(array('bar')))
-			->will($this->returnValue($statementMock));
-		$connectionMock->expects($this->once())
-			->method('insertIfNotExist')
-			->with($this->equalTo('*PREFIX*appconfig'),
-				$this->equalTo(
-					array(
-						'appid' => 'bar',
-						'configkey' => 'foo',
-						'configvalue' => 'v1',
-					)
-				), $this->equalTo(['appid', 'configkey']))
-			->willReturn(1);
-		$connectionMock->expects($this->never())
-			->method('update');
-
-		$appconfig = new OC\AppConfig($connectionMock);
-		$appconfig->setValue('bar', 'foo', 'v1');
-		$appconfig->setValue('bar', 'foo', 'v1');
-		$appconfig->setValue('bar', 'foo', 'v1');
-	}
-
-	public function testSetValueUnchanged2() {
-		$statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false);
-		$statementMock->expects($this->once())
-			->method('fetch')
-			->will($this->returnValue(false));
-
-		$connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
-		$connectionMock->expects($this->once())
-			->method('executeQuery')
-			->with($this->equalTo('SELECT `configvalue`, `configkey` FROM `*PREFIX*appconfig`'
-				.' WHERE `appid` = ?'), $this->equalTo(array('bar')))
-			->will($this->returnValue($statementMock));
-		$connectionMock->expects($this->once())
-			->method('insertIfNotExist')
-			->with($this->equalTo('*PREFIX*appconfig'),
-				$this->equalTo(
-					array(
-						'appid' => 'bar',
-						'configkey' => 'foo',
-						'configvalue' => 'v1',
-					)
-				), $this->equalTo(['appid', 'configkey']))
-			->willReturn(1);
-		$connectionMock->expects($this->once())
-			->method('update')
-			->with($this->equalTo('*PREFIX*appconfig'),
-				$this->equalTo(array('configvalue' => 'v2')),
-				$this->equalTo(array('appid' => 'bar', 'configkey' => 'foo'))
-				);
-
-		$appconfig = new OC\AppConfig($connectionMock);
-		$appconfig->setValue('bar', 'foo', 'v1');
-		$appconfig->setValue('bar', 'foo', 'v2');
-		$appconfig->setValue('bar', 'foo', 'v2');
+		$values = $config->getValues(false, 'enabled');
+		$this->assertEquals($expected, $values);
 	}
 
 	public function testSettingConfigParallel() {
-		$appConfig1 = new OC\AppConfig(\OC::$server->getDatabaseConnection());
-		$appConfig2 = new OC\AppConfig(\OC::$server->getDatabaseConnection());
+		$appConfig1 = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+		$appConfig2 = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
 		$appConfig1->getValue('testapp', 'foo', 'v1');
 		$appConfig2->getValue('testapp', 'foo', 'v1');
 
@@ -286,12 +322,19 @@ class Test_Appconfig extends \Test\TestCase {
 	 * @param string $app
 	 * @param string $key
 	 * @param string $expected
-	 * @throws \OC\DatabaseException
 	 */
 	protected function assertConfigKey($app, $key, $expected) {
-		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?');
-		$result = $query->execute([$app, $key]);
-		$actual = $result->fetchRow();
+		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$sql->select('configvalue')
+			->from('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('appid')))
+			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+			->setParameter('appid', $app)
+			->setParameter('configkey', $key);
+		$query = $sql->execute();
+		$actual = $query->fetch();
+		$query->closeCursor();
+
 		$this->assertEquals($expected, $actual['configvalue']);
 	}
 }
-- 
GitLab


From acc9fa49fc5236bb4ab9189504c86f536fc38fb7 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 3 Sep 2015 11:46:16 +0200
Subject: [PATCH 150/783] use SVG for toggle image instead of PNG, fix
 installation and personal settings toggle

---
 core/css/styles.css             | 2 +-
 core/templates/installation.php | 4 ++--
 settings/templates/personal.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 020c2702a10..dd0110ded3a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -667,7 +667,7 @@ label.infield {
 	position: absolute !important;
 	height: 20px;
 	width: 24px;
-	background-image: url("../img/actions/toggle.png");
+	background-image: url('../img/actions/toggle.svg');
 	background-repeat: no-repeat;
 	background-position: center;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 8db55e4bdab..716cb1af6af 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -53,7 +53,7 @@ script('core', [
 			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
 			<img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="">
 			<input type="checkbox" id="show" name="show">
-			<label for="show"></label>
+			<label for="show" class="svg"></label>
 			<div class="strengthify-wrapper"></div>
 		</p>
 	</fieldset>
@@ -149,7 +149,7 @@ script('core', [
 		</fieldset>
 		<?php endif; ?>
 	<?php endif; ?>
-	
+
 	<div class="icon-loading-dark float-spinner">&nbsp;</div>
 
 	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 490133c9f25..c0adaf9c5a3 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -83,7 +83,7 @@ if($_['passwordChangeSupported']) {
 		placeholder="<?php echo $l->t('New password');?>"
 		data-typetoggle="#personal-show"
 		autocomplete="off" autocapitalize="off" autocorrect="off" />
-	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
+	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="svg"></label>
 	<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	<br/>
 	<div class="strengthify-wrapper"></div>
-- 
GitLab


From ac7d2efbe3dd03cee38a1f247ce56461dc1f74cb Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 3 Sep 2015 11:28:14 +0200
Subject: [PATCH 151/783] Collapse HTML code for federated code

---
 apps/files_sharing/js/settings-personal.js         |  4 ++++
 apps/files_sharing/templates/settings-personal.php | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/files_sharing/js/settings-personal.js b/apps/files_sharing/js/settings-personal.js
index 1c7aea0b9d6..14a9b7bbfa7 100644
--- a/apps/files_sharing/js/settings-personal.js
+++ b/apps/files_sharing/js/settings-personal.js
@@ -12,4 +12,8 @@ $(document).ready(function() {
 		}
 	});
 
+	$('#oca-files-sharing-add-to-your-website').click(function() {
+		$('#oca-files-sharing-add-to-your-website-expanded').slideDown();
+	});
+
 });
diff --git a/apps/files_sharing/templates/settings-personal.php b/apps/files_sharing/templates/settings-personal.php
index ae6b909df7e..1b93084e547 100644
--- a/apps/files_sharing/templates/settings-personal.php
+++ b/apps/files_sharing/templates/settings-personal.php
@@ -46,13 +46,13 @@ if ($_['showShareIT']) {
 				data-url='https://plus.google.com/share?url=<?php p(urlencode($_['reference'])); ?>'/>
 				Google+
 			</button>
+			<button id="oca-files-sharing-add-to-your-website">
+				<?php p($l->t('Add to your website')) ?>
+			</button>
 		</p>
 
-		<br>
-
-		<p>
-			<?php p($l->t('Add it to your website:')); ?>
-
+		<div class="hidden" id="oca-files-sharing-add-to-your-website-expanded">
+		<p style="margin: 10px 0">
 			<a target="_blank" href="<?php p($_['reference']); ?>"
 				style="padding:10px;background-color:#1d2d44;color:#fff;border-radius:3px;padding-left:4px;">
 				<img src="<?php p($_['owncloud_logo_path']); ?>"
@@ -71,6 +71,7 @@ if ($_['showShareIT']) {
 
 </a></xmp>
 		</p>
+		</div>
 		<?php } ?>
 
 	</div>
-- 
GitLab


From 4361ff92e2c5c2ccab16ac8b1ee63ddc9e0f1d37 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 2 Sep 2015 17:11:46 +0200
Subject: [PATCH 152/783] Replace server status message about transitional file
 locking with setup warnings

---
 settings/admin.php           | 10 ++++++----
 settings/templates/admin.php | 30 ++++++++++++++++--------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index 8410a6671ef..38683438f3a 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -193,10 +193,13 @@ $template->assign('fileSharingSettings', $fileSharingSettings);
 $template->assign('filesExternal', $filesExternal);
 $template->assign('updaterAppPanel', $updaterAppPanel);
 $template->assign('ocDefaultEncryptionModulePanel', $ocDefaultEncryptionModulePanel);
-if (\OC::$server->getLockingProvider() instanceof NoopLockingProvider) {
-	$template->assign('fileLockingEnabled', false);
+$lockingProvider = \OC::$server->getLockingProvider();
+if ($lockingProvider instanceof NoopLockingProvider) {
+	$template->assign('fileLockingType', 'none');
+} else if ($lockingProvider instanceof \OC\Lock\DBLockingProvider) {
+	$template->assign('fileLockingType', 'db');
 } else {
-	$template->assign('fileLockingEnabled', true);
+	$template->assign('fileLockingType', 'cache');
 }
 
 $formsMap = array_map(function ($form) {
@@ -223,7 +226,6 @@ $formsAndMore = array_merge($formsAndMore, $formsMap);
 $formsAndMore[] = ['anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron')];
 $formsAndMore[] = ['anchor' => 'mail_general_settings', 'section-name' => $l->t('Email server')];
 $formsAndMore[] = ['anchor' => 'log-section', 'section-name' => $l->t('Log')];
-$formsAndMore[] = ['anchor' => 'server-status', 'section-name' => $l->t('Server status')];
 $formsAndMore[] = ['anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks')];
 if ($updaterAppPanel) {
 	$formsAndMore[] = ['anchor' => 'updater', 'section-name' => $l->t('Updates')];
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9c161281846..5d4ec22223e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -124,6 +124,15 @@ if (!$_['has_fileinfo']) {
 <?php
 }
 
+// locking configured optimally?
+if ($_['fileLockingType'] === 'none') {
+	?>
+	<li>
+		<?php p($l->t('Transitional file locking is disabled, this might lead to issues with race conditions, enable \'filelocking.enabled\' to improve handling of race conditions.')); ?>
+	</li>
+	<?php
+}
+
 // is locale working ?
 if (!$_['isLocaleWorking']) {
 	?>
@@ -172,7 +181,13 @@ if ($_['cronErrors']) {
 	<div class="loading"></div>
 	<ul class="errors hidden"></ul>
 	<ul class="warnings hidden"></ul>
-	<ul class="info hidden"></ul>
+	<ul class="info hidden">
+		<?php if ($_['fileLockingType'] === 'db'):?>
+		<li>
+			<?php p($l->t('Transitional file locking is using the database as locking backend, for best performance it\'s advised to configure a memcache for locking. Check the admin documentation for more information about locking and memcaches')); ?>
+		</li>
+		<?php endif; ?>
+	</ul>
 	<p class="hint hidden">
 		<?php print_unescaped($l->t('Please double check the <a target="_blank" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="#log-section">log</a>.', link_to_docs('admin-install'))); ?>
 	</p>
@@ -519,19 +534,6 @@ if ($_['cronErrors']) {
 	<?php endif; ?>
 </div>
 
-<div class="section" id="server-status">
-	<h2><?php p($l->t('Server status'));?></h2>
-	<ul>
-		<li>
-			<?php if ($_['fileLockingEnabled']) {
-				p($l->t('Transactional File Locking is enabled.'));
-			} else {
-				p($l->t('Transactional File Locking is disabled.'));
-			} ?>
-		</li>
-	</ul>
-</div>
-
 <div class="section" id="admin-tips">
 	<h2><?php p($l->t('Tips & tricks'));?></h2>
 	<ul>
-- 
GitLab


From 4ba233350746b4287556d96bb9adbae039f93882 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 3 Sep 2015 12:17:35 +0200
Subject: [PATCH 153/783] Added unit tests for "new" file menu and small fixes

- added unit tests for NewFileMenu
- use generateUrl for FileList.createFile and FileList.createDirectory
- added unit tests for FileList.createFile and FileList.createDirectory
---
 apps/files/js/filelist.js              |  11 ++-
 apps/files/js/newfilemenu.js           |   1 -
 apps/files/tests/js/fileUploadSpec.js  |  51 -----------
 apps/files/tests/js/filelistSpec.js    | 119 +++++++++++++++++++++++++
 apps/files/tests/js/newfilemenuSpec.js | 119 +++++++++++++++++++++++++
 5 files changed, 247 insertions(+), 54 deletions(-)
 create mode 100644 apps/files/tests/js/newfilemenuSpec.js

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 5f55d421430..20c8e36bfa8 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -270,6 +270,9 @@
 			if (this._newFileMenu) {
 				this._newFileMenu.remove();
 			}
+			if (this._newButton) {
+				this._newButton.remove();
+			}
 			// TODO: also unregister other event handlers
 			this.fileActions.off('registerAction', this._onFileActionsUpdated);
 			this.fileActions.off('setDefault', this._onFileActionsUpdated);
@@ -1695,6 +1698,8 @@
 		 *
 		 * @return {Promise} promise that will be resolved after the
 		 * file was created
+		 *
+		 * @since 8.2
 		 */
 		createFile: function(name) {
 			var self = this;
@@ -1709,7 +1714,7 @@
 			}
 
 			$.post(
-				OC.filePath('files', 'ajax', 'newfile.php'),
+				OC.generateUrl('/apps/files/ajax/newfile.php'),
 				{
 					dir: this.getCurrentDirectory(),
 					filename: name
@@ -1739,6 +1744,8 @@
 		 *
 		 * @return {Promise} promise that will be resolved after the
 		 * directory was created
+		 *
+		 * @since 8.2
 		 */
 		createDirectory: function(name) {
 			var self = this;
@@ -1753,7 +1760,7 @@
 			}
 
 			$.post(
-				OC.filePath('files','ajax','newfolder.php'),
+				OC.generateUrl('/apps/files/ajax/newfolder.php'),
 				{
 					dir: this.getCurrentDirectory(),
 					foldername: name
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
index c7c02bd65f1..4c021e6b873 100644
--- a/apps/files/js/newfilemenu.js
+++ b/apps/files/js/newfilemenu.js
@@ -163,7 +163,6 @@
 					var newname = $input.val();
 					self._createFile(fileType, newname);
 					$form.remove();
-					$('#content').focus();
 					$target.find('.displayname').removeClass('hidden');
 					OC.hideMenus();
 				}
diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
index 817654c4fa9..cad8468d1c8 100644
--- a/apps/files/tests/js/fileUploadSpec.js
+++ b/apps/files/tests/js/fileUploadSpec.js
@@ -19,7 +19,6 @@
 *
 */
 
-/* global OC */
 describe('OC.Upload tests', function() {
 	var $dummyUploader;
 	var testFile;
@@ -118,54 +117,4 @@ describe('OC.Upload tests', function() {
 			);
 		});
 	});
-	describe('New file', function() {
-		var $input;
-		var currentDirStub;
-
-		beforeEach(function() {
-			OC.Upload.init();
-			$('#new>a').click();
-			$('#new li[data-type=file]').click();
-			$input = $('#new input[type=text]');
-
-			currentDirStub = sinon.stub(FileList, 'getCurrentDirectory');
-			currentDirStub.returns('testdir');
-		});
-		afterEach(function() {
-			currentDirStub.restore();
-		});
-		it('sets default text in field', function() {
-			expect($input.length).toEqual(1);
-			expect($input.val()).toEqual('New text file.txt');
-		});
-		it('creates file when enter is pressed', function() {
-			$input.val('somefile.txt');
-			$input.trigger(new $.Event('keyup', {keyCode: 13}));
-			$input.parent('form').submit();
-			expect(fakeServer.requests.length).toEqual(2);
-
-			var request = fakeServer.requests[1];
-			expect(request.method).toEqual('POST');
-			expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/newfile.php');
-			var query = OC.parseQueryString(request.requestBody);
-			expect(query).toEqual({
-				dir: 'testdir',
-				filename: 'somefile.txt'
-			});
-		});
-		it('prevents entering invalid file names', function() {
-			$input.val('..');
-			$input.trigger(new $.Event('keyup', {keyCode: 13}));
-			$input.parent('form').submit();
-			expect(fakeServer.requests.length).toEqual(1);
-		});
-		it('prevents entering file names that already exist', function() {
-			var inListStub = sinon.stub(FileList, 'inList').returns(true);
-			$input.val('existing.txt');
-			$input.trigger(new $.Event('keyup', {keyCode: 13}));
-			$input.parent('form').submit();
-			expect(fakeServer.requests.length).toEqual(1);
-			inListStub.restore();
-		});
-	});
 });
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index a6d72a88efd..c05e7c37214 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2157,6 +2157,93 @@ describe('OCA.Files.FileList tests', function() {
 			expect(fileList.$fileList.find('tr').length).toEqual(5);
 		});
 	});
+	describe('create file', function() {
+		var deferredCreate;
+
+		beforeEach(function() {
+			deferredCreate = $.Deferred();
+		});
+
+		it('creates file with given name and adds it to the list', function() {
+			var deferred = fileList.createFile('test file.txt');
+			var successStub = sinon.stub();
+			var failureStub = sinon.stub();
+
+			deferred.done(successStub);
+			deferred.fail(failureStub);
+
+			expect(fakeServer.requests.length).toEqual(1);
+			expect(fakeServer.requests[0].url).toEqual(OC.generateUrl('/apps/files/ajax/newfile.php'));
+
+			var query = fakeServer.requests[0].requestBody;
+			expect(OC.parseQueryString(query)).toEqual({
+				dir: '/subdir',
+				filename: 'test file.txt'
+			});
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'success',
+					data: {
+						path: '/subdir',
+						name: 'test file.txt',
+						mimetype: 'text/plain'
+					}
+				})
+			);
+
+			var $tr = fileList.findFileEl('test file.txt');
+			expect($tr.length).toEqual(1);
+			expect($tr.attr('data-mime')).toEqual('text/plain');
+
+			expect(successStub.calledOnce).toEqual(true);
+			expect(failureStub.notCalled).toEqual(true);
+		});
+		// TODO: error cases
+		// TODO: unique name cases
+	});
+	describe('create directory', function() {
+		it('creates directory with given name and adds it to the list', function() {
+			var deferred = fileList.createDirectory('test directory');
+			var successStub = sinon.stub();
+			var failureStub = sinon.stub();
+
+			deferred.done(successStub);
+			deferred.fail(failureStub);
+
+			expect(fakeServer.requests.length).toEqual(1);
+			expect(fakeServer.requests[0].url).toEqual(OC.generateUrl('/apps/files/ajax/newfolder.php'));
+			var query = fakeServer.requests[0].requestBody;
+			expect(OC.parseQueryString(query)).toEqual({
+				dir: '/subdir',
+				foldername: 'test directory'
+			});
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'success',
+					data: {
+						path: '/subdir',
+						name: 'test directory',
+						mimetype: 'httpd/unix-directory'
+					}
+				})
+			);
+
+			var $tr = fileList.findFileEl('test directory');
+			expect($tr.length).toEqual(1);
+			expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
+
+			expect(successStub.calledOnce).toEqual(true);
+			expect(failureStub.notCalled).toEqual(true);
+		});
+		// TODO: error cases
+		// TODO: unique name cases
+	});
 	/**
 	 * Test upload mostly by testing the code inside the event handlers
 	 * that were registered on the magic upload object
@@ -2359,4 +2446,36 @@ describe('OCA.Files.FileList tests', function() {
 			expect(fileInfo.type).toEqual('file');
 		});
 	});
+	describe('new file menu', function() {
+		var newFileMenuStub;
+
+		beforeEach(function() {
+			newFileMenuStub = sinon.stub(OCA.Files.NewFileMenu.prototype, 'showAt');
+		});
+		afterEach(function() {
+			newFileMenuStub.restore();
+		})
+		it('renders new button when no legacy upload button exists', function() {
+			expect(fileList.$el.find('.button.upload').length).toEqual(0);
+			expect(fileList.$el.find('.button.new').length).toEqual(1);
+		});
+		it('does not render new button when no legacy upload button exists (public page)', function() {
+			fileList.destroy();
+			$('#controls').append('<input type="button" class="button upload" />');
+			fileList = new OCA.Files.FileList($('#app-content-files'));
+			expect(fileList.$el.find('.button.upload').length).toEqual(1);
+			expect(fileList.$el.find('.button.new').length).toEqual(0);
+		});
+		it('opens the new file menu when clicking on the "New" button', function() {
+			var $button = fileList.$el.find('.button.new');
+			$button.click();
+			expect(newFileMenuStub.calledOnce).toEqual(true);
+		});
+		it('does not open the new file menu when button is disabled', function() {
+			var $button = fileList.$el.find('.button.new');
+			$button.addClass('disabled');
+			$button.click();
+			expect(newFileMenuStub.notCalled).toEqual(true);
+		});
+	});
 });
diff --git a/apps/files/tests/js/newfilemenuSpec.js b/apps/files/tests/js/newfilemenuSpec.js
new file mode 100644
index 00000000000..3d89a997eb2
--- /dev/null
+++ b/apps/files/tests/js/newfilemenuSpec.js
@@ -0,0 +1,119 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2015 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+describe('OCA.Files.NewFileMenu', function() {
+	var FileList = OCA.Files.FileList;
+	var menu, fileList, $uploadField, $trigger;
+
+	beforeEach(function() {
+		// dummy upload button
+		var $container = $('<div id="app-content-files"></div>');
+		$uploadField = $('<input id="file_upload_start"></input>');
+		$trigger = $('<a href="#">Menu</a>');
+		$container.append($uploadField).append($trigger);
+		$('#testArea').append($container);
+
+		fileList = new FileList($container);
+		menu = new OCA.Files.NewFileMenu({
+			fileList: fileList
+		});
+		menu.showAt($trigger);
+	});
+	afterEach(function() {
+		OC.hideMenus();
+		fileList = null;
+		menu = null;
+	});
+
+	describe('rendering', function() {
+		it('renders menu items', function() {
+			var $items = menu.$el.find('.menuitem');
+			expect($items.length).toEqual(3);
+			// label points to the file_upload_start item
+			var $item = $items.eq(0);
+			expect($item.is('label')).toEqual(true);
+			expect($item.attr('for')).toEqual('file_upload_start');
+		});
+	});
+	describe('New file/folder', function() {
+		var $input;
+		var createFileStub;
+		var createDirectoryStub;
+
+		beforeEach(function() {
+			createFileStub = sinon.stub(FileList.prototype, 'createFile');
+			createDirectoryStub = sinon.stub(FileList.prototype, 'createDirectory');
+			menu.$el.find('.menuitem').eq(1).click();
+			$input = menu.$el.find('form.filenameform input');
+		});
+		afterEach(function() {
+			createFileStub.restore();
+			createDirectoryStub.restore();
+		});
+
+		it('sets default text in field', function() {
+			expect($input.length).toEqual(1);
+			expect($input.val()).toEqual('New text file.txt');
+		});
+		it('creates file when enter is pressed', function() {
+			$input.val('somefile.txt');
+			$input.trigger(new $.Event('keyup', {keyCode: 13}));
+			$input.parent('form').submit();
+
+			expect(createFileStub.calledOnce).toEqual(true);
+			expect(createFileStub.getCall(0).args[0]).toEqual('somefile.txt');
+			expect(createDirectoryStub.notCalled).toEqual(true);
+		});
+		it('prevents entering invalid file names', function() {
+			$input.val('..');
+			$input.trigger(new $.Event('keyup', {keyCode: 13}));
+			$input.closest('form').submit();
+
+			expect(createFileStub.notCalled).toEqual(true);
+			expect(createDirectoryStub.notCalled).toEqual(true);
+		});
+		it('prevents entering file names that already exist', function() {
+			var inListStub = sinon.stub(fileList, 'inList').returns(true);
+			$input.val('existing.txt');
+			$input.trigger(new $.Event('keyup', {keyCode: 13}));
+			$input.closest('form').submit();
+
+			expect(createFileStub.notCalled).toEqual(true);
+			expect(createDirectoryStub.notCalled).toEqual(true);
+			inListStub.restore();
+		});
+		it('switching fields removes the previous form', function() {
+			menu.$el.find('.menuitem').eq(2).click();
+			expect(menu.$el.find('form').length).toEqual(1);
+		});
+		it('creates directory when clicking on create directory field', function() {
+			menu.$el.find('.menuitem').eq(2).click();
+			$input = menu.$el.find('form.filenameform input');
+			$input.val('some folder');
+			$input.trigger(new $.Event('keyup', {keyCode: 13}));
+			$input.closest('form').submit();
+
+			expect(createDirectoryStub.calledOnce).toEqual(true);
+			expect(createDirectoryStub.getCall(0).args[0]).toEqual('some folder');
+			expect(createFileStub.notCalled).toEqual(true);
+		});
+	});
+});
-- 
GitLab


From 73c61941e28579dc92ea094fdf3272bcb68ae437 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 2 Sep 2015 19:02:06 +0200
Subject: [PATCH 154/783] Tags in FileInfo map must be an array

Fixes FileList.elementToFile to make an array for the tags instead of
keeping the original joined string
---
 apps/files/js/tagsplugin.js           |  8 +++++++-
 apps/files/tests/js/tagspluginspec.js | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js
index ed1105a1706..609e38ca9a9 100644
--- a/apps/files/js/tagsplugin.js
+++ b/apps/files/js/tagsplugin.js
@@ -150,7 +150,13 @@
 			var oldElementToFile = fileList.elementToFile;
 			fileList.elementToFile = function($el) {
 				var fileInfo = oldElementToFile.apply(this, arguments);
-				fileInfo.tags = $el.attr('data-tags') || [];
+				var tags = $el.attr('data-tags');
+				if (_.isUndefined(tags)) {
+					tags = '';
+				}
+				tags = tags.split('|');
+				tags = _.without(tags, '');
+				fileInfo.tags = tags;
 				return fileInfo;
 			};
 		},
diff --git a/apps/files/tests/js/tagspluginspec.js b/apps/files/tests/js/tagspluginspec.js
index 5309973cf4f..950fb754253 100644
--- a/apps/files/tests/js/tagspluginspec.js
+++ b/apps/files/tests/js/tagspluginspec.js
@@ -112,4 +112,19 @@ describe('OCA.Files.TagsPlugin tests', function() {
 			expect($action.find('img').attr('src')).toEqual(OC.imagePath('core', 'actions/star'));
 		});
 	});
+	describe('elementToFile', function() {
+		it('returns tags', function() {
+			fileList.setFiles(testFiles);
+			var $tr = fileList.findFileEl('One.txt');
+			var data = fileList.elementToFile($tr);
+			expect(data.tags).toEqual(['tag1', 'tag2']);
+		});
+		it('returns empty array when no tags present', function() {
+			delete testFiles[0].tags;
+			fileList.setFiles(testFiles);
+			var $tr = fileList.findFileEl('One.txt');
+			var data = fileList.elementToFile($tr);
+			expect(data.tags).toEqual([]);
+		});
+	});
 });
-- 
GitLab


From fd7b210654dfb2c310264fec70683cdd7682b3bb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 3 Sep 2015 13:46:08 +0200
Subject: [PATCH 155/783] Delay setting up the filesystem for a share owner
 untill the share is used

---
 apps/files_sharing/lib/mountprovider.php | 6 ------
 apps/files_sharing/lib/sharedstorage.php | 7 ++++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/files_sharing/lib/mountprovider.php b/apps/files_sharing/lib/mountprovider.php
index 3f59fd131d0..14a79625993 100644
--- a/apps/files_sharing/lib/mountprovider.php
+++ b/apps/files_sharing/lib/mountprovider.php
@@ -66,12 +66,6 @@ class MountProvider implements IMountProvider {
 			return $share['permissions'] > 0;
 		});
 		$shares = array_map(function ($share) use ($user, $storageFactory) {
-			try {
-				Filesystem::initMountPoints($share['uid_owner']);
-			} catch(NoUserException $e) {
-				\OC::$server->getLogger()->warning('The user \'' . $share['uid_owner'] . '\' of share with ID \'' . $share['id'] . '\' can\'t be retrieved.', array('app' => 'files_sharing'));
-				return null;
-			}
 			// for updating etags for the share owner when we make changes to this share.
 			$ownerPropagator = $this->propagationManager->getChangePropagator($share['uid_owner']);
 
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index c7529df0617..1ac401f3cf8 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -55,6 +55,10 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 		$this->ownerView = $arguments['ownerView'];
 	}
 
+	private function init() {
+		Filesystem::initMountPoints($this->share['uid_owner']);
+	}
+
 	/**
 	 * get id of the mount point
 	 *
@@ -80,6 +84,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	 * @return array Returns array with the keys path, permissions, and owner or false if not found
 	 */
 	public function getFile($target) {
+		$this->init();
 		if (!isset($this->files[$target])) {
 			// Check for partial files
 			if (pathinfo($target, PATHINFO_EXTENSION) === 'part') {
@@ -319,7 +324,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	}
 
 	public function rename($path1, $path2) {
-
+		$this->init();
 		// we need the paths relative to data/user/files
 		$relPath1 = $this->getMountPoint() . '/' . $path1;
 		$relPath2 = $this->getMountPoint() . '/' . $path2;
-- 
GitLab


From 8123df948960423489a1476a6dce3456161c4982 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 3 Sep 2015 14:34:46 +0200
Subject: [PATCH 156/783] setup owner when getting users for share

---
 lib/private/share/share.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index d0c69badb46..e1735dbf92e 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -37,6 +37,7 @@
 
 namespace OC\Share;
 
+use OC\Files\Filesystem;
 use OCP\IUserSession;
 use OCP\IDBConnection;
 use OCP\IConfig;
@@ -120,6 +121,7 @@ class Share extends Constants {
 	 */
 	public static function getUsersSharingFile($path, $ownerUser, $includeOwner = false, $returnUserPaths = false) {
 
+		Filesystem::initMountPoints($ownerUser);
 		$shares = $sharePaths = $fileTargets = array();
 		$publicShare = false;
 		$remoteShare = false;
-- 
GitLab


From 038b09b0b0efe138878742bb57970dcc4445c872 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 3 Sep 2015 14:55:26 +0200
Subject: [PATCH 157/783] Proper details about git submodule update

* fixes #18801
---
 lib/base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 9cf0228bbd9..077ecfa4666 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -540,7 +540,7 @@ class OC {
 			// setup 3rdparty autoloader
 			$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
 			if (!file_exists($vendorAutoLoad)) {
-				throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty".');
+				throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
 			}
 			require_once $vendorAutoLoad;
 
-- 
GitLab


From 1a48499dcbcf96fd908abed0603a0909ebd8a732 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Thu, 3 Sep 2015 15:03:16 +0200
Subject: [PATCH 158/783] move updater panel above version number

---
 settings/templates/admin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9c161281846..da80ca15b0c 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -554,16 +554,16 @@ if ($_['cronErrors']) {
 	</ul>
 </div>
 
+<?php if (!empty($_['updaterAppPanel'])): ?>
+	<div id="updater"><?php print_unescaped($_['updaterAppPanel']); ?></div>
+<?php endif; ?>
+
 <div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
 	<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?>
 	<?php include('settings.development.notice.php'); ?>
 </div>
 
-<?php if (!empty($_['updaterAppPanel'])): ?>
-	<div id="updater"><?php print_unescaped($_['updaterAppPanel']); ?></div>
-<?php endif; ?>
-
 <div class="section credits-footer">
 	<p><?php print_unescaped($theme->getShortFooter()); ?></p>
 </div>
-- 
GitLab


From 38a164aa7a6a5e52971cbc39273a327a22ecc994 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 3 Sep 2015 15:41:30 +0200
Subject: [PATCH 159/783] Make sure the array exists

---
 lib/private/appconfig.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index b9b5dacb168..7ee64980fd0 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -161,6 +161,10 @@ class AppConfig implements IAppConfig {
 			]);
 
 			if ($inserted) {
+				if (!isset($this->cache[$app])) {
+					$this->cache[$app] = [];
+				}
+
 				$this->cache[$app][$key] = $value;
 				return true;
 			}
@@ -264,6 +268,10 @@ class AppConfig implements IAppConfig {
 		$result = $sql->execute();
 
 		while ($row = $result->fetch()) {
+			if (!isset($this->cache[$row['appid']])) {
+				$this->cache[$row['appid']] = [];
+			}
+
 			$this->cache[$row['appid']][$row['configkey']] = $row['configvalue'];
 		}
 		$result->closeCursor();
-- 
GitLab


From 90fa2bd5589f4246bcd18c517d06351ec94305a3 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 3 Sep 2015 15:47:05 +0200
Subject: [PATCH 160/783] export correct 48px png fallbacks for filetype icons

---
 core/img/filetypes/application-pdf.png       | Bin 354 -> 919 bytes
 core/img/filetypes/application.png           | Bin 244 -> 614 bytes
 core/img/filetypes/audio.png                 | Bin 362 -> 781 bytes
 core/img/filetypes/file.png                  | Bin 155 -> 251 bytes
 core/img/filetypes/folder-drag-accept.png    | Bin 137 -> 188 bytes
 core/img/filetypes/folder-external.png       | Bin 274 -> 549 bytes
 core/img/filetypes/folder-public.png         | Bin 264 -> 602 bytes
 core/img/filetypes/folder-shared.png         | Bin 308 -> 726 bytes
 core/img/filetypes/folder-starred.png        | Bin 309 -> 683 bytes
 core/img/filetypes/folder.png                | Bin 135 -> 215 bytes
 core/img/filetypes/image.png                 | Bin 223 -> 394 bytes
 core/img/filetypes/package-x-generic.png     | Bin 142 -> 210 bytes
 core/img/filetypes/text-calendar.png         | Bin 250 -> 572 bytes
 core/img/filetypes/text-code.png             | Bin 194 -> 314 bytes
 core/img/filetypes/text-vcard.png            | Bin 439 -> 1098 bytes
 core/img/filetypes/text.png                  | Bin 169 -> 270 bytes
 core/img/filetypes/video.png                 | Bin 166 -> 239 bytes
 core/img/filetypes/x-office-document.png     | Bin 169 -> 270 bytes
 core/img/filetypes/x-office-presentation.png | Bin 135 -> 179 bytes
 core/img/filetypes/x-office-spreadsheet.png  | Bin 166 -> 266 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png
index 1c0b18e2f5100c589b0fca3a249b297c868d84f7..940ed788b590be60d914603519f513eb08a9ea9e 100644
GIT binary patch
literal 919
zcmV;I18Dq-P)<h;3K|Lk000e1NJLTq001xm001xu0{{R3VB86{0004}P)t-s00030
z0094hfWJUM-A_l|QAXTRNZe3I+fhf|Pe<HQM%++H+fhf|P)6HNNZe3I+)zi{P)FQQ
zN8C_H+)+r}Qc2xYO5IaS-Be56RZQJhP2N~f-dRxIT2kIzQ{G%u-(FSUURK{<SKnb-
z;A30hWL)57UEpS3;b&jrX=34PWa4dQ;%;W*ZfD|eXX0>Z<8y4}c5mc&aOHb+<$QJJ
zeRk!4c;<n6=7W9bg@5OWf#-;V=!=EujE3lqhv|=r>5+@+la1<>j_Q?<>Xne{my+w5
zl<S(6>ztSDo|){To$aNd?WUpbs;2I%r|+$(@2;xww6O5Dv+=mK@wv6~yt(qfyz;=k
z^TEFJ#KH8&!}Q3-^vcKe%*yr6%Jt98_R`Px($MzP(f8HU_tw<+*VOmd)%V!e_u1F@
z+u8Ws+WFtz`QhLB<Kg<`;`-#{`sL*M=H&Y3<@)F5`sn8R=;!<C==<vF`|Ruc?d<&T
z?)>ra{PFSq^YZ=k^ZoSm{q^+y_4WPs_Wk$v{rC6&`1t<%`TqL){`~v?{QUp@{r~>{
z|NsBz+tW(`000woQchC<0RjYCVs3MYl$e>Gqonx!{r*j9oU;G`0gOpRK~#7F&D2MG
z5^)rT@g#O*A>J8#EEp3NdrT}b_O1zHSFp&Spnye0WK<Ne2=jhu-RJ{6bIE^pyzBGZ
zp1z)KxhSoi?+=DVE408Dh~BD&I#9$S1?Vj{0E$q+j%@S!sI<1Ezbi=aga^{r(t$3(
z{!ZAfOM5Hk=^%n<ePKg~Sf+zX*y4F>I>1oB3MSwzAEmPa73_p8P5@w4fmi?_abP+K
zI1lU!0<Hs>f`B)`Yug+|pa7@M!3>P&C~r0eYh4P~q(|H`1k-Ru<R;u+Z3a?&8x~oY
zf)~3@z#)jr-!?vlUoYRfm15?`fiA$xP!EfUz3)Pe|6SI>F_@99=N|oAKb(pjiB>Br
zu=6mRYyx~r-+c%0>drN%q=Aup0A4nBV*jv+Sch+w0DhnH2lmw;z_X*9q^0oq@u@NK
z1tSh0JZjs;FCQ>k<bD(`iXm8^C$aY@Y0DJM@_t*6&tqZ=%A85km=I&&@|DI(F$a4d
t*PVl63=HaZ5E3ory$9zMp~1dh?GO6U$Y&1*IN1OI002ovPDHLkV1ip%22TJ0

literal 354
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfoB*E?S0H^m$o+Pp$DKg8I|1$x
zbQi)1^tc=BeK*wSZn)q5xX?$rsgLr~9~ERgD#(0Xl=Zkc=V@K}v&O1t&9%?l>Yuka
zzMR<eYHI)Mxij9(pY>+Z+&7Eny<4^H-I^8eH?IA(Z`Y>-dp{pO@cGEWFDH+GId%N&
zxieqSpZRwA;`i%UzTdq5<L>RBj~@Pc|L*U%Z~uP({`cqi|Ns9Pv_G{2-N#W9<QL3f
zWa;$!!{;wMmUXcJ#d1Ae978G?b5EoTH5mx7U5Ho|-=q31F6lkjo&R}0YNwsp?wwcH
z+Va3OTja!vD!Ie`j2H3>bmX~rJe+Z~)<Wj-k(Q12v7v@vwrBTW_Uuoty?3wv;%m=^
wX8-ScByX4%eB(Bw+|l2cIGYPR3^Y##)ve>WTfETz4bWl+Pgg&ebxsLQ0LXu}g#Z8m

diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png
index 43cc3abafe760069ddcffb04881fae5e08ae213a..9be7361d1b60940cf171886800c7878039a87705 100644
GIT binary patch
literal 614
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sD*}8%T!Hle|Nk2r8YWGeG=Kj5
znKNfjnKEVi^y$;4O`AG(>WmpPAY33DC;|jP5g;3=03rfc36Vt;hX}&;LbyN@q6<O-
zxex>4vRE1auBcc6-D+ME<QL4q$i&VeC$FHSqN-+XW9#DT78@6zl#-g3k(rg<+0{K|
z#?0As7A;=3{NUlE$IhNRfA{{w&)<LjTeb2^Dgy(fnWu|mNCo5DtNG!Z3?$e-R8M|x
zxLHW`e~O!<XNRlgqpyGWN6JK4C+wbHQS<Ws+p@XF+irVXSzpWTb9#4iq0^K@m)Uo9
z>VIQC<iG39KVAV2DK|;4$S0FH8hoeU=RcCaBJw!H^dH|juU&6doNyp1mBZ%HA#;`^
z!V%{u@wo7)?tNWqwf86cl!yrvcg=qrvG(-Ku)Cs?yjTBeU&;$Pq&k^nso_<hz^;t>
z;%$jv_r34^eCn0;rlg&gyDjU^tV~=eUbL$D+Tu3vjAsYdIrE--x4z-BQi4^GeAMgy
zv~{La&us16(LOuiEYH%Vr6%j@`;Q&4s}Wv#&UiEb{EF5|_rA+6-@l=6`(O4iO1zBn
zVs)>DGUAPECa#^S^mz59tD!q(LPCH3KVZbSLP0L9%HErO%4POFuk^EB+^v4I{omU6
V<D&1KFkmDwc)I$ztaD0e0svv)D+~Yt

literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!S%6Q7E0CTvY0~`p^QTXrK4r=j
zAPEFhr%nZu)4%}E0P^7MpCS@|K%IgmL4Lsu>>LW(I>8}1xl_)byKwQ+zp{9}gFwj`
zPZ!6K3dY{PgM7>i9L|NC78*?a_y4?J_Yu`J_G-o2cK4TNG6(mE`HBQ=oONKrMi!=?
zYcdnA&hHBB=yIN}-tcX&Y{&lw(YOvd;ZxDC_MX>W`u(R_``$Hjm-Rn0&bz?!{(PS=
Q2hbh{Pgg&ebxsLQ08!duvj6}9

diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png
index 32171285e8e89653047d0c47bc87cc8f1df0a2c7..4eb8ab78e3f523464cc8b604eb65b8adbbb242b4 100644
GIT binary patch
literal 781
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_V6+JE32_B-|NsBr(9p1I)vB2@
zX9CGdlP1ldKfk-Xd+OAwK=za=Q-I|3>C<P=o;`W;WFQ+zPMbCjC=MZk+!-@w0J%W*
zKmZg3DuytC;t)1a7Qz6Ma0L)GKrVy<=K|FL0h%C?3lV`x0ZE`n2!OERvJgQC7p4T=
z3N%?XWpFMY#ut?jY{0NfFA4GsW?*DuW@TgN;O5~I78Mhhl2KGrQ`gqjH?p#^cX0Fc
z^6~W#4v&b5O-@bA&Mzn|DzB|?Xm0Q7pE!Buthw_StXQ>r?Yi|Fw(s1vd;ftW$4;F-
zfA#w9I}aW{efIpt`wyQ!fBpXB*Y7`n|9MRaXaz=_tfz}(NCo5D)0xIji4yG}cTefi
ziQL3-^W-E~3$aM0ZlO&bVuk<i|CgSzbM`r#=Myg%-!nM-rMmKLOi2Bly9YmfyXl-a
zHS3kcy#9I1x;1`(xw!t$zW|rr6|IpCt6q1dmlzyXWLsvJlFR42>+C_^+0LKi`EO?D
z7G`*6YAj8Dt!Tf!^_Fv%+5@F!78ytW6=(4DF03~$EM9H5<z0QFCZDe7fvgX0!ZWK2
zEgGI0{9;MtVczxBAhyXQ$MK4Lnr-EY!=fy^!ln8?Bzrg(_@(8_3%n_?ZcFfya#QFk
zh!#Ah=b5G`_2k;WwyquSa%ze@iUp+g8=hXDqw-la@j~;|Tf4vaI2A3PysG2S1|O}M
rc8%(p3Z{K4Pk+Dj_~e}SSLe(v^Az_gKCdqU#tnm~tDnm{r-UW|8*GOx

literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}dw@@fE0F&G|9?Y6!_1j8`}_N+
zPoF+*+O(-tr%stN1wul&K=BzfW&lZ`AP_(V;UtiO3qTBn%c61N;=HR)tN=PirzFTP
zn1PXrOF&vlMa|UQ!pg}jIxe-mskNtn()5K(SFGB!`^edISMNS}{PflPkH7y_p6gTs
z>Pz!<aSW-rHTSG5Uqb*7%Y{ep-o3l?zh+8*%Y+SyVsF3Xa>*yE9`-!tx&K|3ZPHxx
zt$P}d-Al{+)zEh|)qX)^`~h}xgIj#}{)W8>XDM_v;B>i>6;RM8(<rl=zr;q|Xu^uO
d0!ANZ@+uzW&FY@mv=nF~gQu&X%Q~loCIG6yr<ec$

diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
index b56833a5763fff473ac8ee6765a5e6d270320dbc..3bd7463cfc9d5b8b2253b5b930358e04cc8cce17 100644
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s_5nU2u0Z<#|NjjQ4b!JjpE`Bw
zv}w~IB#;3IKq)vIjq#G@^fjOnA|*k7!3>N{5ed14bsgQ)XU>{EXYuzxfB&sIyx|j2
zKHSsAF{I+w+bcVH4=4z*2KKzat#i44Z5~6)-vdGi{r+9zJX;q0^5y9RE2g$7Er^qI
zb(rVEu$e0&<iIMXZ5mAHG??^6Bh;B>ED9bRICx%R<@bB`t+ETR#tHo^l2R^QwF77c
NgQu&X%Q~loCIFqrYvlj{

literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=7=|O`9=e#`Njafed8u
z_LXY~P@1D8$S;_|*wX3EhtFS{*>-XQ#ne4r978ywlM@=6d;0qL+y(eO%C~4aNXi~H
maI@~Y=;-Rka>J-anc;eq)<3H=TQ>r=FnGH9xvX<aXaWF@;xrEc

diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png
index 58640b5cb5cc4145decb93017063bdd54904e9eb..80ab53b72b932da93c16afcceaa2bced2ed1a4a1 100644
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s(g8jpu0T4hWM)Xwtgzx)A;mMn
z<gCzQ5PH7v!$zPqM@f)hFhfJfq$yLU|K9DGXbu$f@N{tusbGA2WwmGngUI0v$JuB7
zRd+jd@Pbsx<Mn4vHpkjT+chc(?}=7U;0SWmGPo?pG=(Y8z>O6M>KkiPyuvGIIUP4y
Z&uzAyf9{5wBsrj&44$rjF6*2UngBwYK2rby

literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=3+9Gee4Ig%*R5Hg9(&
zP>7`@$S;_oq2v8T&j}lVd{s{u#}JO_<b(qZXY}-#64<)CyM=ognb>%A1Vs6!7|lpz
aOJZPPpUAHGplTY(A_h-aKbLh*2~7aHN+Qqz

diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png
index 56cb385a7725bade3dc3619af65850c071541542..5262d72e627c1772da547ccbd75b8e8be34abddd 100644
GIT binary patch
literal 549
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s=L38~T!AzL!~cechP1Sqp$)4N
z8s__z%?&M|8Bj1ks$yDb;hezADWSRZf(m8^mCX(<nH^p<D-@`paAs)n?BK!~Kn1}i
zGee4Ig_X<-E1DHjG&8Jdc4#q>0VHRK0U5=!fLx$#XfaR=kO9&NR1Xvn11bi}g4iGi
zNTdX)5yS{7o*h~Q(hk&u4S|fpik4J`#{fO#QWE4B%)rRR%ErOVFCZu+EGj9ZsHU!K
zY+`0^<q{kk6C0P7k(FOwQP<Gk(bqp|@|3C5XUv+rVCnMB+fJRoaQ)_^x9>lG`Tghb
zLaWzdK=TfIx;TbZ+<JRuJKv!I9=F8H!d370e!us-_5a`boE;*Z5*@aRD(4=&jn=vO
zr9U$M;m$VIfCirjd&QVLSe7saF{Z83W(f#tc;DoAG3O9-d&|xvciauQU-q90mkHKc
zP<hEM_<_uG2CqXo4<|M5Y<5Y=Q5Vd({UUJLAr@aFt(bu4jZ^#IO<l)ORmpeYmVXHI
z2KF+YhTIKZ)f0ISFk46l_Zv0Nl>2A<;9FXJ(J`F^9*d_ld4Kf%&lYeg+%kpBbV2=|
YypxI!#|}h$+y_Osr>mdKI;Vst0OMflYXATM

literal 274
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}NPtg>E0AVj_#fJ^D!g=NNb#(Y
zlG&lfvqOqzh852WE1DHn0u%v~AZ|#}tWdB>Xz@%C0&<J7Bjrm9c0g05OM?7@85r4&
zJpI$sGfK)U8=5;N&sec`!<mbZ-+%b^yWoJFCs0|Cr;B4q1!M0yPre2P0hhoz?1cdV
zS9blkeJe3ZFYMR!{I6&GnN++Rwreu#YP`88&!EKf^-<Af%`FG!EZs2cP%qDP+wHR*
lvlaw=3vyj>v{df*8^#BYyl0+zKU@v+o2RRv%Q~loCIHOxYQX>i

diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png
index 4887ea6e7672d150e457d5c62b2a459f4fb7ead1..17c3ee2a8d91633c1c03e47e46b69bc5ef006e1c 100644
GIT binary patch
literal 602
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sdjotzT!AzL!~f8RRi3$%LJRwR
z8)n9qEDFt<>Q^>5tY}tf@$8VInW06q!-|0j$e0BZESVirJTt6hW@z!OuwoDwC>R1n
zB|!G95THmgkPB1~WY2^s01AcyWx*zZ*gytIb~acLqy?xftYkJ&J5U^?3~UI31c}c^
zaAC5Gc$)%&&bKQG@(X5QWMk*#;^yHE4hap9j87;jEo*3OZfWc2?(Lf}anh8j)27du
zIcM&?`3n{<TDE-E*8MkbJ$~}^#j7`O-~ImkPhb4rLIws#K2I0NkcwMxubd1z6d>Yy
zvDd_`q?3`w(bZ8f;DFi!mUI8>#W+%r78TuJopeI-z3I;8(}jJzy}y)C<lMG*{)PXh
zx(~FUfZ&cN*Mv1bvRawU;GgZkkv-#S!{m&&Tuk3q&s2DOdT~};&Knk|1$rx)n5CEO
zo%iq*W6ZyAS_f~iy^Xb>e5K*fA(r^o`F4vIS1-`zUK6)qh2|W+YJn3>51*TUS;{?Q
zkKidL#rNw2rc_<{$&uQ~@asP7j8`&h+K~%bORg#g$)20G>444l{r`P<AGoPWI7Hrl
z`^&-XM%m&m<qZ7+zSZmk=_f<lmTob3_!Y)%*;J~_{p7Zszk-~}aqjo)3o|DC*msKE
eePW5_xm@WmZ6#*r^>@WVX~fgj&t;ucLK6T@2niGb

literal 264
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!M}SX=E07K@oE2I)C%9y0Xz{F&
zqS+xOv%`vKhn36>DVh~pG%KWdW?1p8(3069K(cryPz0z9!~l_C1Qyx+nHOZ4cuA07
zFoU+4d2C!_RYS+*DO0CSpSfY<ruQGdd`;-eF#;-y@N{tuskqg9?x0YE0*C8Gk&CBJ
zc{Tn2e|b&oi&gL1W^S%H{9&=q(v6Ijv#l;{V$%OztR=9(QaVAJC7gBEMfC?<;wtZz
tUb?w(PIG-|z~>>-m7^nC^#4Y=`ICR#``s+7ih*`8c)I$ztaD0e0s!>0W<vk~

diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png
index 56c8ff36ed84b51b96fc35b20c45a43d0682bf35..be5e59cbf28d20d4a7d4a3d8c3cfdad8bd479d6e 100644
GIT binary patch
literal 726
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_U=$DV32_B-8yXryLsvO8G^C}?
z3~gAI&@ex=urD-gs$bdM=-f#G1@ogSriB*H2`rf&Q8X{Kd}es*%;3@);YG7T%jSj`
z%nmM`6<Rnmq;z&z(ag}2*<mHKLW^gI70(I*q9PzUJG5waXvxgb;#pzEGl8-pKsCiP
zLyKks*+4B}U@4$Rpkkn|P@oi09Hf0Fhzk@4k{~ItUZ5c*vw=n-5YQPAE}Q{Y4>AX#
z49JFYLCSELfKWdxux$!3h!|o@g8YIRn3!2u**G|Pc=-ebg~Vj#lvUN#HMMnZ9i3cU
z-93GR!lPp2Qws`<%4-`MTRJ+sdM8bpI&J!#c?*}VTD^Yrj-9*qA31UA%-PFVu3o=!
z_x^*2Z{B_Q`04A<-+%u8Ynmzf85k8po-U3d6^zLWLOo26J0wyT_y#Zs*k)QKU1*e3
z<X!TrLow8yXQfqA2aBMa0k6wzg-~antEMdx(iSe07aZ)B*U*%8+tOB`xM7XeMX4CY
zO*TieIxe)F*yJX>RPj=ffR?s%4{u<Y(uR}+PkZB=n^!d@&ghl!h`4stFD~Y$eEo)3
z4L{x}IGvg~qvLZ@6PKrjp!nrw0*ra?Nt4?wT^i0$j^M4!5fF4!l~)p;Z>c@uJkJpy
zt$jz9hVlEFzD|gZTcFXM)v$KXibeW?D@|QyOQ&#qOgcPy#}<(#M>(fXRWbX>y2>GC
z=HiU0dy)^e9^52#Bt5X4alw)p3C>oB6|MVhyBO}CTFMdB?X{Uh>FR6)0d_Y=h9gDm
V^4f(B&jMqC!PC{xWt~$(697p@FQ)(i

literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}W`IwKE0AVj_}|db5E{D50Z0~3
zk0_cKT0A4XWKL-D?BK!~p+z%8if4wE%nT`-6;?buq<B_H@$AsznP4<4v}jgnF%SW{
z5C((<Dwq{of-Ev?np=WD&?=>pAirP+MkZz!X<02DW0TC{hK`=O3s$V%v2*w3dyk(y
zd;a3p>-Ycc7W{n=R2|{z;uuoFn5@90p~1+gKdC`T;=@7?g$AZc4IK?i6I?h>Y%=Ij
zWI2-h<EDjW$^#}R9-ljt9HjIV&YU=-+^(}gMe+RUQ%CiBlU9fv3eXS`ZHZdl@XFv2
Z1H-{Zf(5etZQ>x`d%F6$taD0e0st!}b07c!

diff --git a/core/img/filetypes/folder-starred.png b/core/img/filetypes/folder-starred.png
index 09383b5e06b886cee73bf4533e4a8313f445365c..b083a9d2d11f43ae961f02a180c82de3148f4c93 100644
GIT binary patch
literal 683
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-se*%0$T!AzL!~cechP1Sqp@n_1
zC5u9{rbg#Z3N4=*RWU8Ja86+5l*r<lk@>SjOQ(hwP6vty70(GTof%#*JG^KHh*3N%
zv}8tT;jEC7*<nR9LyBjG6wL|)iWC9Gf$W)~MYBVSW``AnrHW^UmCOVx04fUwsRW7x
z*)zc;P!~uLq#h&)<jw|hi)VsJ5F5e;s{v~Vnh#b0Qv<XSq8O?YtR5tY9c_PGHWTRk
z;F2J}U<O7eR!(jnK7K(VVG(f&X*qdiO?@L%OM3@LPaj{uz|iox_}t=#j=l*KCrz0;
zea51t%T}&hy>|2VW5>^&zi{>1%{zA=Jbd){`HMH7zJB}u^Y@>>|2S->0K=b=+tbA{
zq=ND7mFxaYjsnL&-e0)lMxaiDei2v15xo^Ry4Q7|`Tu|ajIWK>9PiG2sJTDgTkWTc
z`OK7wDr=H7;{;=-d8n`0J%KsO5d;tAL~@>}YB0T`%x_^E)^unQ-yPN+p^do-?#y<^
z2WA8|IGeB2Ixt82dFzAcfA?{P7ZiO?`jenP|1{s?#S7p333?j;VQ;HkZcSy~$|+9a
zjvJreeV8L4yY&3drR&uNvRApuENGA15?wL*&O(vK2`UM?Os5we?sZRCqRCLYBZ#@+
zDr>^^-lFi{rr*<86GT1Qr>!V8;ac-~!OVlFjQ@V!)#)jBB~5ST-J>PVto?0CwKj$g
lE8`Qk`af+9xKVq;>lf>xH|2Jpt0#gJou{jx%Q~loCIICoF|+^x

literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}T7XZ8E0AVj_@9<G(=&IHZ^O*k
zl0|`)Q$lm+1(r+?FP#}&JTs(dW@yRGuo56+R#?fb(Bhe)ML=>^Xvu64S&U4AWkG`I
zh~@QXS)e_NB|(0{42-PoT-?H<V#*q!Q4Jk4X0BVmegDD3$4=b7d++_X??3+)STGv`
z6~}tIIEGX(_MY$*YE}?ny>M>A1jWJtk)vUMzVBb+5qaUM+x<@$IeFgeGdXVKKNC^N
zvsUoPkAEpMHto3gX_fa!rS~h77lgZHIdFYnaQbd%#{JUIhDvW(ddj%l4wU3DItB_P
Tcl`-u0(sxl)z4*}Q$iB}Zl`<9

diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png
index 3dfb4391f2cde95313b8fd10b3193604f95bbabf..1dbb1154100103bab8096a60a0dc98dfd198c195 100644
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sx&b~Ru0WcB;eSIzLs-eokfK?k
z#k0bSXN3UC5)c~=3GA5E4OGro666=mz{u3lF=5j589#ph`u#^%&Feo<#@o}yF{Fa=
z?djcuEde~t4*RV?yT95W!z9#pB<xhi=U%nwgUjnh*gP`-{Fs)Nu&Qw-TbgXvjH3r)
rc?$}DcoY;!BwQBT{xs#ZVe8kJL;PM_=TFa713A#s)z4*}Q$iB}0(4NI

literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=3+9Gee4Ig%*R5Hg9(&
zP>7`@$S;_oq2v8T&j}lVd}U7;#}JO0$q5G-&gkheC9rjOcMJD0GO-!7F)!swo6#u2
Zz@YU{_@S@KKP{kg22WQ%mvv4FO#rUjB!B<_

diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png
index 2a5441efdb7989c03307df6ec62ad2ad19bbcbdc..0feaecf2830a7e7c1e6e3723aeccc26eb6e7e4a7 100644
GIT binary patch
literal 394
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-su>n3Iu0Xo4uW#nencdypQ>ILr
zI(6!_Y15`ppAKO_NT3Li0Tcu>AZ!SOAnBMefe&bbTuG2$FaswSw{}8CeM4hY$Fv#q
zmmfWL{OYaSciw*a_T%TDzr}H4D}XBZdAc};RNQ)d@hw+VfIv%Pf2Qo#H^G~??EHV4
zCp&S%4GG1L1>ffz@V6g*GXI8H)byo|(nrp*DY#GIsAXJ|dV9O;1jniaH|$m{II?*~
z(=~_1P4^CzzT;LG6=4h0;;8O<+r;K3ID21Y>-j$~_snA7#CKI@g9TGZzQdYj_f2)!
zT@sXvEE;~dKVam0aF2z*fbqMCY0Uv!S3day|B0n`59T$o?_qiux#l7ByT2Set~<8y
o-8kRGnAF_ZtI<~a$^SLqj4#PcWp{1+5A+Fxr>mdKI;Vst03`&pD*ylh

literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE0FH)?w&Gb%2Y6zK7IN$
z7(iyj#6Yx|N77f2StUV!!3^Bm2@Nf+Z5{KkKL7CP^B1lQD|Z0pyggkULn;`1PdM^5
zC<r)T40LyK{qfy?txGVI_FvE472g*7T#saY{pe=cA&!~ZEfcN_Ms=Hih{)IDkXhu*
o&b0iQHIw_^1uUKGQtsbfV9t7|=fKjpKw}v^UHx3vIVCg!05?NekN^Mx

diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png
index eb1470b0dff2ee8a2d33b25675fa9511b0da77c3..287a1f18869ec927ce48a1a70d005f09953e97b4 100644
GIT binary patch
literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sx&b~Ru0YzMp&_(kRcO)7(BfGj
zR5CjZ!YBfBA#5;Nrqinh)WBB~<QL4q!d6|^*fMGU*Pnm>{@b_YqAyU!&C|s(q=ND7
zX-lpH3_M2;oUQ%+|Gcj_liLonHCesCo=<B~`xp6uzv*A(N>gqSE2(GK<pT!}Jjkxd
kDtK|f&i&%nlcn!i7o9aVQBiqt8)zbfr>mdKI;Vst0D<vSw*UYD

literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Xn;?ME07K=nH5qrJFH}8NYSj&
zVi58?x~%~y!B!IF7tByz-_Y^i<WlWApoo&Ei(^OyW3mFj!DdHB?w<23i3U!tHzqL1
hvPKBjgl)26WAM7h)bs4l@)<zY44$rjF6*2UngDSGCv^Y-

diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png
index dcb22b53e670fede3591e239b1100c582f1b65d5..ff3ced625311665d81557d2669bb13e93167dd9e 100644
GIT binary patch
literal 572
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sX99deT!C~$L&K_7t0qmFG=Kj5
zzP`T6lP6D~K7H!csWWHJgfJlFv}x0Tf<ORd00B@CNW!^bF$4jTg(!fqkx7U;xLzOw
zt{!0o%nD=?{OkishcbcwaV`n+3ua(pW9Q(Ml9rWo_wezJO32F2%_}G@Dz9m7ZR_al
z>h9_5pRo7f;Uh<n9Y1yY?78z7FJF1|_{q~}&tJZJ_x{7j&tJd)W~mC*02+74)5S5Q
zg7NKzlR-{~0&Wl04pxe_SF?(y_b#wFzi8g~di7+<3-@N+i*VJv|H=Q{veXGXkA2O(
ze7k(5u<6^~F+z85msdV^KDy_B(Sz*bz3og(-@M&?TKSUswS{L`S<{6l?FiOke126#
zhsnCgu|)l~MpnG1BSX|Cw=J6N8d>?vAI!`+c6EK8*&mgzd-40_-(^NETFGv*H+)~y
zi;8OP1uJ4%+3F2BdV6Y10=(P|dD;&C=a5@_u)D^J<y)9>Sz{R2Gs7sa#_Z%vE4_@W
rl789i)#g21ak_uk!e^-tdzs&GKAAV?!6$#9KN&n-{an^LB{Ts5F)kXo

literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Q-Dv1E0CTxZQ6_(Gp0|U4rEN7
zIu%aB84xKT7Xr|@j;G@e0!<Mu3GxeO@bvQW%PMc^SiEHEp2J6uK6?D*>A$*1rk{Zd
zf;?RuLn>~qJ$0I|!GOahuqI?nSkBhZ|MzFTY-)LNX?MaT;TNle{|G%O<6~g{+p_ZD
z-jjl&CHl2%3fFVhipFqlin`Qz^3nbUOOAT&JQ$Jiv@y<Bay5GrU(8HKpy>>ru6{1-
HoD!M<6oPCZ

diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png
index 652ab3566ad53b2b9b3dc6db75e2b5f8a6322f9f..5505102f60ebc0d295ca836a253027d1977033e0 100644
GIT binary patch
literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sHUT~%u0VR#s#OgQ4U;BK>hJHL
zHf`FJDO09TpFVZ!R3ID30Fpoe<U&LsTnM>reoh)tzi>&AUoZnR3!i|XaQ%##vlgyc
zdF=SfGv_3Vs^x&vvpiiKLn>~)y>gnb$v}iHaZ8wpe#i5__ph=}(3)K0b3<^~ALIM$
zEYJQk`*_LpKi|(ut7_%nfBs%jb#%h&+MY#UHVV9O53J(&BKUUCmdhV}uKuf=v;1)G
zthOB6)~_Phf+PGBZCk&Iym4I+-Wcb~*l*9+@>SrHvj>0TUhe-sQ28%)EWftAJM%*^
mx=>4V*HgoHL7VsM?%`MFPz?8edsY?bN(N6?KbLh*2~7ZI=8H=J

literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b1=0--4b!Ggn>uyslqplD
zPoEBCLr5S44w6M$P6L(llmz(&GcbAj`iHgkP5=Jmr-%UKBcQmQr;B3<M|5(+0d^f0
ziP?@OpXV`LyUga$cCC=DZH_Jvk54w2gv1R$>ju^XPO}WyF3YSCiQrfwu~0To!H<DK
Yo=3?2-Oq!fK$93eUHx3vIVCg!01ECv-T(jq

diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png
index 81e7d3dc3b66c94723577fe371e731eb78b406a9..77ac138fe1c3cd727961d15dd0525c246d4fefa4 100644
GIT binary patch
literal 1098
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_VB8bn6XFWw{{R2Kp`l^bs#QR8
z=FFKu#-vG;`uh5S?C$RFsZ*!UojVuE?(grPHf`FJDN}&#>C>mro;@2V1!Myi1Ifvg
zCj-eDGiCr40F?oyfNFpY2niGiionHzYJgmbO1KnIB}5mTgs6ub0yhw16hu9;8i+WW
zdWdO2L5Mh94TJ%gg^NRMfpZ}magkV+K}^7<1tN~D2CE_XwL@gLuligLjK9exL4Lsu
zj7-cdtZeL@T--do`~rf)B4Xkak}`6N%BpJWnmT%h#wMl~R@Qco&MvNQ-afv8LBS!R
zkukA}=^2?>**W<Ig+;~HHFfokEv@aHUEO^XCrz0#d+z+jOO~!!y>{LDO`ErD-?@A5
z{zFHO9y@;W)S2@aE?vHQ?Z&O!ckkVQ@bK}IXU|`}eEsI#`wySKeEs(Q$IoBC|NPsX
za^M{>nXU44aSW+oe0%<S{N(_NV;|YMM4Fkmmv%JmXjic4>F9_KEYRR{WifB+VwTyV
zyLD~Y{Q4Uvi_f04^z18-`>^-_-t*5}6WTVe{oHXggwywP^=6%_^jE6c_b(gUNPi59
zk0>*5j3|GR?v#1%<HtW=_I~4H(AKQroceU~mb+^htu&&zBF}Q~s%i)pF?HV7JugSL
zFX#%#&CF?Qnmq%xtTK*;an-3QS|6Dt8sTtILd5LiXJtm8i|>U*UcId3NtjT_zVK7S
zIz0yK7nA3)PrZ^}zCdakx6W<mt;gcG?1}7Hw2HCnoYEQLD65AnWS2j7Q$6(M@+Gct
ze%aLmNrB%*bp5}dYsxjx-7g%lGEZ9P!q>gm?RHJv=EIs2`djVg_vhDU-P)G;zWr=a
zQjft3gR`5$?|v27V&J!KKc`*n6@x8|s?S$E^^%RbzVdmZP@iB{R^wx3)6xSUr_Sm-
zxbas~Thy-yhTG;yR7^{ovzlYZ?w*Nl0#^=rEatd%&LdxN%lwH(|95?mnRM-9$M5IU
z9Tq-(@>eExz5aG-j>$3g56*0L7na}mbml)3!?NA)Kb$-IqyH~!O`*FDqpR^tV4`C1
MboFyt=akR{00gQw1^@s6

literal 439
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf#sHrXS0MfW|Nr^(=TDtFb<(6s
z)2C0LIddkE0ptQ1K<>0@(|~Ls14vGpG6li~vVjaBfQZAnKoJNVt`VXJq70+~tN^G6
zq5zqM$O1`-AVeix5YE{3_55j|qpeDU{DK)6Ie7TQBxPjf6qHnSZ0uazJUqQ45|UFg
za`T&8+S)s&&R@A^?YdnD&z!w*>GGAEcOE}`{^I4wpTGYw%x2vSG^N_p#W6%evh-j(
z-@yQewu|@gUAZ^qR`vFM-|G#oFZC2I?E80GMP%xIA)YUxbIVK*Yn=A_84#abl9JlE
zto`AMuDKt$b05sR;?5jCt65q5;{9UjrN<{s-umP%Crfu%kFlV$r?e8EQP)<^g{#-d
oEo@&?ar$=bpW}s3r+s<M8q6mdlBV8U3Umg8r>mdKI;Vst08!V|!~g&Q

diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png
index 13547961c76d9d14ea436ca0b6c19dde2068d737..5fca7cb69d785617a9ef7fa74ffde4c5c6ca591f 100644
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s_5nU2u0Z<#|NjjQ4O78j+O%mv
zdiwO~Kn5J3apB@Xh7xa^7SIThk|4ie21cgHgxtdVj_&C*XU(3o`1_x~|2}+PWCE1W
z@^o<wsbGA2(VOdl0#D1s8{c=Ep8I?L*4Bgxkt-kU|IcC^l&jyf&yZIntj>$+M(a!#
z4sOndsjN466708F3q6qVXs{ML@qL4XEawHb2|E@w{BUMZ3K977@Ww+e#@zW=m1p-K
gSbAc~@+-Ia&$=bP58pHOJJ41JPgg&ebxsLQ0Jc|jS^xk5

literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=3TdOqnrb29TVF3epcR
z`~{TeC<*clW-zjJe)Hk;7YV`Hyg)HiPZ!4!j_BlshUT8WK0bE=W{>hMS`88kF+8F#
yGujQU6oO;~*kV{bxmJnJ7MbP2a>J-anc*Lg%Ce6UzT1HYFnGH9xvX<aXaWEatTpEV

diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png
index 5604a4a1891236639fcbf7de826330e45418bf65..308e81cca831fc2674d4660884ce7babd312ccba 100644
GIT binary patch
literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sS^+*Gu0VPk7)+l&9Y{}|Iu*jj
zB(G~PHw3EYEeY}qX0UfjpEhIpfg^9f{`vdkcB=+ZBHh!)F{Fa=?d9Ek4FMd@iATCM
zzWt5AzO*yjGv)F9{STjr%s#@Gaaa2w^Tuw5B6$PF1O{$>rUn;w6;THz=1EEl6B#`P
zC!A<lBHmJNXSL_^<3rZR!{>b8`KNRd^AirCB+m`qO6Ie-#9e<Sd$6xQJrigpgQu&X
J%Q~loCIAsqU*G@$

literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=7=SfKr<uzkt#lB|(0{
z4E8Pujy(VH`QxlxSAb$ho-U3d9MQ=M2N>SSCI}oj!1&Ny!8k%>0Z*S8tHxsH6HciI
nmds$iu+>>IM?hOh!hnIH(?%eb`(G|EP&b38tDnm{r-UW|a8)<1

diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png
index 861ac965a7d9e2b247459cc64edb4e44ad13f712..d9c5b890583a874cb2fd6606aa46dd594c223d3d 100644
GIT binary patch
literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s_5nU2u0WdM|Nn-D{~l{zd#rlp
zx%w4|vHCTT;RzyNd#-uux%#EY>Q`QCUU@;qLCPTLLp0A(pa~)+L4Lsuj7*UUxrOx|
z-P32znmuRn_dkFCefYe{1Sp^7>Eakt!T9!~H`f6Lo|cC<zV9|Y_xJp*tqBt%S3cPP
zpT#&RSHEYUA+JbSofp%M)|o6E+?)+lS#R(p*l)2GdLZG^U@dmy`vwPD&I@c4b}VZ6
z;mn>CBJkzmjfYx{x%00o&+b34^u&_oS8nm2bxV97zGv!pkjFe-{an^LB{Ts5hRb&r

literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=8+oUwf>2>9P8S=jvC;
zD6jccFi@JKB*-tA!N}72&4<rlBm`&k0>w-{T^vI=qLULEntS^C_}m4UJ<7LeHApDL
z@QA+5Xg9P{2$B(Ci(&EPS|vJLWR?fZ4WkxihJQRN%RWZ<ZU-8`;OXk;vd$@?2>>W3
BHW2^-

diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png
index fbe941e5c3f2fcfb3fa97ae5104948652c867bb0..5b3733b712129c817568a8eb4c8ff8cea174e033 100644
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I<N|y`T!Hk5>2V*X#ebNZ03uP*
zkBUEnKoy)NL4Lsu>C<K`fBW^%-(U6Xl7WKOo-U3d7N?UFB<3`vs;SLTW0>;bfRdpx
zgT}#5-=sqd(++(3vf{{vNfJSveX_G%7z3Ji3I*5fI;5a0&hUCN!(KZ>H8!9z44$rj
JF6*2UngII(LOlQg

literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE0F#$Egp_CxzF_ig;+|0
z{DK*tfB39#_Gk%^uk7jK7*fHQtiWWjS%J}Q0RuPJ0j-8L^V67G?jCG8ldg1VJ;RB+
WjFm--Tl0a+89ZJ6T-G@yGywqo)F>JN

diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png
index bf22ca23f095143043bdd68a98f7d4b892376a74..5a20026ebdd597b545aef1135805450124412e12 100644
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sHUT~%u0Z<#e})Di*zYiNpZ~0V
zen4{O9=}<8{b%m;o3+mu$ey{^cjjIo8z_i^`uE;Y0O}Vm3GxeOU}R#6O3Ewlm@;GL
zyv0j?{Q3LOH*?Nrpmdg}i(^Q|t+!V!`3@-XxCAOxpJ1B#`@U%`mx0vIPK`g>=KdU!
zn_h1d?tK@?Cb{;K3e%SAG^VVL0s-5D4zPO64rhAf$XUS4^ds%%UuW)3;Y=;}7+<Cz
t_@8h<EWO(}pot}@a<8(e=B~JE#@LAgwYQIbxeT<G!PC{xWt~$(695?hX}tgd

literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=2J3`p($nGkdS^ti687
zNP;DD4N#h+B*-tA!N}6-^@q=2b}Z{+0g4%Ux;Tb#L?<USH23uN@wp2ydz5d{a*&ig
ys=(&V%<OF4bCGfKD+fVEPp)Gf4AE@`EDTal6zzJ8k30hEX7F_Nb6Mw<&;$U@2s7yb

-- 
GitLab


From f1e97433f7346ffcc4b0b2da45170d8ff25819ba Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 3 Sep 2015 14:57:14 +0100
Subject: [PATCH 161/783] Set default mount options for external storages

---
 apps/files_external/js/settings.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index b542fe63d64..bf9981adabf 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -756,6 +756,13 @@ MountConfigListView.prototype = _.extend({
 		$tr.append(priorityEl);
 		$td.children().not('[type=hidden]').first().focus();
 
+		// FIXME default backend mount options
+		$tr.find('input.mountOptions').val(JSON.stringify({
+			'encrypt': true,
+			'previews': true,
+			'filesystem_check_changes': 1
+		}));
+
 		$tr.find('td').last().attr('class', 'remove');
 		$tr.find('td.mountOptionsToggle').removeClass('hidden');
 		$tr.find('td').last().removeAttr('style');
-- 
GitLab


From e7df6c0ca7a8316a3414866597e90719a90ceb1f Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 3 Sep 2015 16:30:32 +0200
Subject: [PATCH 162/783] also modify other places icons to fit new style

---
 core/img/filetypes/application-pdf.png | Bin 919 -> 1022 bytes
 core/img/filetypes/application-pdf.svg |   3 +--
 core/img/places/picture.png            | Bin 360 -> 295 bytes
 core/img/places/picture.svg            |   4 ++--
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png
index 940ed788b590be60d914603519f513eb08a9ea9e..4029f8aead1ad736c65389dcdad02d8aa4b0a0db 100644
GIT binary patch
literal 1022
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_V4N4=6XFWw{s*FlhX0|V`yCw4
zq#57#^n4r|deP18YN*2vKR+P%Zm7%s0EdU(-j74wuLnBc^!2?H=ypHU>p_tF4L{eL
zK0fz?yzU2h-0*d~73^|5!1Hdf>)k-F`@wFv0$qSA@A`Y)3v|B|;C462<6eOKEq}M$
zfgX4K-R=Ydm3iFrcfaN5c00i1j-NYF@oj$(kV=1#yC61Dr8}7PxEtVc*WdkifcqVP
zcOU~O3siQ;-vgrl4$wfLR3JnRP!MF)9iW*3K<z-Q-GSx+NuYHgdw~p)Ua%Sv3F1N&
z0NGGkkVS5Hfh5RSu)Q$$U9cL6Ibii510fnAc0qMP)MJn!FQ6l^3Fv|#Wpi%}hyY`#
zvn0qbn1PXrnT3^|lbeT^k6%DgNLWNnLQ+avUO`bwSyfF#Q%6_d*woD2(#qP#*3QAv
z$=%b-$Jak3G%_kSE-@)BJu5e_xU{^os=B7Ov8kh{Z{p;s(`U?@J!jthg^Lz1TfS=T
z#?3o+?>l(x_?e5BE?>EN{nowv4<9{#_TuHM*Kgl_`1tATw;w-${r>a!-_6F8z*NN8
z=IP=XQo(rk^vn5Ng)#>|o<E~^dQCHL_S;*k?QbSE-(go|S3IS=uqeQz@6Mu`KmT2~
zc^JC)S@izOYtKJEKYO4oe9A0#&NITg-!&XN=gkjk(DT!D&|k~Iys*Li;=+j7Tf1|<
zvQ*zZX!r8PtX94|tTi1Lmu~t-vxnx?OWN-`qAM%1F!A>O-3{q07qD1{d6rvM@CH6}
zV#pV<kYw^;+9A&t!yeblxV&+7;(@4yTc+%xGg@vxdtfu=`o>S2HGhaEUeb?Jv2mWz
zzU4%r#U&%=%{srdF5Tgh)>d1<qWSaocZ)Ok4MZc2HoiP^S?<97p3lIP{9LmAf9yp^
zMm-PZ?XU0e-5pR_l2)>kE9!DV-fw{e5pOPt960mP`}Q%@5APTnWPP8_uN4-2|8Zks
zLuGlB<LgHp0@XiUZ~Y3X3s~W)u;TotTgO&<2QWT(%kn#Tf}rz<;x=1-w;PXUHf>&0
zxqseMQ$tqm9fIjQRE{O|9Obz$T>PQv`JtWaNjyAKB@evr-{G6^R{M@l^DX%=N0#0_
U?0F^?m`oTvUHx3vIVCg!0Df}ZPyhe`

delta 896
zcmV-`1AqMf2bTwsB!8z+OjJbx009300RMo1zd%6UPe<KRM%+<I+)zi`QAgcRN8C|H
z+)zl{QAgcSM%zzF+)zi{P)FQQN8C_H+)zi{QApfUN!?RQ-BU~5R7>4eOx;#Z-dIoG
zSy0|uQr=us-dt4QURB>-R^MM&-(gwcV_V>4T;OG0;AURoXMbPeX=34PWa4dQ;%;W*
zZfD|eXX0>Z<8y4}c5mc&aOHb+<$QJJeRk!4c;<n6=7W9bg@5OWf#-;V=!=EujE3lq
zhv|=r>5+@+la1<>j_Q?<>Xne{my+w5l<S(6>ztSDo|){To$aNd?WUpbs;2I%r|+$(
z@2;xww6O5Dvw!ipweh*N^1Qk7zr6Cmz4O7o^TfgQ#>4c;#q`R@^~}ok&C2!9%=XgH
z_R`Sy)6w_U)A!cY_t(_-*VXsf*7w=h_}kg|+}ioy-TC3)`QzdG<l_3|<ND>~`sU>N
z=H>e5=KAR7`snBT>FE3F>HF;K`|a%f@9zBZ@ci-d{eScF{qytv^z;4o^!@eq{r2|#
z_xAnw_x||!{`&d;`uhI-`~Lj=|NZ^{{{H{}|L5D&O8@`>6LeBeQvd-11X^NlbBL6f
znVzGh`279;O=+C70004uNkl<Zcmd7SM|%=+6ov65c4Hyl8G9@k6BT<*EHU=331U~U
z$e^HrMSnzOR1~lX^L}XE=mR`+$$xgd>+{>5zMgHlD6O3D4~9f5w7?gL-l~N<P{bky
z=q)w?icr9gZ1ef3w6>(bD@gE!2h!HkfiA%QPS~wWdn@MYAcALoVMB*lrh`e?;(2R2
zz)-&mCg3a|rLzGQ?1U^%0AN*tSO6e#U^)mm4}a_m0<Hs>f`B)`Yug+|pa7@M!3>P&
zC~r0eYh4P~q(|H`1k-Ru<R;u+Z3a?&8x~oYf)~3@z#)jr-!?vlUoYRfm15?`fiA$x
zP!EfUz3)Pe|6SI>F_@99=N|oAKb(pjiB>Bru=6mRYyx~r-+c%0>drN%q=Aup0A4nB
zVtN0th**bjl>mO9@(1?SAHcJto1~@i`0=SR@dYCeA3SQ?#V;Q)TI7BdE{Y*opC_^R
zCuz$R%<_I)j?ZIa3d)>G(wGoq;PREmNihd|9@m|NVhjxGbr2FQ<-G^z6rsVsUhNP1
W(8y;G1~}OO0000<MNUMnLSTYRj|SEN

diff --git a/core/img/filetypes/application-pdf.svg b/core/img/filetypes/application-pdf.svg
index 5646f4caaac..9a472dba84b 100644
--- a/core/img/filetypes/application-pdf.svg
+++ b/core/img/filetypes/application-pdf.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0.000005 0.22905 0.20608 0.43749 0.43164 0.4375h11.139c0.22556-0.000006 0.43163-0.20845 0.43164-0.4375v-10.143c-0.004-0.06684-0.02269-0.1329-0.05469-0.19141l-3.3125-3.1992c-0.043-0.0164-0.08876-0.025544-0.13477-0.027344h-8.0684c-0.02684-0.0026-0.055191-0.0026-0.082031 0z" fill="#dc5047"/>
- <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m7.3561 3h0.19315c0.18549 0 0.36359 0.065879 0.49263 0.1949 0.53227 0.5322 0.28209 1.8297 0.015948 2.9022-0.01613 0.048381-0.023832 0.089205-0.031897 0.11339 0.32259 0.91119 0.78197 1.6448 1.29 2.0641 0.20968 0.16127 0.44366 0.32261 0.70173 0.46775 0.36291-0.040318 0.70953-0.056697 1.0402-0.056697 1 0 1.6055 0.17735 1.8394 0.55634 0.08065 0.12902 0.11988 0.28168 0.09569 0.44295-0.0081 0.20159-0.07989 0.38817-0.22505 0.53331-0.1371 0.15321-0.37878 0.24096-0.73362 0.24096-0.61292 0-1.6141-0.18585-2.4206-0.59709-1.3871 0.15321-2.4193 0.33985-3.2499 0.60595-0.040323 0.01613-0.088854 0.03075-0.14531 0.05493-1 1.71-1.7408 2.477-2.394 2.477-0.1291 0-0.2594-0.032-0.3562-0.089l-0.3863-0.249-0.0248-0.041c-0.0565-0.145-0.073-0.283-0.0408-0.436 0.0887-0.427 0.5491-1.105 1.5169-1.71 0.1532-0.113 0.3951-0.242 0.7177-0.395 0.2419-0.4192 0.5001-0.9108 0.7744-1.451 0.4113-0.8306 0.6684-1.6522 0.87-2.3618v-0.00886c-0.2984-0.9757-0.4756-1.5639-0.1772-2.6364 0.0726-0.3064 0.3396-0.6219 0.638-0.6219zm0.1205 0.49965c-0.01613 0.024192-0.040576 0.065194-0.056705 0.097448-0.1371 0.33867-0.12878 0.92736 0.056705 1.6531l0.040757-0.031892c0.056453-0.25804 0.08097-0.48348 0.12936-0.66088l0.023036-0.12934c0.0806-0.4596 0.0644-0.6941-0.0727-0.8876zm0.065566 3.6463c-0.1856 0.5968-0.4523 1.2334-0.8152 1.9349-0.1613 0.3064-0.3395 0.5961-0.404 0.838l0.088602-0.0319c1.0242-0.3951 1.9936-0.6204 2.6952-0.7494-0.1209-0.0806-0.2346-0.17-0.3313-0.2587-0.4839-0.4112-0.9027-1.0071-1.2334-1.7328zm3.3616 2.2165c-0.05645 0-0.11171 0.0008653-0.18429 0.081503 0.58873 0.25804 1.1601 0.41106 1.531 0.41106 0.05645 0 0.10578-0.0079 0.15417-0.01595h0.0319c0.04032-0.01613 0.06459-0.02568 0.07266-0.10631-0.01614-0.0242-0.03234-0.05633-0.07266-0.08859-0.08065-0.08064-0.40375-0.28172-1.5328-0.28172zm-5.8622 1.4596c-0.16936 0.09677-0.30743 0.18531-0.38808 0.24982-0.5726 0.52414-0.9343 1.0561-0.97462 1.3625 0.36291-0.12095 0.83849-0.65276 1.3627-1.6123z" fill="#fff"/>
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" fill="#dc5047" d="m2.3496 1v0.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0 0.228 0.2061 0.436 0.4316 0.436h11.138c0.226 0 0.432-0.208 0.432-0.437v-10.143c-0.004-0.0669-0.023-0.1329-0.055-0.1914l-3.312-3.1993c-0.043-0.0164-0.089-0.0255-0.135-0.0273h-8.0684c-0.0268-0.0026-0.0552-0.0026-0.082 0zm5.0059 2h0.1933c0.1855 0 0.3632 0.0663 0.4922 0.1953 0.5323 0.5322 0.2837 1.8299 0.0176 2.9024-0.0161 0.0483-0.0251 0.0891-0.0332 0.1132 0.3226 0.9112 0.783 1.6452 1.291 2.0645 0.2097 0.1613 0.4431 0.3216 0.7016 0.4668 0.362-0.0403 0.71-0.0567 1.041-0.0567 1 0 1.604 0.1777 1.837 0.5567 0.081 0.129 0.12 0.2821 0.096 0.4433-0.008 0.2016-0.079 0.3885-0.224 0.5335-0.138 0.153-0.378 0.24-0.733 0.24-0.613 0-1.615-0.186-2.4217-0.5977-1.3871 0.1537-2.4194 0.3417-3.25 0.6077-0.0403 0.016-0.0881 0.03-0.1445 0.054-1 1.71-1.7414 2.477-2.3946 2.477-0.1291 0-0.2586-0.033-0.3554-0.09l-0.3868-0.248-0.0254-0.041c-0.0565-0.145-0.0732-0.282-0.041-0.435 0.0887-0.427 0.5498-1.106 1.5176-1.711 0.1532-0.113 0.3942-0.242 0.7168-0.395 0.2419-0.4191 0.5011-0.9109 0.7754-1.4511 0.4113-0.8306 0.6675-1.6517 0.8691-2.3613v-0.0098c-0.2984-0.9757-0.4741-1.5642-0.1757-2.6367 0.0726-0.3064 0.3383-0.6211 0.6367-0.6211zm0.1211 0.5c-0.0162 0.0242-0.0405 0.0654-0.0567 0.0977-0.1371 0.3386-0.1288 0.9266 0.0567 1.6523l0.041-0.0312c0.0564-0.2581 0.0805-0.4848 0.1289-0.6622l0.0234-0.1289c0.0806-0.4596 0.0649-0.6932-0.0722-0.8867l-0.1211-0.041zm0.0664 3.6465c-0.1856 0.5968-0.4535 1.2321-0.8164 1.9336-0.1613 0.3064-0.3398 0.596-0.4043 0.8379l0.0898-0.0313c1.0242-0.3951 1.9937-0.621 2.6953-0.75-0.1209-0.0806-0.2353-0.1691-0.332-0.2578-0.4839-0.4112-0.9017-1.0067-1.2324-1.7324zm3.361 2.2168c-0.056 0-0.113-0.0006-0.185 0.0801 0.588 0.258 1.16 0.4121 1.531 0.4121 0.056 0 0.106-0.0076 0.154-0.0157h0.034c0.04-0.0161 0.064-0.0267 0.072-0.1074-0.016-0.0242-0.032-0.0556-0.072-0.0879-0.081-0.0806-0.405-0.2812-1.534-0.2812zm-5.863 1.4587c-0.1693 0.097-0.3061 0.186-0.3867 0.25-0.5726 0.524-0.9343 1.055-0.9746 1.362 0.3629-0.121 0.8371-0.652 1.3613-1.612z"/>
 </svg>
diff --git a/core/img/places/picture.png b/core/img/places/picture.png
index b60da3b5fd850e9d8f78dbebe0c4ef4180605e1a..171af526e9d5125b00d46a1e353b60118f33834c 100644
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyP60k4u0Z-fWq>38QX9||(UKs)
zU<NjB?SzK*j?VcT4<9*y^~uv`&%gXrX$;i?Dya8#aSW+oJbTWY?~s82OCb9to`=kQ
z0pIs)ZF-Vo{Oy2RP}bii@3!>6E7`q7=&zmV62A}j66cDyDKfAnFwS6%V?4odK3;hF
zizQD#q^!P}R8XVLpR%&7f`N}i%<v*ZlWUJj!-B4&1I&S&fyBmTocu1EMLPr-ZZ}Ea
eU6(0d%b2l8Zl}BJ+&@64FnGH9xvX<aXaWG+k(1^C

delta 344
zcmV-e0jK__0_Xye8Gi-<0047(dh`GQ0WV2JK~z|U?U$i$0zni-??NHLpixalzXFAB
zf+0aw&4)B075#vUS_}yvfWX(06&Q5;1r>D_gi|wVV7fc(z`|?-H@W8R+qpOIz1^8f
z0L4Tts`}M{H87JzBu*0IPT?kY3u-q`AUTupU)5t*pxOo+l7Eb()Y8~kxnLLCqTxS`
zlXEC{1oI4}83xj_4ODst-U`N!gQo=z+w;`Y*w~?Ee*{J$Gf*b)fN!fY+7@*8f>Znn
z>yq9jb+aBGGlWA)D@lVrc~5!blDspJ$0qRVyf+8#GjhAY8V^DZ+yaZ7wSItSpk;I0
zz^6|<)W8GqwNY<D-~;FblLEPg4Ag-aU{hqlP`Kv-7ad7cNxgvK41(_~=t)|hQe2YU
q3Y`6XSc%PO98rIqaJ?H|x`AKO#<L$51k^A90000<MNUMnLSTZ1W0)lX

diff --git a/core/img/places/picture.svg b/core/img/places/picture.svg
index b4c81b7a937..3e105dcd334 100644
--- a/core/img/places/picture.svg
+++ b/core/img/places/picture.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m0.6875 4c-0.39495 0.0765-0.69461 0.4668-0.6875 0.875v22.25c0.00001 0.458 0.4239 0.875 0.875 0.875h30.25c0.4511-0.000012 0.87499-0.41692 0.875-0.875v-21.906c-0.001-0.6731-0.529-1.2229-1.031-1.219zm2.3125 3h26v10l-2-2-5 7-6.625-4-9.1875 7h-3.1875zm6 3c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3 3-1.3431 3-3-1.3431-3-3-3z" fill="#fff"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" fill="#fff" d="m2.6876 4c-0.395 0.0765-0.6946 0.4668-0.6875 0.875v22.25c0 0.46 0.424 0.876 0.875 0.876h26.25c0.4511-0.000012 0.87498-0.41692 0.875-0.875v-21.906c-0.001-0.6731-0.529-1.2229-1.031-1.219zm1.3124 1.9999 24 0.000014v10l-2-2-6 8-6-6-8 8h-2zm5.0002 2c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3 3-1.3431 3-3-1.3431-3-3-3z"/>
 </svg>
-- 
GitLab


From 310d79728447ecf69f18d0b61a527397bd961888 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 1 Sep 2015 19:29:55 +0200
Subject: [PATCH 163/783] Add versions tab to files sidebar

- move versions to a tab in the files sidebar
- added mechanism to auto-update the row in the FileList whenever values
  are set to the FileInfoModel given to the sidebar
- updated tags/favorite action to make use of that new mechanism
---
 apps/files/js/detailsview.js                  |   2 +-
 apps/files/js/detailtabview.js                |   7 +
 apps/files/js/filelist.js                     |  40 ++++
 apps/files/js/tagsplugin.js                   |  16 +-
 apps/files/tests/js/tagspluginspec.js         |  18 +-
 apps/files_versions/ajax/getVersions.php      |   2 +-
 apps/files_versions/ajax/preview.php          |   5 +-
 apps/files_versions/css/versions.css          |  27 ++-
 apps/files_versions/js/filesplugin.js         |  34 +++
 apps/files_versions/js/versioncollection.js   |  91 ++++++++
 apps/files_versions/js/versionmodel.js        |  77 +++++++
 apps/files_versions/js/versions.js            | 193 ----------------
 apps/files_versions/js/versionstabview.js     | 198 +++++++++++++++++
 apps/files_versions/lib/hooks.php             |  12 +
 .../tests/js/versioncollectionSpec.js         | 161 ++++++++++++++
 .../tests/js/versionmodelSpec.js              |  96 ++++++++
 .../tests/js/versionstabviewSpec.js           | 208 ++++++++++++++++++
 tests/karma.config.js                         |  10 +
 18 files changed, 976 insertions(+), 221 deletions(-)
 create mode 100644 apps/files_versions/js/filesplugin.js
 create mode 100644 apps/files_versions/js/versioncollection.js
 create mode 100644 apps/files_versions/js/versionmodel.js
 delete mode 100644 apps/files_versions/js/versions.js
 create mode 100644 apps/files_versions/js/versionstabview.js
 create mode 100644 apps/files_versions/tests/js/versioncollectionSpec.js
 create mode 100644 apps/files_versions/tests/js/versionmodelSpec.js
 create mode 100644 apps/files_versions/tests/js/versionstabviewSpec.js

diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index 83d7fd4a178..3a775c29ec6 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -35,7 +35,7 @@
 	var DetailsView = OC.Backbone.View.extend({
 		id: 'app-sidebar',
 		tabName: 'div',
-		className: 'detailsView',
+		className: 'detailsView scroll-container',
 
 		_template: null,
 
diff --git a/apps/files/js/detailtabview.js b/apps/files/js/detailtabview.js
index b0e170bc4e7..449047cf252 100644
--- a/apps/files/js/detailtabview.js
+++ b/apps/files/js/detailtabview.js
@@ -84,6 +84,13 @@
 		 */
 		getFileInfo: function() {
 			return this.model;
+		},
+
+		/**
+		 * Load the next page of results
+		 */
+		nextPage: function() {
+			// load the next page, if applicable
 		}
 	});
 	DetailTabView._TAB_COUNT = 0;
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 9593ee79e66..3f0ee932d1e 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -291,6 +291,7 @@
 		 * @return {OCA.Files.FileInfoModel} file info model
 		 */
 		getModelForFile: function(fileName) {
+			var self = this;
 			var $tr;
 			// jQuery object ?
 			if (fileName.is) {
@@ -318,6 +319,21 @@
 			if (!model.has('path')) {
 				model.set('path', this.getCurrentDirectory(), {silent: true});
 			}
+
+			model.on('change', function(model) {
+				// re-render row
+				var highlightState = $tr.hasClass('highlighted');
+				$tr = self.updateRow(
+					$tr,
+					_.extend({isPreviewAvailable: true}, model.toJSON()),
+					{updateSummary: true, silent: false, animate: true}
+				);
+				$tr.toggleClass('highlighted', highlightState);
+			});
+			model.on('busy', function(model, state) {
+				self.showFileBusyState($tr, state);
+			});
+
 			return model;
 		},
 
@@ -341,6 +357,9 @@
 			if (!fileName) {
 				OC.Apps.hideAppSidebar(this._detailsView.$el);
 				this._detailsView.setFileInfo(null);
+				if (this._currentFileModel) {
+					this._currentFileModel.off();
+				}
 				this._currentFileModel = null;
 				return;
 			}
@@ -1223,6 +1242,10 @@
 		reload: function() {
 			this._selectedFiles = {};
 			this._selectionSummary.clear();
+			if (this._currentFileModel) {
+				this._currentFileModel.off();
+			}
+			this._currentFileModel = null;
 			this.$el.find('.select-all').prop('checked', false);
 			this.showMask();
 			if (this._reloadCall) {
@@ -1554,6 +1577,23 @@
 
 		},
 
+		/**
+		 * Updates the given row with the given file info
+		 *
+		 * @param {Object} $tr row element
+		 * @param {OCA.Files.FileInfo} fileInfo file info
+		 * @param {Object} options options
+		 *
+		 * @return {Object} new row element
+		 */
+		updateRow: function($tr, fileInfo, options) {
+			this.files.splice($tr.index(), 1);
+			$tr.remove();
+			$tr = this.add(fileInfo, _.extend({updateSummary: false, silent: true}, options));
+			this.$fileList.trigger($.Event('fileActionsReady', {fileList: this, $files: $tr}));
+			return $tr;
+		},
+
 		/**
 		 * Triggers file rename input field for the given file name.
 		 * If the user enters a new name, the file will be renamed.
diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js
index 609e38ca9a9..9f45da9a6e2 100644
--- a/apps/files/js/tagsplugin.js
+++ b/apps/files/js/tagsplugin.js
@@ -92,6 +92,7 @@
 				actionHandler: function(fileName, context) {
 					var $actionEl = context.$file.find('.action-favorite');
 					var $file = context.$file;
+					var fileInfo = context.fileList.files[$file.index()];
 					var dir = context.dir || context.fileList.getCurrentDirectory();
 					var tags = $file.attr('data-tags');
 					if (_.isUndefined(tags)) {
@@ -106,9 +107,11 @@
 					} else {
 						tags.push(OC.TAG_FAVORITE);
 					}
+
+					// pre-toggle the star
 					toggleStar($actionEl, !isFavorite);
 
-					context.fileInfoModel.set('tags', tags);
+					context.fileInfoModel.trigger('busy', context.fileInfoModel, true);
 
 					self.applyFileTags(
 						dir + '/' + fileName,
@@ -116,17 +119,16 @@
 						$actionEl,
 						isFavorite
 					).then(function(result) {
+						context.fileInfoModel.trigger('busy', context.fileInfoModel, false);
 						// response from server should contain updated tags
 						var newTags = result.tags;
 						if (_.isUndefined(newTags)) {
 							newTags = tags;
 						}
-						var fileInfo = context.fileList.files[$file.index()];
-						// read latest state from result
-						toggleStar($actionEl, (newTags.indexOf(OC.TAG_FAVORITE) >= 0));
-						$file.attr('data-tags', newTags.join('|'));
-						$file.attr('data-favorite', !isFavorite);
-						fileInfo.tags = newTags;
+						context.fileInfoModel.set({
+							'tags': newTags,
+							'favorite': !isFavorite
+						});
 					});
 				}
 			});
diff --git a/apps/files/tests/js/tagspluginspec.js b/apps/files/tests/js/tagspluginspec.js
index 950fb754253..533aa63362c 100644
--- a/apps/files/tests/js/tagspluginspec.js
+++ b/apps/files/tests/js/tagspluginspec.js
@@ -79,12 +79,12 @@ describe('OCA.Files.TagsPlugin tests', function() {
 		it('sends request to server and updates icon', function() {
 			var request;
 			fileList.setFiles(testFiles);
-			$tr = fileList.$el.find('tbody tr:first');
-			$action = $tr.find('.action-favorite');
+			var $tr = fileList.findFileEl('One.txt');
+			var $action = $tr.find('.action-favorite');
 			$action.click();
 
 			expect(fakeServer.requests.length).toEqual(1);
-			var request = fakeServer.requests[0];
+			request = fakeServer.requests[0];
 			expect(JSON.parse(request.requestBody)).toEqual({
 				tags: ['tag1', 'tag2', OC.TAG_FAVORITE]
 			});
@@ -92,12 +92,18 @@ describe('OCA.Files.TagsPlugin tests', function() {
 				tags: ['tag1', 'tag2', 'tag3', OC.TAG_FAVORITE]
 			}));
 
+			// re-read the element as it was re-inserted
+			$tr = fileList.findFileEl('One.txt');
+			$action = $tr.find('.action-favorite');
+
 			expect($tr.attr('data-favorite')).toEqual('true');
 			expect($tr.attr('data-tags').split('|')).toEqual(['tag1', 'tag2', 'tag3', OC.TAG_FAVORITE]);
 			expect(fileList.files[0].tags).toEqual(['tag1', 'tag2', 'tag3', OC.TAG_FAVORITE]);
 			expect($action.find('img').attr('src')).toEqual(OC.imagePath('core', 'actions/starred'));
 
 			$action.click();
+
+			expect(fakeServer.requests.length).toEqual(2);
 			request = fakeServer.requests[1];
 			expect(JSON.parse(request.requestBody)).toEqual({
 				tags: ['tag1', 'tag2', 'tag3']
@@ -106,7 +112,11 @@ describe('OCA.Files.TagsPlugin tests', function() {
 				tags: ['tag1', 'tag2', 'tag3']
 			}));
 
-			expect($tr.attr('data-favorite')).toEqual('false');
+			// re-read the element as it was re-inserted
+			$tr = fileList.findFileEl('One.txt');
+			$action = $tr.find('.action-favorite');
+
+			expect($tr.attr('data-favorite')).toBeFalsy();
 			expect($tr.attr('data-tags').split('|')).toEqual(['tag1', 'tag2', 'tag3']);
 			expect(fileList.files[0].tags).toEqual(['tag1', 'tag2', 'tag3']);
 			expect($action.find('img').attr('src')).toEqual(OC.imagePath('core', 'actions/star'));
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 20d60240179..59bd30f434f 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -44,6 +44,6 @@ if( $versions ) {
 
 } else {
 
-	\OCP\JSON::success(array('data' => array('versions' => false, 'endReached' => true)));
+	\OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
 
 }
diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php
index 8a9a5fba14c..2f33f0278ef 100644
--- a/apps/files_versions/ajax/preview.php
+++ b/apps/files_versions/ajax/preview.php
@@ -53,7 +53,10 @@ try {
 	$preview->setScalingUp($scalingUp);
 
 	$preview->showPreview();
-}catch(\Exception $e) {
+} catch (\OCP\Files\NotFoundException $e) {
+	\OC_Response::setStatus(404);
+	\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);
+} catch (\Exception $e) {
 	\OC_Response::setStatus(500);
 	\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);
 }
diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css
index e3ccfc3c864..ec0f0cc9896 100644
--- a/apps/files_versions/css/versions.css
+++ b/apps/files_versions/css/versions.css
@@ -1,19 +1,18 @@
-#dropdown.drop-versions {
-	width: 360px;
+.versionsTabView .clear-float {
+	clear: both;
 }
-
-#found_versions li {
+.versionsTabView li {
 	width: 100%;
 	cursor: default;
 	height: 56px;
 	float: left;
 	border-bottom: 1px solid rgba(100,100,100,.1);
 }
-#found_versions li:last-child {
+.versionsTabView li:last-child {
 	border-bottom: none;
 }
 
-#found_versions li > * {
+.versionsTabView li > * {
 	padding: 7px;
 	float: left;
 	vertical-align: top;
@@ -22,34 +21,34 @@
 	opacity: .5;
 }
 
-#found_versions li > a,
-#found_versions li > span {
+.versionsTabView li > a,
+.versionsTabView li > span {
 	padding: 17px 7px;
 }
 
-#found_versions li > *:hover,
-#found_versions li > *:focus {
+.versionsTabView li > *:hover,
+.versionsTabView li > *:focus {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	filter: alpha(opacity=100);
 	opacity: 1;
 }
 
-#found_versions img {
+.versionsTabView img {
 	cursor: pointer;
 	padding-right: 4px;
 }
 
-#found_versions img.preview {
+.versionsTabView img.preview {
 	cursor: default;
 	opacity: 1;
 }
 
-#found_versions .versionDate {
+.versionsTabView .versionDate {
 	min-width: 100px;
 	vertical-align: text-bottom;
 }
 
-#found_versions .revertVersion {
+.versionsTabView .revertVersion {
 	cursor: pointer;
 	float: right;
 	max-width: 130px;
diff --git a/apps/files_versions/js/filesplugin.js b/apps/files_versions/js/filesplugin.js
new file mode 100644
index 00000000000..42075ce6462
--- /dev/null
+++ b/apps/files_versions/js/filesplugin.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	OCA.Versions = OCA.Versions || {};
+
+	/**
+	 * @namespace
+	 */
+	OCA.Versions.Util = {
+		/**
+		 * Initialize the versions plugin.
+		 *
+		 * @param {OCA.Files.FileList} fileList file list to be extended
+		 */
+		attach: function(fileList) {
+			if (fileList.id === 'trashbin' || fileList.id === 'files.public') {
+				return;
+			}
+
+			fileList.registerTabView(new OCA.Versions.VersionsTabView('versionsTabView'));
+		}
+	};
+})();
+
+OC.Plugins.register('OCA.Files.FileList', OCA.Versions.Util);
+
diff --git a/apps/files_versions/js/versioncollection.js b/apps/files_versions/js/versioncollection.js
new file mode 100644
index 00000000000..3f8214cde8c
--- /dev/null
+++ b/apps/files_versions/js/versioncollection.js
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	/**
+	 * @memberof OCA.Versions
+	 */
+	var VersionCollection = OC.Backbone.Collection.extend({
+		model: OCA.Versions.VersionModel,
+
+		/**
+		 * @var OCA.Files.FileInfoModel
+		 */
+		_fileInfo: null,
+
+		_endReached: false,
+		_currentIndex: 0,
+
+		url: function() {
+			var url = OC.generateUrl('/apps/files_versions/ajax/getVersions.php');
+			var query = {
+				source: this._fileInfo.getFullPath(),
+				start: this._currentIndex
+			};
+			return url + '?' + OC.buildQueryString(query);
+		},
+
+		setFileInfo: function(fileInfo) {
+			this._fileInfo = fileInfo;
+			// reset
+			this._endReached = false;
+			this._currentIndex = 0;
+		},
+
+		getFileInfo: function() {
+			return this._fileInfo;
+		},
+
+		hasMoreResults: function() {
+			return !this._endReached;
+		},
+
+		fetch: function(options) {
+			if (!options || options.remove) {
+				this._currentIndex = 0;
+			}
+			return OC.Backbone.Collection.prototype.fetch.apply(this, arguments);
+		},
+
+		/**
+		 * Fetch the next set of results
+		 */
+		fetchNext: function() {
+			if (!this.hasMoreResults()) {
+				return null;
+			}
+			if (this._currentIndex === 0) {
+				return this.fetch();
+			}
+			return this.fetch({remove: false});
+		},
+
+		parse: function(result) {
+			var results = _.map(result.data.versions, function(version) {
+				var revision = parseInt(version.version, 10);
+				return {
+					id: revision,
+					name: version.name,
+					fullPath: version.path,
+					timestamp: revision,
+					size: version.size
+				};
+			});
+			this._endReached = result.data.endReached;
+			this._currentIndex += results.length;
+			return results;
+		}
+	});
+
+	OCA.Versions = OCA.Versions || {};
+
+	OCA.Versions.VersionCollection = VersionCollection;
+})();
+
diff --git a/apps/files_versions/js/versionmodel.js b/apps/files_versions/js/versionmodel.js
new file mode 100644
index 00000000000..dc610fc2144
--- /dev/null
+++ b/apps/files_versions/js/versionmodel.js
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	/**
+	 * @memberof OCA.Versions
+	 */
+	var VersionModel = OC.Backbone.Model.extend({
+
+		/**
+		 * Restores the original file to this revision
+		 */
+		revert: function(options) {
+			options = options ? _.clone(options) : {};
+			var model = this;
+			var file = this.getFullPath();
+			var revision = this.get('timestamp');
+
+			$.ajax({
+				type: 'GET',
+				url: OC.generateUrl('/apps/files_versions/ajax/rollbackVersion.php'),
+				dataType: 'json',
+				data: {
+					file: file,
+					revision: revision
+				},
+				success: function(response) {
+					if (response.status === 'error') {
+						if (options.error) {
+							options.error.call(options.context, model, response, options);
+						}
+						model.trigger('error', model, response, options);
+					} else {
+						if (options.success) {
+							options.success.call(options.context, model, response, options);
+						}
+						model.trigger('revert', model, response, options);
+					}
+				}
+			});
+		},
+
+		getFullPath: function() {
+			return this.get('fullPath');
+		},
+
+		getPreviewUrl: function() {
+			var url = OC.generateUrl('/apps/files_versions/preview');
+			var params = {
+				file: this.get('fullPath'),
+				version: this.get('timestamp')
+			};
+			return url + '?' + OC.buildQueryString(params);
+		},
+
+		getDownloadUrl: function() {
+			var url = OC.generateUrl('/apps/files_versions/download.php');
+			var params = {
+				file: this.get('fullPath'),
+				revision: this.get('timestamp')
+			};
+			return url + '?' + OC.buildQueryString(params);
+		}
+	});
+
+	OCA.Versions = OCA.Versions || {};
+
+	OCA.Versions.VersionModel = VersionModel;
+})();
+
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
deleted file mode 100644
index e86bb4c3307..00000000000
--- a/apps/files_versions/js/versions.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2014
- *
- * This file is licensed under the Affero General Public License version 3
- * or later.
- *
- * See the COPYING-README file.
- *
- */
-
-/* global scanFiles, escapeHTML, formatDate */
-$(document).ready(function(){
-
-	// TODO: namespace all this as OCA.FileVersions
-
-	if ($('#isPublic').val()){
-		// no versions actions in public mode
-		// beware of https://github.com/owncloud/core/issues/4545
-		// as enabling this might hang Chrome
-		return;
-	}
-
-	if (OCA.Files) {
-		// Add versions button to 'files/index.php'
-		OCA.Files.fileActions.register(
-			'file',
-			'Versions',
-			OC.PERMISSION_UPDATE,
-			function() {
-				// Specify icon for hitory button
-				return OC.imagePath('core','actions/history');
-			}, function(filename, context){
-				// Action to perform when clicked
-				if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
-
-				var file = context.dir.replace(/(?!<=\/)$|\/$/, '/' + filename);
-				var createDropDown = true;
-				// Check if drop down is already visible for a different file
-				if (($('#dropdown').length > 0) ) {
-					if ( $('#dropdown').hasClass('drop-versions') && file == $('#dropdown').data('file')) {
-						createDropDown = false;
-					}
-					$('#dropdown').slideUp(OC.menuSpeed);
-					$('#dropdown').remove();
-					$('tr').removeClass('mouseOver');
-				}
-
-				if(createDropDown === true) {
-					createVersionsDropdown(filename, file, context.fileList);
-				}
-			}, t('files_versions', 'Versions')
-		);
-	}
-
-	$(document).on("click", 'span[class="revertVersion"]', function() {
-		var revision = $(this).attr('id');
-		var file = $(this).attr('value');
-		revertFile(file, revision);
-	});
-
-});
-
-function revertFile(file, revision) {
-
-	$.ajax({
-		type: 'GET',
-		url: OC.linkTo('files_versions', 'ajax/rollbackVersion.php'),
-		dataType: 'json',
-		data: {file: file, revision: revision},
-		async: false,
-		success: function(response) {
-			if (response.status === 'error') {
-				OC.Notification.show( t('files_version', 'Failed to revert {file} to revision {timestamp}.', {file:file, timestamp:formatDate(revision * 1000)}) );
-			} else {
-				$('#dropdown').slideUp(OC.menuSpeed, function() {
-					$('#dropdown').closest('tr').find('.modified:first').html(relative_modified_date(revision));
-					$('#dropdown').remove();
-					$('tr').removeClass('mouseOver');
-				});
-			}
-		}
-	});
-
-}
-
-function goToVersionPage(url){
-	window.location.assign(url);
-}
-
-function createVersionsDropdown(filename, files, fileList) {
-
-	var start = 0;
-	var fileEl;
-
-	var html = '<div id="dropdown" class="drop drop-versions" data-file="'+escapeHTML(files)+'">';
-	html += '<div id="private">';
-	html += '<ul id="found_versions">';
-	html += '</ul>';
-	html += '</div>';
-	html += '<input type="button" value="'+ t('files_versions', 'More versions...') + '" name="show-more-versions" id="show-more-versions" style="display: none;" />';
-
-	if (filename) {
-		fileEl = fileList.findFileEl(filename);
-		fileEl.addClass('mouseOver');
-		$(html).appendTo(fileEl.find('td.filename'));
-	} else {
-		$(html).appendTo($('thead .share'));
-	}
-
-	getVersions(start);
-	start = start + 5;
-
-	$("#show-more-versions").click(function() {
-		//get more versions
-		getVersions(start);
-		start = start + 5;
-	});
-
-	function getVersions(start) {
-		$.ajax({
-			type: 'GET',
-			url: OC.filePath('files_versions', 'ajax', 'getVersions.php'),
-			dataType: 'json',
-			data: {source: files, start: start},
-			async: false,
-			success: function(result) {
-				var versions = result.data.versions;
-				if (result.data.endReached === true) {
-					$("#show-more-versions").css("display", "none");
-				} else {
-					$("#show-more-versions").css("display", "block");
-				}
-				if (versions) {
-					$.each(versions, function(index, row) {
-						addVersion(row);
-					});
-				} else {
-					$('<div style="text-align:center;">'+ t('files_versions', 'No other versions available') + '</div>').appendTo('#dropdown');
-				}
-				$('#found_versions').change(function() {
-					var revision = parseInt($(this).val());
-					revertFile(files, revision);
-				});
-			}
-		});
-	}
-
-	function addVersion( revision ) {
-		var title = formatDate(revision.version*1000);
-		var name ='<span class="versionDate" title="' + title + '">' + revision.humanReadableTimestamp + '</span>';
-
-		var path = OC.filePath('files_versions', '', 'download.php');
-
-		var preview = '<img class="preview" src="'+revision.preview+'"/>';
-
-		var download ='<a href="' + path + "?file=" + encodeURIComponent(files) + '&revision=' + revision.version + '">';
-		download+='<img';
-		download+=' src="' + OC.imagePath('core', 'actions/download') + '"';
-		download+=' name="downloadVersion" />';
-		download+=name;
-		download+='</a>';
-
-		var revert='<span class="revertVersion"';
-		revert+=' id="' + revision.version + '">';
-		revert+='<img';
-		revert+=' src="' + OC.imagePath('core', 'actions/history') + '"';
-		revert+=' name="revertVersion"';
-		revert+='/>'+t('files_versions', 'Restore')+'</span>';
-
-		var version=$('<li/>');
-		version.attr('value', revision.version);
-		version.html(preview + download + revert);
-		// add file here for proper name escaping
-		version.find('span.revertVersion').attr('value', files);
-
-		version.appendTo('#found_versions');
-	}
-
-	$('#dropdown').slideDown(1000);
-}
-
-$(this).click(
-	function(event) {
-	if ($('#dropdown').has(event.target).length === 0 && $('#dropdown').hasClass('drop-versions')) {
-		$('#dropdown').slideUp(OC.menuSpeed, function() {
-			$('#dropdown').remove();
-			$('tr').removeClass('mouseOver');
-		});
-	}
-
-
-	}
-);
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js
new file mode 100644
index 00000000000..1f84428e616
--- /dev/null
+++ b/apps/files_versions/js/versionstabview.js
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	var TEMPLATE_ITEM =
+		'<li data-revision="{{timestamp}}">' +
+		'<img class="preview" src="{{previewUrl}}"/>' +
+		'<a href="{{downloadUrl}}" class="downloadVersion"><img src="{{downloadIconUrl}}" />' +
+		'<span class="versiondate has-tooltip" title="{{formattedTimestamp}}">{{relativeTimestamp}}</span>' +
+		'</a>' +
+		'<a href="#" class="revertVersion"><img src="{{revertIconUrl}}" />{{revertLabel}}</a>' +
+		'</li>';
+
+	var TEMPLATE =
+		'<ul class="versions"></ul>' +
+		'<div class="clear-float"></div>' +
+		'<div class="empty hidden">{{emptyResultLabel}}</div>' +
+		'<input type="button" class="showMoreVersions hidden" value="{{moreVersionsLabel}}"' +
+		' name="show-more-versions" id="show-more-versions" />' +
+		'<div class="loading hidden" style="height: 50px"></div>';
+
+	/**
+	 * @memberof OCA.Versions
+	 */
+	var VersionsTabView = OCA.Files.DetailTabView.extend(
+		/** @lends OCA.Versions.VersionsTabView.prototype */ {
+		id: 'versionsTabView',
+		className: 'tab versionsTabView',
+
+		_template: null,
+
+		$versionsContainer: null,
+
+		events: {
+			'click .revertVersion': '_onClickRevertVersion',
+			'click .showMoreVersions': '_onClickShowMoreVersions'
+		},
+
+		initialize: function() {
+			this.collection = new OCA.Versions.VersionCollection();
+			this.collection.on('request', this._onRequest, this);
+			this.collection.on('sync', this._onEndRequest, this);
+			this.collection.on('update', this._onUpdate, this);
+			this.collection.on('error', this._onError, this);
+			this.collection.on('add', this._onAddModel, this);
+		},
+
+		getLabel: function() {
+			return t('files_versions', 'Versions');
+		},
+
+		nextPage: function() {
+			if (this._loading || !this.collection.hasMoreResults()) {
+				return;
+			}
+
+			if (this.collection.getFileInfo() && this.collection.getFileInfo().isDirectory()) {
+				return;
+			}
+			this.collection.fetchNext();
+		},
+
+		_onClickShowMoreVersions: function(ev) {
+			ev.preventDefault();
+			this.nextPage();
+		},
+
+		_onClickRevertVersion: function(ev) {
+			var self = this;
+			var $target = $(ev.target);
+			var fileInfoModel = this.collection.getFileInfo();
+			var revision;
+			if (!$target.is('li')) {
+				$target = $target.closest('li');
+			}
+
+			ev.preventDefault();
+			revision = $target.attr('data-revision');
+
+			var versionModel = this.collection.get(revision);
+			versionModel.revert({
+				success: function() {
+					// reset and re-fetch the updated collection
+					self.collection.setFileInfo(fileInfoModel);
+					self.collection.fetch();
+
+					// update original model
+					fileInfoModel.trigger('busy', fileInfoModel, false);
+					fileInfoModel.set({
+						size: versionModel.get('size'),
+						mtime: versionModel.get('timestamp') * 1000,
+						// temp dummy, until we can do a PROPFIND
+						etag: versionModel.get('id') + versionModel.get('timestamp')
+					});
+				},
+
+				error: function() {
+					OC.Notification.showTemporary(
+						t('files_version', 'Failed to revert {file} to revision {timestamp}.', {
+							file: versionModel.getFullPath(),
+							timestamp: OC.Util.formatDate(versionModel.get('timestamp') * 1000)
+						})
+					);
+				}
+			});
+
+			// spinner
+			this._toggleLoading(true);
+			fileInfoModel.trigger('busy', fileInfoModel, true);
+		},
+
+		_toggleLoading: function(state) {
+			this._loading = state;
+			this.$el.find('.loading').toggleClass('hidden', !state);
+		},
+
+		_onRequest: function() {
+			this._toggleLoading(true);
+			this.$el.find('.showMoreVersions').addClass('hidden');
+		},
+
+		_onEndRequest: function() {
+			this._toggleLoading(false);
+			this.$el.find('.empty').toggleClass('hidden', !!this.collection.length);
+			this.$el.find('.showMoreVersions').toggleClass('hidden', !this.collection.hasMoreResults());
+		},
+
+		_onAddModel: function(model) {
+			this.$versionsContainer.append(this.itemTemplate(this._formatItem(model)));
+		},
+
+		template: function(data) {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+
+			return this._template(data);
+		},
+
+		itemTemplate: function(data) {
+			if (!this._itemTemplate) {
+				this._itemTemplate = Handlebars.compile(TEMPLATE_ITEM);
+			}
+
+			return this._itemTemplate(data);
+		},
+
+		setFileInfo: function(fileInfo) {
+			if (fileInfo) {
+				this.render();
+				this.collection.setFileInfo(fileInfo);
+				this.collection.reset({silent: true});
+				this.nextPage();
+			} else {
+				this.render();
+				this.collection.reset();
+			}
+		},
+
+		_formatItem: function(version) {
+			var timestamp = version.get('timestamp') * 1000;
+			return _.extend({
+				formattedTimestamp: OC.Util.formatDate(timestamp),
+				relativeTimestamp: OC.Util.relativeModifiedDate(timestamp),
+				downloadUrl: version.getDownloadUrl(),
+				downloadIconUrl: OC.imagePath('core', 'actions/download'),
+				revertIconUrl: OC.imagePath('core', 'actions/history'),
+				previewUrl: version.getPreviewUrl(),
+				revertLabel: t('files_versions', 'Restore'),
+			}, version.attributes);
+		},
+
+		/**
+		 * Renders this details view
+		 */
+		render: function() {
+			this.$el.html(this.template({
+				emptyResultLabel: t('files_versions', 'No other versions available'),
+				moreVersionsLabel: t('files_versions', 'More versions...')
+			}));
+			this.$el.find('.has-tooltip').tooltip();
+			this.$versionsContainer = this.$el.find('ul.versions');
+			this.delegateEvents();
+		}
+	});
+
+	OCA.Versions = OCA.Versions || {};
+
+	OCA.Versions.VersionsTabView = VersionsTabView;
+})();
+
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index ccd89a4a14f..5ef2cc3c7d0 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -43,6 +43,9 @@ class Hooks {
 		\OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Files_Versions\Hooks', 'copy_hook');
 		\OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
 		\OCP\Util::connectHook('OC_Filesystem', 'copy', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
+
+		$eventDispatcher = \OC::$server->getEventDispatcher();
+		$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', ['OCA\Files_Versions\Hooks', 'onLoadFilesAppScripts']);
 	}
 
 	/**
@@ -154,4 +157,13 @@ class Hooks {
 		}
 	}
 
+	/**
+	 * Load additional scripts when the files app is visible
+	 */
+	public static function onLoadFilesAppScripts() {
+		\OCP\Util::addScript('files_versions', 'versionmodel');
+		\OCP\Util::addScript('files_versions', 'versioncollection');
+		\OCP\Util::addScript('files_versions', 'versionstabview');
+		\OCP\Util::addScript('files_versions', 'filesplugin');
+	}
 }
diff --git a/apps/files_versions/tests/js/versioncollectionSpec.js b/apps/files_versions/tests/js/versioncollectionSpec.js
new file mode 100644
index 00000000000..87065fa1d36
--- /dev/null
+++ b/apps/files_versions/tests/js/versioncollectionSpec.js
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+describe('OCA.Versions.VersionCollection', function() {
+	var VersionCollection = OCA.Versions.VersionCollection;
+	var collection, fileInfoModel;
+
+	beforeEach(function() {
+		fileInfoModel = new OCA.Files.FileInfoModel({
+			path: '/subdir',
+			name: 'some file.txt'
+		});
+		collection = new VersionCollection();
+		collection.setFileInfo(fileInfoModel);
+	});
+	it('fetches the next page', function() {
+		collection.fetchNext();
+
+		expect(fakeServer.requests.length).toEqual(1);
+		expect(fakeServer.requests[0].url).toEqual(
+			OC.generateUrl('apps/files_versions/ajax/getVersions.php') +
+			'?source=%2Fsubdir%2Fsome%20file.txt&start=0'
+		);
+		fakeServer.requests[0].respond(
+			200,
+			{ 'Content-Type': 'application/json' },
+			JSON.stringify({
+				status: 'success',
+				data: {
+					endReached: false,
+					versions: [{
+						version: 10000000,
+						size: 123,
+						name: 'some file.txt',
+						fullPath: '/subdir/some file.txt'
+					},{
+						version: 15000000,
+						size: 150,
+						name: 'some file.txt',
+						path: '/subdir/some file.txt'
+					}]
+				}
+			})
+		);
+
+		expect(collection.length).toEqual(2);
+		expect(collection.hasMoreResults()).toEqual(true);
+
+		collection.fetchNext();
+
+		expect(fakeServer.requests.length).toEqual(2);
+		expect(fakeServer.requests[1].url).toEqual(
+			OC.generateUrl('apps/files_versions/ajax/getVersions.php') +
+			'?source=%2Fsubdir%2Fsome%20file.txt&start=2'
+		);
+		fakeServer.requests[1].respond(
+			200,
+			{ 'Content-Type': 'application/json' },
+			JSON.stringify({
+				status: 'success',
+				data: {
+					endReached: true,
+					versions: [{
+						version: 18000000,
+						size: 123,
+						name: 'some file.txt',
+						path: '/subdir/some file.txt'
+					}]
+				}
+			})
+		);
+
+		expect(collection.length).toEqual(3);
+		expect(collection.hasMoreResults()).toEqual(false);
+
+		collection.fetchNext();
+
+		// no further requests
+		expect(fakeServer.requests.length).toEqual(2);
+	});
+	it('properly parses the results', function() {
+		collection.fetchNext();
+
+		expect(fakeServer.requests.length).toEqual(1);
+		expect(fakeServer.requests[0].url).toEqual(
+			OC.generateUrl('apps/files_versions/ajax/getVersions.php') +
+			'?source=%2Fsubdir%2Fsome%20file.txt&start=0'
+		);
+		fakeServer.requests[0].respond(
+			200,
+			{ 'Content-Type': 'application/json' },
+			JSON.stringify({
+				status: 'success',
+				data: {
+					endReached: false,
+					versions: [{
+						version: 10000000,
+						size: 123,
+						name: 'some file.txt',
+						path: '/subdir/some file.txt'
+					},{
+						version: 15000000,
+						size: 150,
+						name: 'some file.txt',
+						path: '/subdir/some file.txt'
+					}]
+				}
+			})
+		);
+
+		expect(collection.length).toEqual(2);
+
+		var model = collection.at(0);
+		expect(model.get('id')).toEqual(10000000);
+		expect(model.get('timestamp')).toEqual(10000000);
+		expect(model.get('name')).toEqual('some file.txt');
+		expect(model.get('fullPath')).toEqual('/subdir/some file.txt');
+		expect(model.get('size')).toEqual(123);
+
+		model = collection.at(1);
+		expect(model.get('id')).toEqual(15000000);
+		expect(model.get('timestamp')).toEqual(15000000);
+		expect(model.get('name')).toEqual('some file.txt');
+		expect(model.get('fullPath')).toEqual('/subdir/some file.txt');
+		expect(model.get('size')).toEqual(150);
+	});
+	it('resets page counted when setting a new file info model', function() {
+		collection.fetchNext();
+
+		expect(fakeServer.requests.length).toEqual(1);
+		fakeServer.requests[0].respond(
+			200,
+			{ 'Content-Type': 'application/json' },
+			JSON.stringify({
+				status: 'success',
+				data: {
+					endReached: true,
+					versions: [{
+						version: 18000000,
+						size: 123,
+						name: 'some file.txt',
+						path: '/subdir/some file.txt'
+					}]
+				}
+			})
+		);
+
+		expect(collection.hasMoreResults()).toEqual(false);
+
+		collection.setFileInfo(fileInfoModel);
+
+		expect(collection.hasMoreResults()).toEqual(true);
+	});
+});
+
diff --git a/apps/files_versions/tests/js/versionmodelSpec.js b/apps/files_versions/tests/js/versionmodelSpec.js
new file mode 100644
index 00000000000..0f1c06581d5
--- /dev/null
+++ b/apps/files_versions/tests/js/versionmodelSpec.js
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+describe('OCA.Versions.VersionModel', function() {
+	var VersionModel = OCA.Versions.VersionModel;
+	var model;
+
+	beforeEach(function() {
+		model = new VersionModel({
+			id: 10000000,
+			timestamp: 10000000,
+			fullPath: '/subdir/some file.txt',
+			name: 'some file.txt',
+			size: 150
+		});
+	});
+
+	it('returns the full path', function() {
+		expect(model.getFullPath()).toEqual('/subdir/some file.txt');
+	});
+	it('returns the preview url', function() {
+		expect(model.getPreviewUrl())
+			.toEqual(OC.generateUrl('/apps/files_versions/preview') +
+					'?file=%2Fsubdir%2Fsome%20file.txt&version=10000000'
+			);
+	});
+	it('returns the download url', function() {
+		expect(model.getDownloadUrl())
+			.toEqual(OC.generateUrl('/apps/files_versions/download.php') +
+					'?file=%2Fsubdir%2Fsome%20file.txt&revision=10000000'
+			);
+	});
+	describe('reverting', function() {
+		var revertEventStub;
+		var successStub;
+		var errorStub;
+
+		beforeEach(function() {
+			revertEventStub = sinon.stub();
+			errorStub = sinon.stub();
+			successStub = sinon.stub();
+
+			model.on('revert', revertEventStub);
+			model.on('error', errorStub);
+		});
+		it('tells the server to revert when calling the revert method', function() {
+			model.revert({
+				success: successStub
+			});
+
+			expect(fakeServer.requests.length).toEqual(1);
+			expect(fakeServer.requests[0].url)
+				.toEqual(
+					OC.generateUrl('/apps/files_versions/ajax/rollbackVersion.php') +
+					'?file=%2Fsubdir%2Fsome+file.txt&revision=10000000'
+				);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'success',
+				})
+			);
+
+			expect(revertEventStub.calledOnce).toEqual(true);
+			expect(successStub.calledOnce).toEqual(true);
+			expect(errorStub.notCalled).toEqual(true);
+		});
+		it('triggers error event when server returns a failure', function() {
+			model.revert({
+				success: successStub
+			});
+
+			expect(fakeServer.requests.length).toEqual(1);
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'error',
+				})
+			);
+
+			expect(revertEventStub.notCalled).toEqual(true);
+			expect(successStub.notCalled).toEqual(true);
+			expect(errorStub.calledOnce).toEqual(true);
+		});
+	});
+});
+
diff --git a/apps/files_versions/tests/js/versionstabviewSpec.js b/apps/files_versions/tests/js/versionstabviewSpec.js
new file mode 100644
index 00000000000..4435f38ef7e
--- /dev/null
+++ b/apps/files_versions/tests/js/versionstabviewSpec.js
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+describe('OCA.Versions.VersionsTabView', function() {
+	var VersionCollection = OCA.Versions.VersionCollection;
+	var VersionModel = OCA.Versions.VersionModel;
+	var VersionsTabView = OCA.Versions.VersionsTabView;
+
+	var fetchStub, fileInfoModel, tabView, testVersions, clock;
+
+	beforeEach(function() {
+		clock = sinon.useFakeTimers(Date.UTC(2015, 6, 17, 1, 2, 0, 3));
+		var time1 = Date.UTC(2015, 6, 17, 1, 2, 0, 3) / 1000;
+		var time2 = Date.UTC(2015, 6, 15, 1, 2, 0, 3) / 1000;
+
+		var version1 = new VersionModel({
+			id: time1,
+			timestamp: time1,
+			name: 'some file.txt',
+			size: 140,
+			fullPath: '/subdir/some file.txt'
+		});
+		var version2 = new VersionModel({
+			id: time2,
+			timestamp: time2,
+			name: 'some file.txt',
+			size: 150,
+			fullPath: '/subdir/some file.txt'
+		});
+
+		testVersions = [version1, version2];
+
+		fetchStub = sinon.stub(VersionCollection.prototype, 'fetch');
+		fileInfoModel = new OCA.Files.FileInfoModel({
+			id: 123,
+			name: 'test.txt'
+		});
+		tabView = new VersionsTabView();
+		tabView.render();
+	});
+
+	afterEach(function() {
+		fetchStub.restore();
+		tabView.remove();
+		clock.restore();
+	});
+
+	describe('rendering', function() {
+		it('reloads matching versions when setting file info model', function() {
+			tabView.setFileInfo(fileInfoModel);
+			expect(fetchStub.calledOnce).toEqual(true);
+		});
+
+		it('renders loading icon while fetching versions', function() {
+			tabView.setFileInfo(fileInfoModel);
+			tabView.collection.trigger('request');
+
+			expect(tabView.$el.find('.loading').length).toEqual(1);
+			expect(tabView.$el.find('.versions li').length).toEqual(0);
+		});
+
+		it('renders versions', function() {
+
+			tabView.setFileInfo(fileInfoModel);
+			tabView.collection.set(testVersions);
+
+			var version1 = testVersions[0];
+			var version2 = testVersions[1];
+			var $versions = tabView.$el.find('.versions>li');
+			expect($versions.length).toEqual(2);
+			var $item = $versions.eq(0);
+			expect($item.find('.downloadVersion').attr('href')).toEqual(version1.getDownloadUrl());
+			expect($item.find('.versiondate').text()).toEqual('a few seconds ago');
+			expect($item.find('.revertVersion').length).toEqual(1);
+			expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl());
+
+			$item = $versions.eq(1);
+			expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl());
+			expect($item.find('.versiondate').text()).toEqual('2 days ago');
+			expect($item.find('.revertVersion').length).toEqual(1);
+			expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl());
+		});
+	});
+
+	describe('More versions', function() {
+		var hasMoreResultsStub;
+
+		beforeEach(function() {
+			tabView.collection.set(testVersions);
+			hasMoreResultsStub = sinon.stub(VersionCollection.prototype, 'hasMoreResults');
+		});
+		afterEach(function() {
+			hasMoreResultsStub.restore();
+		});
+
+		it('shows "More versions" button when more versions are available', function() {
+			hasMoreResultsStub.returns(true);
+			tabView.collection.trigger('sync');
+
+			expect(tabView.$el.find('.showMoreVersions').hasClass('hidden')).toEqual(false);
+		});
+		it('does not show "More versions" button when more versions are available', function() {
+			hasMoreResultsStub.returns(false);
+			tabView.collection.trigger('sync');
+
+			expect(tabView.$el.find('.showMoreVersions').hasClass('hidden')).toEqual(true);
+		});
+		it('fetches and appends the next page when clicking the "More" button', function() {
+			hasMoreResultsStub.returns(true);
+
+			expect(fetchStub.notCalled).toEqual(true);
+
+			tabView.$el.find('.showMoreVersions').click();
+
+			expect(fetchStub.calledOnce).toEqual(true);
+		});
+		it('appends version to the list when added to collection', function() {
+			var time3 = Date.UTC(2015, 6, 10, 1, 0, 0, 0) / 1000;
+
+			var version3 = new VersionModel({
+				id: time3,
+				timestamp: time3,
+				name: 'some file.txt',
+				size: 54,
+				fullPath: '/subdir/some file.txt'
+			});
+
+			tabView.collection.add(version3);
+
+			expect(tabView.$el.find('.versions>li').length).toEqual(3);
+
+			var $item = tabView.$el.find('.versions>li').eq(2);
+			expect($item.find('.downloadVersion').attr('href')).toEqual(version3.getDownloadUrl());
+			expect($item.find('.versiondate').text()).toEqual('7 days ago');
+			expect($item.find('.revertVersion').length).toEqual(1);
+			expect($item.find('.preview').attr('src')).toEqual(version3.getPreviewUrl());
+		});
+	});
+
+	describe('Reverting', function() {
+		var revertStub;
+
+		beforeEach(function() {
+			revertStub = sinon.stub(VersionModel.prototype, 'revert');
+			tabView.setFileInfo(fileInfoModel);
+			tabView.collection.set(testVersions);
+		});
+		
+		afterEach(function() {
+			revertStub.restore();
+		});
+
+		it('tells the model to revert when clicking "Revert"', function() {
+			tabView.$el.find('.revertVersion').eq(1).click();
+
+			expect(revertStub.calledOnce).toEqual(true);
+		});
+		it('triggers busy state during revert', function() {
+			var busyStub = sinon.stub();
+			fileInfoModel.on('busy', busyStub);
+
+			tabView.$el.find('.revertVersion').eq(1).click();
+
+			expect(busyStub.calledOnce).toEqual(true);
+			expect(busyStub.calledWith(fileInfoModel, true)).toEqual(true);
+
+			busyStub.reset();
+			revertStub.getCall(0).args[0].success();
+
+			expect(busyStub.calledOnce).toEqual(true);
+			expect(busyStub.calledWith(fileInfoModel, false)).toEqual(true);
+		});
+		it('updates the file info model with the information from the reverted revision', function() {
+			var changeStub = sinon.stub();
+			fileInfoModel.on('change', changeStub);
+
+			tabView.$el.find('.revertVersion').eq(1).click();
+
+			expect(changeStub.notCalled).toEqual(true);
+
+			revertStub.getCall(0).args[0].success();
+
+			expect(changeStub.calledOnce).toEqual(true);
+			var changes = changeStub.getCall(0).args[0].changed;
+			expect(changes.size).toEqual(150);
+			expect(changes.mtime).toEqual(testVersions[1].get('timestamp') * 1000);
+			expect(changes.etag).toBeDefined();
+		});
+		it('shows notification on revert error', function() {
+			var notificationStub = sinon.stub(OC.Notification, 'showTemporary');
+
+			tabView.$el.find('.revertVersion').eq(1).click();
+
+			revertStub.getCall(0).args[0].error();
+
+			expect(notificationStub.calledOnce).toEqual(true);
+
+			notificationStub.restore();
+		});
+	});
+});
+
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 7b3877f7766..d3280b2939a 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -70,6 +70,16 @@ module.exports = function(config) {
 				],
 				testFiles: ['apps/files_external/tests/js/*.js']
 			},
+			{
+				name: 'files_versions',
+				srcFiles: [
+					// need to enforce loading order...
+					'apps/files_versions/js/versionmodel.js',
+					'apps/files_versions/js/versioncollection.js',
+					'apps/files_versions/js/versionstabview.js'
+				],
+				testFiles: ['apps/files_versions/tests/js/**/*.js']
+			},
 			{
 				name: 'settings',
 				srcFiles: [
-- 
GitLab


From 4100b151cc0a4e131a3eab3fbb7cd2b604f475e6 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 4 Sep 2015 01:55:31 -0400
Subject: [PATCH 164/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/cs_CZ.js       |  1 +
 apps/encryption/l10n/cs_CZ.json     |  1 +
 apps/encryption/l10n/th_TH.js       |  3 +++
 apps/encryption/l10n/th_TH.json     |  3 +++
 apps/files_external/l10n/cs_CZ.js   | 17 +++++++++++++++++
 apps/files_external/l10n/cs_CZ.json | 17 +++++++++++++++++
 apps/files_sharing/l10n/cs_CZ.js    |  1 -
 apps/files_sharing/l10n/cs_CZ.json  |  1 -
 apps/files_sharing/l10n/da.js       |  1 -
 apps/files_sharing/l10n/da.json     |  1 -
 apps/files_sharing/l10n/de.js       |  1 -
 apps/files_sharing/l10n/de.json     |  1 -
 apps/files_sharing/l10n/de_DE.js    |  1 -
 apps/files_sharing/l10n/de_DE.json  |  1 -
 apps/files_sharing/l10n/el.js       |  1 -
 apps/files_sharing/l10n/el.json     |  1 -
 apps/files_sharing/l10n/es.js       |  1 -
 apps/files_sharing/l10n/es.json     |  1 -
 apps/files_sharing/l10n/et_EE.js    |  1 -
 apps/files_sharing/l10n/et_EE.json  |  1 -
 apps/files_sharing/l10n/fi_FI.js    |  1 -
 apps/files_sharing/l10n/fi_FI.json  |  1 -
 apps/files_sharing/l10n/fr.js       |  1 -
 apps/files_sharing/l10n/fr.json     |  1 -
 apps/files_sharing/l10n/gl.js       |  1 -
 apps/files_sharing/l10n/gl.json     |  1 -
 apps/files_sharing/l10n/hu_HU.js    |  1 -
 apps/files_sharing/l10n/hu_HU.json  |  1 -
 apps/files_sharing/l10n/id.js       |  1 -
 apps/files_sharing/l10n/id.json     |  1 -
 apps/files_sharing/l10n/it.js       |  1 -
 apps/files_sharing/l10n/it.json     |  1 -
 apps/files_sharing/l10n/ja.js       |  1 -
 apps/files_sharing/l10n/ja.json     |  1 -
 apps/files_sharing/l10n/ko.js       |  1 -
 apps/files_sharing/l10n/ko.json     |  1 -
 apps/files_sharing/l10n/nb_NO.js    |  1 -
 apps/files_sharing/l10n/nb_NO.json  |  1 -
 apps/files_sharing/l10n/nl.js       |  1 -
 apps/files_sharing/l10n/nl.json     |  1 -
 apps/files_sharing/l10n/pt_BR.js    |  1 -
 apps/files_sharing/l10n/pt_BR.json  |  1 -
 apps/files_sharing/l10n/ru.js       |  1 -
 apps/files_sharing/l10n/ru.json     |  1 -
 apps/files_sharing/l10n/sk_SK.js    |  1 -
 apps/files_sharing/l10n/sk_SK.json  |  1 -
 apps/files_sharing/l10n/th_TH.js    |  1 -
 apps/files_sharing/l10n/th_TH.json  |  1 -
 apps/files_sharing/l10n/tr.js       |  1 -
 apps/files_sharing/l10n/tr.json     |  1 -
 apps/files_sharing/l10n/uk.js       |  1 -
 apps/files_sharing/l10n/uk.json     |  1 -
 core/l10n/af_ZA.js                  |  1 +
 core/l10n/af_ZA.json                |  1 +
 core/l10n/bg_BG.js                  |  1 +
 core/l10n/bg_BG.json                |  1 +
 core/l10n/ca.js                     |  1 +
 core/l10n/ca.json                   |  1 +
 core/l10n/cs_CZ.js                  |  3 +++
 core/l10n/cs_CZ.json                |  3 +++
 core/l10n/cy_GB.js                  |  1 +
 core/l10n/cy_GB.json                |  1 +
 core/l10n/da.js                     |  1 +
 core/l10n/da.json                   |  1 +
 core/l10n/de.js                     |  1 +
 core/l10n/de.json                   |  1 +
 core/l10n/el.js                     |  1 +
 core/l10n/el.json                   |  1 +
 core/l10n/eo.js                     |  1 +
 core/l10n/eo.json                   |  1 +
 core/l10n/es_AR.js                  |  1 +
 core/l10n/es_AR.json                |  1 +
 core/l10n/et_EE.js                  |  1 +
 core/l10n/et_EE.json                |  1 +
 core/l10n/eu.js                     |  1 +
 core/l10n/eu.json                   |  1 +
 core/l10n/fi_FI.js                  |  1 +
 core/l10n/fi_FI.json                |  1 +
 core/l10n/gl.js                     |  1 +
 core/l10n/gl.json                   |  1 +
 core/l10n/he.js                     |  1 +
 core/l10n/he.json                   |  1 +
 core/l10n/hr.js                     |  1 +
 core/l10n/hr.json                   |  1 +
 core/l10n/hu_HU.js                  |  1 +
 core/l10n/hu_HU.json                |  1 +
 core/l10n/is.js                     |  1 +
 core/l10n/is.json                   |  1 +
 core/l10n/ja.js                     |  1 +
 core/l10n/ja.json                   |  1 +
 core/l10n/ka_GE.js                  |  1 +
 core/l10n/ka_GE.json                |  1 +
 core/l10n/lb.js                     |  1 +
 core/l10n/lb.json                   |  1 +
 core/l10n/lt_LT.js                  |  1 +
 core/l10n/lt_LT.json                |  1 +
 core/l10n/lv.js                     |  1 +
 core/l10n/lv.json                   |  1 +
 core/l10n/mk.js                     |  1 +
 core/l10n/mk.json                   |  1 +
 core/l10n/pl.js                     |  1 +
 core/l10n/pl.json                   |  1 +
 core/l10n/pt_BR.js                  |  1 +
 core/l10n/pt_BR.json                |  1 +
 core/l10n/pt_PT.js                  |  1 +
 core/l10n/pt_PT.json                |  1 +
 core/l10n/si_LK.js                  |  1 +
 core/l10n/si_LK.json                |  1 +
 core/l10n/sk_SK.js                  |  1 +
 core/l10n/sk_SK.json                |  1 +
 core/l10n/sv.js                     |  1 +
 core/l10n/sv.json                   |  1 +
 core/l10n/ta_LK.js                  |  1 +
 core/l10n/ta_LK.json                |  1 +
 core/l10n/th_TH.js                  |  1 +
 core/l10n/th_TH.json                |  1 +
 core/l10n/tr.js                     |  1 +
 core/l10n/tr.json                   |  1 +
 core/l10n/uk.js                     |  1 +
 core/l10n/uk.json                   |  1 +
 core/l10n/vi.js                     |  1 +
 core/l10n/vi.json                   |  1 +
 core/l10n/zh_CN.js                  |  1 +
 core/l10n/zh_CN.json                |  1 +
 core/l10n/zh_HK.js                  |  1 +
 core/l10n/zh_HK.json                |  1 +
 lib/l10n/cs_CZ.js                   |  1 +
 lib/l10n/cs_CZ.json                 |  1 +
 settings/l10n/fa.js                 |  3 +++
 settings/l10n/fa.json               |  3 +++
 130 files changed, 128 insertions(+), 46 deletions(-)

diff --git a/apps/encryption/l10n/cs_CZ.js b/apps/encryption/l10n/cs_CZ.js
index e9477dd54db..661731c31d3 100644
--- a/apps/encryption/l10n/cs_CZ.js
+++ b/apps/encryption/l10n/cs_CZ.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
     "Encryption App is enabled and ready" : "Aplikace šifrování je již povolena",
+    "one-time password for server-side-encryption" : "jednorázové heslo pro šifrování na straně serveru",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.",
     "The share will expire on %s." : "Sdílení vyprší %s.",
diff --git a/apps/encryption/l10n/cs_CZ.json b/apps/encryption/l10n/cs_CZ.json
index ed75239894e..1b530d137ed 100644
--- a/apps/encryption/l10n/cs_CZ.json
+++ b/apps/encryption/l10n/cs_CZ.json
@@ -23,6 +23,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
     "Encryption App is enabled and ready" : "Aplikace šifrování je již povolena",
+    "one-time password for server-side-encryption" : "jednorázové heslo pro šifrování na straně serveru",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.",
     "The share will expire on %s." : "Sdílení vyprší %s.",
diff --git a/apps/encryption/l10n/th_TH.js b/apps/encryption/l10n/th_TH.js
index 82db7a6e8b3..3c4a5d696fa 100644
--- a/apps/encryption/l10n/th_TH.js
+++ b/apps/encryption/l10n/th_TH.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "รหัสส่วนตัวไม่ถูกต้องสำหรับการเข้ารหัสแอพฯ กรุณาอัพเดทรหัสการเข้ารหัสผ่านส่วนตัวของคุณในการตั้งค่าส่วนบุคคลและในการกู้คืนการเข้าถึงไฟล์ที่มีการเข้ารหัสของคุณ",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "การเข้ารหัสแอพฯ ถูกเปิดใช้งานแต่รหัสของคุณยังไม่ได้เริ่มต้นใช้ โปรดออกและเข้าสู่ระบบอีกครั้ง",
     "Encryption App is enabled and ready" : "เข้ารหัสแอพถูกเปิดใช้งานและพร้อมทำงาน",
+    "one-time password for server-side-encryption" : "รหัสผ่านเพียงครั้งเดียว สำหรับเข้ารหัสฝั่งเซิร์ฟเวอร์",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถถอดรหัสไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาถามเจ้าของไฟล์เพื่อยกเลิกการใช้งานร่วมกัน ",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถอ่านไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาสอบถามเจ้าของไฟล์เพื่อแชร์ไฟล์กับคุณ",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "นี่คุณ<br>\n<br> \nผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong><br>\n<br>\nกรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br>\n<br>\n",
     "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s",
     "Cheers!" : "ไชโย!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "นี่คุณ <br><br> ผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong> <br><br>กรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br><br>",
     "Enable recovery key" : "เปิดใช้งานการกู้คืนรหัส",
     "Disable recovery key" : "ปิดใช้งานรหัสการกู้คืนรหัส",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "รหัสการกู้คืนเป็นการเข้ารหัสลับพิเศษจะใช้ในการเข้ารหัสไฟล์ มันจะช่วยเรื่องการกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่าน",
diff --git a/apps/encryption/l10n/th_TH.json b/apps/encryption/l10n/th_TH.json
index 11fd75b87e1..b69cdb8a871 100644
--- a/apps/encryption/l10n/th_TH.json
+++ b/apps/encryption/l10n/th_TH.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "รหัสส่วนตัวไม่ถูกต้องสำหรับการเข้ารหัสแอพฯ กรุณาอัพเดทรหัสการเข้ารหัสผ่านส่วนตัวของคุณในการตั้งค่าส่วนบุคคลและในการกู้คืนการเข้าถึงไฟล์ที่มีการเข้ารหัสของคุณ",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "การเข้ารหัสแอพฯ ถูกเปิดใช้งานแต่รหัสของคุณยังไม่ได้เริ่มต้นใช้ โปรดออกและเข้าสู่ระบบอีกครั้ง",
     "Encryption App is enabled and ready" : "เข้ารหัสแอพถูกเปิดใช้งานและพร้อมทำงาน",
+    "one-time password for server-side-encryption" : "รหัสผ่านเพียงครั้งเดียว สำหรับเข้ารหัสฝั่งเซิร์ฟเวอร์",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถถอดรหัสไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาถามเจ้าของไฟล์เพื่อยกเลิกการใช้งานร่วมกัน ",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถอ่านไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาสอบถามเจ้าของไฟล์เพื่อแชร์ไฟล์กับคุณ",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "นี่คุณ<br>\n<br> \nผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong><br>\n<br>\nกรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br>\n<br>\n",
     "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s",
     "Cheers!" : "ไชโย!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "นี่คุณ <br><br> ผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong> <br><br>กรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br><br>",
     "Enable recovery key" : "เปิดใช้งานการกู้คืนรหัส",
     "Disable recovery key" : "ปิดใช้งานรหัสการกู้คืนรหัส",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "รหัสการกู้คืนเป็นการเข้ารหัสลับพิเศษจะใช้ในการเข้ารหัสไฟล์ มันจะช่วยเรื่องการกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่าน",
diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
index b39eef71eaa..ab352880b7c 100644
--- a/apps/files_external/l10n/cs_CZ.js
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Please provide a valid app key and secret." : "Zadejte prosím platný klíč a tajné heslo aplikace.",
     "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s",
     "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s",
     "External storage" : "Externí úložiště",
@@ -22,12 +25,15 @@ OC.L10N.register(
     "SFTP with secret key login" : "SFTP login s tajným klíčem",
     "Public key" : "Veřejný klíč",
     "Storage with id \"%i\" not found" : "Úložiště s id \"%i\" nebylo nalezeno",
+    "Invalid backend or authentication mechanism class" : "Neplatný backend nebo třída ověřovacího mechanismu",
     "Invalid mount point" : "Neplatný přípojný bod",
     "Invalid storage backend \"%s\"" : "Neplatná služba úložiště \"%s\"",
     "Personal" : "Osobní",
     "System" : "Systém",
     "Grant access" : "Povolit přístup",
     "Access granted" : "Přístup povolen",
+    "Error configuring OAuth1" : "Chyba nastavení OAuth1",
+    "Error configuring OAuth2" : "Chyba nastavení OAuth2",
     "Enable encryption" : "Povolit šifrování",
     "Enable previews" : "Povolit náhledy",
     "Check for changes" : "Zkontrolovat změny",
@@ -39,12 +45,18 @@ OC.L10N.register(
     "Saved" : "Uloženo",
     "Generate keys" : "Vytvořit klíče",
     "Error generating key pair" : "Chyba při vytváření páru klíčů",
+    "Access key" : "Přístupový klíč",
+    "Secret key" : "Tajný klíč",
     "None" : "Žádné",
+    "OAuth1" : "OAuth1",
     "App key" : "Klíč aplikace",
     "App secret" : "Tajemství aplikace",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Klientské ID",
     "Client secret" : "Klientské tajemství",
+    "Username and password" : "Uživatelské jméno a heslo",
     "Password" : "Heslo",
+    "Session credentials" : "Přihlašovací údaje sezení",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Hostname",
     "Port" : "Port",
@@ -55,11 +67,15 @@ OC.L10N.register(
     "URL" : "URL",
     "Secure https://" : "Zabezpečené https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Zabezpečené ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Místní",
     "Location" : "Umístění",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Kořen",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
@@ -71,6 +87,7 @@ OC.L10N.register(
     "Scope" : "Rozsah",
     "External Storage" : "Externí úložiště",
     "Folder name" : "Název složky",
+    "Authentication" : "Ověření",
     "Configuration" : "Nastavení",
     "Available for" : "Dostupné pro",
     "Advanced settings" : "Pokročilá nastavení",
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
index c014da7976f..03afeb48b8e 100644
--- a/apps/files_external/l10n/cs_CZ.json
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Please provide a valid app key and secret." : "Zadejte prosím platný klíč a tajné heslo aplikace.",
     "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s",
     "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s",
     "External storage" : "Externí úložiště",
@@ -20,12 +23,15 @@
     "SFTP with secret key login" : "SFTP login s tajným klíčem",
     "Public key" : "Veřejný klíč",
     "Storage with id \"%i\" not found" : "Úložiště s id \"%i\" nebylo nalezeno",
+    "Invalid backend or authentication mechanism class" : "Neplatný backend nebo třída ověřovacího mechanismu",
     "Invalid mount point" : "Neplatný přípojný bod",
     "Invalid storage backend \"%s\"" : "Neplatná služba úložiště \"%s\"",
     "Personal" : "Osobní",
     "System" : "Systém",
     "Grant access" : "Povolit přístup",
     "Access granted" : "Přístup povolen",
+    "Error configuring OAuth1" : "Chyba nastavení OAuth1",
+    "Error configuring OAuth2" : "Chyba nastavení OAuth2",
     "Enable encryption" : "Povolit šifrování",
     "Enable previews" : "Povolit náhledy",
     "Check for changes" : "Zkontrolovat změny",
@@ -37,12 +43,18 @@
     "Saved" : "Uloženo",
     "Generate keys" : "Vytvořit klíče",
     "Error generating key pair" : "Chyba při vytváření páru klíčů",
+    "Access key" : "Přístupový klíč",
+    "Secret key" : "Tajný klíč",
     "None" : "Žádné",
+    "OAuth1" : "OAuth1",
     "App key" : "Klíč aplikace",
     "App secret" : "Tajemství aplikace",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Klientské ID",
     "Client secret" : "Klientské tajemství",
+    "Username and password" : "Uživatelské jméno a heslo",
     "Password" : "Heslo",
+    "Session credentials" : "Přihlašovací údaje sezení",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Hostname",
     "Port" : "Port",
@@ -53,11 +65,15 @@
     "URL" : "URL",
     "Secure https://" : "Zabezpečené https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "Zabezpečené ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Místní",
     "Location" : "Umístění",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Kořen",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
@@ -69,6 +85,7 @@
     "Scope" : "Rozsah",
     "External Storage" : "Externí úložiště",
     "Folder name" : "Název složky",
+    "Authentication" : "Ověření",
     "Configuration" : "Nastavení",
     "Available for" : "Dostupné pro",
     "Advanced settings" : "Pokročilá nastavení",
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index 7051d9e56db..551a6ef4a00 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Sdružený cloud",
     "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:",
     "Share it:" : "Sdílet:",
-    "Add it to your website:" : "Přidat na svou webovou stránku:",
     "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud",
     "HTML Code:" : "HTML kód:"
 },
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index c93886aa33c..065ab460158 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Sdružený cloud",
     "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:",
     "Share it:" : "Sdílet:",
-    "Add it to your website:" : "Přidat na svou webovou stránku:",
     "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud",
     "HTML Code:" : "HTML kód:"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index 7e05b2ca442..b08b09f4284 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Din Federated Cloud ID:",
     "Share it:" : "Del:",
-    "Add it to your website:" : "Tilføj den til din hjemmeside:",
     "Share with me via ownCloud" : "Del med mig gennem ownCloud",
     "HTML Code:" : "HTMLkode:"
 },
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index d08dbdc4273..5cd51acafc6 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Din Federated Cloud ID:",
     "Share it:" : "Del:",
-    "Add it to your website:" : "Tilføj den til din hjemmeside:",
     "Share with me via ownCloud" : "Del med mig gennem ownCloud",
     "HTML Code:" : "HTMLkode:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index f6dcf690b60..afe6cae62eb 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
     "Share it:" : "Zum Teilen:",
-    "Add it to your website:" : "Zum Hinzufügen zu Deiner Website:",
     "Share with me via ownCloud" : "Teile mit mir über ownCloud",
     "HTML Code:" : "HTML-Code:"
 },
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 76f9b6d1155..17f2b6252b8 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
     "Share it:" : "Zum Teilen:",
-    "Add it to your website:" : "Zum Hinzufügen zu Deiner Website:",
     "Share with me via ownCloud" : "Teile mit mir über ownCloud",
     "HTML Code:" : "HTML-Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 3c1eccd4607..395dbf4f295 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:",
     "Share it:" : "Zum Teilen:",
-    "Add it to your website:" : "Zum Hinzufügen zu Ihrer Website:",
     "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud",
     "HTML Code:" : "HTML-Code:"
 },
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 08732c602ec..11b953b3bac 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:",
     "Share it:" : "Zum Teilen:",
-    "Add it to your website:" : "Zum Hinzufügen zu Ihrer Website:",
     "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud",
     "HTML Code:" : "HTML-Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 6a88a675f75..a72abe23b7f 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Federated σύννεφο",
     "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:",
     "Share it:" : "Μοιραστείτε το:",
-    "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:",
     "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ",
     "HTML Code:" : "Κώδικας HTML:"
 },
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index 01b4e6d01b8..7b2b9848a72 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Federated σύννεφο",
     "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:",
     "Share it:" : "Μοιραστείτε το:",
-    "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:",
     "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ",
     "HTML Code:" : "Κώδικας HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index 7e5e48bbf78..e094507d396 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Nube Federada",
     "Your Federated Cloud ID:" : "Su ID Nube Federada:",
     "Share it:" : "Compartir:",
-    "Add it to your website:" : "Agregarlo a su sitio de internet:",
     "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index 358330b80ac..48f1f22a1fd 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Nube Federada",
     "Your Federated Cloud ID:" : "Su ID Nube Federada:",
     "Share it:" : "Compartir:",
-    "Add it to your website:" : "Agregarlo a su sitio de internet:",
     "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js
index 535608ad511..a558a91896a 100644
--- a/apps/files_sharing/l10n/et_EE.js
+++ b/apps/files_sharing/l10n/et_EE.js
@@ -47,7 +47,6 @@ OC.L10N.register(
     "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse",
     "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest",
     "Share it:" : "Jaga seda:",
-    "Add it to your website:" : "Lisa see oma veebisaidile:",
     "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga",
     "HTML Code:" : "HTML kood:"
 },
diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json
index f894b06fc9e..183f1707525 100644
--- a/apps/files_sharing/l10n/et_EE.json
+++ b/apps/files_sharing/l10n/et_EE.json
@@ -45,7 +45,6 @@
     "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse",
     "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest",
     "Share it:" : "Jaga seda:",
-    "Add it to your website:" : "Lisa see oma veebisaidile:",
     "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga",
     "HTML Code:" : "HTML kood:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index 6ef1f741f6d..0de3dda9290 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Federoitu pilvi",
     "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:",
     "Share it:" : "Jaa se:",
-    "Add it to your website:" : "Lisää verkkosivustollesi:",
     "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta",
     "HTML Code:" : "HTML-koodi:"
 },
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index dfb9afb5a8b..80e353818cd 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Federoitu pilvi",
     "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:",
     "Share it:" : "Jaa se:",
-    "Add it to your website:" : "Lisää verkkosivustollesi:",
     "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta",
     "HTML Code:" : "HTML-koodi:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index e07b93c788b..077c12e6db2 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :",
     "Share it:" : "Partager :",
-    "Add it to your website:" : "Ajouter à votre site web :",
     "Share with me via ownCloud" : "Partagez avec moi via ownCloud",
     "HTML Code:" : "Code HTML :"
 },
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index e597d3100b4..c4b3bbe2f72 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :",
     "Share it:" : "Partager :",
-    "Add it to your website:" : "Ajouter à votre site web :",
     "Share with me via ownCloud" : "Partagez avec moi via ownCloud",
     "HTML Code:" : "Code HTML :"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js
index 0e279172124..44dfaa52de2 100644
--- a/apps/files_sharing/l10n/gl.js
+++ b/apps/files_sharing/l10n/gl.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Nube federada",
     "Your Federated Cloud ID:" : "ID da súa nube federada:",
     "Share it:" : "Compártao:",
-    "Add it to your website:" : "Engádao o seu sitio web:",
     "Share with me via ownCloud" : "Comparte comigo a través do ownCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json
index b4757ca2b2b..a9109c5000c 100644
--- a/apps/files_sharing/l10n/gl.json
+++ b/apps/files_sharing/l10n/gl.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Nube federada",
     "Your Federated Cloud ID:" : "ID da súa nube federada:",
     "Share it:" : "Compártao:",
-    "Add it to your website:" : "Engádao o seu sitio web:",
     "Share with me via ownCloud" : "Comparte comigo a través do ownCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index b374be1c317..3278343a769 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Egyesített felhő",
     "Your Federated Cloud ID:" : "Egyesített felhő azonosító:",
     "Share it:" : "Ossza meg:",
-    "Add it to your website:" : "Adja hozzá a saját weboldalához:",
     "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül",
     "HTML Code:" : "HTML Code:"
 },
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index f140b98a57c..edb98a5f70b 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Egyesített felhő",
     "Your Federated Cloud ID:" : "Egyesített felhő azonosító:",
     "Share it:" : "Ossza meg:",
-    "Add it to your website:" : "Adja hozzá a saját weboldalához:",
     "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül",
     "HTML Code:" : "HTML Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index 60b460da8e8..985b424e726 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Federated Cloud ID Anda:",
     "Share it:" : "Bagikan:",
-    "Add it to your website:" : "Tambahkan ke situs web Anda:",
     "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud",
     "HTML Code:" : "Kode HTML:"
 },
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index c4ea5a5c56d..78f5d2352a7 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Federated Cloud ID Anda:",
     "Share it:" : "Bagikan:",
-    "Add it to your website:" : "Tambahkan ke situs web Anda:",
     "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud",
     "HTML Code:" : "Kode HTML:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 8f89da9484d..0d8a315421f 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Cloud federata",
     "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:",
     "Share it:" : "Condividilo:",
-    "Add it to your website:" : "Aggiungilo al tuo sito web:",
     "Share with me via ownCloud" : "Condividi con me tramite ownCloud",
     "HTML Code:" : "Codice HTML:"
 },
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index cad5b0c7db0..dd41b95eab7 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Cloud federata",
     "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:",
     "Share it:" : "Condividilo:",
-    "Add it to your website:" : "Aggiungilo al tuo sito web:",
     "Share with me via ownCloud" : "Condividi con me tramite ownCloud",
     "HTML Code:" : "Codice HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index 73174dfeb84..0fa2f3c8d0f 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "クラウド連携",
     "Your Federated Cloud ID:" : "あなたのクラウド連携ID：",
     "Share it:" : "以下で共有:",
-    "Add it to your website:" : "ウェブサイトに追加:",
     "Share with me via ownCloud" : "OwnCloud経由で共有",
     "HTML Code:" : "HTMLコード:"
 },
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index 79cd4f0bc36..88b94fb5ed7 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "クラウド連携",
     "Your Federated Cloud ID:" : "あなたのクラウド連携ID：",
     "Share it:" : "以下で共有:",
-    "Add it to your website:" : "ウェブサイトに追加:",
     "Share with me via ownCloud" : "OwnCloud経由で共有",
     "HTML Code:" : "HTMLコード:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js
index 638f750b2ef..646a57f7853 100644
--- a/apps/files_sharing/l10n/ko.js
+++ b/apps/files_sharing/l10n/ko.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "연합 클라우드",
     "Your Federated Cloud ID:" : "내 연합 클라우드 ID:",
     "Share it:" : "공유하기:",
-    "Add it to your website:" : "웹 사이트에 다음을 추가하십시오:",
     "Share with me via ownCloud" : "ownCloud로 나와 공유하기",
     "HTML Code:" : "HTML 코드:"
 },
diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json
index 36d69b0f763..4d322770b1a 100644
--- a/apps/files_sharing/l10n/ko.json
+++ b/apps/files_sharing/l10n/ko.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "연합 클라우드",
     "Your Federated Cloud ID:" : "내 연합 클라우드 ID:",
     "Share it:" : "공유하기:",
-    "Add it to your website:" : "웹 사이트에 다음을 추가하십시오:",
     "Share with me via ownCloud" : "ownCloud로 나와 공유하기",
     "HTML Code:" : "HTML 코드:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index 4b76dab034c..65b13acaf53 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Sammenknyttet sky",
     "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:",
     "Share it:" : "Del den:",
-    "Add it to your website:" : "Legg den på websiden din:",
     "Share with me via ownCloud" : "Del med meg via ownCloud",
     "HTML Code:" : "HTML-kode:"
 },
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index c466d22e3de..4fe4ee008be 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Sammenknyttet sky",
     "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:",
     "Share it:" : "Del den:",
-    "Add it to your website:" : "Legg den på websiden din:",
     "Share with me via ownCloud" : "Del med meg via ownCloud",
     "HTML Code:" : "HTML-kode:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index f2541545680..e20f0fd868d 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Gefedereerde Cloud",
     "Your Federated Cloud ID:" : "Uw Federated Cloud ID:",
     "Share it:" : "Deel het:",
-    "Add it to your website:" : "Voeg het toe aan uw website:",
     "Share with me via ownCloud" : "Deel met mij via ownCloud",
     "HTML Code:" : "HTML Code:"
 },
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index 193f787b835..accdcefd74b 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Gefedereerde Cloud",
     "Your Federated Cloud ID:" : "Uw Federated Cloud ID:",
     "Share it:" : "Deel het:",
-    "Add it to your website:" : "Voeg het toe aan uw website:",
     "Share with me via ownCloud" : "Deel met mij via ownCloud",
     "HTML Code:" : "HTML Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index d8b3bc9e81e..2f4e9e9e652 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Nuvem Conglomerada",
     "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:",
     "Share it:" : "Compartilhe:",
-    "Add it to your website:" : "Adicione ao seu site:",
     "Share with me via ownCloud" : "Compartilhe comigo via ownCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 80d75ebd647..fd64260a419 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Nuvem Conglomerada",
     "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:",
     "Share it:" : "Compartilhe:",
-    "Add it to your website:" : "Adicione ao seu site:",
     "Share with me via ownCloud" : "Compartilhe comigo via ownCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index df1ee8603b4..66ef69cac61 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Объединение облачных хранилищ",
     "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:",
     "Share it:" : "Поделись этим:",
-    "Add it to your website:" : "Добавь это на свой сайт:",
     "Share with me via ownCloud" : "Поделитесь мной через ownCloud",
     "HTML Code:" : "HTML код:"
 },
diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json
index d533d01cb01..e4fccaf0800 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Объединение облачных хранилищ",
     "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:",
     "Share it:" : "Поделись этим:",
-    "Add it to your website:" : "Добавь это на свой сайт:",
     "Share with me via ownCloud" : "Поделитесь мной через ownCloud",
     "HTML Code:" : "HTML код:"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js
index cfefda0ba8c..e4ff1b4e1c5 100644
--- a/apps/files_sharing/l10n/sk_SK.js
+++ b/apps/files_sharing/l10n/sk_SK.js
@@ -65,7 +65,6 @@ OC.L10N.register(
     "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov",
     "Your Federated Cloud ID:" : "Vaše združené Cloud ID",
     "Share it:" : "Zdieľať:",
-    "Add it to your website:" : "Pridať na svoju webstránku:",
     "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud",
     "HTML Code:" : "HTML kód:"
 },
diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json
index f9b51d1dd76..ce516ae314c 100644
--- a/apps/files_sharing/l10n/sk_SK.json
+++ b/apps/files_sharing/l10n/sk_SK.json
@@ -63,7 +63,6 @@
     "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov",
     "Your Federated Cloud ID:" : "Vaše združené Cloud ID",
     "Share it:" : "Zdieľať:",
-    "Add it to your website:" : "Pridať na svoju webstránku:",
     "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud",
     "HTML Code:" : "HTML kód:"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
index 86175f5a627..be9a353ffd9 100644
--- a/apps/files_sharing/l10n/th_TH.js
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "สหพันธ์คลาวด์",
     "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:",
     "Share it:" : "แชร์มัน:",
-    "Add it to your website:" : "เพิ่มไปยังเว็บไซต์ของคุณ:",
     "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud",
     "HTML Code:" : "โค้ด HTML:"
 },
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
index 5704a59336c..6984d7275d9 100644
--- a/apps/files_sharing/l10n/th_TH.json
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "สหพันธ์คลาวด์",
     "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:",
     "Share it:" : "แชร์มัน:",
-    "Add it to your website:" : "เพิ่มไปยังเว็บไซต์ของคุณ:",
     "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud",
     "HTML Code:" : "โค้ด HTML:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index ce96af88e1e..9e14e0187cd 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Federated Cloud" : "Birleşmiş Bulut",
     "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:",
     "Share it:" : "Paylaşın:",
-    "Add it to your website:" : "Web sitenize ekleyin:",
     "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı",
     "HTML Code:" : "HTML Kodu:"
 },
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index 8705219ab2e..b11d5be2fd7 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -64,7 +64,6 @@
     "Federated Cloud" : "Birleşmiş Bulut",
     "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:",
     "Share it:" : "Paylaşın:",
-    "Add it to your website:" : "Web sitenize ekleyin:",
     "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı",
     "HTML Code:" : "HTML Kodu:"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js
index 37c838b6aa4..80c28c8a936 100644
--- a/apps/files_sharing/l10n/uk.js
+++ b/apps/files_sharing/l10n/uk.js
@@ -61,7 +61,6 @@ OC.L10N.register(
     "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах",
     "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів",
     "Share it:" : "Поділитися цим:",
-    "Add it to your website:" : "Додати до вашого сайту:",
     "HTML Code:" : "HTML код:"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json
index b062a761fbb..0b5de75ac5a 100644
--- a/apps/files_sharing/l10n/uk.json
+++ b/apps/files_sharing/l10n/uk.json
@@ -59,7 +59,6 @@
     "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах",
     "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів",
     "Share it:" : "Поділитися цим:",
-    "Add it to your website:" : "Додати до вашого сайту:",
     "HTML Code:" : "HTML код:"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
index 7c95b0a0db4..a6f0448d1a5 100644
--- a/core/l10n/af_ZA.js
+++ b/core/l10n/af_ZA.js
@@ -109,6 +109,7 @@ OC.L10N.register(
     "Database host" : "Databasis gasheer",
     "Finish setup" : "Maak opstelling klaar",
     "Log out" : "Teken uit",
+    "Log in" : "Teken aan",
     "remember" : "onthou",
     "Alternative Logins" : "Alternatiewe aantekeninge",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
index a040afc6962..d5b747b5a32 100644
--- a/core/l10n/af_ZA.json
+++ b/core/l10n/af_ZA.json
@@ -107,6 +107,7 @@
     "Database host" : "Databasis gasheer",
     "Finish setup" : "Maak opstelling klaar",
     "Log out" : "Teken uit",
+    "Log in" : "Teken aan",
     "remember" : "onthou",
     "Alternative Logins" : "Alternatiewe aantekeninge",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
index 52fdcccf13b..e7914ca5714 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -211,6 +211,7 @@ OC.L10N.register(
     "Search" : "Търсене",
     "Server side authentication failed!" : "Удостоверяването от страна на сървъра е неуспешно!",
     "Please contact your administrator." : "Моля, свържете се с администратора.",
+    "Log in" : "Вписване",
     "remember" : "запомняне",
     "Alternative Logins" : "Алтернативни методи на вписване",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index 0d8b4a21a19..271cb44435b 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -209,6 +209,7 @@
     "Search" : "Търсене",
     "Server side authentication failed!" : "Удостоверяването от страна на сървъра е неуспешно!",
     "Please contact your administrator." : "Моля, свържете се с администратора.",
+    "Log in" : "Вписване",
     "remember" : "запомняне",
     "Alternative Logins" : "Алтернативни методи на вписване",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.",
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index a3133be76eb..1fa4f12a3e3 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -245,6 +245,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Contacteu amb l'administrador.",
     "An internal error occured." : "S'ha produït un error intern.",
     "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.",
+    "Log in" : "Inici de sessió",
     "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?",
     "remember" : "recorda'm",
     "Alternative Logins" : "Acreditacions alternatives",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index 8af4766eaa1..55962a25362 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -243,6 +243,7 @@
     "Please contact your administrator." : "Contacteu amb l'administrador.",
     "An internal error occured." : "S'ha produït un error intern.",
     "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.",
+    "Log in" : "Inici de sessió",
     "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?",
     "remember" : "recorda'm",
     "Alternative Logins" : "Acreditacions alternatives",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 8d57e0e76c0..54ed40e9a5b 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Nebylo možné odeslat email následujícím uživatelům: %s",
+    "Preparing update" : "Příprava na aktualizaci",
     "Turned on maintenance mode" : "Zapnut režim údržby",
     "Turned off maintenance mode" : "Vypnut režim údržby",
     "Maintenance mode is kept active" : "Mód údržby je aktivní",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Chyba opravy:",
     "Following incompatible apps have been disabled: %s" : "Následující nekompatibilní aplikace byly zakázány: %s",
     "Following apps have been disabled: %s" : "Následující aplikace byly vypnuty: %s",
+    "Already up to date" : "Je již aktuální",
     "File is too big" : "Soubor je příliš velký",
     "Invalid file provided" : "Zadán neplatný soubor",
     "No image or file provided" : "Soubor nebo obrázek nebyl zadán",
@@ -244,6 +246,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Kontaktujte prosím svého správce systému.",
     "An internal error occured." : "Nastala vnitřní chyba.",
     "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.",
+    "Log in" : "Přihlásit",
     "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?",
     "remember" : "zapamatovat",
     "Alternative Logins" : "Alternativní přihlášení",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index e9f52cfa46d..da343b7791a 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Nebylo možné odeslat email následujícím uživatelům: %s",
+    "Preparing update" : "Příprava na aktualizaci",
     "Turned on maintenance mode" : "Zapnut režim údržby",
     "Turned off maintenance mode" : "Vypnut režim údržby",
     "Maintenance mode is kept active" : "Mód údržby je aktivní",
@@ -11,6 +12,7 @@
     "Repair error: " : "Chyba opravy:",
     "Following incompatible apps have been disabled: %s" : "Následující nekompatibilní aplikace byly zakázány: %s",
     "Following apps have been disabled: %s" : "Následující aplikace byly vypnuty: %s",
+    "Already up to date" : "Je již aktuální",
     "File is too big" : "Soubor je příliš velký",
     "Invalid file provided" : "Zadán neplatný soubor",
     "No image or file provided" : "Soubor nebo obrázek nebyl zadán",
@@ -242,6 +244,7 @@
     "Please contact your administrator." : "Kontaktujte prosím svého správce systému.",
     "An internal error occured." : "Nastala vnitřní chyba.",
     "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.",
+    "Log in" : "Přihlásit",
     "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?",
     "remember" : "zapamatovat",
     "Alternative Logins" : "Alternativní přihlášení",
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
index 5afe9c94ae5..27df5177fff 100644
--- a/core/l10n/cy_GB.js
+++ b/core/l10n/cy_GB.js
@@ -100,6 +100,7 @@ OC.L10N.register(
     "Finish setup" : "Gorffen sefydlu",
     "Log out" : "Allgofnodi",
     "Search" : "Chwilio",
+    "Log in" : "Mewngofnodi",
     "remember" : "cofio",
     "Alternative Logins" : "Mewngofnodiadau Amgen"
 },
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
index 1e37b240bc9..37f1aefb527 100644
--- a/core/l10n/cy_GB.json
+++ b/core/l10n/cy_GB.json
@@ -98,6 +98,7 @@
     "Finish setup" : "Gorffen sefydlu",
     "Log out" : "Allgofnodi",
     "Search" : "Chwilio",
+    "Log in" : "Mewngofnodi",
     "remember" : "cofio",
     "Alternative Logins" : "Mewngofnodiadau Amgen"
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
diff --git a/core/l10n/da.js b/core/l10n/da.js
index 0482ceff99e..c8684b3483c 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Kontakt venligst din administrator",
     "An internal error occured." : "Der skete en intern fejl.",
     "Please try again or contact your administrator." : "Kontakt venligst din administrator.",
+    "Log in" : "Log ind",
     "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?",
     "remember" : "husk",
     "Alternative Logins" : "Alternative logins",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 2396b997877..067d5e6914d 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "Kontakt venligst din administrator",
     "An internal error occured." : "Der skete en intern fejl.",
     "Please try again or contact your administrator." : "Kontakt venligst din administrator.",
+    "Log in" : "Log ind",
     "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?",
     "remember" : "husk",
     "Alternative Logins" : "Alternative logins",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 2662e0d895f..495ea72c710 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -237,6 +237,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.",
     "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
     "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.",
+    "Log in" : "Anmelden",
     "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "remember" : "merken",
     "Alternative Logins" : "Alternative Logins",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 2da213c6116..fc826c7fde2 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -235,6 +235,7 @@
     "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.",
     "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
     "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.",
+    "Log in" : "Anmelden",
     "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "remember" : "merken",
     "Alternative Logins" : "Alternative Logins",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 03ecc018c05..28e9763e13c 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
     "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.",
     "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.",
+    "Log in" : "Είσοδος",
     "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;",
     "remember" : "απομνημόνευση",
     "Alternative Logins" : "Εναλλακτικές Συνδέσεις",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 4e901e6606b..6c68066738a 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
     "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.",
     "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.",
+    "Log in" : "Είσοδος",
     "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;",
     "remember" : "απομνημόνευση",
     "Alternative Logins" : "Εναλλακτικές Συνδέσεις",
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
index 78a571a798a..eee2a354958 100644
--- a/core/l10n/eo.js
+++ b/core/l10n/eo.js
@@ -129,6 +129,7 @@ OC.L10N.register(
     "Log out" : "Elsaluti",
     "Search" : "Serĉi",
     "Please contact your administrator." : "Bonvolu kontakti vian administranton.",
+    "Log in" : "Ensaluti",
     "remember" : "memori",
     "Alternative Logins" : "Alternativaj ensalutoj",
     "Thank you for your patience." : "Dankon pro via pacienco."
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
index 401e9327560..fb1ad500032 100644
--- a/core/l10n/eo.json
+++ b/core/l10n/eo.json
@@ -127,6 +127,7 @@
     "Log out" : "Elsaluti",
     "Search" : "Serĉi",
     "Please contact your administrator." : "Bonvolu kontakti vian administranton.",
+    "Log in" : "Ensaluti",
     "remember" : "memori",
     "Alternative Logins" : "Alternativaj ensalutoj",
     "Thank you for your patience." : "Dankon pro via pacienco."
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
index 5cc18198864..bddadc44c1a 100644
--- a/core/l10n/es_AR.js
+++ b/core/l10n/es_AR.js
@@ -149,6 +149,7 @@ OC.L10N.register(
     "Search" : "Buscar",
     "Server side authentication failed!" : "¡Falló la autenticación del servidor!",
     "Please contact your administrator." : "Por favor, contacte a su administrador.",
+    "Log in" : "Iniciar sesión",
     "remember" : "recordame",
     "Alternative Logins" : "Nombre alternativos de usuarios",
     "This ownCloud instance is currently in single user mode." : "Esta instancia de ownCloud está en modo de usuario único.",
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
index 8ccb4cedb4b..93a5b815740 100644
--- a/core/l10n/es_AR.json
+++ b/core/l10n/es_AR.json
@@ -147,6 +147,7 @@
     "Search" : "Buscar",
     "Server side authentication failed!" : "¡Falló la autenticación del servidor!",
     "Please contact your administrator." : "Por favor, contacte a su administrador.",
+    "Log in" : "Iniciar sesión",
     "remember" : "recordame",
     "Alternative Logins" : "Nombre alternativos de usuarios",
     "This ownCloud instance is currently in single user mode." : "Esta instancia de ownCloud está en modo de usuario único.",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 3e517277f53..df638a3d7ee 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -217,6 +217,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.",
     "An internal error occured." : "Tekkis sisemine tõrge.",
     "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.",
+    "Log in" : "Logi sisse",
     "remember" : "pea meeles",
     "Alternative Logins" : "Alternatiivsed sisselogimisviisid",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 73839f889ca..edacdaedca9 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -215,6 +215,7 @@
     "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.",
     "An internal error occured." : "Tekkis sisemine tõrge.",
     "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.",
+    "Log in" : "Logi sisse",
     "remember" : "pea meeles",
     "Alternative Logins" : "Alternatiivsed sisselogimisviisid",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index e215b870125..88b75072356 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -199,6 +199,7 @@ OC.L10N.register(
     "Search" : "Bilatu",
     "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
     "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.",
+    "Log in" : "Hasi saioa",
     "remember" : "gogoratu",
     "Alternative Logins" : "Beste erabiltzaile izenak",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index 9af46ca9cfb..51143f24767 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -197,6 +197,7 @@
     "Search" : "Bilatu",
     "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
     "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.",
+    "Log in" : "Hasi saioa",
     "remember" : "gogoratu",
     "Alternative Logins" : "Beste erabiltzaile izenak",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 2893ce8ae2a..2c3c3c49617 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
     "An internal error occured." : "Tapahtui sisäinen virhe.",
     "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.",
+    "Log in" : "Kirjaudu sisään",
     "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?",
     "remember" : "muista",
     "Alternative Logins" : "Vaihtoehtoiset kirjautumiset",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 21316024e73..e0ac2410747 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
     "An internal error occured." : "Tapahtui sisäinen virhe.",
     "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.",
+    "Log in" : "Kirjaudu sisään",
     "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?",
     "remember" : "muista",
     "Alternative Logins" : "Vaihtoehtoiset kirjautumiset",
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index f53866cdc08..583931d5068 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -243,6 +243,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Contacte co administrador.",
     "An internal error occured." : "Produciuse un erro interno.",
     "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.",
+    "Log in" : "Acceder",
     "remember" : "lembrar",
     "Alternative Logins" : "Accesos alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index 1542d83210c..7d33ed6cc76 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -241,6 +241,7 @@
     "Please contact your administrator." : "Contacte co administrador.",
     "An internal error occured." : "Produciuse un erro interno.",
     "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.",
+    "Log in" : "Acceder",
     "remember" : "lembrar",
     "Alternative Logins" : "Accesos alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
diff --git a/core/l10n/he.js b/core/l10n/he.js
index 4692495cccb..3285a569d34 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -103,6 +103,7 @@ OC.L10N.register(
     "Finish setup" : "סיום התקנה",
     "Log out" : "התנתקות",
     "Search" : "חיפוש",
+    "Log in" : "כניסה",
     "remember" : "שמירת הססמה",
     "Alternative Logins" : "כניסות אלטרנטיביות"
 },
diff --git a/core/l10n/he.json b/core/l10n/he.json
index fe873e0b02c..5db9f156d09 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -101,6 +101,7 @@
     "Finish setup" : "סיום התקנה",
     "Log out" : "התנתקות",
     "Search" : "חיפוש",
+    "Log in" : "כניסה",
     "remember" : "שמירת הססמה",
     "Alternative Logins" : "כניסות אלטרנטיביות"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index 9d0c1ddeb49..44d9fab7740 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -199,6 +199,7 @@ OC.L10N.register(
     "Search" : "pretraži",
     "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!",
     "Please contact your administrator." : "Molimo kontaktirajte svog administratora.",
+    "Log in" : "Prijavite se",
     "remember" : "Sjetite se",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index 1472b8aaa0d..7a6ce98346f 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -197,6 +197,7 @@
     "Search" : "pretraži",
     "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!",
     "Please contact your administrator." : "Molimo kontaktirajte svog administratora.",
+    "Log in" : "Prijavite se",
     "remember" : "Sjetite se",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index b465daa4212..7be9e243e88 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -247,6 +247,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "An internal error occured." : "Belső hiba történt.",
     "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.",
+    "Log in" : "Bejelentkezés",
     "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?",
     "remember" : "emlékezzen",
     "Alternative Logins" : "Alternatív bejelentkezés",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index e8b3e20c33e..63447a4038a 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -245,6 +245,7 @@
     "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "An internal error occured." : "Belső hiba történt.",
     "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.",
+    "Log in" : "Bejelentkezés",
     "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?",
     "remember" : "emlékezzen",
     "Alternative Logins" : "Alternatív bejelentkezés",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index c8fec41dc8f..64cc78ea048 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Vinsamlegast hafðu samband við kerfisstjóra.",
     "An internal error occured." : "Innri villa kom upp.",
     "Please try again or contact your administrator." : "Vinsamlegast reyndu aftur eða hafðu samband við kerfisstjóra.",
+    "Log in" : "Skrá inn",
     "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?",
     "remember" : "muna eftir mér",
     "Alternative Logins" : "Aðrar Innskráningar",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index 638e5267ea0..b6255b1764e 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "Vinsamlegast hafðu samband við kerfisstjóra.",
     "An internal error occured." : "Innri villa kom upp.",
     "Please try again or contact your administrator." : "Vinsamlegast reyndu aftur eða hafðu samband við kerfisstjóra.",
+    "Log in" : "Skrá inn",
     "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?",
     "remember" : "muna eftir mér",
     "Alternative Logins" : "Aðrar Innskráningar",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index fbdd112cb08..9c8d681f379 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -245,6 +245,7 @@ OC.L10N.register(
     "Please contact your administrator." : "管理者に問い合わせてください。",
     "An internal error occured." : "内部エラーが発生しました。",
     "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。",
+    "Log in" : "ログイン",
     "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？",
     "remember" : "パスワードを保存",
     "Alternative Logins" : "代替ログイン",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index c31bd5aba9e..ad18b1f98ed 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -243,6 +243,7 @@
     "Please contact your administrator." : "管理者に問い合わせてください。",
     "An internal error occured." : "内部エラーが発生しました。",
     "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。",
+    "Log in" : "ログイン",
     "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？",
     "remember" : "パスワードを保存",
     "Alternative Logins" : "代替ログイン",
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
index eef607f316d..d6ae525c861 100644
--- a/core/l10n/ka_GE.js
+++ b/core/l10n/ka_GE.js
@@ -102,6 +102,7 @@ OC.L10N.register(
     "Finish setup" : "კონფიგურაციის დასრულება",
     "Log out" : "გამოსვლა",
     "Search" : "ძებნა",
+    "Log in" : "შესვლა",
     "remember" : "დამახსოვრება",
     "Alternative Logins" : "ალტერნატიული Login–ი"
 },
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
index dad6746fe94..85fecffe0c0 100644
--- a/core/l10n/ka_GE.json
+++ b/core/l10n/ka_GE.json
@@ -100,6 +100,7 @@
     "Finish setup" : "კონფიგურაციის დასრულება",
     "Log out" : "გამოსვლა",
     "Search" : "ძებნა",
+    "Log in" : "შესვლა",
     "remember" : "დამახსოვრება",
     "Alternative Logins" : "ალტერნატიული Login–ი"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index 6bbc675150e..4fa998c42f7 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "Finishing …" : "Schléissen of ...",
     "Log out" : "Ofmellen",
     "Search" : "Sichen",
+    "Log in" : "Umellen",
     "remember" : "verhalen",
     "Alternative Logins" : "Alternativ Umeldungen",
     "Thank you for your patience." : "Merci fir deng Gedold."
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index 4a8fcce1136..0a201c98f1c 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -118,6 +118,7 @@
     "Finishing …" : "Schléissen of ...",
     "Log out" : "Ofmellen",
     "Search" : "Sichen",
+    "Log in" : "Umellen",
     "remember" : "verhalen",
     "Alternative Logins" : "Alternativ Umeldungen",
     "Thank you for your patience." : "Merci fir deng Gedold."
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index 41f012b6f07..f36b66dcf52 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -156,6 +156,7 @@ OC.L10N.register(
     "Search" : "Ieškoti",
     "Server side authentication failed!" : "Autentikacija serveryje nepavyko!",
     "Please contact your administrator." : "Kreipkitės į savo sistemos administratorių.",
+    "Log in" : "Prisijungti",
     "remember" : "prisiminti",
     "Alternative Logins" : "Alternatyvūs prisijungimai",
     "This ownCloud instance is currently in single user mode." : "Ši ownCloud sistema yra vieno naudotojo veiksenoje.",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index 7b6ad9e4907..5261b7ee070 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -154,6 +154,7 @@
     "Search" : "Ieškoti",
     "Server side authentication failed!" : "Autentikacija serveryje nepavyko!",
     "Please contact your administrator." : "Kreipkitės į savo sistemos administratorių.",
+    "Log in" : "Prisijungti",
     "remember" : "prisiminti",
     "Alternative Logins" : "Alternatyvūs prisijungimai",
     "This ownCloud instance is currently in single user mode." : "Ši ownCloud sistema yra vieno naudotojo veiksenoje.",
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index 526ef6846c0..d7905ef30a7 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -119,6 +119,7 @@ OC.L10N.register(
     "Finish setup" : "Pabeigt iestatīšanu",
     "Log out" : "Izrakstīties",
     "Search" : "Meklēt",
+    "Log in" : "Ierakstīties",
     "remember" : "atcerēties",
     "Alternative Logins" : "Alternatīvās pieteikšanās"
 },
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index c40bb4757d8..49188f77e89 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -117,6 +117,7 @@
     "Finish setup" : "Pabeigt iestatīšanu",
     "Log out" : "Izrakstīties",
     "Search" : "Meklēt",
+    "Log in" : "Ierakstīties",
     "remember" : "atcerēties",
     "Alternative Logins" : "Alternatīvās pieteikšanās"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
index bbc073bce0b..e960bb4b7f6 100644
--- a/core/l10n/mk.js
+++ b/core/l10n/mk.js
@@ -168,6 +168,7 @@ OC.L10N.register(
     "Search" : "Барај",
     "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!",
     "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.",
+    "Log in" : "Најава",
     "remember" : "запамти",
     "Alternative Logins" : "Алтернативни најавувања",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.",
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
index 88a4ee81934..722af208b2c 100644
--- a/core/l10n/mk.json
+++ b/core/l10n/mk.json
@@ -166,6 +166,7 @@
     "Search" : "Барај",
     "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!",
     "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.",
+    "Log in" : "Најава",
     "remember" : "запамти",
     "Alternative Logins" : "Алтернативни најавувања",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.",
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index a26c2b1e2bd..3eda4c2ed9d 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -206,6 +206,7 @@ OC.L10N.register(
     "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!",
     "Please contact your administrator." : "Skontaktuj się z administratorem",
     "Please try again or contact your administrator." : "Spróbuj ponownie lub skontaktuj się z administratorem.",
+    "Log in" : "Zaloguj",
     "remember" : "pamiętaj",
     "Alternative Logins" : "Alternatywne loginy",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index 0c3524c5cc4..94001147b74 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -204,6 +204,7 @@
     "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!",
     "Please contact your administrator." : "Skontaktuj się z administratorem",
     "Please try again or contact your administrator." : "Spróbuj ponownie lub skontaktuj się z administratorem.",
+    "Log in" : "Zaloguj",
     "remember" : "pamiętaj",
     "Alternative Logins" : "Alternatywne loginy",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index ad5cf69a798..8f1a2878aaa 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Por favor, contate o administrador.",
     "An internal error occured." : "Ocorreu um erro interno.",
     "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.",
+    "Log in" : "Entrar",
     "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?",
     "remember" : "lembrar",
     "Alternative Logins" : "Logins Alternativos",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index bcc3522c430..d07686e7bdd 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "Por favor, contate o administrador.",
     "An internal error occured." : "Ocorreu um erro interno.",
     "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.",
+    "Log in" : "Entrar",
     "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?",
     "remember" : "lembrar",
     "Alternative Logins" : "Logins Alternativos",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index 537efc34728..8fa20c8e024 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -232,6 +232,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Por favor contacte o administrador.",
     "An internal error occured." : "Ocorreu um erro interno.",
     "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
+    "Log in" : "Iniciar Sessão",
     "Wrong password. Reset it?" : "Senha errada. Repô-la?",
     "remember" : "lembrar",
     "Alternative Logins" : "Contas de acesso alternativas",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 17c5b5dd587..e528b7c776d 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -230,6 +230,7 @@
     "Please contact your administrator." : "Por favor contacte o administrador.",
     "An internal error occured." : "Ocorreu um erro interno.",
     "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
+    "Log in" : "Iniciar Sessão",
     "Wrong password. Reset it?" : "Senha errada. Repô-la?",
     "remember" : "lembrar",
     "Alternative Logins" : "Contas de acesso alternativas",
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
index be29a54e7b4..9be2cb088a6 100644
--- a/core/l10n/si_LK.js
+++ b/core/l10n/si_LK.js
@@ -82,6 +82,7 @@ OC.L10N.register(
     "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න",
     "Log out" : "නික්මීම",
     "Search" : "සොයන්න",
+    "Log in" : "ප්‍රවේශවන්න",
     "remember" : "මතක තබාගන්න"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
index 68638609324..7626f55acb1 100644
--- a/core/l10n/si_LK.json
+++ b/core/l10n/si_LK.json
@@ -80,6 +80,7 @@
     "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න",
     "Log out" : "නික්මීම",
     "Search" : "සොයන්න",
+    "Log in" : "ප්‍රවේශවන්න",
     "remember" : "මතක තබාගන්න"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index a08bc9d09f3..2953bc7e0c6 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -227,6 +227,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.",
     "An internal error occured." : "Vyskytla sa vnútorná chyba.",
     "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.",
+    "Log in" : "Prihlásiť sa",
     "remember" : "zapamätať",
     "Alternative Logins" : "Alternatívne prihlásenie",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index fcb358cdf9c..f39e14ed02a 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -225,6 +225,7 @@
     "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.",
     "An internal error occured." : "Vyskytla sa vnútorná chyba.",
     "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.",
+    "Log in" : "Prihlásiť sa",
     "remember" : "zapamätať",
     "Alternative Logins" : "Alternatívne prihlásenie",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index a5a7895b2cc..27c1255f65b 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -201,6 +201,7 @@ OC.L10N.register(
     "Search" : "Sök",
     "Server side authentication failed!" : "Servern misslyckades med autentisering!",
     "Please contact your administrator." : "Kontakta din administratör.",
+    "Log in" : "Logga in",
     "remember" : "kom ihåg",
     "Alternative Logins" : "Alternativa inloggningar",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index 307fd6afc78..befc73dfc44 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -199,6 +199,7 @@
     "Search" : "Sök",
     "Server side authentication failed!" : "Servern misslyckades med autentisering!",
     "Please contact your administrator." : "Kontakta din administratör.",
+    "Log in" : "Logga in",
     "remember" : "kom ihåg",
     "Alternative Logins" : "Alternativa inloggningar",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>",
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
index 21025db2fa0..c58dea8366e 100644
--- a/core/l10n/ta_LK.js
+++ b/core/l10n/ta_LK.js
@@ -93,6 +93,7 @@ OC.L10N.register(
     "Finish setup" : "அமைப்பை முடிக்க",
     "Log out" : "விடுபதிகை செய்க",
     "Search" : "தேடுதல்",
+    "Log in" : "புகுபதிகை",
     "remember" : "ஞாபகப்படுத்துக"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
index a7f28999023..60ff565dbf2 100644
--- a/core/l10n/ta_LK.json
+++ b/core/l10n/ta_LK.json
@@ -91,6 +91,7 @@
     "Finish setup" : "அமைப்பை முடிக்க",
     "Log out" : "விடுபதிகை செய்க",
     "Search" : "தேடுதல்",
+    "Log in" : "புகுபதிகை",
     "remember" : "ஞாபகப்படுத்துக"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index 142895dd1d0..f72fa3ee38b 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ",
     "An internal error occured." : "เกิดข้อผิดพลาดภายใน",
     "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ",
+    "Log in" : "เข้าสู่ระบบ",
     "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?",
     "remember" : "จดจำฉัน",
     "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index 88c74d1eb4c..d808685898d 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ",
     "An internal error occured." : "เกิดข้อผิดพลาดภายใน",
     "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ",
+    "Log in" : "เข้าสู่ระบบ",
     "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?",
     "remember" : "จดจำฉัน",
     "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index 2b319a8f8fe..c250f919892 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
     "An internal error occured." : "Dahili bir hata oluştu.",
     "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.",
+    "Log in" : "Giriş yap",
     "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?",
     "remember" : "hatırla",
     "Alternative Logins" : "Alternatif Girişler",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index 26f831b9262..6fa7aa63c1e 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
     "An internal error occured." : "Dahili bir hata oluştu.",
     "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.",
+    "Log in" : "Giriş yap",
     "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?",
     "remember" : "hatırla",
     "Alternative Logins" : "Alternatif Girişler",
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index ab5689e64f1..e73f854f5e1 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -229,6 +229,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.",
     "An internal error occured." : "Виникла внутрішня помилка.",
     "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.",
+    "Log in" : "Увійти",
     "remember" : "запам'ятати",
     "Alternative Logins" : "Альтернативні імена користувача",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто повідомляємо вам, що %s поділився »%s« з вами.<br><a href=\"%s\">Перегляньте!</a><br><br>",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index 7d92acb3cc9..09326dcf44e 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -227,6 +227,7 @@
     "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.",
     "An internal error occured." : "Виникла внутрішня помилка.",
     "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.",
+    "Log in" : "Увійти",
     "remember" : "запам'ятати",
     "Alternative Logins" : "Альтернативні імена користувача",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто повідомляємо вам, що %s поділився »%s« з вами.<br><a href=\"%s\">Перегляньте!</a><br><br>",
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index c51c1563fe4..229a99b2c29 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -141,6 +141,7 @@ OC.L10N.register(
     "Search" : "Tìm kiếm",
     "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!",
     "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.",
+    "Log in" : "Đăng nhập",
     "remember" : "ghi nhớ",
     "Alternative Logins" : "Đăng nhập khác",
     "This ownCloud instance is currently in single user mode." : "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index ba8015cafb4..e2f6e5a7ecc 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -139,6 +139,7 @@
     "Search" : "Tìm kiếm",
     "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!",
     "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.",
+    "Log in" : "Đăng nhập",
     "remember" : "ghi nhớ",
     "Alternative Logins" : "Đăng nhập khác",
     "This ownCloud instance is currently in single user mode." : "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 4af50e61c13..e8f87ff5900 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "请联系你的管理员。",
     "An internal error occured." : "发生了内部错误。",
     "Please try again or contact your administrator." : "请重试或联系管理员。",
+    "Log in" : "登录",
     "Wrong password. Reset it?" : "密码错误。要重置么？",
     "remember" : "记住",
     "Alternative Logins" : "其他登录方式",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index b485c703e36..7bed1beaa9c 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "请联系你的管理员。",
     "An internal error occured." : "发生了内部错误。",
     "Please try again or contact your administrator." : "请重试或联系管理员。",
+    "Log in" : "登录",
     "Wrong password. Reset it?" : "密码错误。要重置么？",
     "remember" : "记住",
     "Alternative Logins" : "其他登录方式",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index fc1bef316a9..2766bd30007 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -68,6 +68,7 @@ OC.L10N.register(
     "Database name" : "資料庫名稱",
     "Log out" : "登出",
     "Search" : "尋找",
+    "Log in" : "登入",
     "remember" : "記住"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index 2a6230797c1..0029a47794e 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -66,6 +66,7 @@
     "Database name" : "資料庫名稱",
     "Log out" : "登出",
     "Search" : "尋找",
+    "Log in" : "登入",
     "remember" : "記住"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js
index 8885ecd6e10..715b834d2bf 100644
--- a/lib/l10n/cs_CZ.js
+++ b/lib/l10n/cs_CZ.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Nelze přečíst soubor",
     "App directory already exists" : "Adresář aplikace již existuje",
     "Can't create app folder. Please fix permissions. %s" : "Nelze vytvořit složku aplikace. Opravte práva souborů. %s",
+    "Archive does not contain a directory named %s" : "Archiv neobsahuje adresář pojmenovaný %s",
     "No source specified when installing app" : "Nebyl zadán zdroj při instalaci aplikace",
     "No href specified when installing app from http" : "Nebyl zadán odkaz pro instalaci aplikace z HTTP",
     "No path specified when installing app from local file" : "Nebyla zadána cesta pro instalaci aplikace z místního souboru",
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json
index c5f50a73848..891b30850ab 100644
--- a/lib/l10n/cs_CZ.json
+++ b/lib/l10n/cs_CZ.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Nelze přečíst soubor",
     "App directory already exists" : "Adresář aplikace již existuje",
     "Can't create app folder. Please fix permissions. %s" : "Nelze vytvořit složku aplikace. Opravte práva souborů. %s",
+    "Archive does not contain a directory named %s" : "Archiv neobsahuje adresář pojmenovaný %s",
     "No source specified when installing app" : "Nebyl zadán zdroj při instalaci aplikace",
     "No href specified when installing app from http" : "Nebyl zadán odkaz pro instalaci aplikace z HTTP",
     "No path specified when installing app from local file" : "Nebyla zadána cesta pro instalaci aplikace z místního souboru",
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index ca8d2b41081..96a724cae10 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -110,6 +110,9 @@ OC.L10N.register(
     "Cheers!" : "سلامتی!",
     "Forum" : "انجمن",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
+    "Desktop client" : "نرم افزار دسکتاپ",
+    "Android app" : "اپ اندروید",
+    "iOS app" : "اپ iOS",
     "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
     "Password" : "گذرواژه",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index 9dc390ea8cc..354e56e1ffc 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -108,6 +108,9 @@
     "Cheers!" : "سلامتی!",
     "Forum" : "انجمن",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
+    "Desktop client" : "نرم افزار دسکتاپ",
+    "Android app" : "اپ اندروید",
+    "iOS app" : "اپ iOS",
     "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
     "Password" : "گذرواژه",
-- 
GitLab


From e1a79cd651850e972e27f05a6667dcd088aa1bff Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 4 Sep 2015 16:17:27 +0200
Subject: [PATCH 165/783] Avoid re-propagation of shares during one propagation
 run

* fix was proposed by @nickvergessen
---
 .../files_sharing/lib/propagation/recipientpropagator.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/files_sharing/lib/propagation/recipientpropagator.php b/apps/files_sharing/lib/propagation/recipientpropagator.php
index 11764106861..420cacb3d2f 100644
--- a/apps/files_sharing/lib/propagation/recipientpropagator.php
+++ b/apps/files_sharing/lib/propagation/recipientpropagator.php
@@ -126,7 +126,13 @@ class RecipientPropagator {
 		});
 	}
 
+	protected $propagatingIds = [];
+
 	public function propagateById($id) {
+		if (isset($this->propagatingIds[$id])) {
+			return;
+		}
+		$this->propagatingIds[$id] = true;
 		$shares = Share::getAllSharesForFileId($id);
 		foreach ($shares as $share) {
 			// propagate down the share tree
@@ -141,5 +147,7 @@ class RecipientPropagator {
 				$watcher->writeHook(['path' => $path]);
 			}
 		}
+
+		unset($this->propagatingIds[$id]);
 	}
 }
-- 
GitLab


From f100ef0fc6acddc6f5c9d38affa34bb243dc8eeb Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 4 Sep 2015 16:22:01 +0200
Subject: [PATCH 166/783] Prevent sharing twice with user when already a group

---
 lib/private/share/share.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index d0c69badb46..3a4bd0b19dd 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -701,6 +701,18 @@ class Share extends Constants {
 					throw new \Exception($message_t);
 				}
 			}
+			if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_USER,
+				$shareWith, null, self::FORMAT_NONE, null, 1, true, true)) {
+				// Only allow the same share to occur again if it is the same
+				// owner and is not a user share, this use case is for increasing
+				// permissions for a specific user
+				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
+					$message = 'Sharing %s failed, because this item is already shared with user %s';
+					$message_t = $l->t('Sharing %s failed, because this item is already shared with user %s', array($itemSourceName, $shareWith));
+					\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
+					throw new \Exception($message_t);
+				}
+			}
 		} else if ($shareType === self::SHARE_TYPE_GROUP) {
 			if (!\OC_Group::groupExists($shareWith)) {
 				$message = 'Sharing %s failed, because the group %s does not exist';
-- 
GitLab


From cdf01f04194a9de30e4247338a5b2675cb1c3ece Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 3 Sep 2015 19:48:42 +0100
Subject: [PATCH 167/783] Split mimetype handling to new class

---
 apps/files_sharing/lib/cache.php     |   6 +-
 lib/private/files/cache/cache.php    |  96 +++-------------
 lib/private/files/type/loader.php    | 165 +++++++++++++++++++++++++++
 lib/private/server.php               |  14 +++
 lib/public/files/imimetypeloader.php |  59 ++++++++++
 lib/public/iservercontainer.php      |   8 ++
 tests/lib/repair/repairmimetypes.php |  29 +++--
 7 files changed, 280 insertions(+), 97 deletions(-)
 create mode 100644 lib/private/files/type/loader.php
 create mode 100644 lib/public/files/imimetypeloader.php

diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index c25dc92409f..377c9f02253 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -47,6 +47,7 @@ class Shared_Cache extends Cache {
 	 * @param \OC\Files\Storage\Shared $storage
 	 */
 	public function __construct($storage) {
+		parent::__construct($storage);
 		$this->storage = $storage;
 	}
 
@@ -94,6 +95,7 @@ class Shared_Cache extends Cache {
 	 * @return array|false
 	 */
 	public function get($file) {
+		$mimetypeLoader = \OC::$server->getMimeTypeLoader();
 		if (is_string($file)) {
 			$cache = $this->getSourceCache($file);
 			if ($cache) {
@@ -130,8 +132,8 @@ class Shared_Cache extends Cache {
 			$data['mtime'] = (int)$data['mtime'];
 			$data['storage_mtime'] = (int)$data['storage_mtime'];
 			$data['encrypted'] = (bool)$data['encrypted'];
-			$data['mimetype'] = $this->getMimetype($data['mimetype']);
-			$data['mimepart'] = $this->getMimetype($data['mimepart']);
+			$data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']);
+			$data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']);
 			if ($data['storage_mtime'] === 0) {
 				$data['storage_mtime'] = $data['mtime'];
 			}
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 8cf097421d4..5c04da1f0d5 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -35,6 +35,8 @@
 
 namespace OC\Files\Cache;
 
+use \OCP\Files\IMimeTypeLoader;
+
 /**
  * Metadata cache for a storage
  *
@@ -66,8 +68,8 @@ class Cache {
 	 */
 	protected $storageCache;
 
-	protected static $mimetypeIds = array();
-	protected static $mimetypes = array();
+	/** @var IMimeTypeLoader */
+	protected $mimetypeLoader;
 
 	/**
 	 * @param \OC\Files\Storage\Storage|string $storage
@@ -83,6 +85,7 @@ class Cache {
 		}
 
 		$this->storageCache = new Storage($storage);
+		$this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
 	}
 
 	/**
@@ -94,72 +97,6 @@ class Cache {
 		return $this->storageCache->getNumericId();
 	}
 
-	/**
-	 * Get the numeric id for a mimetype
-	 *
-	 * Mimetypes are stored as integers in the cache to prevent duplicated data of the (usually) fairly limited amount of unique mimetypes
-	 * If the supplied mimetype does not yet have a numeric id a new one will be generated
-	 *
-	 * @param string $mime
-	 * @return int
-	 */
-	public function getMimetypeId($mime) {
-		if (empty($mime)) {
-			// Can not insert empty string into Oracle NOT NULL column.
-			$mime = 'application/octet-stream';
-		}
-		if (empty(self::$mimetypeIds)) {
-			$this->loadMimetypes();
-		}
-
-		if (!isset(self::$mimetypeIds[$mime])) {
-			try {
-				$connection = \OC_DB::getConnection();
-				$connection->insertIfNotExist('*PREFIX*mimetypes', [
-					'mimetype'	=> $mime,
-				]);
-				$this->loadMimetypes();
-			} catch (\Doctrine\DBAL\DBALException $e) {
-				\OCP\Util::writeLog('core', 'Exception during mimetype insertion: ' . $e->getmessage(), \OCP\Util::DEBUG);
-				return -1;
-			}
-		}
-
-		return self::$mimetypeIds[$mime];
-	}
-
-
-	/**
-	 * Get the mimetype (as string) from a mimetype id
-	 *
-	 * @param int $id
-	 * @return string | null the mimetype for the id or null if the id is not known
-	 */
-	public function getMimetype($id) {
-		if (empty(self::$mimetypes)) {
-			$this->loadMimetypes();
-		}
-
-		return isset(self::$mimetypes[$id]) ? self::$mimetypes[$id] : null;
-	}
-
-	/**
-	 * Load all known mimetypes and mimetype ids from the database
-	 *
-	 * @throws \OC\DatabaseException
-	 */
-	public function loadMimetypes() {
-		self::$mimetypeIds = self::$mimetypes = array();
-
-		$result = \OC_DB::executeAudited('SELECT `id`, `mimetype` FROM `*PREFIX*mimetypes`', array());
-		if ($result) {
-			while ($row = $result->fetchRow()) {
-				self::$mimetypeIds[$row['mimetype']] = $row['id'];
-				self::$mimetypes[$row['id']] = $row['mimetype'];
-			}
-		}
-	}
-
 	/**
 	 * get the stored metadata of a file or folder
 	 *
@@ -222,8 +159,8 @@ class Cache {
 			$data['storage_mtime'] = (int)$data['storage_mtime'];
 			$data['encrypted'] = (bool)$data['encrypted'];
 			$data['storage'] = $this->storageId;
-			$data['mimetype'] = $this->getMimetype($data['mimetype']);
-			$data['mimepart'] = $this->getMimetype($data['mimepart']);
+			$data['mimetype'] = $this->mimetypeLoader->getMimetypeById($data['mimetype']);
+			$data['mimepart'] = $this->mimetypeLoader->getMimetypeById($data['mimepart']);
 			if ($data['storage_mtime'] == 0) {
 				$data['storage_mtime'] = $data['mtime'];
 			}
@@ -258,8 +195,8 @@ class Cache {
 			$result = \OC_DB::executeAudited($sql, array($fileId));
 			$files = $result->fetchAll();
 			foreach ($files as &$file) {
-				$file['mimetype'] = $this->getMimetype($file['mimetype']);
-				$file['mimepart'] = $this->getMimetype($file['mimepart']);
+				$file['mimetype'] = $this->mimetypeLoader->getMimetypeById($file['mimetype']);
+				$file['mimepart'] = $this->mimetypeLoader->getMimetypeById($file['mimepart']);
 				if ($file['storage_mtime'] == 0) {
 					$file['storage_mtime'] = $file['mtime'];
 				}
@@ -385,9 +322,9 @@ class Cache {
 					$params[] = md5($value);
 					$queryParts[] = '`path_hash`';
 				} elseif ($name === 'mimetype') {
-					$params[] = $this->getMimetypeId(substr($value, 0, strpos($value, '/')));
+					$params[] = $this->mimetypeLoader->getId(substr($value, 0, strpos($value, '/')));
 					$queryParts[] = '`mimepart`';
-					$value = $this->getMimetypeId($value);
+					$value = $this->mimetypeLoader->getId($value);
 				} elseif ($name === 'storage_mtime') {
 					if (!isset($data['mtime'])) {
 						$params[] = $value;
@@ -613,7 +550,6 @@ class Cache {
 	 * @return array an array of cache entries where the name matches the search pattern
 	 */
 	public function search($pattern) {
-
 		// normalize pattern
 		$pattern = $this->normalize($pattern);
 
@@ -630,8 +566,8 @@ class Cache {
 
 		$files = array();
 		while ($row = $result->fetchRow()) {
-			$row['mimetype'] = $this->getMimetype($row['mimetype']);
-			$row['mimepart'] = $this->getMimetype($row['mimepart']);
+			$row['mimetype'] = $this->mimetypeLoader->getMimetypeById($row['mimetype']);
+			$row['mimepart'] = $this->mimetypeLoader->getMimetypeById($row['mimepart']);
 			$files[] = $row;
 		}
 		return $files;
@@ -652,12 +588,12 @@ class Cache {
 		}
 		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`, `permissions`
 				FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?';
-		$mimetype = $this->getMimetypeId($mimetype);
+		$mimetype = $this->mimetypeLoader->getId($mimetype);
 		$result = \OC_DB::executeAudited($sql, array($mimetype, $this->getNumericStorageId()));
 		$files = array();
 		while ($row = $result->fetchRow()) {
-			$row['mimetype'] = $this->getMimetype($row['mimetype']);
-			$row['mimepart'] = $this->getMimetype($row['mimepart']);
+			$row['mimetype'] = $this->mimetypeLoader->getMimetypeById($row['mimetype']);
+			$row['mimepart'] = $this->mimetypeLoader->getMimetypeById($row['mimepart']);
 			$files[] = $row;
 		}
 		return $files;
diff --git a/lib/private/files/type/loader.php b/lib/private/files/type/loader.php
new file mode 100644
index 00000000000..df893306615
--- /dev/null
+++ b/lib/private/files/type/loader.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Files\Type;
+
+use OCP\Files\IMimeTypeLoader;
+use OCP\IDBConnection;
+
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
+
+/**
+ * Mimetype database loader
+ *
+ * @package OC\Files\Type
+ */
+class Loader implements IMimeTypeLoader {
+
+	/** @var IDBConnection */
+	private $dbConnection;
+
+	/** @var array [id => mimetype] */
+	protected $mimetypes;
+
+	/** @var array [mimetype => id] */
+	protected $mimetypeIds;
+
+	/**
+	 * @param IDBConnection $dbConnection
+	 */
+	public function __construct(IDBConnection $dbConnection) {
+		$this->dbConnection = $dbConnection;
+		$this->mimetypes = [];
+		$this->mimetypeIds = [];
+	}
+
+	/**
+	 * Get a mimetype from its ID
+	 *
+	 * @param int $id
+	 * @return string|null
+	 */
+	public function getMimetypeById($id) {
+		if (!$this->mimetypes) {
+			$this->loadMimetypes();
+		}
+		if (isset($this->mimetypes[$id])) {
+			return $this->mimetypes[$id];
+		}
+		return null;
+	}
+
+	/**
+	 * Get a mimetype ID, adding the mimetype to the DB if it does not exist
+	 *
+	 * @param string $mimetype
+	 * @return int
+	 */
+	public function getId($mimetype) {
+		if (!$this->mimetypeIds) {
+			$this->loadMimetypes();
+		}
+		if (isset($this->mimetypeIds[$mimetype])) {
+			return $this->mimetypeIds[$mimetype];
+		}
+		return $this->store($mimetype);
+	}
+
+	/**
+	 * Test if a mimetype exists in the database
+	 *
+	 * @param string $mimetype
+	 * @return bool
+	 */
+	public function exists($mimetype) {
+		if (!$this->mimetypeIds) {
+			$this->loadMimetypes();
+		}
+		return isset($this->mimetypeIds[$mimetype]);
+	}
+
+	/**
+	 * Store a mimetype in the DB
+	 *
+	 * @param string $mimetype
+	 * @param int inserted ID
+	 */
+	protected function store($mimetype) {
+		try {
+			$qb = $this->dbConnection->getQueryBuilder();
+			$qb->insert('mimetypes')
+				->values([
+					'mimetype' => $qb->createNamedParameter($mimetype)
+				]);
+			$qb->execute();
+		} catch (UniqueConstraintViolationException $e) {
+			// something inserted it before us
+		}
+
+		$fetch = $this->dbConnection->getQueryBuilder();
+		$fetch->select('id')
+			->from('mimetypes')
+			->where(
+				$fetch->expr()->eq('mimetype', $fetch->createNamedParameter($mimetype)
+			));
+		$row = $fetch->execute()->fetch();
+
+		$this->mimetypes[$row['id']] = $mimetype;
+		$this->mimetypeIds[$mimetype] = $row['id'];
+		return $row['id'];
+	}
+
+	/**
+	 * Load all mimetypes from DB
+	 */
+	private function loadMimetypes() {
+		$qb = $this->dbConnection->getQueryBuilder();
+		$qb->select('id', 'mimetype')
+			->from('mimetypes');
+		$results = $qb->execute()->fetchAll();
+
+		foreach ($results as $row) {
+			$this->mimetypes[$row['id']] = $row['mimetype'];
+			$this->mimetypeIds[$row['mimetype']] = $row['id'];
+		}
+	}
+
+	/**
+	 * Update filecache mimetype based on file extension
+	 *
+	 * @param string $ext file extension
+	 * @param int $mimetypeId
+	 * @return int number of changed rows
+	 */
+	public function updateFilecache($ext, $mimetypeId) {
+		$update = $this->dbConnection->getQueryBuilder();
+		$update->update('filecache')
+			->set('mimetype', $update->createNamedParameter($mimetypeId))
+			->where($update->expr()->neq(
+				'mimetype', $update->createNamedParameter($mimetypeId)
+			))
+			->andWhere($update->expr()->like(
+				$update->createFunction('LOWER(`name`)'), $update->createNamedParameter($ext)
+			));
+		return $update->execute();
+	}
+
+}
diff --git a/lib/private/server.php b/lib/private/server.php
index a741f33eb3d..f92c68f037c 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -470,6 +470,11 @@ class Server extends SimpleContainer implements IServerContainer {
 				$c->getURLGenerator(),
 				\OC::$configDir);
 		});
+		$this->registerService('MimeTypeLoader', function(Server $c) {
+			return new \OC\Files\Type\Loader(
+				$c->getDatabaseConnection()
+			);
+		});
 		$this->registerService('CapabilitiesManager', function (Server $c) {
 			$manager = new \OC\CapabilitiesManager();
 			$manager->registerCapability(function() use ($c) {
@@ -1010,6 +1015,15 @@ class Server extends SimpleContainer implements IServerContainer {
 		return $this->query('MimeTypeDetector');
 	}
 
+	/**
+	 * Get the MimeTypeLoader
+	 *
+	 * @return \OCP\Files\IMimeTypeLoader
+	 */
+	public function getMimeTypeLoader() {
+		return $this->query('MimeTypeLoader');
+	}
+
 	/**
 	 * Get the manager of all the capabilities
 	 *
diff --git a/lib/public/files/imimetypeloader.php b/lib/public/files/imimetypeloader.php
new file mode 100644
index 00000000000..24937ea9b86
--- /dev/null
+++ b/lib/public/files/imimetypeloader.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP\Files;
+
+/**
+ * Interface IMimeTypeLoader
+ * @package OCP\Files
+ * @since 8.2.0
+ *
+ * Interface to load mimetypes
+ **/
+interface IMimeTypeLoader {
+
+	/**
+	 * Get a mimetype from its ID
+	 *
+	 * @param int $id
+	 * @return string|null
+	 * @since 8.2.0
+	 */
+	public function getMimetypeById($id);
+
+	/**
+	 * Get a mimetype ID, adding the mimetype to the DB if it does not exist
+	 *
+	 * @param string $mimetype
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getId($mimetype);
+
+	/**
+	 * Test if a mimetype exists in the database
+	 *
+	 * @param string $mimetype
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function exists($mimetype);
+}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index a6d83156de3..81724cb4967 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -440,6 +440,14 @@ interface IServerContainer {
 	 */
 	public function getMimeTypeDetector();
 
+	/**
+	 * Get the MimeTypeLoader
+	 *
+	 * @return \OCP\Files\IMimeTypeLoader
+	 * @since 8.2.0
+	 */
+	public function getMimeTypeLoader();
+
 
 	/**
 	 * Get the EventDispatcher
diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php
index 40ffc14612b..76d4d7cc656 100644
--- a/tests/lib/repair/repairmimetypes.php
+++ b/tests/lib/repair/repairmimetypes.php
@@ -22,8 +22,17 @@ class RepairMimeTypes extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$this->storage = new \OC\Files\Storage\Temporary([]);
 
+		$this->savedMimetypeLoader = \OC::$server->getMimeTypeLoader();
+		$this->mimetypeLoader = $this->getMockBuilder('\OC\Files\Type\Loader')
+			->setConstructorArgs([\OC::$server->getDatabaseConnection()])
+			->setMethods(null)
+			->getMock();
+		\OC::$server->registerService('MimeTypeLoader', function ($c) {
+			return $this->mimetypeLoader;
+		});
+
+		$this->storage = new \OC\Files\Storage\Temporary([]);
 		$this->repair = new \OC\Repair\RepairMimeTypes();
 	}
 
@@ -33,7 +42,9 @@ class RepairMimeTypes extends \Test\TestCase {
 		\OC_DB::executeAudited($sql, [$this->storage->getId()]);
 		$this->clearMimeTypes();
 
-		DummyFileCache::clearCachedMimeTypes();
+		\OC::$server->registerService('MimeTypeLoader', function($c) {
+			return $this->savedMimetypeLoader;
+		});
 
 		parent::tearDown();
 	}
@@ -86,8 +97,7 @@ class RepairMimeTypes extends \Test\TestCase {
 		$this->repair->run();
 
 		// force mimetype reload
-		DummyFileCache::clearCachedMimeTypes();
-		$this->storage->getCache()->loadMimeTypes();
+		self::invokePrivate($this->mimetypeLoader, 'loadMimetypes');
 
 		$this->checkEntries($fixedMimeTypes);
 	}
@@ -434,14 +444,3 @@ class RepairMimeTypes extends \Test\TestCase {
 	}
 }
 
-/**
- * Dummy class to access protected members
- */
-class DummyFileCache extends \OC\Files\Cache\Cache {
-
-	public static function clearCachedMimeTypes() {
-		self::$mimetypeIds = [];
-		self::$mimetypes = [];
-	}
-}
-
-- 
GitLab


From 19830e6c2455dc67ba0d8f463b46166aa9713064 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Tue, 1 Sep 2015 14:12:52 +0100
Subject: [PATCH 168/783] Introduce mimetype DB update occ command

---
 .../command/maintenance/mimetype/updatedb.php | 96 +++++++++++++++++++
 core/register_command.php                     |  3 +-
 2 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 core/command/maintenance/mimetype/updatedb.php

diff --git a/core/command/maintenance/mimetype/updatedb.php b/core/command/maintenance/mimetype/updatedb.php
new file mode 100644
index 00000000000..37c401c0338
--- /dev/null
+++ b/core/command/maintenance/mimetype/updatedb.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+namespace OC\Core\Command\Maintenance\Mimetype;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputOption;
+
+use OCP\Files\IMimeTypeDetector;
+use OCP\Files\IMimeTypeLoader;
+
+class UpdateDB extends Command {
+
+	const DEFAULT_MIMETYPE = 'application/octet-stream';
+
+	/** @var IMimeTypeDetector */
+	protected $mimetypeDetector;
+
+	/** @var IMimeTypeLoader */
+	protected $mimetypeLoader;
+
+	public function __construct(
+		IMimeTypeDetector $mimetypeDetector,
+		IMimeTypeLoader $mimetypeLoader
+	) {
+		parent::__construct();
+		$this->mimetypeDetector = $mimetypeDetector;
+		$this->mimetypeLoader = $mimetypeLoader;
+	}
+
+	protected function configure() {
+		$this
+			->setName('maintenance:mimetype:update-db')
+			->setDescription('Update database mimetypes and update filecache')
+			->addOption(
+				'repair-filecache',
+				null,
+				InputOption::VALUE_NONE,
+				'Repair filecache for all mimetypes, not just new ones'
+			)
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$mappings = $this->mimetypeDetector->getAllMappings();
+
+		$totalFilecacheUpdates = 0;
+		$totalNewMimetypes = 0;
+
+		foreach ($mappings as $ext => $mimetypes) {
+			if ($ext[0] === '_') {
+				// comment
+				continue;
+			}
+			$mimetype = $mimetypes[0];
+			$existing = $this->mimetypeLoader->exists($mimetype);
+			// this will add the mimetype if it didn't exist
+			$mimetypeId = $this->mimetypeLoader->getId($mimetype);
+
+			if (!$existing) {
+				$output->writeln('Added mimetype "'.$mimetype.'" to database');
+				$totalNewMimetypes++;
+			}
+
+			if (!$existing || $input->getOption('repair-filecache')) {
+				$touchedFilecacheRows = $this->mimetypeLoader->updateFilecache($ext, $mimetypeId);
+				if ($touchedFilecacheRows > 0) {
+					$output->writeln('Updated '.$touchedFilecacheRows.' filecache rows for mimetype "'.$mimetype.'"');
+				}
+				$totalFilecacheUpdates += $touchedFilecacheRows;
+			}
+		}
+
+		$output->writeln('Added '.$totalNewMimetypes.' new mimetypes');
+		$output->writeln('Updated '.$totalFilecacheUpdates.' filecache rows');
+	}
+}
diff --git a/core/register_command.php b/core/register_command.php
index b79c69c8fd5..d3c04ad0671 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -79,10 +79,11 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	);
 	$application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
 
+	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
+	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
 	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair(\OC\Repair::getRepairSteps()), \OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Maintenance\SingleUser(\OC::$server->getConfig()));
-	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
 
 	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig()));
 
-- 
GitLab


From c6314fc699c7316973fa79f75b7d585e620323e9 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Fri, 4 Sep 2015 16:21:28 +0100
Subject: [PATCH 169/783] Unit tests for mimetype loader

---
 .../maintenance/mimetype/updatedbtest.php     | 184 ++++++++++++++++++
 tests/lib/files/type/loadertest.php           |  93 +++++++++
 2 files changed, 277 insertions(+)
 create mode 100644 tests/core/command/maintenance/mimetype/updatedbtest.php
 create mode 100644 tests/lib/files/type/loadertest.php

diff --git a/tests/core/command/maintenance/mimetype/updatedbtest.php b/tests/core/command/maintenance/mimetype/updatedbtest.php
new file mode 100644
index 00000000000..217301102c5
--- /dev/null
+++ b/tests/core/command/maintenance/mimetype/updatedbtest.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Tests\Core\Command\Maintenance\Mimetype;
+
+use OC\Core\Command\Maintenance\Mimetype\UpdateDB;
+use Test\TestCase;
+use OCP\Files\IMimeTypeDetector;
+use OCP\Files\IMimeTypeLoader;
+
+class UpdateDBTest extends TestCase {
+	/** @var IMimeTypeDetector */
+	protected $detector;
+	/** @var IMimeTypeLoader */
+	protected $loader;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleInput;
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleOutput;
+
+	/** @var \Symfony\Component\Console\Command\Command */
+	protected $command;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->detector = $this->getMockBuilder('OC\Files\Type\Detection')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->loader = $this->getMockBuilder('OC\Files\Type\Loader')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+
+		$this->command = new UpdateDB($this->detector, $this->loader);
+	}
+
+	public function testNoop() {
+		$this->consoleInput->method('getOption')
+			->with('repair-filecache')
+			->willReturn(false);
+
+		$this->detector->expects($this->once())
+			->method('getAllMappings')
+			->willReturn([
+				'ext' => ['testing/existingmimetype']
+			]);
+		$this->loader->expects($this->once())
+			->method('exists')
+			->with('testing/existingmimetype')
+			->willReturn(true);
+
+		$this->loader->expects($this->never())
+			->method('updateFilecache');
+
+		$this->consoleOutput->expects($this->at(0))
+			->method('writeln')
+			->with('Added 0 new mimetypes');
+		$this->consoleOutput->expects($this->at(1))
+			->method('writeln')
+			->with('Updated 0 filecache rows');
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function testAddMimetype() {
+		$this->consoleInput->method('getOption')
+			->with('repair-filecache')
+			->willReturn(false);
+
+		$this->detector->expects($this->once())
+			->method('getAllMappings')
+			->willReturn([
+				'ext' => ['testing/existingmimetype'],
+				'new' => ['testing/newmimetype']
+			]);
+		$this->loader->expects($this->exactly(2))
+			->method('exists')
+			->will($this->returnValueMap([
+				['testing/existingmimetype', true],
+				['testing/newmimetype', false],
+			]));
+		$this->loader->expects($this->exactly(2))
+			->method('getId')
+			->will($this->returnValueMap([
+				['testing/existingmimetype', 1],
+				['testing/newmimetype', 2],
+			]));
+
+		$this->loader->expects($this->once())
+			->method('updateFilecache')
+			->with('new', 2)
+			->willReturn(3);
+
+		$this->consoleOutput->expects($this->at(0))
+			->method('writeln')
+			->with('Added mimetype "testing/newmimetype" to database');
+		$this->consoleOutput->expects($this->at(1))
+			->method('writeln')
+			->with('Updated 3 filecache rows for mimetype "testing/newmimetype"');
+
+		$this->consoleOutput->expects($this->at(2))
+			->method('writeln')
+			->with('Added 1 new mimetypes');
+		$this->consoleOutput->expects($this->at(3))
+			->method('writeln')
+			->with('Updated 3 filecache rows');
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function testSkipComments() {
+		$this->detector->expects($this->once())
+			->method('getAllMappings')
+			->willReturn([
+				'_comment' => 'some comment in the JSON'
+			]);
+		$this->loader->expects($this->never())
+			->method('exists');
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function testRepairFilecache() {
+		$this->consoleInput->method('getOption')
+			->with('repair-filecache')
+			->willReturn(true);
+
+		$this->detector->expects($this->once())
+			->method('getAllMappings')
+			->willReturn([
+				'ext' => ['testing/existingmimetype'],
+			]);
+		$this->loader->expects($this->exactly(1))
+			->method('exists')
+			->will($this->returnValueMap([
+				['testing/existingmimetype', true],
+			]));
+		$this->loader->expects($this->exactly(1))
+			->method('getId')
+			->will($this->returnValueMap([
+				['testing/existingmimetype', 1],
+			]));
+
+		$this->loader->expects($this->once())
+			->method('updateFilecache')
+			->with('ext', 1)
+			->willReturn(3);
+
+		$this->consoleOutput->expects($this->at(0))
+			->method('writeln')
+			->with('Updated 3 filecache rows for mimetype "testing/existingmimetype"');
+
+		$this->consoleOutput->expects($this->at(1))
+			->method('writeln')
+			->with('Added 0 new mimetypes');
+		$this->consoleOutput->expects($this->at(2))
+			->method('writeln')
+			->with('Updated 3 filecache rows');
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+}
diff --git a/tests/lib/files/type/loadertest.php b/tests/lib/files/type/loadertest.php
new file mode 100644
index 00000000000..7f87afd2f4d
--- /dev/null
+++ b/tests/lib/files/type/loadertest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Files\Type;
+
+use \OC\Files\Type\Loader;
+use \OCP\IDBConnection;
+
+class LoaderTest extends \Test\TestCase {
+	/** @var IDBConnection */
+	protected $db;
+	/** @var Loader */
+	protected $loader;
+
+	protected function setUp() {
+		$this->db = \OC::$server->getDatabaseConnection();
+		$this->loader = new Loader($this->db);
+	}
+
+	protected function tearDown() {
+		$deleteMimetypes = $this->db->getQueryBuilder();
+		$deleteMimetypes->delete('mimetypes')
+			->where($deleteMimetypes->expr()->like(
+				'mimetype', $deleteMimetypes->createPositionalParameter('testing/%')
+			));
+		$deleteMimetypes->execute();
+	}
+
+
+	public function testGetMimetype() {
+		$qb = $this->db->getQueryBuilder();
+		$qb->insert('mimetypes')
+			->values([
+				'mimetype' => $qb->createPositionalParameter('testing/mymimetype')
+			]);
+		$qb->execute();
+
+		$this->assertTrue($this->loader->exists('testing/mymimetype'));
+		$mimetypeId = $this->loader->getId('testing/mymimetype');
+		$this->assertNotNull($mimetypeId);
+
+		$mimetype = $this->loader->getMimetypeById($mimetypeId);
+		$this->assertEquals('testing/mymimetype', $mimetype);
+	}
+
+	public function testGetNonexistentMimetype() {
+		$this->assertFalse($this->loader->exists('testing/nonexistent'));
+		// hopefully this ID doesn't exist
+		$this->assertNull($this->loader->getMimetypeById(12345));
+	}
+
+	public function testStore() {
+		$this->assertFalse($this->loader->exists('testing/mymimetype'));
+		$mimetypeId = $this->loader->getId('testing/mymimetype');
+
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('mimetype')
+			->from('mimetypes')
+			->where($qb->expr()->eq('id', $qb->createPositionalParameter($mimetypeId)));
+
+		$mimetype = $qb->execute()->fetch();
+		$this->assertEquals('testing/mymimetype', $mimetype['mimetype']);
+
+		$this->assertEquals('testing/mymimetype', $this->loader->getMimetypeById($mimetypeId));
+		$this->assertEquals($mimetypeId, $this->loader->getId('testing/mymimetype'));
+	}
+
+	public function testStoreExists() {
+		$mimetypeId = $this->loader->getId('testing/mymimetype');
+		$mimetypeId2 = $this->loader->getId('testing/mymimetype');
+
+		$this->assertEquals($mimetypeId, $mimetypeId2);
+	}
+
+}
-- 
GitLab


From b3acf09c60f6d4c9ea4583a65e9a14d597ee91e4 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Fri, 4 Sep 2015 22:11:45 +0100
Subject: [PATCH 170/783] Only add valid root for enabled apps

---
 lib/base.php        | 4 ----
 lib/private/app.php | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 63aad4518ab..a4b5e9e01bf 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -552,10 +552,6 @@ class OC {
 			exit();
 		}
 
-		foreach(OC::$APPSROOTS as $appRoot) {
-			self::$loader->addValidRoot($appRoot['path']);
-		}
-
 		// setup the basic server
 		self::$server = new \OC\Server(\OC::$WEBROOT);
 		\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
diff --git a/lib/private/app.php b/lib/private/app.php
index f1a1d27ae66..f6a81f9945f 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -105,7 +105,6 @@ class OC_App {
 		ob_start();
 		foreach ($apps as $app) {
 			if ((is_null($types) or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) {
-				self::$loadedApps[] = $app;
 				self::loadApp($app);
 			}
 		}
@@ -122,6 +121,8 @@ class OC_App {
 	 * @throws \OC\NeedsUpdateException
 	 */
 	public static function loadApp($app, $checkUpgrade = true) {
+		self::$loadedApps[] = $app;
+		\OC::$loader->addValidRoot(self::getAppPath($app));
 		if (is_file(self::getAppPath($app) . '/appinfo/app.php')) {
 			\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
 			if ($checkUpgrade and self::shouldUpgrade($app)) {
-- 
GitLab


From 895e6337325f4a107aeb834268bbcc0205ecb308 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Fri, 4 Sep 2015 22:27:09 +0100
Subject: [PATCH 171/783] Resolve autoloader valid roots before checking

Allows symlinked app directories to work properly
---
 lib/autoloader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/autoloader.php b/lib/autoloader.php
index d7649781ea1..dd09c3b9cb5 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -58,7 +58,7 @@ class Autoloader {
 	 * @param string $root
 	 */
 	public function addValidRoot($root) {
-		$this->validRoots[] = $root;
+		$this->validRoots[] = stream_resolve_include_path($root);
 	}
 
 	/**
-- 
GitLab


From b06bc409e072343a69410283e1dcedfb5630572f Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Sat, 5 Sep 2015 02:24:18 +0100
Subject: [PATCH 172/783] Rebuild app navigation in JS

Retrieve all app navigations to prevent reloading appinfo/app.php and
causing an error when the app isn't fully loaded. The addition/deletion
logic has been moved to JS, simplifying a lot of code.
---
 lib/private/app.php                | 23 ----------------------
 settings/ajax/navigationdetect.php | 12 ++----------
 settings/js/apps.js                | 31 ++++++++++++++----------------
 3 files changed, 16 insertions(+), 50 deletions(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index f1a1d27ae66..d5415834fa4 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -384,29 +384,6 @@ class OC_App {
 		return true;
 	}
 
-	/**
-	 * Get the navigation entries for the $app
-	 *
-	 * @param string $app app
-	 * @return array an array of the $data added with addNavigationEntry
-	 *
-	 * Warning: destroys the existing entries
-	 */
-	public static function getAppNavigationEntries($app) {
-		if (is_file(self::getAppPath($app) . '/appinfo/app.php')) {
-			OC::$server->getNavigationManager()->clear();
-			try {
-				require $app . '/appinfo/app.php';
-			} catch (\OC\Encryption\Exceptions\ModuleAlreadyExistsException $e) {
-				// FIXME we should avoid getting this exception in first place,
-				// For now we just catch it, since we don't care about encryption modules
-				// when trying to find out, whether the app has a navigation entry.
-			}
-			return OC::$server->getNavigationManager()->getAll();
-		}
-		return array();
-	}
-
 	/**
 	 * gets the active Menu entry
 	 *
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index d7c1cbc5a12..abf04805d87 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -23,14 +23,6 @@
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
-$app = (string)$_GET['app'];
-$app = OC_App::cleanAppId($app);
+$navigation = \OC::$server->getNavigationManager()->getAll();
 
-$navigation = OC_App::getAppNavigationEntries($app);
-
-$navIds = array();
-foreach ($navigation as $nav) {
-	$navIds[] = $nav['id'];
-}
-
-OCP\JSON::success(array('nav_ids' => array_values($navIds), 'nav_entries' => $navigation));
+OCP\JSON::success(['nav_entries' => $navigation]);
diff --git a/settings/js/apps.js b/settings/js/apps.js
index d1de3d727c0..f775ecad620 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -219,10 +219,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					element.val(t('settings','Disable'));
 					appItem.addClass('appwarning');
 				} else {
+					OC.Settings.Apps.rebuildNavigation();
 					appItem.data('active',false);
 					appItem.data('groups', '');
 					element.data('active',false);
-					OC.Settings.Apps.removeNavigation(appId);
 					appItem.removeClass('active');
 					element.val(t('settings','Enable'));
 					element.parent().find(".groups-enable").hide();
@@ -245,7 +245,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					element.val(t('settings','Enable'));
 					appItem.addClass('appwarning');
 				} else {
-					OC.Settings.Apps.addNavigation(appId);
+					OC.Settings.Apps.rebuildNavigation();
 					appItem.data('active',true);
 					element.data('active',true);
 					appItem.addClass('active');
@@ -278,7 +278,6 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					appItem.data('errormsg', t('settings', 'Error while enabling app'));
 					appItem.data('active',false);
 					appItem.addClass('appwarning');
-					OC.Settings.Apps.removeNavigation(appId);
 					element.val(t('settings','Enable'));
 				});
 		}
@@ -312,7 +311,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while uninstalling app'));
 				element.val(t('settings','Uninstall'));
 			} else {
-				OC.Settings.Apps.removeNavigation(appId);
+				OC.Settings.Apps.rebuildNavigation();
 				element.parent().fadeOut(function() {
 					element.remove();
 				});
@@ -320,23 +319,15 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		},'json');
 	},
 
-	removeNavigation: function(appId){
-		$.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appId}).done(function(response){
-			if(response.status === 'success'){
-				var navIds=response.nav_ids;
-				for(var i=0; i< navIds.length; i++){
-					$('#apps ul').children('li[data-id="'+navIds[i]+'"]').remove();
-				}
-			}
-		});
-	},
-	addNavigation: function(appid){
-		$.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appid}).done(function(response){
+	rebuildNavigation: function() {
+		$.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php')).done(function(response){
 			if(response.status === 'success'){
+				var idsToKeep = {};
 				var navEntries=response.nav_entries;
+				var container = $('#apps ul');
 				for(var i=0; i< navEntries.length; i++){
 					var entry = navEntries[i];
-					var container = $('#apps ul');
+					idsToKeep[entry.id] = true;
 
 					if(container.children('li[data-id="'+entry.id+'"]').length === 0){
 						var li=$('<li></li>');
@@ -377,6 +368,12 @@ OC.Settings.Apps = OC.Settings.Apps || {
 						}
 					}
 				}
+
+				container.children('li[data-id]').each(function(index, el) {
+					if (!idsToKeep[$(el).data('id')]) {
+						$(el).remove();
+					}
+				});
 			}
 		});
 	},
-- 
GitLab


From f3b8634058db07555b31a8fde8e02d4eb6201dae Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 5 Sep 2015 01:55:18 -0400
Subject: [PATCH 173/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/es.js         | 3 +++
 apps/encryption/l10n/es.json       | 3 +++
 apps/encryption/l10n/et_EE.js      | 8 ++++++++
 apps/encryption/l10n/et_EE.json    | 8 ++++++++
 apps/files_sharing/l10n/el.js      | 1 +
 apps/files_sharing/l10n/el.json    | 1 +
 apps/files_sharing/l10n/es.js      | 1 +
 apps/files_sharing/l10n/es.json    | 1 +
 apps/files_sharing/l10n/et_EE.js   | 4 ++++
 apps/files_sharing/l10n/et_EE.json | 4 ++++
 apps/files_sharing/l10n/fi_FI.js   | 1 +
 apps/files_sharing/l10n/fi_FI.json | 1 +
 apps/files_sharing/l10n/it.js      | 1 +
 apps/files_sharing/l10n/it.json    | 1 +
 apps/files_sharing/l10n/pt_BR.js   | 1 +
 apps/files_sharing/l10n/pt_BR.json | 1 +
 settings/l10n/es.js                | 5 +++++
 settings/l10n/es.json              | 5 +++++
 settings/l10n/et_EE.js             | 1 +
 settings/l10n/et_EE.json           | 1 +
 20 files changed, 52 insertions(+)

diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index 516722cdc0f..cadedbcc0d4 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
     "Encryption App is enabled and ready" : "Cifrado App está habilitada y lista",
+    "one-time password for server-side-encryption" : "Contraseña de un solo uso para el cifrado en el lado servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hola,\n\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:  '%s'.\n\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.\n\n",
     "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
     "Cheers!" : "¡Saludos!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hola,\n<br><br>\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:   <strong>%s</strong>\n<br><br>\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.<br><br>",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index b070b9393a3..9bdad94cb6d 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
     "Encryption App is enabled and ready" : "Cifrado App está habilitada y lista",
+    "one-time password for server-side-encryption" : "Contraseña de un solo uso para el cifrado en el lado servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hola,\n\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:  '%s'.\n\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.\n\n",
     "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
     "Cheers!" : "¡Saludos!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hola,\n<br><br>\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:   <strong>%s</strong>\n<br><br>\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.<br><br>",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
diff --git a/apps/encryption/l10n/et_EE.js b/apps/encryption/l10n/et_EE.js
index f7e7e1de12c..501772c2808 100644
--- a/apps/encryption/l10n/et_EE.js
+++ b/apps/encryption/l10n/et_EE.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
     "Password successfully changed." : "Parool edukalt vahetatud.",
     "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+    "Recovery Key disabled" : "Taastevõti on välja lülitatud",
+    "Recovery Key enabled" : "Taastevõti on sisse lülitatud",
     "Could not update the private key password." : "Ei suutnud uuendada privaatse võtme parooli.",
     "The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.",
     "The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.",
@@ -23,8 +25,14 @@ OC.L10N.register(
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
     "The share will expire on %s." : "Jagamine aegub %s.",
     "Cheers!" : "Terekest!",
+    "Enable recovery key" : "Luba taastevõtme kasutamine",
+    "Disable recovery key" : "Keela taastevõtme kasutamine",
     "Recovery key password" : "Taastevõtme parool",
+    "Repeat recovery key password" : "Korda taastevõtme parooli",
     "Change recovery key password:" : "Muuda taastevõtme parooli:",
+    "Old recovery key password" : "Vana taastevõtme parool",
+    "New recovery key password" : "Uus taastevõtme parool",
+    "Repeat new recovery key password" : "Korda uut taastevõtme parooli",
     "Change Password" : "Muuda parooli",
     "Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
     "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
diff --git a/apps/encryption/l10n/et_EE.json b/apps/encryption/l10n/et_EE.json
index ab02c63a71e..14d4c59f9fc 100644
--- a/apps/encryption/l10n/et_EE.json
+++ b/apps/encryption/l10n/et_EE.json
@@ -12,6 +12,8 @@
     "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
     "Password successfully changed." : "Parool edukalt vahetatud.",
     "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+    "Recovery Key disabled" : "Taastevõti on välja lülitatud",
+    "Recovery Key enabled" : "Taastevõti on sisse lülitatud",
     "Could not update the private key password." : "Ei suutnud uuendada privaatse võtme parooli.",
     "The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.",
     "The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.",
@@ -21,8 +23,14 @@
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
     "The share will expire on %s." : "Jagamine aegub %s.",
     "Cheers!" : "Terekest!",
+    "Enable recovery key" : "Luba taastevõtme kasutamine",
+    "Disable recovery key" : "Keela taastevõtme kasutamine",
     "Recovery key password" : "Taastevõtme parool",
+    "Repeat recovery key password" : "Korda taastevõtme parooli",
     "Change recovery key password:" : "Muuda taastevõtme parooli:",
+    "Old recovery key password" : "Vana taastevõtme parool",
+    "New recovery key password" : "Uus taastevõtme parool",
+    "Repeat new recovery key password" : "Korda uut taastevõtme parooli",
     "Change Password" : "Muuda parooli",
     "Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
     "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index a72abe23b7f..804b0984729 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federated σύννεφο",
     "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:",
     "Share it:" : "Μοιραστείτε το:",
+    "Add to your website" : "Προσθήκη στην ιστοσελίδα σας",
     "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ",
     "HTML Code:" : "Κώδικας HTML:"
 },
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index 7b2b9848a72..7cc38fc1085 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -64,6 +64,7 @@
     "Federated Cloud" : "Federated σύννεφο",
     "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:",
     "Share it:" : "Μοιραστείτε το:",
+    "Add to your website" : "Προσθήκη στην ιστοσελίδα σας",
     "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ",
     "HTML Code:" : "Κώδικας HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index e094507d396..c7d6b8253a1 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Federated Cloud" : "Nube Federada",
     "Your Federated Cloud ID:" : "Su ID Nube Federada:",
     "Share it:" : "Compartir:",
+    "Add to your website" : "Añadir a su Website",
     "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index 48f1f22a1fd..f3666ee785f 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -64,6 +64,7 @@
     "Federated Cloud" : "Nube Federada",
     "Your Federated Cloud ID:" : "Su ID Nube Federada:",
     "Share it:" : "Compartir:",
+    "Add to your website" : "Añadir a su Website",
     "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js
index a558a91896a..bdd2bc13afd 100644
--- a/apps/files_sharing/l10n/et_EE.js
+++ b/apps/files_sharing/l10n/et_EE.js
@@ -4,13 +4,17 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Serverist serverisse jagamine pole antud serveris lubatud",
     "The mountpoint name contains invalid characters." : "Ühenduspunkti nimes on vigaseid märke.",
     "Invalid or untrusted SSL certificate" : "Vigane või tundmatu SSL sertifikaat",
+    "Storage not valid" : "Andmehoidla pole korrektne",
     "Couldn't add remote share" : "Ei suutnud lisada kaugjagamist",
     "Shared with you" : "Sinuga jagatud",
     "Shared with others" : "Teistega jagatud",
     "Shared by link" : "Jagatud lingiga",
     "Nothing shared with you yet" : "Sinuga pole veel midagi jagatud",
+    "Files and folders others share with you will show up here" : "Siin näidatakse faile ja kaustasid, mida teised on sulle jaganud",
     "Nothing shared yet" : "Midagi pole veel jagatud",
+    "Files and folders you share will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa oled teistega jaganud",
     "No shared links" : "Jagatud linke pole",
+    "Files and folders you share by link will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa jagad lingiga",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?",
     "Remote share" : "Kaugjagamine",
     "Remote share password" : "Kaugjagamise parool",
diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json
index 183f1707525..f6e13620cbd 100644
--- a/apps/files_sharing/l10n/et_EE.json
+++ b/apps/files_sharing/l10n/et_EE.json
@@ -2,13 +2,17 @@
     "Server to server sharing is not enabled on this server" : "Serverist serverisse jagamine pole antud serveris lubatud",
     "The mountpoint name contains invalid characters." : "Ühenduspunkti nimes on vigaseid märke.",
     "Invalid or untrusted SSL certificate" : "Vigane või tundmatu SSL sertifikaat",
+    "Storage not valid" : "Andmehoidla pole korrektne",
     "Couldn't add remote share" : "Ei suutnud lisada kaugjagamist",
     "Shared with you" : "Sinuga jagatud",
     "Shared with others" : "Teistega jagatud",
     "Shared by link" : "Jagatud lingiga",
     "Nothing shared with you yet" : "Sinuga pole veel midagi jagatud",
+    "Files and folders others share with you will show up here" : "Siin näidatakse faile ja kaustasid, mida teised on sulle jaganud",
     "Nothing shared yet" : "Midagi pole veel jagatud",
+    "Files and folders you share will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa oled teistega jaganud",
     "No shared links" : "Jagatud linke pole",
+    "Files and folders you share by link will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa jagad lingiga",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?",
     "Remote share" : "Kaugjagamine",
     "Remote share password" : "Kaugjagamise parool",
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index 0de3dda9290..af074056ba4 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federoitu pilvi",
     "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:",
     "Share it:" : "Jaa se:",
+    "Add to your website" : "Lisää verkkosivuillesi",
     "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta",
     "HTML Code:" : "HTML-koodi:"
 },
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index 80e353818cd..96bb63115e4 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -64,6 +64,7 @@
     "Federated Cloud" : "Federoitu pilvi",
     "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:",
     "Share it:" : "Jaa se:",
+    "Add to your website" : "Lisää verkkosivuillesi",
     "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta",
     "HTML Code:" : "HTML-koodi:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 0d8a315421f..ba37858a951 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Federated Cloud" : "Cloud federata",
     "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:",
     "Share it:" : "Condividilo:",
+    "Add to your website" : "Aggiungilo al tuo sito web",
     "Share with me via ownCloud" : "Condividi con me tramite ownCloud",
     "HTML Code:" : "Codice HTML:"
 },
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index dd41b95eab7..6eae5c0e67b 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -64,6 +64,7 @@
     "Federated Cloud" : "Cloud federata",
     "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:",
     "Share it:" : "Condividilo:",
+    "Add to your website" : "Aggiungilo al tuo sito web",
     "Share with me via ownCloud" : "Condividi con me tramite ownCloud",
     "HTML Code:" : "Codice HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 2f4e9e9e652..ccf3fd98300 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Federated Cloud" : "Nuvem Conglomerada",
     "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:",
     "Share it:" : "Compartilhe:",
+    "Add to your website" : "Adicione ao seu website",
     "Share with me via ownCloud" : "Compartilhe comigo via ownCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index fd64260a419..90c6deeb347 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -64,6 +64,7 @@
     "Federated Cloud" : "Nuvem Conglomerada",
     "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:",
     "Share it:" : "Compartilhe:",
+    "Add to your website" : "Adicione ao seu website",
     "Share with me via ownCloud" : "Compartilhe comigo via ownCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 51c22653ad8..b39ffffba1d 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -132,6 +132,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwrite.cli.url\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor revise las <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, y compruebe los errores o avisos en el <a ref=\"#log-section\">registro</a>.",
+    "All checks passed." : "Ha pasado todos los controles",
     "Open documentation" : "Documentación abierta",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
     "Allow users to share via link" : "Permite a los usuarios compartir por medio de enlaces",
@@ -155,6 +156,10 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar cifrado en el servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "El cifrado en el lado servidor es un proceso de una sola vía. Una vez el cifrado está habilitado, todos los archivos desde este punto en adelante serán cifrados en el servidor y no será posible deshabilitar el cifrado posteriormente. ",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Cualquiera que tenga acceso a este servidor ownCloud, puede descifrar estos archivos, simplemente leyendo la contraseña que se guarda en texto plano en los archivos de sesión. El cifrado del lado servidor, no protege por tanto de administradores malintencionados, pero es ùtil para proteger los datos en almacenes de datos externos de accesos no autorizados. ",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependiendo del módulo de cifrado seleccionado, el tamaño de los archivos se puede ver incrementado (hasta un 35%% o más para las opciones por defecto).",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Deberia salvar de forma regular las claves de cifrado para evitar la perdida de datos (data/<user>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
     "Enable encryption" : "Habilitar cifrado",
     "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 3c0fefc7cfa..87e280637a3 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -130,6 +130,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwrite.cli.url\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor revise las <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, y compruebe los errores o avisos en el <a ref=\"#log-section\">registro</a>.",
+    "All checks passed." : "Ha pasado todos los controles",
     "Open documentation" : "Documentación abierta",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
     "Allow users to share via link" : "Permite a los usuarios compartir por medio de enlaces",
@@ -153,6 +154,10 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar cifrado en el servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "El cifrado en el lado servidor es un proceso de una sola vía. Una vez el cifrado está habilitado, todos los archivos desde este punto en adelante serán cifrados en el servidor y no será posible deshabilitar el cifrado posteriormente. ",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Cualquiera que tenga acceso a este servidor ownCloud, puede descifrar estos archivos, simplemente leyendo la contraseña que se guarda en texto plano en los archivos de sesión. El cifrado del lado servidor, no protege por tanto de administradores malintencionados, pero es ùtil para proteger los datos en almacenes de datos externos de accesos no autorizados. ",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependiendo del módulo de cifrado seleccionado, el tamaño de los archivos se puede ver incrementado (hasta un 35%% o más para las opciones por defecto).",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Deberia salvar de forma regular las claves de cifrado para evitar la perdida de datos (data/<user>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
     "Enable encryption" : "Habilitar cifrado",
     "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index 372d07bd51e..f2efb0221e6 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -109,6 +109,7 @@ OC.L10N.register(
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel.",
     "System locale can not be set to a one which supports UTF-8." : "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t.",
     "This means that there might be problems with certain characters in file names." : "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega.",
+    "All checks passed." : "Kõik kontrollid on läbitud.",
     "Open documentation" : "Ava dokumentatsioon",
     "Allow apps to use the Share API" : "Luba rakendustel kasutada Share API-t",
     "Allow users to share via link" : "Luba kasutajatel lingiga jagamist ",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 5908d9e4149..b30857398ff 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -107,6 +107,7 @@
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel.",
     "System locale can not be set to a one which supports UTF-8." : "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t.",
     "This means that there might be problems with certain characters in file names." : "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega.",
+    "All checks passed." : "Kõik kontrollid on läbitud.",
     "Open documentation" : "Ava dokumentatsioon",
     "Allow apps to use the Share API" : "Luba rakendustel kasutada Share API-t",
     "Allow users to share via link" : "Luba kasutajatel lingiga jagamist ",
-- 
GitLab


From 0fac2e3f3aaaeaddf431f7877ebddb6372a00a42 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Sat, 5 Sep 2015 16:50:02 +0100
Subject: [PATCH 174/783] Unique exception for invalid autoload paths, better
 handling

Background jobs are tolerant of stale entries left by disabled apps,
which will cause an autoload exception.
---
 lib/autoloader.php                         |  4 ++-
 lib/private/backgroundjob/joblist.php      | 22 ++++++++-----
 lib/public/autoloadnotallowedexception.php | 36 ++++++++++++++++++++++
 3 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 lib/public/autoloadnotallowedexception.php

diff --git a/lib/autoloader.php b/lib/autoloader.php
index dd09c3b9cb5..41a040b3f54 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -27,6 +27,8 @@
 
 namespace OC;
 
+use \OCP\AutoloadNotAllowedException;
+
 class Autoloader {
 	private $useGlobalClassPath = true;
 
@@ -129,7 +131,7 @@ class Autoloader {
 				return true;
 			}
 		}
-		throw new \Exception('Path not allowed: '. $fullPath);
+		throw new AutoloadNotAllowedException($fullPath);
 	}
 
 	/**
diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index f297bccbc7d..deadadfb77e 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -26,6 +26,7 @@
 namespace OC\BackgroundJob;
 
 use OCP\BackgroundJob\IJobList;
+use OCP\AutoloadNotAllowedException;
 
 class JobList implements IJobList {
 	/**
@@ -185,15 +186,20 @@ class JobList implements IJobList {
 		/**
 		 * @var Job $job
 		 */
-		if (!class_exists($class)) {
-			// job from disabled app or old version of an app, no need to do anything
-			return null;
+		try {
+			if (!class_exists($class)) {
+				// job from disabled app or old version of an app, no need to do anything
+				return null;
+			}
+			$job = new $class();
+			$job->setId($row['id']);
+			$job->setLastRun($row['last_run']);
+			$job->setArgument(json_decode($row['argument'], true));
+			return $job;
+		} catch (AutoloadNotAllowedException $e) {
+			// job is from a disabled app, ignore
 		}
-		$job = new $class();
-		$job->setId($row['id']);
-		$job->setLastRun($row['last_run']);
-		$job->setArgument(json_decode($row['argument'], true));
-		return $job;
+		return null;
 	}
 
 	/**
diff --git a/lib/public/autoloadnotallowedexception.php b/lib/public/autoloadnotallowedexception.php
new file mode 100644
index 00000000000..edb7121c065
--- /dev/null
+++ b/lib/public/autoloadnotallowedexception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+namespace OCP;
+
+/**
+ * Exception for when a not allowed path is attempted to be autoloaded
+ * @since 8.2.0
+ */
+class AutoloadNotAllowedException extends \DomainException {
+	/**
+	 * @param string $path
+	 * @since 8.2.0
+	 */
+	public function __construct($path) {
+		parent::__construct('Autoload path not allowed: '.$path);
+	}
+}
+
-- 
GitLab


From b64e3f8db609b1f65ec23f467da7488abf92c05a Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Sat, 5 Sep 2015 20:02:49 +0100
Subject: [PATCH 175/783] Fallback to complete Memcached flush if getAllKeys
 fails

Newer Memcached's do not support the underlying protocol commands that
getAllKeys() is implemented with. We should fallback to clearing
everything in that case, as causing (temporary) performance problems for
other applications on the server is better than having stale cached data.
---
 lib/private/memcache/memcached.php |  5 +++++
 tests/lib/memcache/memcached.php   | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php
index 1503851fd73..e99303ecc15 100644
--- a/lib/private/memcache/memcached.php
+++ b/lib/private/memcache/memcached.php
@@ -89,6 +89,11 @@ class Memcached extends Cache implements IMemcache {
 	public function clear($prefix = '') {
 		$prefix = $this->getNamespace() . $prefix;
 		$allKeys = self::$cache->getAllKeys();
+		if ($allKeys === false) {
+			// newer Memcached doesn't like getAllKeys(), flush everything
+			self::$cache->flush();
+			return true;
+		}
 		$keys = array();
 		$prefixLength = strlen($prefix);
 		foreach ($allKeys as $key) {
diff --git a/tests/lib/memcache/memcached.php b/tests/lib/memcache/memcached.php
index 51a78996dd4..3ea9216029a 100644
--- a/tests/lib/memcache/memcached.php
+++ b/tests/lib/memcache/memcached.php
@@ -26,4 +26,27 @@ class Memcached extends Cache {
 		parent::setUp();
 		$this->instance = new \OC\Memcache\Memcached($this->getUniqueID());
 	}
+
+	public function testClear() {
+		// Memcached is sometimes broken with clear(), so we don't test it thoroughly
+		$value='ipsum lorum';
+		$this->instance->set('1_value1', $value);
+		$this->instance->set('1_value2', $value);
+		$this->instance->set('2_value1', $value);
+		$this->instance->set('3_value1', $value);
+
+		$this->assertTrue($this->instance->clear('1_'));
+
+		$this->assertFalse($this->instance->hasKey('1_value1'));
+		$this->assertFalse($this->instance->hasKey('1_value2'));
+		//$this->assertTrue($this->instance->hasKey('2_value1'));
+		//$this->assertTrue($this->instance->hasKey('3_value1'));
+
+		$this->assertTrue($this->instance->clear());
+
+		$this->assertFalse($this->instance->hasKey('1_value1'));
+		$this->assertFalse($this->instance->hasKey('1_value2'));
+		$this->assertFalse($this->instance->hasKey('2_value1'));
+		$this->assertFalse($this->instance->hasKey('3_value1'));
+	}
 }
-- 
GitLab


From 3642fb701a7fc0caba779de9f5d53bf12c27f5aa Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 6 Sep 2015 01:54:56 -0400
Subject: [PATCH 176/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/fr.js   | 1 +
 apps/encryption/l10n/fr.json | 1 +
 core/l10n/fr.js              | 2 ++
 core/l10n/fr.json            | 2 ++
 lib/l10n/el.js               | 1 +
 lib/l10n/el.json             | 1 +
 lib/l10n/fi_FI.js            | 1 +
 lib/l10n/fi_FI.json          | 1 +
 lib/l10n/it.js               | 1 +
 lib/l10n/it.json             | 1 +
 lib/l10n/pt_BR.js            | 1 +
 lib/l10n/pt_BR.json          | 1 +
 12 files changed, 14 insertions(+)

diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index 68063f083fc..d8da3875ce9 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée de chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de la clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
     "Encryption App is enabled and ready" : "L'application de chiffrement est activée et prête",
+    "one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous.  ",
     "The share will expire on %s." : "Le partage expirera le %s.",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index 49616502217..9d89ef275cb 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -23,6 +23,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée de chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de la clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
     "Encryption App is enabled and ready" : "L'application de chiffrement est activée et prête",
+    "one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous.  ",
     "The share will expire on %s." : "Le partage expirera le %s.",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 2ed3872dffb..27bea200a63 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Erreur de réparation :",
     "Following incompatible apps have been disabled: %s" : "Les applications incompatibles suivantes ont été désactivées : %s",
     "Following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
+    "Already up to date" : "Déjà à jour",
     "File is too big" : "Fichier trop volumineux",
     "Invalid file provided" : "Fichier non valide",
     "No image or file provided" : "Aucun fichier fourni",
@@ -247,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Veuillez contacter votre administrateur.",
     "An internal error occured." : "Une erreur interne est survenue.",
     "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.",
+    "Log in" : "Se connecter",
     "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?",
     "remember" : "se souvenir de moi",
     "Alternative Logins" : "Identifiants alternatifs",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 761132e4bde..ac12a4673d5 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -12,6 +12,7 @@
     "Repair error: " : "Erreur de réparation :",
     "Following incompatible apps have been disabled: %s" : "Les applications incompatibles suivantes ont été désactivées : %s",
     "Following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
+    "Already up to date" : "Déjà à jour",
     "File is too big" : "Fichier trop volumineux",
     "Invalid file provided" : "Fichier non valide",
     "No image or file provided" : "Aucun fichier fourni",
@@ -245,6 +246,7 @@
     "Please contact your administrator." : "Veuillez contacter votre administrateur.",
     "An internal error occured." : "Une erreur interne est survenue.",
     "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.",
+    "Log in" : "Se connecter",
     "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?",
     "remember" : "se souvenir de moi",
     "Alternative Logins" : "Identifiants alternatifs",
diff --git a/lib/l10n/el.js b/lib/l10n/el.js
index b47cc7e36d2..ee9ad8efd42 100644
--- a/lib/l10n/el.js
+++ b/lib/l10n/el.js
@@ -88,6 +88,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν υπάρχει",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος καμίας ομάδας στην οποία ο χρήστης %s είναι μέλος",
     "Sharing %s failed, because this item is already shared with %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο ήδη με τον χρήστη %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Αποτυχία διαμοιρασμού με %s, διότι αυτό το αντικείμενο διαμοιράζεται ήδη με τον χρήστη %s",
     "Sharing %s failed, because the group %s does not exist" : "Ο διαμοιρασμός του %s απέτυχε, γιατί η ομάδα χρηστών %s δεν υπάρχει",
     "Sharing %s failed, because %s is not a member of the group %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος της ομάδας %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Πρέπει να εισάγετε έναν κωδικό για να δημιουργήσετε έναν δημόσιο σύνδεσμο. Μόνο προστατευμένοι σύνδεσμοι επιτρέπονται",
diff --git a/lib/l10n/el.json b/lib/l10n/el.json
index d82aec00129..d0235598f7e 100644
--- a/lib/l10n/el.json
+++ b/lib/l10n/el.json
@@ -86,6 +86,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν υπάρχει",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος καμίας ομάδας στην οποία ο χρήστης %s είναι μέλος",
     "Sharing %s failed, because this item is already shared with %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο ήδη με τον χρήστη %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Αποτυχία διαμοιρασμού με %s, διότι αυτό το αντικείμενο διαμοιράζεται ήδη με τον χρήστη %s",
     "Sharing %s failed, because the group %s does not exist" : "Ο διαμοιρασμός του %s απέτυχε, γιατί η ομάδα χρηστών %s δεν υπάρχει",
     "Sharing %s failed, because %s is not a member of the group %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος της ομάδας %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Πρέπει να εισάγετε έναν κωδικό για να δημιουργήσετε έναν δημόσιο σύνδεσμο. Μόνο προστατευμένοι σύνδεσμοι επιτρέπονται",
diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js
index d82d26645db..6960162e0ab 100644
--- a/lib/l10n/fi_FI.js
+++ b/lib/l10n/fi_FI.js
@@ -82,6 +82,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s is the item owner" : "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on kohteen omistaja",
     "Sharing %s failed, because the user %s does not exist" : "Kohteen %s jakaminen epäonnistui, koska käyttäjää %s ei ole olemassa",
     "Sharing %s failed, because this item is already shared with %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
+    "Sharing %s failed, because this item is already shared with user %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
     "Sharing %s failed, because the group %s does not exist" : "Kohteen %s jakaminen epäonnistui, koska ryhmää %s ei ole olemassa",
     "Sharing %s failed, because %s is not a member of the group %s" : "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s ei ole ryhmän %s jäsen",
     "You need to provide a password to create a public link, only protected links are allowed" : "Anna salasana luodaksesi julkisen linkin. Vain suojatut linkit ovat sallittuja",
diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json
index de6d474e467..7d23189b358 100644
--- a/lib/l10n/fi_FI.json
+++ b/lib/l10n/fi_FI.json
@@ -80,6 +80,7 @@
     "Sharing %s failed, because the user %s is the item owner" : "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on kohteen omistaja",
     "Sharing %s failed, because the user %s does not exist" : "Kohteen %s jakaminen epäonnistui, koska käyttäjää %s ei ole olemassa",
     "Sharing %s failed, because this item is already shared with %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
+    "Sharing %s failed, because this item is already shared with user %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
     "Sharing %s failed, because the group %s does not exist" : "Kohteen %s jakaminen epäonnistui, koska ryhmää %s ei ole olemassa",
     "Sharing %s failed, because %s is not a member of the group %s" : "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s ei ole ryhmän %s jäsen",
     "You need to provide a password to create a public link, only protected links are allowed" : "Anna salasana luodaksesi julkisen linkin. Vain suojatut linkit ovat sallittuja",
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
index d0c0022fd06..d0cf725013b 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -91,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Condivisione di %s non riuscita, poiché l'utente %s non esiste",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Condivisione di %s non riuscita, poiché l'utente %s non appartiene ad alcun gruppo di cui %s è membro",
     "Sharing %s failed, because this item is already shared with %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con l'utente %s",
     "Sharing %s failed, because the group %s does not exist" : "Condivisione di %s non riuscita, poiché il gruppo %s non esiste",
     "Sharing %s failed, because %s is not a member of the group %s" : "Condivisione di %s non riuscita, poiché %s non appartiene al gruppo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Devi fornire una password per creare un collegamento pubblico, sono consentiti solo i collegamenti protetti",
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index 1183b588eb2..81038c0e425 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -89,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Condivisione di %s non riuscita, poiché l'utente %s non esiste",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Condivisione di %s non riuscita, poiché l'utente %s non appartiene ad alcun gruppo di cui %s è membro",
     "Sharing %s failed, because this item is already shared with %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con l'utente %s",
     "Sharing %s failed, because the group %s does not exist" : "Condivisione di %s non riuscita, poiché il gruppo %s non esiste",
     "Sharing %s failed, because %s is not a member of the group %s" : "Condivisione di %s non riuscita, poiché %s non appartiene al gruppo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Devi fornire una password per creare un collegamento pubblico, sono consentiti solo i collegamenti protetti",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index a53e5f01a16..402a7cbc51a 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -91,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Compartilhamento %s falhou, porque o usuário %s não existe",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Compartilhamento %s falhou, porque o usuário %s não é membro de nenhum grupo que o usuário %s pertença",
     "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou, porque este ítem já está compartilhado com %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Compartilhamento de %s falhou, porque esse item já é compartilhada com o usuário %s",
     "Sharing %s failed, because the group %s does not exist" : "Compartilhamento %s falhou, porque o grupo %s não existe",
     "Sharing %s failed, because %s is not a member of the group %s" : "Compartilhamento %s falhou, porque  %s não é membro do grupo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Você precisa fornecer uma senha para criar um link público, apenas links protegidos são permitidos",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index cef167c2098..255272b8cb8 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -89,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Compartilhamento %s falhou, porque o usuário %s não existe",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Compartilhamento %s falhou, porque o usuário %s não é membro de nenhum grupo que o usuário %s pertença",
     "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou, porque este ítem já está compartilhado com %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Compartilhamento de %s falhou, porque esse item já é compartilhada com o usuário %s",
     "Sharing %s failed, because the group %s does not exist" : "Compartilhamento %s falhou, porque o grupo %s não existe",
     "Sharing %s failed, because %s is not a member of the group %s" : "Compartilhamento %s falhou, porque  %s não é membro do grupo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Você precisa fornecer uma senha para criar um link público, apenas links protegidos são permitidos",
-- 
GitLab


From c3a327dc385c617bc2daf0b5a51aacfaea2abde1 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Sun, 6 Sep 2015 18:11:34 +0100
Subject: [PATCH 177/783] Add config.sample.php parameter for tempdirectory

---
 config/config.sample.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/config/config.sample.php b/config/config.sample.php
index 234bf8e0fa3..f831080d480 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -79,6 +79,16 @@ $CONFIG = array(
  */
 'datadirectory' => '/var/www/owncloud/data',
 
+/**
+ * Override where ownCloud stores temporary files. Useful in situations where
+ * the system temporary directory is on a limited space ramdisk or is otherwise
+ * restricted, or if external storages which do not support streaming are in
+ * use.
+ *
+ * The web server user must have write access to this directory.
+ */
+'tempdirectory' => '/tmp/owncloudtemp',
+
 /**
  * The current version number of your ownCloud installation. This is set up
  * during installation and update, so you shouldn't need to change it.
-- 
GitLab


From 227868fe168529a638dcf2dbff4ff8f44cadc519 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Sun, 6 Sep 2015 23:24:10 +0100
Subject: [PATCH 178/783] Get sorted navigation list

---
 settings/ajax/navigationdetect.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index abf04805d87..5d3b34e10ef 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -23,6 +23,6 @@
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
-$navigation = \OC::$server->getNavigationManager()->getAll();
+$navigation = \OC_App::getNavigation();
 
 OCP\JSON::success(['nav_entries' => $navigation]);
-- 
GitLab


From 53a0009e7b24762811ecf705aa554564e3a5170e Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 7 Sep 2015 01:55:04 -0400
Subject: [PATCH 179/783] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/da.js   |  1 +
 apps/files_sharing/l10n/da.json |  1 +
 core/l10n/de_DE.js              | 14 ++++++++++++++
 core/l10n/de_DE.json            | 14 ++++++++++++++
 4 files changed, 30 insertions(+)

diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index b08b09f4284..0c0f009f6ec 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Din Federated Cloud ID:",
     "Share it:" : "Del:",
+    "Add to your website" : "Tilføj til dit websted",
     "Share with me via ownCloud" : "Del med mig gennem ownCloud",
     "HTML Code:" : "HTMLkode:"
 },
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index 5cd51acafc6..0f517fbd64d 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -64,6 +64,7 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Din Federated Cloud ID:",
     "Share it:" : "Del:",
+    "Add to your website" : "Tilføj til dit websted",
     "Share with me via ownCloud" : "Del med mig gennem ownCloud",
     "HTML Code:" : "HTMLkode:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 6a77c3952c3..0a4689261a6 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
+    "Preparing update" : "Update vorbereiten",
     "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ",
     "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
     "Maintenance mode is kept active" : "Wartungsmodus wird aktiv gehalten",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Reperaturfehler:",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
+    "Already up to date" : "Bereits aktuell",
     "File is too big" : "Datei ist zu groß",
     "Invalid file provided" : "Ungültige Datei zur Verfügung gestellt",
     "No image or file provided" : "Es wurde weder ein Bild noch eine Datei zur Verfügung gestellt",
@@ -36,6 +38,13 @@ OC.L10N.register(
     "Thu." : "Do",
     "Fri." : "Fr",
     "Sat." : "Sa",
+    "Su" : "So",
+    "Mo" : "Mo",
+    "Tu" : "Di",
+    "We" : "Mi",
+    "Th" : "Do",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "März",
@@ -236,6 +245,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.",
     "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
     "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.",
+    "Log in" : "Einloggen",
     "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "remember" : "merken",
     "Alternative Logins" : "Alternative Logins",
@@ -248,6 +258,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie Administrator dieser Instanz sind, konfigurieren Sie bitte die „trusted_domain“-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereitgestellt.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Wenn es Ihre Konfiguration zulässt, können Sie als Administrator gegebenenfalls den Button unten benutzen, um diese Domain als vertrauenswürdig einzustufen.",
     "Add \"%s\" as trusted domain" : "„%s“ als vertrauenswürdige Domain hinzufügen",
+    "App update required" : "App-Update notwendig",
+    "%s will be updated to version %s" : "%s wird auf Version %s aktualisiert",
+    "These apps will be updated:" : "Diese Apps werden aktualisiert:",
+    "These incompatible apps will be disabled:" : "Diese inkompatiblen Apps werden deaktiviert:",
     "The theme %s has been disabled." : "Das Thema %s wurde deaktiviert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stellen Sie vor dem Fortsetzen bitte sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
     "Start update" : "Aktualisierung starten",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index fc6dc12aa17..a5f2d5857e3 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
+    "Preparing update" : "Update vorbereiten",
     "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ",
     "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
     "Maintenance mode is kept active" : "Wartungsmodus wird aktiv gehalten",
@@ -11,6 +12,7 @@
     "Repair error: " : "Reperaturfehler:",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
+    "Already up to date" : "Bereits aktuell",
     "File is too big" : "Datei ist zu groß",
     "Invalid file provided" : "Ungültige Datei zur Verfügung gestellt",
     "No image or file provided" : "Es wurde weder ein Bild noch eine Datei zur Verfügung gestellt",
@@ -34,6 +36,13 @@
     "Thu." : "Do",
     "Fri." : "Fr",
     "Sat." : "Sa",
+    "Su" : "So",
+    "Mo" : "Mo",
+    "Tu" : "Di",
+    "We" : "Mi",
+    "Th" : "Do",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "März",
@@ -234,6 +243,7 @@
     "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.",
     "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
     "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.",
+    "Log in" : "Einloggen",
     "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "remember" : "merken",
     "Alternative Logins" : "Alternative Logins",
@@ -246,6 +256,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie Administrator dieser Instanz sind, konfigurieren Sie bitte die „trusted_domain“-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereitgestellt.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Wenn es Ihre Konfiguration zulässt, können Sie als Administrator gegebenenfalls den Button unten benutzen, um diese Domain als vertrauenswürdig einzustufen.",
     "Add \"%s\" as trusted domain" : "„%s“ als vertrauenswürdige Domain hinzufügen",
+    "App update required" : "App-Update notwendig",
+    "%s will be updated to version %s" : "%s wird auf Version %s aktualisiert",
+    "These apps will be updated:" : "Diese Apps werden aktualisiert:",
+    "These incompatible apps will be disabled:" : "Diese inkompatiblen Apps werden deaktiviert:",
     "The theme %s has been disabled." : "Das Thema %s wurde deaktiviert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stellen Sie vor dem Fortsetzen bitte sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
     "Start update" : "Aktualisierung starten",
-- 
GitLab


From 089396758849ea26eb512c72065aee77c8b99c99 Mon Sep 17 00:00:00 2001
From: tflidd <tflidd@aspekte.net>
Date: Mon, 7 Sep 2015 09:30:45 +0200
Subject: [PATCH 180/783] Add documentation link php-fpm

Admin-Page warning didn't have a direct link to the documentation.
---
 settings/templates/admin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index da80ca15b0c..4ce3e7bcb78 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -73,7 +73,8 @@ if ($_['getenvServerNotWorking']) {
 ?>
 	<li>
 		<?php p($l->t('php does not seem to be setup properly to query system environment variables. The test with getenv("PATH") only returns an empty response.')); ?><br>
-		<?php p($l->t('Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm.')); ?>
+                <?php print_unescaped($l->t('Please check the <a target="_blank" href="%s">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.', link_to_docs('admin-php-fpm'))); ?>
+
 	</li>
 <?php
 }
-- 
GitLab


From 90fd8bab557518ccbb3f2ca346aabdbbd3eaaa02 Mon Sep 17 00:00:00 2001
From: tflidd <tflidd@aspekte.net>
Date: Mon, 7 Sep 2015 10:05:25 +0200
Subject: [PATCH 181/783] remove spaces and empty line

---
 settings/templates/admin.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 4ce3e7bcb78..75b7161142f 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -73,8 +73,7 @@ if ($_['getenvServerNotWorking']) {
 ?>
 	<li>
 		<?php p($l->t('php does not seem to be setup properly to query system environment variables. The test with getenv("PATH") only returns an empty response.')); ?><br>
-                <?php print_unescaped($l->t('Please check the <a target="_blank" href="%s">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.', link_to_docs('admin-php-fpm'))); ?>
-
+		<?php print_unescaped($l->t('Please check the <a target="_blank" href="%s">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.', link_to_docs('admin-php-fpm'))); ?>
 	</li>
 <?php
 }
-- 
GitLab


From 4251dceccaa01ad5e75c08590b9fc91dbc87242b Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 7 Sep 2015 10:33:23 +0200
Subject: [PATCH 182/783] Remove unneeded include

* fixes #18867
* ref #18748
---
 apps/files_versions/appinfo/app.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 3bad0d8a94d..967f2e73a34 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-OCP\Util::addscript('files_versions', 'versions');
 OCP\Util::addStyle('files_versions', 'versions');
 
 \OCA\Files_Versions\Hooks::connectHooks();
-- 
GitLab


From c97147c99a894f81135b1df29e8c0d86bb4f1cc3 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 7 Sep 2015 10:28:08 +0100
Subject: [PATCH 183/783] Check if app is enabled instead of if class exists

---
 settings/users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/users.php b/settings/users.php
index d4e51900ddd..843995a57f9 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -41,7 +41,7 @@ $groupManager = \OC_Group::getManager();
 // Set the sort option: SORT_USERCOUNT or SORT_GROUPNAME
 $sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT;
 
-if (class_exists('\OCA\user_ldap\GROUP_LDAP')) {
+if (\OC_App::isEnabled('user_ldap')) {
 	$isLDAPUsed =
 		   $groupManager->isBackendUsed('\OCA\user_ldap\GROUP_LDAP')
 		|| $groupManager->isBackendUsed('\OCA\user_ldap\Group_Proxy');
-- 
GitLab


From 7af7fdd92936139480ef0fbb41fbcba970ba7c32 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 7 Sep 2015 14:28:20 +0200
Subject: [PATCH 184/783] Use context function call instead of static

---
 apps/files_sharing/lib/sharedmount.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php
index 2771e0415b0..9aa9bbf562b 100644
--- a/apps/files_sharing/lib/sharedmount.php
+++ b/apps/files_sharing/lib/sharedmount.php
@@ -81,7 +81,7 @@ class SharedMount extends MountPoint implements MoveableMount {
 		);
 
 		if ($newMountPoint !== $share['file_target']) {
-			self::updateFileTarget($newMountPoint, $share);
+			$this->updateFileTarget($newMountPoint, $share);
 			$share['file_target'] = $newMountPoint;
 			$share['unique_name'] = true;
 		}
-- 
GitLab


From 24756cf90bff680a8820747af278dd0f80a6369c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 7 Sep 2015 15:09:40 +0200
Subject: [PATCH 185/783] specify where to enable locking

---
 settings/templates/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5d4ec22223e..4f3fb8f25bb 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -128,7 +128,7 @@ if (!$_['has_fileinfo']) {
 if ($_['fileLockingType'] === 'none') {
 	?>
 	<li>
-		<?php p($l->t('Transitional file locking is disabled, this might lead to issues with race conditions, enable \'filelocking.enabled\' to improve handling of race conditions.')); ?>
+		<?php p($l->t('Transitional file locking is disabled, this might lead to issues with race conditions, enable \'filelocking.enabled\' in config.php to improve handling of race conditions.')); ?>
 	</li>
 	<?php
 }
-- 
GitLab


From acfc7d7c4d4c2daf00ecd61b11eaa9d953868b92 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 7 Sep 2015 11:38:44 +0200
Subject: [PATCH 186/783] enable usage of a master key

---
 apps/encryption/lib/crypto/encryption.php     |  39 +++--
 apps/encryption/lib/keymanager.php            |  80 +++++++++-
 apps/encryption/lib/users/setup.php           |   1 +
 apps/encryption/lib/util.php                  |  10 ++
 apps/encryption/tests/lib/KeyManagerTest.php  | 150 ++++++++++++++++--
 apps/encryption/tests/lib/UtilTest.php        |  21 +++
 apps/encryption/tests/lib/users/SetupTest.php |   2 +
 7 files changed, 276 insertions(+), 27 deletions(-)

diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 1bd6af2eca7..d2925e1b6be 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -84,6 +84,9 @@ class Encryption implements IEncryptionModule {
 	/** @var EncryptAll */
 	private $encryptAll;
 
+	/** @var  bool */
+	private $useMasterPassword;
+
 	/**
 	 *
 	 * @param Crypt $crypt
@@ -105,6 +108,7 @@ class Encryption implements IEncryptionModule {
 		$this->encryptAll = $encryptAll;
 		$this->logger = $logger;
 		$this->l = $il10n;
+		$this->useMasterPassword = $util->isMasterKeyEnabled();
 	}
 
 	/**
@@ -193,23 +197,26 @@ class Encryption implements IEncryptionModule {
 				$this->writeCache = '';
 			}
 			$publicKeys = array();
-			foreach ($this->accessList['users'] as $uid) {
-				try {
-					$publicKeys[$uid] = $this->keyManager->getPublicKey($uid);
-				} catch (PublicKeyMissingException $e) {
-					$this->logger->warning(
-						'no public key found for user "{uid}", user will not be able to read the file',
-						['app' => 'encryption', 'uid' => $uid]
-					);
-					// if the public key of the owner is missing we should fail
-					if ($uid === $this->user) {
-						throw $e;
+			if ($this->useMasterPassword === true) {
+				$publicKeys[$this->keyManager->getMasterKeyId()] = $this->keyManager->getPublicMasterKey();
+			} else {
+				foreach ($this->accessList['users'] as $uid) {
+					try {
+						$publicKeys[$uid] = $this->keyManager->getPublicKey($uid);
+					} catch (PublicKeyMissingException $e) {
+						$this->logger->warning(
+							'no public key found for user "{uid}", user will not be able to read the file',
+							['app' => 'encryption', 'uid' => $uid]
+						);
+						// if the public key of the owner is missing we should fail
+						if ($uid === $this->user) {
+							throw $e;
+						}
 					}
 				}
 			}
 
 			$publicKeys = $this->keyManager->addSystemKeys($this->accessList, $publicKeys, $this->user);
-
 			$encryptedKeyfiles = $this->crypt->multiKeyEncrypt($this->fileKey, $publicKeys);
 			$this->keyManager->setAllFileKeys($this->path, $encryptedKeyfiles);
 		}
@@ -318,8 +325,12 @@ class Encryption implements IEncryptionModule {
 		if (!empty($fileKey)) {
 
 			$publicKeys = array();
-			foreach ($accessList['users'] as $user) {
-				$publicKeys[$user] = $this->keyManager->getPublicKey($user);
+			if ($this->useMasterPassword === true) {
+				$publicKeys[$this->keyManager->getMasterKeyId()] = $this->keyManager->getPublicMasterKey();
+			} else {
+				foreach ($accessList['users'] as $user) {
+					$publicKeys[$user] = $this->keyManager->getPublicKey($user);
+				}
 			}
 
 			$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $uid);
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php
index 6c793e5964f..c4507228878 100644
--- a/apps/encryption/lib/keymanager.php
+++ b/apps/encryption/lib/keymanager.php
@@ -54,6 +54,10 @@ class KeyManager {
 	 * @var string
 	 */
 	private $publicShareKeyId;
+	/**
+	 * @var string
+	 */
+	private $masterKeyId;
 	/**
 	 * @var string UserID
 	 */
@@ -131,10 +135,20 @@ class KeyManager {
 			$this->config->setAppValue('encryption', 'publicShareKeyId', $this->publicShareKeyId);
 		}
 
+		$this->masterKeyId = $this->config->getAppValue('encryption',
+			'masterKeyId');
+		if (empty($this->masterKeyId)) {
+			$this->masterKeyId = 'master_' . substr(md5(time()), 0, 8);
+			$this->config->setAppValue('encryption', 'masterKeyId', $this->masterKeyId);
+		}
+
 		$this->keyId = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
 		$this->log = $log;
 	}
 
+	/**
+	 * check if key pair for public link shares exists, if not we create one
+	 */
 	public function validateShareKey() {
 		$shareKey = $this->getPublicShareKey();
 		if (empty($shareKey)) {
@@ -152,6 +166,26 @@ class KeyManager {
 		}
 	}
 
+	/**
+	 * check if a key pair for the master key exists, if not we create one
+	 */
+	public function validateMasterKey() {
+		$masterKey = $this->getPublicMasterKey();
+		if (empty($masterKey)) {
+			$keyPair = $this->crypt->createKeyPair();
+
+			// Save public key
+			$this->keyStorage->setSystemUserKey(
+				$this->masterKeyId . '.publicKey', $keyPair['publicKey'],
+				Encryption::ID);
+
+			// Encrypt private key with system password
+			$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $this->getMasterKeyPassword(), $this->masterKeyId);
+			$header = $this->crypt->generateHeader();
+			$this->setSystemPrivateKey($this->masterKeyId, $header . $encryptedKey);
+		}
+	}
+
 	/**
 	 * @return bool
 	 */
@@ -304,8 +338,15 @@ class KeyManager {
 
 		$this->session->setStatus(Session::INIT_EXECUTED);
 
+
 		try {
-			$privateKey = $this->getPrivateKey($uid);
+			if($this->util->isMasterKeyEnabled()) {
+				$uid = $this->getMasterKeyId();
+				$passPhrase = $this->getMasterKeyPassword();
+				$privateKey = $this->getSystemPrivateKey($uid);
+			} else {
+				$privateKey = $this->getPrivateKey($uid);
+			}
 			$privateKey = $this->crypt->decryptPrivateKey($privateKey, $passPhrase, $uid);
 		} catch (PrivateKeyMissingException $e) {
 			return false;
@@ -345,6 +386,10 @@ class KeyManager {
 	public function getFileKey($path, $uid) {
 		$encryptedFileKey = $this->keyStorage->getFileKey($path, $this->fileKeyId, Encryption::ID);
 
+		if ($this->util->isMasterKeyEnabled()) {
+			$uid = $this->getMasterKeyId();
+		}
+
 		if (is_null($uid)) {
 			$uid = $this->getPublicShareKeyId();
 			$shareKey = $this->getShareKey($path, $uid);
@@ -566,4 +611,37 @@ class KeyManager {
 
 		return $publicKeys;
 	}
+
+	/**
+	 * get master key password
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	protected function getMasterKeyPassword() {
+		$password = $this->config->getSystemValue('secret');
+		if (empty($password)){
+			throw new \Exception('Can not get secret from ownCloud instance');
+		}
+
+		return $password;
+	}
+
+	/**
+	 * return master key id
+	 *
+	 * @return string
+	 */
+	public function getMasterKeyId() {
+		return $this->masterKeyId;
+	}
+
+	/**
+	 * get public master key
+	 *
+	 * @return string
+	 */
+	public function getPublicMasterKey() {
+		return $this->keyStorage->getSystemUserKey($this->masterKeyId . '.publicKey', Encryption::ID);
+	}
 }
diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/users/setup.php
index 433ea824c9b..d4f7c374547 100644
--- a/apps/encryption/lib/users/setup.php
+++ b/apps/encryption/lib/users/setup.php
@@ -84,6 +84,7 @@ class Setup {
 	 */
 	public function setupServerSide($uid, $password) {
 		$this->keyManager->validateShareKey();
+		$this->keyManager->validateMasterKey();
 		// Check if user already has keys
 		if (!$this->keyManager->userHasKeys($uid)) {
 			return $this->keyManager->storeKeyPair($uid, $password,
diff --git a/apps/encryption/lib/util.php b/apps/encryption/lib/util.php
index fbedc5d6077..e9f916eff38 100644
--- a/apps/encryption/lib/util.php
+++ b/apps/encryption/lib/util.php
@@ -101,6 +101,16 @@ class Util {
 		return ($recoveryMode === '1');
 	}
 
+	/**
+	 * check if master key is enabled
+	 *
+	 * @return bool
+	 */
+	public function isMasterKeyEnabled() {
+		$userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '0');
+		return ($userMasterKey === '1');
+	}
+
 	/**
 	 * @param $enabled
 	 * @return bool
diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/lib/KeyManagerTest.php
index 71b00cf254a..8f1da623efb 100644
--- a/apps/encryption/tests/lib/KeyManagerTest.php
+++ b/apps/encryption/tests/lib/KeyManagerTest.php
@@ -27,6 +27,7 @@ namespace OCA\Encryption\Tests;
 
 
 use OCA\Encryption\KeyManager;
+use OCA\Encryption\Session;
 use Test\TestCase;
 
 class KeyManagerTest extends TestCase {
@@ -237,24 +238,62 @@ class KeyManagerTest extends TestCase {
 
 	}
 
+	/**
+	 * @dataProvider dataTestInit
+	 *
+	 * @param bool $useMasterKey
+	 */
+	public function testInit($useMasterKey) {
+
+		$instance = $this->getMockBuilder('OCA\Encryption\KeyManager')
+			->setConstructorArgs(
+				[
+					$this->keyStorageMock,
+					$this->cryptMock,
+					$this->configMock,
+					$this->userMock,
+					$this->sessionMock,
+					$this->logMock,
+					$this->utilMock
+				]
+			)->setMethods(['getMasterKeyId', 'getMasterKeyPassword', 'getSystemPrivateKey', 'getPrivateKey'])
+			->getMock();
 
-	public function testInit() {
-		$this->keyStorageMock->expects($this->any())
-			->method('getUserKey')
-			->with($this->equalTo($this->userId), $this->equalTo('privateKey'))
-			->willReturn('privateKey');
-		$this->cryptMock->expects($this->any())
-			->method('decryptPrivateKey')
-			->with($this->equalTo('privateKey'), $this->equalTo('pass'))
-			->willReturn('decryptedPrivateKey');
+		$this->utilMock->expects($this->once())->method('isMasterKeyEnabled')
+			->willReturn($useMasterKey);
+
+		$this->sessionMock->expects($this->at(0))->method('setStatus')
+			->with(Session::INIT_EXECUTED);
+
+		$instance->expects($this->any())->method('getMasterKeyId')->willReturn('masterKeyId');
+		$instance->expects($this->any())->method('getMasterKeyPassword')->willReturn('masterKeyPassword');
+		$instance->expects($this->any())->method('getSystemPrivateKey')->with('masterKeyId')->willReturn('privateMasterKey');
+		$instance->expects($this->any())->method('getPrivateKey')->with($this->userId)->willReturn('privateUserKey');
+
+		if($useMasterKey) {
+			$this->cryptMock->expects($this->once())->method('decryptPrivateKey')
+				->with('privateMasterKey', 'masterKeyPassword', 'masterKeyId')
+				->willReturn('key');
+		} else {
+			$this->cryptMock->expects($this->once())->method('decryptPrivateKey')
+				->with('privateUserKey', 'pass', $this->userId)
+				->willReturn('key');
+		}
 
+		$this->sessionMock->expects($this->once())->method('setPrivateKey')
+			->with('key');
 
-		$this->assertTrue(
-			$this->instance->init($this->userId, 'pass')
-		);
+		$this->assertTrue($instance->init($this->userId, 'pass'));
+	}
 
+	public function dataTestInit() {
+		return [
+			[true],
+			[false]
+		];
 	}
 
+
 	public function testSetRecoveryKey() {
 		$this->keyStorageMock->expects($this->exactly(2))
 			->method('setSystemUserKey')
@@ -401,5 +440,92 @@ class KeyManagerTest extends TestCase {
 		);
 	}
 
+	public function testGetMasterKeyId() {
+		$this->assertSame('systemKeyId', $this->instance->getMasterKeyId());
+	}
+
+	public function testGetPublicMasterKey() {
+		$this->keyStorageMock->expects($this->once())->method('getSystemUserKey')
+			->with('systemKeyId.publicKey', \OCA\Encryption\Crypto\Encryption::ID)
+			->willReturn(true);
+
+		$this->assertTrue(
+			$this->instance->getPublicMasterKey()
+		);
+	}
+
+	public function testGetMasterKeyPassword() {
+		$this->configMock->expects($this->once())->method('getSystemValue')->with('secret')
+			->willReturn('password');
+
+		$this->assertSame('password',
+			$this->invokePrivate($this->instance, 'getMasterKeyPassword', [])
+		);
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testGetMasterKeyPasswordException() {
+		$this->configMock->expects($this->once())->method('getSystemValue')->with('secret')
+			->willReturn('');
+
+		$this->invokePrivate($this->instance, 'getMasterKeyPassword', []);
+	}
+
+	/**
+	 * @dataProvider dataTestValidateMasterKey
+	 *
+	 * @param $masterKey
+	 */
+	public function testValidateMasterKey($masterKey) {
+
+		/** @var \OCA\Encryption\KeyManager | \PHPUnit_Framework_MockObject_MockObject $instance */
+		$instance = $this->getMockBuilder('OCA\Encryption\KeyManager')
+			->setConstructorArgs(
+				[
+					$this->keyStorageMock,
+					$this->cryptMock,
+					$this->configMock,
+					$this->userMock,
+					$this->sessionMock,
+					$this->logMock,
+					$this->utilMock
+				]
+			)->setMethods(['getPublicMasterKey', 'setSystemPrivateKey', 'getMasterKeyPassword'])
+			->getMock();
+
+		$instance->expects($this->once())->method('getPublicMasterKey')
+			->willReturn($masterKey);
+
+		$instance->expects($this->any())->method('getMasterKeyPassword')->willReturn('masterKeyPassword');
+		$this->cryptMock->expects($this->any())->method('generateHeader')->willReturn('header');
+
+		if(empty($masterKey)) {
+			$this->cryptMock->expects($this->once())->method('createKeyPair')
+				->willReturn(['publicKey' => 'public', 'privateKey' => 'private']);
+			$this->keyStorageMock->expects($this->once())->method('setSystemUserKey')
+				->with('systemKeyId.publicKey', 'public', \OCA\Encryption\Crypto\Encryption::ID);
+			$this->cryptMock->expects($this->once())->method('encryptPrivateKey')
+				->with('private', 'masterKeyPassword', 'systemKeyId')
+				->willReturn('EncryptedKey');
+			$instance->expects($this->once())->method('setSystemPrivateKey')
+				->with('systemKeyId', 'headerEncryptedKey');
+		} else {
+			$this->cryptMock->expects($this->never())->method('createKeyPair');
+			$this->keyStorageMock->expects($this->never())->method('setSystemUserKey');
+			$this->cryptMock->expects($this->never())->method('encryptPrivateKey');
+			$instance->expects($this->never())->method('setSystemPrivateKey');
+		}
+
+		$instance->validateMasterKey();
+	}
+
+	public function dataTestValidateMasterKey() {
+		return [
+			['masterKey'],
+			['']
+		];
+	}
 
 }
diff --git a/apps/encryption/tests/lib/UtilTest.php b/apps/encryption/tests/lib/UtilTest.php
index e75e8ea36b4..9988ff93f43 100644
--- a/apps/encryption/tests/lib/UtilTest.php
+++ b/apps/encryption/tests/lib/UtilTest.php
@@ -132,4 +132,25 @@ class UtilTest extends TestCase {
 		return $default ?: null;
 	}
 
+	/**
+	 * @dataProvider dataTestIsMasterKeyEnabled
+	 *
+	 * @param string $value
+	 * @param bool $expect
+	 */
+	public function testIsMasterKeyEnabled($value, $expect) {
+		$this->configMock->expects($this->once())->method('getAppValue')
+			->with('encryption', 'useMasterKey', '0')->willReturn($value);
+		$this->assertSame($expect,
+			$this->instance->isMasterKeyEnabled()
+		);
+	}
+
+	public function dataTestIsMasterKeyEnabled() {
+		return [
+			['0', false],
+			['1', true]
+		];
+	}
+
 }
diff --git a/apps/encryption/tests/lib/users/SetupTest.php b/apps/encryption/tests/lib/users/SetupTest.php
index e6936c5c12e..bca3ff58b07 100644
--- a/apps/encryption/tests/lib/users/SetupTest.php
+++ b/apps/encryption/tests/lib/users/SetupTest.php
@@ -43,6 +43,8 @@ class SetupTest extends TestCase {
 	private $instance;
 
 	public function testSetupServerSide() {
+		$this->keyManagerMock->expects($this->exactly(2))->method('validateShareKey');
+		$this->keyManagerMock->expects($this->exactly(2))->method('validateMasterKey');
 		$this->keyManagerMock->expects($this->exactly(2))
 			->method('userHasKeys')
 			->with('admin')
-- 
GitLab


From 84797023ed60d0d1d5a149bd1e58bbfd1b517d74 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 7 Sep 2015 16:52:50 +0200
Subject: [PATCH 187/783] Remove XSendFile support

Required to ensure proper locking
---
 lib/private/files.php | 58 +------------------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/lib/private/files.php b/lib/private/files.php
index 6268bf8a129..0172f1ca6af 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -86,15 +86,6 @@ class OC_Files {
 	 */
 	public static function get($dir, $files, $only_header = false) {
 		$view = \OC\Files\Filesystem::getView();
-		$xsendfile = false;
-		if (\OC::$server->getLockingProvider() instanceof NoopLockingProvider) {
-			if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
-				isset($_SERVER['MOD_X_SENDFILE2_ENABLED']) ||
-				isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])
-			) {
-				$xsendfile = true;
-			}
-		}
 
 		if (is_array($files) && count($files) === 1) {
 			$files = $files[0];
@@ -129,9 +120,6 @@ class OC_Files {
 
 		if ($get_type === self::FILE) {
 			$zip = false;
-			if ($xsendfile && \OC::$server->getEncryptionManager()->isEnabled()) {
-				$xsendfile = false;
-			}
 		} else {
 			$zip = new ZipStreamer(false);
 		}
@@ -176,17 +164,7 @@ class OC_Files {
 				$zip->finalize();
 				set_time_limit($executionTime);
 			} else {
-				if ($xsendfile) {
-					/** @var $storage \OC\Files\Storage\Storage */
-					list($storage) = $view->resolvePath($filename);
-					if ($storage->isLocal()) {
-						self::addSendfileHeader($filename);
-					} else {
-						\OC\Files\Filesystem::readfile($filename);
-					}
-				} else {
-					\OC\Files\Filesystem::readfile($filename);
-				}
+				\OC\Files\Filesystem::readfile($filename);
 			}
 			if ($get_type === self::FILE) {
 				$view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
@@ -202,40 +180,6 @@ class OC_Files {
 		}
 	}
 
-	/**
-	 * @param false|string $filename
-	 */
-	private static function addSendfileHeader($filename) {
-		if (isset($_SERVER['MOD_X_SENDFILE_ENABLED'])) {
-			$filename = \OC\Files\Filesystem::getLocalFile($filename);
-			header("X-Sendfile: " . $filename);
- 		}
- 		if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) {
-			$filename = \OC\Files\Filesystem::getLocalFile($filename);
-			if (isset($_SERVER['HTTP_RANGE']) &&
-				preg_match("/^bytes=([0-9]+)-([0-9]*)$/", $_SERVER['HTTP_RANGE'], $range)) {
-				$filelength = filesize($filename);
- 				if ($range[2] === "") {
- 					$range[2] = $filelength - 1;
- 				}
- 				header("Content-Range: bytes $range[1]-$range[2]/" . $filelength);
- 				header("HTTP/1.1 206 Partial content");
- 				header("X-Sendfile2: " . str_replace(",", "%2c", rawurlencode($filename)) . " $range[1]-$range[2]");
- 			} else {
- 				header("X-Sendfile: " . $filename);
- 			}
-		}
-
-		if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
-			if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_PREFIX'])) {
-				$filename = $_SERVER['MOD_X_ACCEL_REDIRECT_PREFIX'] . \OC\Files\Filesystem::getLocalFile($filename);
-			} else {
-				$filename = \OC::$WEBROOT . '/data' . \OC\Files\Filesystem::getRoot() . $filename;
-			}
-			header("X-Accel-Redirect: " . $filename);
-		}
-	}
-
 	/**
 	 * @param string $dir
 	 * @param ZipStreamer $zip
-- 
GitLab


From 08d2202abb66dd510d42f8a5a5f87e74b9f099d6 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 7 Sep 2015 16:06:53 +0100
Subject: [PATCH 188/783] Load all enabled apps in test bootstrap

---
 tests/bootstrap.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 8bca05b1a18..86bedc3f325 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,9 +10,8 @@ require_once __DIR__ . '/../lib/base.php';
 
 \OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
 
-// load minimum set of apps
-OC_App::loadApps(array('authentication'));
-OC_App::loadApps(array('filesystem', 'logging'));
+// load all enabled apps
+\OC_App::loadApps();
 
 if (!class_exists('PHPUnit_Framework_TestCase')) {
 	require_once('PHPUnit/Autoload.php');
-- 
GitLab


From d044884cfa8d065c7d784dbc792a7228e0eed46f Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 8 Sep 2015 01:55:56 -0400
Subject: [PATCH 189/783] [tx-robot] updated from transifex

---
 apps/files/l10n/af_ZA.js            |  4 +--
 apps/files/l10n/af_ZA.json          |  4 +--
 apps/files/l10n/ar.js               | 12 ++++-----
 apps/files/l10n/ar.json             | 12 ++++-----
 apps/files/l10n/ast.js              | 17 ++++++-------
 apps/files/l10n/ast.json            | 17 ++++++-------
 apps/files/l10n/az.js               | 17 ++++++-------
 apps/files/l10n/az.json             | 17 ++++++-------
 apps/files/l10n/bg_BG.js            | 17 ++++++-------
 apps/files/l10n/bg_BG.json          | 17 ++++++-------
 apps/files/l10n/bn_BD.js            | 12 ++++-----
 apps/files/l10n/bn_BD.json          | 12 ++++-----
 apps/files/l10n/bn_IN.js            |  4 +--
 apps/files/l10n/bn_IN.json          |  4 +--
 apps/files/l10n/bs.js               | 17 ++++++-------
 apps/files/l10n/bs.json             | 17 ++++++-------
 apps/files/l10n/ca.js               | 17 ++++++-------
 apps/files/l10n/ca.json             | 17 ++++++-------
 apps/files/l10n/cs_CZ.js            | 17 ++++++-------
 apps/files/l10n/cs_CZ.json          | 17 ++++++-------
 apps/files/l10n/cy_GB.js            | 10 ++++----
 apps/files/l10n/cy_GB.json          | 10 ++++----
 apps/files/l10n/da.js               | 17 ++++++-------
 apps/files/l10n/da.json             | 17 ++++++-------
 apps/files/l10n/de.js               | 17 ++++++-------
 apps/files/l10n/de.json             | 17 ++++++-------
 apps/files/l10n/de_AT.js            |  4 +--
 apps/files/l10n/de_AT.json          |  4 +--
 apps/files/l10n/de_DE.js            | 17 ++++++-------
 apps/files/l10n/de_DE.json          | 17 ++++++-------
 apps/files/l10n/el.js               | 17 ++++++-------
 apps/files/l10n/el.json             | 17 ++++++-------
 apps/files/l10n/en_GB.js            | 17 ++++++-------
 apps/files/l10n/en_GB.json          | 17 ++++++-------
 apps/files/l10n/eo.js               | 17 ++++++-------
 apps/files/l10n/eo.json             | 17 ++++++-------
 apps/files/l10n/es.js               | 17 ++++++-------
 apps/files/l10n/es.json             | 17 ++++++-------
 apps/files/l10n/es_AR.js            | 17 ++++++-------
 apps/files/l10n/es_AR.json          | 17 ++++++-------
 apps/files/l10n/es_CL.js            |  4 +--
 apps/files/l10n/es_CL.json          |  4 +--
 apps/files/l10n/es_MX.js            | 17 ++++++-------
 apps/files/l10n/es_MX.json          | 17 ++++++-------
 apps/files/l10n/et_EE.js            | 17 ++++++-------
 apps/files/l10n/et_EE.json          | 17 ++++++-------
 apps/files/l10n/eu.js               | 17 ++++++-------
 apps/files/l10n/eu.json             | 17 ++++++-------
 apps/files/l10n/fa.js               | 12 ++++-----
 apps/files/l10n/fa.json             | 12 ++++-----
 apps/files/l10n/fi_FI.js            | 17 ++++++-------
 apps/files/l10n/fi_FI.json          | 17 ++++++-------
 apps/files/l10n/fr.js               | 17 ++++++-------
 apps/files/l10n/fr.json             | 17 ++++++-------
 apps/files/l10n/gl.js               | 17 ++++++-------
 apps/files/l10n/gl.json             | 17 ++++++-------
 apps/files/l10n/he.js               | 12 ++++-----
 apps/files/l10n/he.json             | 12 ++++-----
 apps/files/l10n/hi.js               |  6 ++---
 apps/files/l10n/hi.json             |  6 ++---
 apps/files/l10n/hr.js               | 17 ++++++-------
 apps/files/l10n/hr.json             | 17 ++++++-------
 apps/files/l10n/hu_HU.js            | 17 ++++++-------
 apps/files/l10n/hu_HU.json          | 17 ++++++-------
 apps/files/l10n/ia.js               | 10 ++++----
 apps/files/l10n/ia.json             | 10 ++++----
 apps/files/l10n/id.js               | 17 ++++++-------
 apps/files/l10n/id.json             | 17 ++++++-------
 apps/files/l10n/is.js               | 10 ++++----
 apps/files/l10n/is.json             | 10 ++++----
 apps/files/l10n/it.js               | 17 ++++++-------
 apps/files/l10n/it.json             | 17 ++++++-------
 apps/files/l10n/ja.js               | 17 ++++++-------
 apps/files/l10n/ja.json             | 17 ++++++-------
 apps/files/l10n/ka_GE.js            | 12 ++++-----
 apps/files/l10n/ka_GE.json          | 12 ++++-----
 apps/files/l10n/km.js               | 12 ++++-----
 apps/files/l10n/km.json             | 12 ++++-----
 apps/files/l10n/kn.js               | 17 ++++++-------
 apps/files/l10n/kn.json             | 17 ++++++-------
 apps/files/l10n/ko.js               | 17 ++++++-------
 apps/files/l10n/ko.json             | 17 ++++++-------
 apps/files/l10n/ku_IQ.js            |  6 ++---
 apps/files/l10n/ku_IQ.json          |  6 ++---
 apps/files/l10n/lb.js               | 10 ++++----
 apps/files/l10n/lb.json             | 10 ++++----
 apps/files/l10n/lt_LT.js            | 17 ++++++-------
 apps/files/l10n/lt_LT.json          | 17 ++++++-------
 apps/files/l10n/lv.js               | 17 ++++++-------
 apps/files/l10n/lv.json             | 17 ++++++-------
 apps/files/l10n/mk.js               | 16 ++++++------
 apps/files/l10n/mk.json             | 16 ++++++------
 apps/files/l10n/mn.js               |  4 +--
 apps/files/l10n/mn.json             |  4 +--
 apps/files/l10n/ms_MY.js            |  8 +++---
 apps/files/l10n/ms_MY.json          |  8 +++---
 apps/files/l10n/nb_NO.js            | 17 ++++++-------
 apps/files/l10n/nb_NO.json          | 17 ++++++-------
 apps/files/l10n/nl.js               | 17 ++++++-------
 apps/files/l10n/nl.json             | 17 ++++++-------
 apps/files/l10n/nn_NO.js            | 12 ++++-----
 apps/files/l10n/nn_NO.json          | 12 ++++-----
 apps/files/l10n/oc.js               | 17 ++++++-------
 apps/files/l10n/oc.json             | 17 ++++++-------
 apps/files/l10n/pa.js               |  2 +-
 apps/files/l10n/pa.json             |  2 +-
 apps/files/l10n/pl.js               | 17 ++++++-------
 apps/files/l10n/pl.json             | 17 ++++++-------
 apps/files/l10n/pt_BR.js            | 17 ++++++-------
 apps/files/l10n/pt_BR.json          | 17 ++++++-------
 apps/files/l10n/pt_PT.js            | 17 ++++++-------
 apps/files/l10n/pt_PT.json          | 17 ++++++-------
 apps/files/l10n/ro.js               | 17 ++++++-------
 apps/files/l10n/ro.json             | 17 ++++++-------
 apps/files/l10n/ru.js               | 17 ++++++-------
 apps/files/l10n/ru.json             | 17 ++++++-------
 apps/files/l10n/si_LK.js            |  8 +++---
 apps/files/l10n/si_LK.json          |  8 +++---
 apps/files/l10n/sk_SK.js            | 17 ++++++-------
 apps/files/l10n/sk_SK.json          | 17 ++++++-------
 apps/files/l10n/sl.js               | 17 ++++++-------
 apps/files/l10n/sl.json             | 17 ++++++-------
 apps/files/l10n/sq.js               | 17 ++++++-------
 apps/files/l10n/sq.json             | 17 ++++++-------
 apps/files/l10n/sr.js               | 17 ++++++-------
 apps/files/l10n/sr.json             | 17 ++++++-------
 apps/files/l10n/sr@latin.js         | 17 ++++++-------
 apps/files/l10n/sr@latin.json       | 17 ++++++-------
 apps/files/l10n/sv.js               | 17 ++++++-------
 apps/files/l10n/sv.json             | 17 ++++++-------
 apps/files/l10n/ta_IN.js            |  6 ++---
 apps/files/l10n/ta_IN.json          |  6 ++---
 apps/files/l10n/ta_LK.js            | 10 ++++----
 apps/files/l10n/ta_LK.json          | 10 ++++----
 apps/files/l10n/te.js               |  4 +--
 apps/files/l10n/te.json             |  4 +--
 apps/files/l10n/th_TH.js            | 17 ++++++-------
 apps/files/l10n/th_TH.json          | 17 ++++++-------
 apps/files/l10n/tr.js               | 17 ++++++-------
 apps/files/l10n/tr.json             | 17 ++++++-------
 apps/files/l10n/ug.js               | 12 ++++-----
 apps/files/l10n/ug.json             | 12 ++++-----
 apps/files/l10n/uk.js               | 17 ++++++-------
 apps/files/l10n/uk.json             | 17 ++++++-------
 apps/files/l10n/vi.js               | 17 ++++++-------
 apps/files/l10n/vi.json             | 17 ++++++-------
 apps/files/l10n/zh_CN.js            | 17 ++++++-------
 apps/files/l10n/zh_CN.json          | 17 ++++++-------
 apps/files/l10n/zh_HK.js            |  8 +++---
 apps/files/l10n/zh_HK.json          |  8 +++---
 apps/files/l10n/zh_TW.js            | 17 ++++++-------
 apps/files/l10n/zh_TW.json          | 17 ++++++-------
 apps/files_external/l10n/pt_PT.js   | 38 +++++++++++++++++++++++------
 apps/files_external/l10n/pt_PT.json | 38 +++++++++++++++++++++++------
 apps/files_sharing/l10n/nl.js       |  1 +
 apps/files_sharing/l10n/nl.json     |  1 +
 apps/files_sharing/l10n/pt_PT.js    | 32 +++++++++++++++---------
 apps/files_sharing/l10n/pt_PT.json  | 32 +++++++++++++++---------
 core/l10n/pt_PT.js                  | 10 ++++++++
 core/l10n/pt_PT.json                | 10 ++++++++
 lib/l10n/da.js                      |  1 +
 lib/l10n/da.json                    |  1 +
 lib/l10n/es.js                      |  1 +
 lib/l10n/es.json                    |  1 +
 lib/l10n/fr.js                      |  1 +
 lib/l10n/fr.json                    |  1 +
 lib/l10n/nl.js                      |  1 +
 lib/l10n/nl.json                    |  1 +
 settings/l10n/cs_CZ.js              |  1 -
 settings/l10n/cs_CZ.json            |  1 -
 settings/l10n/da.js                 |  1 -
 settings/l10n/da.json               |  1 -
 settings/l10n/de.js                 |  1 -
 settings/l10n/de.json               |  1 -
 settings/l10n/de_DE.js              |  1 -
 settings/l10n/de_DE.json            |  1 -
 settings/l10n/el.js                 |  1 -
 settings/l10n/el.json               |  1 -
 settings/l10n/en_GB.js              |  1 -
 settings/l10n/en_GB.json            |  1 -
 settings/l10n/es.js                 |  1 -
 settings/l10n/es.json               |  1 -
 settings/l10n/fr.js                 |  1 -
 settings/l10n/fr.json               |  1 -
 settings/l10n/gl.js                 |  1 -
 settings/l10n/gl.json               |  1 -
 settings/l10n/id.js                 |  1 -
 settings/l10n/id.json               |  1 -
 settings/l10n/it.js                 |  1 -
 settings/l10n/it.json               |  1 -
 settings/l10n/ko.js                 |  1 -
 settings/l10n/ko.json               |  1 -
 settings/l10n/nb_NO.js              |  1 -
 settings/l10n/nb_NO.json            |  1 -
 settings/l10n/nl.js                 |  1 -
 settings/l10n/nl.json               |  1 -
 settings/l10n/oc.js                 |  1 -
 settings/l10n/oc.json               |  1 -
 settings/l10n/pt_BR.js              |  1 -
 settings/l10n/pt_BR.json            |  1 -
 settings/l10n/pt_PT.js              |  1 +
 settings/l10n/pt_PT.json            |  1 +
 settings/l10n/ru.js                 |  1 -
 settings/l10n/ru.json               |  1 -
 settings/l10n/sr.js                 |  1 -
 settings/l10n/sr.json               |  1 -
 settings/l10n/th_TH.js              |  1 -
 settings/l10n/th_TH.json            |  1 -
 settings/l10n/tr.js                 |  1 -
 settings/l10n/tr.json               |  1 -
 settings/l10n/zh_CN.js              |  1 -
 settings/l10n/zh_CN.json            |  1 -
 212 files changed, 1148 insertions(+), 1192 deletions(-)

diff --git a/apps/files/l10n/af_ZA.js b/apps/files/l10n/af_ZA.js
index 1844e8ad363..2061e5ec49c 100644
--- a/apps/files/l10n/af_ZA.js
+++ b/apps/files/l10n/af_ZA.js
@@ -2,7 +2,7 @@ OC.L10N.register(
     "files",
     {
     "Error" : "Fout",
-    "Settings" : "Instellings",
-    "Folder" : "Omslag"
+    "Folder" : "Omslag",
+    "Settings" : "Instellings"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/af_ZA.json b/apps/files/l10n/af_ZA.json
index 841c572bc7c..95096fd551b 100644
--- a/apps/files/l10n/af_ZA.json
+++ b/apps/files/l10n/af_ZA.json
@@ -1,6 +1,6 @@
 { "translations": {
     "Error" : "Fout",
-    "Settings" : "Instellings",
-    "Folder" : "Omslag"
+    "Folder" : "Omslag",
+    "Settings" : "Instellings"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js
index d4960b2f370..6dab5f6ba27 100644
--- a/apps/files/l10n/ar.js
+++ b/apps/files/l10n/ar.js
@@ -27,12 +27,12 @@ OC.L10N.register(
     "Upload cancelled." : "تم إلغاء عملية رفع الملفات .",
     "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
-    "{new_name} already exists" : "{new_name} موجود مسبقا",
     "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",
     "Pending" : "قيد الانتظار",
     "Error moving file" : "حدث خطأ أثناء نقل الملف",
     "Error" : "خطأ",
+    "{new_name} already exists" : "{new_name} موجود مسبقا",
     "Name" : "اسم",
     "Size" : "حجم",
     "Modified" : "معدل",
@@ -40,10 +40,15 @@ OC.L10N.register(
     "_%n file_::_%n files_" : ["لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"],
     "{dirs} and {files}" : "{dirs} و {files}",
     "_Uploading %n file_::_Uploading %n files_" : ["لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"],
+    "New" : "جديد",
     "File name cannot be empty." : "اسم الملف لا يجوز أن يكون فارغا",
     "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
     "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ",
     "Favorite" : "المفضلة",
+    "Upload" : "رفع",
+    "Text file" : "ملف",
+    "Folder" : "مجلد",
+    "New folder" : "مجلد جديد",
     "A new file or folder has been <strong>created</strong>" : "تم <strong>  إنشاء</strong> ملف جديد أو مجلد ",
     "A file or folder has been <strong>changed</strong>" : "تم  <strong> تغيير</strong> ملف أو مجلد",
     "A file or folder has been <strong>deleted</strong>" : "تم <strong>حذف </strong> ملف أو مجلد",
@@ -65,11 +70,6 @@ OC.L10N.register(
     "Settings" : "إعدادات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
-    "New" : "جديد",
-    "Text file" : "ملف",
-    "New folder" : "مجلد جديد",
-    "Folder" : "مجلد",
-    "Upload" : "رفع",
     "Cancel upload" : "إلغاء الرفع",
     "Delete" : "إلغاء",
     "Upload too large" : "حجم الترفيع أعلى من المسموح",
diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json
index 16d9732aaef..745d82dc19b 100644
--- a/apps/files/l10n/ar.json
+++ b/apps/files/l10n/ar.json
@@ -25,12 +25,12 @@
     "Upload cancelled." : "تم إلغاء عملية رفع الملفات .",
     "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
-    "{new_name} already exists" : "{new_name} موجود مسبقا",
     "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",
     "Pending" : "قيد الانتظار",
     "Error moving file" : "حدث خطأ أثناء نقل الملف",
     "Error" : "خطأ",
+    "{new_name} already exists" : "{new_name} موجود مسبقا",
     "Name" : "اسم",
     "Size" : "حجم",
     "Modified" : "معدل",
@@ -38,10 +38,15 @@
     "_%n file_::_%n files_" : ["لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"],
     "{dirs} and {files}" : "{dirs} و {files}",
     "_Uploading %n file_::_Uploading %n files_" : ["لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"],
+    "New" : "جديد",
     "File name cannot be empty." : "اسم الملف لا يجوز أن يكون فارغا",
     "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
     "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ",
     "Favorite" : "المفضلة",
+    "Upload" : "رفع",
+    "Text file" : "ملف",
+    "Folder" : "مجلد",
+    "New folder" : "مجلد جديد",
     "A new file or folder has been <strong>created</strong>" : "تم <strong>  إنشاء</strong> ملف جديد أو مجلد ",
     "A file or folder has been <strong>changed</strong>" : "تم  <strong> تغيير</strong> ملف أو مجلد",
     "A file or folder has been <strong>deleted</strong>" : "تم <strong>حذف </strong> ملف أو مجلد",
@@ -63,11 +68,6 @@
     "Settings" : "إعدادات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
-    "New" : "جديد",
-    "Text file" : "ملف",
-    "New folder" : "مجلد جديد",
-    "Folder" : "مجلد",
-    "Upload" : "رفع",
     "Cancel upload" : "إلغاء الرفع",
     "Delete" : "إلغاء",
     "Upload too large" : "حجم الترفيع أعلى من المسموح",
diff --git a/apps/files/l10n/ast.js b/apps/files/l10n/ast.js
index 586d66d0c24..33bf5e37c0a 100644
--- a/apps/files/l10n/ast.js
+++ b/apps/files/l10n/ast.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Xuba encaboxada.",
     "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
-    "{new_name} already exists" : "{new_name} yá existe",
-    "Could not create file" : "Nun pudo crease'l ficheru",
-    "Could not create folder" : "Nun pudo crease la carpeta",
     "Actions" : "Aiciones",
     "Download" : "Descargar",
     "Select" : "Esbillar",
@@ -48,7 +45,10 @@ OC.L10N.register(
     "Error moving file." : "Fallu moviendo'l ficheru.",
     "Error moving file" : "Fallu moviendo'l ficheru",
     "Error" : "Fallu",
+    "{new_name} already exists" : "{new_name} yá existe",
     "Could not rename file" : "Nun pudo renomase'l ficheru",
+    "Could not create file" : "Nun pudo crease'l ficheru",
+    "Could not create folder" : "Nun pudo crease la carpeta",
     "Error deleting file." : "Fallu desaniciando'l ficheru.",
     "Name" : "Nome",
     "Size" : "Tamañu",
@@ -58,11 +58,16 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "Nun tienes permisu pa xubir o crear ficheros equí",
     "_Uploading %n file_::_Uploading %n files_" : ["Xubiendo %n ficheru","Xubiendo %n ficheros"],
+    "New" : "Nuevu",
     "\"{name}\" is an invalid file name." : "\"{name}\" ye un nome de ficheru inválidu.",
     "File name cannot be empty." : "El nome de ficheru nun pue quedar baleru.",
     "Your storage is full, files can not be updated or synced anymore!" : "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!",
     "Your storage is almost full ({usedSpacePercent}%)" : "L'almacenamientu ta casi completu ({usedSpacePercent}%)",
     "Favorite" : "Favoritu",
+    "Upload" : "Xubir",
+    "Text file" : "Ficheru de testu",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creóse</strong> un ficheru o carpeta nuevos",
     "A file or folder has been <strong>changed</strong>" : "<strong>Camudóse</strong> un ficheru o carpeta",
     "A file or folder has been <strong>deleted</strong>" : "<strong>Desanicióse</strong> un ficheru o carpeta",
@@ -86,12 +91,6 @@ OC.L10N.register(
     "Settings" : "Axustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usa esta direición <a href=\"%s\" target=\"_blank\">p'acceder a los ficheros a traviés de WebDAV</a>",
-    "New" : "Nuevu",
-    "New text file" : "Ficheru de testu nuevu",
-    "Text file" : "Ficheru de testu",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Xubir",
     "Cancel upload" : "Encaboxar xuba",
     "Delete" : "Desaniciar",
     "Upload too large" : "La xuba ye abondo grande",
diff --git a/apps/files/l10n/ast.json b/apps/files/l10n/ast.json
index e9b411383a2..601bf2d85f1 100644
--- a/apps/files/l10n/ast.json
+++ b/apps/files/l10n/ast.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Xuba encaboxada.",
     "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
-    "{new_name} already exists" : "{new_name} yá existe",
-    "Could not create file" : "Nun pudo crease'l ficheru",
-    "Could not create folder" : "Nun pudo crease la carpeta",
     "Actions" : "Aiciones",
     "Download" : "Descargar",
     "Select" : "Esbillar",
@@ -46,7 +43,10 @@
     "Error moving file." : "Fallu moviendo'l ficheru.",
     "Error moving file" : "Fallu moviendo'l ficheru",
     "Error" : "Fallu",
+    "{new_name} already exists" : "{new_name} yá existe",
     "Could not rename file" : "Nun pudo renomase'l ficheru",
+    "Could not create file" : "Nun pudo crease'l ficheru",
+    "Could not create folder" : "Nun pudo crease la carpeta",
     "Error deleting file." : "Fallu desaniciando'l ficheru.",
     "Name" : "Nome",
     "Size" : "Tamañu",
@@ -56,11 +56,16 @@
     "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "Nun tienes permisu pa xubir o crear ficheros equí",
     "_Uploading %n file_::_Uploading %n files_" : ["Xubiendo %n ficheru","Xubiendo %n ficheros"],
+    "New" : "Nuevu",
     "\"{name}\" is an invalid file name." : "\"{name}\" ye un nome de ficheru inválidu.",
     "File name cannot be empty." : "El nome de ficheru nun pue quedar baleru.",
     "Your storage is full, files can not be updated or synced anymore!" : "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!",
     "Your storage is almost full ({usedSpacePercent}%)" : "L'almacenamientu ta casi completu ({usedSpacePercent}%)",
     "Favorite" : "Favoritu",
+    "Upload" : "Xubir",
+    "Text file" : "Ficheru de testu",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creóse</strong> un ficheru o carpeta nuevos",
     "A file or folder has been <strong>changed</strong>" : "<strong>Camudóse</strong> un ficheru o carpeta",
     "A file or folder has been <strong>deleted</strong>" : "<strong>Desanicióse</strong> un ficheru o carpeta",
@@ -84,12 +89,6 @@
     "Settings" : "Axustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usa esta direición <a href=\"%s\" target=\"_blank\">p'acceder a los ficheros a traviés de WebDAV</a>",
-    "New" : "Nuevu",
-    "New text file" : "Ficheru de testu nuevu",
-    "Text file" : "Ficheru de testu",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Xubir",
     "Cancel upload" : "Encaboxar xuba",
     "Delete" : "Desaniciar",
     "Upload too large" : "La xuba ye abondo grande",
diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js
index ba3aa4e1b9f..7e80b0aa82d 100644
--- a/apps/files/l10n/az.js
+++ b/apps/files/l10n/az.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Yüklənmə dayandırıldı.",
     "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
-    "{new_name} already exists" : "{new_name} artıq mövcuddur",
-    "Could not create file" : "Faylı yaratmaq olmur",
-    "Could not create folder" : "Qovluğu yaratmaq olmur",
     "Download" : "Yüklə",
     "Select" : "Seç",
     "Pending" : "Gözləmə",
@@ -46,7 +43,10 @@ OC.L10N.register(
     "Error moving file." : "Faylın köçürülməsində səhv baş verdi.",
     "Error moving file" : "Faylın köçürülməsində səhv baş verdi",
     "Error" : "Səhv",
+    "{new_name} already exists" : "{new_name} artıq mövcuddur",
     "Could not rename file" : "Faylın adını dəyişmək mümkün olmadı",
+    "Could not create file" : "Faylı yaratmaq olmur",
+    "Could not create folder" : "Qovluğu yaratmaq olmur",
     "Error deleting file." : "Faylın silinməsində səhv baş verdi.",
     "No entries in this folder match '{filter}'" : "Bu qovluqda '{filter}' uyğunluğunda heç bir verilən tapılmadı",
     "Name" : "Ad",
@@ -57,6 +57,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} və {files}",
     "You don’t have permission to upload or create files here" : "Sizin burda yükləməyə və ya fayl yaratmağa yetkiniz yoxdur  ",
     "_Uploading %n file_::_Uploading %n files_" : ["%n fayllar yüklənilir","%n fayllar yüklənilir"],
+    "New" : "Yeni",
     "\"{name}\" is an invalid file name." : "\"{name}\" yalnış fayl adıdır.",
     "File name cannot be empty." : "Faylın adı boş ola bilməz.",
     "Your storage is full, files can not be updated or synced anymore!" : "Sizin deponuz doludur, fayllar artıq yenilənə və sinxronizasiya edilə bilməz!",
@@ -64,6 +65,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["uyğun '{filter}'","uyğun '{filter}'"],
     "Favorited" : "İstəkləndi",
     "Favorite" : "İstəkli",
+    "Upload" : "Serverə yüklə",
+    "Text file" : "Tekst faylı",
+    "Folder" : "Qovluq",
+    "New folder" : "Yeni qovluq",
     "An error occurred while trying to update the tags" : "Qeydlərin yenilənməsi müddətində səhv baş verdi ",
     "A new file or folder has been <strong>created</strong>" : "Yeni fayl və ya direktoriya <strong>yaradılmışdır</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fayl və ya direktoriya <strong>dəyişdirilib</strong>",
@@ -90,12 +95,6 @@ OC.L10N.register(
     "Settings" : "Quraşdırmalar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Bu ünvanı <a href=\"%s\" target=\"_blank\">WebDAV vasitəsilə fayllarınızı əldə etmək üçün</a> istifadə edə bilərsiniz. ",
-    "New" : "Yeni",
-    "New text file" : "Yeni tekst faylı",
-    "Text file" : "Tekst faylı",
-    "New folder" : "Yeni qovluq",
-    "Folder" : "Qovluq",
-    "Upload" : "Serverə yüklə",
     "Cancel upload" : "Yüklənməni dayandır",
     "No files in here" : "Burda fayl yoxdur",
     "Upload some content or sync with your devices!" : "Bezi kontenti yüklə yada, öz avadanlıqlarınızla sinxronizasiya edin!",
diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json
index a9790ba8322..83347ae9a14 100644
--- a/apps/files/l10n/az.json
+++ b/apps/files/l10n/az.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Yüklənmə dayandırıldı.",
     "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
-    "{new_name} already exists" : "{new_name} artıq mövcuddur",
-    "Could not create file" : "Faylı yaratmaq olmur",
-    "Could not create folder" : "Qovluğu yaratmaq olmur",
     "Download" : "Yüklə",
     "Select" : "Seç",
     "Pending" : "Gözləmə",
@@ -44,7 +41,10 @@
     "Error moving file." : "Faylın köçürülməsində səhv baş verdi.",
     "Error moving file" : "Faylın köçürülməsində səhv baş verdi",
     "Error" : "Səhv",
+    "{new_name} already exists" : "{new_name} artıq mövcuddur",
     "Could not rename file" : "Faylın adını dəyişmək mümkün olmadı",
+    "Could not create file" : "Faylı yaratmaq olmur",
+    "Could not create folder" : "Qovluğu yaratmaq olmur",
     "Error deleting file." : "Faylın silinməsində səhv baş verdi.",
     "No entries in this folder match '{filter}'" : "Bu qovluqda '{filter}' uyğunluğunda heç bir verilən tapılmadı",
     "Name" : "Ad",
@@ -55,6 +55,7 @@
     "{dirs} and {files}" : "{dirs} və {files}",
     "You don’t have permission to upload or create files here" : "Sizin burda yükləməyə və ya fayl yaratmağa yetkiniz yoxdur  ",
     "_Uploading %n file_::_Uploading %n files_" : ["%n fayllar yüklənilir","%n fayllar yüklənilir"],
+    "New" : "Yeni",
     "\"{name}\" is an invalid file name." : "\"{name}\" yalnış fayl adıdır.",
     "File name cannot be empty." : "Faylın adı boş ola bilməz.",
     "Your storage is full, files can not be updated or synced anymore!" : "Sizin deponuz doludur, fayllar artıq yenilənə və sinxronizasiya edilə bilməz!",
@@ -62,6 +63,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["uyğun '{filter}'","uyğun '{filter}'"],
     "Favorited" : "İstəkləndi",
     "Favorite" : "İstəkli",
+    "Upload" : "Serverə yüklə",
+    "Text file" : "Tekst faylı",
+    "Folder" : "Qovluq",
+    "New folder" : "Yeni qovluq",
     "An error occurred while trying to update the tags" : "Qeydlərin yenilənməsi müddətində səhv baş verdi ",
     "A new file or folder has been <strong>created</strong>" : "Yeni fayl və ya direktoriya <strong>yaradılmışdır</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fayl və ya direktoriya <strong>dəyişdirilib</strong>",
@@ -88,12 +93,6 @@
     "Settings" : "Quraşdırmalar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Bu ünvanı <a href=\"%s\" target=\"_blank\">WebDAV vasitəsilə fayllarınızı əldə etmək üçün</a> istifadə edə bilərsiniz. ",
-    "New" : "Yeni",
-    "New text file" : "Yeni tekst faylı",
-    "Text file" : "Tekst faylı",
-    "New folder" : "Yeni qovluq",
-    "Folder" : "Qovluq",
-    "Upload" : "Serverə yüklə",
     "Cancel upload" : "Yüklənməni dayandır",
     "No files in here" : "Burda fayl yoxdur",
     "Upload some content or sync with your devices!" : "Bezi kontenti yüklə yada, öz avadanlıqlarınızla sinxronizasiya edin!",
diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js
index 1b79d6b2824..f21c5de9dc1 100644
--- a/apps/files/l10n/bg_BG.js
+++ b/apps/files/l10n/bg_BG.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Качването е прекъснато.",
     "Could not get result from server." : "Не се получи резултат от сървърът.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.",
-    "{new_name} already exists" : "{new_name} вече съществува.",
-    "Could not create file" : "Несупешно създаване на файла.",
-    "Could not create folder" : "Неуспешно създаване на папка.",
     "Actions" : "Действия",
     "Download" : "Изтегли",
     "Select" : "Избери",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Грешка при местенето на файла.",
     "Error moving file" : "Грешка при преместването на файла.",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} вече съществува.",
     "Could not rename file" : "Неуспешно преименуване на файла.",
+    "Could not create file" : "Несупешно създаване на файла.",
+    "Could not create folder" : "Неуспешно създаване на папка.",
     "Error deleting file." : "Грешка при изтриването на файла.",
     "No entries in this folder match '{filter}'" : "Нищо в тази папка не отговаря на '{filter}'",
     "Name" : "Име",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "Нямаш разрешение да създаваш или качваш файлове тук.",
     "_Uploading %n file_::_Uploading %n files_" : ["Качване на %n файл","Качване на %n файла."],
+    "New" : "Създай",
     "\"{name}\" is an invalid file name." : "\"{name}\" е непозволено име за файл.",
     "File name cannot be empty." : "Името на файла не може да бъде оставено празно.",
     "Your storage is full, files can not be updated or synced anymore!" : "Заделеното място е запълнено, повече файлове не могат да бъдат синхронизирани или опреснени!",
@@ -65,6 +66,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "],
     "Favorited" : "Отбелязано в любими",
     "Favorite" : "Любими",
+    "Upload" : "Качване",
+    "Text file" : "Текстов файл",
+    "Folder" : "Папка",
+    "New folder" : "Нова папка",
     "An error occurred while trying to update the tags" : "Настъпи грешка при опита за промяна на бележките",
     "A new file or folder has been <strong>created</strong>" : "Нов файл или папка беше <strong>създаден/а</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл или папка беше <strong>променен/а</strong>",
@@ -90,12 +95,6 @@ OC.L10N.register(
     "Settings" : "Настройки",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Използвай този адрес, за да получиш <a href=\"%s\" target=\"_blank\">достъп до своите файлове чрез WebDAV</a>.",
-    "New" : "Създай",
-    "New text file" : "Нов текстов файл",
-    "Text file" : "Текстов файл",
-    "New folder" : "Нова папка",
-    "Folder" : "Папка",
-    "Upload" : "Качване",
     "Cancel upload" : "Отказване на качването",
     "No files in here" : "Тук няма файлове",
     "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!",
diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json
index 4493a450d66..6778eff6da8 100644
--- a/apps/files/l10n/bg_BG.json
+++ b/apps/files/l10n/bg_BG.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Качването е прекъснато.",
     "Could not get result from server." : "Не се получи резултат от сървърът.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.",
-    "{new_name} already exists" : "{new_name} вече съществува.",
-    "Could not create file" : "Несупешно създаване на файла.",
-    "Could not create folder" : "Неуспешно създаване на папка.",
     "Actions" : "Действия",
     "Download" : "Изтегли",
     "Select" : "Избери",
@@ -45,7 +42,10 @@
     "Error moving file." : "Грешка при местенето на файла.",
     "Error moving file" : "Грешка при преместването на файла.",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} вече съществува.",
     "Could not rename file" : "Неуспешно преименуване на файла.",
+    "Could not create file" : "Несупешно създаване на файла.",
+    "Could not create folder" : "Неуспешно създаване на папка.",
     "Error deleting file." : "Грешка при изтриването на файла.",
     "No entries in this folder match '{filter}'" : "Нищо в тази папка не отговаря на '{filter}'",
     "Name" : "Име",
@@ -56,6 +56,7 @@
     "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "Нямаш разрешение да създаваш или качваш файлове тук.",
     "_Uploading %n file_::_Uploading %n files_" : ["Качване на %n файл","Качване на %n файла."],
+    "New" : "Създай",
     "\"{name}\" is an invalid file name." : "\"{name}\" е непозволено име за файл.",
     "File name cannot be empty." : "Името на файла не може да бъде оставено празно.",
     "Your storage is full, files can not be updated or synced anymore!" : "Заделеното място е запълнено, повече файлове не могат да бъдат синхронизирани или опреснени!",
@@ -63,6 +64,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "],
     "Favorited" : "Отбелязано в любими",
     "Favorite" : "Любими",
+    "Upload" : "Качване",
+    "Text file" : "Текстов файл",
+    "Folder" : "Папка",
+    "New folder" : "Нова папка",
     "An error occurred while trying to update the tags" : "Настъпи грешка при опита за промяна на бележките",
     "A new file or folder has been <strong>created</strong>" : "Нов файл или папка беше <strong>създаден/а</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл или папка беше <strong>променен/а</strong>",
@@ -88,12 +93,6 @@
     "Settings" : "Настройки",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Използвай този адрес, за да получиш <a href=\"%s\" target=\"_blank\">достъп до своите файлове чрез WebDAV</a>.",
-    "New" : "Създай",
-    "New text file" : "Нов текстов файл",
-    "Text file" : "Текстов файл",
-    "New folder" : "Нова папка",
-    "Folder" : "Папка",
-    "Upload" : "Качване",
     "Cancel upload" : "Отказване на качването",
     "No files in here" : "Тук няма файлове",
     "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!",
diff --git a/apps/files/l10n/bn_BD.js b/apps/files/l10n/bn_BD.js
index f21d44873f0..1272966209b 100644
--- a/apps/files/l10n/bn_BD.js
+++ b/apps/files/l10n/bn_BD.js
@@ -27,22 +27,27 @@ OC.L10N.register(
     "Close" : "বন্ধ",
     "Upload cancelled." : "আপলোড বাতিল করা হয়েছে।",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
-    "{new_name} already exists" : "{new_name} টি বিদ্যমান",
     "Actions" : "পদক্ষেপসমূহ",
     "Download" : "ডাউনলোড",
     "Pending" : "মুলতুবি",
     "Error moving file." : "ফাইল সরাতে সমস্যা হলো।",
     "Error moving file" : "ফাইল সরাতে সমস্যা হলো",
     "Error" : "সমস্যা",
+    "{new_name} already exists" : "{new_name} টি বিদ্যমান",
     "Could not rename file" : "ফাইলের পূণঃনামকরণ করা গেলনা",
     "Name" : "রাম",
     "Size" : "আকার",
     "Modified" : "পরিবর্তিত",
     "_Uploading %n file_::_Uploading %n files_" : ["%n ফাইল আপলোড হচ্ছে","%n ফাইল আপলোড হচ্ছে"],
+    "New" : "নতুন",
     "\"{name}\" is an invalid file name." : "\"{name}\" টি একটি অননুমোদিত ফাইল নাম।",
     "File name cannot be empty." : "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
     "Your storage is almost full ({usedSpacePercent}%)" : "আপনার সংরক্ষণাধার প্রায় পরিপূর্ণ ({usedSpacePercent}%) ",
     "Favorite" : "প্রিয়জন",
+    "Upload" : "আপলোড",
+    "Text file" : "টেক্সট ফাইল",
+    "Folder" : "ফোল্ডার",
+    "New folder" : "নব ফােলডার",
     "A new file or folder has been <strong>created</strong>" : "একটি ফাইল বা ফোলডার <strong>তৈরি</strong> করা হয়েছে",
     "A file or folder has been <strong>changed</strong>" : "একটি ফাইল বা ফোলডার <strong>পরিবরতন</strong> করা হয়েছে",
     "A file or folder has been <strong>deleted</strong>" : "একটি ফাইল বা ফোলডার <strong>মোছা</strong> হয়েছে",
@@ -59,11 +64,6 @@ OC.L10N.register(
     "Save" : "সংরক্ষণ",
     "Settings" : "নিয়ামকসমূহ",
     "WebDAV" : "WebDAV",
-    "New" : "নতুন",
-    "Text file" : "টেক্সট ফাইল",
-    "New folder" : "নব ফােলডার",
-    "Folder" : "ফোল্ডার",
-    "Upload" : "আপলোড",
     "Cancel upload" : "আপলোড বাতিল কর",
     "Delete" : "মুছে",
     "Upload too large" : "আপলোডের আকারটি অনেক বড়",
diff --git a/apps/files/l10n/bn_BD.json b/apps/files/l10n/bn_BD.json
index 740613e054d..472aae78865 100644
--- a/apps/files/l10n/bn_BD.json
+++ b/apps/files/l10n/bn_BD.json
@@ -25,22 +25,27 @@
     "Close" : "বন্ধ",
     "Upload cancelled." : "আপলোড বাতিল করা হয়েছে।",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
-    "{new_name} already exists" : "{new_name} টি বিদ্যমান",
     "Actions" : "পদক্ষেপসমূহ",
     "Download" : "ডাউনলোড",
     "Pending" : "মুলতুবি",
     "Error moving file." : "ফাইল সরাতে সমস্যা হলো।",
     "Error moving file" : "ফাইল সরাতে সমস্যা হলো",
     "Error" : "সমস্যা",
+    "{new_name} already exists" : "{new_name} টি বিদ্যমান",
     "Could not rename file" : "ফাইলের পূণঃনামকরণ করা গেলনা",
     "Name" : "রাম",
     "Size" : "আকার",
     "Modified" : "পরিবর্তিত",
     "_Uploading %n file_::_Uploading %n files_" : ["%n ফাইল আপলোড হচ্ছে","%n ফাইল আপলোড হচ্ছে"],
+    "New" : "নতুন",
     "\"{name}\" is an invalid file name." : "\"{name}\" টি একটি অননুমোদিত ফাইল নাম।",
     "File name cannot be empty." : "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
     "Your storage is almost full ({usedSpacePercent}%)" : "আপনার সংরক্ষণাধার প্রায় পরিপূর্ণ ({usedSpacePercent}%) ",
     "Favorite" : "প্রিয়জন",
+    "Upload" : "আপলোড",
+    "Text file" : "টেক্সট ফাইল",
+    "Folder" : "ফোল্ডার",
+    "New folder" : "নব ফােলডার",
     "A new file or folder has been <strong>created</strong>" : "একটি ফাইল বা ফোলডার <strong>তৈরি</strong> করা হয়েছে",
     "A file or folder has been <strong>changed</strong>" : "একটি ফাইল বা ফোলডার <strong>পরিবরতন</strong> করা হয়েছে",
     "A file or folder has been <strong>deleted</strong>" : "একটি ফাইল বা ফোলডার <strong>মোছা</strong> হয়েছে",
@@ -57,11 +62,6 @@
     "Save" : "সংরক্ষণ",
     "Settings" : "নিয়ামকসমূহ",
     "WebDAV" : "WebDAV",
-    "New" : "নতুন",
-    "Text file" : "টেক্সট ফাইল",
-    "New folder" : "নব ফােলডার",
-    "Folder" : "ফোল্ডার",
-    "Upload" : "আপলোড",
     "Cancel upload" : "আপলোড বাতিল কর",
     "Delete" : "মুছে",
     "Upload too large" : "আপলোডের আকারটি অনেক বড়",
diff --git a/apps/files/l10n/bn_IN.js b/apps/files/l10n/bn_IN.js
index 903dadca605..995c9ad45d1 100644
--- a/apps/files/l10n/bn_IN.js
+++ b/apps/files/l10n/bn_IN.js
@@ -20,6 +20,8 @@ OC.L10N.register(
     "Error" : "ভুল",
     "Name" : "নাম",
     "Size" : "আকার",
+    "Folder" : "ফোল্ডার",
+    "New folder" : "নতুন ফোল্ডার",
     "A new file or folder has been <strong>created</strong>" : "একটি নতুন ফাইল বা ফোল্ডার হয়েছে <strong>তৈরি</strong>",
     "A file or folder has been <strong>changed</strong>" : "একটি নতুন ফাইল বা ফোল্ডার <strong>বদলানো হয়েছে</strong>",
     "A file or folder has been <strong>deleted</strong>" : "একটি নতুন ফাইল বা ফোল্ডার <strong>মুছে ফেলা হয়েছে</strong>",
@@ -31,8 +33,6 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s মুছেছে %1$s কে",
     "Save" : "সেভ",
     "Settings" : "সেটিংস",
-    "New folder" : "নতুন ফোল্ডার",
-    "Folder" : "ফোল্ডার",
     "Delete" : "মুছে ফেলা"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/bn_IN.json b/apps/files/l10n/bn_IN.json
index afdcf0b6f13..17ce39d023a 100644
--- a/apps/files/l10n/bn_IN.json
+++ b/apps/files/l10n/bn_IN.json
@@ -18,6 +18,8 @@
     "Error" : "ভুল",
     "Name" : "নাম",
     "Size" : "আকার",
+    "Folder" : "ফোল্ডার",
+    "New folder" : "নতুন ফোল্ডার",
     "A new file or folder has been <strong>created</strong>" : "একটি নতুন ফাইল বা ফোল্ডার হয়েছে <strong>তৈরি</strong>",
     "A file or folder has been <strong>changed</strong>" : "একটি নতুন ফাইল বা ফোল্ডার <strong>বদলানো হয়েছে</strong>",
     "A file or folder has been <strong>deleted</strong>" : "একটি নতুন ফাইল বা ফোল্ডার <strong>মুছে ফেলা হয়েছে</strong>",
@@ -29,8 +31,6 @@
     "%2$s deleted %1$s" : "%2$s মুছেছে %1$s কে",
     "Save" : "সেভ",
     "Settings" : "সেটিংস",
-    "New folder" : "নতুন ফোল্ডার",
-    "Folder" : "ফোল্ডার",
     "Delete" : "মুছে ফেলা"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/bs.js b/apps/files/l10n/bs.js
index 6fb4c6ed0e9..f10c87bfef8 100644
--- a/apps/files/l10n/bs.js
+++ b/apps/files/l10n/bs.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Učitavanje je prekinuto.",
     "Could not get result from server." : "Nemoguće dobiti rezultat od servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u toku. Napuštanje stranice prekinut će učitavanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Datoteku nije moguće kreirati",
-    "Could not create folder" : "Direktorij nije moguće kreirati",
     "Actions" : "Radnje",
     "Download" : "Preuzmi",
     "Select" : "Izaberi",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Greška pri premještanju datoteke",
     "Error moving file" : "Greška pri premještanju datoteke",
     "Error" : "Greška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Nemoguće preimenovati datoteku",
+    "Could not create file" : "Datoteku nije moguće kreirati",
+    "Could not create folder" : "Direktorij nije moguće kreirati",
     "Error deleting file." : "Greška pri brisanju datoteke",
     "Name" : "Ime",
     "Size" : "Veličina",
@@ -57,12 +57,17 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Ovdje niste ovlašteni učitavati ili kreirati datoteke",
     "_Uploading %n file_::_Uploading %n files_" : ["Prenosim %n datoteku","Prenosim %n datoteke","Prenosim %n datoteke"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime datoteke.",
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša pohrana je puna, datoteke više nije moguće ažurirati niti sinhronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
     "Favorited" : "Favorizovano",
     "Favorite" : "Favorit",
+    "Upload" : "Učitaj",
+    "Text file" : "Tekstualna datoteka",
+    "Folder" : "Direktorij",
+    "New folder" : "Novi direktorij",
     "%s could not be renamed as it has been deleted" : "%s nije moguće preimenovati jer je izbrisan",
     "%s could not be renamed" : "%s nije moguće preimenovati",
     "Upload (max. %s)" : "Učitaj (max. %s)",
@@ -73,12 +78,6 @@ OC.L10N.register(
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristi slijedeću adresu za <a href=\"%s\" target=\"_blank\">pristup vašim datotekama putem WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nova tekstualna datoteka",
-    "Text file" : "Tekstualna datoteka",
-    "New folder" : "Novi direktorij",
-    "Folder" : "Direktorij",
-    "Upload" : "Učitaj",
     "Cancel upload" : "Prekini učitavanje",
     "Upload some content or sync with your devices!" : "Učitaj neki sadržaj ili sinhronizuj sa tvojim uređajima!",
     "Select all" : "Označi sve",
diff --git a/apps/files/l10n/bs.json b/apps/files/l10n/bs.json
index b398ca5a39b..7d8a87f6398 100644
--- a/apps/files/l10n/bs.json
+++ b/apps/files/l10n/bs.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Učitavanje je prekinuto.",
     "Could not get result from server." : "Nemoguće dobiti rezultat od servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u toku. Napuštanje stranice prekinut će učitavanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Datoteku nije moguće kreirati",
-    "Could not create folder" : "Direktorij nije moguće kreirati",
     "Actions" : "Radnje",
     "Download" : "Preuzmi",
     "Select" : "Izaberi",
@@ -45,7 +42,10 @@
     "Error moving file." : "Greška pri premještanju datoteke",
     "Error moving file" : "Greška pri premještanju datoteke",
     "Error" : "Greška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Nemoguće preimenovati datoteku",
+    "Could not create file" : "Datoteku nije moguće kreirati",
+    "Could not create folder" : "Direktorij nije moguće kreirati",
     "Error deleting file." : "Greška pri brisanju datoteke",
     "Name" : "Ime",
     "Size" : "Veličina",
@@ -55,12 +55,17 @@
     "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Ovdje niste ovlašteni učitavati ili kreirati datoteke",
     "_Uploading %n file_::_Uploading %n files_" : ["Prenosim %n datoteku","Prenosim %n datoteke","Prenosim %n datoteke"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime datoteke.",
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša pohrana je puna, datoteke više nije moguće ažurirati niti sinhronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
     "Favorited" : "Favorizovano",
     "Favorite" : "Favorit",
+    "Upload" : "Učitaj",
+    "Text file" : "Tekstualna datoteka",
+    "Folder" : "Direktorij",
+    "New folder" : "Novi direktorij",
     "%s could not be renamed as it has been deleted" : "%s nije moguće preimenovati jer je izbrisan",
     "%s could not be renamed" : "%s nije moguće preimenovati",
     "Upload (max. %s)" : "Učitaj (max. %s)",
@@ -71,12 +76,6 @@
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristi slijedeću adresu za <a href=\"%s\" target=\"_blank\">pristup vašim datotekama putem WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nova tekstualna datoteka",
-    "Text file" : "Tekstualna datoteka",
-    "New folder" : "Novi direktorij",
-    "Folder" : "Direktorij",
-    "Upload" : "Učitaj",
     "Cancel upload" : "Prekini učitavanje",
     "Upload some content or sync with your devices!" : "Učitaj neki sadržaj ili sinhronizuj sa tvojim uređajima!",
     "Select all" : "Označi sve",
diff --git a/apps/files/l10n/ca.js b/apps/files/l10n/ca.js
index 28261b62219..f8388534802 100644
--- a/apps/files/l10n/ca.js
+++ b/apps/files/l10n/ca.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "La pujada s'ha cancel·lat.",
     "Could not get result from server." : "No hi ha resposta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
-    "{new_name} already exists" : "{new_name} ja existeix",
-    "Could not create file" : "No s'ha pogut crear el fitxer",
-    "Could not create folder" : "No s'ha pogut crear la carpeta",
     "Actions" : "Accions",
     "Download" : "Baixa",
     "Select" : "Selecciona",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Error en moure el fitxer.",
     "Error moving file" : "Error en moure el fitxer",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ja existeix",
     "Could not rename file" : "No es pot canviar el nom de fitxer",
+    "Could not create file" : "No s'ha pogut crear el fitxer",
+    "Could not create folder" : "No s'ha pogut crear la carpeta",
     "Error deleting file." : "Error en esborrar el fitxer.",
     "No entries in this folder match '{filter}'" : "No hi ha resultats que coincideixin amb '{filter}'",
     "Name" : "Nom",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "No teniu permisos per a pujar o crear els fitxers aquí",
     "_Uploading %n file_::_Uploading %n files_" : ["Pujant %n fitxer","Pujant %n fitxers"],
+    "New" : "Nou",
     "\"{name}\" is an invalid file name." : "\"{name}\" no es un fitxer vàlid.",
     "File name cannot be empty." : "El nom del fitxer no pot ser buit.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "L'emmagatzematge de {owner} està ple, els arxius no es poden actualitzar o sincronitzar més!",
@@ -67,6 +68,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidències '{filter}'","coincidència '{filter}'"],
     "Favorited" : "Agregat a favorits",
     "Favorite" : "Preferits",
+    "Upload" : "Puja",
+    "Text file" : "Fitxer de text",
+    "Folder" : "Carpeta",
+    "New folder" : "Carpeta nova",
     "An error occurred while trying to update the tags" : "S'ha produït un error en tractar d'actualitzar les etiquetes",
     "A new file or folder has been <strong>created</strong>" : "S'ha <strong>creat</strong> un nou fitxer o una nova carpeta",
     "A file or folder has been <strong>changed</strong>" : "S'ha <strong>canviat</strong> un fitxer o una carpeta",
@@ -93,12 +98,6 @@ OC.L10N.register(
     "Settings" : "Arranjament",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
-    "New" : "Nou",
-    "New text file" : "Nou fitxer de text",
-    "Text file" : "Fitxer de text",
-    "New folder" : "Carpeta nova",
-    "Folder" : "Carpeta",
-    "Upload" : "Puja",
     "Cancel upload" : "Cancel·la la pujada",
     "No files in here" : "No hi ha arxius",
     "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.",
diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json
index 7fcc056717d..10a39fc941a 100644
--- a/apps/files/l10n/ca.json
+++ b/apps/files/l10n/ca.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "La pujada s'ha cancel·lat.",
     "Could not get result from server." : "No hi ha resposta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
-    "{new_name} already exists" : "{new_name} ja existeix",
-    "Could not create file" : "No s'ha pogut crear el fitxer",
-    "Could not create folder" : "No s'ha pogut crear la carpeta",
     "Actions" : "Accions",
     "Download" : "Baixa",
     "Select" : "Selecciona",
@@ -45,7 +42,10 @@
     "Error moving file." : "Error en moure el fitxer.",
     "Error moving file" : "Error en moure el fitxer",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ja existeix",
     "Could not rename file" : "No es pot canviar el nom de fitxer",
+    "Could not create file" : "No s'ha pogut crear el fitxer",
+    "Could not create folder" : "No s'ha pogut crear la carpeta",
     "Error deleting file." : "Error en esborrar el fitxer.",
     "No entries in this folder match '{filter}'" : "No hi ha resultats que coincideixin amb '{filter}'",
     "Name" : "Nom",
@@ -56,6 +56,7 @@
     "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "No teniu permisos per a pujar o crear els fitxers aquí",
     "_Uploading %n file_::_Uploading %n files_" : ["Pujant %n fitxer","Pujant %n fitxers"],
+    "New" : "Nou",
     "\"{name}\" is an invalid file name." : "\"{name}\" no es un fitxer vàlid.",
     "File name cannot be empty." : "El nom del fitxer no pot ser buit.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "L'emmagatzematge de {owner} està ple, els arxius no es poden actualitzar o sincronitzar més!",
@@ -65,6 +66,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidències '{filter}'","coincidència '{filter}'"],
     "Favorited" : "Agregat a favorits",
     "Favorite" : "Preferits",
+    "Upload" : "Puja",
+    "Text file" : "Fitxer de text",
+    "Folder" : "Carpeta",
+    "New folder" : "Carpeta nova",
     "An error occurred while trying to update the tags" : "S'ha produït un error en tractar d'actualitzar les etiquetes",
     "A new file or folder has been <strong>created</strong>" : "S'ha <strong>creat</strong> un nou fitxer o una nova carpeta",
     "A file or folder has been <strong>changed</strong>" : "S'ha <strong>canviat</strong> un fitxer o una carpeta",
@@ -91,12 +96,6 @@
     "Settings" : "Arranjament",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
-    "New" : "Nou",
-    "New text file" : "Nou fitxer de text",
-    "Text file" : "Fitxer de text",
-    "New folder" : "Carpeta nova",
-    "Folder" : "Carpeta",
-    "Upload" : "Puja",
     "Cancel upload" : "Cancel·la la pujada",
     "No files in here" : "No hi ha arxius",
     "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.",
diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js
index c12c66892d9..d462c1361de 100644
--- a/apps/files/l10n/cs_CZ.js
+++ b/apps/files/l10n/cs_CZ.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Odesílání zrušeno.",
     "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
-    "{new_name} already exists" : "{new_name} již existuje",
-    "Could not create file" : "Nepodařilo se vytvořit soubor",
-    "Could not create folder" : "Nepodařilo se vytvořit složku",
     "Actions" : "Činnosti",
     "Download" : "Stáhnout",
     "Select" : "Vybrat",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Chyba při přesunu souboru.",
     "Error moving file" : "Chyba při přesunu souboru",
     "Error" : "Chyba",
+    "{new_name} already exists" : "{new_name} již existuje",
     "Could not rename file" : "Nepodařilo se přejmenovat soubor",
+    "Could not create file" : "Nepodařilo se vytvořit soubor",
+    "Could not create folder" : "Nepodařilo se vytvořit složku",
     "Error deleting file." : "Chyba při mazání souboru.",
     "No entries in this folder match '{filter}'" : "V tomto adresáři nic nesouhlasí s '{filter}'",
     "Name" : "Název",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} a {files}",
     "You don’t have permission to upload or create files here" : "Nemáte oprávnění sem nahrávat nebo vytvářet soubory",
     "_Uploading %n file_::_Uploading %n files_" : ["Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"],
+    "New" : "Nový",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatným názvem souboru.",
     "File name cannot be empty." : "Název souboru nemůže být prázdný řetězec.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Úložiště uživatele {owner} je zaplněné, soubory nelze aktualizovat a synchronizovat!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"],
     "Favorited" : "Přidáno k oblíbeným",
     "Favorite" : "Oblíbené",
+    "Upload" : "Odeslat",
+    "Text file" : "Textový soubor",
+    "Folder" : "Složka",
+    "New folder" : "Nová složka",
     "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba",
     "A new file or folder has been <strong>created</strong>" : "Byl <strong>vytvořen</strong> nový soubor nebo složka",
     "A file or folder has been <strong>changed</strong>" : "Soubor nebo složka byla <strong>změněna</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Nastavení",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\">přístup k vašim souborům přes WebDAV</a>",
-    "New" : "Nový",
-    "New text file" : "Nový textový soubor",
-    "Text file" : "Textový soubor",
-    "New folder" : "Nová složka",
-    "Folder" : "Složka",
-    "Upload" : "Odeslat",
     "Cancel upload" : "Zrušit odesílání",
     "No files in here" : "Žádné soubory",
     "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!",
diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json
index da8c653d37e..56695a52489 100644
--- a/apps/files/l10n/cs_CZ.json
+++ b/apps/files/l10n/cs_CZ.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Odesílání zrušeno.",
     "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
-    "{new_name} already exists" : "{new_name} již existuje",
-    "Could not create file" : "Nepodařilo se vytvořit soubor",
-    "Could not create folder" : "Nepodařilo se vytvořit složku",
     "Actions" : "Činnosti",
     "Download" : "Stáhnout",
     "Select" : "Vybrat",
@@ -47,7 +44,10 @@
     "Error moving file." : "Chyba při přesunu souboru.",
     "Error moving file" : "Chyba při přesunu souboru",
     "Error" : "Chyba",
+    "{new_name} already exists" : "{new_name} již existuje",
     "Could not rename file" : "Nepodařilo se přejmenovat soubor",
+    "Could not create file" : "Nepodařilo se vytvořit soubor",
+    "Could not create folder" : "Nepodařilo se vytvořit složku",
     "Error deleting file." : "Chyba při mazání souboru.",
     "No entries in this folder match '{filter}'" : "V tomto adresáři nic nesouhlasí s '{filter}'",
     "Name" : "Název",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} a {files}",
     "You don’t have permission to upload or create files here" : "Nemáte oprávnění sem nahrávat nebo vytvářet soubory",
     "_Uploading %n file_::_Uploading %n files_" : ["Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"],
+    "New" : "Nový",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatným názvem souboru.",
     "File name cannot be empty." : "Název souboru nemůže být prázdný řetězec.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Úložiště uživatele {owner} je zaplněné, soubory nelze aktualizovat a synchronizovat!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"],
     "Favorited" : "Přidáno k oblíbeným",
     "Favorite" : "Oblíbené",
+    "Upload" : "Odeslat",
+    "Text file" : "Textový soubor",
+    "Folder" : "Složka",
+    "New folder" : "Nová složka",
     "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba",
     "A new file or folder has been <strong>created</strong>" : "Byl <strong>vytvořen</strong> nový soubor nebo složka",
     "A file or folder has been <strong>changed</strong>" : "Soubor nebo složka byla <strong>změněna</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "Nastavení",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\">přístup k vašim souborům přes WebDAV</a>",
-    "New" : "Nový",
-    "New text file" : "Nový textový soubor",
-    "Text file" : "Textový soubor",
-    "New folder" : "Nová složka",
-    "Folder" : "Složka",
-    "Upload" : "Odeslat",
     "Cancel upload" : "Zrušit odesílání",
     "No files in here" : "Žádné soubory",
     "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!",
diff --git a/apps/files/l10n/cy_GB.js b/apps/files/l10n/cy_GB.js
index f3a9825ea4c..bdf61e20f24 100644
--- a/apps/files/l10n/cy_GB.js
+++ b/apps/files/l10n/cy_GB.js
@@ -18,26 +18,26 @@ OC.L10N.register(
     "Close" : "Cau",
     "Upload cancelled." : "Diddymwyd llwytho i fyny.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
-    "{new_name} already exists" : "{new_name} yn bodoli'n barod",
     "Actions" : "Gweithredoedd",
     "Download" : "Llwytho i lawr",
     "Pending" : "I ddod",
     "Error" : "Gwall",
+    "{new_name} already exists" : "{new_name} yn bodoli'n barod",
     "Name" : "Enw",
     "Size" : "Maint",
     "Modified" : "Addaswyd",
+    "New" : "Newydd",
     "File name cannot be empty." : "Does dim hawl cael enw ffeil gwag.",
     "Your storage is full, files can not be updated or synced anymore!" : "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)",
+    "Upload" : "Llwytho i fyny",
+    "Text file" : "Ffeil destun",
+    "Folder" : "Plygell",
     "File handling" : "Trafod ffeiliau",
     "Maximum upload size" : "Maint mwyaf llwytho i fyny",
     "max. possible: " : "mwyaf. posib:",
     "Save" : "Cadw",
     "Settings" : "Gosodiadau",
-    "New" : "Newydd",
-    "Text file" : "Ffeil destun",
-    "Folder" : "Plygell",
-    "Upload" : "Llwytho i fyny",
     "Cancel upload" : "Diddymu llwytho i fyny",
     "Delete" : "Dileu",
     "Upload too large" : "Maint llwytho i fyny'n rhy fawr",
diff --git a/apps/files/l10n/cy_GB.json b/apps/files/l10n/cy_GB.json
index e4c7a637625..eb66c24ec62 100644
--- a/apps/files/l10n/cy_GB.json
+++ b/apps/files/l10n/cy_GB.json
@@ -16,26 +16,26 @@
     "Close" : "Cau",
     "Upload cancelled." : "Diddymwyd llwytho i fyny.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
-    "{new_name} already exists" : "{new_name} yn bodoli'n barod",
     "Actions" : "Gweithredoedd",
     "Download" : "Llwytho i lawr",
     "Pending" : "I ddod",
     "Error" : "Gwall",
+    "{new_name} already exists" : "{new_name} yn bodoli'n barod",
     "Name" : "Enw",
     "Size" : "Maint",
     "Modified" : "Addaswyd",
+    "New" : "Newydd",
     "File name cannot be empty." : "Does dim hawl cael enw ffeil gwag.",
     "Your storage is full, files can not be updated or synced anymore!" : "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)",
+    "Upload" : "Llwytho i fyny",
+    "Text file" : "Ffeil destun",
+    "Folder" : "Plygell",
     "File handling" : "Trafod ffeiliau",
     "Maximum upload size" : "Maint mwyaf llwytho i fyny",
     "max. possible: " : "mwyaf. posib:",
     "Save" : "Cadw",
     "Settings" : "Gosodiadau",
-    "New" : "Newydd",
-    "Text file" : "Ffeil destun",
-    "Folder" : "Plygell",
-    "Upload" : "Llwytho i fyny",
     "Cancel upload" : "Diddymu llwytho i fyny",
     "Delete" : "Dileu",
     "Upload too large" : "Maint llwytho i fyny'n rhy fawr",
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index b82b69baf52..1ecbcb7e16f 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Upload afbrudt.",
     "Could not get result from server." : "Kunne ikke hente resultat fra server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
-    "{new_name} already exists" : "{new_name} eksisterer allerede",
-    "Could not create file" : "Kunne ikke oprette fil",
-    "Could not create folder" : "Kunne ikke oprette mappe",
     "Actions" : "Handlinger",
     "Download" : "Download",
     "Select" : "Vælg",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Fejl ved flytning af fil",
     "Error moving file" : "Fejl ved flytning af fil",
     "Error" : "Fejl",
+    "{new_name} already exists" : "{new_name} eksisterer allerede",
     "Could not rename file" : "Kunne ikke omdøbe filen",
+    "Could not create file" : "Kunne ikke oprette fil",
+    "Could not create folder" : "Kunne ikke oprette mappe",
     "Error deleting file." : "Fejl ved sletnign af fil.",
     "No entries in this folder match '{filter}'" : "Der er ingen poster i denne mappe, der matcher '{filter}'",
     "Name" : "Navn",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} og {files}",
     "You don’t have permission to upload or create files here" : "Du har ikke tilladelse til at uploade eller oprette filer her",
     "_Uploading %n file_::_Uploading %n files_" : ["Uploader %n fil","Uploader %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "'{name}' er et ugyldigt filnavn.",
     "File name cannot be empty." : "Filnavnet kan ikke stå tomt.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Opbevaringspladsen tilhørende {owner} er fyldt op - filer kan ikke længere opdateres eller synkroniseres!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Gjort til foretrukken",
     "Favorite" : "Foretrukken",
+    "Upload" : "Upload",
+    "Text file" : "Tekstfil",
+    "Folder" : "Mappe",
+    "New folder" : "Ny Mappe",
     "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mapper er blevet <strong>oprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe er blevet <strong>ændret</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Indstillinger",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny tekstfil",
-    "Text file" : "Tekstfil",
-    "New folder" : "Ny Mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Upload",
     "Cancel upload" : "Fortryd upload",
     "No files in here" : "Her er ingen filer",
     "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index 85e0f872433..c85759c5640 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Upload afbrudt.",
     "Could not get result from server." : "Kunne ikke hente resultat fra server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
-    "{new_name} already exists" : "{new_name} eksisterer allerede",
-    "Could not create file" : "Kunne ikke oprette fil",
-    "Could not create folder" : "Kunne ikke oprette mappe",
     "Actions" : "Handlinger",
     "Download" : "Download",
     "Select" : "Vælg",
@@ -47,7 +44,10 @@
     "Error moving file." : "Fejl ved flytning af fil",
     "Error moving file" : "Fejl ved flytning af fil",
     "Error" : "Fejl",
+    "{new_name} already exists" : "{new_name} eksisterer allerede",
     "Could not rename file" : "Kunne ikke omdøbe filen",
+    "Could not create file" : "Kunne ikke oprette fil",
+    "Could not create folder" : "Kunne ikke oprette mappe",
     "Error deleting file." : "Fejl ved sletnign af fil.",
     "No entries in this folder match '{filter}'" : "Der er ingen poster i denne mappe, der matcher '{filter}'",
     "Name" : "Navn",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} og {files}",
     "You don’t have permission to upload or create files here" : "Du har ikke tilladelse til at uploade eller oprette filer her",
     "_Uploading %n file_::_Uploading %n files_" : ["Uploader %n fil","Uploader %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "'{name}' er et ugyldigt filnavn.",
     "File name cannot be empty." : "Filnavnet kan ikke stå tomt.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Opbevaringspladsen tilhørende {owner} er fyldt op - filer kan ikke længere opdateres eller synkroniseres!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Gjort til foretrukken",
     "Favorite" : "Foretrukken",
+    "Upload" : "Upload",
+    "Text file" : "Tekstfil",
+    "Folder" : "Mappe",
+    "New folder" : "Ny Mappe",
     "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mapper er blevet <strong>oprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe er blevet <strong>ændret</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "Indstillinger",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny tekstfil",
-    "Text file" : "Tekstfil",
-    "New folder" : "Ny Mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Upload",
     "Cancel upload" : "Fortryd upload",
     "No files in here" : "Her er ingen filer",
     "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!",
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index 48e386308ec..5e22e05f80d 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Upload abgebrochen.",
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Could not create file" : "Die Datei konnte nicht erstellt werden",
-    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Actions" : "Aktionen",
     "Download" : "Herunterladen",
     "Select" : "Auswählen",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Fehler beim Verschieben der Datei.",
     "Error moving file" : "Fehler beim Verschieben der Datei",
     "Error" : "Fehler",
+    "{new_name} already exists" : "{new_name} existiert bereits",
     "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Could not create file" : "Die Datei konnte nicht erstellt werden",
+    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Error deleting file." : "Fehler beim Löschen der Datei.",
     "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein",
     "Name" : "Name",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} und {files}",
     "You don’t have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
     "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
+    "New" : "Neu",
     "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Der Speicher von {owner} ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"],
     "Favorited" : "Favorisiert",
     "Favorite" : "Favorit",
+    "Upload" : "Hochladen",
+    "Text file" : "Textdatei",
+    "Folder" : "Ordner",
+    "New folder" : "Neuer Ordner",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
@@ -97,12 +102,6 @@ OC.L10N.register(
     "Settings" : "Einstellungen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Benutze diese Adresse, um <a href=\"%s\" target=\"_blank\">über WebDAV auf Deine Dateien zuzugreifen</a>",
-    "New" : "Neu",
-    "New text file" : "Neue Textdatei",
-    "Text file" : "Textdatei",
-    "New folder" : "Neuer Ordner",
-    "Folder" : "Ordner",
-    "Upload" : "Hochladen",
     "Cancel upload" : "Upload abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Lade Inhalte hoch oder synchronisiere mit Deinen Geräten!",
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index fdf22ba9732..5e93d2b3856 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Upload abgebrochen.",
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Could not create file" : "Die Datei konnte nicht erstellt werden",
-    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Actions" : "Aktionen",
     "Download" : "Herunterladen",
     "Select" : "Auswählen",
@@ -47,7 +44,10 @@
     "Error moving file." : "Fehler beim Verschieben der Datei.",
     "Error moving file" : "Fehler beim Verschieben der Datei",
     "Error" : "Fehler",
+    "{new_name} already exists" : "{new_name} existiert bereits",
     "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Could not create file" : "Die Datei konnte nicht erstellt werden",
+    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Error deleting file." : "Fehler beim Löschen der Datei.",
     "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein",
     "Name" : "Name",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} und {files}",
     "You don’t have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
     "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
+    "New" : "Neu",
     "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Der Speicher von {owner} ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"],
     "Favorited" : "Favorisiert",
     "Favorite" : "Favorit",
+    "Upload" : "Hochladen",
+    "Text file" : "Textdatei",
+    "Folder" : "Ordner",
+    "New folder" : "Neuer Ordner",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
@@ -95,12 +100,6 @@
     "Settings" : "Einstellungen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Benutze diese Adresse, um <a href=\"%s\" target=\"_blank\">über WebDAV auf Deine Dateien zuzugreifen</a>",
-    "New" : "Neu",
-    "New text file" : "Neue Textdatei",
-    "Text file" : "Textdatei",
-    "New folder" : "Neuer Ordner",
-    "Folder" : "Ordner",
-    "Upload" : "Hochladen",
     "Cancel upload" : "Upload abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Lade Inhalte hoch oder synchronisiere mit Deinen Geräten!",
diff --git a/apps/files/l10n/de_AT.js b/apps/files/l10n/de_AT.js
index a6ff8843a63..70adef6bb08 100644
--- a/apps/files/l10n/de_AT.js
+++ b/apps/files/l10n/de_AT.js
@@ -5,6 +5,8 @@ OC.L10N.register(
     "Files" : "Dateien",
     "Download" : "Herunterladen",
     "Error" : "Fehler",
+    "Upload" : "Hochladen",
+    "New folder" : "Neuer Ordner",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner hat sich <strong>geändert</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>",
@@ -16,8 +18,6 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s löschte %1$s",
     "Save" : "Speichern",
     "Settings" : "Einstellungen",
-    "New folder" : "Neuer Ordner",
-    "Upload" : "Hochladen",
     "Cancel upload" : "Hochladen abbrechen",
     "Delete" : "Löschen"
 },
diff --git a/apps/files/l10n/de_AT.json b/apps/files/l10n/de_AT.json
index 0356e6650af..8766f264741 100644
--- a/apps/files/l10n/de_AT.json
+++ b/apps/files/l10n/de_AT.json
@@ -3,6 +3,8 @@
     "Files" : "Dateien",
     "Download" : "Herunterladen",
     "Error" : "Fehler",
+    "Upload" : "Hochladen",
+    "New folder" : "Neuer Ordner",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner hat sich <strong>geändert</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>",
@@ -14,8 +16,6 @@
     "%2$s deleted %1$s" : "%2$s löschte %1$s",
     "Save" : "Speichern",
     "Settings" : "Einstellungen",
-    "New folder" : "Neuer Ordner",
-    "Upload" : "Hochladen",
     "Cancel upload" : "Hochladen abbrechen",
     "Delete" : "Löschen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index bc2f764ae55..34c6c8fb4a6 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Upload abgebrochen.",
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Could not create file" : "Die Datei konnte nicht erstellt werden",
-    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Actions" : "Aktionen",
     "Download" : "Herunterladen",
     "Select" : "Auswählen",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Fehler beim Verschieben der Datei.",
     "Error moving file" : "Fehler beim Verschieben der Datei",
     "Error" : "Fehler",
+    "{new_name} already exists" : "{new_name} existiert bereits",
     "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Could not create file" : "Die Datei konnte nicht erstellt werden",
+    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Error deleting file." : "Fehler beim Löschen der Datei.",
     "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein",
     "Name" : "Name",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} und {files}",
     "You don’t have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
     "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hoch geladen"],
+    "New" : "Neu",
     "\"{name}\" is an invalid file name." : "„{name}“ ist kein gültiger Dateiname.",
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Der Speicher von {owner} ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
@@ -69,6 +70,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"],
     "Favorited" : "Favorisiert",
     "Favorite" : "Favorit",
+    "Upload" : "Hochladen",
+    "Text file" : "Textdatei",
+    "Folder" : "Ordner",
+    "New folder" : "Neuer Ordner",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
@@ -95,12 +100,6 @@ OC.L10N.register(
     "Settings" : "Einstellungen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Benutzen Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">über WebDAV auf Ihre Dateien zuzugreifen</a>",
-    "New" : "Neu",
-    "New text file" : "Neue Textdatei",
-    "Text file" : "Textdatei",
-    "New folder" : "Neuer Ordner",
-    "Folder" : "Ordner",
-    "Upload" : "Hochladen",
     "Cancel upload" : "Upload abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!",
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index 7e4ee06cb81..390e5e0e575 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Upload abgebrochen.",
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Could not create file" : "Die Datei konnte nicht erstellt werden",
-    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Actions" : "Aktionen",
     "Download" : "Herunterladen",
     "Select" : "Auswählen",
@@ -47,7 +44,10 @@
     "Error moving file." : "Fehler beim Verschieben der Datei.",
     "Error moving file" : "Fehler beim Verschieben der Datei",
     "Error" : "Fehler",
+    "{new_name} already exists" : "{new_name} existiert bereits",
     "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Could not create file" : "Die Datei konnte nicht erstellt werden",
+    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Error deleting file." : "Fehler beim Löschen der Datei.",
     "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein",
     "Name" : "Name",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} und {files}",
     "You don’t have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
     "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hoch geladen"],
+    "New" : "Neu",
     "\"{name}\" is an invalid file name." : "„{name}“ ist kein gültiger Dateiname.",
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Der Speicher von {owner} ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
@@ -67,6 +68,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"],
     "Favorited" : "Favorisiert",
     "Favorite" : "Favorit",
+    "Upload" : "Hochladen",
+    "Text file" : "Textdatei",
+    "Folder" : "Ordner",
+    "New folder" : "Neuer Ordner",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
@@ -93,12 +98,6 @@
     "Settings" : "Einstellungen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Benutzen Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">über WebDAV auf Ihre Dateien zuzugreifen</a>",
-    "New" : "Neu",
-    "New text file" : "Neue Textdatei",
-    "Text file" : "Textdatei",
-    "New folder" : "Neuer Ordner",
-    "Folder" : "Ordner",
-    "Upload" : "Hochladen",
     "Cancel upload" : "Upload abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!",
diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js
index 1d0ac807d5f..582e3b1758b 100644
--- a/apps/files/l10n/el.js
+++ b/apps/files/l10n/el.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Η αποστολή ακυρώθηκε.",
     "Could not get result from server." : "Αδυναμία λήψης αποτελέσματος από το διακομιστή.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
-    "{new_name} already exists" : "{new_name} υπάρχει ήδη",
-    "Could not create file" : "Αδυναμία δημιουργίας αρχείου",
-    "Could not create folder" : "Αδυναμία δημιουργίας φακέλου",
     "Actions" : "Ενέργειες",
     "Download" : "Λήψη",
     "Select" : "Επιλογή",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Σφάλμα κατά τη μετακίνηση του αρχείου.",
     "Error moving file" : "Σφάλμα κατά τη μετακίνηση του αρχείου",
     "Error" : "Σφάλμα",
+    "{new_name} already exists" : "{new_name} υπάρχει ήδη",
     "Could not rename file" : "Αδυναμία μετονομασίας αρχείου",
+    "Could not create file" : "Αδυναμία δημιουργίας αρχείου",
+    "Could not create folder" : "Αδυναμία δημιουργίας φακέλου",
     "Error deleting file." : "Σφάλμα διαγραφής αρχείου.",
     "No entries in this folder match '{filter}'" : "Δεν ταιριάζουν καταχωρήσεις σε αυτόν το φάκελο '{filter}'",
     "Name" : "Όνομα",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{Κατάλογοι αρχείων} και {αρχεία}",
     "You don’t have permission to upload or create files here" : "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ",
     "_Uploading %n file_::_Uploading %n files_" : ["Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"],
+    "New" : "Νέο",
     "\"{name}\" is an invalid file name." : "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου.",
     "File name cannot be empty." : "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Ο αποθηκευτικός χώρος του {owner} είναι πλήρης, τα αρχεία δεν δύναται να ενημερωθούν ή να συγχρονίσουν!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Προτιμώμενα",
     "Favorite" : "Αγαπημένο",
+    "Upload" : "Μεταφόρτωση",
+    "Text file" : "Αρχείο κειμένου",
+    "Folder" : "Φάκελος",
+    "New folder" : "Νέος κατάλογος",
     "An error occurred while trying to update the tags" : "Ένα σφάλμα προέκυψε κατά τη διάρκεια ενημέρωσης των ετικετών",
     "A new file or folder has been <strong>created</strong>" : "Ένα νέο αρχείο ή κατάλογος έχουν <strong>δημιουργηθεί</strong>",
     "A file or folder has been <strong>changed</strong>" : "Ένα αρχείο ή κατάλογος έχουν <strong>αλλάξει</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Ρυθμίσεις",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">πρόσβαση στα αρχεία σας μέσω WebDAV</a>",
-    "New" : "Νέο",
-    "New text file" : "Νέο αρχείο κειμένου",
-    "Text file" : "Αρχείο κειμένου",
-    "New folder" : "Νέος κατάλογος",
-    "Folder" : "Φάκελος",
-    "Upload" : "Μεταφόρτωση",
     "Cancel upload" : "Ακύρωση μεταφόρτωσης",
     "No files in here" : "Δεν υπάρχουν αρχεία",
     "Upload some content or sync with your devices!" : "Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!",
diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json
index d3ea79a5e40..de550e86dea 100644
--- a/apps/files/l10n/el.json
+++ b/apps/files/l10n/el.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Η αποστολή ακυρώθηκε.",
     "Could not get result from server." : "Αδυναμία λήψης αποτελέσματος από το διακομιστή.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
-    "{new_name} already exists" : "{new_name} υπάρχει ήδη",
-    "Could not create file" : "Αδυναμία δημιουργίας αρχείου",
-    "Could not create folder" : "Αδυναμία δημιουργίας φακέλου",
     "Actions" : "Ενέργειες",
     "Download" : "Λήψη",
     "Select" : "Επιλογή",
@@ -47,7 +44,10 @@
     "Error moving file." : "Σφάλμα κατά τη μετακίνηση του αρχείου.",
     "Error moving file" : "Σφάλμα κατά τη μετακίνηση του αρχείου",
     "Error" : "Σφάλμα",
+    "{new_name} already exists" : "{new_name} υπάρχει ήδη",
     "Could not rename file" : "Αδυναμία μετονομασίας αρχείου",
+    "Could not create file" : "Αδυναμία δημιουργίας αρχείου",
+    "Could not create folder" : "Αδυναμία δημιουργίας φακέλου",
     "Error deleting file." : "Σφάλμα διαγραφής αρχείου.",
     "No entries in this folder match '{filter}'" : "Δεν ταιριάζουν καταχωρήσεις σε αυτόν το φάκελο '{filter}'",
     "Name" : "Όνομα",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{Κατάλογοι αρχείων} και {αρχεία}",
     "You don’t have permission to upload or create files here" : "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ",
     "_Uploading %n file_::_Uploading %n files_" : ["Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"],
+    "New" : "Νέο",
     "\"{name}\" is an invalid file name." : "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου.",
     "File name cannot be empty." : "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Ο αποθηκευτικός χώρος του {owner} είναι πλήρης, τα αρχεία δεν δύναται να ενημερωθούν ή να συγχρονίσουν!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Προτιμώμενα",
     "Favorite" : "Αγαπημένο",
+    "Upload" : "Μεταφόρτωση",
+    "Text file" : "Αρχείο κειμένου",
+    "Folder" : "Φάκελος",
+    "New folder" : "Νέος κατάλογος",
     "An error occurred while trying to update the tags" : "Ένα σφάλμα προέκυψε κατά τη διάρκεια ενημέρωσης των ετικετών",
     "A new file or folder has been <strong>created</strong>" : "Ένα νέο αρχείο ή κατάλογος έχουν <strong>δημιουργηθεί</strong>",
     "A file or folder has been <strong>changed</strong>" : "Ένα αρχείο ή κατάλογος έχουν <strong>αλλάξει</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "Ρυθμίσεις",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">πρόσβαση στα αρχεία σας μέσω WebDAV</a>",
-    "New" : "Νέο",
-    "New text file" : "Νέο αρχείο κειμένου",
-    "Text file" : "Αρχείο κειμένου",
-    "New folder" : "Νέος κατάλογος",
-    "Folder" : "Φάκελος",
-    "Upload" : "Μεταφόρτωση",
     "Cancel upload" : "Ακύρωση μεταφόρτωσης",
     "No files in here" : "Δεν υπάρχουν αρχεία",
     "Upload some content or sync with your devices!" : "Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!",
diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js
index 1433c5d9c18..decfe4dcd83 100644
--- a/apps/files/l10n/en_GB.js
+++ b/apps/files/l10n/en_GB.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Upload cancelled.",
     "Could not get result from server." : "Could not get result from server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
-    "{new_name} already exists" : "{new_name} already exists",
-    "Could not create file" : "Could not create file",
-    "Could not create folder" : "Could not create folder",
     "Actions" : "Actions",
     "Download" : "Download",
     "Select" : "Select",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Error moving file.",
     "Error moving file" : "Error moving file",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} already exists",
     "Could not rename file" : "Could not rename file",
+    "Could not create file" : "Could not create file",
+    "Could not create folder" : "Could not create folder",
     "Error deleting file." : "Error deleting file.",
     "No entries in this folder match '{filter}'" : "No entries in this folder match '{filter}'",
     "Name" : "Name",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} and {files}",
     "You don’t have permission to upload or create files here" : "You don’t have permission to upload or create files here",
     "_Uploading %n file_::_Uploading %n files_" : ["Uploading %n file","Uploading %n files"],
+    "New" : "New",
     "\"{name}\" is an invalid file name." : "\"{name}\" is an invalid file name.",
     "File name cannot be empty." : "File name cannot be empty.",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
@@ -65,6 +66,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["matches '{filter}'","match '{filter}'"],
     "Favorited" : "Favourited",
     "Favorite" : "Favourite",
+    "Upload" : "Upload",
+    "Text file" : "Text file",
+    "Folder" : "Folder",
+    "New folder" : "New folder",
     "An error occurred while trying to update the tags" : "An error occurred whilst trying to update the tags",
     "A new file or folder has been <strong>created</strong>" : "A new file or folder has been <strong>created</strong>",
     "A file or folder has been <strong>changed</strong>" : "A file or folder has been <strong>changed</strong>",
@@ -91,12 +96,6 @@ OC.L10N.register(
     "Settings" : "Settings",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
-    "New" : "New",
-    "New text file" : "New text file",
-    "Text file" : "Text file",
-    "New folder" : "New folder",
-    "Folder" : "Folder",
-    "Upload" : "Upload",
     "Cancel upload" : "Cancel upload",
     "No files in here" : "No files in here",
     "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!",
diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json
index 84feb344142..cf06affa55e 100644
--- a/apps/files/l10n/en_GB.json
+++ b/apps/files/l10n/en_GB.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Upload cancelled.",
     "Could not get result from server." : "Could not get result from server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
-    "{new_name} already exists" : "{new_name} already exists",
-    "Could not create file" : "Could not create file",
-    "Could not create folder" : "Could not create folder",
     "Actions" : "Actions",
     "Download" : "Download",
     "Select" : "Select",
@@ -45,7 +42,10 @@
     "Error moving file." : "Error moving file.",
     "Error moving file" : "Error moving file",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} already exists",
     "Could not rename file" : "Could not rename file",
+    "Could not create file" : "Could not create file",
+    "Could not create folder" : "Could not create folder",
     "Error deleting file." : "Error deleting file.",
     "No entries in this folder match '{filter}'" : "No entries in this folder match '{filter}'",
     "Name" : "Name",
@@ -56,6 +56,7 @@
     "{dirs} and {files}" : "{dirs} and {files}",
     "You don’t have permission to upload or create files here" : "You don’t have permission to upload or create files here",
     "_Uploading %n file_::_Uploading %n files_" : ["Uploading %n file","Uploading %n files"],
+    "New" : "New",
     "\"{name}\" is an invalid file name." : "\"{name}\" is an invalid file name.",
     "File name cannot be empty." : "File name cannot be empty.",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
@@ -63,6 +64,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["matches '{filter}'","match '{filter}'"],
     "Favorited" : "Favourited",
     "Favorite" : "Favourite",
+    "Upload" : "Upload",
+    "Text file" : "Text file",
+    "Folder" : "Folder",
+    "New folder" : "New folder",
     "An error occurred while trying to update the tags" : "An error occurred whilst trying to update the tags",
     "A new file or folder has been <strong>created</strong>" : "A new file or folder has been <strong>created</strong>",
     "A file or folder has been <strong>changed</strong>" : "A file or folder has been <strong>changed</strong>",
@@ -89,12 +94,6 @@
     "Settings" : "Settings",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
-    "New" : "New",
-    "New text file" : "New text file",
-    "Text file" : "Text file",
-    "New folder" : "New folder",
-    "Folder" : "Folder",
-    "Upload" : "Upload",
     "Cancel upload" : "Cancel upload",
     "No files in here" : "No files in here",
     "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!",
diff --git a/apps/files/l10n/eo.js b/apps/files/l10n/eo.js
index 0f6c7de8a31..3c208a6bc17 100644
--- a/apps/files/l10n/eo.js
+++ b/apps/files/l10n/eo.js
@@ -29,16 +29,16 @@ OC.L10N.register(
     "Upload cancelled." : "La alŝuto nuliĝis.",
     "Could not get result from server." : "Ne povis ekhaviĝi rezulto el la servilo.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
-    "{new_name} already exists" : "{new_name} jam ekzistas",
-    "Could not create file" : "Ne povis kreiĝi dosiero",
-    "Could not create folder" : "Ne povis kreiĝi dosierujo",
     "Actions" : "Agoj",
     "Download" : "Elŝuti",
     "Select" : "Elekti",
     "Pending" : "Traktotaj",
     "Error moving file" : "Eraris movo de dosiero",
     "Error" : "Eraro",
+    "{new_name} already exists" : "{new_name} jam ekzistas",
     "Could not rename file" : "Ne povis alinomiĝi dosiero",
+    "Could not create file" : "Ne povis kreiĝi dosiero",
+    "Could not create folder" : "Ne povis kreiĝi dosierujo",
     "Name" : "Nomo",
     "Size" : "Grando",
     "Modified" : "Modifita",
@@ -47,10 +47,15 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} kaj {files}",
     "You don’t have permission to upload or create files here" : "Vi ne havas permeson alŝuti aŭ krei dosierojn ĉi tie",
     "_Uploading %n file_::_Uploading %n files_" : ["Alŝutatas %n dosiero","Alŝutatas %n dosieroj"],
+    "New" : "Nova",
     "File name cannot be empty." : "Dosiernomo devas ne malpleni.",
     "Your storage is full, files can not be updated or synced anymore!" : "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
     "Favorite" : "Favorato",
+    "Upload" : "Alŝuti",
+    "Text file" : "Tekstodosiero",
+    "Folder" : "Dosierujo",
+    "New folder" : "Nova dosierujo",
     "You created %1$s" : "Vi kreis %1$s",
     "%2$s created %1$s" : "%2$s kreis %1$s",
     "%1$s was created in a public folder" : "%1$s kreiĝis en publika dosierujo",
@@ -68,12 +73,6 @@ OC.L10N.register(
     "Settings" : "Agordo",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Uzu ĉi tiun adreson por <a href=\"%s\" target=\"_blank\">aliri viajn Dosierojn per WebDAV</a>",
-    "New" : "Nova",
-    "New text file" : "Nova tekstodosiero",
-    "Text file" : "Tekstodosiero",
-    "New folder" : "Nova dosierujo",
-    "Folder" : "Dosierujo",
-    "Upload" : "Alŝuti",
     "Cancel upload" : "Nuligi alŝuton",
     "No files in here" : "Neniu dosiero estas ĉi tie",
     "Select all" : "Elekti ĉion",
diff --git a/apps/files/l10n/eo.json b/apps/files/l10n/eo.json
index 88639f33449..bf69b68d883 100644
--- a/apps/files/l10n/eo.json
+++ b/apps/files/l10n/eo.json
@@ -27,16 +27,16 @@
     "Upload cancelled." : "La alŝuto nuliĝis.",
     "Could not get result from server." : "Ne povis ekhaviĝi rezulto el la servilo.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
-    "{new_name} already exists" : "{new_name} jam ekzistas",
-    "Could not create file" : "Ne povis kreiĝi dosiero",
-    "Could not create folder" : "Ne povis kreiĝi dosierujo",
     "Actions" : "Agoj",
     "Download" : "Elŝuti",
     "Select" : "Elekti",
     "Pending" : "Traktotaj",
     "Error moving file" : "Eraris movo de dosiero",
     "Error" : "Eraro",
+    "{new_name} already exists" : "{new_name} jam ekzistas",
     "Could not rename file" : "Ne povis alinomiĝi dosiero",
+    "Could not create file" : "Ne povis kreiĝi dosiero",
+    "Could not create folder" : "Ne povis kreiĝi dosierujo",
     "Name" : "Nomo",
     "Size" : "Grando",
     "Modified" : "Modifita",
@@ -45,10 +45,15 @@
     "{dirs} and {files}" : "{dirs} kaj {files}",
     "You don’t have permission to upload or create files here" : "Vi ne havas permeson alŝuti aŭ krei dosierojn ĉi tie",
     "_Uploading %n file_::_Uploading %n files_" : ["Alŝutatas %n dosiero","Alŝutatas %n dosieroj"],
+    "New" : "Nova",
     "File name cannot be empty." : "Dosiernomo devas ne malpleni.",
     "Your storage is full, files can not be updated or synced anymore!" : "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
     "Favorite" : "Favorato",
+    "Upload" : "Alŝuti",
+    "Text file" : "Tekstodosiero",
+    "Folder" : "Dosierujo",
+    "New folder" : "Nova dosierujo",
     "You created %1$s" : "Vi kreis %1$s",
     "%2$s created %1$s" : "%2$s kreis %1$s",
     "%1$s was created in a public folder" : "%1$s kreiĝis en publika dosierujo",
@@ -66,12 +71,6 @@
     "Settings" : "Agordo",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Uzu ĉi tiun adreson por <a href=\"%s\" target=\"_blank\">aliri viajn Dosierojn per WebDAV</a>",
-    "New" : "Nova",
-    "New text file" : "Nova tekstodosiero",
-    "Text file" : "Tekstodosiero",
-    "New folder" : "Nova dosierujo",
-    "Folder" : "Dosierujo",
-    "Upload" : "Alŝuti",
     "Cancel upload" : "Nuligi alŝuton",
     "No files in here" : "Neniu dosiero estas ĉi tie",
     "Select all" : "Elekti ĉion",
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index 39f4b8d0569..43e32d9ab25 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Subida cancelada.",
     "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear la carpeta",
     "Actions" : "Acciones",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Error al mover el archivo.",
     "Error moving file" : "Error moviendo archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear la carpeta",
     "Error deleting file." : "Error al borrar el archivo",
     "No entries in this folder match '{filter}'" : "No hay resultados que coincidan con '{filter}'",
     "Name" : "Nombre",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "No tiene permisos para subir o crear archivos aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "\"{name}\" is an invalid file name." : "\"{name}\" es un nombre de archivo inválido.",
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "El almacén de {owner} está repleto, ¡los archivos no se actualizarán ni sincronizarán más!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Agregado a Favoritos",
     "Favorite" : "Favorito",
+    "Upload" : "Subir",
+    "Text file" : "Archivo de texto",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Se ha <strong>creado</strong> un nuevo archivo o carpeta",
     "A file or folder has been <strong>changed</strong>" : "Se ha <strong>modificado</strong> un archivo o carpeta",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Ajustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use esta URL <a href=\"%s\" target=\"_blank\">para acceder via WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir",
     "Cancel upload" : "Cancelar la subida",
     "No files in here" : "Aquí no hay archivos",
     "Upload some content or sync with your devices!" : "Suba contenidos o sincronice sus dispositivos.",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index 064ffe3785d..4d2e01e7eb8 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Subida cancelada.",
     "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear la carpeta",
     "Actions" : "Acciones",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
@@ -47,7 +44,10 @@
     "Error moving file." : "Error al mover el archivo.",
     "Error moving file" : "Error moviendo archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear la carpeta",
     "Error deleting file." : "Error al borrar el archivo",
     "No entries in this folder match '{filter}'" : "No hay resultados que coincidan con '{filter}'",
     "Name" : "Nombre",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "No tiene permisos para subir o crear archivos aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "\"{name}\" is an invalid file name." : "\"{name}\" es un nombre de archivo inválido.",
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "El almacén de {owner} está repleto, ¡los archivos no se actualizarán ni sincronizarán más!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Agregado a Favoritos",
     "Favorite" : "Favorito",
+    "Upload" : "Subir",
+    "Text file" : "Archivo de texto",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Se ha <strong>creado</strong> un nuevo archivo o carpeta",
     "A file or folder has been <strong>changed</strong>" : "Se ha <strong>modificado</strong> un archivo o carpeta",
@@ -96,12 +101,6 @@
     "Settings" : "Ajustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use esta URL <a href=\"%s\" target=\"_blank\">para acceder via WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir",
     "Cancel upload" : "Cancelar la subida",
     "No files in here" : "Aquí no hay archivos",
     "Upload some content or sync with your devices!" : "Suba contenidos o sincronice sus dispositivos.",
diff --git a/apps/files/l10n/es_AR.js b/apps/files/l10n/es_AR.js
index 8b277c3b9f5..f99464401b6 100644
--- a/apps/files/l10n/es_AR.js
+++ b/apps/files/l10n/es_AR.js
@@ -29,16 +29,16 @@ OC.L10N.register(
     "Upload cancelled." : "La subida fue cancelada",
     "Could not get result from server." : "No se pudo obtener resultados del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear el directorio",
     "Actions" : "Acciones",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
     "Pending" : "Pendientes",
     "Error moving file" : "Error moviendo el archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear el directorio",
     "Error deleting file." : "Error al borrar el archivo.",
     "Name" : "Nombre",
     "Size" : "Tamaño",
@@ -48,10 +48,15 @@ OC.L10N.register(
     "{dirs} and {files}" : "{carpetas} y {archivos}",
     "You don’t have permission to upload or create files here" : "No tienes permisos para subir o crear archivos aquí",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "File name cannot be empty." : "El nombre del archivo no puede quedar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
     "Your storage is almost full ({usedSpacePercent}%)" : "El almacenamiento está casi lleno ({usedSpacePercent}%)",
     "Favorite" : "Favorito",
+    "Upload" : "Subir",
+    "Text file" : "Archivo de texto",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva Carpeta",
     "A new file or folder has been <strong>created</strong>" : "Un archivo o carpeta ha sido <strong>creado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>modificado</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
@@ -69,12 +74,6 @@ OC.L10N.register(
     "Settings" : "Configuración",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva Carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir",
     "Cancel upload" : "Cancelar subida",
     "Delete" : "Borrar",
     "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande",
diff --git a/apps/files/l10n/es_AR.json b/apps/files/l10n/es_AR.json
index a9bd63269db..43dc9d35c3c 100644
--- a/apps/files/l10n/es_AR.json
+++ b/apps/files/l10n/es_AR.json
@@ -27,16 +27,16 @@
     "Upload cancelled." : "La subida fue cancelada",
     "Could not get result from server." : "No se pudo obtener resultados del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear el directorio",
     "Actions" : "Acciones",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
     "Pending" : "Pendientes",
     "Error moving file" : "Error moviendo el archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear el directorio",
     "Error deleting file." : "Error al borrar el archivo.",
     "Name" : "Nombre",
     "Size" : "Tamaño",
@@ -46,10 +46,15 @@
     "{dirs} and {files}" : "{carpetas} y {archivos}",
     "You don’t have permission to upload or create files here" : "No tienes permisos para subir o crear archivos aquí",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "File name cannot be empty." : "El nombre del archivo no puede quedar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
     "Your storage is almost full ({usedSpacePercent}%)" : "El almacenamiento está casi lleno ({usedSpacePercent}%)",
     "Favorite" : "Favorito",
+    "Upload" : "Subir",
+    "Text file" : "Archivo de texto",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva Carpeta",
     "A new file or folder has been <strong>created</strong>" : "Un archivo o carpeta ha sido <strong>creado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>modificado</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
@@ -67,12 +72,6 @@
     "Settings" : "Configuración",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva Carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir",
     "Cancel upload" : "Cancelar subida",
     "Delete" : "Borrar",
     "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande",
diff --git a/apps/files/l10n/es_CL.js b/apps/files/l10n/es_CL.js
index a33902178e1..c6269cdafd1 100644
--- a/apps/files/l10n/es_CL.js
+++ b/apps/files/l10n/es_CL.js
@@ -5,6 +5,8 @@ OC.L10N.register(
     "Files" : "Archivos",
     "Download" : "Descargar",
     "Error" : "Error",
+    "Upload" : "Subir",
+    "New folder" : "Nuevo directorio",
     "A new file or folder has been <strong>created</strong>" : "Un nuevo archivo o carpeta ha sido <strong>creado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>cambiado</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
@@ -15,8 +17,6 @@ OC.L10N.register(
     "You deleted %1$s" : "Ha borrado %1$s",
     "%2$s deleted %1$s" : "%2$s borró %1$s",
     "Settings" : "Configuración",
-    "New folder" : "Nuevo directorio",
-    "Upload" : "Subir",
     "Cancel upload" : "cancelar subida"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_CL.json b/apps/files/l10n/es_CL.json
index 9703b5d68f9..75215c9cb7f 100644
--- a/apps/files/l10n/es_CL.json
+++ b/apps/files/l10n/es_CL.json
@@ -3,6 +3,8 @@
     "Files" : "Archivos",
     "Download" : "Descargar",
     "Error" : "Error",
+    "Upload" : "Subir",
+    "New folder" : "Nuevo directorio",
     "A new file or folder has been <strong>created</strong>" : "Un nuevo archivo o carpeta ha sido <strong>creado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>cambiado</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
@@ -13,8 +15,6 @@
     "You deleted %1$s" : "Ha borrado %1$s",
     "%2$s deleted %1$s" : "%2$s borró %1$s",
     "Settings" : "Configuración",
-    "New folder" : "Nuevo directorio",
-    "Upload" : "Subir",
     "Cancel upload" : "cancelar subida"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js
index 61438805521..b58037005aa 100644
--- a/apps/files/l10n/es_MX.js
+++ b/apps/files/l10n/es_MX.js
@@ -29,15 +29,15 @@ OC.L10N.register(
     "Upload cancelled." : "Subida cancelada.",
     "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear la carpeta",
     "Actions" : "Acciones",
     "Download" : "Descargar",
     "Pending" : "Pendiente",
     "Error moving file" : "Error moviendo archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear la carpeta",
     "Error deleting file." : "Error borrando el archivo.",
     "Name" : "Nombre",
     "Size" : "Tamaño",
@@ -47,10 +47,15 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "No tienes permisos para subir o crear archivos aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
     "Favorite" : "Favorito",
+    "Upload" : "Subir archivo",
+    "Text file" : "Archivo de texto",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "%s could not be renamed" : "%s no pudo ser renombrado",
     "File handling" : "Administración de archivos",
     "Maximum upload size" : "Tamaño máximo de subida",
@@ -59,12 +64,6 @@ OC.L10N.register(
     "Settings" : "Ajustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir archivo",
     "Cancel upload" : "Cancelar subida",
     "Delete" : "Eliminar",
     "Upload too large" : "Subida demasido grande",
diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json
index 9bd2fe80f2b..5655fd4bf09 100644
--- a/apps/files/l10n/es_MX.json
+++ b/apps/files/l10n/es_MX.json
@@ -27,15 +27,15 @@
     "Upload cancelled." : "Subida cancelada.",
     "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear la carpeta",
     "Actions" : "Acciones",
     "Download" : "Descargar",
     "Pending" : "Pendiente",
     "Error moving file" : "Error moviendo archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear la carpeta",
     "Error deleting file." : "Error borrando el archivo.",
     "Name" : "Nombre",
     "Size" : "Tamaño",
@@ -45,10 +45,15 @@
     "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "No tienes permisos para subir o crear archivos aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
     "Favorite" : "Favorito",
+    "Upload" : "Subir archivo",
+    "Text file" : "Archivo de texto",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "%s could not be renamed" : "%s no pudo ser renombrado",
     "File handling" : "Administración de archivos",
     "Maximum upload size" : "Tamaño máximo de subida",
@@ -57,12 +62,6 @@
     "Settings" : "Ajustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir archivo",
     "Cancel upload" : "Cancelar subida",
     "Delete" : "Eliminar",
     "Upload too large" : "Subida demasido grande",
diff --git a/apps/files/l10n/et_EE.js b/apps/files/l10n/et_EE.js
index 384bce053ef..173c6d5503a 100644
--- a/apps/files/l10n/et_EE.js
+++ b/apps/files/l10n/et_EE.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Üleslaadimine tühistati.",
     "Could not get result from server." : "Serverist ei saadud tulemusi",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
-    "{new_name} already exists" : "{new_name} on juba olemas",
-    "Could not create file" : "Ei suuda luua faili",
-    "Could not create folder" : "Ei suuda luua kataloogi",
     "Actions" : "Tegevused",
     "Download" : "Lae alla",
     "Select" : "Vali",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Viga faili liigutamisel.",
     "Error moving file" : "Viga faili eemaldamisel",
     "Error" : "Viga",
+    "{new_name} already exists" : "{new_name} on juba olemas",
     "Could not rename file" : "Ei suuda faili ümber nimetada",
+    "Could not create file" : "Ei suuda luua faili",
+    "Could not create folder" : "Ei suuda luua kataloogi",
     "Error deleting file." : "Viga faili kustutamisel.",
     "No entries in this folder match '{filter}'" : "Ükski sissekanne ei kattu filtriga '{filter}'",
     "Name" : "Nimi",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} ja {files}",
     "You don’t have permission to upload or create files here" : "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks",
     "_Uploading %n file_::_Uploading %n files_" : ["Laadin üles %n faili","Laadin üles %n faili"],
+    "New" : "Uus",
     "\"{name}\" is an invalid file name." : "\"{name}\" on vigane failinimi.",
     "File name cannot be empty." : "Faili nimi ei saa olla tühi.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
@@ -70,6 +71,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n bait","%n baiti"],
     "Favorited" : "Lemmikud",
     "Favorite" : "Lemmik",
+    "Upload" : "Lae üles",
+    "Text file" : "Tekstifail",
+    "Folder" : "Kaust",
+    "New folder" : "Uus kaust",
     "An error occurred while trying to update the tags" : "Siltide uuendamisel tekkis tõrge",
     "A new file or folder has been <strong>created</strong>" : "Uus fail või kataloog on <strong>loodud</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fail või kataloog on <strong>muudetud</strong>",
@@ -96,12 +101,6 @@ OC.L10N.register(
     "Settings" : "Seaded",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
-    "New" : "Uus",
-    "New text file" : "Uus tekstifail",
-    "Text file" : "Tekstifail",
-    "New folder" : "Uus kaust",
-    "Folder" : "Kaust",
-    "Upload" : "Lae üles",
     "Cancel upload" : "Tühista üleslaadimine",
     "No files in here" : "Siin ei ole faile",
     "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!",
diff --git a/apps/files/l10n/et_EE.json b/apps/files/l10n/et_EE.json
index d069982f8f6..d880d3d4720 100644
--- a/apps/files/l10n/et_EE.json
+++ b/apps/files/l10n/et_EE.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Üleslaadimine tühistati.",
     "Could not get result from server." : "Serverist ei saadud tulemusi",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
-    "{new_name} already exists" : "{new_name} on juba olemas",
-    "Could not create file" : "Ei suuda luua faili",
-    "Could not create folder" : "Ei suuda luua kataloogi",
     "Actions" : "Tegevused",
     "Download" : "Lae alla",
     "Select" : "Vali",
@@ -47,7 +44,10 @@
     "Error moving file." : "Viga faili liigutamisel.",
     "Error moving file" : "Viga faili eemaldamisel",
     "Error" : "Viga",
+    "{new_name} already exists" : "{new_name} on juba olemas",
     "Could not rename file" : "Ei suuda faili ümber nimetada",
+    "Could not create file" : "Ei suuda luua faili",
+    "Could not create folder" : "Ei suuda luua kataloogi",
     "Error deleting file." : "Viga faili kustutamisel.",
     "No entries in this folder match '{filter}'" : "Ükski sissekanne ei kattu filtriga '{filter}'",
     "Name" : "Nimi",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} ja {files}",
     "You don’t have permission to upload or create files here" : "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks",
     "_Uploading %n file_::_Uploading %n files_" : ["Laadin üles %n faili","Laadin üles %n faili"],
+    "New" : "Uus",
     "\"{name}\" is an invalid file name." : "\"{name}\" on vigane failinimi.",
     "File name cannot be empty." : "Faili nimi ei saa olla tühi.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
@@ -68,6 +69,10 @@
     "_%n byte_::_%n bytes_" : ["%n bait","%n baiti"],
     "Favorited" : "Lemmikud",
     "Favorite" : "Lemmik",
+    "Upload" : "Lae üles",
+    "Text file" : "Tekstifail",
+    "Folder" : "Kaust",
+    "New folder" : "Uus kaust",
     "An error occurred while trying to update the tags" : "Siltide uuendamisel tekkis tõrge",
     "A new file or folder has been <strong>created</strong>" : "Uus fail või kataloog on <strong>loodud</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fail või kataloog on <strong>muudetud</strong>",
@@ -94,12 +99,6 @@
     "Settings" : "Seaded",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
-    "New" : "Uus",
-    "New text file" : "Uus tekstifail",
-    "Text file" : "Tekstifail",
-    "New folder" : "Uus kaust",
-    "Folder" : "Kaust",
-    "Upload" : "Lae üles",
     "Cancel upload" : "Tühista üleslaadimine",
     "No files in here" : "Siin ei ole faile",
     "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!",
diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js
index e14be1ba264..249e73b1871 100644
--- a/apps/files/l10n/eu.js
+++ b/apps/files/l10n/eu.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Igoera ezeztatuta",
     "Could not get result from server." : "Ezin da zerbitzaritik emaitzik lortu",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
-    "{new_name} already exists" : "{new_name} dagoeneko existitzen da",
-    "Could not create file" : "Ezin izan da fitxategia sortu",
-    "Could not create folder" : "Ezin izan da karpeta sortu",
     "Actions" : "Ekintzak",
     "Download" : "Deskargatu",
     "Select" : "hautatu",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Errorea fitxategia mugitzean.",
     "Error moving file" : "Errorea fitxategia mugitzean",
     "Error" : "Errorea",
+    "{new_name} already exists" : "{new_name} dagoeneko existitzen da",
     "Could not rename file" : "Ezin izan da fitxategia berrizendatu",
+    "Could not create file" : "Ezin izan da fitxategia sortu",
+    "Could not create folder" : "Ezin izan da karpeta sortu",
     "Error deleting file." : "Errorea fitxategia ezabatzerakoan.",
     "No entries in this folder match '{filter}'" : "Karpeta honetan ez dago sarrerarik '{filter}' iragazkiarekin bat egiten dutenak",
     "Name" : "Izena",
@@ -58,12 +58,17 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} eta {files}",
     "You don’t have permission to upload or create files here" : "Ez duzu fitxategiak hona igotzeko edo hemen sortzeko baimenik",
     "_Uploading %n file_::_Uploading %n files_" : ["Fitxategi %n igotzen","%n fitxategi igotzen"],
+    "New" : "Berria",
     "\"{name}\" is an invalid file name." : "\"{name}\" ez da fitxategi izen baliogarria.",
     "File name cannot be empty." : "Fitxategi izena ezin da hutsa izan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
     "Favorited" : "Gogokoa",
     "Favorite" : "Gogokoa",
+    "Upload" : "Igo",
+    "Text file" : "Testu fitxategia",
+    "Folder" : "Karpeta",
+    "New folder" : "Karpeta berria",
     "A new file or folder has been <strong>created</strong>" : "Fitxategi edo karpeta berri bat <strong>sortu da</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fitxategi edo karpeta bat <strong>aldatu da</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Fitxategi edo karpeta bat <strong>ezabatu da</strong>",
@@ -87,12 +92,6 @@ OC.L10N.register(
     "Settings" : "Ezarpenak",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
-    "New" : "Berria",
-    "New text file" : "Testu fitxategi berria",
-    "Text file" : "Testu fitxategia",
-    "New folder" : "Karpeta berria",
-    "Folder" : "Karpeta",
-    "Upload" : "Igo",
     "Cancel upload" : "Ezeztatu igoera",
     "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
     "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json
index 3436235e79c..5e610f3f4fa 100644
--- a/apps/files/l10n/eu.json
+++ b/apps/files/l10n/eu.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Igoera ezeztatuta",
     "Could not get result from server." : "Ezin da zerbitzaritik emaitzik lortu",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
-    "{new_name} already exists" : "{new_name} dagoeneko existitzen da",
-    "Could not create file" : "Ezin izan da fitxategia sortu",
-    "Could not create folder" : "Ezin izan da karpeta sortu",
     "Actions" : "Ekintzak",
     "Download" : "Deskargatu",
     "Select" : "hautatu",
@@ -45,7 +42,10 @@
     "Error moving file." : "Errorea fitxategia mugitzean.",
     "Error moving file" : "Errorea fitxategia mugitzean",
     "Error" : "Errorea",
+    "{new_name} already exists" : "{new_name} dagoeneko existitzen da",
     "Could not rename file" : "Ezin izan da fitxategia berrizendatu",
+    "Could not create file" : "Ezin izan da fitxategia sortu",
+    "Could not create folder" : "Ezin izan da karpeta sortu",
     "Error deleting file." : "Errorea fitxategia ezabatzerakoan.",
     "No entries in this folder match '{filter}'" : "Karpeta honetan ez dago sarrerarik '{filter}' iragazkiarekin bat egiten dutenak",
     "Name" : "Izena",
@@ -56,12 +56,17 @@
     "{dirs} and {files}" : "{dirs} eta {files}",
     "You don’t have permission to upload or create files here" : "Ez duzu fitxategiak hona igotzeko edo hemen sortzeko baimenik",
     "_Uploading %n file_::_Uploading %n files_" : ["Fitxategi %n igotzen","%n fitxategi igotzen"],
+    "New" : "Berria",
     "\"{name}\" is an invalid file name." : "\"{name}\" ez da fitxategi izen baliogarria.",
     "File name cannot be empty." : "Fitxategi izena ezin da hutsa izan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
     "Favorited" : "Gogokoa",
     "Favorite" : "Gogokoa",
+    "Upload" : "Igo",
+    "Text file" : "Testu fitxategia",
+    "Folder" : "Karpeta",
+    "New folder" : "Karpeta berria",
     "A new file or folder has been <strong>created</strong>" : "Fitxategi edo karpeta berri bat <strong>sortu da</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fitxategi edo karpeta bat <strong>aldatu da</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Fitxategi edo karpeta bat <strong>ezabatu da</strong>",
@@ -85,12 +90,6 @@
     "Settings" : "Ezarpenak",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
-    "New" : "Berria",
-    "New text file" : "Testu fitxategi berria",
-    "Text file" : "Testu fitxategia",
-    "New folder" : "Karpeta berria",
-    "Folder" : "Karpeta",
-    "Upload" : "Igo",
     "Cancel upload" : "Ezeztatu igoera",
     "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
     "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
diff --git a/apps/files/l10n/fa.js b/apps/files/l10n/fa.js
index 5df2d0ccc3e..984c53c3740 100644
--- a/apps/files/l10n/fa.js
+++ b/apps/files/l10n/fa.js
@@ -22,18 +22,23 @@ OC.L10N.register(
     "Close" : "بستن",
     "Upload cancelled." : "بار گذاری لغو شد",
     "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
-    "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
     "Actions" : "فعالیت ها",
     "Download" : "دانلود",
     "Pending" : "در انتظار",
     "Error" : "خطا",
+    "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
     "Name" : "نام",
     "Size" : "اندازه",
     "Modified" : "تاریخ",
     "_Uploading %n file_::_Uploading %n files_" : ["در حال بارگذاری %n فایل"],
+    "New" : "جدید",
     "File name cannot be empty." : "نام پرونده نمی تواند خالی باشد.",
     "Your storage is full, files can not be updated or synced anymore!" : "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
     "Your storage is almost full ({usedSpacePercent}%)" : "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
+    "Upload" : "بارگزاری",
+    "Text file" : "فایل متنی",
+    "Folder" : "پوشه",
+    "New folder" : "پوشه جدید",
     "A new file or folder has been <strong>created</strong>" : "فایل یا پوشه ای <strong>ایجاد</strong> شد",
     "A file or folder has been <strong>changed</strong>" : "فایل یا پوشه ای به <strong>تغییر</strong> یافت",
     "A file or folder has been <strong>deleted</strong>" : "فایل یا پوشه ای به <strong>حذف</strong> شد",
@@ -55,11 +60,6 @@ OC.L10N.register(
     "Settings" : "تنظیمات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
-    "New" : "جدید",
-    "Text file" : "فایل متنی",
-    "New folder" : "پوشه جدید",
-    "Folder" : "پوشه",
-    "Upload" : "بارگزاری",
     "Cancel upload" : "متوقف کردن بار گذاری",
     "Delete" : "حذف",
     "Upload too large" : "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
diff --git a/apps/files/l10n/fa.json b/apps/files/l10n/fa.json
index b36fee0090c..361dbee1a1f 100644
--- a/apps/files/l10n/fa.json
+++ b/apps/files/l10n/fa.json
@@ -20,18 +20,23 @@
     "Close" : "بستن",
     "Upload cancelled." : "بار گذاری لغو شد",
     "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
-    "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
     "Actions" : "فعالیت ها",
     "Download" : "دانلود",
     "Pending" : "در انتظار",
     "Error" : "خطا",
+    "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
     "Name" : "نام",
     "Size" : "اندازه",
     "Modified" : "تاریخ",
     "_Uploading %n file_::_Uploading %n files_" : ["در حال بارگذاری %n فایل"],
+    "New" : "جدید",
     "File name cannot be empty." : "نام پرونده نمی تواند خالی باشد.",
     "Your storage is full, files can not be updated or synced anymore!" : "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
     "Your storage is almost full ({usedSpacePercent}%)" : "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
+    "Upload" : "بارگزاری",
+    "Text file" : "فایل متنی",
+    "Folder" : "پوشه",
+    "New folder" : "پوشه جدید",
     "A new file or folder has been <strong>created</strong>" : "فایل یا پوشه ای <strong>ایجاد</strong> شد",
     "A file or folder has been <strong>changed</strong>" : "فایل یا پوشه ای به <strong>تغییر</strong> یافت",
     "A file or folder has been <strong>deleted</strong>" : "فایل یا پوشه ای به <strong>حذف</strong> شد",
@@ -53,11 +58,6 @@
     "Settings" : "تنظیمات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
-    "New" : "جدید",
-    "Text file" : "فایل متنی",
-    "New folder" : "پوشه جدید",
-    "Folder" : "پوشه",
-    "Upload" : "بارگزاری",
     "Cancel upload" : "متوقف کردن بار گذاری",
     "Delete" : "حذف",
     "Upload too large" : "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js
index 414312858a3..b4d00878e8b 100644
--- a/apps/files/l10n/fi_FI.js
+++ b/apps/files/l10n/fi_FI.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Lähetys peruttu.",
     "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
-    "{new_name} already exists" : "{new_name} on jo olemassa",
-    "Could not create file" : "Tiedoston luominen epäonnistui",
-    "Could not create folder" : "Kansion luominen epäonnistui",
     "Actions" : "Toiminnot",
     "Download" : "Lataa",
     "Select" : "Valitse",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Virhe tiedostoa siirrettäessä.",
     "Error moving file" : "Virhe tiedostoa siirrettäessä",
     "Error" : "Virhe",
+    "{new_name} already exists" : "{new_name} on jo olemassa",
     "Could not rename file" : "Tiedoston nimeäminen uudelleen epäonnistui",
+    "Could not create file" : "Tiedoston luominen epäonnistui",
+    "Could not create folder" : "Kansion luominen epäonnistui",
     "Error deleting file." : "Virhe tiedostoa poistaessa.",
     "No entries in this folder match '{filter}'" : "Mikään tässä kansiossa ei vastaa suodatusta '{filter}'",
     "Name" : "Nimi",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} ja {files}",
     "You don’t have permission to upload or create files here" : "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin",
     "_Uploading %n file_::_Uploading %n files_" : ["Lähetetään %n tiedosto","Lähetetään %n tiedostoa"],
+    "New" : "Uusi",
     "\"{name}\" is an invalid file name." : "\"{name}\" on virheellinen tiedostonimi.",
     "File name cannot be empty." : "Tiedoston nimi ei voi olla tyhjä.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Käyttäjän {owner} tallennustila on täynnä, tiedostoja ei voi enää päivittää tai synkronoida!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"],
     "Favorited" : "Lisätty suosikkeihin",
     "Favorite" : "Suosikki",
+    "Upload" : "Lähetä",
+    "Text file" : "Tekstitiedosto",
+    "Folder" : "Kansio",
+    "New folder" : "Uusi kansio",
     "An error occurred while trying to update the tags" : "Tunnisteiden päivitystä yrittäessä tapahtui virhe",
     "A new file or folder has been <strong>created</strong>" : "Uusi tiedosto tai kansio on <strong>luotu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Tiedostoa tai kansiota on <strong>muutettu</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Asetukset",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
-    "New" : "Uusi",
-    "New text file" : "Uusi tekstitiedosto",
-    "Text file" : "Tekstitiedosto",
-    "New folder" : "Uusi kansio",
-    "Folder" : "Kansio",
-    "Upload" : "Lähetä",
     "Cancel upload" : "Peru lähetys",
     "No files in here" : "Täällä ei ole tiedostoja",
     "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!",
diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json
index ade67816cc2..507689cbaf2 100644
--- a/apps/files/l10n/fi_FI.json
+++ b/apps/files/l10n/fi_FI.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Lähetys peruttu.",
     "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
-    "{new_name} already exists" : "{new_name} on jo olemassa",
-    "Could not create file" : "Tiedoston luominen epäonnistui",
-    "Could not create folder" : "Kansion luominen epäonnistui",
     "Actions" : "Toiminnot",
     "Download" : "Lataa",
     "Select" : "Valitse",
@@ -47,7 +44,10 @@
     "Error moving file." : "Virhe tiedostoa siirrettäessä.",
     "Error moving file" : "Virhe tiedostoa siirrettäessä",
     "Error" : "Virhe",
+    "{new_name} already exists" : "{new_name} on jo olemassa",
     "Could not rename file" : "Tiedoston nimeäminen uudelleen epäonnistui",
+    "Could not create file" : "Tiedoston luominen epäonnistui",
+    "Could not create folder" : "Kansion luominen epäonnistui",
     "Error deleting file." : "Virhe tiedostoa poistaessa.",
     "No entries in this folder match '{filter}'" : "Mikään tässä kansiossa ei vastaa suodatusta '{filter}'",
     "Name" : "Nimi",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} ja {files}",
     "You don’t have permission to upload or create files here" : "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin",
     "_Uploading %n file_::_Uploading %n files_" : ["Lähetetään %n tiedosto","Lähetetään %n tiedostoa"],
+    "New" : "Uusi",
     "\"{name}\" is an invalid file name." : "\"{name}\" on virheellinen tiedostonimi.",
     "File name cannot be empty." : "Tiedoston nimi ei voi olla tyhjä.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Käyttäjän {owner} tallennustila on täynnä, tiedostoja ei voi enää päivittää tai synkronoida!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"],
     "Favorited" : "Lisätty suosikkeihin",
     "Favorite" : "Suosikki",
+    "Upload" : "Lähetä",
+    "Text file" : "Tekstitiedosto",
+    "Folder" : "Kansio",
+    "New folder" : "Uusi kansio",
     "An error occurred while trying to update the tags" : "Tunnisteiden päivitystä yrittäessä tapahtui virhe",
     "A new file or folder has been <strong>created</strong>" : "Uusi tiedosto tai kansio on <strong>luotu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Tiedostoa tai kansiota on <strong>muutettu</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "Asetukset",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
-    "New" : "Uusi",
-    "New text file" : "Uusi tekstitiedosto",
-    "Text file" : "Tekstitiedosto",
-    "New folder" : "Uusi kansio",
-    "Folder" : "Kansio",
-    "Upload" : "Lähetä",
     "Cancel upload" : "Peru lähetys",
     "No files in here" : "Täällä ei ole tiedostoja",
     "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 40ad266ecea..6ba0bdee182 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Envoi annulé.",
     "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
-    "{new_name} already exists" : "{new_name} existe déjà",
-    "Could not create file" : "Impossible de créer le fichier",
-    "Could not create folder" : "Impossible de créer le dossier",
     "Actions" : "Actions",
     "Download" : "Télécharger",
     "Select" : "Sélectionner",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Erreur lors du déplacement du fichier.",
     "Error moving file" : "Erreur lors du déplacement du fichier",
     "Error" : "Erreur",
+    "{new_name} already exists" : "{new_name} existe déjà",
     "Could not rename file" : "Impossible de renommer le fichier",
+    "Could not create file" : "Impossible de créer le fichier",
+    "Could not create folder" : "Impossible de créer le dossier",
     "Error deleting file." : "Erreur pendant la suppression du fichier.",
     "No entries in this folder match '{filter}'" : "Aucune entrée de ce dossier ne correspond à '{filter}'",
     "Name" : "Nom",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} et {files}",
     "You don’t have permission to upload or create files here" : "Vous n'avez pas la permission d'ajouter des fichiers ici",
     "_Uploading %n file_::_Uploading %n files_" : ["Téléversement de %n fichier","Téléversement de %n fichiers"],
+    "New" : "Nouveau",
     "\"{name}\" is an invalid file name." : "\"{name}\" n'est pas un nom de fichier valide.",
     "File name cannot be empty." : "Le nom de fichier ne peut être vide.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "L'espace de stockage de {owner} est plein. Les fichiers ne peuvent plus être mis à jour ou synchronisés!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n octet","%n octets"],
     "Favorited" : "Marqué comme favori",
     "Favorite" : "Favoris",
+    "Upload" : "Chargement",
+    "Text file" : "Fichier texte",
+    "Folder" : "Dossier",
+    "New folder" : "Nouveau dossier",
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
     "A new file or folder has been <strong>created</strong>" : "Un nouveau fichier ou répertoire a été <strong>créé</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichier ou un répertoire a été <strong>modifié</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Paramètres",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\">accéder à vos fichiers par WebDAV</a>",
-    "New" : "Nouveau",
-    "New text file" : "Nouveau fichier texte",
-    "Text file" : "Fichier texte",
-    "New folder" : "Nouveau dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Chargement",
     "Cancel upload" : "Annuler l'envoi",
     "No files in here" : "Aucun fichier ici",
     "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index ca2ecebe5d2..c8c0c1ceabf 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Envoi annulé.",
     "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
-    "{new_name} already exists" : "{new_name} existe déjà",
-    "Could not create file" : "Impossible de créer le fichier",
-    "Could not create folder" : "Impossible de créer le dossier",
     "Actions" : "Actions",
     "Download" : "Télécharger",
     "Select" : "Sélectionner",
@@ -47,7 +44,10 @@
     "Error moving file." : "Erreur lors du déplacement du fichier.",
     "Error moving file" : "Erreur lors du déplacement du fichier",
     "Error" : "Erreur",
+    "{new_name} already exists" : "{new_name} existe déjà",
     "Could not rename file" : "Impossible de renommer le fichier",
+    "Could not create file" : "Impossible de créer le fichier",
+    "Could not create folder" : "Impossible de créer le dossier",
     "Error deleting file." : "Erreur pendant la suppression du fichier.",
     "No entries in this folder match '{filter}'" : "Aucune entrée de ce dossier ne correspond à '{filter}'",
     "Name" : "Nom",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} et {files}",
     "You don’t have permission to upload or create files here" : "Vous n'avez pas la permission d'ajouter des fichiers ici",
     "_Uploading %n file_::_Uploading %n files_" : ["Téléversement de %n fichier","Téléversement de %n fichiers"],
+    "New" : "Nouveau",
     "\"{name}\" is an invalid file name." : "\"{name}\" n'est pas un nom de fichier valide.",
     "File name cannot be empty." : "Le nom de fichier ne peut être vide.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "L'espace de stockage de {owner} est plein. Les fichiers ne peuvent plus être mis à jour ou synchronisés!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n octet","%n octets"],
     "Favorited" : "Marqué comme favori",
     "Favorite" : "Favoris",
+    "Upload" : "Chargement",
+    "Text file" : "Fichier texte",
+    "Folder" : "Dossier",
+    "New folder" : "Nouveau dossier",
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
     "A new file or folder has been <strong>created</strong>" : "Un nouveau fichier ou répertoire a été <strong>créé</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichier ou un répertoire a été <strong>modifié</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "Paramètres",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\">accéder à vos fichiers par WebDAV</a>",
-    "New" : "Nouveau",
-    "New text file" : "Nouveau fichier texte",
-    "Text file" : "Fichier texte",
-    "New folder" : "Nouveau dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Chargement",
     "Cancel upload" : "Annuler l'envoi",
     "No files in here" : "Aucun fichier ici",
     "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js
index 3f666f2b95b..4293b3ab9ba 100644
--- a/apps/files/l10n/gl.js
+++ b/apps/files/l10n/gl.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Envío cancelado.",
     "Could not get result from server." : "Non foi posíbel obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
-    "{new_name} already exists" : "Xa existe un {new_name}",
-    "Could not create file" : "Non foi posíbel crear o ficheiro",
-    "Could not create folder" : "Non foi posíbel crear o cartafol",
     "Actions" : "Accións",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Produciuse un erro ao mover o ficheiro.",
     "Error moving file" : "Produciuse un erro ao mover o ficheiro",
     "Error" : "Erro",
+    "{new_name} already exists" : "Xa existe un {new_name}",
     "Could not rename file" : "Non foi posíbel renomear o ficheiro",
+    "Could not create file" : "Non foi posíbel crear o ficheiro",
+    "Could not create folder" : "Non foi posíbel crear o cartafol",
     "Error deleting file." : "Produciuse un erro ao eliminar o ficheiro.",
     "No entries in this folder match '{filter}'" : "Non hai entradas neste cartafol coincidentes con «{filter}»",
     "Name" : "Nome",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Non ten permisos para enviar ou crear ficheiros aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Cargando %n ficheiro","Cargando %n ficheiros"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "«{name}» é un nome incorrecto de ficheiro.",
     "File name cannot be empty." : "O nome de ficheiro non pode estar baleiro",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "O espazo de almacenamento de {owner} está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Marcado como favorito",
     "Favorite" : "Favorito",
+    "Upload" : "Enviar",
+    "Text file" : "Ficheiro de texto",
+    "Folder" : "Cartafol",
+    "New folder" : "Novo cartafol",
     "An error occurred while trying to update the tags" : "Produciuse un erro ao tentar actualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creouse</strong> un novo ficheiro ou cartafol",
     "A file or folder has been <strong>changed</strong>" : "<strong>Cambiouse</strong> un ficheiro ou cartafol",
@@ -97,12 +102,6 @@ OC.L10N.register(
     "Settings" : "Axustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Empregue esta ligazón para  <a href=\"%s\" target=\"_blank\">acceder aos seus ficheiros mediante WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Ficheiro novo de texto",
-    "Text file" : "Ficheiro de texto",
-    "New folder" : "Novo cartafol",
-    "Folder" : "Cartafol",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar o envío",
     "No files in here" : "Aquí non hai ficheiros",
     "Upload some content or sync with your devices!" : "Envíe algún contido ou sincronice cos seus dispositivos!",
diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json
index f9fec770356..34eeaa6a369 100644
--- a/apps/files/l10n/gl.json
+++ b/apps/files/l10n/gl.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Envío cancelado.",
     "Could not get result from server." : "Non foi posíbel obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
-    "{new_name} already exists" : "Xa existe un {new_name}",
-    "Could not create file" : "Non foi posíbel crear o ficheiro",
-    "Could not create folder" : "Non foi posíbel crear o cartafol",
     "Actions" : "Accións",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
@@ -47,7 +44,10 @@
     "Error moving file." : "Produciuse un erro ao mover o ficheiro.",
     "Error moving file" : "Produciuse un erro ao mover o ficheiro",
     "Error" : "Erro",
+    "{new_name} already exists" : "Xa existe un {new_name}",
     "Could not rename file" : "Non foi posíbel renomear o ficheiro",
+    "Could not create file" : "Non foi posíbel crear o ficheiro",
+    "Could not create folder" : "Non foi posíbel crear o cartafol",
     "Error deleting file." : "Produciuse un erro ao eliminar o ficheiro.",
     "No entries in this folder match '{filter}'" : "Non hai entradas neste cartafol coincidentes con «{filter}»",
     "Name" : "Nome",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Non ten permisos para enviar ou crear ficheiros aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Cargando %n ficheiro","Cargando %n ficheiros"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "«{name}» é un nome incorrecto de ficheiro.",
     "File name cannot be empty." : "O nome de ficheiro non pode estar baleiro",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "O espazo de almacenamento de {owner} está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Marcado como favorito",
     "Favorite" : "Favorito",
+    "Upload" : "Enviar",
+    "Text file" : "Ficheiro de texto",
+    "Folder" : "Cartafol",
+    "New folder" : "Novo cartafol",
     "An error occurred while trying to update the tags" : "Produciuse un erro ao tentar actualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creouse</strong> un novo ficheiro ou cartafol",
     "A file or folder has been <strong>changed</strong>" : "<strong>Cambiouse</strong> un ficheiro ou cartafol",
@@ -95,12 +100,6 @@
     "Settings" : "Axustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Empregue esta ligazón para  <a href=\"%s\" target=\"_blank\">acceder aos seus ficheiros mediante WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Ficheiro novo de texto",
-    "Text file" : "Ficheiro de texto",
-    "New folder" : "Novo cartafol",
-    "Folder" : "Cartafol",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar o envío",
     "No files in here" : "Aquí non hai ficheiros",
     "Upload some content or sync with your devices!" : "Envíe algún contido ou sincronice cos seus dispositivos!",
diff --git a/apps/files/l10n/he.js b/apps/files/l10n/he.js
index 8918c8686c9..94956cbff0e 100644
--- a/apps/files/l10n/he.js
+++ b/apps/files/l10n/he.js
@@ -22,18 +22,23 @@ OC.L10N.register(
     "Upload cancelled." : "ההעלאה בוטלה.",
     "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
-    "{new_name} already exists" : "{new_name} כבר קיים",
     "Actions" : "פעולות",
     "Download" : "הורדה",
     "Select" : "בחר",
     "Pending" : "ממתין",
     "Error" : "שגיאה",
+    "{new_name} already exists" : "{new_name} כבר קיים",
     "Name" : "שם",
     "Size" : "גודל",
     "Modified" : "זמן שינוי",
+    "New" : "חדש",
     "File name cannot be empty." : "שם קובץ אינו יכול להיות ריק",
     "Your storage is almost full ({usedSpacePercent}%)" : "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
     "Favorite" : "מועדף",
+    "Upload" : "העלאה",
+    "Text file" : "קובץ טקסט",
+    "Folder" : "תיקייה",
+    "New folder" : "תיקייה חדשה",
     "A new file or folder has been <strong>created</strong>" : "קובץ או תיקייה חדשים <strong>נוצרו<strong/>",
     "A file or folder has been <strong>changed</strong>" : "קובץ או תיקייה <strong>שונו<strong/>",
     "A file or folder has been <strong>deleted</strong>" : "קובץ או תיקייה <strong>נמחקו<strong/>",
@@ -51,11 +56,6 @@ OC.L10N.register(
     "Save" : "שמירה",
     "Settings" : "הגדרות",
     "WebDAV" : "WebDAV",
-    "New" : "חדש",
-    "Text file" : "קובץ טקסט",
-    "New folder" : "תיקייה חדשה",
-    "Folder" : "תיקייה",
-    "Upload" : "העלאה",
     "Cancel upload" : "ביטול ההעלאה",
     "Delete" : "מחיקה",
     "Upload too large" : "העלאה גדולה מידי",
diff --git a/apps/files/l10n/he.json b/apps/files/l10n/he.json
index 38b8365eaa0..8dfc57f3276 100644
--- a/apps/files/l10n/he.json
+++ b/apps/files/l10n/he.json
@@ -20,18 +20,23 @@
     "Upload cancelled." : "ההעלאה בוטלה.",
     "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
-    "{new_name} already exists" : "{new_name} כבר קיים",
     "Actions" : "פעולות",
     "Download" : "הורדה",
     "Select" : "בחר",
     "Pending" : "ממתין",
     "Error" : "שגיאה",
+    "{new_name} already exists" : "{new_name} כבר קיים",
     "Name" : "שם",
     "Size" : "גודל",
     "Modified" : "זמן שינוי",
+    "New" : "חדש",
     "File name cannot be empty." : "שם קובץ אינו יכול להיות ריק",
     "Your storage is almost full ({usedSpacePercent}%)" : "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
     "Favorite" : "מועדף",
+    "Upload" : "העלאה",
+    "Text file" : "קובץ טקסט",
+    "Folder" : "תיקייה",
+    "New folder" : "תיקייה חדשה",
     "A new file or folder has been <strong>created</strong>" : "קובץ או תיקייה חדשים <strong>נוצרו<strong/>",
     "A file or folder has been <strong>changed</strong>" : "קובץ או תיקייה <strong>שונו<strong/>",
     "A file or folder has been <strong>deleted</strong>" : "קובץ או תיקייה <strong>נמחקו<strong/>",
@@ -49,11 +54,6 @@
     "Save" : "שמירה",
     "Settings" : "הגדרות",
     "WebDAV" : "WebDAV",
-    "New" : "חדש",
-    "Text file" : "קובץ טקסט",
-    "New folder" : "תיקייה חדשה",
-    "Folder" : "תיקייה",
-    "Upload" : "העלאה",
     "Cancel upload" : "ביטול ההעלאה",
     "Delete" : "מחיקה",
     "Upload too large" : "העלאה גדולה מידי",
diff --git a/apps/files/l10n/hi.js b/apps/files/l10n/hi.js
index 35ad6e5f688..c040105875d 100644
--- a/apps/files/l10n/hi.js
+++ b/apps/files/l10n/hi.js
@@ -4,9 +4,9 @@ OC.L10N.register(
     "Files" : "फाइलें ",
     "Close" : "बंद करें ",
     "Error" : "त्रुटि",
-    "Save" : "सहेजें",
-    "Settings" : "सेटिंग्स",
+    "Upload" : "अपलोड ",
     "New folder" : "नया फ़ोल्डर",
-    "Upload" : "अपलोड "
+    "Save" : "सहेजें",
+    "Settings" : "सेटिंग्स"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/hi.json b/apps/files/l10n/hi.json
index 0bcf3ace1de..70db8f9d7f1 100644
--- a/apps/files/l10n/hi.json
+++ b/apps/files/l10n/hi.json
@@ -2,9 +2,9 @@
     "Files" : "फाइलें ",
     "Close" : "बंद करें ",
     "Error" : "त्रुटि",
-    "Save" : "सहेजें",
-    "Settings" : "सेटिंग्स",
+    "Upload" : "अपलोड ",
     "New folder" : "नया फ़ोल्डर",
-    "Upload" : "अपलोड "
+    "Save" : "सहेजें",
+    "Settings" : "सेटिंग्स"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/hr.js b/apps/files/l10n/hr.js
index fb273f410cc..379d43f4dbd 100644
--- a/apps/files/l10n/hr.js
+++ b/apps/files/l10n/hr.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Učitavanje je prekinuto.",
     "Could not get result from server." : "Nemoguće dobiti rezultat od poslužitelja.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u tijeku. Napuštanje stranice prekinut će učitavanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Datoteku nije moguće kreirati",
-    "Could not create folder" : "Mapu nije moguće kreirati",
     "Actions" : "Radnje",
     "Download" : "Preuzimanje",
     "Select" : "Selektiraj",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Pogrešno premještanje datoteke",
     "Error moving file" : "Pogrešno premještanje datoteke",
     "Error" : "Pogreška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Datoteku nije moguće preimenovati",
+    "Could not create file" : "Datoteku nije moguće kreirati",
+    "Could not create folder" : "Mapu nije moguće kreirati",
     "Error deleting file." : "Pogrešno brisanje datoteke",
     "No entries in this folder match '{filter}'" : "Nema zapisa u ovom folderu match '{filter}'",
     "Name" : "Naziv",
@@ -58,12 +58,17 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Ovdje vam nije dopušteno učitavati ili kreirati datoteke",
     "_Uploading %n file_::_Uploading %n files_" : ["Prenosim %n datoteku","Prenosim %n datoteke","Prenosim %n datoteka"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime datoteke.",
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša je pohrana puna, datoteke više nije moguće ažurirati niti sinkronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
     "Favorited" : "Favoritovan",
     "Favorite" : "Favorit",
+    "Upload" : "Učitavanje",
+    "Text file" : "Tekstualna datoteka",
+    "Folder" : "Mapa",
+    "New folder" : "Nova mapa",
     "A new file or folder has been <strong>created</strong>" : "Nova datoteka ili nova mapa su <strong>kreirani</strong>",
     "A file or folder has been <strong>changed</strong>" : "Datoteka ili mapa su <strong>promijenjeni</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Datoteka ili mapa su <strong>izbrisani</strong>",
@@ -87,12 +92,6 @@ OC.L10N.register(
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristitet slijedeću adresu za <a href=\"%s\" target=\"_blank\">pristup vašim datotekama putem WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nova tekstualna datoteka",
-    "Text file" : "Tekstualna datoteka",
-    "New folder" : "Nova mapa",
-    "Folder" : "Mapa",
-    "Upload" : "Učitavanje",
     "Cancel upload" : "Prekini upload",
     "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!",
     "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ",
diff --git a/apps/files/l10n/hr.json b/apps/files/l10n/hr.json
index 92e6b5d80e1..a8d935848ea 100644
--- a/apps/files/l10n/hr.json
+++ b/apps/files/l10n/hr.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Učitavanje je prekinuto.",
     "Could not get result from server." : "Nemoguće dobiti rezultat od poslužitelja.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u tijeku. Napuštanje stranice prekinut će učitavanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Datoteku nije moguće kreirati",
-    "Could not create folder" : "Mapu nije moguće kreirati",
     "Actions" : "Radnje",
     "Download" : "Preuzimanje",
     "Select" : "Selektiraj",
@@ -45,7 +42,10 @@
     "Error moving file." : "Pogrešno premještanje datoteke",
     "Error moving file" : "Pogrešno premještanje datoteke",
     "Error" : "Pogreška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Datoteku nije moguće preimenovati",
+    "Could not create file" : "Datoteku nije moguće kreirati",
+    "Could not create folder" : "Mapu nije moguće kreirati",
     "Error deleting file." : "Pogrešno brisanje datoteke",
     "No entries in this folder match '{filter}'" : "Nema zapisa u ovom folderu match '{filter}'",
     "Name" : "Naziv",
@@ -56,12 +56,17 @@
     "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Ovdje vam nije dopušteno učitavati ili kreirati datoteke",
     "_Uploading %n file_::_Uploading %n files_" : ["Prenosim %n datoteku","Prenosim %n datoteke","Prenosim %n datoteka"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime datoteke.",
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša je pohrana puna, datoteke više nije moguće ažurirati niti sinkronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
     "Favorited" : "Favoritovan",
     "Favorite" : "Favorit",
+    "Upload" : "Učitavanje",
+    "Text file" : "Tekstualna datoteka",
+    "Folder" : "Mapa",
+    "New folder" : "Nova mapa",
     "A new file or folder has been <strong>created</strong>" : "Nova datoteka ili nova mapa su <strong>kreirani</strong>",
     "A file or folder has been <strong>changed</strong>" : "Datoteka ili mapa su <strong>promijenjeni</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Datoteka ili mapa su <strong>izbrisani</strong>",
@@ -85,12 +90,6 @@
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristitet slijedeću adresu za <a href=\"%s\" target=\"_blank\">pristup vašim datotekama putem WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nova tekstualna datoteka",
-    "Text file" : "Tekstualna datoteka",
-    "New folder" : "Nova mapa",
-    "Folder" : "Mapa",
-    "Upload" : "Učitavanje",
     "Cancel upload" : "Prekini upload",
     "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!",
     "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ",
diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js
index c7c7719db1c..396d9ec8755 100644
--- a/apps/files/l10n/hu_HU.js
+++ b/apps/files/l10n/hu_HU.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "A feltöltést megszakítottuk.",
     "Could not get result from server." : "A kiszolgálótól nem kapható meg a művelet eredménye.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
-    "{new_name} already exists" : "{new_name} már létezik",
-    "Could not create file" : "Az állomány nem hozható létre",
-    "Could not create folder" : "A mappa nem hozható létre",
     "Actions" : "Műveletek",
     "Download" : "Letöltés",
     "Select" : "Kiválaszt",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Hiba történt a fájl áthelyezése közben.",
     "Error moving file" : "Az állomány áthelyezése nem sikerült.",
     "Error" : "Hiba",
+    "{new_name} already exists" : "{new_name} már létezik",
     "Could not rename file" : "Az állomány nem nevezhető át",
+    "Could not create file" : "Az állomány nem hozható létre",
+    "Could not create folder" : "A mappa nem hozható létre",
     "Error deleting file." : "Hiba a file törlése közben.",
     "No entries in this folder match '{filter}'" : "Nincsenek egyező bejegyzések ebben a könyvtárban '{filter}'",
     "Name" : "Név",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} és {files}",
     "You don’t have permission to upload or create files here" : "Önnek nincs jogosultsága ahhoz, hogy ide állományokat töltsön föl, vagy itt újakat hozzon létre",
     "_Uploading %n file_::_Uploading %n files_" : ["%n állomány feltöltése","%n állomány feltöltése"],
+    "New" : "Új",
     "\"{name}\" is an invalid file name." : "\"{name}\" érvénytelen, mint fájlnév.",
     "File name cannot be empty." : "A fájlnév nem lehet semmi.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "A {owner} felhasználó tárolója betelt, a fájlok nem frissíthetők és szinkronizálhatók többet!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n bájt","%n bájt"],
     "Favorited" : "Kedvenc",
     "Favorite" : "Kedvenc",
+    "Upload" : "Feltöltés",
+    "Text file" : "Szövegfájl",
+    "Folder" : "Mappa",
+    "New folder" : "Új mappa",
     "An error occurred while trying to update the tags" : "Hiba történt, miközben megpróbálta frissíteni a címkéket",
     "A new file or folder has been <strong>created</strong>" : "Új fájl vagy könyvtár <strong>létrehozása</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fájl vagy könyvtár <strong>módosítása</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Beállítások",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Ezt a címet használja, ha <a href=\"%s\" target=\"_blank\">WebDAV-on keresztül szeretné elérni a fájljait</a>",
-    "New" : "Új",
-    "New text file" : "Új szövegfájl",
-    "Text file" : "Szövegfájl",
-    "New folder" : "Új mappa",
-    "Folder" : "Mappa",
-    "Upload" : "Feltöltés",
     "Cancel upload" : "A feltöltés megszakítása",
     "No files in here" : "Itt nincsenek fájlok",
     "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!",
diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json
index 08027509fb3..3a29ff27f24 100644
--- a/apps/files/l10n/hu_HU.json
+++ b/apps/files/l10n/hu_HU.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "A feltöltést megszakítottuk.",
     "Could not get result from server." : "A kiszolgálótól nem kapható meg a művelet eredménye.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
-    "{new_name} already exists" : "{new_name} már létezik",
-    "Could not create file" : "Az állomány nem hozható létre",
-    "Could not create folder" : "A mappa nem hozható létre",
     "Actions" : "Műveletek",
     "Download" : "Letöltés",
     "Select" : "Kiválaszt",
@@ -47,7 +44,10 @@
     "Error moving file." : "Hiba történt a fájl áthelyezése közben.",
     "Error moving file" : "Az állomány áthelyezése nem sikerült.",
     "Error" : "Hiba",
+    "{new_name} already exists" : "{new_name} már létezik",
     "Could not rename file" : "Az állomány nem nevezhető át",
+    "Could not create file" : "Az állomány nem hozható létre",
+    "Could not create folder" : "A mappa nem hozható létre",
     "Error deleting file." : "Hiba a file törlése közben.",
     "No entries in this folder match '{filter}'" : "Nincsenek egyező bejegyzések ebben a könyvtárban '{filter}'",
     "Name" : "Név",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} és {files}",
     "You don’t have permission to upload or create files here" : "Önnek nincs jogosultsága ahhoz, hogy ide állományokat töltsön föl, vagy itt újakat hozzon létre",
     "_Uploading %n file_::_Uploading %n files_" : ["%n állomány feltöltése","%n állomány feltöltése"],
+    "New" : "Új",
     "\"{name}\" is an invalid file name." : "\"{name}\" érvénytelen, mint fájlnév.",
     "File name cannot be empty." : "A fájlnév nem lehet semmi.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "A {owner} felhasználó tárolója betelt, a fájlok nem frissíthetők és szinkronizálhatók többet!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n bájt","%n bájt"],
     "Favorited" : "Kedvenc",
     "Favorite" : "Kedvenc",
+    "Upload" : "Feltöltés",
+    "Text file" : "Szövegfájl",
+    "Folder" : "Mappa",
+    "New folder" : "Új mappa",
     "An error occurred while trying to update the tags" : "Hiba történt, miközben megpróbálta frissíteni a címkéket",
     "A new file or folder has been <strong>created</strong>" : "Új fájl vagy könyvtár <strong>létrehozása</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fájl vagy könyvtár <strong>módosítása</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "Beállítások",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Ezt a címet használja, ha <a href=\"%s\" target=\"_blank\">WebDAV-on keresztül szeretné elérni a fájljait</a>",
-    "New" : "Új",
-    "New text file" : "Új szövegfájl",
-    "Text file" : "Szövegfájl",
-    "New folder" : "Új mappa",
-    "Folder" : "Mappa",
-    "Upload" : "Feltöltés",
     "Cancel upload" : "A feltöltés megszakítása",
     "No files in here" : "Itt nincsenek fájlok",
     "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!",
diff --git a/apps/files/l10n/ia.js b/apps/files/l10n/ia.js
index d6d4b83cfca..9b5d321937e 100644
--- a/apps/files/l10n/ia.js
+++ b/apps/files/l10n/ia.js
@@ -13,7 +13,12 @@ OC.L10N.register(
     "Name" : "Nomine",
     "Size" : "Dimension",
     "Modified" : "Modificate",
+    "New" : "Nove",
     "File name cannot be empty." : "Le nomine de file non pote esser vacue.",
+    "Upload" : "Incargar",
+    "Text file" : "File de texto",
+    "Folder" : "Dossier",
+    "New folder" : "Nove dossier",
     "A new file or folder has been <strong>created</strong>" : "Un nove file o dossier ha essite <strong>create</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un nove file o dossier ha essite <strong>modificate</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un nove file o dossier ha essite <strong>delite</strong>",
@@ -31,11 +36,6 @@ OC.L10N.register(
     "Maximum upload size" : "Dimension maxime de incargamento",
     "Save" : "Salveguardar",
     "Settings" : "Configurationes",
-    "New" : "Nove",
-    "Text file" : "File de texto",
-    "New folder" : "Nove dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Incargar",
     "Delete" : "Deler",
     "Upload too large" : "Incargamento troppo longe"
 },
diff --git a/apps/files/l10n/ia.json b/apps/files/l10n/ia.json
index 0389c806b30..461634d526a 100644
--- a/apps/files/l10n/ia.json
+++ b/apps/files/l10n/ia.json
@@ -11,7 +11,12 @@
     "Name" : "Nomine",
     "Size" : "Dimension",
     "Modified" : "Modificate",
+    "New" : "Nove",
     "File name cannot be empty." : "Le nomine de file non pote esser vacue.",
+    "Upload" : "Incargar",
+    "Text file" : "File de texto",
+    "Folder" : "Dossier",
+    "New folder" : "Nove dossier",
     "A new file or folder has been <strong>created</strong>" : "Un nove file o dossier ha essite <strong>create</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un nove file o dossier ha essite <strong>modificate</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un nove file o dossier ha essite <strong>delite</strong>",
@@ -29,11 +34,6 @@
     "Maximum upload size" : "Dimension maxime de incargamento",
     "Save" : "Salveguardar",
     "Settings" : "Configurationes",
-    "New" : "Nove",
-    "Text file" : "File de texto",
-    "New folder" : "Nove dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Incargar",
     "Delete" : "Deler",
     "Upload too large" : "Incargamento troppo longe"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js
index 8d57bacedf4..af35544da8a 100644
--- a/apps/files/l10n/id.js
+++ b/apps/files/l10n/id.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Pengunggahan dibatalkan.",
     "Could not get result from server." : "Tidak mendapatkan hasil dari server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
-    "{new_name} already exists" : "{new_name} sudah ada",
-    "Could not create file" : "Tidak dapat membuat berkas",
-    "Could not create folder" : "Tidak dapat membuat folder",
     "Actions" : "Tindakan",
     "Download" : "Unduh",
     "Select" : "Pilih",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Kesalahan saat memindahkan berkas.",
     "Error moving file" : "Kesalahan saat memindahkan berkas",
     "Error" : "Kesalahan ",
+    "{new_name} already exists" : "{new_name} sudah ada",
     "Could not rename file" : "Tidak dapat mengubah nama berkas",
+    "Could not create file" : "Tidak dapat membuat berkas",
+    "Could not create folder" : "Tidak dapat membuat folder",
     "Error deleting file." : "Kesalahan saat menghapus berkas.",
     "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'",
     "Name" : "Nama",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} dan {files}",
     "You don’t have permission to upload or create files here" : "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini",
     "_Uploading %n file_::_Uploading %n files_" : ["Mengunggah %n berkas"],
+    "New" : "Baru",
     "\"{name}\" is an invalid file name." : "\"{name}\" adalah nama berkas yang tidak sah.",
     "File name cannot be empty." : "Nama berkas tidak boleh kosong.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Penyimpanan {owner} penuh, berkas tidak dapat diperbarui atau disinkronisasikan lagi!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte"],
     "Favorited" : "Difavoritkan",
     "Favorite" : "Favorit",
+    "Upload" : "Unggah",
+    "Text file" : "Berkas teks",
+    "Folder" : "Folder",
+    "New folder" : "Map baru",
     "An error occurred while trying to update the tags" : "Terjadi kesalahan saat mencoba untuk memperbarui label",
     "A new file or folder has been <strong>created</strong>" : "Sebuah berkas atau folder baru telah <strong>dibuat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Sebuah berkas atau folder telah <strong>diubah</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Pengaturan",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
-    "New" : "Baru",
-    "New text file" : "Berkas teks baru",
-    "Text file" : "Berkas teks",
-    "New folder" : "Map baru",
-    "Folder" : "Folder",
-    "Upload" : "Unggah",
     "Cancel upload" : "Batal unggah",
     "No files in here" : "Tidak ada berkas disini",
     "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!",
diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json
index c38ca149788..2c0f8274542 100644
--- a/apps/files/l10n/id.json
+++ b/apps/files/l10n/id.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Pengunggahan dibatalkan.",
     "Could not get result from server." : "Tidak mendapatkan hasil dari server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
-    "{new_name} already exists" : "{new_name} sudah ada",
-    "Could not create file" : "Tidak dapat membuat berkas",
-    "Could not create folder" : "Tidak dapat membuat folder",
     "Actions" : "Tindakan",
     "Download" : "Unduh",
     "Select" : "Pilih",
@@ -47,7 +44,10 @@
     "Error moving file." : "Kesalahan saat memindahkan berkas.",
     "Error moving file" : "Kesalahan saat memindahkan berkas",
     "Error" : "Kesalahan ",
+    "{new_name} already exists" : "{new_name} sudah ada",
     "Could not rename file" : "Tidak dapat mengubah nama berkas",
+    "Could not create file" : "Tidak dapat membuat berkas",
+    "Could not create folder" : "Tidak dapat membuat folder",
     "Error deleting file." : "Kesalahan saat menghapus berkas.",
     "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'",
     "Name" : "Nama",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} dan {files}",
     "You don’t have permission to upload or create files here" : "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini",
     "_Uploading %n file_::_Uploading %n files_" : ["Mengunggah %n berkas"],
+    "New" : "Baru",
     "\"{name}\" is an invalid file name." : "\"{name}\" adalah nama berkas yang tidak sah.",
     "File name cannot be empty." : "Nama berkas tidak boleh kosong.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Penyimpanan {owner} penuh, berkas tidak dapat diperbarui atau disinkronisasikan lagi!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte"],
     "Favorited" : "Difavoritkan",
     "Favorite" : "Favorit",
+    "Upload" : "Unggah",
+    "Text file" : "Berkas teks",
+    "Folder" : "Folder",
+    "New folder" : "Map baru",
     "An error occurred while trying to update the tags" : "Terjadi kesalahan saat mencoba untuk memperbarui label",
     "A new file or folder has been <strong>created</strong>" : "Sebuah berkas atau folder baru telah <strong>dibuat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Sebuah berkas atau folder telah <strong>diubah</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "Pengaturan",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
-    "New" : "Baru",
-    "New text file" : "Berkas teks baru",
-    "Text file" : "Berkas teks",
-    "New folder" : "Map baru",
-    "Folder" : "Folder",
-    "Upload" : "Unggah",
     "Cancel upload" : "Batal unggah",
     "No files in here" : "Tidak ada berkas disini",
     "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!",
diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js
index a3b44be4731..7ac24eba462 100644
--- a/apps/files/l10n/is.js
+++ b/apps/files/l10n/is.js
@@ -16,25 +16,25 @@ OC.L10N.register(
     "Close" : "Loka",
     "Upload cancelled." : "Hætt við innsendingu.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.",
-    "{new_name} already exists" : "{new_name} er þegar til",
     "Download" : "Niðurhal",
     "Select" : "Velja",
     "Pending" : "Bíður",
     "Error" : "Villa",
+    "{new_name} already exists" : "{new_name} er þegar til",
     "Name" : "Nafn",
     "Size" : "Stærð",
     "Modified" : "Breytt",
+    "New" : "Nýtt",
     "File name cannot be empty." : "Nafn skráar má ekki vera tómt",
+    "Upload" : "Senda inn",
+    "Text file" : "Texta skrá",
+    "Folder" : "Mappa",
     "File handling" : "Meðhöndlun skrár",
     "Maximum upload size" : "Hámarks stærð innsendingar",
     "max. possible: " : "hámark mögulegt: ",
     "Save" : "Vista",
     "Settings" : "Stillingar",
     "WebDAV" : "WebDAV",
-    "New" : "Nýtt",
-    "Text file" : "Texta skrá",
-    "Folder" : "Mappa",
-    "Upload" : "Senda inn",
     "Cancel upload" : "Hætta við innsendingu",
     "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
     "Select all" : "Velja allt",
diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json
index 9307f9b6df4..8e723d963a7 100644
--- a/apps/files/l10n/is.json
+++ b/apps/files/l10n/is.json
@@ -14,25 +14,25 @@
     "Close" : "Loka",
     "Upload cancelled." : "Hætt við innsendingu.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.",
-    "{new_name} already exists" : "{new_name} er þegar til",
     "Download" : "Niðurhal",
     "Select" : "Velja",
     "Pending" : "Bíður",
     "Error" : "Villa",
+    "{new_name} already exists" : "{new_name} er þegar til",
     "Name" : "Nafn",
     "Size" : "Stærð",
     "Modified" : "Breytt",
+    "New" : "Nýtt",
     "File name cannot be empty." : "Nafn skráar má ekki vera tómt",
+    "Upload" : "Senda inn",
+    "Text file" : "Texta skrá",
+    "Folder" : "Mappa",
     "File handling" : "Meðhöndlun skrár",
     "Maximum upload size" : "Hámarks stærð innsendingar",
     "max. possible: " : "hámark mögulegt: ",
     "Save" : "Vista",
     "Settings" : "Stillingar",
     "WebDAV" : "WebDAV",
-    "New" : "Nýtt",
-    "Text file" : "Texta skrá",
-    "Folder" : "Mappa",
-    "Upload" : "Senda inn",
     "Cancel upload" : "Hætta við innsendingu",
     "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
     "Select all" : "Velja allt",
diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js
index 2a7e998cced..8aa774c7381 100644
--- a/apps/files/l10n/it.js
+++ b/apps/files/l10n/it.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Caricamento annullato.",
     "Could not get result from server." : "Impossibile ottenere il risultato dal server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
-    "{new_name} already exists" : "{new_name} esiste già",
-    "Could not create file" : "Impossibile creare il file",
-    "Could not create folder" : "Impossibile creare la cartella",
     "Actions" : "Azioni",
     "Download" : "Scarica",
     "Select" : "Seleziona",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Errore durante lo spostamento del file.",
     "Error moving file" : "Errore durante lo spostamento del file",
     "Error" : "Errore",
+    "{new_name} already exists" : "{new_name} esiste già",
     "Could not rename file" : "Impossibile rinominare il file",
+    "Could not create file" : "Impossibile creare il file",
+    "Could not create folder" : "Impossibile creare la cartella",
     "Error deleting file." : "Errore durante l'eliminazione del file.",
     "No entries in this folder match '{filter}'" : "Nessuna voce in questa cartella corrisponde a '{filter}'",
     "Name" : "Nome",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Qui non hai i permessi di caricare o creare file",
     "_Uploading %n file_::_Uploading %n files_" : ["Caricamento di %n file in corso","Caricamento di %n file in corso"],
+    "New" : "Nuovo",
     "\"{name}\" is an invalid file name." : "\"{name}\" non è un nome file valido.",
     "File name cannot be empty." : "Il nome del file non può essere vuoto.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lo spazio di archiviazione di {owner} è pieno, i file non possono essere più aggiornati o sincronizzati!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n byte"],
     "Favorited" : "Preferiti",
     "Favorite" : "Preferito",
+    "Upload" : "Carica",
+    "Text file" : "File di testo",
+    "Folder" : "Cartella",
+    "New folder" : "Nuova cartella",
     "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette",
     "A new file or folder has been <strong>created</strong>" : "Un nuovo file o cartella è stato <strong>creato</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un file o una cartella è stato <strong>modificato</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Impostazioni",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
-    "New" : "Nuovo",
-    "New text file" : "Nuovo file di testo",
-    "Text file" : "File di testo",
-    "New folder" : "Nuova cartella",
-    "Folder" : "Cartella",
-    "Upload" : "Carica",
     "Cancel upload" : "Annulla caricamento",
     "No files in here" : "Qui non c'è alcun file",
     "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!",
diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json
index b61fb39ae5f..39b6b9983e7 100644
--- a/apps/files/l10n/it.json
+++ b/apps/files/l10n/it.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Caricamento annullato.",
     "Could not get result from server." : "Impossibile ottenere il risultato dal server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
-    "{new_name} already exists" : "{new_name} esiste già",
-    "Could not create file" : "Impossibile creare il file",
-    "Could not create folder" : "Impossibile creare la cartella",
     "Actions" : "Azioni",
     "Download" : "Scarica",
     "Select" : "Seleziona",
@@ -47,7 +44,10 @@
     "Error moving file." : "Errore durante lo spostamento del file.",
     "Error moving file" : "Errore durante lo spostamento del file",
     "Error" : "Errore",
+    "{new_name} already exists" : "{new_name} esiste già",
     "Could not rename file" : "Impossibile rinominare il file",
+    "Could not create file" : "Impossibile creare il file",
+    "Could not create folder" : "Impossibile creare la cartella",
     "Error deleting file." : "Errore durante l'eliminazione del file.",
     "No entries in this folder match '{filter}'" : "Nessuna voce in questa cartella corrisponde a '{filter}'",
     "Name" : "Nome",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Qui non hai i permessi di caricare o creare file",
     "_Uploading %n file_::_Uploading %n files_" : ["Caricamento di %n file in corso","Caricamento di %n file in corso"],
+    "New" : "Nuovo",
     "\"{name}\" is an invalid file name." : "\"{name}\" non è un nome file valido.",
     "File name cannot be empty." : "Il nome del file non può essere vuoto.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lo spazio di archiviazione di {owner} è pieno, i file non possono essere più aggiornati o sincronizzati!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n byte"],
     "Favorited" : "Preferiti",
     "Favorite" : "Preferito",
+    "Upload" : "Carica",
+    "Text file" : "File di testo",
+    "Folder" : "Cartella",
+    "New folder" : "Nuova cartella",
     "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette",
     "A new file or folder has been <strong>created</strong>" : "Un nuovo file o cartella è stato <strong>creato</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un file o una cartella è stato <strong>modificato</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "Impostazioni",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
-    "New" : "Nuovo",
-    "New text file" : "Nuovo file di testo",
-    "Text file" : "File di testo",
-    "New folder" : "Nuova cartella",
-    "Folder" : "Cartella",
-    "Upload" : "Carica",
     "Cancel upload" : "Annulla caricamento",
     "No files in here" : "Qui non c'è alcun file",
     "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!",
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 23326e2ab2e..91e75e6e76a 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "アップロードはキャンセルされました。",
     "Could not get result from server." : "サーバーから結果を取得できませんでした。",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
-    "{new_name} already exists" : "{new_name} はすでに存在します",
-    "Could not create file" : "ファイルを作成できませんでした",
-    "Could not create folder" : "フォルダーを作成できませんでした",
     "Actions" : "アクション",
     "Download" : "ダウンロード",
     "Select" : "選択",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "ファイル移動でエラー",
     "Error moving file" : "ファイルの移動エラー",
     "Error" : "エラー",
+    "{new_name} already exists" : "{new_name} はすでに存在します",
     "Could not rename file" : "ファイルの名前変更ができませんでした",
+    "Could not create file" : "ファイルを作成できませんでした",
+    "Could not create folder" : "フォルダーを作成できませんでした",
     "Error deleting file." : "ファイルの削除エラー。",
     "No entries in this folder match '{filter}'" : "このフォルダー内で '{filter}' にマッチするものはありません",
     "Name" : "名前",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} と {files}",
     "You don’t have permission to upload or create files here" : "ここにファイルをアップロードもしくは作成する権限がありません",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 個のファイルをアップロード中"],
+    "New" : "新規作成",
     "\"{name}\" is an invalid file name." : "\"{name}\" は無効なファイル名です。",
     "File name cannot be empty." : "ファイル名を空にすることはできません。",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} のストレージは一杯です。ファイルの更新と同期はもうできません！",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n バイト"],
     "Favorited" : "お気に入り済",
     "Favorite" : "お気に入り",
+    "Upload" : "アップロード",
+    "Text file" : "テキストファイル",
+    "Folder" : "フォルダー",
+    "New folder" : "新しいフォルダー",
     "An error occurred while trying to update the tags" : "タグを更新する際にエラーが発生しました",
     "A new file or folder has been <strong>created</strong>" : "新しいファイルまたはフォルダーを<strong>作成</strong>したとき",
     "A file or folder has been <strong>changed</strong>" : "ファイルまたはフォルダーを<strong>変更</strong>したとき",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">WebDAV経由でのファイルアクセス</a>にはこのアドレスを利用してください",
-    "New" : "新規作成",
-    "New text file" : "新規のテキストファイル作成",
-    "Text file" : "テキストファイル",
-    "New folder" : "新しいフォルダー",
-    "Folder" : "フォルダー",
-    "Upload" : "アップロード",
     "Cancel upload" : "アップロードをキャンセル",
     "No files in here" : "ファイルがありません",
     "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index df2a7bd8058..7c0c94c0348 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "アップロードはキャンセルされました。",
     "Could not get result from server." : "サーバーから結果を取得できませんでした。",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
-    "{new_name} already exists" : "{new_name} はすでに存在します",
-    "Could not create file" : "ファイルを作成できませんでした",
-    "Could not create folder" : "フォルダーを作成できませんでした",
     "Actions" : "アクション",
     "Download" : "ダウンロード",
     "Select" : "選択",
@@ -47,7 +44,10 @@
     "Error moving file." : "ファイル移動でエラー",
     "Error moving file" : "ファイルの移動エラー",
     "Error" : "エラー",
+    "{new_name} already exists" : "{new_name} はすでに存在します",
     "Could not rename file" : "ファイルの名前変更ができませんでした",
+    "Could not create file" : "ファイルを作成できませんでした",
+    "Could not create folder" : "フォルダーを作成できませんでした",
     "Error deleting file." : "ファイルの削除エラー。",
     "No entries in this folder match '{filter}'" : "このフォルダー内で '{filter}' にマッチするものはありません",
     "Name" : "名前",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} と {files}",
     "You don’t have permission to upload or create files here" : "ここにファイルをアップロードもしくは作成する権限がありません",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 個のファイルをアップロード中"],
+    "New" : "新規作成",
     "\"{name}\" is an invalid file name." : "\"{name}\" は無効なファイル名です。",
     "File name cannot be empty." : "ファイル名を空にすることはできません。",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} のストレージは一杯です。ファイルの更新と同期はもうできません！",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n バイト"],
     "Favorited" : "お気に入り済",
     "Favorite" : "お気に入り",
+    "Upload" : "アップロード",
+    "Text file" : "テキストファイル",
+    "Folder" : "フォルダー",
+    "New folder" : "新しいフォルダー",
     "An error occurred while trying to update the tags" : "タグを更新する際にエラーが発生しました",
     "A new file or folder has been <strong>created</strong>" : "新しいファイルまたはフォルダーを<strong>作成</strong>したとき",
     "A file or folder has been <strong>changed</strong>" : "ファイルまたはフォルダーを<strong>変更</strong>したとき",
@@ -96,12 +101,6 @@
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">WebDAV経由でのファイルアクセス</a>にはこのアドレスを利用してください",
-    "New" : "新規作成",
-    "New text file" : "新規のテキストファイル作成",
-    "Text file" : "テキストファイル",
-    "New folder" : "新しいフォルダー",
-    "Folder" : "フォルダー",
-    "Upload" : "アップロード",
     "Cancel upload" : "アップロードをキャンセル",
     "No files in here" : "ファイルがありません",
     "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。",
diff --git a/apps/files/l10n/ka_GE.js b/apps/files/l10n/ka_GE.js
index 68e142e74d5..33135feb7cc 100644
--- a/apps/files/l10n/ka_GE.js
+++ b/apps/files/l10n/ka_GE.js
@@ -20,29 +20,29 @@ OC.L10N.register(
     "Close" : "დახურვა",
     "Upload cancelled." : "ატვირთვა შეჩერებულ იქნა.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
-    "{new_name} already exists" : "{new_name} უკვე არსებობს",
     "Actions" : "მოქმედებები",
     "Download" : "ჩამოტვირთვა",
     "Pending" : "მოცდის რეჟიმში",
     "Error" : "შეცდომა",
+    "{new_name} already exists" : "{new_name} უკვე არსებობს",
     "Name" : "სახელი",
     "Size" : "ზომა",
     "Modified" : "შეცვლილია",
+    "New" : "ახალი",
     "File name cannot be empty." : "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
     "Your storage is full, files can not be updated or synced anymore!" : "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
     "Your storage is almost full ({usedSpacePercent}%)" : "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
     "Favorite" : "ფავორიტი",
+    "Upload" : "ატვირთვა",
+    "Text file" : "ტექსტური ფაილი",
+    "Folder" : "საქაღალდე",
+    "New folder" : "ახალი ფოლდერი",
     "File handling" : "ფაილის დამუშავება",
     "Maximum upload size" : "მაქსიმუმ ატვირთის ზომა",
     "max. possible: " : "მაქს. შესაძლებელი:",
     "Save" : "შენახვა",
     "Settings" : "პარამეტრები",
     "WebDAV" : "WebDAV",
-    "New" : "ახალი",
-    "Text file" : "ტექსტური ფაილი",
-    "New folder" : "ახალი ფოლდერი",
-    "Folder" : "საქაღალდე",
-    "Upload" : "ატვირთვა",
     "Cancel upload" : "ატვირთვის გაუქმება",
     "Delete" : "წაშლა",
     "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია",
diff --git a/apps/files/l10n/ka_GE.json b/apps/files/l10n/ka_GE.json
index 4cbe5e15fdd..ef3f109d306 100644
--- a/apps/files/l10n/ka_GE.json
+++ b/apps/files/l10n/ka_GE.json
@@ -18,29 +18,29 @@
     "Close" : "დახურვა",
     "Upload cancelled." : "ატვირთვა შეჩერებულ იქნა.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
-    "{new_name} already exists" : "{new_name} უკვე არსებობს",
     "Actions" : "მოქმედებები",
     "Download" : "ჩამოტვირთვა",
     "Pending" : "მოცდის რეჟიმში",
     "Error" : "შეცდომა",
+    "{new_name} already exists" : "{new_name} უკვე არსებობს",
     "Name" : "სახელი",
     "Size" : "ზომა",
     "Modified" : "შეცვლილია",
+    "New" : "ახალი",
     "File name cannot be empty." : "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
     "Your storage is full, files can not be updated or synced anymore!" : "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
     "Your storage is almost full ({usedSpacePercent}%)" : "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
     "Favorite" : "ფავორიტი",
+    "Upload" : "ატვირთვა",
+    "Text file" : "ტექსტური ფაილი",
+    "Folder" : "საქაღალდე",
+    "New folder" : "ახალი ფოლდერი",
     "File handling" : "ფაილის დამუშავება",
     "Maximum upload size" : "მაქსიმუმ ატვირთის ზომა",
     "max. possible: " : "მაქს. შესაძლებელი:",
     "Save" : "შენახვა",
     "Settings" : "პარამეტრები",
     "WebDAV" : "WebDAV",
-    "New" : "ახალი",
-    "Text file" : "ტექსტური ფაილი",
-    "New folder" : "ახალი ფოლდერი",
-    "Folder" : "საქაღალდე",
-    "Upload" : "ატვირთვა",
     "Cancel upload" : "ატვირთვის გაუქმება",
     "Delete" : "წაშლა",
     "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია",
diff --git a/apps/files/l10n/km.js b/apps/files/l10n/km.js
index d21f200dc09..6b8517e7229 100644
--- a/apps/files/l10n/km.js
+++ b/apps/files/l10n/km.js
@@ -9,14 +9,19 @@ OC.L10N.register(
     "Files" : "ឯកសារ",
     "Close" : "បិទ",
     "Upload cancelled." : "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
-    "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
     "Download" : "ទាញយក",
     "Pending" : "កំពុង​រង់ចាំ",
     "Error" : "កំហុស",
+    "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
     "Name" : "ឈ្មោះ",
     "Size" : "ទំហំ",
     "Modified" : "បាន​កែ​ប្រែ",
+    "New" : "ថ្មី",
     "File name cannot be empty." : "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទេ​បាន​ឡើយ។",
+    "Upload" : "ផ្ទុក​ឡើង",
+    "Text file" : "ឯកសារ​អក្សរ",
+    "Folder" : "ថត",
+    "New folder" : "ថត​ថ្មី",
     "You created %1$s" : "អ្នក​បាន​បង្កើត %1$s",
     "%2$s created %1$s" : "%2$s បាន​បង្កើត %1$s",
     "You changed %1$s" : "អ្នក​បាន​ផ្លាស់​ប្ដូរ %1$s",
@@ -27,11 +32,6 @@ OC.L10N.register(
     "Save" : "រក្សាទុក",
     "Settings" : "ការកំណត់",
     "WebDAV" : "WebDAV",
-    "New" : "ថ្មី",
-    "Text file" : "ឯកសារ​អក្សរ",
-    "New folder" : "ថត​ថ្មី",
-    "Folder" : "ថត",
-    "Upload" : "ផ្ទុក​ឡើង",
     "Cancel upload" : "បោះបង់​ការ​ផ្ទុកឡើង",
     "Delete" : "លុប",
     "Upload too large" : "ផ្ទុក​ឡើង​ធំ​ពេក"
diff --git a/apps/files/l10n/km.json b/apps/files/l10n/km.json
index bd147f593d0..ebbb9a8b4ab 100644
--- a/apps/files/l10n/km.json
+++ b/apps/files/l10n/km.json
@@ -7,14 +7,19 @@
     "Files" : "ឯកសារ",
     "Close" : "បិទ",
     "Upload cancelled." : "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
-    "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
     "Download" : "ទាញយក",
     "Pending" : "កំពុង​រង់ចាំ",
     "Error" : "កំហុស",
+    "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
     "Name" : "ឈ្មោះ",
     "Size" : "ទំហំ",
     "Modified" : "បាន​កែ​ប្រែ",
+    "New" : "ថ្មី",
     "File name cannot be empty." : "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទេ​បាន​ឡើយ។",
+    "Upload" : "ផ្ទុក​ឡើង",
+    "Text file" : "ឯកសារ​អក្សរ",
+    "Folder" : "ថត",
+    "New folder" : "ថត​ថ្មី",
     "You created %1$s" : "អ្នក​បាន​បង្កើត %1$s",
     "%2$s created %1$s" : "%2$s បាន​បង្កើត %1$s",
     "You changed %1$s" : "អ្នក​បាន​ផ្លាស់​ប្ដូរ %1$s",
@@ -25,11 +30,6 @@
     "Save" : "រក្សាទុក",
     "Settings" : "ការកំណត់",
     "WebDAV" : "WebDAV",
-    "New" : "ថ្មី",
-    "Text file" : "ឯកសារ​អក្សរ",
-    "New folder" : "ថត​ថ្មី",
-    "Folder" : "ថត",
-    "Upload" : "ផ្ទុក​ឡើង",
     "Cancel upload" : "បោះបង់​ការ​ផ្ទុកឡើង",
     "Delete" : "លុប",
     "Upload too large" : "ផ្ទុក​ឡើង​ធំ​ពេក"
diff --git a/apps/files/l10n/kn.js b/apps/files/l10n/kn.js
index 59e444e46c6..9bd8982fdaf 100644
--- a/apps/files/l10n/kn.js
+++ b/apps/files/l10n/kn.js
@@ -28,9 +28,6 @@ OC.L10N.register(
     "Close" : "ಮುಚ್ಚು",
     "Upload cancelled." : "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಯಿತು.",
     "Could not get result from server." : "ಪರಿಚಾರಕ ಕಣಕದಿಂದ ಫಲಿತಾಂಶವನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.",
-    "{new_name} already exists" : "ಈಗಾಗಲೇ {new_name}  ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ",
-    "Could not create file" : "ಕಡತ ರಚಿಸಲಾಗಲಿಲ್ಲ",
-    "Could not create folder" : "ಕೋಶವನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ",
     "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ",
     "Select" : "ಆಯ್ಕೆ ಮಾಡಿ",
     "Pending" : "ಬಾಕಿ ಇದೆ",
@@ -38,7 +35,10 @@ OC.L10N.register(
     "Error moving file." : "ಕಡತದ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸುವಾಗ ದೋಷವಾಗಿದೆ.",
     "Error moving file" : "ಕಡತದ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸುವಾಗ ದೋಷವಾಗಿದೆ",
     "Error" : "ತಪ್ಪಾಗಿದೆ",
+    "{new_name} already exists" : "ಈಗಾಗಲೇ {new_name}  ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ",
     "Could not rename file" : "ಕಡತ ಮರುಹೆಸರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ",
+    "Could not create file" : "ಕಡತ ರಚಿಸಲಾಗಲಿಲ್ಲ",
+    "Could not create folder" : "ಕೋಶವನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ",
     "Error deleting file." : "ಕಡತವನ್ನು ಅಳಿಸುವಲ್ಲಿ ಲೋಪವಾದೆ",
     "Name" : "ಹೆಸರು",
     "Size" : " ಪ್ರಮಾಣ",
@@ -47,9 +47,14 @@ OC.L10N.register(
     "_%n file_::_%n files_" : ["%n ಕಡತ"],
     "You don’t have permission to upload or create files here" : "ನಿಮಗೆ ಇಲ್ಲಿ ಅಪ್ಲೋಡ್ ಅಥವಾ ಕಡತಗಳನ್ನು ರಚಿಸವ ಅನುಮತಿ ಇಲ್ಲ",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 'ನೆ ಕಡತವನ್ನು ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ"],
+    "New" : "ಹೊಸ",
     "File name cannot be empty." : "ಕಡತ ಹೆಸರು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.",
     "Favorited" : "ಅಚ್ಚುಮೆಚ್ಚಿನವು",
     "Favorite" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
+    "Upload" : "ವರ್ಗಾಯಿಸಿ",
+    "Text file" : "ಸರಳಾಕ್ಷರದ ಕಡತ",
+    "Folder" : "ಕಡತಕೋಶ",
+    "New folder" : "ಹೊಸ ಕಡತಕೋಶ",
     "Upload (max. %s)" : "ವರ್ಗಾವಣೆ (ಗರಿಷ್ಠ %s)",
     "File handling" : "ಕಡತ ನಿರ್ವಹಣೆ",
     "Maximum upload size" : "ಗರಿಷ್ಠ ವರ್ಗಾವಣೆ ಗಾತ್ರ",
@@ -57,12 +62,6 @@ OC.L10N.register(
     "Save" : "ಉಳಿಸಿ",
     "Settings" : "ಆಯ್ಕೆ",
     "WebDAV" : "WebDAV",
-    "New" : "ಹೊಸ",
-    "New text file" : "ಹೊಸ ಸರಳಾಕ್ಷರದ ಕಡತ ",
-    "Text file" : "ಸರಳಾಕ್ಷರದ ಕಡತ",
-    "New folder" : "ಹೊಸ ಕಡತಕೋಶ",
-    "Folder" : "ಕಡತಕೋಶ",
-    "Upload" : "ವರ್ಗಾಯಿಸಿ",
     "Cancel upload" : "ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ",
     "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ",
     "Delete" : "ಅಳಿಸಿ",
diff --git a/apps/files/l10n/kn.json b/apps/files/l10n/kn.json
index d432dbdae33..803b1c87cf4 100644
--- a/apps/files/l10n/kn.json
+++ b/apps/files/l10n/kn.json
@@ -26,9 +26,6 @@
     "Close" : "ಮುಚ್ಚು",
     "Upload cancelled." : "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಯಿತು.",
     "Could not get result from server." : "ಪರಿಚಾರಕ ಕಣಕದಿಂದ ಫಲಿತಾಂಶವನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.",
-    "{new_name} already exists" : "ಈಗಾಗಲೇ {new_name}  ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ",
-    "Could not create file" : "ಕಡತ ರಚಿಸಲಾಗಲಿಲ್ಲ",
-    "Could not create folder" : "ಕೋಶವನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ",
     "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ",
     "Select" : "ಆಯ್ಕೆ ಮಾಡಿ",
     "Pending" : "ಬಾಕಿ ಇದೆ",
@@ -36,7 +33,10 @@
     "Error moving file." : "ಕಡತದ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸುವಾಗ ದೋಷವಾಗಿದೆ.",
     "Error moving file" : "ಕಡತದ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸುವಾಗ ದೋಷವಾಗಿದೆ",
     "Error" : "ತಪ್ಪಾಗಿದೆ",
+    "{new_name} already exists" : "ಈಗಾಗಲೇ {new_name}  ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ",
     "Could not rename file" : "ಕಡತ ಮರುಹೆಸರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ",
+    "Could not create file" : "ಕಡತ ರಚಿಸಲಾಗಲಿಲ್ಲ",
+    "Could not create folder" : "ಕೋಶವನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ",
     "Error deleting file." : "ಕಡತವನ್ನು ಅಳಿಸುವಲ್ಲಿ ಲೋಪವಾದೆ",
     "Name" : "ಹೆಸರು",
     "Size" : " ಪ್ರಮಾಣ",
@@ -45,9 +45,14 @@
     "_%n file_::_%n files_" : ["%n ಕಡತ"],
     "You don’t have permission to upload or create files here" : "ನಿಮಗೆ ಇಲ್ಲಿ ಅಪ್ಲೋಡ್ ಅಥವಾ ಕಡತಗಳನ್ನು ರಚಿಸವ ಅನುಮತಿ ಇಲ್ಲ",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 'ನೆ ಕಡತವನ್ನು ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ"],
+    "New" : "ಹೊಸ",
     "File name cannot be empty." : "ಕಡತ ಹೆಸರು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.",
     "Favorited" : "ಅಚ್ಚುಮೆಚ್ಚಿನವು",
     "Favorite" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
+    "Upload" : "ವರ್ಗಾಯಿಸಿ",
+    "Text file" : "ಸರಳಾಕ್ಷರದ ಕಡತ",
+    "Folder" : "ಕಡತಕೋಶ",
+    "New folder" : "ಹೊಸ ಕಡತಕೋಶ",
     "Upload (max. %s)" : "ವರ್ಗಾವಣೆ (ಗರಿಷ್ಠ %s)",
     "File handling" : "ಕಡತ ನಿರ್ವಹಣೆ",
     "Maximum upload size" : "ಗರಿಷ್ಠ ವರ್ಗಾವಣೆ ಗಾತ್ರ",
@@ -55,12 +60,6 @@
     "Save" : "ಉಳಿಸಿ",
     "Settings" : "ಆಯ್ಕೆ",
     "WebDAV" : "WebDAV",
-    "New" : "ಹೊಸ",
-    "New text file" : "ಹೊಸ ಸರಳಾಕ್ಷರದ ಕಡತ ",
-    "Text file" : "ಸರಳಾಕ್ಷರದ ಕಡತ",
-    "New folder" : "ಹೊಸ ಕಡತಕೋಶ",
-    "Folder" : "ಕಡತಕೋಶ",
-    "Upload" : "ವರ್ಗಾಯಿಸಿ",
     "Cancel upload" : "ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ",
     "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ",
     "Delete" : "ಅಳಿಸಿ",
diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js
index 65ca5780d6f..50126226933 100644
--- a/apps/files/l10n/ko.js
+++ b/apps/files/l10n/ko.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "업로드가 취소되었습니다.",
     "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
-    "{new_name} already exists" : "{new_name}이(가) 이미 존재함",
-    "Could not create file" : "파일을 만들 수 없음",
-    "Could not create folder" : "폴더를 만들 수 없음",
     "Actions" : "작업",
     "Download" : "다운로드",
     "Select" : "선택",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "파일 이동 오류.",
     "Error moving file" : "파일 이동 오류",
     "Error" : "오류",
+    "{new_name} already exists" : "{new_name}이(가) 이미 존재함",
     "Could not rename file" : "이름을 변경할 수 없음",
+    "Could not create file" : "파일을 만들 수 없음",
+    "Could not create folder" : "폴더를 만들 수 없음",
     "Error deleting file." : "파일 삭제 오류.",
     "No entries in this folder match '{filter}'" : "이 폴더에 '{filter}'와(과) 일치하는 항목 없음",
     "Name" : "이름",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} 그리고 {files}",
     "You don’t have permission to upload or create files here" : "여기에 파일을 업로드하거나 만들 권한이 없습니다",
     "_Uploading %n file_::_Uploading %n files_" : ["파일 %n개 업로드 중"],
+    "New" : "새로 만들기",
     "\"{name}\" is an invalid file name." : "\"{name}\"은(는) 잘못된 파일 이름입니다.",
     "File name cannot be empty." : "파일 이름이 비어 있을 수 없습니다.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner}의 저장소가 가득 찼습니다. 파일을 더 이상 업데이트하거나 동기화할 수 없습니다!",
@@ -69,6 +70,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}'와(과) 일치"],
     "Favorited" : "책갈피에 추가됨",
     "Favorite" : "즐겨찾기",
+    "Upload" : "업로드",
+    "Text file" : "텍스트 파일",
+    "Folder" : "폴더",
+    "New folder" : "새 폴더",
     "An error occurred while trying to update the tags" : "태그를 업데이트하는 중 오류 발생",
     "A new file or folder has been <strong>created</strong>" : "새 파일이나 폴더가 <strong>생성됨</strong>",
     "A file or folder has been <strong>changed</strong>" : "파일이나 폴더가 <strong>변경됨</strong>",
@@ -95,12 +100,6 @@ OC.L10N.register(
     "Settings" : "설정",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>",
-    "New" : "새로 만들기",
-    "New text file" : "새 텍스트 파일",
-    "Text file" : "텍스트 파일",
-    "New folder" : "새 폴더",
-    "Folder" : "폴더",
-    "Upload" : "업로드",
     "Cancel upload" : "업로드 취소",
     "No files in here" : "여기에 파일 없음",
     "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!",
diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json
index 9139e78c0ac..95601323bd1 100644
--- a/apps/files/l10n/ko.json
+++ b/apps/files/l10n/ko.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "업로드가 취소되었습니다.",
     "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
-    "{new_name} already exists" : "{new_name}이(가) 이미 존재함",
-    "Could not create file" : "파일을 만들 수 없음",
-    "Could not create folder" : "폴더를 만들 수 없음",
     "Actions" : "작업",
     "Download" : "다운로드",
     "Select" : "선택",
@@ -47,7 +44,10 @@
     "Error moving file." : "파일 이동 오류.",
     "Error moving file" : "파일 이동 오류",
     "Error" : "오류",
+    "{new_name} already exists" : "{new_name}이(가) 이미 존재함",
     "Could not rename file" : "이름을 변경할 수 없음",
+    "Could not create file" : "파일을 만들 수 없음",
+    "Could not create folder" : "폴더를 만들 수 없음",
     "Error deleting file." : "파일 삭제 오류.",
     "No entries in this folder match '{filter}'" : "이 폴더에 '{filter}'와(과) 일치하는 항목 없음",
     "Name" : "이름",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} 그리고 {files}",
     "You don’t have permission to upload or create files here" : "여기에 파일을 업로드하거나 만들 권한이 없습니다",
     "_Uploading %n file_::_Uploading %n files_" : ["파일 %n개 업로드 중"],
+    "New" : "새로 만들기",
     "\"{name}\" is an invalid file name." : "\"{name}\"은(는) 잘못된 파일 이름입니다.",
     "File name cannot be empty." : "파일 이름이 비어 있을 수 없습니다.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner}의 저장소가 가득 찼습니다. 파일을 더 이상 업데이트하거나 동기화할 수 없습니다!",
@@ -67,6 +68,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}'와(과) 일치"],
     "Favorited" : "책갈피에 추가됨",
     "Favorite" : "즐겨찾기",
+    "Upload" : "업로드",
+    "Text file" : "텍스트 파일",
+    "Folder" : "폴더",
+    "New folder" : "새 폴더",
     "An error occurred while trying to update the tags" : "태그를 업데이트하는 중 오류 발생",
     "A new file or folder has been <strong>created</strong>" : "새 파일이나 폴더가 <strong>생성됨</strong>",
     "A file or folder has been <strong>changed</strong>" : "파일이나 폴더가 <strong>변경됨</strong>",
@@ -93,12 +98,6 @@
     "Settings" : "설정",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>",
-    "New" : "새로 만들기",
-    "New text file" : "새 텍스트 파일",
-    "Text file" : "텍스트 파일",
-    "New folder" : "새 폴더",
-    "Folder" : "폴더",
-    "Upload" : "업로드",
     "Cancel upload" : "업로드 취소",
     "No files in here" : "여기에 파일 없음",
     "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!",
diff --git a/apps/files/l10n/ku_IQ.js b/apps/files/l10n/ku_IQ.js
index 4e676ceaa81..32af16b3673 100644
--- a/apps/files/l10n/ku_IQ.js
+++ b/apps/files/l10n/ku_IQ.js
@@ -8,9 +8,9 @@ OC.L10N.register(
     "Select" : "دیاریکردنی",
     "Error" : "هه‌ڵه",
     "Name" : "ناو",
-    "Save" : "پاشکه‌وتکردن",
-    "Settings" : "ڕێکخستنه‌کان",
+    "Upload" : "بارکردن",
     "Folder" : "بوخچه",
-    "Upload" : "بارکردن"
+    "Save" : "پاشکه‌وتکردن",
+    "Settings" : "ڕێکخستنه‌کان"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ku_IQ.json b/apps/files/l10n/ku_IQ.json
index 3a42444a605..4f1068bbb04 100644
--- a/apps/files/l10n/ku_IQ.json
+++ b/apps/files/l10n/ku_IQ.json
@@ -6,9 +6,9 @@
     "Select" : "دیاریکردنی",
     "Error" : "هه‌ڵه",
     "Name" : "ناو",
-    "Save" : "پاشکه‌وتکردن",
-    "Settings" : "ڕێکخستنه‌کان",
+    "Upload" : "بارکردن",
     "Folder" : "بوخچه",
-    "Upload" : "بارکردن"
+    "Save" : "پاشکه‌وتکردن",
+    "Settings" : "ڕێکخستنه‌کان"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/lb.js b/apps/files/l10n/lb.js
index f6f28c15a77..513d802c1e4 100644
--- a/apps/files/l10n/lb.js
+++ b/apps/files/l10n/lb.js
@@ -20,16 +20,16 @@ OC.L10N.register(
     "Name" : "Numm",
     "Size" : "Gréisst",
     "Modified" : "Geännert",
+    "New" : "Nei",
+    "Upload" : "Eroplueden",
+    "Text file" : "Text Fichier",
+    "Folder" : "Dossier",
+    "New folder" : "Neien Dossier",
     "File handling" : "Fichier handling",
     "Maximum upload size" : "Maximum Upload Gréisst ",
     "max. possible: " : "max. méiglech:",
     "Save" : "Späicheren",
     "Settings" : "Astellungen",
-    "New" : "Nei",
-    "Text file" : "Text Fichier",
-    "New folder" : "Neien Dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Eroplueden",
     "Cancel upload" : "Upload ofbriechen",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Select all" : "All auswielen",
diff --git a/apps/files/l10n/lb.json b/apps/files/l10n/lb.json
index 07363a6ab6c..fb586a90991 100644
--- a/apps/files/l10n/lb.json
+++ b/apps/files/l10n/lb.json
@@ -18,16 +18,16 @@
     "Name" : "Numm",
     "Size" : "Gréisst",
     "Modified" : "Geännert",
+    "New" : "Nei",
+    "Upload" : "Eroplueden",
+    "Text file" : "Text Fichier",
+    "Folder" : "Dossier",
+    "New folder" : "Neien Dossier",
     "File handling" : "Fichier handling",
     "Maximum upload size" : "Maximum Upload Gréisst ",
     "max. possible: " : "max. méiglech:",
     "Save" : "Späicheren",
     "Settings" : "Astellungen",
-    "New" : "Nei",
-    "Text file" : "Text Fichier",
-    "New folder" : "Neien Dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Eroplueden",
     "Cancel upload" : "Upload ofbriechen",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Select all" : "All auswielen",
diff --git a/apps/files/l10n/lt_LT.js b/apps/files/l10n/lt_LT.js
index 272a92f99c4..26fb351f50d 100644
--- a/apps/files/l10n/lt_LT.js
+++ b/apps/files/l10n/lt_LT.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Įkėlimas atšauktas.",
     "Could not get result from server." : "Nepavyko gauti rezultato iš serverio.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
-    "{new_name} already exists" : "{new_name} jau egzistuoja",
-    "Could not create file" : "Neįmanoma sukurti failo",
-    "Could not create folder" : "Neįmanoma sukurti aplanko",
     "Actions" : "Veiksmai",
     "Download" : "Atsisiųsti",
     "Select" : "Pasirinkiti",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Klaida perkeliant failą.",
     "Error moving file" : "Klaida perkeliant failą",
     "Error" : "Klaida",
+    "{new_name} already exists" : "{new_name} jau egzistuoja",
     "Could not rename file" : "Neįmanoma pervadinti failo",
+    "Could not create file" : "Neįmanoma sukurti failo",
+    "Could not create folder" : "Neįmanoma sukurti aplanko",
     "Error deleting file." : "Klaida trinant failą.",
     "No entries in this folder match '{filter}'" : "Nėra įrašų šiame aplanko atitikmeniui „{filter}“",
     "Name" : "Pavadinimas",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} ir {files}",
     "You don’t have permission to upload or create files here" : "Jūs neturite leidimo čia įkelti arba kurti failus",
     "_Uploading %n file_::_Uploading %n files_" : ["Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"],
+    "New" : "Naujas",
     "\"{name}\" is an invalid file name." : "„{name}“ yra netinkamas failo pavadinime.",
     "File name cannot be empty." : "Failo pavadinimas negali būti tuščias.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} saugykla yra pilna, failai daugiau nebegali būti atnaujinti arba sinchronizuojami!",
@@ -69,6 +70,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["atitikmuo „{filter}“","atitikmenys „{filter}“","atitikmenų „{filter}“"],
     "Favorited" : "Pažymėta mėgstamu",
     "Favorite" : "Mėgiamas",
+    "Upload" : "Įkelti",
+    "Text file" : "Teksto failas",
+    "Folder" : "Katalogas",
+    "New folder" : "Naujas aplankas",
     "An error occurred while trying to update the tags" : "Bandant atnaujinti žymes įvyko klaida",
     "A new file or folder has been <strong>created</strong>" : "Naujas failas ar aplankas buvo <strong>sukurtas</strong>",
     "A file or folder has been <strong>changed</strong>" : "Failas ar aplankas buvo <strong>pakeistas</strong>",
@@ -95,12 +100,6 @@ OC.L10N.register(
     "Settings" : "Nustatymai",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>",
-    "New" : "Naujas",
-    "New text file" : "Naujas tekstinis failas",
-    "Text file" : "Teksto failas",
-    "New folder" : "Naujas aplankas",
-    "Folder" : "Katalogas",
-    "Upload" : "Įkelti",
     "Cancel upload" : "Atšaukti siuntimą",
     "No files in here" : "Čia nėra failų",
     "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!",
diff --git a/apps/files/l10n/lt_LT.json b/apps/files/l10n/lt_LT.json
index 65103d0cc03..ee8fb0480c2 100644
--- a/apps/files/l10n/lt_LT.json
+++ b/apps/files/l10n/lt_LT.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Įkėlimas atšauktas.",
     "Could not get result from server." : "Nepavyko gauti rezultato iš serverio.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
-    "{new_name} already exists" : "{new_name} jau egzistuoja",
-    "Could not create file" : "Neįmanoma sukurti failo",
-    "Could not create folder" : "Neįmanoma sukurti aplanko",
     "Actions" : "Veiksmai",
     "Download" : "Atsisiųsti",
     "Select" : "Pasirinkiti",
@@ -47,7 +44,10 @@
     "Error moving file." : "Klaida perkeliant failą.",
     "Error moving file" : "Klaida perkeliant failą",
     "Error" : "Klaida",
+    "{new_name} already exists" : "{new_name} jau egzistuoja",
     "Could not rename file" : "Neįmanoma pervadinti failo",
+    "Could not create file" : "Neįmanoma sukurti failo",
+    "Could not create folder" : "Neįmanoma sukurti aplanko",
     "Error deleting file." : "Klaida trinant failą.",
     "No entries in this folder match '{filter}'" : "Nėra įrašų šiame aplanko atitikmeniui „{filter}“",
     "Name" : "Pavadinimas",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} ir {files}",
     "You don’t have permission to upload or create files here" : "Jūs neturite leidimo čia įkelti arba kurti failus",
     "_Uploading %n file_::_Uploading %n files_" : ["Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"],
+    "New" : "Naujas",
     "\"{name}\" is an invalid file name." : "„{name}“ yra netinkamas failo pavadinime.",
     "File name cannot be empty." : "Failo pavadinimas negali būti tuščias.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} saugykla yra pilna, failai daugiau nebegali būti atnaujinti arba sinchronizuojami!",
@@ -67,6 +68,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["atitikmuo „{filter}“","atitikmenys „{filter}“","atitikmenų „{filter}“"],
     "Favorited" : "Pažymėta mėgstamu",
     "Favorite" : "Mėgiamas",
+    "Upload" : "Įkelti",
+    "Text file" : "Teksto failas",
+    "Folder" : "Katalogas",
+    "New folder" : "Naujas aplankas",
     "An error occurred while trying to update the tags" : "Bandant atnaujinti žymes įvyko klaida",
     "A new file or folder has been <strong>created</strong>" : "Naujas failas ar aplankas buvo <strong>sukurtas</strong>",
     "A file or folder has been <strong>changed</strong>" : "Failas ar aplankas buvo <strong>pakeistas</strong>",
@@ -93,12 +98,6 @@
     "Settings" : "Nustatymai",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>",
-    "New" : "Naujas",
-    "New text file" : "Naujas tekstinis failas",
-    "Text file" : "Teksto failas",
-    "New folder" : "Naujas aplankas",
-    "Folder" : "Katalogas",
-    "Upload" : "Įkelti",
     "Cancel upload" : "Atšaukti siuntimą",
     "No files in here" : "Čia nėra failų",
     "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!",
diff --git a/apps/files/l10n/lv.js b/apps/files/l10n/lv.js
index b5963af978b..e86b2d335e7 100644
--- a/apps/files/l10n/lv.js
+++ b/apps/files/l10n/lv.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Augšupielāde ir atcelta.",
     "Could not get result from server." : "Nevar saņemt rezultātus no servera",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
-    "{new_name} already exists" : "{new_name} jau eksistē",
-    "Could not create file" : "Neizdevās izveidot datni",
-    "Could not create folder" : "Neizdevās izveidot mapi",
     "Actions" : "Darbības",
     "Download" : "Lejupielādēt",
     "Select" : "Norādīt",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Kļūda, pārvietojot datni.",
     "Error moving file" : "Kļūda, pārvietojot datni",
     "Error" : "Kļūda",
+    "{new_name} already exists" : "{new_name} jau eksistē",
     "Could not rename file" : "Neizdevās pārsaukt datni",
+    "Could not create file" : "Neizdevās izveidot datni",
+    "Could not create folder" : "Neizdevās izveidot mapi",
     "Error deleting file." : "Kļūda, dzēšot datni.",
     "No entries in this folder match '{filter}'" : "Šajā mapē nekas nav atrasts, meklējot pēc '{filter}'",
     "Name" : "Nosaukums",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} un {files}",
     "You don’t have permission to upload or create files here" : "Jums nav tiesību, augšupielādēt vai veidot, šeit datnes",
     "_Uploading %n file_::_Uploading %n files_" : ["%n","Augšupielāde %n failu","Augšupielāde %n failus"],
+    "New" : "Jauna",
     "\"{name}\" is an invalid file name." : "\"{name}\" ir nepareizs datnes nosaukums.",
     "File name cannot be empty." : "Datnes nosaukums nevar būt tukšs.",
     "Your storage is full, files can not be updated or synced anymore!" : "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
@@ -65,6 +66,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["atrasts pēc '{filter}'","atrasts pēc '{filter}'","atrasti pēc '{filter}'"],
     "Favorited" : "Favorīti",
     "Favorite" : "Iecienītais",
+    "Upload" : "Augšupielādēt",
+    "Text file" : "Teksta datne",
+    "Folder" : "Mape",
+    "New folder" : "Jauna mape",
     "An error occurred while trying to update the tags" : "Atjaunojot atzīmes notika kļūda",
     "A new file or folder has been <strong>created</strong>" : "<strong>Izveidots</strong> jauns fails vai mape",
     "A file or folder has been <strong>changed</strong>" : "<strong>Izmainīts</strong> fails vai mape",
@@ -89,12 +94,6 @@ OC.L10N.register(
     "Settings" : "Iestatījumi",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Izmantojot šo adresi, <a href=\"%s\" target=\"_blank\">piekļūstiet saviem failiem, izmantojot WebDAV</a>",
-    "New" : "Jauna",
-    "New text file" : "Jauna teksta datne",
-    "Text file" : "Teksta datne",
-    "New folder" : "Jauna mape",
-    "Folder" : "Mape",
-    "Upload" : "Augšupielādēt",
     "Cancel upload" : "Atcelt augšupielādi",
     "Upload some content or sync with your devices!" : "Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!",
     "No entries found in this folder" : "Šajā mapē nekas nav atrasts",
diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json
index 5e9498ee6f7..7a5a53c1305 100644
--- a/apps/files/l10n/lv.json
+++ b/apps/files/l10n/lv.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Augšupielāde ir atcelta.",
     "Could not get result from server." : "Nevar saņemt rezultātus no servera",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
-    "{new_name} already exists" : "{new_name} jau eksistē",
-    "Could not create file" : "Neizdevās izveidot datni",
-    "Could not create folder" : "Neizdevās izveidot mapi",
     "Actions" : "Darbības",
     "Download" : "Lejupielādēt",
     "Select" : "Norādīt",
@@ -45,7 +42,10 @@
     "Error moving file." : "Kļūda, pārvietojot datni.",
     "Error moving file" : "Kļūda, pārvietojot datni",
     "Error" : "Kļūda",
+    "{new_name} already exists" : "{new_name} jau eksistē",
     "Could not rename file" : "Neizdevās pārsaukt datni",
+    "Could not create file" : "Neizdevās izveidot datni",
+    "Could not create folder" : "Neizdevās izveidot mapi",
     "Error deleting file." : "Kļūda, dzēšot datni.",
     "No entries in this folder match '{filter}'" : "Šajā mapē nekas nav atrasts, meklējot pēc '{filter}'",
     "Name" : "Nosaukums",
@@ -56,6 +56,7 @@
     "{dirs} and {files}" : "{dirs} un {files}",
     "You don’t have permission to upload or create files here" : "Jums nav tiesību, augšupielādēt vai veidot, šeit datnes",
     "_Uploading %n file_::_Uploading %n files_" : ["%n","Augšupielāde %n failu","Augšupielāde %n failus"],
+    "New" : "Jauna",
     "\"{name}\" is an invalid file name." : "\"{name}\" ir nepareizs datnes nosaukums.",
     "File name cannot be empty." : "Datnes nosaukums nevar būt tukšs.",
     "Your storage is full, files can not be updated or synced anymore!" : "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
@@ -63,6 +64,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["atrasts pēc '{filter}'","atrasts pēc '{filter}'","atrasti pēc '{filter}'"],
     "Favorited" : "Favorīti",
     "Favorite" : "Iecienītais",
+    "Upload" : "Augšupielādēt",
+    "Text file" : "Teksta datne",
+    "Folder" : "Mape",
+    "New folder" : "Jauna mape",
     "An error occurred while trying to update the tags" : "Atjaunojot atzīmes notika kļūda",
     "A new file or folder has been <strong>created</strong>" : "<strong>Izveidots</strong> jauns fails vai mape",
     "A file or folder has been <strong>changed</strong>" : "<strong>Izmainīts</strong> fails vai mape",
@@ -87,12 +92,6 @@
     "Settings" : "Iestatījumi",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Izmantojot šo adresi, <a href=\"%s\" target=\"_blank\">piekļūstiet saviem failiem, izmantojot WebDAV</a>",
-    "New" : "Jauna",
-    "New text file" : "Jauna teksta datne",
-    "Text file" : "Teksta datne",
-    "New folder" : "Jauna mape",
-    "Folder" : "Mape",
-    "Upload" : "Augšupielādēt",
     "Cancel upload" : "Atcelt augšupielādi",
     "Upload some content or sync with your devices!" : "Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!",
     "No entries found in this folder" : "Šajā mapē nekas nav atrasts",
diff --git a/apps/files/l10n/mk.js b/apps/files/l10n/mk.js
index 6246b5b192b..b9225ac6708 100644
--- a/apps/files/l10n/mk.js
+++ b/apps/files/l10n/mk.js
@@ -26,23 +26,28 @@ OC.L10N.register(
     "Upload cancelled." : "Преземањето е прекинато.",
     "Could not get result from server." : "Не можам да добијам резултат од серверот.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
-    "{new_name} already exists" : "{new_name} веќе постои",
-    "Could not create file" : "Не множам да креирам датотека",
-    "Could not create folder" : "Не можам да креирам папка",
     "Actions" : "Акции",
     "Download" : "Преземи",
     "Select" : "Избери",
     "Pending" : "Чека",
     "Error moving file" : "Грешка при префрлање на датотека",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} веќе постои",
     "Could not rename file" : "Не можам да ја преименувам датотеката",
+    "Could not create file" : "Не множам да креирам датотека",
+    "Could not create folder" : "Не можам да креирам папка",
     "Name" : "Име",
     "Size" : "Големина",
     "Modified" : "Променето",
     "{dirs} and {files}" : "{dirs} и {files}",
+    "New" : "Ново",
     "File name cannot be empty." : "Името на датотеката не може да биде празно.",
     "Your storage is full, files can not be updated or synced anymore!" : "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Вашиот сториџ е скоро полн ({usedSpacePercent}%)",
+    "Upload" : "Подигни",
+    "Text file" : "Текстуална датотека",
+    "Folder" : "Папка",
+    "New folder" : "Нова папка",
     "You created %1$s" : "Вие креиравте %1$s",
     "%2$s created %1$s" : "%2$s креирано %1$s",
     "You changed %1$s" : "Вие изменивте %1$s",
@@ -57,11 +62,6 @@ OC.L10N.register(
     "Save" : "Сними",
     "Settings" : "Подесувања",
     "WebDAV" : "WebDAV",
-    "New" : "Ново",
-    "Text file" : "Текстуална датотека",
-    "New folder" : "Нова папка",
-    "Folder" : "Папка",
-    "Upload" : "Подигни",
     "Cancel upload" : "Откажи прикачување",
     "Delete" : "Избриши",
     "Upload too large" : "Фајлот кој се вчитува е преголем",
diff --git a/apps/files/l10n/mk.json b/apps/files/l10n/mk.json
index 9ad1ea0706c..e6ce76ecb45 100644
--- a/apps/files/l10n/mk.json
+++ b/apps/files/l10n/mk.json
@@ -24,23 +24,28 @@
     "Upload cancelled." : "Преземањето е прекинато.",
     "Could not get result from server." : "Не можам да добијам резултат од серверот.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
-    "{new_name} already exists" : "{new_name} веќе постои",
-    "Could not create file" : "Не множам да креирам датотека",
-    "Could not create folder" : "Не можам да креирам папка",
     "Actions" : "Акции",
     "Download" : "Преземи",
     "Select" : "Избери",
     "Pending" : "Чека",
     "Error moving file" : "Грешка при префрлање на датотека",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} веќе постои",
     "Could not rename file" : "Не можам да ја преименувам датотеката",
+    "Could not create file" : "Не множам да креирам датотека",
+    "Could not create folder" : "Не можам да креирам папка",
     "Name" : "Име",
     "Size" : "Големина",
     "Modified" : "Променето",
     "{dirs} and {files}" : "{dirs} и {files}",
+    "New" : "Ново",
     "File name cannot be empty." : "Името на датотеката не може да биде празно.",
     "Your storage is full, files can not be updated or synced anymore!" : "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Вашиот сториџ е скоро полн ({usedSpacePercent}%)",
+    "Upload" : "Подигни",
+    "Text file" : "Текстуална датотека",
+    "Folder" : "Папка",
+    "New folder" : "Нова папка",
     "You created %1$s" : "Вие креиравте %1$s",
     "%2$s created %1$s" : "%2$s креирано %1$s",
     "You changed %1$s" : "Вие изменивте %1$s",
@@ -55,11 +60,6 @@
     "Save" : "Сними",
     "Settings" : "Подесувања",
     "WebDAV" : "WebDAV",
-    "New" : "Ново",
-    "Text file" : "Текстуална датотека",
-    "New folder" : "Нова папка",
-    "Folder" : "Папка",
-    "Upload" : "Подигни",
     "Cancel upload" : "Откажи прикачување",
     "Delete" : "Избриши",
     "Upload too large" : "Фајлот кој се вчитува е преголем",
diff --git a/apps/files/l10n/mn.js b/apps/files/l10n/mn.js
index d55fa0c2b29..994f002b48c 100644
--- a/apps/files/l10n/mn.js
+++ b/apps/files/l10n/mn.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "files",
     {
     "Files" : "Файлууд",
+    "Upload" : "Байршуулах",
     "A new file or folder has been <strong>created</strong>" : "Файл эсвэл хавтас амжилттай <strong>үүсгэгдлээ</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл эсвэл хавтас амжилттай <strong>солигдлоо</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Файл эсвэл хавтас амжилттай <strong>устгагдлаа</strong>",
@@ -16,7 +17,6 @@ OC.L10N.register(
     "You restored %1$s" : "Та %1$s-ийг сэргээлээ",
     "%2$s restored %1$s" : "%2$s %1$s-ийг сэргээлээ",
     "Save" : "Хадгалах",
-    "Settings" : "Тохиргоо",
-    "Upload" : "Байршуулах"
+    "Settings" : "Тохиргоо"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/mn.json b/apps/files/l10n/mn.json
index d2ff8f5fa4a..f1b58c7e13f 100644
--- a/apps/files/l10n/mn.json
+++ b/apps/files/l10n/mn.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Files" : "Файлууд",
+    "Upload" : "Байршуулах",
     "A new file or folder has been <strong>created</strong>" : "Файл эсвэл хавтас амжилттай <strong>үүсгэгдлээ</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл эсвэл хавтас амжилттай <strong>солигдлоо</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Файл эсвэл хавтас амжилттай <strong>устгагдлаа</strong>",
@@ -14,7 +15,6 @@
     "You restored %1$s" : "Та %1$s-ийг сэргээлээ",
     "%2$s restored %1$s" : "%2$s %1$s-ийг сэргээлээ",
     "Save" : "Хадгалах",
-    "Settings" : "Тохиргоо",
-    "Upload" : "Байршуулах"
+    "Settings" : "Тохиргоо"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/ms_MY.js b/apps/files/l10n/ms_MY.js
index bffc265c0fe..0bbbe400b28 100644
--- a/apps/files/l10n/ms_MY.js
+++ b/apps/files/l10n/ms_MY.js
@@ -18,6 +18,10 @@ OC.L10N.register(
     "Name" : "Nama",
     "Size" : "Saiz",
     "Modified" : "Dimodifikasi",
+    "New" : "Baru",
+    "Upload" : "Muat naik",
+    "Text file" : "Fail teks",
+    "Folder" : "Folder",
     "You created %1$s" : "Anda telah membina %1$s",
     "%2$s created %1$s" : "%2$s membina %1$s",
     "You changed %1$s" : "Anda menukar %1$s",
@@ -26,10 +30,6 @@ OC.L10N.register(
     "max. possible: " : "maksimum:",
     "Save" : "Simpan",
     "Settings" : "Tetapan",
-    "New" : "Baru",
-    "Text file" : "Fail teks",
-    "Folder" : "Folder",
-    "Upload" : "Muat naik",
     "Cancel upload" : "Batal muat naik",
     "Delete" : "Padam",
     "Upload too large" : "Muatnaik terlalu besar",
diff --git a/apps/files/l10n/ms_MY.json b/apps/files/l10n/ms_MY.json
index 30b8777b035..071fab23194 100644
--- a/apps/files/l10n/ms_MY.json
+++ b/apps/files/l10n/ms_MY.json
@@ -16,6 +16,10 @@
     "Name" : "Nama",
     "Size" : "Saiz",
     "Modified" : "Dimodifikasi",
+    "New" : "Baru",
+    "Upload" : "Muat naik",
+    "Text file" : "Fail teks",
+    "Folder" : "Folder",
     "You created %1$s" : "Anda telah membina %1$s",
     "%2$s created %1$s" : "%2$s membina %1$s",
     "You changed %1$s" : "Anda menukar %1$s",
@@ -24,10 +28,6 @@
     "max. possible: " : "maksimum:",
     "Save" : "Simpan",
     "Settings" : "Tetapan",
-    "New" : "Baru",
-    "Text file" : "Fail teks",
-    "Folder" : "Folder",
-    "Upload" : "Muat naik",
     "Cancel upload" : "Batal muat naik",
     "Delete" : "Padam",
     "Upload too large" : "Muatnaik terlalu besar",
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index 2dec11dd26a..6c7653d05e6 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Opplasting avbrutt.",
     "Could not get result from server." : "Fikk ikke resultat fra serveren.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
-    "{new_name} already exists" : "{new_name} finnes allerede",
-    "Could not create file" : "Klarte ikke å opprette fil",
-    "Could not create folder" : "Klarte ikke å opprette mappe",
     "Actions" : "Handlinger",
     "Download" : "Last ned",
     "Select" : "Velg",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Feil ved flytting av fil.",
     "Error moving file" : "Feil ved flytting av fil",
     "Error" : "Feil",
+    "{new_name} already exists" : "{new_name} finnes allerede",
     "Could not rename file" : "Klarte ikke å gi nytt navn til fil",
+    "Could not create file" : "Klarte ikke å opprette fil",
+    "Could not create folder" : "Klarte ikke å opprette mappe",
     "Error deleting file." : "Feil ved sletting av fil.",
     "No entries in this folder match '{filter}'" : "Ingen oppføringer i denne mappen stemmer med '{filter}'",
     "Name" : "Navn",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} og {files}",
     "You don’t have permission to upload or create files here" : "Du har ikke tillatelse til å laste opp eller opprette filer her",
     "_Uploading %n file_::_Uploading %n files_" : ["Laster opp %n fil","Laster opp %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.",
     "File name cannot be empty." : "Filnavn kan ikke være tomt.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagringsplass for {owner} er full, filer kan ikke oppdateres eller synkroniseres lenger!",
@@ -69,6 +70,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
     "Favorited" : "Er favoritt",
     "Favorite" : "Gjør til favoritt",
+    "Upload" : "Last opp",
+    "Text file" : "Tekstfil",
+    "Folder" : "Mappe",
+    "New folder" : "Ny mappe",
     "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av taggene",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mappe ble <strong>opprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe ble <strong>endret</strong>",
@@ -95,12 +100,6 @@ OC.L10N.register(
     "Settings" : "Innstillinger",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny tekstfil",
-    "Text file" : "Tekstfil",
-    "New folder" : "Ny mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Last opp",
     "Cancel upload" : "Avbryt opplasting",
     "No files in here" : "Ingen filer her",
     "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index f5adc80f138..f75d26d6d1d 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Opplasting avbrutt.",
     "Could not get result from server." : "Fikk ikke resultat fra serveren.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
-    "{new_name} already exists" : "{new_name} finnes allerede",
-    "Could not create file" : "Klarte ikke å opprette fil",
-    "Could not create folder" : "Klarte ikke å opprette mappe",
     "Actions" : "Handlinger",
     "Download" : "Last ned",
     "Select" : "Velg",
@@ -47,7 +44,10 @@
     "Error moving file." : "Feil ved flytting av fil.",
     "Error moving file" : "Feil ved flytting av fil",
     "Error" : "Feil",
+    "{new_name} already exists" : "{new_name} finnes allerede",
     "Could not rename file" : "Klarte ikke å gi nytt navn til fil",
+    "Could not create file" : "Klarte ikke å opprette fil",
+    "Could not create folder" : "Klarte ikke å opprette mappe",
     "Error deleting file." : "Feil ved sletting av fil.",
     "No entries in this folder match '{filter}'" : "Ingen oppføringer i denne mappen stemmer med '{filter}'",
     "Name" : "Navn",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} og {files}",
     "You don’t have permission to upload or create files here" : "Du har ikke tillatelse til å laste opp eller opprette filer her",
     "_Uploading %n file_::_Uploading %n files_" : ["Laster opp %n fil","Laster opp %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.",
     "File name cannot be empty." : "Filnavn kan ikke være tomt.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagringsplass for {owner} er full, filer kan ikke oppdateres eller synkroniseres lenger!",
@@ -67,6 +68,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
     "Favorited" : "Er favoritt",
     "Favorite" : "Gjør til favoritt",
+    "Upload" : "Last opp",
+    "Text file" : "Tekstfil",
+    "Folder" : "Mappe",
+    "New folder" : "Ny mappe",
     "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av taggene",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mappe ble <strong>opprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe ble <strong>endret</strong>",
@@ -93,12 +98,6 @@
     "Settings" : "Innstillinger",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny tekstfil",
-    "Text file" : "Tekstfil",
-    "New folder" : "Ny mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Last opp",
     "Cancel upload" : "Avbryt opplasting",
     "No files in here" : "Ingen filer her",
     "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!",
diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js
index 8392da4c2eb..66ce04be361 100644
--- a/apps/files/l10n/nl.js
+++ b/apps/files/l10n/nl.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Uploaden geannuleerd.",
     "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
-    "{new_name} already exists" : "{new_name} bestaat al",
-    "Could not create file" : "Kon bestand niet creëren",
-    "Could not create folder" : "Kon niet creëren map",
     "Actions" : "Acties",
     "Download" : "Downloaden",
     "Select" : "Selecteer",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Fout bij verplaatsen bestand.",
     "Error moving file" : "Fout bij verplaatsen bestand",
     "Error" : "Fout",
+    "{new_name} already exists" : "{new_name} bestaat al",
     "Could not rename file" : "Kon de naam van het bestand niet wijzigen",
+    "Could not create file" : "Kon bestand niet creëren",
+    "Could not create folder" : "Kon niet creëren map",
     "Error deleting file." : "Fout bij verwijderen bestand.",
     "No entries in this folder match '{filter}'" : "Niets in deze map komt overeen met '{filter}'",
     "Name" : "Naam",
@@ -59,6 +59,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} en {files}",
     "You don’t have permission to upload or create files here" : "U hebt geen toestemming om hier te uploaden of bestanden te maken",
     "_Uploading %n file_::_Uploading %n files_" : ["%n bestand aan het uploaden","%n bestanden aan het uploaden"],
+    "New" : "Nieuw",
     "\"{name}\" is an invalid file name." : "\"{name}\" is een ongeldige bestandsnaam.",
     "File name cannot be empty." : "Bestandsnaam kan niet leeg zijn.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Opslagruimte van {owner} zit vol, bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
@@ -70,6 +71,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favoriet",
     "Favorite" : "Favoriet",
+    "Upload" : "Uploaden",
+    "Text file" : "Tekstbestand",
+    "Folder" : "Map",
+    "New folder" : "Nieuwe map",
     "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de tags bij te werken",
     "A new file or folder has been <strong>created</strong>" : "Een nieuw bestand of map is <strong>aangemaakt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Een bestand of map is <strong>gewijzigd</strong>",
@@ -97,12 +102,6 @@ OC.L10N.register(
     "Settings" : "Instellingen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>",
-    "New" : "Nieuw",
-    "New text file" : "Nieuw tekstbestand",
-    "Text file" : "Tekstbestand",
-    "New folder" : "Nieuwe map",
-    "Folder" : "Map",
-    "Upload" : "Uploaden",
     "Cancel upload" : "Upload afbreken",
     "No files in here" : "Hier geen bestanden",
     "Upload some content or sync with your devices!" : "Upload bestanden of synchroniseer met uw apparaten!",
diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json
index 532905c9c4a..5739351a79c 100644
--- a/apps/files/l10n/nl.json
+++ b/apps/files/l10n/nl.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Uploaden geannuleerd.",
     "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
-    "{new_name} already exists" : "{new_name} bestaat al",
-    "Could not create file" : "Kon bestand niet creëren",
-    "Could not create folder" : "Kon niet creëren map",
     "Actions" : "Acties",
     "Download" : "Downloaden",
     "Select" : "Selecteer",
@@ -47,7 +44,10 @@
     "Error moving file." : "Fout bij verplaatsen bestand.",
     "Error moving file" : "Fout bij verplaatsen bestand",
     "Error" : "Fout",
+    "{new_name} already exists" : "{new_name} bestaat al",
     "Could not rename file" : "Kon de naam van het bestand niet wijzigen",
+    "Could not create file" : "Kon bestand niet creëren",
+    "Could not create folder" : "Kon niet creëren map",
     "Error deleting file." : "Fout bij verwijderen bestand.",
     "No entries in this folder match '{filter}'" : "Niets in deze map komt overeen met '{filter}'",
     "Name" : "Naam",
@@ -57,6 +57,7 @@
     "{dirs} and {files}" : "{dirs} en {files}",
     "You don’t have permission to upload or create files here" : "U hebt geen toestemming om hier te uploaden of bestanden te maken",
     "_Uploading %n file_::_Uploading %n files_" : ["%n bestand aan het uploaden","%n bestanden aan het uploaden"],
+    "New" : "Nieuw",
     "\"{name}\" is an invalid file name." : "\"{name}\" is een ongeldige bestandsnaam.",
     "File name cannot be empty." : "Bestandsnaam kan niet leeg zijn.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Opslagruimte van {owner} zit vol, bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
@@ -68,6 +69,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favoriet",
     "Favorite" : "Favoriet",
+    "Upload" : "Uploaden",
+    "Text file" : "Tekstbestand",
+    "Folder" : "Map",
+    "New folder" : "Nieuwe map",
     "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de tags bij te werken",
     "A new file or folder has been <strong>created</strong>" : "Een nieuw bestand of map is <strong>aangemaakt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Een bestand of map is <strong>gewijzigd</strong>",
@@ -95,12 +100,6 @@
     "Settings" : "Instellingen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>",
-    "New" : "Nieuw",
-    "New text file" : "Nieuw tekstbestand",
-    "Text file" : "Tekstbestand",
-    "New folder" : "Nieuwe map",
-    "Folder" : "Map",
-    "Upload" : "Uploaden",
     "Cancel upload" : "Upload afbreken",
     "No files in here" : "Hier geen bestanden",
     "Upload some content or sync with your devices!" : "Upload bestanden of synchroniseer met uw apparaten!",
diff --git a/apps/files/l10n/nn_NO.js b/apps/files/l10n/nn_NO.js
index b7523a465d9..cc993f5ca6d 100644
--- a/apps/files/l10n/nn_NO.js
+++ b/apps/files/l10n/nn_NO.js
@@ -26,12 +26,12 @@ OC.L10N.register(
     "Upload cancelled." : "Opplasting avbroten.",
     "Could not get result from server." : "Klarte ikkje å henta resultat frå tenaren.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
-    "{new_name} already exists" : "{new_name} finst allereie",
     "Actions" : "Handlingar",
     "Download" : "Last ned",
     "Pending" : "Under vegs",
     "Error moving file" : "Feil ved flytting av fil",
     "Error" : "Feil",
+    "{new_name} already exists" : "{new_name} finst allereie",
     "Name" : "Namn",
     "Size" : "Storleik",
     "Modified" : "Endra",
@@ -39,10 +39,15 @@ OC.L10N.register(
     "_%n file_::_%n files_" : ["%n fil","%n filer"],
     "{dirs} and {files}" : "{dirs} og {files}",
     "_Uploading %n file_::_Uploading %n files_" : ["Lastar opp %n fil","Lastar opp %n filer"],
+    "New" : "Ny",
     "File name cannot be empty." : "Filnamnet kan ikkje vera tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringa di er nesten full ({usedSpacePercent} %)",
     "Favorite" : "Favoritt",
+    "Upload" : "Last opp",
+    "Text file" : "Tekst fil",
+    "Folder" : "Mappe",
+    "New folder" : "Ny mappe",
     "A new file or folder has been <strong>created</strong>" : "Ei ny fil eller mappe er <strong>oppretta</strong>",
     "A file or folder has been <strong>changed</strong>" : "Ei fil eller mappe er <strong>endra</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Ei fil eller mappe er <strong>sletta</strong>",
@@ -60,11 +65,6 @@ OC.L10N.register(
     "Save" : "Lagre",
     "Settings" : "Innstillingar",
     "WebDAV" : "WebDAV",
-    "New" : "Ny",
-    "Text file" : "Tekst fil",
-    "New folder" : "Ny mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Last opp",
     "Cancel upload" : "Avbryt opplasting",
     "Delete" : "Slett",
     "Upload too large" : "For stor opplasting",
diff --git a/apps/files/l10n/nn_NO.json b/apps/files/l10n/nn_NO.json
index 05bef4cb9d2..62d1cfb2c50 100644
--- a/apps/files/l10n/nn_NO.json
+++ b/apps/files/l10n/nn_NO.json
@@ -24,12 +24,12 @@
     "Upload cancelled." : "Opplasting avbroten.",
     "Could not get result from server." : "Klarte ikkje å henta resultat frå tenaren.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
-    "{new_name} already exists" : "{new_name} finst allereie",
     "Actions" : "Handlingar",
     "Download" : "Last ned",
     "Pending" : "Under vegs",
     "Error moving file" : "Feil ved flytting av fil",
     "Error" : "Feil",
+    "{new_name} already exists" : "{new_name} finst allereie",
     "Name" : "Namn",
     "Size" : "Storleik",
     "Modified" : "Endra",
@@ -37,10 +37,15 @@
     "_%n file_::_%n files_" : ["%n fil","%n filer"],
     "{dirs} and {files}" : "{dirs} og {files}",
     "_Uploading %n file_::_Uploading %n files_" : ["Lastar opp %n fil","Lastar opp %n filer"],
+    "New" : "Ny",
     "File name cannot be empty." : "Filnamnet kan ikkje vera tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringa di er nesten full ({usedSpacePercent} %)",
     "Favorite" : "Favoritt",
+    "Upload" : "Last opp",
+    "Text file" : "Tekst fil",
+    "Folder" : "Mappe",
+    "New folder" : "Ny mappe",
     "A new file or folder has been <strong>created</strong>" : "Ei ny fil eller mappe er <strong>oppretta</strong>",
     "A file or folder has been <strong>changed</strong>" : "Ei fil eller mappe er <strong>endra</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Ei fil eller mappe er <strong>sletta</strong>",
@@ -58,11 +63,6 @@
     "Save" : "Lagre",
     "Settings" : "Innstillingar",
     "WebDAV" : "WebDAV",
-    "New" : "Ny",
-    "Text file" : "Tekst fil",
-    "New folder" : "Ny mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Last opp",
     "Cancel upload" : "Avbryt opplasting",
     "Delete" : "Slett",
     "Upload too large" : "For stor opplasting",
diff --git a/apps/files/l10n/oc.js b/apps/files/l10n/oc.js
index a362dde52be..75bceacac3b 100644
--- a/apps/files/l10n/oc.js
+++ b/apps/files/l10n/oc.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Mandadís anullat.",
     "Could not get result from server." : "Pòt pas recebre los resultats del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Lo mandadís del fichièr es en cors. Quitar aquesta pagina ara anullarà lo mandadís del fichièr.",
-    "{new_name} already exists" : "{new_name} existís ja",
-    "Could not create file" : "Impossible de crear lo fichièr",
-    "Could not create folder" : "Impossible de crear lo dorsièr",
     "Actions" : "Accions",
     "Download" : "Telecargar",
     "Select" : "Seleccionar",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Error al moment del desplaçament del fichièr.",
     "Error moving file" : "Error al moment del desplaçament del fichièr",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} existís ja",
     "Could not rename file" : "Impossible de renomenar lo fichièr",
+    "Could not create file" : "Impossible de crear lo fichièr",
+    "Could not create folder" : "Impossible de crear lo dorsièr",
     "Error deleting file." : "Error pendent la supression del fichièr.",
     "No entries in this folder match '{filter}'" : "Cap d'entrada d'aqueste dorsièr correspond pas a '{filter}'",
     "Name" : "Nom",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Avètz pas la permission d'apondre de fichièrs aicí",
     "_Uploading %n file_::_Uploading %n files_" : ["Mandadís de %n fichièr","Mandadís de %n fichièrs"],
+    "New" : "Novèl",
     "\"{name}\" is an invalid file name." : "\"{name}\" es pas un nom de fichièr valid.",
     "File name cannot be empty." : "Lo nom de fichièr pòt pas èsser void.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vòstre espaci d'emmagazinatge es plen, los fichièrs pòdon pas mai èsser aponduts o sincronizats !",
@@ -65,6 +66,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["correspond a '{filter}'","correspondon a '{filter}'"],
     "Favorited" : "Marcat coma favorit",
     "Favorite" : "Favorit",
+    "Upload" : "Cargament",
+    "Text file" : "Fichièr tèxte",
+    "Folder" : "Dorsièr",
+    "New folder" : "Novèl dorsièr",
     "An error occurred while trying to update the tags" : "Una error s'es produsida al moment de la mesa a jorn de las etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Un novèl fichièr o repertòri es estat <strong>creat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichièr o un repertòri es estat <strong>modificat</strong>",
@@ -91,12 +96,6 @@ OC.L10N.register(
     "Settings" : "Paramètres",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilizatz aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir a vòstres fichièrs per WebDAV</a>",
-    "New" : "Novèl",
-    "New text file" : "Novèl fichièr tèxte",
-    "Text file" : "Fichièr tèxte",
-    "New folder" : "Novèl dorsièr",
-    "Folder" : "Dorsièr",
-    "Upload" : "Cargament",
     "Cancel upload" : "Anullar lo mandadís",
     "No files in here" : "Pas cap de fichièr aicí",
     "Upload some content or sync with your devices!" : "Depausatz de contengut o sincronizatz vòstres aparelhs !",
diff --git a/apps/files/l10n/oc.json b/apps/files/l10n/oc.json
index 3b89728ce9c..20b690a2ed8 100644
--- a/apps/files/l10n/oc.json
+++ b/apps/files/l10n/oc.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Mandadís anullat.",
     "Could not get result from server." : "Pòt pas recebre los resultats del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Lo mandadís del fichièr es en cors. Quitar aquesta pagina ara anullarà lo mandadís del fichièr.",
-    "{new_name} already exists" : "{new_name} existís ja",
-    "Could not create file" : "Impossible de crear lo fichièr",
-    "Could not create folder" : "Impossible de crear lo dorsièr",
     "Actions" : "Accions",
     "Download" : "Telecargar",
     "Select" : "Seleccionar",
@@ -45,7 +42,10 @@
     "Error moving file." : "Error al moment del desplaçament del fichièr.",
     "Error moving file" : "Error al moment del desplaçament del fichièr",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} existís ja",
     "Could not rename file" : "Impossible de renomenar lo fichièr",
+    "Could not create file" : "Impossible de crear lo fichièr",
+    "Could not create folder" : "Impossible de crear lo dorsièr",
     "Error deleting file." : "Error pendent la supression del fichièr.",
     "No entries in this folder match '{filter}'" : "Cap d'entrada d'aqueste dorsièr correspond pas a '{filter}'",
     "Name" : "Nom",
@@ -56,6 +56,7 @@
     "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Avètz pas la permission d'apondre de fichièrs aicí",
     "_Uploading %n file_::_Uploading %n files_" : ["Mandadís de %n fichièr","Mandadís de %n fichièrs"],
+    "New" : "Novèl",
     "\"{name}\" is an invalid file name." : "\"{name}\" es pas un nom de fichièr valid.",
     "File name cannot be empty." : "Lo nom de fichièr pòt pas èsser void.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vòstre espaci d'emmagazinatge es plen, los fichièrs pòdon pas mai èsser aponduts o sincronizats !",
@@ -63,6 +64,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["correspond a '{filter}'","correspondon a '{filter}'"],
     "Favorited" : "Marcat coma favorit",
     "Favorite" : "Favorit",
+    "Upload" : "Cargament",
+    "Text file" : "Fichièr tèxte",
+    "Folder" : "Dorsièr",
+    "New folder" : "Novèl dorsièr",
     "An error occurred while trying to update the tags" : "Una error s'es produsida al moment de la mesa a jorn de las etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Un novèl fichièr o repertòri es estat <strong>creat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichièr o un repertòri es estat <strong>modificat</strong>",
@@ -89,12 +94,6 @@
     "Settings" : "Paramètres",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilizatz aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir a vòstres fichièrs per WebDAV</a>",
-    "New" : "Novèl",
-    "New text file" : "Novèl fichièr tèxte",
-    "Text file" : "Fichièr tèxte",
-    "New folder" : "Novèl dorsièr",
-    "Folder" : "Dorsièr",
-    "Upload" : "Cargament",
     "Cancel upload" : "Anullar lo mandadís",
     "No files in here" : "Pas cap de fichièr aicí",
     "Upload some content or sync with your devices!" : "Depausatz de contengut o sincronizatz vòstres aparelhs !",
diff --git a/apps/files/l10n/pa.js b/apps/files/l10n/pa.js
index 8f7fafa6e32..c92f4473ccb 100644
--- a/apps/files/l10n/pa.js
+++ b/apps/files/l10n/pa.js
@@ -5,8 +5,8 @@ OC.L10N.register(
     "Files" : "ਫਾਇਲਾਂ",
     "Download" : "ਡਾਊਨਲੋਡ",
     "Error" : "ਗਲਤੀ",
-    "Settings" : "ਸੈਟਿੰਗ",
     "Upload" : "ਅੱਪਲੋਡ",
+    "Settings" : "ਸੈਟਿੰਗ",
     "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ",
     "Delete" : "ਹਟਾਓ"
 },
diff --git a/apps/files/l10n/pa.json b/apps/files/l10n/pa.json
index b14ece73520..438a0cdb313 100644
--- a/apps/files/l10n/pa.json
+++ b/apps/files/l10n/pa.json
@@ -3,8 +3,8 @@
     "Files" : "ਫਾਇਲਾਂ",
     "Download" : "ਡਾਊਨਲੋਡ",
     "Error" : "ਗਲਤੀ",
-    "Settings" : "ਸੈਟਿੰਗ",
     "Upload" : "ਅੱਪਲੋਡ",
+    "Settings" : "ਸੈਟਿੰਗ",
     "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ",
     "Delete" : "ਹਟਾਓ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js
index 28ffe4444e8..c64f9c97d60 100644
--- a/apps/files/l10n/pl.js
+++ b/apps/files/l10n/pl.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Wczytywanie anulowane.",
     "Could not get result from server." : "Nie można uzyskać wyniku z serwera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
-    "{new_name} already exists" : "{new_name} już istnieje",
-    "Could not create file" : "Nie można utworzyć pliku",
-    "Could not create folder" : "Nie można utworzyć folderu",
     "Actions" : "Akcje",
     "Download" : "Pobierz",
     "Select" : "Wybierz",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Błąd podczas przenoszenia pliku.",
     "Error moving file" : "Błąd prz przenoszeniu pliku",
     "Error" : "Błąd",
+    "{new_name} already exists" : "{new_name} już istnieje",
     "Could not rename file" : "Nie można zmienić nazwy pliku",
+    "Could not create file" : "Nie można utworzyć pliku",
+    "Could not create folder" : "Nie można utworzyć folderu",
     "Error deleting file." : "Błąd podczas usuwania pliku",
     "No entries in this folder match '{filter}'" : "Brak wyników pasujących do '{filter}'",
     "Name" : "Nazwa",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Nie masz uprawnień do wczytywania lub tworzenia plików w tym miejscu",
     "_Uploading %n file_::_Uploading %n files_" : ["Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"],
+    "New" : "Nowy",
     "\"{name}\" is an invalid file name." : "\"{name}\" jest nieprawidłową nazwą pliku.",
     "File name cannot be empty." : "Nazwa pliku nie może być pusta.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Brak wolnego miejsca {owner}, pliki nie mogą zostać zaktualizowane lub synchronizowane! ",
@@ -66,6 +67,10 @@ OC.L10N.register(
     "Your storage is almost full ({usedSpacePercent}%)" : "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
     "Favorited" : "Ulubione",
     "Favorite" : "Ulubione",
+    "Upload" : "Wyślij",
+    "Text file" : "Plik tekstowy",
+    "Folder" : "Folder",
+    "New folder" : "Nowy folder",
     "A new file or folder has been <strong>created</strong>" : "Nowy plik lub folder został <strong>utworzony</strong>",
     "A file or folder has been <strong>changed</strong>" : "Plik lub folder został <strong>zmieniony</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Plik lub folder został <strong>usunięty</strong>",
@@ -89,12 +94,6 @@ OC.L10N.register(
     "Settings" : "Ustawienia",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
-    "New" : "Nowy",
-    "New text file" : "Nowy plik tekstowy",
-    "Text file" : "Plik tekstowy",
-    "New folder" : "Nowy folder",
-    "Folder" : "Folder",
-    "Upload" : "Wyślij",
     "Cancel upload" : "Anuluj wysyłanie",
     "No entries found in this folder" : "Brak wpisów w tym folderze",
     "Select all" : "Wybierz wszystko",
diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json
index c2d49274c6b..d5a3c33e698 100644
--- a/apps/files/l10n/pl.json
+++ b/apps/files/l10n/pl.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Wczytywanie anulowane.",
     "Could not get result from server." : "Nie można uzyskać wyniku z serwera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
-    "{new_name} already exists" : "{new_name} już istnieje",
-    "Could not create file" : "Nie można utworzyć pliku",
-    "Could not create folder" : "Nie można utworzyć folderu",
     "Actions" : "Akcje",
     "Download" : "Pobierz",
     "Select" : "Wybierz",
@@ -45,7 +42,10 @@
     "Error moving file." : "Błąd podczas przenoszenia pliku.",
     "Error moving file" : "Błąd prz przenoszeniu pliku",
     "Error" : "Błąd",
+    "{new_name} already exists" : "{new_name} już istnieje",
     "Could not rename file" : "Nie można zmienić nazwy pliku",
+    "Could not create file" : "Nie można utworzyć pliku",
+    "Could not create folder" : "Nie można utworzyć folderu",
     "Error deleting file." : "Błąd podczas usuwania pliku",
     "No entries in this folder match '{filter}'" : "Brak wyników pasujących do '{filter}'",
     "Name" : "Nazwa",
@@ -56,6 +56,7 @@
     "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Nie masz uprawnień do wczytywania lub tworzenia plików w tym miejscu",
     "_Uploading %n file_::_Uploading %n files_" : ["Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"],
+    "New" : "Nowy",
     "\"{name}\" is an invalid file name." : "\"{name}\" jest nieprawidłową nazwą pliku.",
     "File name cannot be empty." : "Nazwa pliku nie może być pusta.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Brak wolnego miejsca {owner}, pliki nie mogą zostać zaktualizowane lub synchronizowane! ",
@@ -64,6 +65,10 @@
     "Your storage is almost full ({usedSpacePercent}%)" : "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
     "Favorited" : "Ulubione",
     "Favorite" : "Ulubione",
+    "Upload" : "Wyślij",
+    "Text file" : "Plik tekstowy",
+    "Folder" : "Folder",
+    "New folder" : "Nowy folder",
     "A new file or folder has been <strong>created</strong>" : "Nowy plik lub folder został <strong>utworzony</strong>",
     "A file or folder has been <strong>changed</strong>" : "Plik lub folder został <strong>zmieniony</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Plik lub folder został <strong>usunięty</strong>",
@@ -87,12 +92,6 @@
     "Settings" : "Ustawienia",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
-    "New" : "Nowy",
-    "New text file" : "Nowy plik tekstowy",
-    "Text file" : "Plik tekstowy",
-    "New folder" : "Nowy folder",
-    "Folder" : "Folder",
-    "Upload" : "Wyślij",
     "Cancel upload" : "Anuluj wysyłanie",
     "No entries found in this folder" : "Brak wpisów w tym folderze",
     "Select all" : "Wybierz wszystko",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index 81378cdef4c..6586d227d66 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Envio cancelado.",
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
-    "{new_name} already exists" : "{new_name} já existe",
-    "Could not create file" : "Não foi possível criar o arquivo",
-    "Could not create folder" : "Não foi possível criar a pasta",
     "Actions" : "Ações",
     "Download" : "Baixar",
     "Select" : "Selecionar",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Erro movendo o arquivo.",
     "Error moving file" : "Erro movendo o arquivo",
     "Error" : "Erro",
+    "{new_name} already exists" : "{new_name} já existe",
     "Could not rename file" : "Não foi possível renomear o arquivo",
+    "Could not create file" : "Não foi possível criar o arquivo",
+    "Could not create folder" : "Não foi possível criar a pasta",
     "Error deleting file." : "Erro eliminando o arquivo.",
     "No entries in this folder match '{filter}'" : "Nenhuma entrada nesta pasta coincide com '{filter}'",
     "Name" : "Nome",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Você não tem permissão para enviar ou criar arquivos aqui",
     "_Uploading %n file_::_Uploading %n files_" : ["Enviando %n arquivo","Enviando %n arquivos"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de arquivo inválido.",
     "File name cannot be empty." : "O nome do arquivo não pode estar vazio.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Armazenamento do {owner} está cheio, os arquivos não podem ser mais atualizados ou sincronizados!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favorito",
     "Favorite" : "Favorito",
+    "Upload" : "Enviar",
+    "Text file" : "Arquivo texto",
+    "Folder" : "Pasta",
+    "New folder" : "Nova pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Um novo arquivo ou pasta foi <strong>criado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Um arquivo ou pasta foi <strong>modificado</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Configurações",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso aos seus Arquivos via WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Novo arquivo texto",
-    "Text file" : "Arquivo texto",
-    "New folder" : "Nova pasta",
-    "Folder" : "Pasta",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar envio",
     "No files in here" : "Nenhum arquivo aqui",
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index 1cdb7969af7..06847e4fa87 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Envio cancelado.",
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
-    "{new_name} already exists" : "{new_name} já existe",
-    "Could not create file" : "Não foi possível criar o arquivo",
-    "Could not create folder" : "Não foi possível criar a pasta",
     "Actions" : "Ações",
     "Download" : "Baixar",
     "Select" : "Selecionar",
@@ -47,7 +44,10 @@
     "Error moving file." : "Erro movendo o arquivo.",
     "Error moving file" : "Erro movendo o arquivo",
     "Error" : "Erro",
+    "{new_name} already exists" : "{new_name} já existe",
     "Could not rename file" : "Não foi possível renomear o arquivo",
+    "Could not create file" : "Não foi possível criar o arquivo",
+    "Could not create folder" : "Não foi possível criar a pasta",
     "Error deleting file." : "Erro eliminando o arquivo.",
     "No entries in this folder match '{filter}'" : "Nenhuma entrada nesta pasta coincide com '{filter}'",
     "Name" : "Nome",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Você não tem permissão para enviar ou criar arquivos aqui",
     "_Uploading %n file_::_Uploading %n files_" : ["Enviando %n arquivo","Enviando %n arquivos"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de arquivo inválido.",
     "File name cannot be empty." : "O nome do arquivo não pode estar vazio.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Armazenamento do {owner} está cheio, os arquivos não podem ser mais atualizados ou sincronizados!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favorito",
     "Favorite" : "Favorito",
+    "Upload" : "Enviar",
+    "Text file" : "Arquivo texto",
+    "Folder" : "Pasta",
+    "New folder" : "Nova pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Um novo arquivo ou pasta foi <strong>criado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Um arquivo ou pasta foi <strong>modificado</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "Configurações",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso aos seus Arquivos via WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Novo arquivo texto",
-    "Text file" : "Arquivo texto",
-    "New folder" : "Nova pasta",
-    "Folder" : "Pasta",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar envio",
     "No files in here" : "Nenhum arquivo aqui",
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!",
diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js
index 07817ecf79d..32f7dee7d43 100644
--- a/apps/files/l10n/pt_PT.js
+++ b/apps/files/l10n/pt_PT.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Envio cancelado.",
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
-    "{new_name} already exists" : "O nome {new_name} já existe",
-    "Could not create file" : "Não pôde criar ficheiro",
-    "Could not create folder" : "Não pôde criar pasta",
     "Actions" : "Ações",
     "Download" : "Descarregar",
     "Select" : "Selecionar",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Erro a mover o ficheiro.",
     "Error moving file" : "Erro ao mover o ficheiro",
     "Error" : "Erro",
+    "{new_name} already exists" : "O nome {new_name} já existe",
     "Could not rename file" : "Não pôde renomear o ficheiro",
+    "Could not create file" : "Não pôde criar ficheiro",
+    "Could not create folder" : "Não pôde criar pasta",
     "Error deleting file." : "Erro ao apagar o ficheiro.",
     "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'",
     "Name" : "Nome",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Você não tem permissão para enviar ou criar ficheiros aqui",
     "_Uploading %n file_::_Uploading %n files_" : ["A carregar %n ficheiro","A carregar %n ficheiros"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de ficheiro inválido.",
     "File name cannot be empty." : "O nome do ficheiro não pode estar em branco.",
     "Your storage is full, files can not be updated or synced anymore!" : "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
@@ -65,6 +66,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
     "Favorited" : "Assinalado como Favorito",
     "Favorite" : "Favorito",
+    "Upload" : "Enviar",
+    "Text file" : "Ficheiro de Texto",
+    "Folder" : "Pasta",
+    "New folder" : "Nova Pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as tags",
     "A new file or folder has been <strong>created</strong>" : "Foi <strong>criado</strong> um novo ficheiro ou pasta",
     "A file or folder has been <strong>changed</strong>" : "Foi <strong>alterado</strong> um ficheiro ou pasta",
@@ -91,12 +96,6 @@ OC.L10N.register(
     "Settings" : "Definições",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Novo ficheiro de texto",
-    "Text file" : "Ficheiro de Texto",
-    "New folder" : "Nova Pasta",
-    "Folder" : "Pasta",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar o envio",
     "No files in here" : "Nenhuns ficheiros aqui",
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!",
diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json
index cca3e42bc72..5c6a8aececa 100644
--- a/apps/files/l10n/pt_PT.json
+++ b/apps/files/l10n/pt_PT.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Envio cancelado.",
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
-    "{new_name} already exists" : "O nome {new_name} já existe",
-    "Could not create file" : "Não pôde criar ficheiro",
-    "Could not create folder" : "Não pôde criar pasta",
     "Actions" : "Ações",
     "Download" : "Descarregar",
     "Select" : "Selecionar",
@@ -45,7 +42,10 @@
     "Error moving file." : "Erro a mover o ficheiro.",
     "Error moving file" : "Erro ao mover o ficheiro",
     "Error" : "Erro",
+    "{new_name} already exists" : "O nome {new_name} já existe",
     "Could not rename file" : "Não pôde renomear o ficheiro",
+    "Could not create file" : "Não pôde criar ficheiro",
+    "Could not create folder" : "Não pôde criar pasta",
     "Error deleting file." : "Erro ao apagar o ficheiro.",
     "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'",
     "Name" : "Nome",
@@ -56,6 +56,7 @@
     "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Você não tem permissão para enviar ou criar ficheiros aqui",
     "_Uploading %n file_::_Uploading %n files_" : ["A carregar %n ficheiro","A carregar %n ficheiros"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de ficheiro inválido.",
     "File name cannot be empty." : "O nome do ficheiro não pode estar em branco.",
     "Your storage is full, files can not be updated or synced anymore!" : "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
@@ -63,6 +64,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
     "Favorited" : "Assinalado como Favorito",
     "Favorite" : "Favorito",
+    "Upload" : "Enviar",
+    "Text file" : "Ficheiro de Texto",
+    "Folder" : "Pasta",
+    "New folder" : "Nova Pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as tags",
     "A new file or folder has been <strong>created</strong>" : "Foi <strong>criado</strong> um novo ficheiro ou pasta",
     "A file or folder has been <strong>changed</strong>" : "Foi <strong>alterado</strong> um ficheiro ou pasta",
@@ -89,12 +94,6 @@
     "Settings" : "Definições",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Novo ficheiro de texto",
-    "Text file" : "Ficheiro de Texto",
-    "New folder" : "Nova Pasta",
-    "Folder" : "Pasta",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar o envio",
     "No files in here" : "Nenhuns ficheiros aqui",
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!",
diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js
index 1d571ea8f67..35753e97da8 100644
--- a/apps/files/l10n/ro.js
+++ b/apps/files/l10n/ro.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Încărcare anulată.",
     "Could not get result from server." : "Nu se poate obține rezultatul de la server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
-    "{new_name} already exists" : "{new_name} există deja",
-    "Could not create file" : "Nu s-a putut crea fisierul",
-    "Could not create folder" : "Nu s-a putut crea folderul",
     "Actions" : "Acțiuni",
     "Download" : "Descarcă",
     "Select" : "Alege",
@@ -46,7 +43,10 @@ OC.L10N.register(
     "Error moving file." : "Eroare la mutarea fișierului.",
     "Error moving file" : "Eroare la mutarea fișierului",
     "Error" : "Eroare",
+    "{new_name} already exists" : "{new_name} există deja",
     "Could not rename file" : "Nu s-a putut redenumi fișierul",
+    "Could not create file" : "Nu s-a putut crea fisierul",
+    "Could not create folder" : "Nu s-a putut crea folderul",
     "Error deleting file." : "Eroare la ștergerea fișierului.",
     "Name" : "Nume",
     "Size" : "Mărime",
@@ -56,11 +56,16 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} și {files}",
     "You don’t have permission to upload or create files here" : "Nu aveți permisiunea de a încărca sau crea fișiere aici",
     "_Uploading %n file_::_Uploading %n files_" : ["Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."],
+    "New" : "Nou",
     "\"{name}\" is an invalid file name." : "\"{name}\" este un nume de fișier nevalid.",
     "File name cannot be empty." : "Numele fișierului nu poate rămâne gol.",
     "Your storage is full, files can not be updated or synced anymore!" : "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Spațiul de stocare este aproape plin ({usedSpacePercent}%)",
     "Favorite" : "Favorit",
+    "Upload" : "Încărcă",
+    "Text file" : "Fișier text",
+    "Folder" : "Dosar",
+    "New folder" : "Un nou dosar",
     "A new file or folder has been <strong>created</strong>" : "Un nou fișier sau dosar a fost <strong>creat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un nou fișier sau dosar a fost <strong>modificat</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un nou fișier sau dosar a fost <strong>șters</strong>",
@@ -84,12 +89,6 @@ OC.L10N.register(
     "Settings" : "Setări",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>",
-    "New" : "Nou",
-    "New text file" : "Un nou fișier text",
-    "Text file" : "Fișier text",
-    "New folder" : "Un nou dosar",
-    "Folder" : "Dosar",
-    "Upload" : "Încărcă",
     "Cancel upload" : "Anulează încărcarea",
     "Select all" : "Selectează tot",
     "Delete" : "Șterge",
diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json
index d0152c340ab..22d66f8dbf0 100644
--- a/apps/files/l10n/ro.json
+++ b/apps/files/l10n/ro.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Încărcare anulată.",
     "Could not get result from server." : "Nu se poate obține rezultatul de la server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
-    "{new_name} already exists" : "{new_name} există deja",
-    "Could not create file" : "Nu s-a putut crea fisierul",
-    "Could not create folder" : "Nu s-a putut crea folderul",
     "Actions" : "Acțiuni",
     "Download" : "Descarcă",
     "Select" : "Alege",
@@ -44,7 +41,10 @@
     "Error moving file." : "Eroare la mutarea fișierului.",
     "Error moving file" : "Eroare la mutarea fișierului",
     "Error" : "Eroare",
+    "{new_name} already exists" : "{new_name} există deja",
     "Could not rename file" : "Nu s-a putut redenumi fișierul",
+    "Could not create file" : "Nu s-a putut crea fisierul",
+    "Could not create folder" : "Nu s-a putut crea folderul",
     "Error deleting file." : "Eroare la ștergerea fișierului.",
     "Name" : "Nume",
     "Size" : "Mărime",
@@ -54,11 +54,16 @@
     "{dirs} and {files}" : "{dirs} și {files}",
     "You don’t have permission to upload or create files here" : "Nu aveți permisiunea de a încărca sau crea fișiere aici",
     "_Uploading %n file_::_Uploading %n files_" : ["Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."],
+    "New" : "Nou",
     "\"{name}\" is an invalid file name." : "\"{name}\" este un nume de fișier nevalid.",
     "File name cannot be empty." : "Numele fișierului nu poate rămâne gol.",
     "Your storage is full, files can not be updated or synced anymore!" : "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Spațiul de stocare este aproape plin ({usedSpacePercent}%)",
     "Favorite" : "Favorit",
+    "Upload" : "Încărcă",
+    "Text file" : "Fișier text",
+    "Folder" : "Dosar",
+    "New folder" : "Un nou dosar",
     "A new file or folder has been <strong>created</strong>" : "Un nou fișier sau dosar a fost <strong>creat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un nou fișier sau dosar a fost <strong>modificat</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un nou fișier sau dosar a fost <strong>șters</strong>",
@@ -82,12 +87,6 @@
     "Settings" : "Setări",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>",
-    "New" : "Nou",
-    "New text file" : "Un nou fișier text",
-    "Text file" : "Fișier text",
-    "New folder" : "Un nou dosar",
-    "Folder" : "Dosar",
-    "Upload" : "Încărcă",
     "Cancel upload" : "Anulează încărcarea",
     "Select all" : "Selectează tot",
     "Delete" : "Șterge",
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index 87116553e40..962698709c3 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Загрузка отменена.",
     "Could not get result from server." : "Не удалось получить ответ от сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
-    "{new_name} already exists" : "{new_name} уже существует",
-    "Could not create file" : "Не удалось создать файл",
-    "Could not create folder" : "Не удалось создать каталог",
     "Actions" : "Действия",
     "Download" : "Скачать",
     "Select" : "Выбрать",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Ошибка при перемещении файла.",
     "Error moving file" : "Ошибка при перемещении файла",
     "Error" : "Ошибка",
+    "{new_name} already exists" : "{new_name} уже существует",
     "Could not rename file" : "Не удалось переименовать файл",
+    "Could not create file" : "Не удалось создать файл",
+    "Could not create folder" : "Не удалось создать каталог",
     "Error deleting file." : "Ошибка при удалении файла.",
     "No entries in this folder match '{filter}'" : "В данном каталоге нет элементов соответствующих '{filter}'",
     "Name" : "Имя",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "У вас нет прав для загрузки или создания файлов здесь.",
     "_Uploading %n file_::_Uploading %n files_" : ["Закачка %n файла","Закачка %n файлов","Закачка %n файлов","Закачка %n файлов"],
+    "New" : "Новый",
     "\"{name}\" is an invalid file name." : "\"{name}\" это неправильное имя файла.",
     "File name cannot be empty." : "Имя файла не может быть пустым.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Хранилище {owner} переполнено, файлы больше не могут быть обновлены или синхронизированы!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"],
     "Favorited" : "Избранное",
     "Favorite" : "Избранное",
+    "Upload" : "Загрузить",
+    "Text file" : "Текстовый файл",
+    "Folder" : "Каталог",
+    "New folder" : "Новый каталог",
     "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка",
     "A new file or folder has been <strong>created</strong>" : "<strong>Создан</strong> новый файл или каталог",
     "A file or folder has been <strong>changed</strong>" : "<strong>Изменён</strong> файл или каталог",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Настройки",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Используйте этот адрес для <a href=\"%s\" target=\"_blank\">доступа файлам через WebDAV</a>",
-    "New" : "Новый",
-    "New text file" : "Новый текстовый файл",
-    "Text file" : "Текстовый файл",
-    "New folder" : "Новый каталог",
-    "Folder" : "Каталог",
-    "Upload" : "Загрузить",
     "Cancel upload" : "Отменить загрузку",
     "No files in here" : "Здесь нет файлов",
     "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index 8880ec6f5aa..410ef1d9cbe 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Загрузка отменена.",
     "Could not get result from server." : "Не удалось получить ответ от сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
-    "{new_name} already exists" : "{new_name} уже существует",
-    "Could not create file" : "Не удалось создать файл",
-    "Could not create folder" : "Не удалось создать каталог",
     "Actions" : "Действия",
     "Download" : "Скачать",
     "Select" : "Выбрать",
@@ -47,7 +44,10 @@
     "Error moving file." : "Ошибка при перемещении файла.",
     "Error moving file" : "Ошибка при перемещении файла",
     "Error" : "Ошибка",
+    "{new_name} already exists" : "{new_name} уже существует",
     "Could not rename file" : "Не удалось переименовать файл",
+    "Could not create file" : "Не удалось создать файл",
+    "Could not create folder" : "Не удалось создать каталог",
     "Error deleting file." : "Ошибка при удалении файла.",
     "No entries in this folder match '{filter}'" : "В данном каталоге нет элементов соответствующих '{filter}'",
     "Name" : "Имя",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "У вас нет прав для загрузки или создания файлов здесь.",
     "_Uploading %n file_::_Uploading %n files_" : ["Закачка %n файла","Закачка %n файлов","Закачка %n файлов","Закачка %n файлов"],
+    "New" : "Новый",
     "\"{name}\" is an invalid file name." : "\"{name}\" это неправильное имя файла.",
     "File name cannot be empty." : "Имя файла не может быть пустым.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Хранилище {owner} переполнено, файлы больше не могут быть обновлены или синхронизированы!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"],
     "Favorited" : "Избранное",
     "Favorite" : "Избранное",
+    "Upload" : "Загрузить",
+    "Text file" : "Текстовый файл",
+    "Folder" : "Каталог",
+    "New folder" : "Новый каталог",
     "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка",
     "A new file or folder has been <strong>created</strong>" : "<strong>Создан</strong> новый файл или каталог",
     "A file or folder has been <strong>changed</strong>" : "<strong>Изменён</strong> файл или каталог",
@@ -96,12 +101,6 @@
     "Settings" : "Настройки",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Используйте этот адрес для <a href=\"%s\" target=\"_blank\">доступа файлам через WebDAV</a>",
-    "New" : "Новый",
-    "New text file" : "Новый текстовый файл",
-    "Text file" : "Текстовый файл",
-    "New folder" : "Новый каталог",
-    "Folder" : "Каталог",
-    "Upload" : "Загрузить",
     "Cancel upload" : "Отменить загрузку",
     "No files in here" : "Здесь нет файлов",
     "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!",
diff --git a/apps/files/l10n/si_LK.js b/apps/files/l10n/si_LK.js
index 5c43bdd9be7..ea63cda82dc 100644
--- a/apps/files/l10n/si_LK.js
+++ b/apps/files/l10n/si_LK.js
@@ -19,6 +19,10 @@ OC.L10N.register(
     "Name" : "නම",
     "Size" : "ප්‍රමාණය",
     "Modified" : "වෙනස් කළ",
+    "New" : "නව",
+    "Upload" : "උඩුගත කරන්න",
+    "Text file" : "පෙළ ගොනුව",
+    "Folder" : "ෆෝල්ඩරය",
     "A new file or folder has been <strong>created</strong>" : "නව ගොනුවක් හෝ බහාලුමක් <strong> නිර්මාණය කර ඇත</ strong> ",
     "A file or folder has been <strong>changed</strong>" : "ගොනුවක් හෝ ෆෝල්ඩරයක් <strong>වෙනස්</strong> වී ඇත",
     "A file or folder has been <strong>deleted</strong>" : "ගොනුවක් හෝ ෆෝල්ඩරයක් <strong>මකා දමා</strong> ඇත",
@@ -28,10 +32,6 @@ OC.L10N.register(
     "max. possible: " : "හැකි උපරිමය:",
     "Save" : "සුරකින්න",
     "Settings" : "සිටුවම්",
-    "New" : "නව",
-    "Text file" : "පෙළ ගොනුව",
-    "Folder" : "ෆෝල්ඩරය",
-    "Upload" : "උඩුගත කරන්න",
     "Cancel upload" : "උඩුගත කිරීම අත් හරින්න",
     "Delete" : "මකා දමන්න",
     "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය",
diff --git a/apps/files/l10n/si_LK.json b/apps/files/l10n/si_LK.json
index 6fbac44938e..6cfbe30ff4a 100644
--- a/apps/files/l10n/si_LK.json
+++ b/apps/files/l10n/si_LK.json
@@ -17,6 +17,10 @@
     "Name" : "නම",
     "Size" : "ප්‍රමාණය",
     "Modified" : "වෙනස් කළ",
+    "New" : "නව",
+    "Upload" : "උඩුගත කරන්න",
+    "Text file" : "පෙළ ගොනුව",
+    "Folder" : "ෆෝල්ඩරය",
     "A new file or folder has been <strong>created</strong>" : "නව ගොනුවක් හෝ බහාලුමක් <strong> නිර්මාණය කර ඇත</ strong> ",
     "A file or folder has been <strong>changed</strong>" : "ගොනුවක් හෝ ෆෝල්ඩරයක් <strong>වෙනස්</strong> වී ඇත",
     "A file or folder has been <strong>deleted</strong>" : "ගොනුවක් හෝ ෆෝල්ඩරයක් <strong>මකා දමා</strong> ඇත",
@@ -26,10 +30,6 @@
     "max. possible: " : "හැකි උපරිමය:",
     "Save" : "සුරකින්න",
     "Settings" : "සිටුවම්",
-    "New" : "නව",
-    "Text file" : "පෙළ ගොනුව",
-    "Folder" : "ෆෝල්ඩරය",
-    "Upload" : "උඩුගත කරන්න",
     "Cancel upload" : "උඩුගත කිරීම අත් හරින්න",
     "Delete" : "මකා දමන්න",
     "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය",
diff --git a/apps/files/l10n/sk_SK.js b/apps/files/l10n/sk_SK.js
index ebb328e5a41..ebe1973a9ed 100644
--- a/apps/files/l10n/sk_SK.js
+++ b/apps/files/l10n/sk_SK.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Odosielanie je zrušené.",
     "Could not get result from server." : "Nepodarilo sa dostať výsledky zo servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
-    "{new_name} already exists" : "{new_name} už existuje",
-    "Could not create file" : "Nemožno vytvoriť súbor",
-    "Could not create folder" : "Nemožno vytvoriť priečinok",
     "Actions" : "Akcie",
     "Download" : "Sťahovanie",
     "Select" : "Vybrať",
@@ -48,7 +45,10 @@ OC.L10N.register(
     "Error moving file." : "Chyba pri presune súboru.",
     "Error moving file" : "Chyba pri presúvaní súboru",
     "Error" : "Chyba",
+    "{new_name} already exists" : "{new_name} už existuje",
     "Could not rename file" : "Nemožno premenovať súbor",
+    "Could not create file" : "Nemožno vytvoriť súbor",
+    "Could not create folder" : "Nemožno vytvoriť priečinok",
     "Error deleting file." : "Chyba pri mazaní súboru.",
     "No entries in this folder match '{filter}'" : "V tomto priečinku nič nezodpovedá '{filter}'",
     "Name" : "Názov",
@@ -59,6 +59,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} a {files}",
     "You don’t have permission to upload or create files here" : "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory",
     "_Uploading %n file_::_Uploading %n files_" : ["Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"],
+    "New" : "Nový",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatné meno súboru.",
     "File name cannot be empty." : "Meno súboru nemôže byť prázdne",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
@@ -66,6 +67,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["zodpovedá '{filter}'","zodpovedá '{filter}'","zodpovedá '{filter}'"],
     "Favorited" : "Pridané k obľúbeným",
     "Favorite" : "Obľúbené",
+    "Upload" : "Nahrať",
+    "Text file" : "Textový súbor",
+    "Folder" : "Priečinok",
+    "New folder" : "Nový priečinok",
     "An error occurred while trying to update the tags" : "Pri pokuse o aktualizáciu štítkov došlo k chybe",
     "A new file or folder has been <strong>created</strong>" : "Nový súbor alebo priečinok bol <strong>vytvorený</strong>",
     "A file or folder has been <strong>changed</strong>" : "Súbor alebo priečinok bol <strong>zmenený</strong>",
@@ -90,12 +95,6 @@ OC.L10N.register(
     "Settings" : "Nastavenia",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>",
-    "New" : "Nový",
-    "New text file" : "Nový textový súbor",
-    "Text file" : "Textový súbor",
-    "New folder" : "Nový priečinok",
-    "Folder" : "Priečinok",
-    "Upload" : "Nahrať",
     "Cancel upload" : "Zrušiť nahrávanie",
     "No files in here" : "Nie sú tu žiadne súbory",
     "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!",
diff --git a/apps/files/l10n/sk_SK.json b/apps/files/l10n/sk_SK.json
index 0595e921535..ccd7a045699 100644
--- a/apps/files/l10n/sk_SK.json
+++ b/apps/files/l10n/sk_SK.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Odosielanie je zrušené.",
     "Could not get result from server." : "Nepodarilo sa dostať výsledky zo servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
-    "{new_name} already exists" : "{new_name} už existuje",
-    "Could not create file" : "Nemožno vytvoriť súbor",
-    "Could not create folder" : "Nemožno vytvoriť priečinok",
     "Actions" : "Akcie",
     "Download" : "Sťahovanie",
     "Select" : "Vybrať",
@@ -46,7 +43,10 @@
     "Error moving file." : "Chyba pri presune súboru.",
     "Error moving file" : "Chyba pri presúvaní súboru",
     "Error" : "Chyba",
+    "{new_name} already exists" : "{new_name} už existuje",
     "Could not rename file" : "Nemožno premenovať súbor",
+    "Could not create file" : "Nemožno vytvoriť súbor",
+    "Could not create folder" : "Nemožno vytvoriť priečinok",
     "Error deleting file." : "Chyba pri mazaní súboru.",
     "No entries in this folder match '{filter}'" : "V tomto priečinku nič nezodpovedá '{filter}'",
     "Name" : "Názov",
@@ -57,6 +57,7 @@
     "{dirs} and {files}" : "{dirs} a {files}",
     "You don’t have permission to upload or create files here" : "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory",
     "_Uploading %n file_::_Uploading %n files_" : ["Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"],
+    "New" : "Nový",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatné meno súboru.",
     "File name cannot be empty." : "Meno súboru nemôže byť prázdne",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
@@ -64,6 +65,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["zodpovedá '{filter}'","zodpovedá '{filter}'","zodpovedá '{filter}'"],
     "Favorited" : "Pridané k obľúbeným",
     "Favorite" : "Obľúbené",
+    "Upload" : "Nahrať",
+    "Text file" : "Textový súbor",
+    "Folder" : "Priečinok",
+    "New folder" : "Nový priečinok",
     "An error occurred while trying to update the tags" : "Pri pokuse o aktualizáciu štítkov došlo k chybe",
     "A new file or folder has been <strong>created</strong>" : "Nový súbor alebo priečinok bol <strong>vytvorený</strong>",
     "A file or folder has been <strong>changed</strong>" : "Súbor alebo priečinok bol <strong>zmenený</strong>",
@@ -88,12 +93,6 @@
     "Settings" : "Nastavenia",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>",
-    "New" : "Nový",
-    "New text file" : "Nový textový súbor",
-    "Text file" : "Textový súbor",
-    "New folder" : "Nový priečinok",
-    "Folder" : "Priečinok",
-    "Upload" : "Nahrať",
     "Cancel upload" : "Zrušiť nahrávanie",
     "No files in here" : "Nie sú tu žiadne súbory",
     "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!",
diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js
index 17cbdb1470c..2d296468d69 100644
--- a/apps/files/l10n/sl.js
+++ b/apps/files/l10n/sl.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Pošiljanje je preklicano.",
     "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
-    "{new_name} already exists" : "{new_name} že obstaja",
-    "Could not create file" : "Ni mogoče ustvariti datoteke",
-    "Could not create folder" : "Ni mogoče ustvariti mape",
     "Actions" : "Dejanja",
     "Download" : "Prejmi",
     "Select" : "Izberi",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Napaka premikanja datoteke.",
     "Error moving file" : "Napaka premikanja datoteke",
     "Error" : "Napaka",
+    "{new_name} already exists" : "{new_name} že obstaja",
     "Could not rename file" : "Ni mogoče preimenovati datoteke",
+    "Could not create file" : "Ni mogoče ustvariti datoteke",
+    "Could not create folder" : "Ni mogoče ustvariti mape",
     "Error deleting file." : "Napaka brisanja datoteke.",
     "No entries in this folder match '{filter}'" : "Ni zadetkov, ki bi bili skladni z nizom '{filter}'",
     "Name" : "Ime",
@@ -58,6 +58,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} in {files}",
     "You don’t have permission to upload or create files here" : "Ni ustreznih dovoljenj za pošiljanje ali ustvarjanje datotek na tem mestu.",
     "_Uploading %n file_::_Uploading %n files_" : ["Posodabljanje %n datoteke","Posodabljanje %n datotek","Posodabljanje %n datotek","Posodabljanje %n datotek"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neveljavno ime datoteke.",
     "File name cannot be empty." : "Ime datoteke ne sme biti prazno polje.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Shramba uporabnika {owner} je polna, zato datotek ni več mogoče posodabljati in usklajevati!",
@@ -67,6 +68,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["se sklada s filtrom '{filter}'","se skladata s filtrom '{filter}'","se skladajo s filtrom '{filter}'","se skladajo s filtrom '{filter}'"],
     "Favorited" : "Označeno kot priljubljeno",
     "Favorite" : "Priljubljene",
+    "Upload" : "Pošlji",
+    "Text file" : "Besedilna datoteka",
+    "Folder" : "Mapa",
+    "New folder" : "Nova mapa",
     "An error occurred while trying to update the tags" : "Prišlo je do napake med posodabljanjem oznak",
     "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je <strong>ustvarjena</strong>",
     "A file or folder has been <strong>changed</strong>" : "Datoteka ali mapa je <strong>spremenjena</strong>.",
@@ -93,12 +98,6 @@ OC.L10N.register(
     "Settings" : "Nastavitve",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek peko sistema WebDAV</a>.",
-    "New" : "Novo",
-    "New text file" : "Nova besedilna datoteka",
-    "Text file" : "Besedilna datoteka",
-    "New folder" : "Nova mapa",
-    "Folder" : "Mapa",
-    "Upload" : "Pošlji",
     "Cancel upload" : "Prekliči pošiljanje",
     "No files in here" : "V mapi ni datotek",
     "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!",
diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json
index 0e123f4e715..0cb69f5f7a1 100644
--- a/apps/files/l10n/sl.json
+++ b/apps/files/l10n/sl.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Pošiljanje je preklicano.",
     "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
-    "{new_name} already exists" : "{new_name} že obstaja",
-    "Could not create file" : "Ni mogoče ustvariti datoteke",
-    "Could not create folder" : "Ni mogoče ustvariti mape",
     "Actions" : "Dejanja",
     "Download" : "Prejmi",
     "Select" : "Izberi",
@@ -45,7 +42,10 @@
     "Error moving file." : "Napaka premikanja datoteke.",
     "Error moving file" : "Napaka premikanja datoteke",
     "Error" : "Napaka",
+    "{new_name} already exists" : "{new_name} že obstaja",
     "Could not rename file" : "Ni mogoče preimenovati datoteke",
+    "Could not create file" : "Ni mogoče ustvariti datoteke",
+    "Could not create folder" : "Ni mogoče ustvariti mape",
     "Error deleting file." : "Napaka brisanja datoteke.",
     "No entries in this folder match '{filter}'" : "Ni zadetkov, ki bi bili skladni z nizom '{filter}'",
     "Name" : "Ime",
@@ -56,6 +56,7 @@
     "{dirs} and {files}" : "{dirs} in {files}",
     "You don’t have permission to upload or create files here" : "Ni ustreznih dovoljenj za pošiljanje ali ustvarjanje datotek na tem mestu.",
     "_Uploading %n file_::_Uploading %n files_" : ["Posodabljanje %n datoteke","Posodabljanje %n datotek","Posodabljanje %n datotek","Posodabljanje %n datotek"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neveljavno ime datoteke.",
     "File name cannot be empty." : "Ime datoteke ne sme biti prazno polje.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Shramba uporabnika {owner} je polna, zato datotek ni več mogoče posodabljati in usklajevati!",
@@ -65,6 +66,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["se sklada s filtrom '{filter}'","se skladata s filtrom '{filter}'","se skladajo s filtrom '{filter}'","se skladajo s filtrom '{filter}'"],
     "Favorited" : "Označeno kot priljubljeno",
     "Favorite" : "Priljubljene",
+    "Upload" : "Pošlji",
+    "Text file" : "Besedilna datoteka",
+    "Folder" : "Mapa",
+    "New folder" : "Nova mapa",
     "An error occurred while trying to update the tags" : "Prišlo je do napake med posodabljanjem oznak",
     "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je <strong>ustvarjena</strong>",
     "A file or folder has been <strong>changed</strong>" : "Datoteka ali mapa je <strong>spremenjena</strong>.",
@@ -91,12 +96,6 @@
     "Settings" : "Nastavitve",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek peko sistema WebDAV</a>.",
-    "New" : "Novo",
-    "New text file" : "Nova besedilna datoteka",
-    "Text file" : "Besedilna datoteka",
-    "New folder" : "Nova mapa",
-    "Folder" : "Mapa",
-    "Upload" : "Pošlji",
     "Cancel upload" : "Prekliči pošiljanje",
     "No files in here" : "V mapi ni datotek",
     "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!",
diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js
index c76819b7b8f..2b87c39d968 100644
--- a/apps/files/l10n/sq.js
+++ b/apps/files/l10n/sq.js
@@ -35,15 +35,15 @@ OC.L10N.register(
     "Upload cancelled." : "Ngarkimi u anullua",
     "Could not get result from server." : "Nuk mund të merret ndonjë rezultat nga serveri.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
-    "{new_name} already exists" : "{new_name} është ekzistues ",
-    "Could not create file" : "Skedari nuk mund të krijohet",
-    "Could not create folder" : "I pamundur krijimi i kartelës",
     "Download" : "Shkarko",
     "Pending" : "Në vijim",
     "Error moving file." : "Gabim në lëvizjen e skedarëve.",
     "Error moving file" : "Gabim lëvizjen dokumentave",
     "Error" : "Gabim",
+    "{new_name} already exists" : "{new_name} është ekzistues ",
     "Could not rename file" : "Riemërtimi i skedarit nuk është i mundur",
+    "Could not create file" : "Skedari nuk mund të krijohet",
+    "Could not create folder" : "I pamundur krijimi i kartelës",
     "Error deleting file." : "Gabim gjatë fshirjes së skedarit.",
     "Name" : "Emri",
     "Size" : "Madhësia",
@@ -53,10 +53,15 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} dhe {files}",
     "You don’t have permission to upload or create files here" : "Ju nuk keni të drejta për të ngarkuar apo krijuar skedarë këtu",
     "_Uploading %n file_::_Uploading %n files_" : ["Po ngarkoj %n skedar","Po ngarkoj %n skedarë"],
+    "New" : "E re",
     "\"{name}\" is an invalid file name." : "\"{name}\" është emër i pavlefshëm.",
     "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.",
     "Your storage is full, files can not be updated or synced anymore!" : "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Hapsira juaj e arkivimit është pothuajse në fund  ({usedSpacePercent}%)",
+    "Upload" : "Ngarko",
+    "Text file" : "Skedar tekst",
+    "Folder" : "Dosje",
+    "New folder" : "Dosje e're",
     "A new file or folder has been <strong>created</strong>" : "Një skedar ose një dosje e re është <strong>krijuar</strong>",
     "A file or folder has been <strong>changed</strong>" : "Një skedar ose një dosje ka <strong>ndryshuar</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Një skedar ose një dosje është <strong>fshirë</strong>",
@@ -80,12 +85,6 @@ OC.L10N.register(
     "Settings" : "Konfigurime",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\">qasje në skedarët tuaj me anë të WebDAV</a>",
-    "New" : "E re",
-    "New text file" : "Skedar i ri tekst",
-    "Text file" : "Skedar tekst",
-    "New folder" : "Dosje e're",
-    "Folder" : "Dosje",
-    "Upload" : "Ngarko",
     "Cancel upload" : "Anullo ngarkimin",
     "Delete" : "Fshi",
     "Upload too large" : "Ngarkimi shumë i madh",
diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json
index 619aaa79a56..1e755ee80f6 100644
--- a/apps/files/l10n/sq.json
+++ b/apps/files/l10n/sq.json
@@ -33,15 +33,15 @@
     "Upload cancelled." : "Ngarkimi u anullua",
     "Could not get result from server." : "Nuk mund të merret ndonjë rezultat nga serveri.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
-    "{new_name} already exists" : "{new_name} është ekzistues ",
-    "Could not create file" : "Skedari nuk mund të krijohet",
-    "Could not create folder" : "I pamundur krijimi i kartelës",
     "Download" : "Shkarko",
     "Pending" : "Në vijim",
     "Error moving file." : "Gabim në lëvizjen e skedarëve.",
     "Error moving file" : "Gabim lëvizjen dokumentave",
     "Error" : "Gabim",
+    "{new_name} already exists" : "{new_name} është ekzistues ",
     "Could not rename file" : "Riemërtimi i skedarit nuk është i mundur",
+    "Could not create file" : "Skedari nuk mund të krijohet",
+    "Could not create folder" : "I pamundur krijimi i kartelës",
     "Error deleting file." : "Gabim gjatë fshirjes së skedarit.",
     "Name" : "Emri",
     "Size" : "Madhësia",
@@ -51,10 +51,15 @@
     "{dirs} and {files}" : "{dirs} dhe {files}",
     "You don’t have permission to upload or create files here" : "Ju nuk keni të drejta për të ngarkuar apo krijuar skedarë këtu",
     "_Uploading %n file_::_Uploading %n files_" : ["Po ngarkoj %n skedar","Po ngarkoj %n skedarë"],
+    "New" : "E re",
     "\"{name}\" is an invalid file name." : "\"{name}\" është emër i pavlefshëm.",
     "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.",
     "Your storage is full, files can not be updated or synced anymore!" : "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Hapsira juaj e arkivimit është pothuajse në fund  ({usedSpacePercent}%)",
+    "Upload" : "Ngarko",
+    "Text file" : "Skedar tekst",
+    "Folder" : "Dosje",
+    "New folder" : "Dosje e're",
     "A new file or folder has been <strong>created</strong>" : "Një skedar ose një dosje e re është <strong>krijuar</strong>",
     "A file or folder has been <strong>changed</strong>" : "Një skedar ose një dosje ka <strong>ndryshuar</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Një skedar ose një dosje është <strong>fshirë</strong>",
@@ -78,12 +83,6 @@
     "Settings" : "Konfigurime",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\">qasje në skedarët tuaj me anë të WebDAV</a>",
-    "New" : "E re",
-    "New text file" : "Skedar i ri tekst",
-    "Text file" : "Skedar tekst",
-    "New folder" : "Dosje e're",
-    "Folder" : "Dosje",
-    "Upload" : "Ngarko",
     "Cancel upload" : "Anullo ngarkimin",
     "Delete" : "Fshi",
     "Upload too large" : "Ngarkimi shumë i madh",
diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js
index 2a6df1f9cd2..597389e15da 100644
--- a/apps/files/l10n/sr.js
+++ b/apps/files/l10n/sr.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Отпремање је отказано.",
     "Could not get result from server." : "Не могу да добијем резултат са сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање фајла је у току. Ако сада напустите страницу, отказаћете отпремање.",
-    "{new_name} already exists" : "{new_name} већ постоји",
-    "Could not create file" : "Не могу да створим фајл",
-    "Could not create folder" : "Не могу да створим фасциклу",
     "Actions" : "Радње",
     "Download" : "Преузми",
     "Select" : "Изабери",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Грешка при премештању фајла.",
     "Error moving file" : "Грешка при премештању фајла",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} већ постоји",
     "Could not rename file" : "Не могу да преименујем фајл",
+    "Could not create file" : "Не могу да створим фајл",
+    "Could not create folder" : "Не могу да створим фасциклу",
     "Error deleting file." : "Грешка при брисању фајла.",
     "No entries in this folder match '{filter}'" : "У овој фасцикли ништа се не поклапа са '{filter}'",
     "Name" : "Назив",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "Немате дозволе да овде отпремате или стварате фајлове",
     "_Uploading %n file_::_Uploading %n files_" : ["Отпремам %n фајл","Отпремам %n фајла","Отпремам %n фајлова"],
+    "New" : "Ново",
     "\"{name}\" is an invalid file name." : "\"{name}\" није исправан назив фајла.",
     "File name cannot be empty." : "Назив фајла не може бити празан.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Складиште корисника {owner} је пуно. Фајлови се не могу ажурирати нити синхронизовати!",
@@ -69,6 +70,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["се поклапа са '{filter}'","се поклапају са '{filter}'","се поклапа са '{filter}'"],
     "Favorited" : "Омиљено",
     "Favorite" : "Омиљени",
+    "Upload" : "Отпреми",
+    "Text file" : "текстуални фајл",
+    "Folder" : "фасцикла",
+    "New folder" : "Нова фасцикла",
     "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака",
     "A new file or folder has been <strong>created</strong>" : "Нови фајл или фасцикла су <strong>направљени</strong>",
     "A file or folder has been <strong>changed</strong>" : "Фајл или фасцикла су <strong>измењени</strong>",
@@ -95,12 +100,6 @@ OC.L10N.register(
     "Settings" : "Поставке",
     "WebDAV" : "ВебДАВ",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Користите ову адресу да <a href=\"%s\" target=\"_blank\"> приступите фајловима преко ВебДАВ-а</a>",
-    "New" : "Ново",
-    "New text file" : "Нов текстуални фајл",
-    "Text file" : "текстуални фајл",
-    "New folder" : "Нова фасцикла",
-    "Folder" : "фасцикла",
-    "Upload" : "Отпреми",
     "Cancel upload" : "Откажи отпремање",
     "No files in here" : "Овде нема фајлова",
     "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!",
diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json
index 09aabbb72e7..ec2fcc101e6 100644
--- a/apps/files/l10n/sr.json
+++ b/apps/files/l10n/sr.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Отпремање је отказано.",
     "Could not get result from server." : "Не могу да добијем резултат са сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање фајла је у току. Ако сада напустите страницу, отказаћете отпремање.",
-    "{new_name} already exists" : "{new_name} већ постоји",
-    "Could not create file" : "Не могу да створим фајл",
-    "Could not create folder" : "Не могу да створим фасциклу",
     "Actions" : "Радње",
     "Download" : "Преузми",
     "Select" : "Изабери",
@@ -47,7 +44,10 @@
     "Error moving file." : "Грешка при премештању фајла.",
     "Error moving file" : "Грешка при премештању фајла",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} већ постоји",
     "Could not rename file" : "Не могу да преименујем фајл",
+    "Could not create file" : "Не могу да створим фајл",
+    "Could not create folder" : "Не могу да створим фасциклу",
     "Error deleting file." : "Грешка при брисању фајла.",
     "No entries in this folder match '{filter}'" : "У овој фасцикли ништа се не поклапа са '{filter}'",
     "Name" : "Назив",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "Немате дозволе да овде отпремате или стварате фајлове",
     "_Uploading %n file_::_Uploading %n files_" : ["Отпремам %n фајл","Отпремам %n фајла","Отпремам %n фајлова"],
+    "New" : "Ново",
     "\"{name}\" is an invalid file name." : "\"{name}\" није исправан назив фајла.",
     "File name cannot be empty." : "Назив фајла не може бити празан.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Складиште корисника {owner} је пуно. Фајлови се не могу ажурирати нити синхронизовати!",
@@ -67,6 +68,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["се поклапа са '{filter}'","се поклапају са '{filter}'","се поклапа са '{filter}'"],
     "Favorited" : "Омиљено",
     "Favorite" : "Омиљени",
+    "Upload" : "Отпреми",
+    "Text file" : "текстуални фајл",
+    "Folder" : "фасцикла",
+    "New folder" : "Нова фасцикла",
     "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака",
     "A new file or folder has been <strong>created</strong>" : "Нови фајл или фасцикла су <strong>направљени</strong>",
     "A file or folder has been <strong>changed</strong>" : "Фајл или фасцикла су <strong>измењени</strong>",
@@ -93,12 +98,6 @@
     "Settings" : "Поставке",
     "WebDAV" : "ВебДАВ",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Користите ову адресу да <a href=\"%s\" target=\"_blank\"> приступите фајловима преко ВебДАВ-а</a>",
-    "New" : "Ново",
-    "New text file" : "Нов текстуални фајл",
-    "Text file" : "текстуални фајл",
-    "New folder" : "Нова фасцикла",
-    "Folder" : "фасцикла",
-    "Upload" : "Отпреми",
     "Cancel upload" : "Откажи отпремање",
     "No files in here" : "Овде нема фајлова",
     "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!",
diff --git a/apps/files/l10n/sr@latin.js b/apps/files/l10n/sr@latin.js
index 28e317ff9be..b00575619e9 100644
--- a/apps/files/l10n/sr@latin.js
+++ b/apps/files/l10n/sr@latin.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Otpremanje je otkazano.",
     "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Ne mogu da stvorim fajl",
-    "Could not create folder" : "Ne mogu da stvorim fasciklu",
     "Download" : "Preuzmi",
     "Select" : "Izaberi",
     "Pending" : "Na čekanju",
@@ -46,7 +43,10 @@ OC.L10N.register(
     "Error moving file." : "Greška pri premeštanju fajla.",
     "Error moving file" : "Greška pri premeštanju fajla",
     "Error" : "Greška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Ne mogu da preimenujem fajl",
+    "Could not create file" : "Ne mogu da stvorim fajl",
+    "Could not create folder" : "Ne mogu da stvorim fasciklu",
     "Error deleting file." : "Greška pri brisanju fajla.",
     "No entries in this folder match '{filter}'" : "U ovoj fascikli ništa se ne poklapa sa '{filter}'",
     "Name" : "Naziv",
@@ -57,6 +57,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Nemate dozvole da ovde otpremate ili stvarate fajlove",
     "_Uploading %n file_::_Uploading %n files_" : ["Otpremam %n fajl","Otpremam %n fajla","Otpremam %n fajlova"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" nije ispravan naziv fajla.",
     "File name cannot be empty." : "Naziv fajla ne može biti prazan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše skladište je puno. Fajlovi više ne mogu biti ažurirani ni sinhronizovani!",
@@ -64,6 +65,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["se poklapa sa '{filter}'","se poklapaju sa '{filter}'","se poklapa sa '{filter}'"],
     "Favorited" : "Omiljeno",
     "Favorite" : "Omiljeni",
+    "Upload" : "Otpremi",
+    "Text file" : "tekstualni fajl",
+    "Folder" : "fascikla",
+    "New folder" : "Nova fascikla",
     "An error occurred while trying to update the tags" : "Došlo je do greške pri pokušaju ažuriranja oznaka",
     "A new file or folder has been <strong>created</strong>" : "Novi fajl ili fascikla su <strong>napravljeni</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fajl ili fascikla su <strong>izmenjeni</strong>",
@@ -90,12 +95,6 @@ OC.L10N.register(
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristite ovu adresu da <a href=\"%s\" target=\"_blank\"> pristupite fajlovima preko WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nov tekstualni fajl",
-    "Text file" : "tekstualni fajl",
-    "New folder" : "Nova fascikla",
-    "Folder" : "fascikla",
-    "Upload" : "Otpremi",
     "Cancel upload" : "Otkaži otpremanje",
     "No files in here" : "Ovde nema fajlova",
     "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!",
diff --git a/apps/files/l10n/sr@latin.json b/apps/files/l10n/sr@latin.json
index 5f31ed2547c..b6ffda5aa6b 100644
--- a/apps/files/l10n/sr@latin.json
+++ b/apps/files/l10n/sr@latin.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Otpremanje je otkazano.",
     "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Ne mogu da stvorim fajl",
-    "Could not create folder" : "Ne mogu da stvorim fasciklu",
     "Download" : "Preuzmi",
     "Select" : "Izaberi",
     "Pending" : "Na čekanju",
@@ -44,7 +41,10 @@
     "Error moving file." : "Greška pri premeštanju fajla.",
     "Error moving file" : "Greška pri premeštanju fajla",
     "Error" : "Greška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Ne mogu da preimenujem fajl",
+    "Could not create file" : "Ne mogu da stvorim fajl",
+    "Could not create folder" : "Ne mogu da stvorim fasciklu",
     "Error deleting file." : "Greška pri brisanju fajla.",
     "No entries in this folder match '{filter}'" : "U ovoj fascikli ništa se ne poklapa sa '{filter}'",
     "Name" : "Naziv",
@@ -55,6 +55,7 @@
     "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Nemate dozvole da ovde otpremate ili stvarate fajlove",
     "_Uploading %n file_::_Uploading %n files_" : ["Otpremam %n fajl","Otpremam %n fajla","Otpremam %n fajlova"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" nije ispravan naziv fajla.",
     "File name cannot be empty." : "Naziv fajla ne može biti prazan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše skladište je puno. Fajlovi više ne mogu biti ažurirani ni sinhronizovani!",
@@ -62,6 +63,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["se poklapa sa '{filter}'","se poklapaju sa '{filter}'","se poklapa sa '{filter}'"],
     "Favorited" : "Omiljeno",
     "Favorite" : "Omiljeni",
+    "Upload" : "Otpremi",
+    "Text file" : "tekstualni fajl",
+    "Folder" : "fascikla",
+    "New folder" : "Nova fascikla",
     "An error occurred while trying to update the tags" : "Došlo je do greške pri pokušaju ažuriranja oznaka",
     "A new file or folder has been <strong>created</strong>" : "Novi fajl ili fascikla su <strong>napravljeni</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fajl ili fascikla su <strong>izmenjeni</strong>",
@@ -88,12 +93,6 @@
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristite ovu adresu da <a href=\"%s\" target=\"_blank\"> pristupite fajlovima preko WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nov tekstualni fajl",
-    "Text file" : "tekstualni fajl",
-    "New folder" : "Nova fascikla",
-    "Folder" : "fascikla",
-    "Upload" : "Otpremi",
     "Cancel upload" : "Otkaži otpremanje",
     "No files in here" : "Ovde nema fajlova",
     "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!",
diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js
index c6b64eab029..5f9a08404d7 100644
--- a/apps/files/l10n/sv.js
+++ b/apps/files/l10n/sv.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Uppladdning avbruten.",
     "Could not get result from server." : "Gick inte att hämta resultat från server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
-    "{new_name} already exists" : "{new_name} finns redan",
-    "Could not create file" : "Kunde ej skapa fil",
-    "Could not create folder" : "Kunde ej skapa katalog",
     "Actions" : "Åtgärder",
     "Download" : "Ladda ner",
     "Select" : "Välj",
@@ -47,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Fel vid flytt av fil.",
     "Error moving file" : "Fel uppstod vid flyttning av fil",
     "Error" : "Fel",
+    "{new_name} already exists" : "{new_name} finns redan",
     "Could not rename file" : "Kan ej byta filnamn",
+    "Could not create file" : "Kunde ej skapa fil",
+    "Could not create folder" : "Kunde ej skapa katalog",
     "Error deleting file." : "Kunde inte ta bort filen.",
     "Name" : "Namn",
     "Size" : "Storlek",
@@ -57,12 +57,17 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} och {files}",
     "You don’t have permission to upload or create files here" : "Du har ej tillåtelse att ladda upp eller skapa filer här",
     "_Uploading %n file_::_Uploading %n files_" : ["Laddar upp %n fil","Laddar upp %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "\"{name}\" är ett ogiltligt filnamn.",
     "File name cannot be empty." : "Filnamn kan inte vara tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
     "Favorited" : "Favoritiserad",
     "Favorite" : "Favorit",
+    "Upload" : "Ladda upp",
+    "Text file" : "Textfil",
+    "Folder" : "Mapp",
+    "New folder" : "Ny mapp",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mapp har blivit <strong>skapad</strong>",
     "A file or folder has been <strong>changed</strong>" : "En ny fil eller mapp har blivit <strong>ändrad</strong>",
     "A file or folder has been <strong>deleted</strong>" : "En ny fil eller mapp har blivit <strong>raderad</strong>",
@@ -86,12 +91,6 @@ OC.L10N.register(
     "Settings" : "Inställningar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny textfil",
-    "Text file" : "Textfil",
-    "New folder" : "Ny mapp",
-    "Folder" : "Mapp",
-    "Upload" : "Ladda upp",
     "Cancel upload" : "Avbryt uppladdning",
     "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!",
     "Select all" : "Välj allt",
diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json
index c752155dbb9..e6775948cf6 100644
--- a/apps/files/l10n/sv.json
+++ b/apps/files/l10n/sv.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Uppladdning avbruten.",
     "Could not get result from server." : "Gick inte att hämta resultat från server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
-    "{new_name} already exists" : "{new_name} finns redan",
-    "Could not create file" : "Kunde ej skapa fil",
-    "Could not create folder" : "Kunde ej skapa katalog",
     "Actions" : "Åtgärder",
     "Download" : "Ladda ner",
     "Select" : "Välj",
@@ -45,7 +42,10 @@
     "Error moving file." : "Fel vid flytt av fil.",
     "Error moving file" : "Fel uppstod vid flyttning av fil",
     "Error" : "Fel",
+    "{new_name} already exists" : "{new_name} finns redan",
     "Could not rename file" : "Kan ej byta filnamn",
+    "Could not create file" : "Kunde ej skapa fil",
+    "Could not create folder" : "Kunde ej skapa katalog",
     "Error deleting file." : "Kunde inte ta bort filen.",
     "Name" : "Namn",
     "Size" : "Storlek",
@@ -55,12 +55,17 @@
     "{dirs} and {files}" : "{dirs} och {files}",
     "You don’t have permission to upload or create files here" : "Du har ej tillåtelse att ladda upp eller skapa filer här",
     "_Uploading %n file_::_Uploading %n files_" : ["Laddar upp %n fil","Laddar upp %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "\"{name}\" är ett ogiltligt filnamn.",
     "File name cannot be empty." : "Filnamn kan inte vara tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
     "Favorited" : "Favoritiserad",
     "Favorite" : "Favorit",
+    "Upload" : "Ladda upp",
+    "Text file" : "Textfil",
+    "Folder" : "Mapp",
+    "New folder" : "Ny mapp",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mapp har blivit <strong>skapad</strong>",
     "A file or folder has been <strong>changed</strong>" : "En ny fil eller mapp har blivit <strong>ändrad</strong>",
     "A file or folder has been <strong>deleted</strong>" : "En ny fil eller mapp har blivit <strong>raderad</strong>",
@@ -84,12 +89,6 @@
     "Settings" : "Inställningar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny textfil",
-    "Text file" : "Textfil",
-    "New folder" : "Ny mapp",
-    "Folder" : "Mapp",
-    "Upload" : "Ladda upp",
     "Cancel upload" : "Avbryt uppladdning",
     "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!",
     "Select all" : "Välj allt",
diff --git a/apps/files/l10n/ta_IN.js b/apps/files/l10n/ta_IN.js
index c12b3fc948e..c8453338084 100644
--- a/apps/files/l10n/ta_IN.js
+++ b/apps/files/l10n/ta_IN.js
@@ -2,6 +2,8 @@ OC.L10N.register(
     "files",
     {
     "Files" : "கோப்புகள்",
+    "Upload" : "பதிவேற்று",
+    "New folder" : "புதிய கோப்புறை",
     "A new file or folder has been <strong>created</strong>" : "ஒரு புதிய கோப்புறை அல்லது ஆவணம் <strong> உருவாக்கப்பட்டுள்ளது.</strong>",
     "A file or folder has been <strong>changed</strong>" : "ஒரு கோப்புறை அல்லது ஆவணம் <strong>மாற்றம் செய்யப்பட்டுள்ளது.</strong>",
     "A file or folder has been <strong>deleted</strong>" : "ஒரு கோப்புறை அல்லது ஆவணம்  <strong> நீக்கப்பட்டுள்ளது. </strong>",
@@ -11,8 +13,6 @@ OC.L10N.register(
     "%2$s changed %1$s" : "%2$s  %1$s 'ல் மாற்றம் செய்துள்ளார். ",
     "You deleted %1$s" : "நீங்கள் %1$s 'ஐ நீக்கி உள்ளீர்கள்.",
     "%2$s deleted %1$s" : "%2$s , %1$s 'ஐ நீக்கியுள்ளார்.",
-    "Settings" : "அமைப்புகள்",
-    "New folder" : "புதிய கோப்புறை",
-    "Upload" : "பதிவேற்று"
+    "Settings" : "அமைப்புகள்"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ta_IN.json b/apps/files/l10n/ta_IN.json
index 086a3416614..392601a3756 100644
--- a/apps/files/l10n/ta_IN.json
+++ b/apps/files/l10n/ta_IN.json
@@ -1,5 +1,7 @@
 { "translations": {
     "Files" : "கோப்புகள்",
+    "Upload" : "பதிவேற்று",
+    "New folder" : "புதிய கோப்புறை",
     "A new file or folder has been <strong>created</strong>" : "ஒரு புதிய கோப்புறை அல்லது ஆவணம் <strong> உருவாக்கப்பட்டுள்ளது.</strong>",
     "A file or folder has been <strong>changed</strong>" : "ஒரு கோப்புறை அல்லது ஆவணம் <strong>மாற்றம் செய்யப்பட்டுள்ளது.</strong>",
     "A file or folder has been <strong>deleted</strong>" : "ஒரு கோப்புறை அல்லது ஆவணம்  <strong> நீக்கப்பட்டுள்ளது. </strong>",
@@ -9,8 +11,6 @@
     "%2$s changed %1$s" : "%2$s  %1$s 'ல் மாற்றம் செய்துள்ளார். ",
     "You deleted %1$s" : "நீங்கள் %1$s 'ஐ நீக்கி உள்ளீர்கள்.",
     "%2$s deleted %1$s" : "%2$s , %1$s 'ஐ நீக்கியுள்ளார்.",
-    "Settings" : "அமைப்புகள்",
-    "New folder" : "புதிய கோப்புறை",
-    "Upload" : "பதிவேற்று"
+    "Settings" : "அமைப்புகள்"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/ta_LK.js b/apps/files/l10n/ta_LK.js
index ef41c862b4c..90a955e135b 100644
--- a/apps/files/l10n/ta_LK.js
+++ b/apps/files/l10n/ta_LK.js
@@ -14,25 +14,25 @@ OC.L10N.register(
     "Close" : "மூடுக",
     "Upload cancelled." : "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
     "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
-    "{new_name} already exists" : "{new_name} ஏற்கனவே உள்ளது",
     "Actions" : "செயல்கள்",
     "Download" : "பதிவிறக்குக",
     "Select" : "தெரிக",
     "Pending" : "நிலுவையிலுள்ள",
     "Error" : "வழு",
+    "{new_name} already exists" : "{new_name} ஏற்கனவே உள்ளது",
     "Name" : "பெயர்",
     "Size" : "அளவு",
     "Modified" : "மாற்றப்பட்டது",
+    "New" : "புதிய",
     "Favorite" : "விருப்பமான",
+    "Upload" : "பதிவேற்றுக",
+    "Text file" : "கோப்பு உரை",
+    "Folder" : "கோப்புறை",
     "File handling" : "கோப்பு கையாளுதல்",
     "Maximum upload size" : "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
     "max. possible: " : "ஆகக் கூடியது:",
     "Save" : "சேமிக்க ",
     "Settings" : "அமைப்புகள்",
-    "New" : "புதிய",
-    "Text file" : "கோப்பு உரை",
-    "Folder" : "கோப்புறை",
-    "Upload" : "பதிவேற்றுக",
     "Cancel upload" : "பதிவேற்றலை இரத்து செய்க",
     "Delete" : "நீக்குக",
     "Upload too large" : "பதிவேற்றல் மிகப்பெரியது",
diff --git a/apps/files/l10n/ta_LK.json b/apps/files/l10n/ta_LK.json
index a233c016cad..64220b86744 100644
--- a/apps/files/l10n/ta_LK.json
+++ b/apps/files/l10n/ta_LK.json
@@ -12,25 +12,25 @@
     "Close" : "மூடுக",
     "Upload cancelled." : "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
     "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
-    "{new_name} already exists" : "{new_name} ஏற்கனவே உள்ளது",
     "Actions" : "செயல்கள்",
     "Download" : "பதிவிறக்குக",
     "Select" : "தெரிக",
     "Pending" : "நிலுவையிலுள்ள",
     "Error" : "வழு",
+    "{new_name} already exists" : "{new_name} ஏற்கனவே உள்ளது",
     "Name" : "பெயர்",
     "Size" : "அளவு",
     "Modified" : "மாற்றப்பட்டது",
+    "New" : "புதிய",
     "Favorite" : "விருப்பமான",
+    "Upload" : "பதிவேற்றுக",
+    "Text file" : "கோப்பு உரை",
+    "Folder" : "கோப்புறை",
     "File handling" : "கோப்பு கையாளுதல்",
     "Maximum upload size" : "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
     "max. possible: " : "ஆகக் கூடியது:",
     "Save" : "சேமிக்க ",
     "Settings" : "அமைப்புகள்",
-    "New" : "புதிய",
-    "Text file" : "கோப்பு உரை",
-    "Folder" : "கோப்புறை",
-    "Upload" : "பதிவேற்றுக",
     "Cancel upload" : "பதிவேற்றலை இரத்து செய்க",
     "Delete" : "நீக்குக",
     "Upload too large" : "பதிவேற்றல் மிகப்பெரியது",
diff --git a/apps/files/l10n/te.js b/apps/files/l10n/te.js
index 481c994e301..51f6b1c5291 100644
--- a/apps/files/l10n/te.js
+++ b/apps/files/l10n/te.js
@@ -5,10 +5,10 @@ OC.L10N.register(
     "Error" : "పొరపాటు",
     "Name" : "పేరు",
     "Size" : "పరిమాణం",
+    "Folder" : "సంచయం",
+    "New folder" : "కొత్త సంచయం",
     "Save" : "భద్రపరచు",
     "Settings" : "అమరికలు",
-    "New folder" : "కొత్త సంచయం",
-    "Folder" : "సంచయం",
     "Delete" : "తొలగించు"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/te.json b/apps/files/l10n/te.json
index a836ec02fa8..fa7efa9d702 100644
--- a/apps/files/l10n/te.json
+++ b/apps/files/l10n/te.json
@@ -3,10 +3,10 @@
     "Error" : "పొరపాటు",
     "Name" : "పేరు",
     "Size" : "పరిమాణం",
+    "Folder" : "సంచయం",
+    "New folder" : "కొత్త సంచయం",
     "Save" : "భద్రపరచు",
     "Settings" : "అమరికలు",
-    "New folder" : "కొత్త సంచయం",
-    "Folder" : "సంచయం",
     "Delete" : "తొలగించు"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js
index 2529d3e8ca8..61182b63ad3 100644
--- a/apps/files/l10n/th_TH.js
+++ b/apps/files/l10n/th_TH.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "การอัพโหลดถูกยกเลิก",
     "Could not get result from server." : "ไม่สามารถรับผลลัพธ์จากเซิร์ฟเวอร์",
     "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
-    "{new_name} already exists" : "{new_name} มีอยู่แล้วในระบบ",
-    "Could not create file" : "ไม่สามารถสร้างไฟล์",
-    "Could not create folder" : "ไม่สามารถสร้างโฟลเดอร์",
     "Actions" : "การกระทำ",
     "Download" : "ดาวน์โหลด",
     "Select" : "เลือก",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "ข้อผิดพลาดในการเคลื่อนย้ายไฟล์",
     "Error moving file" : "ข้อผิดพลาดในการเคลื่อนย้ายไฟล์",
     "Error" : "ข้อผิดพลาด",
+    "{new_name} already exists" : "{new_name} มีอยู่แล้วในระบบ",
     "Could not rename file" : "ไม่สามารถเปลี่ยนชื่อไฟล์",
+    "Could not create file" : "ไม่สามารถสร้างไฟล์",
+    "Could not create folder" : "ไม่สามารถสร้างโฟลเดอร์",
     "Error deleting file." : "เกิดข้อผิดพลาดในการลบไฟล์",
     "No entries in this folder match '{filter}'" : "ไม่มีรายการในโฟลเดอร์นี้ที่ตรงกับ '{filter}'",
     "Name" : "ชื่อ",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} และ {files}",
     "You don’t have permission to upload or create files here" : "คุณไม่ได้รับอนุญาตให้อัพโหลดหรือสร้างไฟล์ที่นี่",
     "_Uploading %n file_::_Uploading %n files_" : ["อัพโหลด %n ไฟล์"],
+    "New" : "ใหม่",
     "\"{name}\" is an invalid file name." : "\"{name}\" เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
     "File name cannot be empty." : "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของ {owner} เต็มแล้ว  ไฟล์ไม่สามารถอัพเดทหรือประสานข้อมูลได้อีก!",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n ไบต์"],
     "Favorited" : "รายการโปรด",
     "Favorite" : "รายการโปรด",
+    "Upload" : "อัพโหลด",
+    "Text file" : "ไฟล์ข้อความ",
+    "Folder" : "แฟ้มเอกสาร",
+    "New folder" : "โฟลเดอร์ใหม่",
     "An error occurred while trying to update the tags" : "เกิดข้อผิดพลาดขณะที่พยายามจะปรับปรุงแท็ก",
     "A new file or folder has been <strong>created</strong>" : "มีไฟล์ใหม่หรือโฟลเดอร์ได้ถูก <strong>สร้างขึ้น!</strong>",
     "A file or folder has been <strong>changed</strong>" : "มีไฟล์หรือโฟลเดอร์ได้ถูก <strong>เปลี่ยน!</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "ตั้งค่า",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "ใช้ที่อยู่นี้เพื่อ <a href=\"%s\" target=\"_blank\">เข้าถึงไฟล์ของคุณผ่าน WebDAV</a>",
-    "New" : "ใหม่",
-    "New text file" : "ไฟล์ข้อความใหม่",
-    "Text file" : "ไฟล์ข้อความ",
-    "New folder" : "โฟลเดอร์ใหม่",
-    "Folder" : "แฟ้มเอกสาร",
-    "Upload" : "อัพโหลด",
     "Cancel upload" : "ยกเลิกการอัพโหลด",
     "No files in here" : "ไม่มีไฟล์ที่นี่",
     "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือประสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง",
diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json
index cf4fc24fc0a..dd2ecf36df3 100644
--- a/apps/files/l10n/th_TH.json
+++ b/apps/files/l10n/th_TH.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "การอัพโหลดถูกยกเลิก",
     "Could not get result from server." : "ไม่สามารถรับผลลัพธ์จากเซิร์ฟเวอร์",
     "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
-    "{new_name} already exists" : "{new_name} มีอยู่แล้วในระบบ",
-    "Could not create file" : "ไม่สามารถสร้างไฟล์",
-    "Could not create folder" : "ไม่สามารถสร้างโฟลเดอร์",
     "Actions" : "การกระทำ",
     "Download" : "ดาวน์โหลด",
     "Select" : "เลือก",
@@ -47,7 +44,10 @@
     "Error moving file." : "ข้อผิดพลาดในการเคลื่อนย้ายไฟล์",
     "Error moving file" : "ข้อผิดพลาดในการเคลื่อนย้ายไฟล์",
     "Error" : "ข้อผิดพลาด",
+    "{new_name} already exists" : "{new_name} มีอยู่แล้วในระบบ",
     "Could not rename file" : "ไม่สามารถเปลี่ยนชื่อไฟล์",
+    "Could not create file" : "ไม่สามารถสร้างไฟล์",
+    "Could not create folder" : "ไม่สามารถสร้างโฟลเดอร์",
     "Error deleting file." : "เกิดข้อผิดพลาดในการลบไฟล์",
     "No entries in this folder match '{filter}'" : "ไม่มีรายการในโฟลเดอร์นี้ที่ตรงกับ '{filter}'",
     "Name" : "ชื่อ",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} และ {files}",
     "You don’t have permission to upload or create files here" : "คุณไม่ได้รับอนุญาตให้อัพโหลดหรือสร้างไฟล์ที่นี่",
     "_Uploading %n file_::_Uploading %n files_" : ["อัพโหลด %n ไฟล์"],
+    "New" : "ใหม่",
     "\"{name}\" is an invalid file name." : "\"{name}\" เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
     "File name cannot be empty." : "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของ {owner} เต็มแล้ว  ไฟล์ไม่สามารถอัพเดทหรือประสานข้อมูลได้อีก!",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n ไบต์"],
     "Favorited" : "รายการโปรด",
     "Favorite" : "รายการโปรด",
+    "Upload" : "อัพโหลด",
+    "Text file" : "ไฟล์ข้อความ",
+    "Folder" : "แฟ้มเอกสาร",
+    "New folder" : "โฟลเดอร์ใหม่",
     "An error occurred while trying to update the tags" : "เกิดข้อผิดพลาดขณะที่พยายามจะปรับปรุงแท็ก",
     "A new file or folder has been <strong>created</strong>" : "มีไฟล์ใหม่หรือโฟลเดอร์ได้ถูก <strong>สร้างขึ้น!</strong>",
     "A file or folder has been <strong>changed</strong>" : "มีไฟล์หรือโฟลเดอร์ได้ถูก <strong>เปลี่ยน!</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "ตั้งค่า",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "ใช้ที่อยู่นี้เพื่อ <a href=\"%s\" target=\"_blank\">เข้าถึงไฟล์ของคุณผ่าน WebDAV</a>",
-    "New" : "ใหม่",
-    "New text file" : "ไฟล์ข้อความใหม่",
-    "Text file" : "ไฟล์ข้อความ",
-    "New folder" : "โฟลเดอร์ใหม่",
-    "Folder" : "แฟ้มเอกสาร",
-    "Upload" : "อัพโหลด",
     "Cancel upload" : "ยกเลิกการอัพโหลด",
     "No files in here" : "ไม่มีไฟล์ที่นี่",
     "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือประสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง",
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
index 2145fb5c9fc..157280b696c 100644
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Yükleme iptal edildi.",
     "Could not get result from server." : "Sunucudan sonuç alınamadı.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
-    "{new_name} already exists" : "{new_name} zaten mevcut",
-    "Could not create file" : "Dosya oluşturulamadı",
-    "Could not create folder" : "Klasör oluşturulamadı",
     "Actions" : "Eylemler",
     "Download" : "İndir",
     "Select" : "Seç",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Dosya taşıma hatası.",
     "Error moving file" : "Dosya taşıma hatası",
     "Error" : "Hata",
+    "{new_name} already exists" : "{new_name} zaten mevcut",
     "Could not rename file" : "Dosya adlandırılamadı",
+    "Could not create file" : "Dosya oluşturulamadı",
+    "Could not create folder" : "Klasör oluşturulamadı",
     "Error deleting file." : "Dosya silinirken hata.",
     "No entries in this folder match '{filter}'" : "Bu klasörde hiçbir girdi '{filter}' ile eşleşmiyor",
     "Name" : "İsim",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} ve {files}",
     "You don’t have permission to upload or create files here" : "Buraya dosya yükleme veya oluşturma izniniz yok",
     "_Uploading %n file_::_Uploading %n files_" : ["%n dosya yükleniyor","%n dosya yükleniyor"],
+    "New" : "Yeni",
     "\"{name}\" is an invalid file name." : "\"{name}\" geçersiz bir dosya adı.",
     "File name cannot be empty." : "Dosya adı boş olamaz.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} depolama alanı dolu, artık dosyalar güncellenmeyecek yada eşitlenmeyecek.",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n bayt","%n bayt"],
     "Favorited" : "Sık kullanılanlara eklendi",
     "Favorite" : "Sık kullanılan",
+    "Upload" : "Yükle",
+    "Text file" : "Metin dosyası",
+    "Folder" : "Klasör",
+    "New folder" : "Yeni klasör",
     "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu",
     "A new file or folder has been <strong>created</strong>" : "Yeni bir dosya veya klasör <strong>oluşturuldu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Bir dosya veya klasör <strong>değiştirildi</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "Ayarlar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın",
-    "New" : "Yeni",
-    "New text file" : "Yeni metin dosyası",
-    "Text file" : "Metin dosyası",
-    "New folder" : "Yeni klasör",
-    "Folder" : "Klasör",
-    "Upload" : "Yükle",
     "Cancel upload" : "Yüklemeyi iptal et",
     "No files in here" : "Burada hiç dosya yok",
     "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!",
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
index 5a1e5f9ec7a..8a15f7ff315 100644
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Yükleme iptal edildi.",
     "Could not get result from server." : "Sunucudan sonuç alınamadı.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
-    "{new_name} already exists" : "{new_name} zaten mevcut",
-    "Could not create file" : "Dosya oluşturulamadı",
-    "Could not create folder" : "Klasör oluşturulamadı",
     "Actions" : "Eylemler",
     "Download" : "İndir",
     "Select" : "Seç",
@@ -47,7 +44,10 @@
     "Error moving file." : "Dosya taşıma hatası.",
     "Error moving file" : "Dosya taşıma hatası",
     "Error" : "Hata",
+    "{new_name} already exists" : "{new_name} zaten mevcut",
     "Could not rename file" : "Dosya adlandırılamadı",
+    "Could not create file" : "Dosya oluşturulamadı",
+    "Could not create folder" : "Klasör oluşturulamadı",
     "Error deleting file." : "Dosya silinirken hata.",
     "No entries in this folder match '{filter}'" : "Bu klasörde hiçbir girdi '{filter}' ile eşleşmiyor",
     "Name" : "İsim",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} ve {files}",
     "You don’t have permission to upload or create files here" : "Buraya dosya yükleme veya oluşturma izniniz yok",
     "_Uploading %n file_::_Uploading %n files_" : ["%n dosya yükleniyor","%n dosya yükleniyor"],
+    "New" : "Yeni",
     "\"{name}\" is an invalid file name." : "\"{name}\" geçersiz bir dosya adı.",
     "File name cannot be empty." : "Dosya adı boş olamaz.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} depolama alanı dolu, artık dosyalar güncellenmeyecek yada eşitlenmeyecek.",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n bayt","%n bayt"],
     "Favorited" : "Sık kullanılanlara eklendi",
     "Favorite" : "Sık kullanılan",
+    "Upload" : "Yükle",
+    "Text file" : "Metin dosyası",
+    "Folder" : "Klasör",
+    "New folder" : "Yeni klasör",
     "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu",
     "A new file or folder has been <strong>created</strong>" : "Yeni bir dosya veya klasör <strong>oluşturuldu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Bir dosya veya klasör <strong>değiştirildi</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "Ayarlar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın",
-    "New" : "Yeni",
-    "New text file" : "Yeni metin dosyası",
-    "Text file" : "Metin dosyası",
-    "New folder" : "Yeni klasör",
-    "Folder" : "Klasör",
-    "Upload" : "Yükle",
     "Cancel upload" : "Yüklemeyi iptal et",
     "No files in here" : "Burada hiç dosya yok",
     "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!",
diff --git a/apps/files/l10n/ug.js b/apps/files/l10n/ug.js
index 8d8dbe886c9..8d6dabd50d7 100644
--- a/apps/files/l10n/ug.js
+++ b/apps/files/l10n/ug.js
@@ -14,23 +14,23 @@ OC.L10N.register(
     "Close" : "ياپ",
     "Upload cancelled." : "يۈكلەشتىن ۋاز كەچتى.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
-    "{new_name} already exists" : "{new_name} مەۋجۇت",
     "Actions" : "مەشغۇلاتلار",
     "Download" : "چۈشۈر",
     "Pending" : "كۈتۈۋاتىدۇ",
     "Error" : "خاتالىق",
+    "{new_name} already exists" : "{new_name} مەۋجۇت",
     "Name" : "ئاتى",
     "Size" : "چوڭلۇقى",
     "Modified" : "ئۆزگەرتكەن",
+    "New" : "يېڭى",
     "Favorite" : "يىغقۇچ",
+    "Upload" : "يۈكلە",
+    "Text file" : "تېكىست ھۆججەت",
+    "Folder" : "قىسقۇچ",
+    "New folder" : "يېڭى قىسقۇچ",
     "Save" : "ساقلا",
     "Settings" : "تەڭشەكلەر",
     "WebDAV" : "WebDAV",
-    "New" : "يېڭى",
-    "Text file" : "تېكىست ھۆججەت",
-    "New folder" : "يېڭى قىسقۇچ",
-    "Folder" : "قىسقۇچ",
-    "Upload" : "يۈكلە",
     "Cancel upload" : "يۈكلەشتىن ۋاز كەچ",
     "Delete" : "ئۆچۈر",
     "Upload too large" : "يۈكلەندىغىنى بەك چوڭ"
diff --git a/apps/files/l10n/ug.json b/apps/files/l10n/ug.json
index 0ace5900d0e..86bd8391af2 100644
--- a/apps/files/l10n/ug.json
+++ b/apps/files/l10n/ug.json
@@ -12,23 +12,23 @@
     "Close" : "ياپ",
     "Upload cancelled." : "يۈكلەشتىن ۋاز كەچتى.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
-    "{new_name} already exists" : "{new_name} مەۋجۇت",
     "Actions" : "مەشغۇلاتلار",
     "Download" : "چۈشۈر",
     "Pending" : "كۈتۈۋاتىدۇ",
     "Error" : "خاتالىق",
+    "{new_name} already exists" : "{new_name} مەۋجۇت",
     "Name" : "ئاتى",
     "Size" : "چوڭلۇقى",
     "Modified" : "ئۆزگەرتكەن",
+    "New" : "يېڭى",
     "Favorite" : "يىغقۇچ",
+    "Upload" : "يۈكلە",
+    "Text file" : "تېكىست ھۆججەت",
+    "Folder" : "قىسقۇچ",
+    "New folder" : "يېڭى قىسقۇچ",
     "Save" : "ساقلا",
     "Settings" : "تەڭشەكلەر",
     "WebDAV" : "WebDAV",
-    "New" : "يېڭى",
-    "Text file" : "تېكىست ھۆججەت",
-    "New folder" : "يېڭى قىسقۇچ",
-    "Folder" : "قىسقۇچ",
-    "Upload" : "يۈكلە",
     "Cancel upload" : "يۈكلەشتىن ۋاز كەچ",
     "Delete" : "ئۆچۈر",
     "Upload too large" : "يۈكلەندىغىنى بەك چوڭ"
diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js
index f695cfb49e5..a06cc2f3d73 100644
--- a/apps/files/l10n/uk.js
+++ b/apps/files/l10n/uk.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "Вивантаження скасовано.",
     "Could not get result from server." : "Не вдалося отримати результат від сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується вивантаження файлу. Закриття цієї сторінки приведе до скасування вивантаження.",
-    "{new_name} already exists" : "{new_name} вже існує",
-    "Could not create file" : "Не вдалося створити файл",
-    "Could not create folder" : "Не вдалося створити теку",
     "Actions" : "Дії",
     "Download" : "Завантажити",
     "Select" : "Оберіть",
@@ -48,7 +45,10 @@ OC.L10N.register(
     "Error moving file." : "Помилка переміщення файлу.",
     "Error moving file" : "Помилка переміщення файлу",
     "Error" : "Помилка",
+    "{new_name} already exists" : "{new_name} вже існує",
     "Could not rename file" : "Неможливо перейменувати файл",
+    "Could not create file" : "Не вдалося створити файл",
+    "Could not create folder" : "Не вдалося створити теку",
     "Error deleting file." : "Помилка видалення файлу.",
     "No entries in this folder match '{filter}'" : "Нічого не знайдено в цій теці  '{filter}'",
     "Name" : "Ім'я",
@@ -59,6 +59,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} і {files}",
     "You don’t have permission to upload or create files here" : "У вас недостатньо прав для вивантаження або створення тут файлів",
     "_Uploading %n file_::_Uploading %n files_" : ["Вивантаження %n файлу","Вивантаження %n файлів","Вивантаження %n файлів"],
+    "New" : "Створити",
     "\"{name}\" is an invalid file name." : "\"{name}\" - некоректне ім'я файлу.",
     "File name cannot be empty." : " Ім'я файлу не може бути порожнім.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
@@ -66,6 +67,10 @@ OC.L10N.register(
     "_matches '{filter}'_::_match '{filter}'_" : ["знайдено '{filter}'","знайдено '{filter}'","знайдено '{filter}'"],
     "Favorited" : "Улюблений",
     "Favorite" : "Улюблений",
+    "Upload" : "Вивантажити",
+    "Text file" : "Текстовий файл",
+    "Folder" : "Тека",
+    "New folder" : "Нова тека",
     "An error occurred while trying to update the tags" : "Виникла помилка при спробі оновити мітки",
     "A new file or folder has been <strong>created</strong>" : "Новий файл або теку було <strong>створено</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл або теку було <strong> змінено </strong>",
@@ -92,12 +97,6 @@ OC.L10N.register(
     "Settings" : "Налаштування",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Для доступу до файлів через WebDAV використовуйте <a href=\"%s\" target=\"_blank\">це посилання</a>",
-    "New" : "Створити",
-    "New text file" : "Новий текстовий файл",
-    "Text file" : "Текстовий файл",
-    "New folder" : "Нова тека",
-    "Folder" : "Тека",
-    "Upload" : "Вивантажити",
     "Cancel upload" : "Скасувати вивантаження",
     "No files in here" : "Тут немає файлів",
     "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!",
diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json
index adc124a267f..964ada95de1 100644
--- a/apps/files/l10n/uk.json
+++ b/apps/files/l10n/uk.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "Вивантаження скасовано.",
     "Could not get result from server." : "Не вдалося отримати результат від сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується вивантаження файлу. Закриття цієї сторінки приведе до скасування вивантаження.",
-    "{new_name} already exists" : "{new_name} вже існує",
-    "Could not create file" : "Не вдалося створити файл",
-    "Could not create folder" : "Не вдалося створити теку",
     "Actions" : "Дії",
     "Download" : "Завантажити",
     "Select" : "Оберіть",
@@ -46,7 +43,10 @@
     "Error moving file." : "Помилка переміщення файлу.",
     "Error moving file" : "Помилка переміщення файлу",
     "Error" : "Помилка",
+    "{new_name} already exists" : "{new_name} вже існує",
     "Could not rename file" : "Неможливо перейменувати файл",
+    "Could not create file" : "Не вдалося створити файл",
+    "Could not create folder" : "Не вдалося створити теку",
     "Error deleting file." : "Помилка видалення файлу.",
     "No entries in this folder match '{filter}'" : "Нічого не знайдено в цій теці  '{filter}'",
     "Name" : "Ім'я",
@@ -57,6 +57,7 @@
     "{dirs} and {files}" : "{dirs} і {files}",
     "You don’t have permission to upload or create files here" : "У вас недостатньо прав для вивантаження або створення тут файлів",
     "_Uploading %n file_::_Uploading %n files_" : ["Вивантаження %n файлу","Вивантаження %n файлів","Вивантаження %n файлів"],
+    "New" : "Створити",
     "\"{name}\" is an invalid file name." : "\"{name}\" - некоректне ім'я файлу.",
     "File name cannot be empty." : " Ім'я файлу не може бути порожнім.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
@@ -64,6 +65,10 @@
     "_matches '{filter}'_::_match '{filter}'_" : ["знайдено '{filter}'","знайдено '{filter}'","знайдено '{filter}'"],
     "Favorited" : "Улюблений",
     "Favorite" : "Улюблений",
+    "Upload" : "Вивантажити",
+    "Text file" : "Текстовий файл",
+    "Folder" : "Тека",
+    "New folder" : "Нова тека",
     "An error occurred while trying to update the tags" : "Виникла помилка при спробі оновити мітки",
     "A new file or folder has been <strong>created</strong>" : "Новий файл або теку було <strong>створено</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл або теку було <strong> змінено </strong>",
@@ -90,12 +95,6 @@
     "Settings" : "Налаштування",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Для доступу до файлів через WebDAV використовуйте <a href=\"%s\" target=\"_blank\">це посилання</a>",
-    "New" : "Створити",
-    "New text file" : "Новий текстовий файл",
-    "Text file" : "Текстовий файл",
-    "New folder" : "Нова тека",
-    "Folder" : "Тека",
-    "Upload" : "Вивантажити",
     "Cancel upload" : "Скасувати вивантаження",
     "No files in here" : "Тут немає файлів",
     "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!",
diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js
index b96c4fca63c..5e83c36abea 100644
--- a/apps/files/l10n/vi.js
+++ b/apps/files/l10n/vi.js
@@ -31,16 +31,16 @@ OC.L10N.register(
     "Upload cancelled." : "Hủy tải lên",
     "Could not get result from server." : "Không thể nhận được kết quả từ máy chủ.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
-    "{new_name} already exists" : "{new_name} đã tồn tại",
-    "Could not create file" : "Không thể tạo file",
-    "Could not create folder" : "Không thể tạo thư mục",
     "Actions" : "Actions",
     "Download" : "Tải về",
     "Select" : "Chọn",
     "Pending" : "Đang chờ",
     "Error moving file" : "Lỗi di chuyển tập tin",
     "Error" : "Lỗi",
+    "{new_name} already exists" : "{new_name} đã tồn tại",
     "Could not rename file" : "Không thể đổi tên file",
+    "Could not create file" : "Không thể tạo file",
+    "Could not create folder" : "Không thể tạo thư mục",
     "Error deleting file." : "Lỗi xóa file,",
     "Name" : "Tên",
     "Size" : "Kích cỡ",
@@ -50,10 +50,15 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} và {files}",
     "You don’t have permission to upload or create files here" : "Bạn không có quyền upload hoặc tạo files ở đây",
     "_Uploading %n file_::_Uploading %n files_" : ["Đang tải lên %n tập tin"],
+    "New" : "Tạo mới",
     "File name cannot be empty." : "Tên file không được rỗng",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Your storage is almost full ({usedSpacePercent}%)",
     "Favorite" : "Ưu thích",
+    "Upload" : "Tải lên",
+    "Text file" : "Tập tin văn bản",
+    "Folder" : "Thư mục",
+    "New folder" : "Tạo thư mục",
     "%s could not be renamed" : "%s không thể đổi tên",
     "File handling" : "Xử lý tập tin",
     "Maximum upload size" : "Kích thước tối đa ",
@@ -61,12 +66,6 @@ OC.L10N.register(
     "Save" : "Lưu",
     "Settings" : "Cài đặt",
     "WebDAV" : "WebDAV",
-    "New" : "Tạo mới",
-    "New text file" : "File text mới",
-    "Text file" : "Tập tin văn bản",
-    "New folder" : "Tạo thư mục",
-    "Folder" : "Thư mục",
-    "Upload" : "Tải lên",
     "Cancel upload" : "Hủy upload",
     "No entries found in this folder" : "Chưa có mục nào trong thư mục",
     "Select all" : "Chọn tất cả",
diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json
index 38e0e1c3846..285c0e39240 100644
--- a/apps/files/l10n/vi.json
+++ b/apps/files/l10n/vi.json
@@ -29,16 +29,16 @@
     "Upload cancelled." : "Hủy tải lên",
     "Could not get result from server." : "Không thể nhận được kết quả từ máy chủ.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
-    "{new_name} already exists" : "{new_name} đã tồn tại",
-    "Could not create file" : "Không thể tạo file",
-    "Could not create folder" : "Không thể tạo thư mục",
     "Actions" : "Actions",
     "Download" : "Tải về",
     "Select" : "Chọn",
     "Pending" : "Đang chờ",
     "Error moving file" : "Lỗi di chuyển tập tin",
     "Error" : "Lỗi",
+    "{new_name} already exists" : "{new_name} đã tồn tại",
     "Could not rename file" : "Không thể đổi tên file",
+    "Could not create file" : "Không thể tạo file",
+    "Could not create folder" : "Không thể tạo thư mục",
     "Error deleting file." : "Lỗi xóa file,",
     "Name" : "Tên",
     "Size" : "Kích cỡ",
@@ -48,10 +48,15 @@
     "{dirs} and {files}" : "{dirs} và {files}",
     "You don’t have permission to upload or create files here" : "Bạn không có quyền upload hoặc tạo files ở đây",
     "_Uploading %n file_::_Uploading %n files_" : ["Đang tải lên %n tập tin"],
+    "New" : "Tạo mới",
     "File name cannot be empty." : "Tên file không được rỗng",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Your storage is almost full ({usedSpacePercent}%)",
     "Favorite" : "Ưu thích",
+    "Upload" : "Tải lên",
+    "Text file" : "Tập tin văn bản",
+    "Folder" : "Thư mục",
+    "New folder" : "Tạo thư mục",
     "%s could not be renamed" : "%s không thể đổi tên",
     "File handling" : "Xử lý tập tin",
     "Maximum upload size" : "Kích thước tối đa ",
@@ -59,12 +64,6 @@
     "Save" : "Lưu",
     "Settings" : "Cài đặt",
     "WebDAV" : "WebDAV",
-    "New" : "Tạo mới",
-    "New text file" : "File text mới",
-    "Text file" : "Tập tin văn bản",
-    "New folder" : "Tạo thư mục",
-    "Folder" : "Thư mục",
-    "Upload" : "Tải lên",
     "Cancel upload" : "Hủy upload",
     "No entries found in this folder" : "Chưa có mục nào trong thư mục",
     "Select all" : "Chọn tất cả",
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
index 9633e2961a9..84b31368a14 100644
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "上传已取消",
     "Could not get result from server." : "不能从服务器得到结果",
     "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。",
-    "{new_name} already exists" : "{new_name} 已存在",
-    "Could not create file" : "不能创建文件",
-    "Could not create folder" : "不能创建文件夹",
     "Actions" : "动作",
     "Download" : "下载",
     "Select" : "选择",
@@ -49,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "移动文件出错。",
     "Error moving file" : "移动文件错误",
     "Error" : "错误",
+    "{new_name} already exists" : "{new_name} 已存在",
     "Could not rename file" : "不能重命名文件",
+    "Could not create file" : "不能创建文件",
+    "Could not create folder" : "不能创建文件夹",
     "Error deleting file." : "删除文件出错。",
     "No entries in this folder match '{filter}'" : "此文件夹中无项目匹配“{filter}”",
     "Name" : "名称",
@@ -60,6 +60,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} 和 {files}",
     "You don’t have permission to upload or create files here" : "您没有权限来上传湖州哦和创建文件",
     "_Uploading %n file_::_Uploading %n files_" : ["上传 %n 个文件"],
+    "New" : "新建",
     "\"{name}\" is an invalid file name." : "“{name}”是一个无效的文件名。",
     "File name cannot be empty." : "文件名不能为空。",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的存储空间已满，文件将无法更新或同步！",
@@ -71,6 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n 字节"],
     "Favorited" : "已收藏",
     "Favorite" : "收藏",
+    "Upload" : "上传",
+    "Text file" : "文本文件",
+    "Folder" : "文件夹",
+    "New folder" : "增加文件夹",
     "An error occurred while trying to update the tags" : "更新标签时出错",
     "A new file or folder has been <strong>created</strong>" : "一个新的文件或文件夹已被<strong>创建</strong>",
     "A file or folder has been <strong>changed</strong>" : "一个文件或文件夹已被<strong>修改</strong>",
@@ -98,12 +103,6 @@ OC.L10N.register(
     "Settings" : "设置",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "使用这个地址 <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>",
-    "New" : "新建",
-    "New text file" : "创建文本文件",
-    "Text file" : "文本文件",
-    "New folder" : "增加文件夹",
-    "Folder" : "文件夹",
-    "Upload" : "上传",
     "Cancel upload" : "取消上传",
     "No files in here" : "无文件",
     "Upload some content or sync with your devices!" : "上传一些内容或者与设备同步!",
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index b803908729f..4d9a3737a98 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "上传已取消",
     "Could not get result from server." : "不能从服务器得到结果",
     "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。",
-    "{new_name} already exists" : "{new_name} 已存在",
-    "Could not create file" : "不能创建文件",
-    "Could not create folder" : "不能创建文件夹",
     "Actions" : "动作",
     "Download" : "下载",
     "Select" : "选择",
@@ -47,7 +44,10 @@
     "Error moving file." : "移动文件出错。",
     "Error moving file" : "移动文件错误",
     "Error" : "错误",
+    "{new_name} already exists" : "{new_name} 已存在",
     "Could not rename file" : "不能重命名文件",
+    "Could not create file" : "不能创建文件",
+    "Could not create folder" : "不能创建文件夹",
     "Error deleting file." : "删除文件出错。",
     "No entries in this folder match '{filter}'" : "此文件夹中无项目匹配“{filter}”",
     "Name" : "名称",
@@ -58,6 +58,7 @@
     "{dirs} and {files}" : "{dirs} 和 {files}",
     "You don’t have permission to upload or create files here" : "您没有权限来上传湖州哦和创建文件",
     "_Uploading %n file_::_Uploading %n files_" : ["上传 %n 个文件"],
+    "New" : "新建",
     "\"{name}\" is an invalid file name." : "“{name}”是一个无效的文件名。",
     "File name cannot be empty." : "文件名不能为空。",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的存储空间已满，文件将无法更新或同步！",
@@ -69,6 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n 字节"],
     "Favorited" : "已收藏",
     "Favorite" : "收藏",
+    "Upload" : "上传",
+    "Text file" : "文本文件",
+    "Folder" : "文件夹",
+    "New folder" : "增加文件夹",
     "An error occurred while trying to update the tags" : "更新标签时出错",
     "A new file or folder has been <strong>created</strong>" : "一个新的文件或文件夹已被<strong>创建</strong>",
     "A file or folder has been <strong>changed</strong>" : "一个文件或文件夹已被<strong>修改</strong>",
@@ -96,12 +101,6 @@
     "Settings" : "设置",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "使用这个地址 <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>",
-    "New" : "新建",
-    "New text file" : "创建文本文件",
-    "Text file" : "文本文件",
-    "New folder" : "增加文件夹",
-    "Folder" : "文件夹",
-    "Upload" : "上传",
     "Cancel upload" : "取消上传",
     "No files in here" : "无文件",
     "Upload some content or sync with your devices!" : "上传一些内容或者与设备同步!",
diff --git a/apps/files/l10n/zh_HK.js b/apps/files/l10n/zh_HK.js
index 02193710b4e..94f4397f23b 100644
--- a/apps/files/l10n/zh_HK.js
+++ b/apps/files/l10n/zh_HK.js
@@ -11,6 +11,10 @@ OC.L10N.register(
     "Name" : "名稱",
     "Size" : "大小",
     "{dirs} and {files}" : "{dirs} 和 {files}",
+    "New" : "新增",
+    "Upload" : "上戴",
+    "Folder" : "資料夾",
+    "New folder" : "新資料夾",
     "A new file or folder has been <strong>created</strong>" : "新檔案或資料夾已被 <strong> 新增 </strong>",
     "A file or folder has been <strong>changed</strong>" : "檔案或資料夾已被 <strong> 變成 </strong>",
     "A file or folder has been <strong>deleted</strong>" : "新檔案或資料夾已被 <strong> 刪除 </strong>",
@@ -23,10 +27,6 @@ OC.L10N.register(
     "Save" : "儲存",
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
-    "New" : "新增",
-    "New folder" : "新資料夾",
-    "Folder" : "資料夾",
-    "Upload" : "上戴",
     "Cancel upload" : "取消上戴",
     "Delete" : "刪除"
 },
diff --git a/apps/files/l10n/zh_HK.json b/apps/files/l10n/zh_HK.json
index 23f24afa0a6..63716aca559 100644
--- a/apps/files/l10n/zh_HK.json
+++ b/apps/files/l10n/zh_HK.json
@@ -9,6 +9,10 @@
     "Name" : "名稱",
     "Size" : "大小",
     "{dirs} and {files}" : "{dirs} 和 {files}",
+    "New" : "新增",
+    "Upload" : "上戴",
+    "Folder" : "資料夾",
+    "New folder" : "新資料夾",
     "A new file or folder has been <strong>created</strong>" : "新檔案或資料夾已被 <strong> 新增 </strong>",
     "A file or folder has been <strong>changed</strong>" : "檔案或資料夾已被 <strong> 變成 </strong>",
     "A file or folder has been <strong>deleted</strong>" : "新檔案或資料夾已被 <strong> 刪除 </strong>",
@@ -21,10 +25,6 @@
     "Save" : "儲存",
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
-    "New" : "新增",
-    "New folder" : "新資料夾",
-    "Folder" : "資料夾",
-    "Upload" : "上戴",
     "Cancel upload" : "取消上戴",
     "Delete" : "刪除"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js
index eeefcd95884..7c013533e2a 100644
--- a/apps/files/l10n/zh_TW.js
+++ b/apps/files/l10n/zh_TW.js
@@ -36,9 +36,6 @@ OC.L10N.register(
     "Upload cancelled." : "上傳已取消",
     "Could not get result from server." : "無法從伺服器取回結果",
     "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳。",
-    "{new_name} already exists" : "{new_name} 已經存在",
-    "Could not create file" : "無法建立檔案",
-    "Could not create folder" : "無法建立資料夾",
     "Actions" : "動作",
     "Download" : "下載",
     "Select" : "選擇",
@@ -48,7 +45,10 @@ OC.L10N.register(
     "Error moving file." : "移動檔案發生錯誤",
     "Error moving file" : "移動檔案失敗",
     "Error" : "錯誤",
+    "{new_name} already exists" : "{new_name} 已經存在",
     "Could not rename file" : "無法重新命名",
+    "Could not create file" : "無法建立檔案",
+    "Could not create folder" : "無法建立資料夾",
     "Error deleting file." : "刪除檔案發生錯誤",
     "No entries in this folder match '{filter}'" : "在此資料夾中沒有項目與 '{filter}' 相符",
     "Name" : "名稱",
@@ -59,6 +59,7 @@ OC.L10N.register(
     "{dirs} and {files}" : "{dirs} 和 {files}",
     "You don’t have permission to upload or create files here" : "您沒有權限在這裡上傳或建立檔案",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 個檔案正在上傳"],
+    "New" : "新增",
     "\"{name}\" is an invalid file name." : "{name} 是無效的檔名",
     "File name cannot be empty." : "檔名不能為空",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的儲存空間已滿，沒有辦法再更新或是同步檔案！",
@@ -69,6 +70,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n 位元組"],
     "Favorited" : "已加入最愛",
     "Favorite" : "我的最愛",
+    "Upload" : "上傳",
+    "Text file" : "文字檔",
+    "Folder" : "資料夾",
+    "New folder" : "新資料夾",
     "An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
     "A new file or folder has been <strong>created</strong>" : "新的檔案或目錄已被 <strong>建立</strong>",
     "A file or folder has been <strong>changed</strong>" : "檔案或目錄已被 <strong>變更</strong>",
@@ -93,12 +98,6 @@ OC.L10N.register(
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "使用這個地址<a href=\"%s\" target=\"_blank\">來透過 WebDAV 存取檔案</a>",
-    "New" : "新增",
-    "New text file" : "新文字檔",
-    "Text file" : "文字檔",
-    "New folder" : "新資料夾",
-    "Folder" : "資料夾",
-    "Upload" : "上傳",
     "Cancel upload" : "取消上傳",
     "No files in here" : "沒有任何檔案",
     "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容",
diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json
index 84af9fae39e..9d1aec9e4f2 100644
--- a/apps/files/l10n/zh_TW.json
+++ b/apps/files/l10n/zh_TW.json
@@ -34,9 +34,6 @@
     "Upload cancelled." : "上傳已取消",
     "Could not get result from server." : "無法從伺服器取回結果",
     "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳。",
-    "{new_name} already exists" : "{new_name} 已經存在",
-    "Could not create file" : "無法建立檔案",
-    "Could not create folder" : "無法建立資料夾",
     "Actions" : "動作",
     "Download" : "下載",
     "Select" : "選擇",
@@ -46,7 +43,10 @@
     "Error moving file." : "移動檔案發生錯誤",
     "Error moving file" : "移動檔案失敗",
     "Error" : "錯誤",
+    "{new_name} already exists" : "{new_name} 已經存在",
     "Could not rename file" : "無法重新命名",
+    "Could not create file" : "無法建立檔案",
+    "Could not create folder" : "無法建立資料夾",
     "Error deleting file." : "刪除檔案發生錯誤",
     "No entries in this folder match '{filter}'" : "在此資料夾中沒有項目與 '{filter}' 相符",
     "Name" : "名稱",
@@ -57,6 +57,7 @@
     "{dirs} and {files}" : "{dirs} 和 {files}",
     "You don’t have permission to upload or create files here" : "您沒有權限在這裡上傳或建立檔案",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 個檔案正在上傳"],
+    "New" : "新增",
     "\"{name}\" is an invalid file name." : "{name} 是無效的檔名",
     "File name cannot be empty." : "檔名不能為空",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的儲存空間已滿，沒有辦法再更新或是同步檔案！",
@@ -67,6 +68,10 @@
     "_%n byte_::_%n bytes_" : ["%n 位元組"],
     "Favorited" : "已加入最愛",
     "Favorite" : "我的最愛",
+    "Upload" : "上傳",
+    "Text file" : "文字檔",
+    "Folder" : "資料夾",
+    "New folder" : "新資料夾",
     "An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
     "A new file or folder has been <strong>created</strong>" : "新的檔案或目錄已被 <strong>建立</strong>",
     "A file or folder has been <strong>changed</strong>" : "檔案或目錄已被 <strong>變更</strong>",
@@ -91,12 +96,6 @@
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "使用這個地址<a href=\"%s\" target=\"_blank\">來透過 WebDAV 存取檔案</a>",
-    "New" : "新增",
-    "New text file" : "新文字檔",
-    "Text file" : "文字檔",
-    "New folder" : "新資料夾",
-    "Folder" : "資料夾",
-    "Upload" : "上傳",
     "Cancel upload" : "取消上傳",
     "No files in here" : "沒有任何檔案",
     "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容",
diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
index 44c542d596c..182eb7f17f1 100644
--- a/apps/files_external/l10n/pt_PT.js
+++ b/apps/files_external/l10n/pt_PT.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas solicitadas. Verifique se o código e o segredo da sua app estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas de acesso. Verifique se o código e o segredo da sua app estão corretos.",
+    "Please provide a valid app key and secret." : "Por favor, indique um código e segredo de app válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
@@ -10,34 +13,50 @@ OC.L10N.register(
     "Region (optional for OpenStack Object Storage)" : "Região (opcional para OpenStack Object Storage)",
     "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
     "Tenantname (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessária para OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Palavra-passe (necessária para OpenStack Object Storage)",
     "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
     "URL of identity endpoint (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout de pedidos HTTP em segundos",
+    "Timeout of HTTP requests in seconds" : "Expiração de pedidos HTTP em segundos",
     "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
     "Host" : "Anfitrião",
-    "Username as share" : "Utilizar nome de utilizador como partilha",
+    "Username as share" : "Nome de utilizador como partilha",
     "Share" : "Compartilhar",
     "Remote subfolder" : "Subpasta remota ",
     "Public key" : "Chave pública",
-    "Storage with id \"%i\" not found" : "Armazenamento com ID \"%i\" não encontrado",
+    "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
     "Invalid mount point" : "Ponto de montagem inválido",
     "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos",
     "Personal" : "Pessoal",
     "System" : "Sistema",
     "Grant access" : "Conceder acesso",
     "Access granted" : "Acesso autorizado",
+    "Error configuring OAuth1" : "Erro de configuração OAuth1",
+    "Error configuring OAuth2" : "Erro de configuração OAuth2",
+    "Enable encryption" : "Ative a encriptação",
+    "Enable previews" : "Ative as pré-visualizações",
+    "Check for changes" : "Verifique as suas alterações",
+    "Never" : "Nunca",
+    "Once every direct access" : "Uma vez em cada acesso direto",
+    "Every time the filesystem is used" : "De todas as vezes que o sistema de ficheiros é usado",
     "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Guardado",
     "Generate keys" : "Gerar chaves",
     "Error generating key pair" : "Erro ao gerar chave par",
+    "Access key" : "Código de acesso",
+    "Secret key" : "Código secreto",
+    "Builtin" : "Integrado",
     "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
     "App key" : "Chave da App",
-    "App secret" : "Chave secreta da aplicação",
+    "App secret" : "Segredo da app",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Id. do Cliente",
-    "Client secret" : "Segredo do cliente",
+    "Client secret" : "Segredo do cliente\\\\",
+    "Username and password" : "Nome de utilizador e palavra-passe",
     "Password" : "Palavra-passe",
+    "Session credentials" : "Credenciais da sessão",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Nome do Anfitrião",
     "Port" : "Porta",
@@ -48,11 +67,15 @@ OC.L10N.register(
     "URL" : "URL",
     "Secure https://" : "https:// Seguro",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "ftps:// Seguro",
+    "Google Drive" : "Google Drive",
     "Local" : "Local",
     "Location" : "Localização:",
     "ownCloud" : "ownCloud",
-    "Root" : "Raiz",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
@@ -64,6 +87,7 @@ OC.L10N.register(
     "Scope" : "Âmbito",
     "External Storage" : "Armazenamento Externo",
     "Folder name" : "Nome da pasta",
+    "Authentication" : "Autenticação",
     "Configuration" : "Configuração",
     "Available for" : "Disponível para ",
     "Advanced settings" : "Definições avançadas",
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
index cda3b0bbd07..0f3a9298057 100644
--- a/apps/files_external/l10n/pt_PT.json
+++ b/apps/files_external/l10n/pt_PT.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas solicitadas. Verifique se o código e o segredo da sua app estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas de acesso. Verifique se o código e o segredo da sua app estão corretos.",
+    "Please provide a valid app key and secret." : "Por favor, indique um código e segredo de app válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
@@ -8,34 +11,50 @@
     "Region (optional for OpenStack Object Storage)" : "Região (opcional para OpenStack Object Storage)",
     "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
     "Tenantname (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessária para OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Palavra-passe (necessária para OpenStack Object Storage)",
     "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
     "URL of identity endpoint (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout de pedidos HTTP em segundos",
+    "Timeout of HTTP requests in seconds" : "Expiração de pedidos HTTP em segundos",
     "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
     "Host" : "Anfitrião",
-    "Username as share" : "Utilizar nome de utilizador como partilha",
+    "Username as share" : "Nome de utilizador como partilha",
     "Share" : "Compartilhar",
     "Remote subfolder" : "Subpasta remota ",
     "Public key" : "Chave pública",
-    "Storage with id \"%i\" not found" : "Armazenamento com ID \"%i\" não encontrado",
+    "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
     "Invalid mount point" : "Ponto de montagem inválido",
     "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos",
     "Personal" : "Pessoal",
     "System" : "Sistema",
     "Grant access" : "Conceder acesso",
     "Access granted" : "Acesso autorizado",
+    "Error configuring OAuth1" : "Erro de configuração OAuth1",
+    "Error configuring OAuth2" : "Erro de configuração OAuth2",
+    "Enable encryption" : "Ative a encriptação",
+    "Enable previews" : "Ative as pré-visualizações",
+    "Check for changes" : "Verifique as suas alterações",
+    "Never" : "Nunca",
+    "Once every direct access" : "Uma vez em cada acesso direto",
+    "Every time the filesystem is used" : "De todas as vezes que o sistema de ficheiros é usado",
     "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Guardado",
     "Generate keys" : "Gerar chaves",
     "Error generating key pair" : "Erro ao gerar chave par",
+    "Access key" : "Código de acesso",
+    "Secret key" : "Código secreto",
+    "Builtin" : "Integrado",
     "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
     "App key" : "Chave da App",
-    "App secret" : "Chave secreta da aplicação",
+    "App secret" : "Segredo da app",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Id. do Cliente",
-    "Client secret" : "Segredo do cliente",
+    "Client secret" : "Segredo do cliente\\\\",
+    "Username and password" : "Nome de utilizador e palavra-passe",
     "Password" : "Palavra-passe",
+    "Session credentials" : "Credenciais da sessão",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Nome do Anfitrião",
     "Port" : "Porta",
@@ -46,11 +65,15 @@
     "URL" : "URL",
     "Secure https://" : "https:// Seguro",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "ftps:// Seguro",
+    "Google Drive" : "Google Drive",
     "Local" : "Local",
     "Location" : "Localização:",
     "ownCloud" : "ownCloud",
-    "Root" : "Raiz",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
@@ -62,6 +85,7 @@
     "Scope" : "Âmbito",
     "External Storage" : "Armazenamento Externo",
     "Folder name" : "Nome da pasta",
+    "Authentication" : "Autenticação",
     "Configuration" : "Configuração",
     "Available for" : "Disponível para ",
     "Advanced settings" : "Definições avançadas",
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index e20f0fd868d..c289e4ccac7 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Federated Cloud" : "Gefedereerde Cloud",
     "Your Federated Cloud ID:" : "Uw Federated Cloud ID:",
     "Share it:" : "Deel het:",
+    "Add to your website" : "Toevoegen aan uw website",
     "Share with me via ownCloud" : "Deel met mij via ownCloud",
     "HTML Code:" : "HTML Code:"
 },
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index accdcefd74b..2e47542b679 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -64,6 +64,7 @@
     "Federated Cloud" : "Gefedereerde Cloud",
     "Your Federated Cloud ID:" : "Uw Federated Cloud ID:",
     "Share it:" : "Deel het:",
+    "Add to your website" : "Toevoegen aan uw website",
     "Share with me via ownCloud" : "Deel met mij via ownCloud",
     "HTML Code:" : "HTML Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index 8e9afdd0626..fb16ea5fbab 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -4,41 +4,45 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor",
     "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
-    "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada",
+    "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada",
     "Storage not valid" : "Armazenamento inválido",
     "Couldn't add remote share" : "Não foi possível adicionar a partilha remota",
     "Shared with you" : "Partilhado consigo ",
     "Shared with others" : "Partilhado com outros",
     "Shared by link" : "Partilhado pela hiperligação",
     "Nothing shared with you yet" : "Ainda não foi partilhado nada consigo",
-    "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui",
-    "Nothing shared yet" : "Ainda não foi nada paratilhado",
-    "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui",
+    "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradaos aqui",
+    "Nothing shared yet" : "Ainda não foi partilhado nada",
+    "Files and folders you share will show up here" : "Os ficheiros e as pastas que partilha serão mostrados aqui",
     "No shared links" : "Sem hiperligações partilhadas",
-    "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui",
+    "Files and folders you share by link will show up here" : "Os ficheiros e as pastas que partilha com esta hiperligação, serão mostrados aqui",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?",
     "Remote share" : "Partilha remota",
     "Remote share password" : "Senha da partilha remota",
     "Cancel" : "Cancelar",
     "Add remote share" : "Adicionar partilha remota",
-    "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}",
+    "You can upload into this folder" : "Pode enviar para esta pasta",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Não foi encontrada nenhuma instalação OwnCloud (7 ou superior) em {remote}",
     "Invalid ownCloud url" : "Url ownCloud inválido",
     "Shared by" : "Partilhado por",
     "Sharing" : "Partilha",
     "A file or folder has been <strong>shared</strong>" : "Foi <strong>partilhado</strong> um ficheiro ou uma pasta",
     "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>",
-    "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi  <strong>descarregado</strong>",
-    "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s",
+    "A public shared file or folder was <strong>downloaded</strong>" : "Foi  <strong>transferido</strong> um ficheiro ou pasta partilhada publicamente",
+    "You received a new remote share %2$s from %1$s" : "Recebeu uma nova partilha remota %2$s de %1$s",
+    "You received a new remote share from %s" : "Recebeu uma nova partilha remota de %s",
     "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s",
     "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s",
-    "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo",
-    "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada",
-    "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado",
+    "%1$s unshared %2$s from you" : "%1$s cancelou a partilha %2$s consigo",
+    "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi transferida",
+    "Public shared file %1$s was downloaded" : "Foi transferido o ficheiro %1$s partilhado publicamente",
     "You shared %1$s with %2$s" : "Partilhou %1$s com %2$s",
     "You shared %1$s with group %2$s" : "Partilhou %1$s com o grupo %2$s",
     "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo",
     "You shared %1$s via link" : "Partilhou %1$s através de uma hiperligação",
     "Shares" : "Partilhas",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud",
     "This share is password-protected" : "Esta partilha está protegida por senha",
     "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.",
     "Password" : "Senha",
@@ -55,10 +59,14 @@ OC.L10N.register(
     "Download" : "Transferir",
     "Download %s" : "Transferir %s",
     "Direct link" : "Hiperligação direta",
-    "Federated Cloud Sharing" : "Partilha de Cloud Federada",
+    "Federated Cloud Sharing" : "Partilha de Nuvem Federada",
     "Open documentation" : "Abrir documentação",
     "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores",
     "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores",
+    "Federated Cloud" : "Nuvem Federada",
+    "Your Federated Cloud ID:" : "A Sua Id. da Nuvem Federada",
+    "Share it:" : "Partilhe:",
+    "Add to your website" : "Adicione ao seu sítio da Web",
     "Share with me via ownCloud" : "Partilhe comigo via ownCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index 9a66c73a681..6d5c21a5487 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -2,41 +2,45 @@
     "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor",
     "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
-    "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada",
+    "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada",
     "Storage not valid" : "Armazenamento inválido",
     "Couldn't add remote share" : "Não foi possível adicionar a partilha remota",
     "Shared with you" : "Partilhado consigo ",
     "Shared with others" : "Partilhado com outros",
     "Shared by link" : "Partilhado pela hiperligação",
     "Nothing shared with you yet" : "Ainda não foi partilhado nada consigo",
-    "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui",
-    "Nothing shared yet" : "Ainda não foi nada paratilhado",
-    "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui",
+    "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradaos aqui",
+    "Nothing shared yet" : "Ainda não foi partilhado nada",
+    "Files and folders you share will show up here" : "Os ficheiros e as pastas que partilha serão mostrados aqui",
     "No shared links" : "Sem hiperligações partilhadas",
-    "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui",
+    "Files and folders you share by link will show up here" : "Os ficheiros e as pastas que partilha com esta hiperligação, serão mostrados aqui",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?",
     "Remote share" : "Partilha remota",
     "Remote share password" : "Senha da partilha remota",
     "Cancel" : "Cancelar",
     "Add remote share" : "Adicionar partilha remota",
-    "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}",
+    "You can upload into this folder" : "Pode enviar para esta pasta",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Não foi encontrada nenhuma instalação OwnCloud (7 ou superior) em {remote}",
     "Invalid ownCloud url" : "Url ownCloud inválido",
     "Shared by" : "Partilhado por",
     "Sharing" : "Partilha",
     "A file or folder has been <strong>shared</strong>" : "Foi <strong>partilhado</strong> um ficheiro ou uma pasta",
     "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>",
-    "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi  <strong>descarregado</strong>",
-    "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s",
+    "A public shared file or folder was <strong>downloaded</strong>" : "Foi  <strong>transferido</strong> um ficheiro ou pasta partilhada publicamente",
+    "You received a new remote share %2$s from %1$s" : "Recebeu uma nova partilha remota %2$s de %1$s",
+    "You received a new remote share from %s" : "Recebeu uma nova partilha remota de %s",
     "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s",
     "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s",
-    "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo",
-    "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada",
-    "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado",
+    "%1$s unshared %2$s from you" : "%1$s cancelou a partilha %2$s consigo",
+    "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi transferida",
+    "Public shared file %1$s was downloaded" : "Foi transferido o ficheiro %1$s partilhado publicamente",
     "You shared %1$s with %2$s" : "Partilhou %1$s com %2$s",
     "You shared %1$s with group %2$s" : "Partilhou %1$s com o grupo %2$s",
     "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo",
     "You shared %1$s via link" : "Partilhou %1$s através de uma hiperligação",
     "Shares" : "Partilhas",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud",
     "This share is password-protected" : "Esta partilha está protegida por senha",
     "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.",
     "Password" : "Senha",
@@ -53,10 +57,14 @@
     "Download" : "Transferir",
     "Download %s" : "Transferir %s",
     "Direct link" : "Hiperligação direta",
-    "Federated Cloud Sharing" : "Partilha de Cloud Federada",
+    "Federated Cloud Sharing" : "Partilha de Nuvem Federada",
     "Open documentation" : "Abrir documentação",
     "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores",
     "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores",
+    "Federated Cloud" : "Nuvem Federada",
+    "Your Federated Cloud ID:" : "A Sua Id. da Nuvem Federada",
+    "Share it:" : "Partilhe:",
+    "Add to your website" : "Adicione ao seu sítio da Web",
     "Share with me via ownCloud" : "Partilhe comigo via ownCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index 8fa20c8e024..a5c899a5986 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Não foi possível enviar a mensagem para os seguintes utilizadores: %s",
+    "Preparing update" : "A preparar atualização",
     "Turned on maintenance mode" : "Ativado o modo de manutenção",
     "Turned off maintenance mode" : "Desativado o modo de manutenção",
     "Maintenance mode is kept active" : "O modo de manutenção é mantido ativo",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Corrija o erro:",
     "Following incompatible apps have been disabled: %s" : "As seguintes apps incompatíveis foram desativadas: %s",
     "Following apps have been disabled: %s" : "As seguintes apps foram desativadas: %s",
+    "Already up to date" : "Já está atualizado",
     "File is too big" : "O ficheiro é muito grande",
     "Invalid file provided" : "Ficheiro indicado inválido",
     "No image or file provided" : "Não foi fornecido nenhum ficheiro ou imagem",
@@ -36,6 +38,13 @@ OC.L10N.register(
     "Thu." : "Qui.",
     "Fri." : "Sex.",
     "Sat." : "Sáb.",
+    "Su" : "Dom",
+    "Mo" : "Seg",
+    "Tu" : "Ter",
+    "We" : "Qua",
+    "Th" : "Qui",
+    "Fr" : "Sex",
+    "Sa" : "Sáb",
     "January" : "Janeiro",
     "February" : "Fevereiro",
     "March" : "Março",
@@ -159,6 +168,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "A atualização foi bem sucedida. Tem alguns avisos.",
     "The update was successful. Redirecting you to ownCloud now." : "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
     "Couldn't reset password because the token is invalid" : "Não foi possível repor a palavra-passe porque a senha é inválida",
+    "Couldn't reset password because the token is expired" : "Não foi possível repor a palavra-passe porque a senha expirou",
     "Couldn't send reset email. Please make sure your username is correct." : "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.",
     "%s password reset" : "%s reposição da palavra-passe",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index e528b7c776d..736490eb273 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Não foi possível enviar a mensagem para os seguintes utilizadores: %s",
+    "Preparing update" : "A preparar atualização",
     "Turned on maintenance mode" : "Ativado o modo de manutenção",
     "Turned off maintenance mode" : "Desativado o modo de manutenção",
     "Maintenance mode is kept active" : "O modo de manutenção é mantido ativo",
@@ -11,6 +12,7 @@
     "Repair error: " : "Corrija o erro:",
     "Following incompatible apps have been disabled: %s" : "As seguintes apps incompatíveis foram desativadas: %s",
     "Following apps have been disabled: %s" : "As seguintes apps foram desativadas: %s",
+    "Already up to date" : "Já está atualizado",
     "File is too big" : "O ficheiro é muito grande",
     "Invalid file provided" : "Ficheiro indicado inválido",
     "No image or file provided" : "Não foi fornecido nenhum ficheiro ou imagem",
@@ -34,6 +36,13 @@
     "Thu." : "Qui.",
     "Fri." : "Sex.",
     "Sat." : "Sáb.",
+    "Su" : "Dom",
+    "Mo" : "Seg",
+    "Tu" : "Ter",
+    "We" : "Qua",
+    "Th" : "Qui",
+    "Fr" : "Sex",
+    "Sa" : "Sáb",
     "January" : "Janeiro",
     "February" : "Fevereiro",
     "March" : "Março",
@@ -157,6 +166,7 @@
     "The update was successful. There were warnings." : "A atualização foi bem sucedida. Tem alguns avisos.",
     "The update was successful. Redirecting you to ownCloud now." : "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
     "Couldn't reset password because the token is invalid" : "Não foi possível repor a palavra-passe porque a senha é inválida",
+    "Couldn't reset password because the token is expired" : "Não foi possível repor a palavra-passe porque a senha expirou",
     "Couldn't send reset email. Please make sure your username is correct." : "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.",
     "%s password reset" : "%s reposição da palavra-passe",
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index 42f367d21c2..d644d7d3426 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -91,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Der skete en fejl ved deling af %s, brugeren %s eksistere ikke",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Der skete en fejl ved deling af %s, brugeren %s er ikke medlem af nogle grupper som %s er medlem af",
     "Sharing %s failed, because this item is already shared with %s" : "Der skete en fejl ved deling af %s, objektet er allerede delt med %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Deling af %s mislykkedes, fordi dette element allerede er delt med brugeren %s",
     "Sharing %s failed, because the group %s does not exist" : "Der skete en fejl ved deling af %s, gruppen %s eksistere ikke",
     "Sharing %s failed, because %s is not a member of the group %s" : "Der skete en fejl ved deling af %s, fordi %s ikke er medlem af gruppen %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Du skal angive et kodeord for at oprette et offentligt link - kun beskyttede links er tilladt",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index 0e20adc31bf..d57ea2a92ae 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -89,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Der skete en fejl ved deling af %s, brugeren %s eksistere ikke",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Der skete en fejl ved deling af %s, brugeren %s er ikke medlem af nogle grupper som %s er medlem af",
     "Sharing %s failed, because this item is already shared with %s" : "Der skete en fejl ved deling af %s, objektet er allerede delt med %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Deling af %s mislykkedes, fordi dette element allerede er delt med brugeren %s",
     "Sharing %s failed, because the group %s does not exist" : "Der skete en fejl ved deling af %s, gruppen %s eksistere ikke",
     "Sharing %s failed, because %s is not a member of the group %s" : "Der skete en fejl ved deling af %s, fordi %s ikke er medlem af gruppen %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Du skal angive et kodeord for at oprette et offentligt link - kun beskyttede links er tilladt",
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index e08ed66f1b5..3f1d751fc1e 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -91,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Se ha fallado al compartir %s, ya que el usuario %s no existe",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Se ha fallado al compartir %s, ya que el usuario %s no es miembro de ningún grupo del que %s sea miembro",
     "Sharing %s failed, because this item is already shared with %s" : "Se falló al compartir %s, ya que este elemento ya está compartido con %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Compartiendo %s falló, porque este objeto ya se comparte con el usuario %s",
     "Sharing %s failed, because the group %s does not exist" : "Se falló al compartir %s, ya que el grupo %s no existe",
     "Sharing %s failed, because %s is not a member of the group %s" : "Se falló al compartir %s, ya que %s no es miembro del grupo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Es necesario definir una contraseña para crear un enlace publico. Solo los enlaces protegidos están permitidos",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index f9bca103231..75b8060b819 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -89,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Se ha fallado al compartir %s, ya que el usuario %s no existe",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Se ha fallado al compartir %s, ya que el usuario %s no es miembro de ningún grupo del que %s sea miembro",
     "Sharing %s failed, because this item is already shared with %s" : "Se falló al compartir %s, ya que este elemento ya está compartido con %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Compartiendo %s falló, porque este objeto ya se comparte con el usuario %s",
     "Sharing %s failed, because the group %s does not exist" : "Se falló al compartir %s, ya que el grupo %s no existe",
     "Sharing %s failed, because %s is not a member of the group %s" : "Se falló al compartir %s, ya que %s no es miembro del grupo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Es necesario definir una contraseña para crear un enlace publico. Solo los enlaces protegidos están permitidos",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 873abd44ad0..d0abd693e0c 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -90,6 +90,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Le partage de %s a échoué car l'utilisateur %s n'existe pas",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Le partage de %s a échoué car l'utilisateur %s n'est membre d'aucun groupe auquel %s appartient",
     "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet objet est déjà partagé avec %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Le partage de %s a échoué car cet élément est déjà partagé avec l'utilisateur %s",
     "Sharing %s failed, because the group %s does not exist" : "Le partage de %s a échoué car le groupe %s n'existe pas",
     "Sharing %s failed, because %s is not a member of the group %s" : "Le partage de %s a échoué car %s n'est pas membre du groupe %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Vous devez fournir un mot de passe pour créer un lien public, seuls les liens protégés sont autorisées.",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 440f2ddd84d..d0a90797df9 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -88,6 +88,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Le partage de %s a échoué car l'utilisateur %s n'existe pas",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Le partage de %s a échoué car l'utilisateur %s n'est membre d'aucun groupe auquel %s appartient",
     "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet objet est déjà partagé avec %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Le partage de %s a échoué car cet élément est déjà partagé avec l'utilisateur %s",
     "Sharing %s failed, because the group %s does not exist" : "Le partage de %s a échoué car le groupe %s n'existe pas",
     "Sharing %s failed, because %s is not a member of the group %s" : "Le partage de %s a échoué car %s n'est pas membre du groupe %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Vous devez fournir un mot de passe pour créer un lien public, seuls les liens protégés sont autorisées.",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index d08e8294dfb..5abae786d34 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -91,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Delen van %s is mislukt, omdat gebruiker %s niet bestaat",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Delen van %s is mislukt, omdat gebruiker %s geen lid is van een groep waar %s lid van is",
     "Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met gebruiker %s",
     "Sharing %s failed, because the group %s does not exist" : "Delen van %s is mislukt, omdat groep %s niet bestaat",
     "Sharing %s failed, because %s is not a member of the group %s" : "Delen van %s is mislukt, omdat %s geen lid is van groep %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "U moet een wachtwoord verstrekken om een openbare koppeling te maken, alleen beschermde links zijn toegestaan",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 8d0b5dc7169..4e4eaf8b52a 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -89,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Delen van %s is mislukt, omdat gebruiker %s niet bestaat",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Delen van %s is mislukt, omdat gebruiker %s geen lid is van een groep waar %s lid van is",
     "Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met gebruiker %s",
     "Sharing %s failed, because the group %s does not exist" : "Delen van %s is mislukt, omdat groep %s niet bestaat",
     "Sharing %s failed, because %s is not a member of the group %s" : "Delen van %s is mislukt, omdat %s geen lid is van groep %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "U moet een wachtwoord verstrekken om een openbare koppeling te maken, alleen beschermde links zijn toegestaan",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 7ca3772718e..ceee37922cf 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php není nejspíše správně nastaveno pro dotazování na proměnné hodnoty systému. Test s getenv(\"PATH\") vrací pouze prázdnou odpověď.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Zkontrolujte prosím konfiguraci php podle instalační dokumentace a php konfiguraci na serveru, hlavně při použití php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfigurace je nastavena pouze pro čtení. Toto znemožňuje některá nastavení přes webové rozhraní. Dále musí být pro každou změnu povolen zápis do konfiguračního souboru ručně.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index ef0fab25d17..2dbe29a8cab 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php není nejspíše správně nastaveno pro dotazování na proměnné hodnoty systému. Test s getenv(\"PATH\") vrací pouze prázdnou odpověď.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Zkontrolujte prosím konfiguraci php podle instalační dokumentace a php konfiguraci na serveru, hlavně při použití php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfigurace je nastavena pouze pro čtení. Toto znemožňuje některá nastavení přes webové rozhraní. Dále musí být pro každou změnu povolen zápis do konfiguračního souboru ručně.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index e7c7baf4e32..a8ad193c646 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lader ikke til at være korrekt opsat til at forespørge miljøvariablerne i systemet. Testen med getenv(\"PATH\") returnerer blot et tomt svar.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tjek venligst dokumentationen til installation for noterne til konfiguration af php og konfigurationen af php for din server, særligt når php-fpm anvendes.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfiguration er blevet slået til. Dette forhindrer indstillinger af nogle konfigurationer via webgrænsefladen. I tillæg skal filen gøres skrivbar manuelt for hver opdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 4656d407098..bb8f5cfba3c 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lader ikke til at være korrekt opsat til at forespørge miljøvariablerne i systemet. Testen med getenv(\"PATH\") returnerer blot et tomt svar.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tjek venligst dokumentationen til installation for noterne til konfiguration af php og konfigurationen af php for din server, særligt når php-fpm anvendes.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfiguration er blevet slået til. Dette forhindrer indstillinger af nogle konfigurationer via webgrænsefladen. I tillæg skal filen gøres skrivbar manuelt for hver opdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index b74a5364d1a..79c5d57cf13 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfe die Installationsdokumentation auf Hinweise zur PHP-Konfiguration sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index d0e658c3c0f..0d0d2eef602 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfe die Installationsdokumentation auf Hinweise zur PHP-Konfiguration sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 9c1b5e3fd94..31276630dc0 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfen Sie die Installationsdokumentation auf Hinweise zur PHP-Konfiguration sowie die PHP-Konfiguration Ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzen.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 046b412337f..e3fd49d2857 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -113,7 +113,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfen Sie die Installationsdokumentation auf Hinweise zur PHP-Konfiguration sowie die PHP-Konfiguration Ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzen.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 859bfe296cf..6f167f62493 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Η php δεν φαίνεται να είναι σωστά ρυθμισμένη για ερωτήματα σε μεταβλητές περιβάλλοντος του συστήματος. Η δοκιμή με την εντολή getenv(\"PATH\") επιστρέφει κενή απάντηση.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Παρακαλούμε ελέγξτε την τεκμηρίωση της εγκατάστασης για τις σημειώσεις σχετικά με τη διαμόρφωση της php και τη διαμόρφωση της php στο διακομιστή σας, ειδικά όταν χρησιμοποιείτε php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Η ρύθμιση  \"μόνο ανάγνωση\"  έχει ενεργοποιηθεί. Αυτό εμποδίζει τον καθορισμό κάποιων ρυθμίσεων μέσω της διεπαφής web. Επιπλέον, το αρχείο πρέπει να γίνει χειροκίνητα εγγράψιμο πριν από κάθε διαδικασία ενημέρωσης.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index a0b1f0c7f13..9b758b1eec3 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Η php δεν φαίνεται να είναι σωστά ρυθμισμένη για ερωτήματα σε μεταβλητές περιβάλλοντος του συστήματος. Η δοκιμή με την εντολή getenv(\"PATH\") επιστρέφει κενή απάντηση.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Παρακαλούμε ελέγξτε την τεκμηρίωση της εγκατάστασης για τις σημειώσεις σχετικά με τη διαμόρφωση της php και τη διαμόρφωση της php στο διακομιστή σας, ειδικά όταν χρησιμοποιείτε php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Η ρύθμιση  \"μόνο ανάγνωση\"  έχει ενεργοποιηθεί. Αυτό εμποδίζει τον καθορισμό κάποιων ρυθμίσεων μέσω της διεπαφής web. Επιπλέον, το αρχείο πρέπει να γίνει χειροκίνητα εγγράψιμο πριν από κάθε διαδικασία ενημέρωσης.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index af0d61512e3..3385448f4e4 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -112,7 +112,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index bac57ed2974..7a426bbc1f4 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -110,7 +110,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index b39ffffba1d..efb56b54c38 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique la documentación de instalación para las notas de configuración de php y la configuración de php en tu servidor, específicamente donde se está usando php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 87e280637a3..f7e3ce433b7 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique la documentación de instalación para las notas de configuración de php y la configuración de php en tu servidor, específicamente donde se está usando php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index d07fe9ebf26..c20bef29b3c 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php ne semble pas être configuré de manière à récupérer les valeurs des variables d’environnement. Le test de la commande getenv(\"PATH\") retourne seulement une réponse vide. ",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez verifier la documentation d'installation concernant les instructions de configuration de php ainsi que la configuration de votre serveur, en particulier dans le cas où vous utilisez php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 0688759770c..b86a44adaf0 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php ne semble pas être configuré de manière à récupérer les valeurs des variables d’environnement. Le test de la commande getenv(\"PATH\") retourne seulement une réponse vide. ",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez verifier la documentation d'installation concernant les instructions de configuration de php ainsi que la configuration de votre serveur, en particulier dans le cas où vous utilisez php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index 650b1d471cc..dc2a23f5a08 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Semella que PHP non está configurado correctamente para consultar as variábeis de entorno do sistema. A proba con getenv(\"PATH\") só devolve unha resposta baleira.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Consulte a documentación de instalación para ver as notas de configuración de PHP e a configuración PHP do servidor, especialmente se emprega php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Foi activada a restrición da configuración a só lectura. Isto impide o estabelecemento dalgunhas configuracións a través da interface web. Ademais, ten que facer escribíbel manualmente o ficheiro para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 1d2bf9b137e..65939eeb397 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Semella que PHP non está configurado correctamente para consultar as variábeis de entorno do sistema. A proba con getenv(\"PATH\") só devolve unha resposta baleira.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Consulte a documentación de instalación para ver as notas de configuración de PHP e a configuración PHP do servidor, especialmente se emprega php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Foi activada a restrición da configuración a só lectura. Isto impide o estabelecemento dalgunhas configuracións a través da interface web. Ademais, ten que facer escribíbel manualmente o ficheiro para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index c36bd864138..344805ec1e9 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "kelihatannya php tidak diatur dengan benar untuk variabel lingkungan sistem kueri. Pemeriksaan dengan getenv(\"PATH\") hanya mengembalikan respon kosong.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Mohon periksa dokumentasi instalasi untuk catatan konfigurasi php dan konfigurasi php server Anda, terutama saat menggunakan ph-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP tampaknya disetel menjadi strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 5f6e21dd843..5d238d81822 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "kelihatannya php tidak diatur dengan benar untuk variabel lingkungan sistem kueri. Pemeriksaan dengan getenv(\"PATH\") hanya mengembalikan respon kosong.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Mohon periksa dokumentasi instalasi untuk catatan konfigurasi php dan konfigurasi php server Anda, terutama saat menggunakan ph-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP tampaknya disetel menjadi strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 5316867a882..aa1e6d7e93f 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php non sembra essere configurato correttamente per interrogare le variabili d'ambiente di sistema. Il test con getenv(\"PATH\") restituisce solo una risposta vuota.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Controlla la documentazione di installazione per le note di configurazione di php e la configurazione del tuo server, specialmente quando utilizzi php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configurazione di sola lettura è stata abilitata. Ciò impedisce l'impostazione di alcune configurazioni tramite l'interfaccia web. Inoltre, i file devono essere resi scrivibili manualmente per ogni aggiornamento.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index c13d21bf4b7..c4f227a1953 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php non sembra essere configurato correttamente per interrogare le variabili d'ambiente di sistema. Il test con getenv(\"PATH\") restituisce solo una risposta vuota.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Controlla la documentazione di installazione per le note di configurazione di php e la configurazione del tuo server, specialmente quando utilizzi php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configurazione di sola lettura è stata abilitata. Ciò impedisce l'impostazione di alcune configurazioni tramite l'interfaccia web. Inoltre, i file devono essere resi scrivibili manualmente per ogni aggiornamento.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index 5e3bc7183f1..0bb2fbef5ac 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php가 시스템 환경 변수를 올바르게 조회할 수 있도록 설정되지 않았습니다. getenv(\"PATH\")의 값이 비어 있습니다.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "설치 문서를 참조하여 php 설정 방법 및 php 설정을 변경하십시오. php-fpm을 사용한다면 더 주의하십시오.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "읽기 전용 설정이 활성화되었습니다. 이 상태에서는 웹 인터페이스를 통하여 일부 설정을 변경할 수 없습니다. 또한 매 업데이트마다 파일을 쓸 수 있는 상태로 변경해야 합니다.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index b9cc5084cc4..f5d774aba65 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php가 시스템 환경 변수를 올바르게 조회할 수 있도록 설정되지 않았습니다. getenv(\"PATH\")의 값이 비어 있습니다.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "설치 문서를 참조하여 php 설정 방법 및 php 설정을 변경하십시오. php-fpm을 사용한다면 더 주의하십시오.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "읽기 전용 설정이 활성화되었습니다. 이 상태에서는 웹 인터페이스를 통하여 일부 설정을 변경할 수 없습니다. 또한 매 업데이트마다 파일을 쓸 수 있는 상태로 변경해야 합니다.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index efdcc9b6de8..a3c071b3f2f 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP ser ikke ut til å være satt opp riktig for å lese systemets miljøvariabler. Testen med getenv(\"PATH\") returnerer bare et tomt svar.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Sjekk installasjonsdokumentasjonen for notiser om PHP-konfigurering og om konfigurering av serveren, spesielt ved bruk av php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfigurasjonen er blitt aktivert. Dette forhindrer setting av visse konfigureringer via web-grensesnittet. Videre må config-filen gjøres skrivbar manuelt for hver oppdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index b3d673e7df3..485cd207008 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -113,7 +113,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP ser ikke ut til å være satt opp riktig for å lese systemets miljøvariabler. Testen med getenv(\"PATH\") returnerer bare et tomt svar.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Sjekk installasjonsdokumentasjonen for notiser om PHP-konfigurering og om konfigurering av serveren, spesielt ved bruk av php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfigurasjonen er blitt aktivert. Dette forhindrer setting av visse konfigureringer via web-grensesnittet. Videre må config-filen gjøres skrivbar manuelt for hver oppdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 6fef65aabc4..97958325168 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de documentatie voor php configuratieinstellingen en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 978b70e7996..637cc3bb2d9 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de documentatie voor php configuratieinstellingen en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
index a8f78ecb65b..c4e745e368e 100644
--- a/settings/l10n/oc.js
+++ b/settings/l10n/oc.js
@@ -108,7 +108,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "sembla que php es pas configurat de manièra a recuperar las valors de las variablas d’environament. Lo test de la comanda getenv(\"PATH\") torna solament una responsa voida. ",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verificatz la documentacion d'installacion a prepaus de las instruccions de configuracion de php e tanben de la configuracion de vòstre servidor, en particular dins lo cas qu'utilizatz php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuracion es en mòde lectura sola. Aquò empacha la modificacion de certanas configuracions via l'interfàcia web. Amai, lo fichièr deu èsser passat manualament en lectura-escritura per cada mesa a jorn.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP es aparentament configurat per suprimir los blòts de documentacion intèrnes. Aquò rendrà mantuna aplicacion de basa inaccessiblas.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La rason es probablament l'utilizacion d'un escondedor / accelerador tal coma Zend OPcache o eAccelerator.",
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
index 2830cf64518..9a2d5a5bc2d 100644
--- a/settings/l10n/oc.json
+++ b/settings/l10n/oc.json
@@ -106,7 +106,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "sembla que php es pas configurat de manièra a recuperar las valors de las variablas d’environament. Lo test de la comanda getenv(\"PATH\") torna solament una responsa voida. ",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verificatz la documentacion d'installacion a prepaus de las instruccions de configuracion de php e tanben de la configuracion de vòstre servidor, en particular dins lo cas qu'utilizatz php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuracion es en mòde lectura sola. Aquò empacha la modificacion de certanas configuracions via l'interfàcia web. Amai, lo fichièr deu èsser passat manualament en lectura-escritura per cada mesa a jorn.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP es aparentament configurat per suprimir los blòts de documentacion intèrnes. Aquò rendrà mantuna aplicacion de basa inaccessiblas.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La rason es probablament l'utilizacion d'un escondedor / accelerador tal coma Zend OPcache o eAccelerator.",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index d6d7fad0759..bf7b404b6ca 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "O PHP não parecem esta configurado corretamente para consultar as variáveis de ambiente do sistema. O teste com getenv(\"PATH\") só retorna uma resposta vazia.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique a documentação de instalação para as notas de configuração do PHP e a configuração do PHP do seu servidor, especialmente quando se utiliza php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "A configuração Somente-Leitura foi habilitada. Isso impede que algumas configurações sejam definidas via a interface web. Além disso, o arquivo precisa ter permissão de escrita manual para cada atualização.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index d06ae0f7dd7..ee03a1cdd08 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "O PHP não parecem esta configurado corretamente para consultar as variáveis de ambiente do sistema. O teste com getenv(\"PATH\") só retorna uma resposta vazia.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique a documentação de instalação para as notas de configuração do PHP e a configuração do PHP do seu servidor, especialmente quando se utiliza php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "A configuração Somente-Leitura foi habilitada. Isso impede que algumas configurações sejam definidas via a interface web. Além disso, o arquivo precisa ter permissão de escrita manual para cada atualização.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index df4df129c49..f744091d294 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -143,6 +143,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
+    "Enable encryption" : "Ative a encriptação",
     "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 44a1bc88916..fa8c0a7d21f 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -141,6 +141,7 @@
     "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
+    "Enable encryption" : "Ative a encriptação",
     "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index d715cc41398..7ccef65d29f 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP был установлен неверно. Запрос getenv(\"PATH\") возвращает пустые результаты.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Пожалуйста обратитесь к документации по установке для получения заметок по настройке php, а также к настройкам php вашего сервера, особенно это касается php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса невозможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index ac2aa38d849..88dc9a5ba5d 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP был установлен неверно. Запрос getenv(\"PATH\") возвращает пустые результаты.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Пожалуйста обратитесь к документации по установке для получения заметок по настройке php, а также к настройкам php вашего сервера, особенно это касается php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса невозможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index f63cedbe918..d89fe14c546 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "SSL" : "ССЛ",
     "TLS" : "ТЛС",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ПХП није подешен да може да провери системске променљиве. Проба са getenv(\"PATH\") враћа празан одговор.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Погледајте инсталациону документацију за ПХП и серверска подешавања, посебно кад се користи php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Омогућена је Само-читај конфигурација. То спречава постављање неке конфигурације преко веб-интерфејса. Осим тога, фајлу мора бити ручно омогућено уписивање код сваког освежавања.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "ПХП је очигледно подешен да се скида уметнуте док блокова. То ће учинити неколико кључних апликација недоступним.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ово је вероватно изазвано кешом или акцелератором као што су ЗендОПкеш или еАкцелератор.",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index 9d3767e0df6..e360fcb863c 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -113,7 +113,6 @@
     "SSL" : "ССЛ",
     "TLS" : "ТЛС",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ПХП није подешен да може да провери системске променљиве. Проба са getenv(\"PATH\") враћа празан одговор.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Погледајте инсталациону документацију за ПХП и серверска подешавања, посебно кад се користи php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Омогућена је Само-читај конфигурација. То спречава постављање неке конфигурације преко веб-интерфејса. Осим тога, фајлу мора бити ручно омогућено уписивање код сваког освежавања.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "ПХП је очигледно подешен да се скида уметнуте док блокова. То ће учинити неколико кључних апликација недоступним.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ово је вероватно изазвано кешом или акцелератором као што су ЗендОПкеш или еАкцелератор.",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index 043f3429bf3..552dd7d2e6f 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ไม่ได้ติดตั้งphp อย่างถูกต้องค้นหาตัวแปรสภาพแวดล้อมของระบบการทดสอบกับ getenv(\"PATH\") ส่งกลับเฉพาะการตอบสนองที่ว่างเปล่า",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "กรุณาตรวจสอบเอกสารการติดตั้งสำหรับการบันทึกการตั้งค่าและการกำหนดค่า PHP ของเซิร์ฟเวอร์ของคุณโดยเฉพาะอย่างยิ่งเมื่อใช้ PHP-FPM",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "ตั้งค่าให้สามารถอ่านได้อย่างเดียวถูกเปิดใช้งาน นี้จะช่วยป้องกันการตั้งค่าผ่านทางบางเว็บอินเตอร์เฟซ นอกจากนี้จะต้องเขียนไฟล์ด้วยตนเองสำหรับทุกการอัพเดท",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "เห็นได้ชัดว่าการตั้งค่า PHP จะตัดบล็อคเอกสารแบบอินไลน์ ซึ่งจะทำให้แอพพลิเคชันอีกหลายแกนไม่สามารถเข้าถึงได้",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "นี้อาจเกิดจาก cache/accelerator อย่างเช่น Zend OPcache หรือ eAccelerator",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index e67cc01f279..65f226ba72a 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ไม่ได้ติดตั้งphp อย่างถูกต้องค้นหาตัวแปรสภาพแวดล้อมของระบบการทดสอบกับ getenv(\"PATH\") ส่งกลับเฉพาะการตอบสนองที่ว่างเปล่า",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "กรุณาตรวจสอบเอกสารการติดตั้งสำหรับการบันทึกการตั้งค่าและการกำหนดค่า PHP ของเซิร์ฟเวอร์ของคุณโดยเฉพาะอย่างยิ่งเมื่อใช้ PHP-FPM",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "ตั้งค่าให้สามารถอ่านได้อย่างเดียวถูกเปิดใช้งาน นี้จะช่วยป้องกันการตั้งค่าผ่านทางบางเว็บอินเตอร์เฟซ นอกจากนี้จะต้องเขียนไฟล์ด้วยตนเองสำหรับทุกการอัพเดท",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "เห็นได้ชัดว่าการตั้งค่า PHP จะตัดบล็อคเอกสารแบบอินไลน์ ซึ่งจะทำให้แอพพลิเคชันอีกหลายแกนไม่สามารถเข้าถึงได้",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "นี้อาจเกิดจาก cache/accelerator อย่างเช่น Zend OPcache หรือ eAccelerator",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 89395920948..e23662341fb 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP sistem değişkenleri sorgusuna uygun olarak ayarlanmamış görünüyor. getenv(\"PATH\") komutu sadece boş bir cevap döndürüyor.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lütfen kurulum belgelendirmesindeki php ayarlama notlarını ve sunucudaki özellikle php-fpm kullanırken php ayarlamalarını kontrol edin.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Salt Okunur yapılandırma etkinleştirilmiş. Bu, bazı ayarların web arayüzü ile yapılandırılmasını önler. Ayrıca, bu dosya her güncelleme sırasında el ile yazılabilir yapılmalıdır.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 51ec1a007e0..8c7a39f0a2a 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP sistem değişkenleri sorgusuna uygun olarak ayarlanmamış görünüyor. getenv(\"PATH\") komutu sadece boş bir cevap döndürüyor.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lütfen kurulum belgelendirmesindeki php ayarlama notlarını ve sunucudaki özellikle php-fpm kullanırken php ayarlamalarını kontrol edin.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Salt Okunur yapılandırma etkinleştirilmiş. Bu, bazı ayarların web arayüzü ile yapılandırılmasını önler. Ayrıca, bu dosya her güncelleme sırasında el ile yazılabilir yapılmalıdır.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 6b6d50dccb2..6fa83464bc0 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 似乎没有设置好查询的系统环境变量。 用 getenv(\\\"PATH\\\") 测试只返回一个空值。",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "请检查PHP配置说明和服务器的 PHP 配置的安装文档，使用 PHP-FPM 时尤其如此。",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "只读配置已启用。这样可防止通过 WEB 接口设置一些配置。此外，每次更新后该文件需要手动设置为可写。",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 41025e81a7d..8b34997b2a7 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -117,7 +117,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 似乎没有设置好查询的系统环境变量。 用 getenv(\\\"PATH\\\") 测试只返回一个空值。",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "请检查PHP配置说明和服务器的 PHP 配置的安装文档，使用 PHP-FPM 时尤其如此。",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "只读配置已启用。这样可防止通过 WEB 接口设置一些配置。此外，每次更新后该文件需要手动设置为可写。",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
-- 
GitLab


From 4e347170ac31462e447daaccf794000981a68f86 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 31 Aug 2015 12:24:37 +0200
Subject: [PATCH 190/783] Notification API

---
 lib/private/notification/action.php       | 151 ++++++++
 lib/private/notification/manager.php      | 180 +++++++++
 lib/private/notification/notification.php | 448 ++++++++++++++++++++++
 lib/private/server.php                    |  14 +
 lib/public/iservercontainer.php           |   9 +-
 lib/public/notification/iaction.php       |  96 +++++
 lib/public/notification/iapp.php          |  55 +++
 lib/public/notification/imanager.php      |  52 +++
 lib/public/notification/inotification.php | 237 ++++++++++++
 lib/public/notification/inotifier.php     |  38 ++
 10 files changed, 1279 insertions(+), 1 deletion(-)
 create mode 100644 lib/private/notification/action.php
 create mode 100644 lib/private/notification/manager.php
 create mode 100644 lib/private/notification/notification.php
 create mode 100644 lib/public/notification/iaction.php
 create mode 100644 lib/public/notification/iapp.php
 create mode 100644 lib/public/notification/imanager.php
 create mode 100644 lib/public/notification/inotification.php
 create mode 100644 lib/public/notification/inotifier.php

diff --git a/lib/private/notification/action.php b/lib/private/notification/action.php
new file mode 100644
index 00000000000..09e37a70d5e
--- /dev/null
+++ b/lib/private/notification/action.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Notification;
+
+use OCP\Notification\IAction;
+
+class Action implements IAction {
+
+	/** @var string */
+	protected $label;
+
+	/** @var string */
+	protected $labelParsed;
+
+	/** @var string */
+	protected $link;
+
+	/** @var string */
+	protected $icon;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		$this->label = '';
+		$this->labelParsed = '';
+		$this->link = '';
+		$this->icon = '';
+	}
+
+	/**
+	 * @param string $label
+	 * @return $this
+	 * @throws \InvalidArgumentException if the label is invalid
+	 * @since 8.2.0
+	 */
+	public function setLabel($label) {
+		if (!is_string($label) || $label === '' || isset($label[32])) {
+			throw new \InvalidArgumentException('The given label is invalid');
+		}
+		$this->label = $label;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLabel() {
+		return $this->label;
+	}
+
+	/**
+	 * @param string $label
+	 * @return $this
+	 * @throws \InvalidArgumentException if the label is invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedLabel($label) {
+		if (!is_string($label) || $label === '') {
+			throw new \InvalidArgumentException('The given parsed label is invalid');
+		}
+		$this->labelParsed = $label;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedLabel() {
+		return $this->labelParsed;
+	}
+
+	/**
+	 * @param string $link
+	 * @return $this
+	 * @throws \InvalidArgumentException if the link is invalid
+	 * @since 8.2.0
+	 */
+	public function setLink($link) {
+		if (!is_string($link) || $link === '' || isset($link[256])) {
+			throw new \InvalidArgumentException('The given link is invalid');
+		}
+		$this->link = $link;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLink() {
+		return $this->link;
+	}
+
+	/**
+	 * @param string $icon
+	 * @return $this
+	 * @throws \InvalidArgumentException if the icon is invalid
+	 * @since 8.2.0
+	 */
+	public function setIcon($icon) {
+		if (!is_string($icon) || $icon === '' || isset($icon[64])) {
+			throw new \InvalidArgumentException('The given icon is invalid');
+		}
+		$this->icon = $icon;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getIcon() {
+		return $this->icon;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isValid() {
+		return $this->label !== '' && $this->link !== '';
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isValidParsed() {
+		return $this->labelParsed !== '' && $this->link !== '';
+	}
+}
diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
new file mode 100644
index 00000000000..93062ae14dc
--- /dev/null
+++ b/lib/private/notification/manager.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Notification;
+
+
+use OCP\Notification\IApp;
+use OCP\Notification\IManager;
+use OCP\Notification\INotification;
+use OCP\Notification\INotifier;
+
+class Manager implements IManager {
+	/** @var IApp */
+	protected $apps;
+
+	/** @var INotifier */
+	protected $notifiers;
+
+	/** @var \Closure */
+	protected $appsClosures;
+
+	/** @var \Closure */
+	protected $notifiersClosures;
+
+	/**
+	 * @param \Closure $service The service must implement IApp, otherwise a
+	 *                          \InvalidArgumentException is thrown later
+	 * @return null
+	 * @since 8.2.0
+	 */
+	public function registerApp(\Closure $service) {
+		$this->appsClosures[] = $service;
+		$this->apps = [];
+	}
+
+	/**
+	 * @param \Closure $service The service must implement INotifier, otherwise a
+	 *                          \InvalidArgumentException is thrown later
+	 * @return null
+	 * @since 8.2.0
+	 */
+	public function registerNotifier(\Closure $service) {
+		$this->notifiersClosures[] = $service;
+		$this->notifiers = [];
+	}
+
+	/**
+	 * @return IApp[]
+	 */
+	protected function getApps() {
+		if (!empty($this->apps)) {
+			return $this->apps;
+		}
+
+		foreach ($this->appsClosures as $closure) {
+			$app = $closure;
+			if (!($app instanceof IApp)) {
+				throw new \InvalidArgumentException('The given notification app does not implement the IApp interface');
+			}
+			$this->apps[] = $app;
+		}
+
+		return $this->apps;
+	}
+
+	/**
+	 * @return INotifier[]
+	 */
+	protected function getNotifiers() {
+		if (!empty($this->notifiers)) {
+			return $this->notifiers;
+		}
+
+		foreach ($this->notifiersClosures as $closure) {
+			$notifier = $closure;
+			if (!($notifier instanceof INotifier)) {
+				throw new \InvalidArgumentException('The given notification app does not implement the INotifier interface');
+			}
+			$this->notifiers[] = $notifier;
+		}
+
+		return $this->notifiers;
+	}
+
+	/**
+	 * @return INotification
+	 * @since 8.2.0
+	 */
+	public function createNotification() {
+		return new Notification();
+	}
+
+	/**
+	 * @param INotification $notification
+	 * @return null
+	 * @throws \InvalidArgumentException When the notification is not valid
+	 * @since 8.2.0
+	 */
+	public function notify(INotification $notification) {
+		if (!$notification->isValid()) {
+			throw new \InvalidArgumentException('The given notification is invalid');
+		}
+
+		$apps = $this->getApps();
+
+		foreach ($apps as $app) {
+			$app->notify($notification);
+		}
+	}
+
+	/**
+	 * @param INotification $notification
+	 * @return INotification
+	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+	 * @since 8.2.0
+	 */
+	public function prepare(INotification $notification) {
+		$notifiers = $this->getNotifiers();
+
+		foreach ($notifiers as $notifier) {
+			try {
+				$notifier->prepare($notification);
+			} catch (\InvalidArgumentException $e) {}
+		}
+
+		if (!$notification->isValidParsed()) {
+			throw new \InvalidArgumentException('The given notification has not been handled');
+		}
+
+		return $notification;
+	}
+
+	/**
+	 * @param string $objectType
+	 * @param int $objectId
+	 * @param string $user
+	 * @return null
+	 */
+	public function markProcessed($objectType, $objectId, $user = '') {
+		$apps = $this->getApps();
+
+		foreach ($apps as $app) {
+			$app->markProcessed($objectType, $objectId, $user);
+		}
+	}
+
+	/**
+	 * @param string $user
+	 * @param string $appId
+	 * @return int
+	 */
+	public function getCount($user, $appId = '') {
+		$apps = $this->getApps();
+
+		$count = 0;
+		foreach ($apps as $app) {
+			$count += $app->markProcessed($user, $appId);
+		}
+
+		return $count;
+	}
+}
diff --git a/lib/private/notification/notification.php b/lib/private/notification/notification.php
new file mode 100644
index 00000000000..9262a198b52
--- /dev/null
+++ b/lib/private/notification/notification.php
@@ -0,0 +1,448 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Notification;
+
+use OCP\Notification\IAction;
+use OCP\Notification\INotification;
+
+class Notification implements INotification {
+	/** @var string */
+	protected $app;
+
+	/** @var string */
+	protected $user;
+
+	/** @var int */
+	protected $timestamp;
+
+	/** @var string */
+	protected $objectType;
+
+	/** @var int */
+	protected $objectId;
+
+	/** @var string */
+	protected $subject;
+
+	/** @var array */
+	protected $subjectParameters;
+
+	/** @var string */
+	protected $subjectParsed;
+
+	/** @var string */
+	protected $message;
+
+	/** @var array */
+	protected $messageParameters;
+
+	/** @var string */
+	protected $messageParsed;
+
+	/** @var string */
+	protected $link;
+
+	/** @var string */
+	protected $icon;
+
+	/** @var array */
+	protected $actions;
+
+	/** @var array */
+	protected $actionsParsed;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		$this->app = '';
+		$this->user = '';
+		$this->timestamp = 0;
+		$this->objectType = '';
+		$this->objectId = 0;
+		$this->subject = '';
+		$this->subjectParameters = [];
+		$this->subjectParsed = '';
+		$this->message = '';
+		$this->messageParameters = [];
+		$this->messageParsed = '';
+		$this->link = '';
+		$this->icon = '';
+		$this->actions = [];
+		$this->actionsParsed = [];
+	}
+
+	/**
+	 * @param string $app
+	 * @return $this
+	 * @throws \InvalidArgumentException if the app id is invalid
+	 * @since 8.2.0
+	 */
+	public function setApp($app) {
+		if (!is_string($app) || $app === '' || isset($app[32])) {
+			throw new \InvalidArgumentException('The given app name is invalid');
+		}
+		$this->app = $app;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getApp() {
+		return $this->app;
+	}
+
+	/**
+	 * @param string $user
+	 * @return $this
+	 * @throws \InvalidArgumentException if the user id is invalid
+	 * @since 8.2.0
+	 */
+	public function setUser($user) {
+		if (!is_string($user) || $user === '' || isset($app[64])) {
+			throw new \InvalidArgumentException('The given user id is invalid');
+		}
+		$this->user = $user;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getUser() {
+		return $this->user;
+	}
+
+	/**
+	 * @param int $timestamp
+	 * @return $this
+	 * @throws \InvalidArgumentException if the timestamp is invalid
+	 * @since 8.2.0
+	 */
+	public function setTimestamp($timestamp) {
+		if (!is_int($timestamp)) {
+			throw new \InvalidArgumentException('The given timestamp is invalid');
+		}
+		$this->timestamp = $timestamp;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getTimestamp() {
+		return $this->timestamp;
+	}
+
+	/**
+	 * @param string $type
+	 * @param int $id
+	 * @return $this
+	 * @throws \InvalidArgumentException if the object type or id is invalid
+	 * @since 8.2.0
+	 */
+	public function setObject($type, $id) {
+		if (!is_string($type) || $type === '' || isset($type[64])) {
+			throw new \InvalidArgumentException('The given object type is invalid');
+		}
+		$this->objectType = $type;
+
+		if (!is_int($id)) {
+			throw new \InvalidArgumentException('The given object id is invalid');
+		}
+		$this->objectId = $id;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getObjectType() {
+		return $this->objectType;
+	}
+
+	/**
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getObjectId() {
+		return $this->objectId;
+	}
+
+	/**
+	 * @param string $subject
+	 * @param array $parameters
+	 * @return $this
+	 * @throws \InvalidArgumentException if the subject or parameters are invalid
+	 * @since 8.2.0
+	 */
+	public function setSubject($subject, array $parameters = []) {
+		if (!is_string($subject) || $subject === '' || isset($subject[64])) {
+			throw new \InvalidArgumentException('The given subject is invalid');
+		}
+		$this->subject = $subject;
+
+		if (!is_array($parameters)) {
+			throw new \InvalidArgumentException('The given subject parameters are invalid');
+		}
+		$this->subjectParameters = $parameters;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getSubject() {
+		return $this->subject;
+	}
+
+	/**
+	 * @return string[]
+	 * @since 8.2.0
+	 */
+	public function getSubjectParameters() {
+		return $this->subjectParameters;
+	}
+
+	/**
+	 * @param string $subject
+	 * @return $this
+	 * @throws \InvalidArgumentException if the subject are invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedSubject($subject) {
+		if (!is_string($subject) || $subject === '') {
+			throw new \InvalidArgumentException('The given parsed subject is invalid');
+		}
+		$this->subjectParsed = $subject;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedSubject() {
+		return $this->messageParsed;
+	}
+
+	/**
+	 * @param string $message
+	 * @param array $parameters
+	 * @return $this
+	 * @throws \InvalidArgumentException if the message or parameters are invalid
+	 * @since 8.2.0
+	 */
+	public function setMessage($message, array $parameters = []) {
+		if (!is_string($message) || $message === '' || isset($message[64])) {
+			throw new \InvalidArgumentException('The given message is invalid');
+		}
+		$this->message = $message;
+
+		if (!is_array($parameters)) {
+			throw new \InvalidArgumentException('The given message parameters are invalid');
+		}
+		$this->messageParameters = $parameters;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getMessage() {
+		return $this->message;
+	}
+
+	/**
+	 * @return string[]
+	 * @since 8.2.0
+	 */
+	public function getMessageParameters() {
+		return $this->messageParameters;
+	}
+
+	/**
+	 * @param string $message
+	 * @return $this
+	 * @throws \InvalidArgumentException if the message are invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedMessage($message) {
+		if (!is_string($message) || $message === '') {
+			throw new \InvalidArgumentException('The given parsed message is invalid');
+		}
+		$this->messageParsed = $message;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedMessage() {
+		return $this->messageParsed;
+	}
+
+	/**
+	 * @param string $link
+	 * @return $this
+	 * @throws \InvalidArgumentException if the link are invalid
+	 * @since 8.2.0
+	 */
+	public function setLink($link) {
+		if (!is_string($link) || $link === '' || isset($link[256])) {
+			throw new \InvalidArgumentException('The given link is invalid');
+		}
+		$this->link = $link;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLink() {
+		return $this->link;
+	}
+
+	/**
+	 * @param string $icon
+	 * @return $this
+	 * @throws \InvalidArgumentException if the icon are invalid
+	 * @since 8.2.0
+	 */
+	public function setIcon($icon) {
+		if (!is_string($icon) || $icon === '' || isset($icon[64])) {
+			throw new \InvalidArgumentException('The given icon is invalid');
+		}
+		$this->icon = $icon;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getIcon() {
+		return $this->icon;
+	}
+
+	/**
+	 * @return IAction
+	 * @since 8.2.0
+	 */
+	public function createAction() {
+		return new Action();
+	}
+
+	/**
+	 * @param IAction $action
+	 * @return $this
+	 * @throws \InvalidArgumentException if the action are invalid
+	 * @since 8.2.0
+	 */
+	public function addAction(IAction $action) {
+		if ($action->isValid()) {
+			throw new \InvalidArgumentException('The given action is invalid');
+		}
+		$this->actions[] = $action;
+		return $this;
+	}
+
+	/**
+	 * @return IAction[]
+	 * @since 8.2.0
+	 */
+	public function getActions() {
+		return $this->actions;
+	}
+
+	/**
+	 * @param IAction $action
+	 * @return $this
+	 * @throws \InvalidArgumentException if the action are invalid
+	 * @since 8.2.0
+	 */
+	public function addParsedAction(IAction $action) {
+		if ($action->isValidParsed()) {
+			throw new \InvalidArgumentException('The given parsed action is invalid');
+		}
+		$this->actions[] = $action;
+		return $this;
+	}
+
+	/**
+	 * @return IAction[]
+	 * @since 8.2.0
+	 */
+	public function getParsedActions() {
+		return $this->actionsParsed;
+	}
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isValid() {
+		return
+			$this->isValidCommon()
+			&&
+			$this->subject !== ''
+		;
+	}
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isValidParsed() {
+		return
+			$this->isValidCommon()
+			&&
+			$this->subjectParsed !== ''
+		;
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isValidCommon() {
+		return
+			$this->app !== ''
+			&&
+			$this->user !== ''
+			&&
+			$this->timestamp !== 0
+			&&
+			$this->objectType !== ''
+			&&
+			$this->objectId !== 0
+		;
+	}
+}
diff --git a/lib/private/server.php b/lib/private/server.php
index 393c1840973..880ab274f12 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -53,6 +53,7 @@ use OC\Lock\DBLockingProvider;
 use OC\Lock\MemcacheLockingProvider;
 use OC\Lock\NoopLockingProvider;
 use OC\Mail\Mailer;
+use OC\Notification\Manager;
 use OC\Security\CertificateManager;
 use OC\Security\Crypto;
 use OC\Security\Hasher;
@@ -475,6 +476,9 @@ class Server extends SimpleContainer implements IServerContainer {
 				$c->getDatabaseConnection()
 			);
 		});
+		$this->registerService('NotificationManager', function() {
+			return new Manager();
+		});
 		$this->registerService('CapabilitiesManager', function (Server $c) {
 			$manager = new \OC\CapabilitiesManager();
 			$manager->registerCapability(function() use ($c) {
@@ -1043,6 +1047,16 @@ class Server extends SimpleContainer implements IServerContainer {
 		return $this->query('EventDispatcher');
 	}
 
+	/**
+	 * Get the Notification Manager
+	 *
+	 * @return \OCP\Notification\IManager
+	 * @since 8.2.0
+	 */
+	public function getNotificationManager() {
+		return $this->query('NotificationManager');
+	}
+
 	/**
 	 * @return \OC\Session\CryptoWrapper
 	 */
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 81724cb4967..ea08b5a78ca 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -448,7 +448,6 @@ interface IServerContainer {
 	 */
 	public function getMimeTypeLoader();
 
-
 	/**
 	 * Get the EventDispatcher
 	 *
@@ -456,4 +455,12 @@ interface IServerContainer {
 	 * @since 8.2.0
 	 */
 	public function getEventDispatcher();
+
+	/**
+	 * Get the Notification Manager
+	 *
+	 * @return \OCP\Notification\IManager
+	 * @since 8.2.0
+	 */
+	public function getNotificationManager();
 }
diff --git a/lib/public/notification/iaction.php b/lib/public/notification/iaction.php
new file mode 100644
index 00000000000..f0dfb024961
--- /dev/null
+++ b/lib/public/notification/iaction.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP\Notification;
+
+/**
+ * Interface IAction
+ *
+ * @package OCP\Notification
+ * @since 8.2.0
+ */
+interface IAction {
+	/**
+	 * @param string $label
+	 * @return $this
+	 * @throws \InvalidArgumentException if the label is invalid
+	 * @since 8.2.0
+	 */
+	public function setLabel($label);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLabel();
+
+	/**
+	 * @param string $label
+	 * @return $this
+	 * @throws \InvalidArgumentException if the label is invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedLabel($label);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedLabel();
+
+	/**
+	 * @param string $link
+	 * @return $this
+	 * @throws \InvalidArgumentException if the link is invalid
+	 * @since 8.2.0
+	 */
+	public function setLink($link);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLink();
+
+	/**
+	 * @param string $icon
+	 * @return $this
+	 * @throws \InvalidArgumentException if the icon is invalid
+	 * @since 8.2.0
+	 */
+	public function setIcon($icon);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getIcon();
+
+	/**
+	 * @return bool
+	 */
+	public function isValid();
+
+	/**
+	 * @return bool
+	 */
+	public function isValidParsed();
+}
diff --git a/lib/public/notification/iapp.php b/lib/public/notification/iapp.php
new file mode 100644
index 00000000000..b154efab759
--- /dev/null
+++ b/lib/public/notification/iapp.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP\Notification;
+
+/**
+ * Interface IApp
+ *
+ * @package OCP\Notification
+ * @since 8.2.0
+ */
+interface IApp {
+	/**
+	 * @param INotification $notification
+	 * @return null
+	 * @throws \InvalidArgumentException When the notification is not valid
+	 * @since 8.2.0
+	 */
+	public function notify(INotification $notification);
+
+	/**
+	 * @param string $objectType
+	 * @param int $objectId
+	 * @param string $user
+	 * @return null
+	 * @since 8.2.0
+	 */
+	public function markProcessed($objectType, $objectId, $user = '');
+
+	/**
+	 * @param string $user
+	 * @param string $appId
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getCount($user, $appId = '');
+}
diff --git a/lib/public/notification/imanager.php b/lib/public/notification/imanager.php
new file mode 100644
index 00000000000..e68f19e71fd
--- /dev/null
+++ b/lib/public/notification/imanager.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP\Notification;
+
+/**
+ * Interface IManager
+ *
+ * @package OCP\Notification
+ * @since 8.2.0
+ */
+interface IManager extends IApp, INotifier {
+	/**
+	 * @param \Closure $service The service must implement IApp, otherwise a
+	 *                          \InvalidArgumentException is thrown later
+	 * @return null
+	 * @since 8.2.0
+	 */
+	public function registerApp(\Closure $service);
+
+	/**
+	 * @param \Closure $service The service must implement INotifier, otherwise a
+	 *                          \InvalidArgumentException is thrown later
+	 * @return null
+	 * @since 8.2.0
+	 */
+	public function registerNotifier(\Closure $service);
+
+	/**
+	 * @return INotification
+	 * @since 8.2.0
+	 */
+	public function createNotification();
+}
diff --git a/lib/public/notification/inotification.php b/lib/public/notification/inotification.php
new file mode 100644
index 00000000000..48204f733c1
--- /dev/null
+++ b/lib/public/notification/inotification.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP\Notification;
+
+/**
+ * Interface INotification
+ *
+ * @package OCP\Notification
+ * @since 8.2.0
+ */
+interface INotification {
+	/**
+	 * @param string $app
+	 * @return $this
+	 * @throws \InvalidArgumentException if the app id are invalid
+	 * @since 8.2.0
+	 */
+	public function setApp($app);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getApp();
+
+	/**
+	 * @param string $user
+	 * @return $this
+	 * @throws \InvalidArgumentException if the user id are invalid
+	 * @since 8.2.0
+	 */
+	public function setUser($user);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getUser();
+
+	/**
+	 * @param int $timestamp
+	 * @return $this
+	 * @throws \InvalidArgumentException if the timestamp are invalid
+	 * @since 8.2.0
+	 */
+	public function setTimestamp($timestamp);
+
+	/**
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getTimestamp();
+
+	/**
+	 * @param string $type
+	 * @param int $id
+	 * @return $this
+	 * @throws \InvalidArgumentException if the object type or id are invalid
+	 * @since 8.2.0
+	 */
+	public function setObject($type, $id);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getObjectType();
+
+	/**
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getObjectId();
+
+	/**
+	 * @param string $subject
+	 * @param array $parameters
+	 * @return $this
+	 * @throws \InvalidArgumentException if the subject or parameters are invalid
+	 * @since 8.2.0
+	 */
+	public function setSubject($subject, array $parameters = []);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getSubject();
+
+	/**
+	 * @return string[]
+	 * @since 8.2.0
+	 */
+	public function getSubjectParameters();
+
+	/**
+	 * @param string $subject
+	 * @return $this
+	 * @throws \InvalidArgumentException if the subject are invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedSubject($subject);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedSubject();
+
+	/**
+	 * @param string $message
+	 * @param array $parameters
+	 * @return $this
+	 * @throws \InvalidArgumentException if the message or parameters are invalid
+	 * @since 8.2.0
+	 */
+	public function setMessage($message, array $parameters = []);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getMessage();
+
+	/**
+	 * @return string[]
+	 * @since 8.2.0
+	 */
+	public function getMessageParameters();
+
+	/**
+	 * @param string $message
+	 * @return $this
+	 * @throws \InvalidArgumentException if the message are invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedMessage($message);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedMessage();
+
+	/**
+	 * @param string $link
+	 * @return $this
+	 * @throws \InvalidArgumentException if the link are invalid
+	 * @since 8.2.0
+	 */
+	public function setLink($link);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLink();
+
+	/**
+	 * @param string $icon
+	 * @return $this
+	 * @throws \InvalidArgumentException if the icon are invalid
+	 * @since 8.2.0
+	 */
+	public function setIcon($icon);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getIcon();
+
+	/**
+	 * @return IAction
+	 * @since 8.2.0
+	 */
+	public function createAction();
+
+	/**
+	 * @param IAction $action
+	 * @return $this
+	 * @throws \InvalidArgumentException if the action are invalid
+	 * @since 8.2.0
+	 */
+	public function addAction(IAction $action);
+
+	/**
+	 * @return IAction[]
+	 * @since 8.2.0
+	 */
+	public function getActions();
+
+	/**
+	 * @param IAction $action
+	 * @return $this
+	 * @throws \InvalidArgumentException if the action are invalid
+	 * @since 8.2.0
+	 */
+	public function addParsedAction(IAction $action);
+
+	/**
+	 * @return IAction[]
+	 * @since 8.2.0
+	 */
+	public function getParsedActions();
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isValid();
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isValidParsed();
+}
diff --git a/lib/public/notification/inotifier.php b/lib/public/notification/inotifier.php
new file mode 100644
index 00000000000..32628768ebc
--- /dev/null
+++ b/lib/public/notification/inotifier.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP\Notification;
+
+/**
+ * Interface INotifier
+ *
+ * @package OCP\Notification
+ * @since 8.2.0
+ */
+interface INotifier {
+	/**
+	 * @param INotification $notification
+	 * @return INotification
+	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+	 * @since 8.2.0
+	 */
+	public function prepare(INotification $notification);
+}
-- 
GitLab


From 5437aeeaa2ad2445c0ea9668d0afffee46a3ba68 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 31 Aug 2015 12:27:06 +0200
Subject: [PATCH 191/783] Nothing is set in stone here yet

---
 lib/public/notification/iaction.php       | 4 ++++
 lib/public/notification/iapp.php          | 4 ++++
 lib/public/notification/imanager.php      | 4 ++++
 lib/public/notification/inotification.php | 4 ++++
 lib/public/notification/inotifier.php     | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/lib/public/notification/iaction.php b/lib/public/notification/iaction.php
index f0dfb024961..334f6cc44a7 100644
--- a/lib/public/notification/iaction.php
+++ b/lib/public/notification/iaction.php
@@ -26,6 +26,10 @@ namespace OCP\Notification;
  *
  * @package OCP\Notification
  * @since 8.2.0
+ *
+ * DEVELOPER NOTE:
+ * The notification api is experimental only in 8.2.0! Do not start using it,
+ * if you can not prepare an update for the next version afterwards.
  */
 interface IAction {
 	/**
diff --git a/lib/public/notification/iapp.php b/lib/public/notification/iapp.php
index b154efab759..b7bf41ce7f5 100644
--- a/lib/public/notification/iapp.php
+++ b/lib/public/notification/iapp.php
@@ -26,6 +26,10 @@ namespace OCP\Notification;
  *
  * @package OCP\Notification
  * @since 8.2.0
+ *
+ * DEVELOPER NOTE:
+ * The notification api is experimental only in 8.2.0! Do not start using it,
+ * if you can not prepare an update for the next version afterwards.
  */
 interface IApp {
 	/**
diff --git a/lib/public/notification/imanager.php b/lib/public/notification/imanager.php
index e68f19e71fd..ca1cc968b12 100644
--- a/lib/public/notification/imanager.php
+++ b/lib/public/notification/imanager.php
@@ -26,6 +26,10 @@ namespace OCP\Notification;
  *
  * @package OCP\Notification
  * @since 8.2.0
+ *
+ * DEVELOPER NOTE:
+ * The notification api is experimental only in 8.2.0! Do not start using it,
+ * if you can not prepare an update for the next version afterwards.
  */
 interface IManager extends IApp, INotifier {
 	/**
diff --git a/lib/public/notification/inotification.php b/lib/public/notification/inotification.php
index 48204f733c1..51d4a804647 100644
--- a/lib/public/notification/inotification.php
+++ b/lib/public/notification/inotification.php
@@ -26,6 +26,10 @@ namespace OCP\Notification;
  *
  * @package OCP\Notification
  * @since 8.2.0
+ *
+ * DEVELOPER NOTE:
+ * The notification api is experimental only in 8.2.0! Do not start using it,
+ * if you can not prepare an update for the next version afterwards.
  */
 interface INotification {
 	/**
diff --git a/lib/public/notification/inotifier.php b/lib/public/notification/inotifier.php
index 32628768ebc..be6b3f25533 100644
--- a/lib/public/notification/inotifier.php
+++ b/lib/public/notification/inotifier.php
@@ -26,6 +26,10 @@ namespace OCP\Notification;
  *
  * @package OCP\Notification
  * @since 8.2.0
+ *
+ * DEVELOPER NOTE:
+ * The notification api is experimental only in 8.2.0! Do not start using it,
+ * if you can not prepare an update for the next version afterwards.
  */
 interface INotifier {
 	/**
-- 
GitLab


From f16c5a38a85270e2230d78ab355774238a325f5d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 1 Sep 2015 10:20:54 +0200
Subject: [PATCH 192/783] Add language to the preparation method

---
 lib/private/notification/manager.php  | 5 +++--
 lib/public/notification/inotifier.php | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
index 93062ae14dc..0b3b68a4065 100644
--- a/lib/private/notification/manager.php
+++ b/lib/private/notification/manager.php
@@ -128,16 +128,17 @@ class Manager implements IManager {
 
 	/**
 	 * @param INotification $notification
+	 * @param string $languageCode The code of the language that should be used to prepare the notification
 	 * @return INotification
 	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
 	 * @since 8.2.0
 	 */
-	public function prepare(INotification $notification) {
+	public function prepare(INotification $notification, $languageCode) {
 		$notifiers = $this->getNotifiers();
 
 		foreach ($notifiers as $notifier) {
 			try {
-				$notifier->prepare($notification);
+				$notifier->prepare($notification, $languageCode);
 			} catch (\InvalidArgumentException $e) {}
 		}
 
diff --git a/lib/public/notification/inotifier.php b/lib/public/notification/inotifier.php
index be6b3f25533..9eefcddae18 100644
--- a/lib/public/notification/inotifier.php
+++ b/lib/public/notification/inotifier.php
@@ -34,9 +34,10 @@ namespace OCP\Notification;
 interface INotifier {
 	/**
 	 * @param INotification $notification
+	 * @param string $languageCode The code of the language that should be used to prepare the notification
 	 * @return INotification
 	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
 	 * @since 8.2.0
 	 */
-	public function prepare(INotification $notification);
+	public function prepare(INotification $notification, $languageCode);
 }
-- 
GitLab


From 0bcae89d141fb8fd35477b5b847360fbf3eb32f1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 1 Sep 2015 10:24:21 +0200
Subject: [PATCH 193/783] Handle InvalidArgumentException more gracefully

---
 lib/private/notification/manager.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
index 0b3b68a4065..c721f610113 100644
--- a/lib/private/notification/manager.php
+++ b/lib/private/notification/manager.php
@@ -122,7 +122,10 @@ class Manager implements IManager {
 		$apps = $this->getApps();
 
 		foreach ($apps as $app) {
-			$app->notify($notification);
+			try {
+				$app->notify($notification);
+			} catch (\InvalidArgumentException $e) {
+			}
 		}
 	}
 
@@ -139,11 +142,13 @@ class Manager implements IManager {
 		foreach ($notifiers as $notifier) {
 			try {
 				$notifier->prepare($notification, $languageCode);
-			} catch (\InvalidArgumentException $e) {}
-		}
+			} catch (\InvalidArgumentException $e) {
+				continue;
+			}
 
-		if (!$notification->isValidParsed()) {
-			throw new \InvalidArgumentException('The given notification has not been handled');
+			if (!$notification->isValidParsed()) {
+				throw new \InvalidArgumentException('The given notification has not been handled');
+			}
 		}
 
 		return $notification;
-- 
GitLab


From f0ecfa6e6c49253230fa847ff2ce7082f6c97e68 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 1 Sep 2015 10:28:11 +0200
Subject: [PATCH 194/783] Add the app id to the markProcessed method

---
 lib/private/notification/manager.php | 5 +++--
 lib/public/notification/iapp.php     | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
index c721f610113..1946c4203d4 100644
--- a/lib/private/notification/manager.php
+++ b/lib/private/notification/manager.php
@@ -155,16 +155,17 @@ class Manager implements IManager {
 	}
 
 	/**
+	 * @param string $appId
 	 * @param string $objectType
 	 * @param int $objectId
 	 * @param string $user
 	 * @return null
 	 */
-	public function markProcessed($objectType, $objectId, $user = '') {
+	public function markProcessed($appId, $objectType, $objectId, $user = '') {
 		$apps = $this->getApps();
 
 		foreach ($apps as $app) {
-			$app->markProcessed($objectType, $objectId, $user);
+			$app->markProcessed($appId, $objectType, $objectId, $user);
 		}
 	}
 
diff --git a/lib/public/notification/iapp.php b/lib/public/notification/iapp.php
index b7bf41ce7f5..e2b0e89fc32 100644
--- a/lib/public/notification/iapp.php
+++ b/lib/public/notification/iapp.php
@@ -41,13 +41,14 @@ interface IApp {
 	public function notify(INotification $notification);
 
 	/**
+	 * @param string $appId
 	 * @param string $objectType
 	 * @param int $objectId
 	 * @param string $user
 	 * @return null
 	 * @since 8.2.0
 	 */
-	public function markProcessed($objectType, $objectId, $user = '');
+	public function markProcessed($appId, $objectType, $objectId, $user = '');
 
 	/**
 	 * @param string $user
-- 
GitLab


From 3bdfef910708eaba19daaf7d1d992cd4575af3b4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 1 Sep 2015 10:46:08 +0200
Subject: [PATCH 195/783] Add the request type to the action

---
 lib/private/notification/action.php | 10 +++++++++-
 lib/public/notification/iaction.php |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/private/notification/action.php b/lib/private/notification/action.php
index 09e37a70d5e..2f7c1a5b5f4 100644
--- a/lib/private/notification/action.php
+++ b/lib/private/notification/action.php
@@ -34,6 +34,9 @@ class Action implements IAction {
 	/** @var string */
 	protected $link;
 
+	/** @var string */
+	protected $requestType;
+
 	/** @var string */
 	protected $icon;
 
@@ -44,6 +47,7 @@ class Action implements IAction {
 		$this->label = '';
 		$this->labelParsed = '';
 		$this->link = '';
+		$this->requestType = '';
 		$this->icon = '';
 	}
 
@@ -93,14 +97,18 @@ class Action implements IAction {
 
 	/**
 	 * @param string $link
+	 * @param string $requestType
 	 * @return $this
 	 * @throws \InvalidArgumentException if the link is invalid
 	 * @since 8.2.0
 	 */
-	public function setLink($link) {
+	public function setLink($link, $requestType) {
 		if (!is_string($link) || $link === '' || isset($link[256])) {
 			throw new \InvalidArgumentException('The given link is invalid');
 		}
+		if (!in_array($requestType, ['GET', 'POST', 'PUT', 'DELETE'])) {
+			throw new \InvalidArgumentException('The given request type is invalid');
+		}
 		$this->link = $link;
 		return $this;
 	}
diff --git a/lib/public/notification/iaction.php b/lib/public/notification/iaction.php
index 334f6cc44a7..db60f6cedbb 100644
--- a/lib/public/notification/iaction.php
+++ b/lib/public/notification/iaction.php
@@ -62,11 +62,12 @@ interface IAction {
 
 	/**
 	 * @param string $link
+	 * @param string $requestType
 	 * @return $this
 	 * @throws \InvalidArgumentException if the link is invalid
 	 * @since 8.2.0
 	 */
-	public function setLink($link);
+	public function setLink($link, $requestType);
 
 	/**
 	 * @return string
-- 
GitLab


From 913e2e9ae67de805d99039105c634c843009345e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 1 Sep 2015 10:46:32 +0200
Subject: [PATCH 196/783] Use an INotification to getCount() and
 markProcessed()

---
 lib/private/notification/manager.php | 16 ++++++----------
 lib/public/notification/iapp.php     | 12 ++++--------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
index 1946c4203d4..f14929642dc 100644
--- a/lib/private/notification/manager.php
+++ b/lib/private/notification/manager.php
@@ -155,31 +155,27 @@ class Manager implements IManager {
 	}
 
 	/**
-	 * @param string $appId
-	 * @param string $objectType
-	 * @param int $objectId
-	 * @param string $user
+	 * @param INotification $notification
 	 * @return null
 	 */
-	public function markProcessed($appId, $objectType, $objectId, $user = '') {
+	public function markProcessed(INotification $notification) {
 		$apps = $this->getApps();
 
 		foreach ($apps as $app) {
-			$app->markProcessed($appId, $objectType, $objectId, $user);
+			$app->markProcessed($notification);
 		}
 	}
 
 	/**
-	 * @param string $user
-	 * @param string $appId
+	 * @param INotification $notification
 	 * @return int
 	 */
-	public function getCount($user, $appId = '') {
+	public function getCount(INotification $notification) {
 		$apps = $this->getApps();
 
 		$count = 0;
 		foreach ($apps as $app) {
-			$count += $app->markProcessed($user, $appId);
+			$count += $app->markProcessed($notification);
 		}
 
 		return $count;
diff --git a/lib/public/notification/iapp.php b/lib/public/notification/iapp.php
index e2b0e89fc32..a4718a21b60 100644
--- a/lib/public/notification/iapp.php
+++ b/lib/public/notification/iapp.php
@@ -41,20 +41,16 @@ interface IApp {
 	public function notify(INotification $notification);
 
 	/**
-	 * @param string $appId
-	 * @param string $objectType
-	 * @param int $objectId
-	 * @param string $user
+	 * @param INotification $notification
 	 * @return null
 	 * @since 8.2.0
 	 */
-	public function markProcessed($appId, $objectType, $objectId, $user = '');
+	public function markProcessed(INotification $notification);
 
 	/**
-	 * @param string $user
-	 * @param string $appId
+	 * @param INotification $notification
 	 * @return int
 	 * @since 8.2.0
 	 */
-	public function getCount($user, $appId = '');
+	public function getCount(INotification $notification);
 }
-- 
GitLab


From 21b83dc730c9eebd9eb4d8c9944f680514eb2121 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 1 Sep 2015 12:09:39 +0200
Subject: [PATCH 197/783] Allow getting the request type

---
 lib/private/notification/action.php | 8 ++++++++
 lib/public/notification/iaction.php | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/lib/private/notification/action.php b/lib/private/notification/action.php
index 2f7c1a5b5f4..08f3d50bac2 100644
--- a/lib/private/notification/action.php
+++ b/lib/private/notification/action.php
@@ -121,6 +121,14 @@ class Action implements IAction {
 		return $this->link;
 	}
 
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getRequestType() {
+		return $this->requestType;
+	}
+
 	/**
 	 * @param string $icon
 	 * @return $this
diff --git a/lib/public/notification/iaction.php b/lib/public/notification/iaction.php
index db60f6cedbb..64b95bdb5ad 100644
--- a/lib/public/notification/iaction.php
+++ b/lib/public/notification/iaction.php
@@ -75,6 +75,12 @@ interface IAction {
 	 */
 	public function getLink();
 
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getRequestType();
+
 	/**
 	 * @param string $icon
 	 * @return $this
-- 
GitLab


From d04021b1ac8e9717adb39111622a7d024d90502d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 1 Sep 2015 17:06:38 +0200
Subject: [PATCH 198/783] Fix the request type and the validity

---
 lib/private/notification/action.php       | 1 +
 lib/private/notification/notification.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/private/notification/action.php b/lib/private/notification/action.php
index 08f3d50bac2..f0bcb23c877 100644
--- a/lib/private/notification/action.php
+++ b/lib/private/notification/action.php
@@ -110,6 +110,7 @@ class Action implements IAction {
 			throw new \InvalidArgumentException('The given request type is invalid');
 		}
 		$this->link = $link;
+		$this->requestType = $requestType;
 		return $this;
 	}
 
diff --git a/lib/private/notification/notification.php b/lib/private/notification/notification.php
index 9262a198b52..17246ddef32 100644
--- a/lib/private/notification/notification.php
+++ b/lib/private/notification/notification.php
@@ -316,7 +316,7 @@ class Notification implements INotification {
 	 * @since 8.2.0
 	 */
 	public function setLink($link) {
-		if (!is_string($link) || $link === '' || isset($link[256])) {
+		if (!is_string($link) || $link === '' || isset($link[4000])) {
 			throw new \InvalidArgumentException('The given link is invalid');
 		}
 		$this->link = $link;
@@ -368,7 +368,7 @@ class Notification implements INotification {
 	 * @since 8.2.0
 	 */
 	public function addAction(IAction $action) {
-		if ($action->isValid()) {
+		if (!$action->isValid()) {
 			throw new \InvalidArgumentException('The given action is invalid');
 		}
 		$this->actions[] = $action;
@@ -390,7 +390,7 @@ class Notification implements INotification {
 	 * @since 8.2.0
 	 */
 	public function addParsedAction(IAction $action) {
-		if ($action->isValidParsed()) {
+		if (!$action->isValidParsed()) {
 			throw new \InvalidArgumentException('The given parsed action is invalid');
 		}
 		$this->actions[] = $action;
-- 
GitLab


From 57c273b2dae918e1b007c1f1d1cd37ec9f6fb248 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 1 Sep 2015 17:58:23 +0200
Subject: [PATCH 199/783] Fix closures and adding parsed Actions

---
 lib/private/notification/manager.php      | 4 ++--
 lib/private/notification/notification.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
index f14929642dc..eee03d93db2 100644
--- a/lib/private/notification/manager.php
+++ b/lib/private/notification/manager.php
@@ -71,7 +71,7 @@ class Manager implements IManager {
 		}
 
 		foreach ($this->appsClosures as $closure) {
-			$app = $closure;
+			$app = $closure();
 			if (!($app instanceof IApp)) {
 				throw new \InvalidArgumentException('The given notification app does not implement the IApp interface');
 			}
@@ -90,7 +90,7 @@ class Manager implements IManager {
 		}
 
 		foreach ($this->notifiersClosures as $closure) {
-			$notifier = $closure;
+			$notifier = $closure();
 			if (!($notifier instanceof INotifier)) {
 				throw new \InvalidArgumentException('The given notification app does not implement the INotifier interface');
 			}
diff --git a/lib/private/notification/notification.php b/lib/private/notification/notification.php
index 17246ddef32..f5171f150c6 100644
--- a/lib/private/notification/notification.php
+++ b/lib/private/notification/notification.php
@@ -393,7 +393,7 @@ class Notification implements INotification {
 		if (!$action->isValidParsed()) {
 			throw new \InvalidArgumentException('The given parsed action is invalid');
 		}
-		$this->actions[] = $action;
+		$this->actionsParsed[] = $action;
 		return $this;
 	}
 
-- 
GitLab


From d191a0daccfa923dcef4ffa9c020fe01f3caf129 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 1 Sep 2015 17:59:01 +0200
Subject: [PATCH 200/783] Add notifications for remote shares

---
 apps/files_sharing/api/server2server.php | 22 ++++++
 apps/files_sharing/appinfo/app.php       |  7 ++
 apps/files_sharing/lib/notifier.php      | 86 ++++++++++++++++++++++++
 3 files changed, 115 insertions(+)
 create mode 100644 apps/files_sharing/lib/notifier.php

diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php
index 4328e3830ba..d5f1dce5055 100644
--- a/apps/files_sharing/api/server2server.php
+++ b/apps/files_sharing/api/server2server.php
@@ -82,6 +82,28 @@ class Server2Server {
 					Activity::FILES_SHARING_APP, Activity::SUBJECT_REMOTE_SHARE_RECEIVED, array($user, trim($name, '/')), '', array(),
 					'', '', $shareWith, Activity::TYPE_REMOTE_SHARE, Activity::PRIORITY_LOW);
 
+				$urlGenerator = \OC::$server->getURLGenerator();
+
+				$notificationManager = \OC::$server->getNotificationManager();
+				$notification = $notificationManager->createNotification();
+				$notification->setApp('files_sharing')
+					->setUser($shareWith)
+					->setTimestamp(time())
+					->setObject('remote_share', $remoteId)
+					->setSubject('remote_share', [$user, trim($name, '/')]);
+
+				$acceptAction = $notification->createAction();
+				$acceptAction->setLabel('accept')
+					->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/' . $remoteId), 'POST');
+				$declineAction = $notification->createAction();
+				$declineAction->setLabel('decline')
+					->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/' . $remoteId), 'DELETE');
+
+				$notification->addAction($acceptAction)
+					->addAction($declineAction);
+
+				$notificationManager->notify($notification);
+
 				return new \OC_OCS_Result();
 			} catch (\Exception $e) {
 				\OCP\Util::writeLog('files_sharing', 'server can not add remote share, ' . $e->getMessage(), \OCP\Util::ERROR);
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 295d013beff..20f1b046d35 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -103,3 +103,10 @@ if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') {
 		}
 	}
 }
+
+$manager = \OC::$server->getNotificationManager();
+$manager->registerNotifier(function() {
+	return new \OCA\Files_Sharing\Notifier(
+		\OC::$server->getL10NFactory()
+	);
+});
diff --git a/apps/files_sharing/lib/notifier.php b/apps/files_sharing/lib/notifier.php
new file mode 100644
index 00000000000..e050d4d3c1a
--- /dev/null
+++ b/apps/files_sharing/lib/notifier.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_Sharing;
+
+
+use OCP\Notification\INotification;
+use OCP\Notification\INotifier;
+
+class Notifier implements INotifier {
+	/** @var \OCP\L10N\IFactory */
+	protected $factory;
+
+	/**
+	 * @param \OCP\L10N\IFactory $factory
+	 */
+	public function __construct(\OCP\L10N\IFactory $factory) {
+		$this->factory = $factory;
+	}
+
+	/**
+	 * @param INotification $notification
+	 * @param string $languageCode The code of the language that should be used to prepare the notification
+	 * @return INotification
+	 */
+	public function prepare(INotification $notification, $languageCode) {
+		if ($notification->getApp() !== 'files_sharing') {
+			// Not my app => throw
+			throw new \InvalidArgumentException();
+		}
+
+		// Read the language from the notification
+		$l = $this->factory->get('files_sharing', $languageCode);
+
+		switch ($notification->getSubject()) {
+			// Deal with known subjects
+			case 'remote_share':
+				$params = $notification->getSubjectParameters();
+				$notification->setParsedSubject(
+					(string) $l->t('You received %s as a remote share from %s', $params)
+				);
+
+				// Deal with the actions for a known subject
+				foreach ($notification->getActions() as $action) {
+					switch ($action->getLabel()) {
+						case 'accept':
+							$action->setParsedLabel(
+								(string) $l->t('Accept')
+							);
+							break;
+
+						case 'decline':
+							$action->setParsedLabel(
+								(string) $l->t('Decline')
+							);
+							break;
+					}
+
+					$notification->addParsedAction($action);
+				}
+				return $notification;
+
+			default:
+				// Unknown subject => Unknown notification => throw
+				throw new \InvalidArgumentException();
+		}
+	}
+}
-- 
GitLab


From 805f1d0096205d346173ab4c0cf314e1c95eba2f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 1 Sep 2015 18:56:09 +0200
Subject: [PATCH 201/783] Scrap the notifications when the share is accepted or
 declined

---
 apps/files_sharing/ajax/external.php          |  1 +
 apps/files_sharing/api/remote.php             |  5 +++-
 apps/files_sharing/api/server2server.php      |  1 +
 apps/files_sharing/appinfo/application.php    |  1 +
 apps/files_sharing/lib/external/manager.php   | 24 ++++++++++++++++++-
 apps/files_sharing/lib/hooks.php              |  1 +
 .../tests/external/managertest.php            |  1 +
 apps/files_sharing/tests/server2server.php    |  1 +
 8 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php
index d26a64d3aec..66cfd8e9d1a 100644
--- a/apps/files_sharing/ajax/external.php
+++ b/apps/files_sharing/ajax/external.php
@@ -52,6 +52,7 @@ $externalManager = new \OCA\Files_Sharing\External\Manager(
 		\OC\Files\Filesystem::getMountManager(),
 		\OC\Files\Filesystem::getLoader(),
 		\OC::$server->getHTTPHelper(),
+		\OC::$server->getNotificationManager(),
 		\OC::$server->getUserSession()->getUser()->getUID()
 );
 
diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/api/remote.php
index f6cb0a29d8b..404787c3895 100644
--- a/apps/files_sharing/api/remote.php
+++ b/apps/files_sharing/api/remote.php
@@ -23,6 +23,7 @@ namespace OCA\Files_Sharing\API;
 
 use OC\Files\Filesystem;
 use OCA\Files_Sharing\External\Manager;
+use OCP\Notification\IManager;
 
 class Remote {
 
@@ -38,6 +39,7 @@ class Remote {
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
 			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
 			\OC_User::getUser()
 		);
 
@@ -56,6 +58,7 @@ class Remote {
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
 			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
 			\OC_User::getUser()
 		);
 
@@ -78,6 +81,7 @@ class Remote {
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
 			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
 			\OC_User::getUser()
 		);
 
@@ -87,5 +91,4 @@ class Remote {
 
 		return new \OC_OCS_Result(null, 404, "wrong share ID, share doesn't exist.");
 	}
-
 }
diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php
index d5f1dce5055..6ecaea20535 100644
--- a/apps/files_sharing/api/server2server.php
+++ b/apps/files_sharing/api/server2server.php
@@ -70,6 +70,7 @@ class Server2Server {
 					\OC\Files\Filesystem::getMountManager(),
 					\OC\Files\Filesystem::getLoader(),
 					\OC::$server->getHTTPHelper(),
+					\OC::$server->getNotificationManager(),
 					$shareWith
 				);
 
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index 530195c65fa..d0dcadb77e8 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -93,6 +93,7 @@ class Application extends App {
 				\OC\Files\Filesystem::getMountManager(),
 				\OC\Files\Filesystem::getLoader(),
 				$server->getHTTPHelper(),
+				$server->getNotificationManager(),
 				$uid
 			);
 		});
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 67a26c096c2..18b9c724dea 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -28,6 +28,7 @@ namespace OCA\Files_Sharing\External;
 
 use OC\Files\Filesystem;
 use OCP\Files;
+use OCP\Notification\IManager;
 
 class Manager {
 	const STORAGE = '\OCA\Files_Sharing\External\Storage';
@@ -57,20 +58,27 @@ class Manager {
 	 */
 	private $httpHelper;
 
+	/**
+	 * @var IManager
+	 */
+	private $notificationManager;
+
 	/**
 	 * @param \OCP\IDBConnection $connection
 	 * @param \OC\Files\Mount\Manager $mountManager
 	 * @param \OCP\Files\Storage\IStorageFactory $storageLoader
 	 * @param \OC\HTTPHelper $httpHelper
+	 * @param IManager $notificationManager
 	 * @param string $uid
 	 */
 	public function __construct(\OCP\IDBConnection $connection, \OC\Files\Mount\Manager $mountManager,
-								\OCP\Files\Storage\IStorageFactory $storageLoader, \OC\HTTPHelper $httpHelper, $uid) {
+								\OCP\Files\Storage\IStorageFactory $storageLoader, \OC\HTTPHelper $httpHelper, IManager $notificationManager, $uid) {
 		$this->connection = $connection;
 		$this->mountManager = $mountManager;
 		$this->storageLoader = $storageLoader;
 		$this->httpHelper = $httpHelper;
 		$this->uid = $uid;
+		$this->notificationManager = $notificationManager;
 	}
 
 	/**
@@ -206,6 +214,7 @@ class Manager {
 			$acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid));
 			$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
 
+			$this->scrapNotification($share['remote_id']);
 			return true;
 		}
 
@@ -228,12 +237,24 @@ class Manager {
 			$removeShare->execute(array($id, $this->uid));
 			$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
 
+			$this->scrapNotification($share['remote_id']);
 			return true;
 		}
 
 		return false;
 	}
 
+	/**
+	 * @param int $remoteShare
+	 */
+	protected function scrapNotification($remoteShare) {
+		$filter = $this->notificationManager->createNotification();
+		$filter->setApp('files_sharing')
+			->setUser($this->uid)
+			->setObject('remote_share', (int) $remoteShare);
+		$this->notificationManager->markProcessed($filter);
+	}
+
 	/**
 	 * inform remote server whether server-to-server share was accepted/declined
 	 *
@@ -265,6 +286,7 @@ class Manager {
 				\OC\Files\Filesystem::getMountManager(),
 				\OC\Files\Filesystem::getLoader(),
 				\OC::$server->getHTTPHelper(),
+				\OC::$server->getNotificationManager(),
 				$params['user']
 		);
 
diff --git a/apps/files_sharing/lib/hooks.php b/apps/files_sharing/lib/hooks.php
index 7dd04f2f4a0..1937010f390 100644
--- a/apps/files_sharing/lib/hooks.php
+++ b/apps/files_sharing/lib/hooks.php
@@ -33,6 +33,7 @@ class Hooks {
 			\OC\Files\Filesystem::getMountManager(),
 			\OC\Files\Filesystem::getLoader(),
 			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
 			$params['uid']);
 
 		$manager->removeUserShares($params['uid']);
diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php
index df01ea0f738..8e03c67a9a3 100644
--- a/apps/files_sharing/tests/external/managertest.php
+++ b/apps/files_sharing/tests/external/managertest.php
@@ -50,6 +50,7 @@ class ManagerTest extends TestCase {
 			$this->mountManager,
 			new StorageFactory(),
 			$httpHelper,
+			\OC::$server->getNotificationManager(),
 			$this->uid
 		);
 	}
diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php
index a1c87d73393..a4cc8209a8e 100644
--- a/apps/files_sharing/tests/server2server.php
+++ b/apps/files_sharing/tests/server2server.php
@@ -154,6 +154,7 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase {
 			\OC\Files\Filesystem::getMountManager(),
 			\OC\Files\Filesystem::getLoader(),
 			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
 			$toDelete
 			);
 
-- 
GitLab


From 0d154595f81e9c181a73ee44650fffe78bccc002 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 2 Sep 2015 13:09:46 +0200
Subject: [PATCH 202/783] Fix the subject of notifications

---
 lib/private/notification/manager.php      | 2 +-
 lib/private/notification/notification.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
index eee03d93db2..933c6199bc5 100644
--- a/lib/private/notification/manager.php
+++ b/lib/private/notification/manager.php
@@ -141,7 +141,7 @@ class Manager implements IManager {
 
 		foreach ($notifiers as $notifier) {
 			try {
-				$notifier->prepare($notification, $languageCode);
+				$notification = $notifier->prepare($notification, $languageCode);
 			} catch (\InvalidArgumentException $e) {
 				continue;
 			}
diff --git a/lib/private/notification/notification.php b/lib/private/notification/notification.php
index f5171f150c6..5151b5546a8 100644
--- a/lib/private/notification/notification.php
+++ b/lib/private/notification/notification.php
@@ -248,7 +248,7 @@ class Notification implements INotification {
 	 * @since 8.2.0
 	 */
 	public function getParsedSubject() {
-		return $this->messageParsed;
+		return $this->subjectParsed;
 	}
 
 	/**
-- 
GitLab


From acf8149f17fb940c9c9ce1519869a1de34ef6a84 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 3 Sep 2015 12:12:10 +0200
Subject: [PATCH 203/783] Add tests for Action

---
 lib/private/notification/action.php   |   2 +-
 lib/public/notification/iaction.php   |   2 +
 tests/lib/notification/actiontest.php | 232 ++++++++++++++++++++++++++
 3 files changed, 235 insertions(+), 1 deletion(-)
 create mode 100644 tests/lib/notification/actiontest.php

diff --git a/lib/private/notification/action.php b/lib/private/notification/action.php
index f0bcb23c877..7f654bf9082 100644
--- a/lib/private/notification/action.php
+++ b/lib/private/notification/action.php
@@ -106,7 +106,7 @@ class Action implements IAction {
 		if (!is_string($link) || $link === '' || isset($link[256])) {
 			throw new \InvalidArgumentException('The given link is invalid');
 		}
-		if (!in_array($requestType, ['GET', 'POST', 'PUT', 'DELETE'])) {
+		if (!in_array($requestType, ['GET', 'POST', 'PUT', 'DELETE'], true)) {
 			throw new \InvalidArgumentException('The given request type is invalid');
 		}
 		$this->link = $link;
diff --git a/lib/public/notification/iaction.php b/lib/public/notification/iaction.php
index 64b95bdb5ad..8db1eaa6543 100644
--- a/lib/public/notification/iaction.php
+++ b/lib/public/notification/iaction.php
@@ -97,11 +97,13 @@ interface IAction {
 
 	/**
 	 * @return bool
+	 * @since 8.2.0
 	 */
 	public function isValid();
 
 	/**
 	 * @return bool
+	 * @since 8.2.0
 	 */
 	public function isValidParsed();
 }
diff --git a/tests/lib/notification/actiontest.php b/tests/lib/notification/actiontest.php
new file mode 100644
index 00000000000..5b3f10f9ce8
--- /dev/null
+++ b/tests/lib/notification/actiontest.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Test\Notification;
+
+
+use OC\Notification\Action;
+use OCP\Notification\IAction;
+
+class ActionTest extends \Test\TestCase {
+	/** @var IAction */
+	protected $action;
+
+	public function setUp() {
+		parent::setUp();
+		$this->action = new Action();
+	}
+
+	public function dataSetLabel() {
+		return [
+			['test1'],
+			['test2'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetLabel
+	 * @param string $label
+	 */
+	public function testSetLabel($label) {
+		$this->assertSame('', $this->action->getLabel());
+		$this->action->setLabel($label);
+		$this->assertSame($label, $this->action->getLabel());
+	}
+
+	public function dataSetLabelInvalid() {
+		return [
+			[true],
+			[false],
+			[0],
+			[1],
+			[''],
+			[str_repeat('a', 33)],
+			[[]],
+			[[str_repeat('a', 33)]],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetLabelInvalid
+	 * @param string $label
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetLabelInvalid($label) {
+		$this->action->setLabel($label);
+	}
+
+	public function dataSetParsedLabel() {
+		return [
+			['test1'],
+			['test2'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetParsedLabel
+	 * @param string $label
+	 */
+	public function testSetParsedLabel($label) {
+		$this->assertSame('', $this->action->getParsedLabel());
+		$this->action->setParsedLabel($label);
+		$this->assertSame($label, $this->action->getParsedLabel());
+	}
+
+	public function dataSetParsedLabelInvalid() {
+		return [
+			[true],
+			[false],
+			[0],
+			[1],
+			[''],
+			[[]],
+			[[str_repeat('a', 33)]],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetParsedLabelInvalid
+	 * @param string $label
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetParsedLabelInvalid($label) {
+		$this->action->setParsedLabel($label);
+	}
+
+	public function dataSetLink() {
+		return [
+			['test1', 'GET'],
+			['test2', 'POST'],
+			['test3', 'PUT'],
+			['test4', 'DELETE'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetLink
+	 * @param string $link
+	 * @param string $type
+	 */
+	public function testSetLink($link, $type) {
+		$this->assertSame('', $this->action->getLink());
+		$this->action->setLink($link, $type);
+		$this->assertSame($link, $this->action->getLink());
+		$this->assertSame($type, $this->action->getRequestType());
+	}
+
+	public function dataSetLinkInvalid() {
+		return [
+			// Invalid link
+			[true, 'GET'],
+			[false, 'GET'],
+			[0, 'GET'],
+			[1, 'GET'],
+			['', 'GET'],
+			[str_repeat('a', 257), 'GET'],
+			[[], 'GET'],
+			[[str_repeat('a', 257)], 'GET'],
+
+			// Invalid type
+			['url', 'notGET'],
+			['url', true],
+			['url', false],
+			['url', 0],
+			['url', 1],
+			['url', []],
+			['url', ['GET']],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetLinkInvalid
+	 * @param string $link
+	 * @param string $type
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetLinkInvalid($link, $type) {
+		$this->action->setLink($link, $type);
+	}
+
+	public function dataSetIcon() {
+		return [
+			['test1'],
+			['test2'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetIcon
+	 * @param string $icon
+	 */
+	public function testSetIcon($icon) {
+		$this->assertSame('', $this->action->getIcon());
+		$this->action->setIcon($icon);
+		$this->assertSame($icon, $this->action->getIcon());
+	}
+
+	public function dataSetIconInvalid() {
+		return [
+			[true],
+			[false],
+			[0],
+			[1],
+			[''],
+			[str_repeat('a', 65)],
+			[[]],
+			[[str_repeat('a', 65)]],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetIconInvalid
+	 * @param string $icon
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetIconInvalid($icon) {
+		$this->action->setIcon($icon);
+	}
+
+	public function testIsValid() {
+		$this->assertFalse($this->action->isValid());
+		$this->assertFalse($this->action->isValidParsed());
+		$this->action->setLabel('label');
+		$this->assertFalse($this->action->isValid());
+		$this->assertFalse($this->action->isValidParsed());
+		$this->action->setLink('link', 'GET');
+		$this->assertTrue($this->action->isValid());
+		$this->assertFalse($this->action->isValidParsed());
+	}
+
+	public function testIsValidParsed() {
+		$this->assertFalse($this->action->isValid());
+		$this->assertFalse($this->action->isValidParsed());
+		$this->action->setParsedLabel('label');
+		$this->assertFalse($this->action->isValid());
+		$this->assertFalse($this->action->isValidParsed());
+		$this->action->setLink('link', 'GET');
+		$this->assertFalse($this->action->isValid());
+		$this->assertTrue($this->action->isValidParsed());
+	}
+}
-- 
GitLab


From c6469be8bdb70a57da5212f7b1e8e4836e0bb2be Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 3 Sep 2015 14:47:49 +0200
Subject: [PATCH 204/783] Add tests for notification

---
 lib/private/notification/notification.php   |  16 +-
 tests/lib/notification/notificationtest.php | 602 ++++++++++++++++++++
 2 files changed, 610 insertions(+), 8 deletions(-)
 create mode 100644 tests/lib/notification/notificationtest.php

diff --git a/lib/private/notification/notification.php b/lib/private/notification/notification.php
index 5151b5546a8..2f53a347283 100644
--- a/lib/private/notification/notification.php
+++ b/lib/private/notification/notification.php
@@ -120,7 +120,7 @@ class Notification implements INotification {
 	 * @since 8.2.0
 	 */
 	public function setUser($user) {
-		if (!is_string($user) || $user === '' || isset($app[64])) {
+		if (!is_string($user) || $user === '' || isset($user[64])) {
 			throw new \InvalidArgumentException('The given user id is invalid');
 		}
 		$this->user = $user;
@@ -413,7 +413,7 @@ class Notification implements INotification {
 		return
 			$this->isValidCommon()
 			&&
-			$this->subject !== ''
+			$this->getSubject() !== ''
 		;
 	}
 
@@ -425,7 +425,7 @@ class Notification implements INotification {
 		return
 			$this->isValidCommon()
 			&&
-			$this->subjectParsed !== ''
+			$this->getParsedSubject() !== ''
 		;
 	}
 
@@ -434,15 +434,15 @@ class Notification implements INotification {
 	 */
 	protected function isValidCommon() {
 		return
-			$this->app !== ''
+			$this->getApp() !== ''
 			&&
-			$this->user !== ''
+			$this->getUser() !== ''
 			&&
-			$this->timestamp !== 0
+			$this->getTimestamp() !== 0
 			&&
-			$this->objectType !== ''
+			$this->getObjectType() !== ''
 			&&
-			$this->objectId !== 0
+			$this->getObjectId() !== 0
 		;
 	}
 }
diff --git a/tests/lib/notification/notificationtest.php b/tests/lib/notification/notificationtest.php
new file mode 100644
index 00000000000..8f1779dd968
--- /dev/null
+++ b/tests/lib/notification/notificationtest.php
@@ -0,0 +1,602 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Test\Notification;
+
+
+use OC\Notification\Action;
+use OC\Notification\Notification;
+use OCP\Notification\IAction;
+use OCP\Notification\INotification;
+
+class NotificationTest extends \Test\TestCase {
+	/** @var INotification */
+	protected $notification;
+
+	public function setUp() {
+		parent::setUp();
+		$this->notification = new Notification();
+	}
+
+	protected function dataValidString($maxLength) {
+		$dataSets = [
+			['test1'],
+			[str_repeat('a', 1)],
+		];
+		if ($maxLength !== false) {
+			$dataSets[] = [str_repeat('a', $maxLength)];
+		}
+		return $dataSets;
+	}
+
+	protected function dataInvalidString($maxLength) {
+		$dataSets = [
+			[true],
+			[false],
+			[0],
+			[1],
+			[''],
+			[[]],
+		];
+		if ($maxLength !== false) {
+			$dataSets[] = [str_repeat('a', $maxLength + 1)];
+			$dataSets[] = [[str_repeat('a', $maxLength + 1)]];
+		}
+		return $dataSets;
+	}
+
+	protected function dataValidInt() {
+		return [
+			[0],
+			[1],
+			[time()],
+		];
+	}
+
+	protected function dataInvalidInt() {
+		return [
+			[true],
+			[false],
+			[''],
+			['a'],
+			[str_repeat('a', 256)],
+			[[]],
+			[['a']],
+			[[str_repeat('a', 256)]],
+		];
+	}
+
+	public function dataSetApp() {
+		return $this->dataValidString(32);
+	}
+
+	/**
+	 * @dataProvider dataSetApp
+	 * @param string $app
+	 */
+	public function testSetApp($app) {
+		$this->assertSame('', $this->notification->getApp());
+		$this->notification->setApp($app);
+		$this->assertSame($app, $this->notification->getApp());
+	}
+
+	public function dataSetAppInvalid() {
+		return $this->dataInvalidString(32);
+	}
+
+	/**
+	 * @dataProvider dataSetAppInvalid
+	 * @param mixed $app
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetAppInvalid($app) {
+		$this->notification->setApp($app);
+	}
+
+	public function dataSetUser() {
+		return $this->dataValidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetUser
+	 * @param string $user
+	 */
+	public function testSetUser($user) {
+		$this->assertSame('', $this->notification->getUser());
+		$this->notification->setUser($user);
+		$this->assertSame($user, $this->notification->getUser());
+	}
+
+	public function dataSetUserInvalid() {
+		return $this->dataInvalidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetUserInvalid
+	 * @param mixed $user
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetUserInvalid($user) {
+		$this->notification->setUser($user);
+	}
+
+	public function dataSetTimestamp() {
+		return $this->dataValidInt();
+	}
+
+	/**
+	 * @dataProvider dataSetTimestamp
+	 * @param int $timestamp
+	 */
+	public function testSetTimestamp($timestamp) {
+		$this->assertSame(0, $this->notification->getTimestamp());
+		$this->notification->setTimestamp($timestamp);
+		$this->assertSame($timestamp, $this->notification->getTimestamp());
+	}
+
+	public function dataSetTimestampInvalid() {
+		return $this->dataInvalidInt();
+	}
+
+	/**
+	 * @dataProvider dataSetTimestampInvalid
+	 * @param mixed $timestamp
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetTimestampInvalid($timestamp) {
+		$this->notification->setTimestamp($timestamp);
+	}
+
+	public function dataSetObject() {
+		return [
+			['a', 1],
+			[str_repeat('a', 64), time()],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetObject
+	 * @param string $type
+	 * @param int $id
+	 */
+	public function testSetObject($type, $id) {
+		$this->assertSame('', $this->notification->getObjectType());
+		$this->assertSame(0, $this->notification->getObjectId());
+		$this->notification->setObject($type, $id);
+		$this->assertSame($type, $this->notification->getObjectType());
+		$this->assertSame($id, $this->notification->getObjectId());
+	}
+
+	public function dataSetObjectTypeInvalid() {
+		return $this->dataInvalidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetObjectTypeInvalid
+	 * @param mixed $type
+	 *
+	 * @expectedException \InvalidArgumentException
+	 * @expectedMessage 'The given object type is invalid'
+	 */
+	public function testSetObjectTypeInvalid($type) {
+		$this->notification->setObject($type, 1337);
+	}
+
+	public function dataSetObjectIdInvalid() {
+		return $this->dataInvalidInt();
+	}
+
+	/**
+	 * @dataProvider dataSetObjectIdInvalid
+	 * @param mixed $id
+	 *
+	 * @expectedException \InvalidArgumentException
+	 * @expectedMessage 'The given object id is invalid'
+	 */
+	public function testSetObjectIdInvalid($id) {
+		$this->notification->setObject('object', $id);
+	}
+
+	public function dataSetSubject() {
+		return [
+			['a', []],
+			[str_repeat('a', 64), [str_repeat('a', 160)]],
+			[str_repeat('a', 64), array_fill(0, 160, 'a')],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetSubject
+	 * @param string $subject
+	 * @param array $parameters
+	 */
+	public function testSetSubject($subject, $parameters) {
+		$this->assertSame('', $this->notification->getSubject());
+		$this->assertSame([], $this->notification->getSubjectParameters());
+		$this->notification->setSubject($subject, $parameters);
+		$this->assertSame($subject, $this->notification->getSubject());
+		$this->assertSame($parameters, $this->notification->getSubjectParameters());
+	}
+
+	public function dataSetSubjectInvalidSubject() {
+		return $this->dataInvalidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetSubjectInvalidSubject
+	 * @param mixed $subject
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetSubjectInvalidSubject($subject) {
+		$this->notification->setSubject($subject, []);
+	}
+
+	public function dataSetParsedSubject() {
+		return $this->dataValidString(false);
+	}
+
+	/**
+	 * @dataProvider dataSetParsedSubject
+	 * @param string $subject
+	 */
+	public function testSetParsedSubject($subject) {
+		$this->assertSame('', $this->notification->getParsedSubject());
+		$this->notification->setParsedSubject($subject);
+		$this->assertSame($subject, $this->notification->getParsedSubject());
+	}
+
+	public function dataSetParsedSubjectInvalid() {
+		return $this->dataInvalidString(false);
+	}
+
+	/**
+	 * @dataProvider dataSetParsedSubjectInvalid
+	 * @param mixed $subject
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetParsedSubjectInvalid($subject) {
+		$this->notification->setParsedSubject($subject);
+	}
+
+	public function dataSetMessage() {
+		return [
+			['a', []],
+			[str_repeat('a', 64), [str_repeat('a', 160)]],
+			[str_repeat('a', 64), array_fill(0, 160, 'a')],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetMessage
+	 * @param string $message
+	 * @param array $parameters
+	 */
+	public function testSetMessage($message, $parameters) {
+		$this->assertSame('', $this->notification->getMessage());
+		$this->assertSame([], $this->notification->getMessageParameters());
+		$this->notification->setMessage($message, $parameters);
+		$this->assertSame($message, $this->notification->getMessage());
+		$this->assertSame($parameters, $this->notification->getMessageParameters());
+	}
+
+	public function dataSetMessageInvalidMessage() {
+		return $this->dataInvalidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetMessageInvalidMessage
+	 * @param mixed $message
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetMessageInvalidMessage($message) {
+		$this->notification->setMessage($message, []);
+	}
+
+	public function dataSetParsedMessage() {
+		return $this->dataValidString(false);
+	}
+
+	/**
+	 * @dataProvider dataSetParsedMessage
+	 * @param string $message
+	 */
+	public function testSetParsedMessage($message) {
+		$this->assertSame('', $this->notification->getParsedMessage());
+		$this->notification->setParsedMessage($message);
+		$this->assertSame($message, $this->notification->getParsedMessage());
+	}
+
+	public function dataSetParsedMessageInvalid() {
+		return $this->dataInvalidString(false);
+	}
+
+	/**
+	 * @dataProvider dataSetParsedMessageInvalid
+	 * @param mixed $message
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetParsedMessageInvalid($message) {
+		$this->notification->setParsedMessage($message);
+	}
+
+	public function dataSetLink() {
+		return $this->dataValidString(4000);
+	}
+
+	/**
+	 * @dataProvider dataSetLink
+	 * @param string $link
+	 */
+	public function testSetLink($link) {
+		$this->assertSame('', $this->notification->getLink());
+		$this->notification->setLink($link);
+		$this->assertSame($link, $this->notification->getLink());
+	}
+
+	public function dataSetLinkInvalid() {
+		return $this->dataInvalidString(4000);
+	}
+
+	/**
+	 * @dataProvider dataSetLinkInvalid
+	 * @param mixed $link
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetLinkInvalid($link) {
+		$this->notification->setLink($link);
+	}
+
+	public function dataSetIcon() {
+		return $this->dataValidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetIcon
+	 * @param string $icon
+	 */
+	public function testSetIcon($icon) {
+		$this->assertSame('', $this->notification->getIcon());
+		$this->notification->setIcon($icon);
+		$this->assertSame($icon, $this->notification->getIcon());
+	}
+
+	public function dataSetIconInvalid() {
+		return $this->dataInvalidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetIconInvalid
+	 * @param mixed $icon
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetIconInvalid($icon) {
+		$this->notification->setIcon($icon);
+	}
+
+	public function testCreateAction() {
+		$action = $this->notification->createAction();
+		$this->assertInstanceOf('OCP\Notification\IAction', $action);
+	}
+
+	public function testAddAction() {
+		/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OCP\Notification\IAction')
+			->disableOriginalConstructor()
+			->getMock();
+		$action->expects($this->once())
+			->method('isValid')
+			->willReturn(true);
+		$action->expects($this->never())
+			->method('isValidParsed');
+
+		$this->notification->addAction($action);
+
+		$this->assertEquals([$action], $this->notification->getActions());
+		$this->assertEquals([], $this->notification->getParsedActions());
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testAddActionInvalid() {
+		/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OCP\Notification\IAction')
+			->disableOriginalConstructor()
+			->getMock();
+		$action->expects($this->once())
+			->method('isValid')
+			->willReturn(false);
+		$action->expects($this->never())
+			->method('isValidParsed');
+
+		$this->notification->addAction($action);
+	}
+
+	public function testAddParsedAction() {
+		/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OCP\Notification\IAction')
+			->disableOriginalConstructor()
+			->getMock();
+		$action->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(true);
+		$action->expects($this->never())
+			->method('isValid');
+
+		$this->notification->addParsedAction($action);
+
+		$this->assertEquals([$action], $this->notification->getParsedActions());
+		$this->assertEquals([], $this->notification->getActions());
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testAddParsedActionInvalid() {
+		/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OCP\Notification\IAction')
+			->disableOriginalConstructor()
+			->getMock();
+		$action->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(false);
+		$action->expects($this->never())
+			->method('isValid');
+
+		$this->notification->addParsedAction($action);
+	}
+
+	public function dataIsValid() {
+		return [
+			[false, '', false],
+			[true, '', false],
+			[false, 'a', false],
+			[true, 'a', true],
+		];
+	}
+
+	/**
+	 * @dataProvider dataIsValid
+	 *
+	 * @param bool $isValidCommon
+	 * @param string $subject
+	 * @param bool $expected
+	 */
+	public function testIsValid($isValidCommon, $subject, $expected) {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('\OC\Notification\Notification')
+			->setMethods([
+				'isValidCommon',
+				'getSubject',
+			])
+			->getMock();
+
+		$notification->expects($this->once())
+			->method('isValidCommon')
+			->willReturn($isValidCommon);
+
+		$notification->expects(!$isValidCommon ? $this->never() : $this->once())
+			->method('getSubject')
+			->willReturn($subject);
+
+		$notification->expects($this->never())
+			->method('getParsedSubject')
+			->willReturn($subject);
+
+		$this->assertEquals($expected, $notification->isValid());
+	}
+
+	/**
+	 * @dataProvider dataIsValid
+	 *
+	 * @param bool $isValidCommon
+	 * @param string $subject
+	 * @param bool $expected
+	 */
+	public function testIsParsedValid($isValidCommon, $subject, $expected) {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('\OC\Notification\Notification')
+			->setMethods([
+				'isValidCommon',
+				'getParsedSubject',
+			])
+			->getMock();
+
+		$notification->expects($this->once())
+			->method('isValidCommon')
+			->willReturn($isValidCommon);
+
+		$notification->expects(!$isValidCommon ? $this->never() : $this->once())
+			->method('getParsedSubject')
+			->willReturn($subject);
+
+		$notification->expects($this->never())
+			->method('getSubject')
+			->willReturn($subject);
+
+		$this->assertEquals($expected, $notification->isValidParsed());
+	}
+
+	public function dataIsValidCommon() {
+		return [
+			['', '', 0, '', 0, false],
+			['app', '', 0, '', 0, false],
+			['app', 'user', 0, '', 0, false],
+			['app', 'user', time(), '', 0, false],
+			['app', 'user', time(), 'type', 0, false],
+			['app', 'user', time(), 'type', 42, true],
+		];
+	}
+
+	/**
+	 * @dataProvider dataIsValidCommon
+	 *
+	 * @param string $app
+	 * @param string $user
+	 * @param int $timestamp
+	 * @param string $objectType
+	 * @param int $objectId
+	 * @param bool $expected
+	 */
+	public function testIsValidCommon($app, $user, $timestamp, $objectType, $objectId, $expected) {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('\OC\Notification\Notification')
+			->setMethods([
+				'getApp',
+				'getUser',
+				'getTimestamp',
+				'getObjectType',
+				'getObjectId',
+			])
+			->getMock();
+
+		$notification->expects($this->any())
+			->method('getApp')
+			->willReturn($app);
+
+		$notification->expects($this->any())
+			->method('getUser')
+			->willReturn($user);
+
+		$notification->expects($this->any())
+			->method('getTimestamp')
+			->willReturn($timestamp);
+
+		$notification->expects($this->any())
+			->method('getObjectType')
+			->willReturn($objectType);
+
+		$notification->expects($this->any())
+			->method('getObjectId')
+			->willReturn($objectId);
+
+		$this->assertEquals($expected, $this->invokePrivate($notification, 'isValidCommon'));
+	}
+}
-- 
GitLab


From 270b0bd91b9ff5ab8fa87bd2e8124ff0bb35470b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 3 Sep 2015 14:48:27 +0200
Subject: [PATCH 205/783] Add more action tests

---
 tests/lib/notification/actiontest.php       | 16 ++++++++++------
 tests/lib/notification/notificationtest.php |  5 ++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tests/lib/notification/actiontest.php b/tests/lib/notification/actiontest.php
index 5b3f10f9ce8..994e22a2f14 100644
--- a/tests/lib/notification/actiontest.php
+++ b/tests/lib/notification/actiontest.php
@@ -24,8 +24,9 @@ namespace Test\Notification;
 
 use OC\Notification\Action;
 use OCP\Notification\IAction;
+use Test\TestCase;
 
-class ActionTest extends \Test\TestCase {
+class ActionTest extends TestCase {
 	/** @var IAction */
 	protected $action;
 
@@ -37,7 +38,8 @@ class ActionTest extends \Test\TestCase {
 	public function dataSetLabel() {
 		return [
 			['test1'],
-			['test2'],
+			[str_repeat('a', 1)],
+			[str_repeat('a', 32)],
 		];
 	}
 
@@ -77,7 +79,8 @@ class ActionTest extends \Test\TestCase {
 	public function dataSetParsedLabel() {
 		return [
 			['test1'],
-			['test2'],
+			[str_repeat('a', 1)],
+			[str_repeat('a', 32)],
 		];
 	}
 
@@ -117,8 +120,8 @@ class ActionTest extends \Test\TestCase {
 		return [
 			['test1', 'GET'],
 			['test2', 'POST'],
-			['test3', 'PUT'],
-			['test4', 'DELETE'],
+			[str_repeat('a', 1), 'PUT'],
+			[str_repeat('a', 256), 'DELETE'],
 		];
 	}
 
@@ -171,7 +174,8 @@ class ActionTest extends \Test\TestCase {
 	public function dataSetIcon() {
 		return [
 			['test1'],
-			['test2'],
+			[str_repeat('a', 1)],
+			[str_repeat('a', 64)],
 		];
 	}
 
diff --git a/tests/lib/notification/notificationtest.php b/tests/lib/notification/notificationtest.php
index 8f1779dd968..5865d2dbee1 100644
--- a/tests/lib/notification/notificationtest.php
+++ b/tests/lib/notification/notificationtest.php
@@ -22,12 +22,11 @@
 namespace Test\Notification;
 
 
-use OC\Notification\Action;
 use OC\Notification\Notification;
-use OCP\Notification\IAction;
 use OCP\Notification\INotification;
+use Test\TestCase;
 
-class NotificationTest extends \Test\TestCase {
+class NotificationTest extends TestCase {
 	/** @var INotification */
 	protected $notification;
 
-- 
GitLab


From 190d2c3d5bd8b2bbd39f9112c5b977d27ee70664 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 3 Sep 2015 15:24:33 +0200
Subject: [PATCH 206/783] Add tests for the notification manager

---
 lib/private/notification/manager.php   |  17 +-
 tests/lib/notification/managertest.php | 345 +++++++++++++++++++++++++
 2 files changed, 360 insertions(+), 2 deletions(-)
 create mode 100644 tests/lib/notification/managertest.php

diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
index 933c6199bc5..bafb123f768 100644
--- a/lib/private/notification/manager.php
+++ b/lib/private/notification/manager.php
@@ -40,6 +40,13 @@ class Manager implements IManager {
 	/** @var \Closure */
 	protected $notifiersClosures;
 
+	public function __construct() {
+		$this->apps = [];
+		$this->notifiers = [];
+		$this->appsClosures = [];
+		$this->notifiersClosures = [];
+	}
+
 	/**
 	 * @param \Closure $service The service must implement IApp, otherwise a
 	 *                          \InvalidArgumentException is thrown later
@@ -70,6 +77,7 @@ class Manager implements IManager {
 			return $this->apps;
 		}
 
+		$this->apps = [];
 		foreach ($this->appsClosures as $closure) {
 			$app = $closure();
 			if (!($app instanceof IApp)) {
@@ -89,6 +97,7 @@ class Manager implements IManager {
 			return $this->notifiers;
 		}
 
+		$this->notifiers = [];
 		foreach ($this->notifiersClosures as $closure) {
 			$notifier = $closure();
 			if (!($notifier instanceof INotifier)) {
@@ -146,11 +155,15 @@ class Manager implements IManager {
 				continue;
 			}
 
-			if (!$notification->isValidParsed()) {
+			if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
 				throw new \InvalidArgumentException('The given notification has not been handled');
 			}
 		}
 
+		if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+			throw new \InvalidArgumentException('The given notification has not been handled');
+		}
+
 		return $notification;
 	}
 
@@ -175,7 +188,7 @@ class Manager implements IManager {
 
 		$count = 0;
 		foreach ($apps as $app) {
-			$count += $app->markProcessed($notification);
+			$count += $app->getCount($notification);
 		}
 
 		return $count;
diff --git a/tests/lib/notification/managertest.php b/tests/lib/notification/managertest.php
new file mode 100644
index 00000000000..13ac4b80b84
--- /dev/null
+++ b/tests/lib/notification/managertest.php
@@ -0,0 +1,345 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Test\Notification;
+
+use OC\Notification\Manager;
+use OCP\Notification\IManager;
+use Test\TestCase;
+
+class ManagerTest extends TestCase {
+	/** @var IManager */
+	protected $manager;
+
+	public function setUp() {
+		parent::setUp();
+		$this->manager = new Manager();
+	}
+
+	public function testRegisterApp() {
+		$app = $this->getMockBuilder('OCP\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$closure = function() use ($app) {
+			return $app;
+		};
+
+		$this->assertEquals([], $this->invokePrivate($this->manager, 'getApps'));
+
+		$this->manager->registerApp($closure);
+
+		$this->assertEquals([$app], $this->invokePrivate($this->manager, 'getApps'));
+		$this->assertEquals([$app], $this->invokePrivate($this->manager, 'getApps'));
+
+		$this->manager->registerApp($closure);
+
+		$this->assertEquals([$app, $app], $this->invokePrivate($this->manager, 'getApps'));
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testRegisterAppInvalid() {
+		$notifier = $this->getMockBuilder('OCP\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$closure = function() use ($notifier) {
+			return $notifier;
+		};
+
+		$this->manager->registerApp($closure);
+
+		$this->invokePrivate($this->manager, 'getApps');
+	}
+
+	public function testRegisterNotifier() {
+		$notifier = $this->getMockBuilder('OCP\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$closure = function() use ($notifier) {
+			return $notifier;
+		};
+
+		$this->assertEquals([], $this->invokePrivate($this->manager, 'getNotifiers'));
+
+		$this->manager->registerNotifier($closure);
+
+		$this->assertEquals([$notifier], $this->invokePrivate($this->manager, 'getNotifiers'));
+		$this->assertEquals([$notifier], $this->invokePrivate($this->manager, 'getNotifiers'));
+
+		$this->manager->registerNotifier($closure);
+
+		$this->assertEquals([$notifier, $notifier], $this->invokePrivate($this->manager, 'getNotifiers'));
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testRegisterNotifierInvalid() {
+		$app = $this->getMockBuilder('OCP\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$closure = function() use ($app) {
+			return $app;
+		};
+
+		$this->manager->registerNotifier($closure);
+
+		$this->invokePrivate($this->manager, 'getNotifiers');
+	}
+
+	public function testCreateNotification() {
+		$action = $this->manager->createNotification();
+		$this->assertInstanceOf('OCP\Notification\INotification', $action);
+	}
+
+	public function testNotify() {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValid')
+			->willReturn(true);
+
+		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
+		$app = $this->getMockBuilder('OCP\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app->expects($this->once())
+			->method('notify')
+			->with($notification);
+
+		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
+		$app2 = $this->getMockBuilder('OCP\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app2->expects($this->once())
+			->method('notify')
+			->with($notification);
+
+		$this->manager->registerApp(function() use ($app) {
+			return $app;
+		});
+		$this->manager->registerApp(function() use ($app2) {
+			return $app2;
+		});
+
+		$this->manager->notify($notification);
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testNotifyInvalid() {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValid')
+			->willReturn(false);
+
+		$this->manager->notify($notification);
+	}
+
+	public function testPrepare() {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(true);
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification2 */
+		$notification2 = $this->getMockBuilder('OCP\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification2->expects($this->exactly(2))
+			->method('isValidParsed')
+			->willReturn(true);
+
+		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
+		$notifier = $this->getMockBuilder('OCP\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+		$notifier->expects($this->once())
+			->method('prepare')
+			->with($notification, 'en')
+			->willReturnArgument(0);
+
+		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier2 */
+		$notifier2 = $this->getMockBuilder('OCP\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+		$notifier2->expects($this->once())
+			->method('prepare')
+			->with($notification, 'en')
+			->willReturn($notification2);
+
+		$this->manager->registerNotifier(function() use ($notifier) {
+			return $notifier;
+		});
+		$this->manager->registerNotifier(function() use ($notifier2) {
+			return $notifier2;
+		});
+
+		$this->assertEquals($notification2, $this->manager->prepare($notification, 'en'));
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testPrepareInvalid() {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(false);
+
+		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
+		$notifier = $this->getMockBuilder('OCP\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+		$notifier->expects($this->once())
+			->method('prepare')
+			->with($notification, 'de')
+			->willReturnArgument(0);
+
+		$this->manager->registerNotifier(function() use ($notifier) {
+			return $notifier;
+		});
+
+		$this->manager->prepare($notification, 'de');
+	}
+
+	public function testPrepareNotifierThrows() {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(true);
+
+		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
+		$notifier = $this->getMockBuilder('OCP\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+		$notifier->expects($this->once())
+			->method('prepare')
+			->with($notification, 'de')
+			->willThrowException(new \InvalidArgumentException);
+
+		$this->manager->registerNotifier(function() use ($notifier) {
+			return $notifier;
+		});
+
+		$this->assertEquals($notification, $this->manager->prepare($notification, 'de'));
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testPrepareNoNotifier() {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(false);
+
+		$this->manager->prepare($notification, 'en');
+	}
+
+	public function testMarkProcessed() {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
+		$app = $this->getMockBuilder('OCP\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app->expects($this->once())
+			->method('markProcessed')
+			->with($notification);
+
+		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
+		$app2 = $this->getMockBuilder('OCP\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app2->expects($this->once())
+			->method('markProcessed')
+			->with($notification);
+
+		$this->manager->registerApp(function() use ($app) {
+			return $app;
+		});
+		$this->manager->registerApp(function() use ($app2) {
+			return $app2;
+		});
+
+		$this->manager->markProcessed($notification);
+	}
+
+	public function testGetCount() {
+		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
+		$app = $this->getMockBuilder('OCP\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app->expects($this->once())
+			->method('getCount')
+			->with($notification)
+			->willReturn(21);
+
+		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
+		$app2 = $this->getMockBuilder('OCP\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app2->expects($this->once())
+			->method('getCount')
+			->with($notification)
+			->willReturn(42);
+
+		$this->manager->registerApp(function() use ($app) {
+			return $app;
+		});
+		$this->manager->registerApp(function() use ($app2) {
+			return $app2;
+		});
+
+		$this->assertSame(63, $this->manager->getCount($notification));
+	}
+}
-- 
GitLab


From 59f37a8dfbc27242bb0ad50731f8ae20b1ad938c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 3 Sep 2015 15:26:17 +0200
Subject: [PATCH 207/783] Add tests for the query()

---
 tests/lib/server.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/lib/server.php b/tests/lib/server.php
index e73fc8b3ab1..78d6a0c8302 100644
--- a/tests/lib/server.php
+++ b/tests/lib/server.php
@@ -104,6 +104,8 @@ class Server extends \Test\TestCase {
 
 			['NavigationManager', '\OC\NavigationManager'],
 			['NavigationManager', '\OCP\INavigationManager'],
+			['NotificationManager', '\OC\Notification\Manager'],
+			['NotificationManager', '\OCP\Notification\IManager'],
 			['UserCache', '\OC\Cache\File'],
 			['UserCache', '\OCP\ICache'],
 
-- 
GitLab


From 38001d824b142ca9c47f2afafce91ab8b76f1a9a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 8 Sep 2015 08:57:29 +0200
Subject: [PATCH 208/783] Move interfaces to private until they are no longer
 experimental

---
 apps/files_sharing/api/remote.php             |  1 -
 apps/files_sharing/lib/external/manager.php   |  2 +-
 apps/files_sharing/lib/notifier.php           |  4 +-
 lib/private/notification/action.php           |  1 -
 .../notification/iaction.php                  |  4 +-
 lib/{public => private}/notification/iapp.php |  4 +-
 .../notification/imanager.php                 |  4 +-
 .../notification/inotification.php            |  4 +-
 .../notification/inotifier.php                |  4 +-
 lib/private/notification/manager.php          |  5 --
 lib/private/notification/notification.php     |  2 -
 lib/private/server.php                        |  2 +-
 lib/public/iservercontainer.php               |  2 +-
 tests/lib/notification/actiontest.php         |  2 +-
 tests/lib/notification/managertest.php        | 88 +++++++++----------
 tests/lib/notification/notificationtest.php   | 26 +++---
 tests/lib/server.php                          |  2 +-
 17 files changed, 74 insertions(+), 83 deletions(-)
 rename lib/{public => private}/notification/iaction.php (97%)
 rename lib/{public => private}/notification/iapp.php (96%)
 rename lib/{public => private}/notification/imanager.php (96%)
 rename lib/{public => private}/notification/inotification.php (98%)
 rename lib/{public => private}/notification/inotifier.php (95%)

diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/api/remote.php
index 404787c3895..0f6d2dc265a 100644
--- a/apps/files_sharing/api/remote.php
+++ b/apps/files_sharing/api/remote.php
@@ -23,7 +23,6 @@ namespace OCA\Files_Sharing\API;
 
 use OC\Files\Filesystem;
 use OCA\Files_Sharing\External\Manager;
-use OCP\Notification\IManager;
 
 class Remote {
 
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 18b9c724dea..17142e95099 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -28,7 +28,7 @@ namespace OCA\Files_Sharing\External;
 
 use OC\Files\Filesystem;
 use OCP\Files;
-use OCP\Notification\IManager;
+use OC\Notification\IManager;
 
 class Manager {
 	const STORAGE = '\OCA\Files_Sharing\External\Storage';
diff --git a/apps/files_sharing/lib/notifier.php b/apps/files_sharing/lib/notifier.php
index e050d4d3c1a..cc2deb3f439 100644
--- a/apps/files_sharing/lib/notifier.php
+++ b/apps/files_sharing/lib/notifier.php
@@ -22,8 +22,8 @@
 namespace OCA\Files_Sharing;
 
 
-use OCP\Notification\INotification;
-use OCP\Notification\INotifier;
+use OC\Notification\INotification;
+use OC\Notification\INotifier;
 
 class Notifier implements INotifier {
 	/** @var \OCP\L10N\IFactory */
diff --git a/lib/private/notification/action.php b/lib/private/notification/action.php
index 7f654bf9082..6de8a1a4bbc 100644
--- a/lib/private/notification/action.php
+++ b/lib/private/notification/action.php
@@ -21,7 +21,6 @@
 
 namespace OC\Notification;
 
-use OCP\Notification\IAction;
 
 class Action implements IAction {
 
diff --git a/lib/public/notification/iaction.php b/lib/private/notification/iaction.php
similarity index 97%
rename from lib/public/notification/iaction.php
rename to lib/private/notification/iaction.php
index 8db1eaa6543..da6728f5c52 100644
--- a/lib/public/notification/iaction.php
+++ b/lib/private/notification/iaction.php
@@ -19,12 +19,12 @@
  *
  */
 
-namespace OCP\Notification;
+namespace OC\Notification;
 
 /**
  * Interface IAction
  *
- * @package OCP\Notification
+ * @package OC\Notification
  * @since 8.2.0
  *
  * DEVELOPER NOTE:
diff --git a/lib/public/notification/iapp.php b/lib/private/notification/iapp.php
similarity index 96%
rename from lib/public/notification/iapp.php
rename to lib/private/notification/iapp.php
index a4718a21b60..eda66423f3a 100644
--- a/lib/public/notification/iapp.php
+++ b/lib/private/notification/iapp.php
@@ -19,12 +19,12 @@
  *
  */
 
-namespace OCP\Notification;
+namespace OC\Notification;
 
 /**
  * Interface IApp
  *
- * @package OCP\Notification
+ * @package OC\Notification
  * @since 8.2.0
  *
  * DEVELOPER NOTE:
diff --git a/lib/public/notification/imanager.php b/lib/private/notification/imanager.php
similarity index 96%
rename from lib/public/notification/imanager.php
rename to lib/private/notification/imanager.php
index ca1cc968b12..0cd92b33251 100644
--- a/lib/public/notification/imanager.php
+++ b/lib/private/notification/imanager.php
@@ -19,12 +19,12 @@
  *
  */
 
-namespace OCP\Notification;
+namespace OC\Notification;
 
 /**
  * Interface IManager
  *
- * @package OCP\Notification
+ * @package OC\Notification
  * @since 8.2.0
  *
  * DEVELOPER NOTE:
diff --git a/lib/public/notification/inotification.php b/lib/private/notification/inotification.php
similarity index 98%
rename from lib/public/notification/inotification.php
rename to lib/private/notification/inotification.php
index 51d4a804647..faf5db1d24c 100644
--- a/lib/public/notification/inotification.php
+++ b/lib/private/notification/inotification.php
@@ -19,12 +19,12 @@
  *
  */
 
-namespace OCP\Notification;
+namespace OC\Notification;
 
 /**
  * Interface INotification
  *
- * @package OCP\Notification
+ * @package OC\Notification
  * @since 8.2.0
  *
  * DEVELOPER NOTE:
diff --git a/lib/public/notification/inotifier.php b/lib/private/notification/inotifier.php
similarity index 95%
rename from lib/public/notification/inotifier.php
rename to lib/private/notification/inotifier.php
index 9eefcddae18..22531229e3f 100644
--- a/lib/public/notification/inotifier.php
+++ b/lib/private/notification/inotifier.php
@@ -19,12 +19,12 @@
  *
  */
 
-namespace OCP\Notification;
+namespace OC\Notification;
 
 /**
  * Interface INotifier
  *
- * @package OCP\Notification
+ * @package OC\Notification
  * @since 8.2.0
  *
  * DEVELOPER NOTE:
diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
index bafb123f768..9635925e38e 100644
--- a/lib/private/notification/manager.php
+++ b/lib/private/notification/manager.php
@@ -22,11 +22,6 @@
 namespace OC\Notification;
 
 
-use OCP\Notification\IApp;
-use OCP\Notification\IManager;
-use OCP\Notification\INotification;
-use OCP\Notification\INotifier;
-
 class Manager implements IManager {
 	/** @var IApp */
 	protected $apps;
diff --git a/lib/private/notification/notification.php b/lib/private/notification/notification.php
index 2f53a347283..40fe39a956e 100644
--- a/lib/private/notification/notification.php
+++ b/lib/private/notification/notification.php
@@ -21,8 +21,6 @@
 
 namespace OC\Notification;
 
-use OCP\Notification\IAction;
-use OCP\Notification\INotification;
 
 class Notification implements INotification {
 	/** @var string */
diff --git a/lib/private/server.php b/lib/private/server.php
index 880ab274f12..8e8444c83d4 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -1050,7 +1050,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	/**
 	 * Get the Notification Manager
 	 *
-	 * @return \OCP\Notification\IManager
+	 * @return \OC\Notification\IManager
 	 * @since 8.2.0
 	 */
 	public function getNotificationManager() {
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index ea08b5a78ca..8be23dff214 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -459,7 +459,7 @@ interface IServerContainer {
 	/**
 	 * Get the Notification Manager
 	 *
-	 * @return \OCP\Notification\IManager
+	 * @return \OC\Notification\IManager
 	 * @since 8.2.0
 	 */
 	public function getNotificationManager();
diff --git a/tests/lib/notification/actiontest.php b/tests/lib/notification/actiontest.php
index 994e22a2f14..e319c250cc7 100644
--- a/tests/lib/notification/actiontest.php
+++ b/tests/lib/notification/actiontest.php
@@ -23,7 +23,7 @@ namespace Test\Notification;
 
 
 use OC\Notification\Action;
-use OCP\Notification\IAction;
+use OC\Notification\IAction;
 use Test\TestCase;
 
 class ActionTest extends TestCase {
diff --git a/tests/lib/notification/managertest.php b/tests/lib/notification/managertest.php
index 13ac4b80b84..fa2a0586f90 100644
--- a/tests/lib/notification/managertest.php
+++ b/tests/lib/notification/managertest.php
@@ -22,7 +22,7 @@
 namespace Test\Notification;
 
 use OC\Notification\Manager;
-use OCP\Notification\IManager;
+use OC\Notification\IManager;
 use Test\TestCase;
 
 class ManagerTest extends TestCase {
@@ -35,7 +35,7 @@ class ManagerTest extends TestCase {
 	}
 
 	public function testRegisterApp() {
-		$app = $this->getMockBuilder('OCP\Notification\IApp')
+		$app = $this->getMockBuilder('OC\Notification\IApp')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -59,7 +59,7 @@ class ManagerTest extends TestCase {
 	 * @expectedException \InvalidArgumentException
 	 */
 	public function testRegisterAppInvalid() {
-		$notifier = $this->getMockBuilder('OCP\Notification\INotifier')
+		$notifier = $this->getMockBuilder('OC\Notification\INotifier')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -73,7 +73,7 @@ class ManagerTest extends TestCase {
 	}
 
 	public function testRegisterNotifier() {
-		$notifier = $this->getMockBuilder('OCP\Notification\INotifier')
+		$notifier = $this->getMockBuilder('OC\Notification\INotifier')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -97,7 +97,7 @@ class ManagerTest extends TestCase {
 	 * @expectedException \InvalidArgumentException
 	 */
 	public function testRegisterNotifierInvalid() {
-		$app = $this->getMockBuilder('OCP\Notification\IApp')
+		$app = $this->getMockBuilder('OC\Notification\IApp')
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -112,28 +112,28 @@ class ManagerTest extends TestCase {
 
 	public function testCreateNotification() {
 		$action = $this->manager->createNotification();
-		$this->assertInstanceOf('OCP\Notification\INotification', $action);
+		$this->assertInstanceOf('OC\Notification\INotification', $action);
 	}
 
 	public function testNotify() {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
-		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
 			->disableOriginalConstructor()
 			->getMock();
 		$notification->expects($this->once())
 			->method('isValid')
 			->willReturn(true);
 
-		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
-		$app = $this->getMockBuilder('OCP\Notification\IApp')
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
+		$app = $this->getMockBuilder('OC\Notification\IApp')
 			->disableOriginalConstructor()
 			->getMock();
 		$app->expects($this->once())
 			->method('notify')
 			->with($notification);
 
-		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
-		$app2 = $this->getMockBuilder('OCP\Notification\IApp')
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
+		$app2 = $this->getMockBuilder('OC\Notification\IApp')
 			->disableOriginalConstructor()
 			->getMock();
 		$app2->expects($this->once())
@@ -154,8 +154,8 @@ class ManagerTest extends TestCase {
 	 * @expectedException \InvalidArgumentException
 	 */
 	public function testNotifyInvalid() {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
-		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
 			->disableOriginalConstructor()
 			->getMock();
 		$notification->expects($this->once())
@@ -166,23 +166,23 @@ class ManagerTest extends TestCase {
 	}
 
 	public function testPrepare() {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
-		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
 			->disableOriginalConstructor()
 			->getMock();
 		$notification->expects($this->once())
 			->method('isValidParsed')
 			->willReturn(true);
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification2 */
-		$notification2 = $this->getMockBuilder('OCP\Notification\INotification')
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification2 */
+		$notification2 = $this->getMockBuilder('OC\Notification\INotification')
 			->disableOriginalConstructor()
 			->getMock();
 		$notification2->expects($this->exactly(2))
 			->method('isValidParsed')
 			->willReturn(true);
 
-		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
-		$notifier = $this->getMockBuilder('OCP\Notification\INotifier')
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
+		$notifier = $this->getMockBuilder('OC\Notification\INotifier')
 			->disableOriginalConstructor()
 			->getMock();
 		$notifier->expects($this->once())
@@ -190,8 +190,8 @@ class ManagerTest extends TestCase {
 			->with($notification, 'en')
 			->willReturnArgument(0);
 
-		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier2 */
-		$notifier2 = $this->getMockBuilder('OCP\Notification\INotifier')
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier2 */
+		$notifier2 = $this->getMockBuilder('OC\Notification\INotifier')
 			->disableOriginalConstructor()
 			->getMock();
 		$notifier2->expects($this->once())
@@ -213,16 +213,16 @@ class ManagerTest extends TestCase {
 	 * @expectedException \InvalidArgumentException
 	 */
 	public function testPrepareInvalid() {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
-		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
 			->disableOriginalConstructor()
 			->getMock();
 		$notification->expects($this->once())
 			->method('isValidParsed')
 			->willReturn(false);
 
-		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
-		$notifier = $this->getMockBuilder('OCP\Notification\INotifier')
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
+		$notifier = $this->getMockBuilder('OC\Notification\INotifier')
 			->disableOriginalConstructor()
 			->getMock();
 		$notifier->expects($this->once())
@@ -238,16 +238,16 @@ class ManagerTest extends TestCase {
 	}
 
 	public function testPrepareNotifierThrows() {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
-		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
 			->disableOriginalConstructor()
 			->getMock();
 		$notification->expects($this->once())
 			->method('isValidParsed')
 			->willReturn(true);
 
-		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
-		$notifier = $this->getMockBuilder('OCP\Notification\INotifier')
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
+		$notifier = $this->getMockBuilder('OC\Notification\INotifier')
 			->disableOriginalConstructor()
 			->getMock();
 		$notifier->expects($this->once())
@@ -266,8 +266,8 @@ class ManagerTest extends TestCase {
 	 * @expectedException \InvalidArgumentException
 	 */
 	public function testPrepareNoNotifier() {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
-		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
 			->disableOriginalConstructor()
 			->getMock();
 		$notification->expects($this->once())
@@ -278,21 +278,21 @@ class ManagerTest extends TestCase {
 	}
 
 	public function testMarkProcessed() {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
-		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
 			->disableOriginalConstructor()
 			->getMock();
 
-		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
-		$app = $this->getMockBuilder('OCP\Notification\IApp')
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
+		$app = $this->getMockBuilder('OC\Notification\IApp')
 			->disableOriginalConstructor()
 			->getMock();
 		$app->expects($this->once())
 			->method('markProcessed')
 			->with($notification);
 
-		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
-		$app2 = $this->getMockBuilder('OCP\Notification\IApp')
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
+		$app2 = $this->getMockBuilder('OC\Notification\IApp')
 			->disableOriginalConstructor()
 			->getMock();
 		$app2->expects($this->once())
@@ -310,13 +310,13 @@ class ManagerTest extends TestCase {
 	}
 
 	public function testGetCount() {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
-		$notification = $this->getMockBuilder('OCP\Notification\INotification')
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
 			->disableOriginalConstructor()
 			->getMock();
 
-		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
-		$app = $this->getMockBuilder('OCP\Notification\IApp')
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
+		$app = $this->getMockBuilder('OC\Notification\IApp')
 			->disableOriginalConstructor()
 			->getMock();
 		$app->expects($this->once())
@@ -324,8 +324,8 @@ class ManagerTest extends TestCase {
 			->with($notification)
 			->willReturn(21);
 
-		/** @var \OCP\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
-		$app2 = $this->getMockBuilder('OCP\Notification\IApp')
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
+		$app2 = $this->getMockBuilder('OC\Notification\IApp')
 			->disableOriginalConstructor()
 			->getMock();
 		$app2->expects($this->once())
diff --git a/tests/lib/notification/notificationtest.php b/tests/lib/notification/notificationtest.php
index 5865d2dbee1..a790a53eaa7 100644
--- a/tests/lib/notification/notificationtest.php
+++ b/tests/lib/notification/notificationtest.php
@@ -23,7 +23,7 @@ namespace Test\Notification;
 
 
 use OC\Notification\Notification;
-use OCP\Notification\INotification;
+use OC\Notification\INotification;
 use Test\TestCase;
 
 class NotificationTest extends TestCase {
@@ -401,12 +401,12 @@ class NotificationTest extends TestCase {
 
 	public function testCreateAction() {
 		$action = $this->notification->createAction();
-		$this->assertInstanceOf('OCP\Notification\IAction', $action);
+		$this->assertInstanceOf('OC\Notification\IAction', $action);
 	}
 
 	public function testAddAction() {
-		/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
-		$action = $this->getMockBuilder('OCP\Notification\IAction')
+		/** @var \OC\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OC\Notification\IAction')
 			->disableOriginalConstructor()
 			->getMock();
 		$action->expects($this->once())
@@ -425,8 +425,8 @@ class NotificationTest extends TestCase {
 	 * @expectedException \InvalidArgumentException
 	 */
 	public function testAddActionInvalid() {
-		/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
-		$action = $this->getMockBuilder('OCP\Notification\IAction')
+		/** @var \OC\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OC\Notification\IAction')
 			->disableOriginalConstructor()
 			->getMock();
 		$action->expects($this->once())
@@ -439,8 +439,8 @@ class NotificationTest extends TestCase {
 	}
 
 	public function testAddParsedAction() {
-		/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
-		$action = $this->getMockBuilder('OCP\Notification\IAction')
+		/** @var \OC\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OC\Notification\IAction')
 			->disableOriginalConstructor()
 			->getMock();
 		$action->expects($this->once())
@@ -459,8 +459,8 @@ class NotificationTest extends TestCase {
 	 * @expectedException \InvalidArgumentException
 	 */
 	public function testAddParsedActionInvalid() {
-		/** @var \OCP\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
-		$action = $this->getMockBuilder('OCP\Notification\IAction')
+		/** @var \OC\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OC\Notification\IAction')
 			->disableOriginalConstructor()
 			->getMock();
 		$action->expects($this->once())
@@ -489,7 +489,7 @@ class NotificationTest extends TestCase {
 	 * @param bool $expected
 	 */
 	public function testIsValid($isValidCommon, $subject, $expected) {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
 		$notification = $this->getMockBuilder('\OC\Notification\Notification')
 			->setMethods([
 				'isValidCommon',
@@ -520,7 +520,7 @@ class NotificationTest extends TestCase {
 	 * @param bool $expected
 	 */
 	public function testIsParsedValid($isValidCommon, $subject, $expected) {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
 		$notification = $this->getMockBuilder('\OC\Notification\Notification')
 			->setMethods([
 				'isValidCommon',
@@ -565,7 +565,7 @@ class NotificationTest extends TestCase {
 	 * @param bool $expected
 	 */
 	public function testIsValidCommon($app, $user, $timestamp, $objectType, $objectId, $expected) {
-		/** @var \OCP\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
 		$notification = $this->getMockBuilder('\OC\Notification\Notification')
 			->setMethods([
 				'getApp',
diff --git a/tests/lib/server.php b/tests/lib/server.php
index 78d6a0c8302..96a476bd4d1 100644
--- a/tests/lib/server.php
+++ b/tests/lib/server.php
@@ -105,7 +105,7 @@ class Server extends \Test\TestCase {
 			['NavigationManager', '\OC\NavigationManager'],
 			['NavigationManager', '\OCP\INavigationManager'],
 			['NotificationManager', '\OC\Notification\Manager'],
-			['NotificationManager', '\OCP\Notification\IManager'],
+			['NotificationManager', '\OC\Notification\IManager'],
 			['UserCache', '\OC\Cache\File'],
 			['UserCache', '\OCP\ICache'],
 
-- 
GitLab


From a7f132a9641e532ad68a60f916166d7ece685318 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 8 Sep 2015 14:02:30 +0200
Subject: [PATCH 209/783] Add proper PHPDoc

Makes my IDE happier when going through that file.
---
 apps/provisioning_api/lib/apps.php   | 29 +++++++++++---
 apps/provisioning_api/lib/groups.php | 39 ++++++++++++++-----
 apps/provisioning_api/lib/users.php  | 56 +++++++++++++++++++++++-----
 3 files changed, 100 insertions(+), 24 deletions(-)

diff --git a/apps/provisioning_api/lib/apps.php b/apps/provisioning_api/lib/apps.php
index 168f6f3cad8..80f6e7049c6 100644
--- a/apps/provisioning_api/lib/apps.php
+++ b/apps/provisioning_api/lib/apps.php
@@ -31,13 +31,20 @@ class Apps {
 	/** @var \OCP\App\IAppManager */
 	private $appManager;
 
+	/**
+	 * @param \OCP\App\IAppManager $appManager
+	 */
 	public function __construct(\OCP\App\IAppManager $appManager) {
 		$this->appManager = $appManager;
 	}
 
-	public function getApps($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function getApps($parameters) {
 		$apps = OC_App::listAllApps();
-		$list = array();
+		$list = [];
 		foreach($apps as $app) {
 			$list[] = $app['id'];
 		}
@@ -62,7 +69,11 @@ class Apps {
 		}
 	}
 
-	public function getAppInfo($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function getAppInfo($parameters) {
 		$app = $parameters['appid'];
 		$info = \OCP\App::getAppInfo($app);
 		if(!is_null($info)) {
@@ -72,13 +83,21 @@ class Apps {
 		}
 	}
 
-	public function enable($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function enable($parameters) {
 		$app = $parameters['appid'];
 		$this->appManager->enableApp($app);
 		return new OC_OCS_Result(null, 100);
 	}
 
-	public function disable($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function disable($parameters) {
 		$app = $parameters['appid'];
 		$this->appManager->disableApp($app);
 		return new OC_OCS_Result(null, 100);
diff --git a/apps/provisioning_api/lib/groups.php b/apps/provisioning_api/lib/groups.php
index 91d0a1c6342..c6fbe12b34e 100644
--- a/apps/provisioning_api/lib/groups.php
+++ b/apps/provisioning_api/lib/groups.php
@@ -25,6 +25,8 @@ namespace OCA\Provisioning_API;
 
 use \OC_OCS_Result;
 use \OC_SubAdmin;
+use OCP\IGroup;
+use OCP\IUser;
 
 class Groups{
 
@@ -39,21 +41,25 @@ class Groups{
 	 * @param \OCP\IUserSession $userSession
 	 */
 	public function __construct(\OCP\IGroupManager $groupManager,
-	                            \OCP\IUserSession $userSession) {
+								\OCP\IUserSession $userSession) {
 		$this->groupManager = $groupManager;
 		$this->userSession = $userSession;
 	}
 
 	/**
 	 * returns a list of groups
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
-	public function getGroups($parameters){
+	public function getGroups($parameters) {
 		$search = !empty($_GET['search']) ? $_GET['search'] : '';
 		$limit = !empty($_GET['limit']) ? $_GET['limit'] : null;
 		$offset = !empty($_GET['offset']) ? $_GET['offset'] : null;
 
 		$groups = $this->groupManager->search($search, $limit, $offset);
 		$groups = array_map(function($group) {
+			/** @var IGroup $group */
 			return $group->getGID();
 		}, $groups);
 
@@ -62,6 +68,9 @@ class Groups{
 
 	/**
 	 * returns an array of users in the group specified
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
 	public function getGroup($parameters) {
 		// Check if user is logged in
@@ -71,7 +80,7 @@ class Groups{
 		}
 
 		// Check the group exists
-		if(!$this->groupManager->groupExists($parameters['groupid'])){
+		if(!$this->groupManager->groupExists($parameters['groupid'])) {
 			return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested group could not be found');
 		}
 		// Check subadmin has access to this group
@@ -79,6 +88,7 @@ class Groups{
 		   || in_array($parameters['groupid'], \OC_SubAdmin::getSubAdminsGroups($user->getUID()))){
 			$users = $this->groupManager->get($parameters['groupid'])->getUsers();
 			$users =  array_map(function($user) {
+				/** @var IUser $user */
 				return $user->getUID();
 			}, $users);
 			$users = array_values($users);
@@ -90,23 +100,30 @@ class Groups{
 
 	/**
 	 * creates a new group
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
-	public function addGroup($parameters){
+	public function addGroup($parameters) {
 		// Validate name
-		$groupid = isset($_POST['groupid']) ? $_POST['groupid'] : '';
-		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $groupid ) || empty($groupid)){
+		$groupId = isset($_POST['groupid']) ? $_POST['groupid'] : '';
+		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $groupId ) || empty($groupId)){
 			\OCP\Util::writeLog('provisioning_api', 'Attempt made to create group using invalid characters.', \OCP\Util::ERROR);
 			return new OC_OCS_Result(null, 101, 'Invalid group name');
 		}
 		// Check if it exists
-		if($this->groupManager->groupExists($groupid)){
+		if($this->groupManager->groupExists($groupId)){
 			return new OC_OCS_Result(null, 102);
 		}
-		$this->groupManager->createGroup($groupid);
+		$this->groupManager->createGroup($groupId);
 		return new OC_OCS_Result(null, 100);
 	}
 
-	public function deleteGroup($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function deleteGroup($parameters) {
 		// Check it exists
 		if(!$this->groupManager->groupExists($parameters['groupid'])){
 			return new OC_OCS_Result(null, 101);
@@ -118,6 +135,10 @@ class Groups{
 		}
 	}
 
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
 	public function getSubAdminsOfGroup($parameters) {
 		$group = $parameters['groupid'];
 		// Check group exists
diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php
index f5b201a55ea..617e50b403e 100644
--- a/apps/provisioning_api/lib/users.php
+++ b/apps/provisioning_api/lib/users.php
@@ -48,10 +48,10 @@ class Users {
 	 * @param \OCP\IUserManager $userManager
 	 * @param \OCP\IConfig $config
 	 * @param \OCP\IGroupManager $groupManager
-	 * @param \OCP\IUserSession $user
+	 * @param \OCP\IUserSession $userSession
 	 */
 	public function __construct(\OCP\IUserManager $userManager,
-	                            \OCP\IConfig $config,
+								\OCP\IConfig $config,
 								\OCP\IGroupManager $groupManager,
 								\OCP\IUserSession $userSession) {
 		$this->userManager = $userManager;
@@ -62,8 +62,10 @@ class Users {
 
 	/**
 	 * returns a list of users
+	 *
+	 * @return OC_OCS_Result
 	 */
-	public function getUsers(){
+	public function getUsers() {
 		$search = !empty($_GET['search']) ? $_GET['search'] : '';
 		$limit = !empty($_GET['limit']) ? $_GET['limit'] : null;
 		$offset = !empty($_GET['offset']) ? $_GET['offset'] : null;
@@ -76,7 +78,10 @@ class Users {
 		]);
 	}
 
-	public function addUser(){
+	/**
+	 * @return OC_OCS_Result
+	 */
+	public function addUser() {
 		$userId = isset($_POST['userid']) ? $_POST['userid'] : null;
 		$password = isset($_POST['password']) ? $_POST['password'] : null;
 		if($this->userManager->userExists($userId)) {
@@ -96,6 +101,9 @@ class Users {
 
 	/**
 	 * gets user info
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
 	public function getUser($parameters){
 		$userId = $parameters['userid'];
@@ -150,8 +158,11 @@ class Users {
 
 	/** 
 	 * edit users
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
-	public function editUser($parameters){
+	public function editUser($parameters) {
 		$userId = $parameters['userid'];
 
 		// Check if user is logged in
@@ -230,7 +241,11 @@ class Users {
 		return new OC_OCS_Result(null, 100);
 	}
 
-	public function deleteUser($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function deleteUser($parameters) {
 		// Check if user is logged in
 		$user = $this->userSession->getUser();
 		if ($user === null) {
@@ -253,6 +268,10 @@ class Users {
 		}
 	}
 
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
 	public function getUsersGroups($parameters) {
 		// Check if user is logged in
 		$user = $this->userSession->getUser();
@@ -286,7 +305,11 @@ class Users {
 		
 	}
 
-	public function addToGroup($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function addToGroup($parameters) {
 		// Check if user is logged in
 		$user = $this->userSession->getUser();
 		if ($user === null) {
@@ -317,6 +340,10 @@ class Users {
 		return new OC_OCS_Result(null, 100);
 	}
 
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
 	public function removeFromGroup($parameters) {
 		// Check if user is logged in
 		$user = $this->userSession->getUser();
@@ -362,6 +389,9 @@ class Users {
 
 	/**
 	 * Creates a subadmin
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
 	public function addSubAdmin($parameters) {
 		$group = $_POST['groupid'];
@@ -393,6 +423,9 @@ class Users {
 
 	/**
 	 * Removes a subadmin from a group
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
 	public function removeSubAdmin($parameters) {
 		$group = $parameters['_delete']['groupid'];
@@ -414,7 +447,10 @@ class Users {
 	}
 
 	/**
-	 * @Get the groups a user is a subadmin of
+	 * Get the groups a user is a subadmin of
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
 	public function getUserSubAdminGroups($parameters) {
 		$user = $parameters['userid'];
@@ -431,8 +467,8 @@ class Users {
 	}
 
 	/**
-	 * @param $userId
-	 * @param $data
+	 * @param string $userId
+	 * @param array $data
 	 * @return mixed
 	 * @throws \OCP\Files\NotFoundException
 	 */
-- 
GitLab


From b2e6d7b5f490385bf05199be0daee0f04d83aa73 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 7 Sep 2015 12:38:55 +0200
Subject: [PATCH 210/783] occ command to enable master key

---
 apps/encryption/appinfo/register_command.php  |   7 ++
 apps/encryption/command/enablemasterkey.php   |  86 +++++++++++++++
 .../tests/command/testenablemasterkey.php     | 103 ++++++++++++++++++
 3 files changed, 196 insertions(+)
 create mode 100644 apps/encryption/command/enablemasterkey.php
 create mode 100644 apps/encryption/tests/command/testenablemasterkey.php

diff --git a/apps/encryption/appinfo/register_command.php b/apps/encryption/appinfo/register_command.php
index 4fdf7ecec38..0f03b63560a 100644
--- a/apps/encryption/appinfo/register_command.php
+++ b/apps/encryption/appinfo/register_command.php
@@ -21,10 +21,17 @@
  */
 
 use OCA\Encryption\Command\MigrateKeys;
+use Symfony\Component\Console\Helper\QuestionHelper;
 
 $userManager = OC::$server->getUserManager();
 $view = new \OC\Files\View();
 $config = \OC::$server->getConfig();
+$userSession = \OC::$server->getUserSession();
 $connection = \OC::$server->getDatabaseConnection();
 $logger = \OC::$server->getLogger();
+$questionHelper = new QuestionHelper();
+$crypt = new \OCA\Encryption\Crypto\Crypt($logger, $userSession, $config);
+$util = new \OCA\Encryption\Util($view, $crypt, $logger, $userSession, $config, $userManager);
+
 $application->add(new MigrateKeys($userManager, $view, $connection, $config, $logger));
+$application->add(new \OCA\Encryption\Command\EnableMasterKey($util, $config, $questionHelper));
diff --git a/apps/encryption/command/enablemasterkey.php b/apps/encryption/command/enablemasterkey.php
new file mode 100644
index 00000000000..f49579a3b81
--- /dev/null
+++ b/apps/encryption/command/enablemasterkey.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace OCA\Encryption\Command;
+
+
+use OCA\Encryption\Util;
+use OCP\IConfig;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+class EnableMasterKey extends Command {
+
+	/** @var Util */
+	protected $util;
+
+	/** @var IConfig */
+	protected $config;
+
+	/** @var  QuestionHelper */
+	protected $questionHelper;
+
+	/**
+	 * @param Util $util
+	 * @param IConfig $config
+	 * @param QuestionHelper $questionHelper
+	 */
+	public function __construct(Util $util,
+								IConfig $config,
+								QuestionHelper $questionHelper) {
+
+		$this->util = $util;
+		$this->config = $config;
+		$this->questionHelper = $questionHelper;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('encryption:enable-master-key')
+			->setDescription('Enable the master key. Only available for fresh installations with no existing encrypted data! There is also no way to disable it again.');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+
+		$isAlreadyEnabled = $this->util->isMasterKeyEnabled();
+
+		if($isAlreadyEnabled) {
+			$output->writeln('Master key already enabled');
+		} else {
+			$question = new ConfirmationQuestion(
+				'Warning: Only available for fresh installations with no existing encrypted data! '
+			. 'There is also no way to disable it again. Do you want to continue? (y/n) ', false);
+			if ($this->questionHelper->ask($input, $output, $question)) {
+				$this->config->setAppValue('encryption', 'useMasterKey', '1');
+				$output->writeln('Master key successfully enabled.');
+			} else {
+				$output->writeln('aborted.');
+			}
+		}
+
+	}
+
+}
diff --git a/apps/encryption/tests/command/testenablemasterkey.php b/apps/encryption/tests/command/testenablemasterkey.php
new file mode 100644
index 00000000000..c905329269e
--- /dev/null
+++ b/apps/encryption/tests/command/testenablemasterkey.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace OCA\Encryption\Tests\Command;
+
+
+use OCA\Encryption\Command\EnableMasterKey;
+use Test\TestCase;
+
+class TestEnableMasterKey extends TestCase {
+
+	/** @var  EnableMasterKey */
+	protected $enableMasterKey;
+
+	/** @var  Util | \PHPUnit_Framework_MockObject_MockObject */
+	protected $util;
+
+	/** @var \OCP\IConfig | \PHPUnit_Framework_MockObject_MockObject  */
+	protected $config;
+
+	/** @var \Symfony\Component\Console\Helper\QuestionHelper | \PHPUnit_Framework_MockObject_MockObject */
+	protected $questionHelper;
+
+	/** @var  \Symfony\Component\Console\Output\OutputInterface | \PHPUnit_Framework_MockObject_MockObject */
+	protected $output;
+
+	/** @var  \Symfony\Component\Console\Input\InputInterface | \PHPUnit_Framework_MockObject_MockObject */
+	protected $input;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->util = $this->getMockBuilder('OCA\Encryption\Util')
+			->disableOriginalConstructor()->getMock();
+		$this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$this->questionHelper = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
+			->disableOriginalConstructor()->getMock();
+		$this->output = $this->getMockBuilder('Symfony\Component\Console\Output\OutputInterface')
+			->disableOriginalConstructor()->getMock();
+		$this->input = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')
+			->disableOriginalConstructor()->getMock();
+
+		$this->enableMasterKey = new EnableMasterKey($this->util, $this->config, $this->questionHelper);
+	}
+
+	/**
+	 * @dataProvider dataTestExecute
+	 *
+	 * @param bool $isAlreadyEnabled
+	 * @param string $answer
+	 */
+	public function testExecute($isAlreadyEnabled, $answer) {
+
+		$this->util->expects($this->once())->method('isMasterKeyEnabled')
+			->willReturn($isAlreadyEnabled);
+
+		if ($isAlreadyEnabled) {
+			$this->output->expects($this->once())->method('writeln')
+				->with('Master key already enabled');
+		} else {
+			if ($answer === 'y') {
+				$this->questionHelper->expects($this->once())->method('ask')->willReturn(true);
+				$this->config->expects($this->once())->method('setAppValue')
+					->with('encryption', 'useMasterKey', '1');
+			} else {
+				$this->questionHelper->expects($this->once())->method('ask')->willReturn(false);
+				$this->config->expects($this->never())->method('setAppValue');
+
+			}
+		}
+
+		$this->invokePrivate($this->enableMasterKey, 'execute', [$this->input, $this->output]);
+	}
+
+	public function dataTestExecute() {
+		return [
+			[true, ''],
+			[false, 'y'],
+			[false, 'n'],
+			[false, '']
+		];
+	}
+}
-- 
GitLab


From 7cbf2bc56df4519868e8694fd3ead4700aec7642 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 8 Sep 2015 17:53:29 +0200
Subject: [PATCH 211/783] Allow 0 and false as password

When we use the check for "empty" here passwords such as 0 will not work.

Fixes https://github.com/owncloud/password_policy/issues/8
---
 lib/private/share/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 70ed26c0b27..6ad36d60fe8 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -765,7 +765,7 @@ class Share extends Constants {
 				}
 
 				// Generate hash of password - same method as user passwords
-				if (!empty($shareWith)) {
+				if (is_string($shareWith) && $shareWith !== '') {
 					self::verifyPassword($shareWith);
 					$shareWith = \OC::$server->getHasher()->hash($shareWith);
 				} else {
-- 
GitLab


From 1b708e26efbcb4052becad3d7b6618064c2605a6 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 8 Sep 2015 19:51:15 +0200
Subject: [PATCH 212/783] Show cached previews directly

---
 lib/private/preview.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index 978da1161c2..db2a56f9fa5 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -772,6 +772,12 @@ class Preview {
 			throw new NotFoundException('File not found.');
 		}
 
+		if ($cachedPath = $this->isCached($this->info->getId())) {
+			header('Content-Type: ' . $this->info->getMimetype());
+			$this->userView->readfile($cachedPath);
+			return;
+		}
+
 		if (is_null($this->preview)) {
 			$this->getPreview();
 		}
-- 
GitLab


From a03422c55afb5fdf3d8527d870a85160e0f95c6a Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 8 Sep 2015 21:28:15 +0200
Subject: [PATCH 213/783] Cache generated result

Saves 50ms
---
 lib/private/util.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/private/util.php b/lib/private/util.php
index 0fda55496dc..f110d618f77 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1054,6 +1054,7 @@ class OC_Util {
 		return $id;
 	}
 
+	protected static $encryptedToken;
 	/**
 	 * Register an get/post call. Important to prevent CSRF attacks.
 	 *
@@ -1066,6 +1067,11 @@ class OC_Util {
 	 * @see OC_Util::isCallRegistered()
 	 */
 	public static function callRegister() {
+		// Use existing token if function has already been called
+		if(isset(self::$encryptedToken)) {
+			return self::$encryptedToken;
+		}
+
 		// Check if a token exists
 		if (!\OC::$server->getSession()->exists('requesttoken')) {
 			// No valid token found, generate a new one.
@@ -1078,7 +1084,8 @@ class OC_Util {
 
 		// Encrypt the token to mitigate breach-like attacks
 		$sharedSecret = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(10);
-		return \OC::$server->getCrypto()->encrypt($requestToken, $sharedSecret) . ':' . $sharedSecret;
+		self::$encryptedToken = \OC::$server->getCrypto()->encrypt($requestToken, $sharedSecret) . ':' . $sharedSecret;
+		return self::$encryptedToken;
 	}
 
 	/**
-- 
GitLab


From 9f11b277976663297e201d81a7051b166968cba0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 8 Sep 2015 22:38:50 +0200
Subject: [PATCH 214/783] Use the view logic for getFolderContent for the node
 api

---
 lib/private/files/node/folder.php | 77 ++++---------------------------
 lib/private/files/node/node.php   |  4 +-
 tests/lib/files/node/folder.php   | 37 +++------------
 3 files changed, 18 insertions(+), 100 deletions(-)

diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php
index 042b515fea1..23004fc3527 100644
--- a/lib/private/files/node/folder.php
+++ b/lib/private/files/node/folder.php
@@ -25,7 +25,7 @@
 
 namespace OC\Files\Node;
 
-use OC\Files\Cache\Cache;
+use OCP\Files\FileInfo;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 
@@ -77,76 +77,15 @@ class Folder extends Node implements \OCP\Files\Folder {
 	 * @return Node[]
 	 */
 	public function getDirectoryListing() {
-		$result = array();
-
-		/**
-		 * @var \OC\Files\Storage\Storage $storage
-		 */
-		list($storage, $internalPath) = $this->view->resolvePath($this->path);
-		if ($storage) {
-			$cache = $storage->getCache($internalPath);
-
-			//trigger cache update check
-			$this->view->getFileInfo($this->path);
-
-			$files = $cache->getFolderContents($internalPath);
-		} else {
-			$files = array();
-		}
-
-		//add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
-		$mounts = $this->root->getMountsIn($this->path);
-		$dirLength = strlen($this->path);
-		foreach ($mounts as $mount) {
-			$subStorage = $mount->getStorage();
-			if ($subStorage) {
-				$subCache = $subStorage->getCache('');
+		$folderContent = $this->view->getDirectoryContent($this->path);
 
-				if ($subCache->getStatus('') === Cache::NOT_FOUND) {
-					$subScanner = $subStorage->getScanner('');
-					$subScanner->scanFile('');
-				}
-
-				$rootEntry = $subCache->get('');
-				if ($rootEntry) {
-					$relativePath = trim(substr($mount->getMountPoint(), $dirLength), '/');
-					if ($pos = strpos($relativePath, '/')) {
-						//mountpoint inside subfolder add size to the correct folder
-						$entryName = substr($relativePath, 0, $pos);
-						foreach ($files as &$entry) {
-							if ($entry['name'] === $entryName) {
-								if ($rootEntry['size'] >= 0) {
-									$entry['size'] += $rootEntry['size'];
-								} else {
-									$entry['size'] = -1;
-								}
-							}
-						}
-					} else { //mountpoint in this folder, add an entry for it
-						$rootEntry['name'] = $relativePath;
-						$rootEntry['storageObject'] = $subStorage;
-
-						//remove any existing entry with the same name
-						foreach ($files as $i => $file) {
-							if ($file['name'] === $rootEntry['name']) {
-								$files[$i] = null;
-								break;
-							}
-						}
-						$files[] = $rootEntry;
-					}
-				}
-			}
-		}
-
-		foreach ($files as $file) {
-			if ($file) {
-				$node = $this->createNode($this->path . '/' . $file['name'], $file);
-				$result[] = $node;
+		return array_map(function(FileInfo $info) {
+			if ($info->getMimetype() === 'httpd/unix-directory') {
+				return new Folder($this->root, $this->view, $info->getPath(), $info);
+			} else {
+				return new File($this->root, $this->view, $info->getPath(), $info);
 			}
-		}
-
-		return $result;
+		}, $folderContent);
 	}
 
 	/**
diff --git a/lib/private/files/node/node.php b/lib/private/files/node/node.php
index b9bd785de5c..943d12122e6 100644
--- a/lib/private/files/node/node.php
+++ b/lib/private/files/node/node.php
@@ -56,11 +56,13 @@ class Node implements \OCP\Files\Node {
 	 * @param \OC\Files\View $view
 	 * @param \OC\Files\Node\Root $root
 	 * @param string $path
+	 * @param FileInfo $fileInfo
 	 */
-	public function __construct($root, $view, $path) {
+	public function __construct($root, $view, $path, $fileInfo = null) {
 		$this->view = $view;
 		$this->root = $root;
 		$this->path = $path;
+		$this->fileInfo = $fileInfo;
 	}
 
 	/**
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
index 4a88e2acd36..96795cb02ef 100644
--- a/tests/lib/files/node/folder.php
+++ b/tests/lib/files/node/folder.php
@@ -143,38 +143,13 @@ class Folder extends \Test\TestCase {
 			->method('getUser')
 			->will($this->returnValue($this->user));
 
-		/**
-		 * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
-		 */
-		$storage = $this->getMock('\OC\Files\Storage\Storage');
-
-		$cache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
-		$cache->expects($this->any())
-			->method('getStatus')
-			->with('foo')
-			->will($this->returnValue(Cache::COMPLETE));
-
-		$cache->expects($this->once())
-			->method('getFolderContents')
-			->with('foo')
-			->will($this->returnValue(array(
-				array('fileid' => 2, 'path' => '/bar/foo/asd', 'name' => 'asd', 'size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain'),
-				array('fileid' => 3, 'path' => '/bar/foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'httpd/unix-directory')
-			)));
-
-		$root->expects($this->once())
-			->method('getMountsIn')
-			->with('/bar/foo')
-			->will($this->returnValue(array()));
-
-		$storage->expects($this->any())
-			->method('getCache')
-			->will($this->returnValue($cache));
-
 		$view->expects($this->any())
-			->method('resolvePath')
+			->method('getDirectoryContent')
 			->with('/bar/foo')
-			->will($this->returnValue(array($storage, 'foo')));
+			->will($this->returnValue(array(
+				new FileInfo('/bar/foo/asd', null, 'foo/asd', ['fileid' => 2, 'path' => '/bar/foo/asd', 'name' => 'asd', 'size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain'], null),
+				new FileInfo('/bar/foo/qwerty', null, 'foo/qwerty', ['fileid' => 3, 'path' => '/bar/foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'httpd/unix-directory'], null)
+			)));
 
 		$node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
 		$children = $node->getDirectoryListing();
@@ -183,6 +158,8 @@ class Folder extends \Test\TestCase {
 		$this->assertInstanceOf('\OC\Files\Node\Folder', $children[1]);
 		$this->assertEquals('asd', $children[0]->getName());
 		$this->assertEquals('qwerty', $children[1]->getName());
+		$this->assertEquals(2, $children[0]->getId());
+		$this->assertEquals(3, $children[1]->getId());
 	}
 
 	public function testGet() {
-- 
GitLab


From bf01c3d72af1db12bd4bb1a2333d0b716a9a11ed Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 9 Sep 2015 01:54:49 -0400
Subject: [PATCH 215/783] [tx-robot] updated from transifex

---
 apps/files/l10n/el.js              | 2 ++
 apps/files/l10n/el.json            | 2 ++
 apps/files/l10n/fi_FI.js           | 2 ++
 apps/files/l10n/fi_FI.json         | 2 ++
 apps/files/l10n/hu_HU.js           | 2 ++
 apps/files/l10n/hu_HU.json         | 2 ++
 apps/files/l10n/nl.js              | 2 ++
 apps/files/l10n/nl.json            | 2 ++
 apps/files/l10n/pt_BR.js           | 2 ++
 apps/files/l10n/pt_BR.json         | 2 ++
 apps/files/l10n/th_TH.js           | 2 ++
 apps/files/l10n/th_TH.json         | 2 ++
 apps/files_sharing/l10n/hu_HU.js   | 1 +
 apps/files_sharing/l10n/hu_HU.json | 1 +
 apps/files_sharing/l10n/th_TH.js   | 1 +
 apps/files_sharing/l10n/th_TH.json | 1 +
 lib/l10n/th_TH.js                  | 1 +
 lib/l10n/th_TH.json                | 1 +
 settings/l10n/el.js                | 1 +
 settings/l10n/el.json              | 1 +
 settings/l10n/fi_FI.js             | 2 ++
 settings/l10n/fi_FI.json           | 2 ++
 settings/l10n/hu_HU.js             | 4 ++++
 settings/l10n/hu_HU.json           | 4 ++++
 settings/l10n/nl.js                | 1 +
 settings/l10n/nl.json              | 1 +
 settings/l10n/pt_BR.js             | 1 +
 settings/l10n/pt_BR.json           | 1 +
 settings/l10n/th_TH.js             | 1 +
 settings/l10n/th_TH.json           | 1 +
 30 files changed, 50 insertions(+)

diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js
index 582e3b1758b..fe65869c3bb 100644
--- a/apps/files/l10n/el.js
+++ b/apps/files/l10n/el.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Προτιμώμενα",
     "Favorite" : "Αγαπημένο",
+    "{newname} already exists" : "το {newname} υπάρχει ήδη",
     "Upload" : "Μεταφόρτωση",
     "Text file" : "Αρχείο κειμένου",
+    "New text file.txt" : "Νέο αρχείο κειμένου.txt",
     "Folder" : "Φάκελος",
     "New folder" : "Νέος κατάλογος",
     "An error occurred while trying to update the tags" : "Ένα σφάλμα προέκυψε κατά τη διάρκεια ενημέρωσης των ετικετών",
diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json
index de550e86dea..37ff95b406e 100644
--- a/apps/files/l10n/el.json
+++ b/apps/files/l10n/el.json
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Προτιμώμενα",
     "Favorite" : "Αγαπημένο",
+    "{newname} already exists" : "το {newname} υπάρχει ήδη",
     "Upload" : "Μεταφόρτωση",
     "Text file" : "Αρχείο κειμένου",
+    "New text file.txt" : "Νέο αρχείο κειμένου.txt",
     "Folder" : "Φάκελος",
     "New folder" : "Νέος κατάλογος",
     "An error occurred while trying to update the tags" : "Ένα σφάλμα προέκυψε κατά τη διάρκεια ενημέρωσης των ετικετών",
diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js
index b4d00878e8b..c6615a61234 100644
--- a/apps/files/l10n/fi_FI.js
+++ b/apps/files/l10n/fi_FI.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"],
     "Favorited" : "Lisätty suosikkeihin",
     "Favorite" : "Suosikki",
+    "{newname} already exists" : "{newname} on jo olemassa",
     "Upload" : "Lähetä",
     "Text file" : "Tekstitiedosto",
+    "New text file.txt" : "Uusi tekstitiedosto.txt",
     "Folder" : "Kansio",
     "New folder" : "Uusi kansio",
     "An error occurred while trying to update the tags" : "Tunnisteiden päivitystä yrittäessä tapahtui virhe",
diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json
index 507689cbaf2..9be7c66d37a 100644
--- a/apps/files/l10n/fi_FI.json
+++ b/apps/files/l10n/fi_FI.json
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"],
     "Favorited" : "Lisätty suosikkeihin",
     "Favorite" : "Suosikki",
+    "{newname} already exists" : "{newname} on jo olemassa",
     "Upload" : "Lähetä",
     "Text file" : "Tekstitiedosto",
+    "New text file.txt" : "Uusi tekstitiedosto.txt",
     "Folder" : "Kansio",
     "New folder" : "Uusi kansio",
     "An error occurred while trying to update the tags" : "Tunnisteiden päivitystä yrittäessä tapahtui virhe",
diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js
index 396d9ec8755..8b9b7c17f15 100644
--- a/apps/files/l10n/hu_HU.js
+++ b/apps/files/l10n/hu_HU.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n bájt","%n bájt"],
     "Favorited" : "Kedvenc",
     "Favorite" : "Kedvenc",
+    "{newname} already exists" : "{newname} már létezik",
     "Upload" : "Feltöltés",
     "Text file" : "Szövegfájl",
+    "New text file.txt" : "Új szöveges fájl.txt",
     "Folder" : "Mappa",
     "New folder" : "Új mappa",
     "An error occurred while trying to update the tags" : "Hiba történt, miközben megpróbálta frissíteni a címkéket",
diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json
index 3a29ff27f24..6d82cd60413 100644
--- a/apps/files/l10n/hu_HU.json
+++ b/apps/files/l10n/hu_HU.json
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n bájt","%n bájt"],
     "Favorited" : "Kedvenc",
     "Favorite" : "Kedvenc",
+    "{newname} already exists" : "{newname} már létezik",
     "Upload" : "Feltöltés",
     "Text file" : "Szövegfájl",
+    "New text file.txt" : "Új szöveges fájl.txt",
     "Folder" : "Mappa",
     "New folder" : "Új mappa",
     "An error occurred while trying to update the tags" : "Hiba történt, miközben megpróbálta frissíteni a címkéket",
diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js
index 66ce04be361..3470d011dc6 100644
--- a/apps/files/l10n/nl.js
+++ b/apps/files/l10n/nl.js
@@ -71,8 +71,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favoriet",
     "Favorite" : "Favoriet",
+    "{newname} already exists" : "{newname} bestaat al",
     "Upload" : "Uploaden",
     "Text file" : "Tekstbestand",
+    "New text file.txt" : "Nieuw tekstbestand.txt",
     "Folder" : "Map",
     "New folder" : "Nieuwe map",
     "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de tags bij te werken",
diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json
index 5739351a79c..04c0b7916b5 100644
--- a/apps/files/l10n/nl.json
+++ b/apps/files/l10n/nl.json
@@ -69,8 +69,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favoriet",
     "Favorite" : "Favoriet",
+    "{newname} already exists" : "{newname} bestaat al",
     "Upload" : "Uploaden",
     "Text file" : "Tekstbestand",
+    "New text file.txt" : "Nieuw tekstbestand.txt",
     "Folder" : "Map",
     "New folder" : "Nieuwe map",
     "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de tags bij te werken",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index 6586d227d66..7f154cbbf5e 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favorito",
     "Favorite" : "Favorito",
+    "{newname} already exists" : "{newname} já existe",
     "Upload" : "Enviar",
     "Text file" : "Arquivo texto",
+    "New text file.txt" : "Novo texto file.txt",
     "Folder" : "Pasta",
     "New folder" : "Nova pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index 06847e4fa87..81c76bb2b84 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favorito",
     "Favorite" : "Favorito",
+    "{newname} already exists" : "{newname} já existe",
     "Upload" : "Enviar",
     "Text file" : "Arquivo texto",
+    "New text file.txt" : "Novo texto file.txt",
     "Folder" : "Pasta",
     "New folder" : "Nova pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas",
diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js
index 61182b63ad3..2b092551a17 100644
--- a/apps/files/l10n/th_TH.js
+++ b/apps/files/l10n/th_TH.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n ไบต์"],
     "Favorited" : "รายการโปรด",
     "Favorite" : "รายการโปรด",
+    "{newname} already exists" : "{newname} ถูกใช้ไปแล้ว",
     "Upload" : "อัพโหลด",
     "Text file" : "ไฟล์ข้อความ",
+    "New text file.txt" : "ไฟล์ข้อความใหม่ .txt",
     "Folder" : "แฟ้มเอกสาร",
     "New folder" : "โฟลเดอร์ใหม่",
     "An error occurred while trying to update the tags" : "เกิดข้อผิดพลาดขณะที่พยายามจะปรับปรุงแท็ก",
diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json
index dd2ecf36df3..3125adc820f 100644
--- a/apps/files/l10n/th_TH.json
+++ b/apps/files/l10n/th_TH.json
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n ไบต์"],
     "Favorited" : "รายการโปรด",
     "Favorite" : "รายการโปรด",
+    "{newname} already exists" : "{newname} ถูกใช้ไปแล้ว",
     "Upload" : "อัพโหลด",
     "Text file" : "ไฟล์ข้อความ",
+    "New text file.txt" : "ไฟล์ข้อความใหม่ .txt",
     "Folder" : "แฟ้มเอกสาร",
     "New folder" : "โฟลเดอร์ใหม่",
     "An error occurred while trying to update the tags" : "เกิดข้อผิดพลาดขณะที่พยายามจะปรับปรุงแท็ก",
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index 3278343a769..738fe6eb6b9 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Federated Cloud" : "Egyesített felhő",
     "Your Federated Cloud ID:" : "Egyesített felhő azonosító:",
     "Share it:" : "Ossza meg:",
+    "Add to your website" : "Add hozzá saját weboldaladhoz",
     "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül",
     "HTML Code:" : "HTML Code:"
 },
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index edb98a5f70b..6b60146ffff 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -64,6 +64,7 @@
     "Federated Cloud" : "Egyesített felhő",
     "Your Federated Cloud ID:" : "Egyesített felhő azonosító:",
     "Share it:" : "Ossza meg:",
+    "Add to your website" : "Add hozzá saját weboldaladhoz",
     "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül",
     "HTML Code:" : "HTML Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
index be9a353ffd9..242b3a8a68b 100644
--- a/apps/files_sharing/l10n/th_TH.js
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Federated Cloud" : "สหพันธ์คลาวด์",
     "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:",
     "Share it:" : "แชร์มัน:",
+    "Add to your website" : "เพิ่มไปยังเว็บไซต์",
     "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud",
     "HTML Code:" : "โค้ด HTML:"
 },
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
index 6984d7275d9..4658d45fbbe 100644
--- a/apps/files_sharing/l10n/th_TH.json
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -64,6 +64,7 @@
     "Federated Cloud" : "สหพันธ์คลาวด์",
     "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:",
     "Share it:" : "แชร์มัน:",
+    "Add to your website" : "เพิ่มไปยังเว็บไซต์",
     "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud",
     "HTML Code:" : "โค้ด HTML:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/lib/l10n/th_TH.js b/lib/l10n/th_TH.js
index 2ff86f599e9..6092f348cb5 100644
--- a/lib/l10n/th_TH.js
+++ b/lib/l10n/th_TH.js
@@ -91,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "การแชร์ %s ล้มเหลวเนื่องจากไม่ได้มีผู้ใช้ %s อยู่",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "การแชร์ %s ล้มเหลวเนื่องจากผู้ใช้ %s ไม่ได้เป็นสมาชิกของกลุ่มใดๆ %s เป็นสมาชิกของ",
     "Sharing %s failed, because this item is already shared with %s" : "การแชร์ %s ล้มเหลวเพราะรายการนี้ถูกแชร์กับ %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "%s ที่กำลังแชร์ล้มเหลว เพราะรายการนี้ได้ถูกแชร์กับผู้ใช้ %s",
     "Sharing %s failed, because the group %s does not exist" : "การแชร์ %s ล้มเหลวเพราะไม่มีกลุ่ม %s อยู่",
     "Sharing %s failed, because %s is not a member of the group %s" : "การแชร์ %s ล้มเหลวเพราะ %s ไม่ได้เป็นสมาชิกของกลุ่ม %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "คุณจำเป็นต้องระบุรหัสผ่านเพื่อสร้างลิงค์สาธารณะ, ลิงค์ที่มีการป้องกันเท่านั้นที่ได้รับอนุญาต",
diff --git a/lib/l10n/th_TH.json b/lib/l10n/th_TH.json
index a215b67a180..a872236a70d 100644
--- a/lib/l10n/th_TH.json
+++ b/lib/l10n/th_TH.json
@@ -89,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "การแชร์ %s ล้มเหลวเนื่องจากไม่ได้มีผู้ใช้ %s อยู่",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "การแชร์ %s ล้มเหลวเนื่องจากผู้ใช้ %s ไม่ได้เป็นสมาชิกของกลุ่มใดๆ %s เป็นสมาชิกของ",
     "Sharing %s failed, because this item is already shared with %s" : "การแชร์ %s ล้มเหลวเพราะรายการนี้ถูกแชร์กับ %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "%s ที่กำลังแชร์ล้มเหลว เพราะรายการนี้ได้ถูกแชร์กับผู้ใช้ %s",
     "Sharing %s failed, because the group %s does not exist" : "การแชร์ %s ล้มเหลวเพราะไม่มีกลุ่ม %s อยู่",
     "Sharing %s failed, because %s is not a member of the group %s" : "การแชร์ %s ล้มเหลวเพราะ %s ไม่ได้เป็นสมาชิกของกลุ่ม %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "คุณจำเป็นต้องระบุรหัสผ่านเพื่อสร้างลิงค์สาธารณะ, ลิงค์ที่มีการป้องกันเท่านั้นที่ได้รับอนุญาต",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 6f167f62493..21b70a65740 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -119,6 +119,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Η php δεν φαίνεται να είναι σωστά ρυθμισμένη για ερωτήματα σε μεταβλητές περιβάλλοντος του συστήματος. Η δοκιμή με την εντολή getenv(\"PATH\") επιστρέφει κενή απάντηση.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Παρακαλούμε ελέγξτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση της εγκατάστασης ↗</a> για τις σημειώσεις σχετικά με τη διαμόρφωση της php και τη διαμόρφωση της php στο διακομιστή σας, ειδικά όταν χρησιμοποιείτε php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Η ρύθμιση  \"μόνο ανάγνωση\"  έχει ενεργοποιηθεί. Αυτό εμποδίζει τον καθορισμό κάποιων ρυθμίσεων μέσω της διεπαφής web. Επιπλέον, το αρχείο πρέπει να γίνει χειροκίνητα εγγράψιμο πριν από κάθε διαδικασία ενημέρωσης.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 9b758b1eec3..87aca13d1bd 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -117,6 +117,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Η php δεν φαίνεται να είναι σωστά ρυθμισμένη για ερωτήματα σε μεταβλητές περιβάλλοντος του συστήματος. Η δοκιμή με την εντολή getenv(\"PATH\") επιστρέφει κενή απάντηση.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Παρακαλούμε ελέγξτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση της εγκατάστασης ↗</a> για τις σημειώσεις σχετικά με τη διαμόρφωση της php και τη διαμόρφωση της php στο διακομιστή σας, ειδικά όταν χρησιμοποιείτε php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Η ρύθμιση  \"μόνο ανάγνωση\"  έχει ενεργοποιηθεί. Αυτό εμποδίζει τον καθορισμό κάποιων ρυθμίσεων μέσω της διεπαφής web. Επιπλέον, το αρχείο πρέπει να γίνει χειροκίνητα εγγράψιμο πριν από κάθε διαδικασία ενημέρωσης.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index 63456c91a95..cbbdba36bd5 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -115,6 +115,7 @@ OC.L10N.register(
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tarkista <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a> PHP-asetusten osalta, erityisesti jos käytössäsi on php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s alta version %2$s on asennettu. Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään uudempaan versioon %1$s.",
@@ -149,6 +150,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "Käytä palvelinpään salausta",
     "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
     "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Salausta ei voi perua. Kun salaus on käytössä, kaikki tiedostot siitä hetkestä eteenpäin palvelimella on salattu, eikä salausta voi enää poistaa käytöstä.",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Varmista, että otat säännöllisesti varmuuskopiot salausavaimista, jotta et menetä kaikkia tietoja pysyvästi (data/<käyttäjä>/files_encryption ja data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
     "Enable encryption" : "Käytä salausta",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Salausmoduulia ei ole käytössä. Ota salausmoduuli käyttöön sovellusvalikosta.",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 932c3950528..f4b6bb41749 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -113,6 +113,7 @@
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tarkista <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a> PHP-asetusten osalta, erityisesti jos käytössäsi on php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s alta version %2$s on asennettu. Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään uudempaan versioon %1$s.",
@@ -147,6 +148,7 @@
     "Enable server-side encryption" : "Käytä palvelinpään salausta",
     "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
     "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Salausta ei voi perua. Kun salaus on käytössä, kaikki tiedostot siitä hetkestä eteenpäin palvelimella on salattu, eikä salausta voi enää poistaa käytöstä.",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Varmista, että otat säännöllisesti varmuuskopiot salausavaimista, jotta et menetä kaikkia tietoja pysyvästi (data/<käyttäjä>/files_encryption ja data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
     "Enable encryption" : "Käytä salausta",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Salausmoduulia ei ole käytössä. Ota salausmoduuli käyttöön sovellusvalikosta.",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index cb0400e63b4..0766f2b55aa 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -60,6 +60,7 @@ OC.L10N.register(
     "Approved" : "Jóváhagyott",
     "Experimental" : "Kísérleti",
     "All" : "Mind",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ez az alkalmazás még nincs biztonságilag ellenőrizve és vagy új, vagy ismert instabil. Telepítés csak saját felelősségre!",
     "Update to %s" : "Frissítés erre: %s",
     "Please wait...." : "Kérjük várj...",
     "Error while disabling app" : "Hiba az alkalmazás letiltása közben",
@@ -110,6 +111,8 @@ OC.L10N.register(
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Úgy tűnik, hogy a PHP nem tudja olvasni a rendszer környezeti változóit. A getenv(\"PATH\") teszt visszatérési értéke üres.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Kérjük ellenőrizd a <a target=\"_blank\" href=\"%s\">telepítési dokumentációt ↗</a> a PHP konfigurációs beállításaival kapcsolatban, főleg ha PHP-FPM-et használsz.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "A szervered Microsoft Windowson fut. A legjobb felhasználói élményért erősen javasoljuk, hogy Linuxot használj.",
@@ -142,6 +145,7 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
     "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
+    "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
     "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "A szerveroldali titkosítás egyirányú folyamat. Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később nem lehet visszafordítani.",
     "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
     "Enable encryption" : "Titkosítás engedélyezése",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index 34ea7fc681d..4f1801fdef4 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -58,6 +58,7 @@
     "Approved" : "Jóváhagyott",
     "Experimental" : "Kísérleti",
     "All" : "Mind",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ez az alkalmazás még nincs biztonságilag ellenőrizve és vagy új, vagy ismert instabil. Telepítés csak saját felelősségre!",
     "Update to %s" : "Frissítés erre: %s",
     "Please wait...." : "Kérjük várj...",
     "Error while disabling app" : "Hiba az alkalmazás letiltása közben",
@@ -108,6 +109,8 @@
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Úgy tűnik, hogy a PHP nem tudja olvasni a rendszer környezeti változóit. A getenv(\"PATH\") teszt visszatérési értéke üres.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Kérjük ellenőrizd a <a target=\"_blank\" href=\"%s\">telepítési dokumentációt ↗</a> a PHP konfigurációs beállításaival kapcsolatban, főleg ha PHP-FPM-et használsz.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "A szervered Microsoft Windowson fut. A legjobb felhasználói élményért erősen javasoljuk, hogy Linuxot használj.",
@@ -140,6 +143,7 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
     "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
+    "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
     "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "A szerveroldali titkosítás egyirányú folyamat. Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később nem lehet visszafordítani.",
     "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
     "Enable encryption" : "Titkosítás engedélyezése",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 97958325168..d11b77a2183 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -119,6 +119,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de <a target=\"_blank\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratie notities en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 637cc3bb2d9..a47e0b11403 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -117,6 +117,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de <a target=\"_blank\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratie notities en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index bf7b404b6ca..14cc0211bef 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -119,6 +119,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "O PHP não parecem esta configurado corretamente para consultar as variáveis de ambiente do sistema. O teste com getenv(\"PATH\") só retorna uma resposta vazia.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor verifique o <a target=\"_blank\" href=\"%s\">documento de instalação ↗</a> para as notas de configuração do PHP e configuração do PHP do seu servidor, especialmente quando usando PHP-FPM.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "A configuração Somente-Leitura foi habilitada. Isso impede que algumas configurações sejam definidas via a interface web. Além disso, o arquivo precisa ter permissão de escrita manual para cada atualização.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index ee03a1cdd08..2f056645a0c 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -117,6 +117,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "O PHP não parecem esta configurado corretamente para consultar as variáveis de ambiente do sistema. O teste com getenv(\"PATH\") só retorna uma resposta vazia.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor verifique o <a target=\"_blank\" href=\"%s\">documento de instalação ↗</a> para as notas de configuração do PHP e configuração do PHP do seu servidor, especialmente quando usando PHP-FPM.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "A configuração Somente-Leitura foi habilitada. Isso impede que algumas configurações sejam definidas via a interface web. Além disso, o arquivo precisa ter permissão de escrita manual para cada atualização.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index 552dd7d2e6f..d72dc37b703 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -119,6 +119,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ไม่ได้ติดตั้งphp อย่างถูกต้องค้นหาตัวแปรสภาพแวดล้อมของระบบการทดสอบกับ getenv(\"PATH\") ส่งกลับเฉพาะการตอบสนองที่ว่างเปล่า",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "กรุณาตรวจสอบ <a target=\"_blank\" href=\"%s\">เอกสารการติดตั้ง</a> สำหรับการตั้งค่าและบันทึก php ของเซิร์ฟเวอร์ของคุณโดยเฉพาะอย่างยิ่งเมื่อใช้ php-fpm",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "ตั้งค่าให้สามารถอ่านได้อย่างเดียวถูกเปิดใช้งาน นี้จะช่วยป้องกันการตั้งค่าผ่านทางบางเว็บอินเตอร์เฟซ นอกจากนี้จะต้องเขียนไฟล์ด้วยตนเองสำหรับทุกการอัพเดท",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "เห็นได้ชัดว่าการตั้งค่า PHP จะตัดบล็อคเอกสารแบบอินไลน์ ซึ่งจะทำให้แอพพลิเคชันอีกหลายแกนไม่สามารถเข้าถึงได้",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "นี้อาจเกิดจาก cache/accelerator อย่างเช่น Zend OPcache หรือ eAccelerator",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index 65f226ba72a..f2e4af2f838 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -117,6 +117,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ไม่ได้ติดตั้งphp อย่างถูกต้องค้นหาตัวแปรสภาพแวดล้อมของระบบการทดสอบกับ getenv(\"PATH\") ส่งกลับเฉพาะการตอบสนองที่ว่างเปล่า",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "กรุณาตรวจสอบ <a target=\"_blank\" href=\"%s\">เอกสารการติดตั้ง</a> สำหรับการตั้งค่าและบันทึก php ของเซิร์ฟเวอร์ของคุณโดยเฉพาะอย่างยิ่งเมื่อใช้ php-fpm",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "ตั้งค่าให้สามารถอ่านได้อย่างเดียวถูกเปิดใช้งาน นี้จะช่วยป้องกันการตั้งค่าผ่านทางบางเว็บอินเตอร์เฟซ นอกจากนี้จะต้องเขียนไฟล์ด้วยตนเองสำหรับทุกการอัพเดท",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "เห็นได้ชัดว่าการตั้งค่า PHP จะตัดบล็อคเอกสารแบบอินไลน์ ซึ่งจะทำให้แอพพลิเคชันอีกหลายแกนไม่สามารถเข้าถึงได้",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "นี้อาจเกิดจาก cache/accelerator อย่างเช่น Zend OPcache หรือ eAccelerator",
-- 
GitLab


From bfa26db4727cf5cf9a26754b82e65a38ffc98bbd Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 8 Sep 2015 21:15:08 +0200
Subject: [PATCH 216/783] Use md5 over the version file to prevent cyclyc
 dependency

---
 lib/private/server.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/private/server.php b/lib/private/server.php
index 393c1840973..346761840d6 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -177,8 +177,6 @@ class Server extends SimpleContainer implements IServerContainer {
 			$manager = $c->getUserManager();
 
 			$session = new \OC\Session\Memory('');
-			$cryptoWrapper = $c->getSessionCryptoWrapper();
-			$session = $cryptoWrapper->wrapSession($session);
 
 			$userSession = new \OC\User\Session($manager, $session);
 			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
@@ -252,7 +250,7 @@ class Server extends SimpleContainer implements IServerContainer {
 
 			if($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
 				$v = \OC_App::getAppVersions();
-				$v['core'] = implode('.', \OC_Util::getVersion());
+				$v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php'));
 				$version = implode(',', $v);
 				$instanceId = \OC_Util::getInstanceId();
 				$path = \OC::$SERVERROOT;
-- 
GitLab


From e579dd62fd4d4622766ecf60473dba41d3fbed9b Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 8 Sep 2015 21:16:11 +0200
Subject: [PATCH 217/783] Write session data to single key

This prevents decrypting values multiple times.
---
 lib/private/session/cryptosessiondata.php | 46 +++++++++++++++--------
 tests/lib/session/cryptowrappingtest.php  |  8 ++--
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/lib/private/session/cryptosessiondata.php b/lib/private/session/cryptosessiondata.php
index 60d22b25e97..a0d180757bc 100644
--- a/lib/private/session/cryptosessiondata.php
+++ b/lib/private/session/cryptosessiondata.php
@@ -32,22 +32,38 @@ use OCP\Security\ICrypto;
 class CryptoSessionData implements \ArrayAccess, ISession {
 	/** @var ISession */
 	protected $session;
-
 	/** @var \OCP\Security\ICrypto */
 	protected $crypto;
-
 	/** @var string */
 	protected $passphrase;
+	/** @var array */
+	protected $sessionValues;
+	CONST encryptedSessionName = 'encrypted_session_data';
 
 	/**
 	 * @param ISession $session
 	 * @param ICrypto $crypto
 	 * @param string $passphrase
 	 */
-	public function __construct(ISession $session, ICrypto $crypto, $passphrase) {
+	public function __construct(ISession $session,
+								ICrypto $crypto,
+								$passphrase) {
 		$this->crypto = $crypto;
 		$this->session = $session;
 		$this->passphrase = $passphrase;
+		$this->initializeSession();
+	}
+
+	protected function initializeSession() {
+		$encryptedSessionData = $this->session->get(self::encryptedSessionName);
+		try {
+			$this->sessionValues = json_decode(
+				$this->crypto->decrypt($encryptedSessionData, $this->passphrase),
+				true
+			);
+		} catch (\Exception $e) {
+			$this->sessionValues = [];
+		}
 	}
 
 	/**
@@ -57,8 +73,9 @@ class CryptoSessionData implements \ArrayAccess, ISession {
 	 * @param mixed $value
 	 */
 	public function set($key, $value) {
-		$encryptedValue = $this->crypto->encrypt(json_encode($value), $this->passphrase);
-		$this->session->set($key, $encryptedValue);
+		$this->sessionValues[$key] = $value;
+		$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
+		$this->session->set(self::encryptedSessionName, $encryptedValue);
 	}
 
 	/**
@@ -68,17 +85,12 @@ class CryptoSessionData implements \ArrayAccess, ISession {
 	 * @return string|null Either the value or null
 	 */
 	public function get($key) {
-		$encryptedValue = $this->session->get($key);
-		if ($encryptedValue === null) {
-			return null;
-		}
 
-		try {
-			$value = $this->crypto->decrypt($encryptedValue, $this->passphrase);
-			return json_decode($value);
-		} catch (\Exception $e) {
-			return null;
+		if(isset($this->sessionValues[$key])) {
+			return $this->sessionValues[$key];
 		}
+
+		return null;
 	}
 
 	/**
@@ -88,7 +100,7 @@ class CryptoSessionData implements \ArrayAccess, ISession {
 	 * @return bool
 	 */
 	public function exists($key) {
-		return $this->session->exists($key);
+		return isset($this->sessionValues[$key]);
 	}
 
 	/**
@@ -97,13 +109,15 @@ class CryptoSessionData implements \ArrayAccess, ISession {
 	 * @param string $key
 	 */
 	public function remove($key) {
-		$this->session->remove($key);
+		unset($this->sessionValues[$key]);
+		$this->session->remove(self::encryptedSessionName);
 	}
 
 	/**
 	 * Reset and recreate the session
 	 */
 	public function clear() {
+		$this->sessionValues = [];
 		$this->session->clear();
 	}
 
diff --git a/tests/lib/session/cryptowrappingtest.php b/tests/lib/session/cryptowrappingtest.php
index 12b3c905b7f..1cbe60066fe 100644
--- a/tests/lib/session/cryptowrappingtest.php
+++ b/tests/lib/session/cryptowrappingtest.php
@@ -62,8 +62,8 @@ class CryptoWrappingTest extends TestCase {
 
 		$this->wrappedSession->expects($this->once())
 			->method('set')
-			->with('key', $this->crypto->encrypt(json_encode($unencryptedValue)));
-		$this->instance->set('key', $unencryptedValue);
+			->with('encrypted_session_data', $this->crypto->encrypt(json_encode(['encrypted_session_data' => $unencryptedValue])));
+		$this->instance->set('encrypted_session_data', $unencryptedValue);
 	}
 
 	public function testUnwrappingGet() {
@@ -72,11 +72,11 @@ class CryptoWrappingTest extends TestCase {
 
 		$this->wrappedSession->expects($this->once())
 			->method('get')
-			->with('key')
+			->with('encrypted_session_data')
 			->willReturnCallback(function () use ($encryptedValue) {
 				return $encryptedValue;
 			});
 
-		$this->assertSame($unencryptedValue, $this->wrappedSession->get('key'));
+		$this->assertSame($unencryptedValue, $this->wrappedSession->get('encrypted_session_data'));
 	}
 }
-- 
GitLab


From 0b910874899b3c7cd839e8b0a0a8416e44e348bc Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 8 Sep 2015 22:05:36 +0200
Subject: [PATCH 218/783] Write to session in batch at the end of the request

---
 lib/private/session/cryptosessiondata.php | 22 ++++++++++++++++++----
 lib/private/session/internal.php          |  8 ++++----
 tests/lib/session/cryptowrappingtest.php  |  9 ---------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/private/session/cryptosessiondata.php b/lib/private/session/cryptosessiondata.php
index a0d180757bc..6826ede5e33 100644
--- a/lib/private/session/cryptosessiondata.php
+++ b/lib/private/session/cryptosessiondata.php
@@ -38,6 +38,8 @@ class CryptoSessionData implements \ArrayAccess, ISession {
 	protected $passphrase;
 	/** @var array */
 	protected $sessionValues;
+	/** @var bool */
+	protected $isModified = false;
 	CONST encryptedSessionName = 'encrypted_session_data';
 
 	/**
@@ -54,6 +56,13 @@ class CryptoSessionData implements \ArrayAccess, ISession {
 		$this->initializeSession();
 	}
 
+	/**
+	 * Close session if class gets destructed
+	 */
+	public function __destruct() {
+		$this->close();
+	}
+
 	protected function initializeSession() {
 		$encryptedSessionData = $this->session->get(self::encryptedSessionName);
 		try {
@@ -74,8 +83,7 @@ class CryptoSessionData implements \ArrayAccess, ISession {
 	 */
 	public function set($key, $value) {
 		$this->sessionValues[$key] = $value;
-		$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
-		$this->session->set(self::encryptedSessionName, $encryptedValue);
+		$this->isModified = true;
 	}
 
 	/**
@@ -85,7 +93,6 @@ class CryptoSessionData implements \ArrayAccess, ISession {
 	 * @return string|null Either the value or null
 	 */
 	public function get($key) {
-
 		if(isset($this->sessionValues[$key])) {
 			return $this->sessionValues[$key];
 		}
@@ -109,6 +116,7 @@ class CryptoSessionData implements \ArrayAccess, ISession {
 	 * @param string $key
 	 */
 	public function remove($key) {
+		$this->isModified = true;
 		unset($this->sessionValues[$key]);
 		$this->session->remove(self::encryptedSessionName);
 	}
@@ -118,13 +126,19 @@ class CryptoSessionData implements \ArrayAccess, ISession {
 	 */
 	public function clear() {
 		$this->sessionValues = [];
+		$this->isModified = true;
 		$this->session->clear();
 	}
 
 	/**
-	 * Close the session and release the lock
+	 * Close the session and release the lock, also writes all changed data in batch
 	 */
 	public function close() {
+		if($this->isModified) {
+			$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
+			$this->session->set(self::encryptedSessionName, $encryptedValue);
+			$this->isModified = false;
+		}
 		$this->session->close();
 	}
 
diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php
index 77197887754..8ee21272104 100644
--- a/lib/private/session/internal.php
+++ b/lib/private/session/internal.php
@@ -32,6 +32,10 @@ namespace OC\Session;
  * @package OC\Session
  */
 class Internal extends Session {
+	/**
+	 * @param string $name
+	 * @throws \Exception
+	 */
 	public function __construct($name) {
 		session_name($name);
 		set_error_handler(array($this, 'trapError'));
@@ -42,10 +46,6 @@ class Internal extends Session {
 		}
 	}
 
-	public function __destruct() {
-		$this->close();
-	}
-
 	/**
 	 * @param string $key
 	 * @param integer $value
diff --git a/tests/lib/session/cryptowrappingtest.php b/tests/lib/session/cryptowrappingtest.php
index 1cbe60066fe..e1fadbf933f 100644
--- a/tests/lib/session/cryptowrappingtest.php
+++ b/tests/lib/session/cryptowrappingtest.php
@@ -57,15 +57,6 @@ class CryptoWrappingTest extends TestCase {
 		$this->instance = new CryptoSessionData($this->wrappedSession, $this->crypto, 'PASS');
 	}
 
-	public function testWrappingSet() {
-		$unencryptedValue = 'foobar';
-
-		$this->wrappedSession->expects($this->once())
-			->method('set')
-			->with('encrypted_session_data', $this->crypto->encrypt(json_encode(['encrypted_session_data' => $unencryptedValue])));
-		$this->instance->set('encrypted_session_data', $unencryptedValue);
-	}
-
 	public function testUnwrappingGet() {
 		$unencryptedValue = 'foobar';
 		$encryptedValue = $this->crypto->encrypt($unencryptedValue);
-- 
GitLab


From 0943781ccfc91bee9f61658ee085b9fa2c5d4e2b Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 9 Sep 2015 12:52:54 +0200
Subject: [PATCH 219/783] Rename data provider to avoid risky test warning

```
06:49:56 There was 1 risky test:
06:49:56
06:49:56 1) OC\AppFramework\Http\JSONResponseTest::testRenderProvider
06:49:56 This test did not perform any assertions
```
---
 tests/lib/appframework/http/JSONResponseTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index 253c523934b..a98f5fc894a 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -69,7 +69,7 @@ class JSONResponseTest extends \Test\TestCase {
 	/**
 	 * @return array
 	 */
-	public function testRenderProvider() {
+	public function renderDataProvider() {
 		return [
 			[
 				['test' => 'hi'], '{"test":"hi"}',
@@ -81,7 +81,7 @@ class JSONResponseTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider testRenderProvider
+	 * @dataProvider renderDataProvider
 	 * @param array $input
 	 * @param string $expected
 	 */
-- 
GitLab


From 29dd7d83c4ec5a82cc75f1da54b4101b2bb986e6 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 9 Sep 2015 14:56:49 +0100
Subject: [PATCH 220/783] Check if files_sharing is actually enabled before
 using it

---
 ocs/routes.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/ocs/routes.php b/ocs/routes.php
index f8e6f33c48a..9a8625bcc31 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -104,31 +104,33 @@ API::register(
 );
 
 // Server-to-Server Sharing
-$s2s = new \OCA\Files_Sharing\API\Server2Server();
-API::register('post',
+if (\OC::$server->getAppManager()->isEnabledForUser('files_sharing')) {
+	$s2s = new \OCA\Files_Sharing\API\Server2Server();
+	API::register('post',
 		'/cloud/shares',
 		array($s2s, 'createShare'),
 		'files_sharing',
 		API::GUEST_AUTH
-);
+	);
 
-API::register('post',
+	API::register('post',
 		'/cloud/shares/{id}/accept',
 		array($s2s, 'acceptShare'),
 		'files_sharing',
 		API::GUEST_AUTH
-);
+	);
 
-API::register('post',
+	API::register('post',
 		'/cloud/shares/{id}/decline',
 		array($s2s, 'declineShare'),
 		'files_sharing',
 		API::GUEST_AUTH
-);
+	);
 
-API::register('post',
+	API::register('post',
 		'/cloud/shares/{id}/unshare',
 		array($s2s, 'unshare'),
 		'files_sharing',
 		API::GUEST_AUTH
-);
+	);
+}
-- 
GitLab


From 436c149fbbca2c26d906dfb871bdafc8c7a2ab34 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 9 Sep 2015 18:07:43 +0200
Subject: [PATCH 221/783] Prevent referer from being sent

Nice hardening for enhanced privacy. Especially useful when using embedded viewers such as files_pdfviewer.
---
 core/templates/layout.base.php  | 1 +
 core/templates/layout.guest.php | 1 +
 core/templates/layout.user.php  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 43d692c0364..b01820a05bb 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -8,6 +8,7 @@
 		<?php p($theme->getTitle()); ?>
 		</title>
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="referrer" content="never">
 		<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>">
 		<link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>">
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 0fd7521271d..56b762d3266 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -8,6 +8,7 @@
 		<?php p($theme->getTitle()); ?>
 		</title>
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="referrer" content="never">
 		<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
 		<meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>">
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 59fced353d1..0910047032d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -15,6 +15,7 @@
 			?>
 		</title>
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="referrer" content="never">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
 		<meta name="apple-mobile-web-app-capable" content="yes">
-- 
GitLab


From 0ef7b84d778147ff0d47f4cdf95c0ac1272863b8 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 10 Sep 2015 01:54:52 -0400
Subject: [PATCH 222/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/fr.js       | 2 ++
 apps/encryption/l10n/fr.json     | 2 ++
 apps/files/l10n/fr.js            | 2 ++
 apps/files/l10n/fr.json          | 2 ++
 apps/files/l10n/it.js            | 2 ++
 apps/files/l10n/it.json          | 2 ++
 apps/files_external/l10n/fr.js   | 7 +++++++
 apps/files_external/l10n/fr.json | 7 +++++++
 apps/files_sharing/l10n/fr.js    | 1 +
 apps/files_sharing/l10n/fr.json  | 1 +
 settings/l10n/it.js              | 1 +
 settings/l10n/it.json            | 1 +
 12 files changed, 30 insertions(+)

diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index d8da3875ce9..0de35f8ec1c 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -28,8 +28,10 @@ OC.L10N.register(
     "one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous.  ",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjour,\n\nL'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel.\n",
     "The share will expire on %s." : "Le partage expirera le %s.",
     "Cheers!" : "À bientôt !",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>. <br><br>Veuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel. <br><br>",
     "Enable recovery key" : "Activer la clé de récupération",
     "Disable recovery key" : "Désactiver la clé de récupération",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index 9d89ef275cb..3fa598a72ce 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -26,8 +26,10 @@
     "one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous.  ",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjour,\n\nL'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel.\n",
     "The share will expire on %s." : "Le partage expirera le %s.",
     "Cheers!" : "À bientôt !",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>. <br><br>Veuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel. <br><br>",
     "Enable recovery key" : "Activer la clé de récupération",
     "Disable recovery key" : "Désactiver la clé de récupération",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 6ba0bdee182..3b84a6c0c53 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n octet","%n octets"],
     "Favorited" : "Marqué comme favori",
     "Favorite" : "Favoris",
+    "{newname} already exists" : "{newname} existe déjà",
     "Upload" : "Chargement",
     "Text file" : "Fichier texte",
+    "New text file.txt" : "Nouveau fichier texte \"file.txt\"",
     "Folder" : "Dossier",
     "New folder" : "Nouveau dossier",
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index c8c0c1ceabf..4d05b5a42c3 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n octet","%n octets"],
     "Favorited" : "Marqué comme favori",
     "Favorite" : "Favoris",
+    "{newname} already exists" : "{newname} existe déjà",
     "Upload" : "Chargement",
     "Text file" : "Fichier texte",
+    "New text file.txt" : "Nouveau fichier texte \"file.txt\"",
     "Folder" : "Dossier",
     "New folder" : "Nouveau dossier",
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js
index 8aa774c7381..aa92ffc0f70 100644
--- a/apps/files/l10n/it.js
+++ b/apps/files/l10n/it.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n byte"],
     "Favorited" : "Preferiti",
     "Favorite" : "Preferito",
+    "{newname} already exists" : "{newname} esiste già",
     "Upload" : "Carica",
     "Text file" : "File di testo",
+    "New text file.txt" : "Nuovo file di testo.txt",
     "Folder" : "Cartella",
     "New folder" : "Nuova cartella",
     "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette",
diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json
index 39b6b9983e7..8f18858b2eb 100644
--- a/apps/files/l10n/it.json
+++ b/apps/files/l10n/it.json
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n byte"],
     "Favorited" : "Preferiti",
     "Favorite" : "Preferito",
+    "{newname} already exists" : "{newname} esiste già",
     "Upload" : "Carica",
     "Text file" : "File di testo",
+    "New text file.txt" : "Nuovo file di testo.txt",
     "Folder" : "Cartella",
     "New folder" : "Nuova cartella",
     "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 42944b2f2fb..8ac5b1a4466 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -27,13 +27,17 @@ OC.L10N.register(
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
     "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
+    "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
+    "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
     "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
     "Admin-only storage backend \"%s\"" : "Service de stockage \"%s\" pour admins seulement",
     "Personal" : "Personnel",
     "System" : "Système",
     "Grant access" : "Autoriser l'accès",
     "Access granted" : "Accès autorisé",
+    "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1",
+    "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2",
     "Enable encryption" : "Activer le chiffrement",
     "Enable previews" : "Activer les prévisualisations",
     "Check for changes" : "Rechercher les modifications",
@@ -45,6 +49,9 @@ OC.L10N.register(
     "Saved" : "Sauvegardé",
     "Generate keys" : "Générer des clés",
     "Error generating key pair" : "Erreur lors de la génération des clés",
+    "Access key" : "Clé d'accès",
+    "Secret key" : "Clé secrète",
+    "Builtin" : "inclus",
     "None" : "Aucun",
     "OAuth1" : "OAuth1",
     "App key" : "App key",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index ffc2de0ef53..67b8932202f 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -25,13 +25,17 @@
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
     "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
+    "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
+    "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
     "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
     "Admin-only storage backend \"%s\"" : "Service de stockage \"%s\" pour admins seulement",
     "Personal" : "Personnel",
     "System" : "Système",
     "Grant access" : "Autoriser l'accès",
     "Access granted" : "Accès autorisé",
+    "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1",
+    "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2",
     "Enable encryption" : "Activer le chiffrement",
     "Enable previews" : "Activer les prévisualisations",
     "Check for changes" : "Rechercher les modifications",
@@ -43,6 +47,9 @@
     "Saved" : "Sauvegardé",
     "Generate keys" : "Générer des clés",
     "Error generating key pair" : "Erreur lors de la génération des clés",
+    "Access key" : "Clé d'accès",
+    "Secret key" : "Clé secrète",
+    "Builtin" : "inclus",
     "None" : "Aucun",
     "OAuth1" : "OAuth1",
     "App key" : "App key",
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 077c12e6db2..721f52d4a67 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -66,6 +66,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :",
     "Share it:" : "Partager :",
+    "Add to your website" : "Ajouter à votre site web",
     "Share with me via ownCloud" : "Partagez avec moi via ownCloud",
     "HTML Code:" : "Code HTML :"
 },
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index c4b3bbe2f72..3f0ee47a381 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -64,6 +64,7 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :",
     "Share it:" : "Partager :",
+    "Add to your website" : "Ajouter à votre site web",
     "Share with me via ownCloud" : "Partagez avec moi via ownCloud",
     "HTML Code:" : "Code HTML :"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index aa1e6d7e93f..e51d43544a8 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -119,6 +119,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php non sembra essere configurato correttamente per interrogare le variabili d'ambiente di sistema. Il test con getenv(\"PATH\") restituisce solo una risposta vuota.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Controlla la <a target=\"_blank\" href=\"%s\">documentazione di installazione↗</a>  per le note di configurazione di php e la configurazione del tuo server, in particolare quando utilizzi php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configurazione di sola lettura è stata abilitata. Ciò impedisce l'impostazione di alcune configurazioni tramite l'interfaccia web. Inoltre, i file devono essere resi scrivibili manualmente per ogni aggiornamento.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index c4f227a1953..66b16c14433 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -117,6 +117,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php non sembra essere configurato correttamente per interrogare le variabili d'ambiente di sistema. Il test con getenv(\"PATH\") restituisce solo una risposta vuota.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Controlla la <a target=\"_blank\" href=\"%s\">documentazione di installazione↗</a>  per le note di configurazione di php e la configurazione del tuo server, in particolare quando utilizzi php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configurazione di sola lettura è stata abilitata. Ciò impedisce l'impostazione di alcune configurazioni tramite l'interfaccia web. Inoltre, i file devono essere resi scrivibili manualmente per ogni aggiornamento.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
-- 
GitLab


From 64203331bcc740a3caa4069da98e9a2512d664f3 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 10 Sep 2015 11:03:00 +0200
Subject: [PATCH 223/783] [example theme] make it easier for non PHP people to
 understand what to change

---
 themes/example/defaults.php | 38 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/themes/example/defaults.php b/themes/example/defaults.php
index 0dd0d46bd9c..6fea8fa8a49 100644
--- a/themes/example/defaults.php
+++ b/themes/example/defaults.php
@@ -20,54 +20,32 @@
 
 class OC_Theme {
 
-	private $themeEntity;
-	private $themeName;
-	private $themeTitle;
-	private $themeBaseUrl;
-	private $themeDocBaseUrl;
-	private $themeSyncClientUrl;
-	private $themeSlogan;
-	private $themeMailHeaderColor;
-
-	/* put your custom text in these variables */
-	function __construct() {
-		$this->themeEntity = 'Custom Cloud Co.';
-		$this->themeName = 'Custom Cloud';
-		$this->themeTitle = 'Custom Cloud';
-		$this->themeBaseUrl = 'https://owncloud.org';
-		$this->themeDocBaseUrl = 'https://doc.owncloud.org';
-		$this->themeSyncClientUrl = 'https://owncloud.org/install';
-		$this->themeSlogan = 'Your custom cloud, personalized for you!';
-		$this->themeMailHeaderColor = '#745bca';
-	}
-	/* nothing after this needs to be adjusted */
-
 	public function getBaseUrl() {
-		return $this->themeBaseUrl;
+		return 'https://owncloud.org';
 	}
 
 	public function getSyncClientUrl() {
-		return $this->themeSyncClientUrl;
+		return 'https://owncloud.org/install';
 	}
 
 	public function getDocBaseUrl() {
-		return $this->themeDocBaseUrl;
+		return 'https://doc.owncloud.org';
 	}
 
 	public function getTitle() {
-		return $this->themeTitle;
+		return 'Custom Cloud';
 	}
 
 	public function getName() {
-		return $this->themeName;
+		return 'Custom Cloud';
 	}
 
 	public function getEntity() {
-		return $this->themeEntity;
+		return 'Custom Cloud Co.';
 	}
 
 	public function getSlogan() {
-		return $this->themeSlogan;
+		return 'Your custom cloud, personalized for you!';
 	}
 
 	public function getShortFooter() {
@@ -89,7 +67,7 @@ class OC_Theme {
 	}
 
 	public function getMailHeaderColor() {
-		return $this->themeMailHeaderColor;
+		return '#745bca';
 	}
 
 }
-- 
GitLab


From d032d2f0f442ad7928cfed10d33a871b8e777db7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 10 Sep 2015 15:11:14 +0200
Subject: [PATCH 224/783] Add documentation links for transactional locking

---
 settings/templates/admin.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 4f3fb8f25bb..2a617387a83 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -128,7 +128,10 @@ if (!$_['has_fileinfo']) {
 if ($_['fileLockingType'] === 'none') {
 	?>
 	<li>
-		<?php p($l->t('Transitional file locking is disabled, this might lead to issues with race conditions, enable \'filelocking.enabled\' in config.php to improve handling of race conditions.')); ?>
+		<?php p($l->t('Transactional file locking is disabled, this might lead to issues with race conditions, enable \'filelocking.enabled\' in config.php to improve handling of race conditions.')); ?>
+		<a target="_blank" class="icon-info svg"
+		   title="<?php p($l->t('Open documentation')); ?>"
+		   href="<?php p(link_to_docs('admin-transactional-locking')); ?>"></a>
 	</li>
 	<?php
 }
@@ -184,7 +187,10 @@ if ($_['cronErrors']) {
 	<ul class="info hidden">
 		<?php if ($_['fileLockingType'] === 'db'):?>
 		<li>
-			<?php p($l->t('Transitional file locking is using the database as locking backend, for best performance it\'s advised to configure a memcache for locking. Check the admin documentation for more information about locking and memcaches')); ?>
+			<?php p($l->t('Transactional file locking is using the database as locking backend, for best performance it\'s advised to configure a memcache for locking. Check the admin documentation for more information about locking and memcaches')); ?>
+			<a target="_blank" class="icon-info svg"
+			   title="<?php p($l->t('Open documentation')); ?>"
+			   href="<?php p(link_to_docs('admin-transactional-locking')); ?>"></a>
 		</li>
 		<?php endif; ?>
 	</ul>
-- 
GitLab


From 27bc781cba0c445a5921ecba95f11fc813bdaabe Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 10 Sep 2015 21:40:51 +0100
Subject: [PATCH 225/783] Update isCertificateImportAllowed() check to new API

---
 settings/controller/certificatecontroller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/controller/certificatecontroller.php b/settings/controller/certificatecontroller.php
index 92d0961efb7..4c129dcd588 100644
--- a/settings/controller/certificatecontroller.php
+++ b/settings/controller/certificatecontroller.php
@@ -120,8 +120,8 @@ class CertificateController extends Controller {
 	protected function isCertificateImportAllowed() {
 		$externalStorageEnabled = $this->appManager->isEnabledForUser('files_external');
 		if ($externalStorageEnabled) {
-			$backends = \OC_Mount_Config::getPersonalBackends();
-			if (!empty($backends)) {
+			$backendService = \OC_Mount_Config::$app->getContainer()->query('OCA\Files_External\Service\BackendService');
+			if ($backendService->getBackendsVisibleFor(\OCA\Files_External\Service\BackendService::VISIBILITY_PERSONAL)) {
 				return true;
 			}
 		}
-- 
GitLab


From d67251fe4c908111c542ba105798ddae2f6749c7 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 10 Sep 2015 22:09:42 +0100
Subject: [PATCH 226/783] Remove storing storage_id in mount.json

One mount configuration does not necessarily map to a single storage,
due to `$user` substitution or special auth mechanisms.
---
 apps/files_external/lib/config.php | 67 ------------------------------
 1 file changed, 67 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 62932dc4028..2dc7de30a6c 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -81,9 +81,7 @@ class OC_Mount_Config {
 	 * @param array $data
 	 */
 	public static function initMountPointsHook($data) {
-		self::addStorageIdToConfig(null);
 		if ($data['user']) {
-			self::addStorageIdToConfig($data['user']);
 			$user = \OC::$server->getUserManager()->get($data['user']);
 			if (!$user) {
 				\OC::$server->getLogger()->warning(
@@ -210,7 +208,6 @@ class OC_Mount_Config {
 			'users' => $storage->getApplicableUsers(),
 		];
 		$mountEntry['id'] = $storage->getId();
-		// $mountEntry['storage_id'] = null; // we don't store this!
 
 		return $mountEntry;
 	}
@@ -310,14 +307,6 @@ class OC_Mount_Config {
 			$file = $config->getSystemValue('mount_file', $datadir . '/mount.json');
 		}
 
-		foreach ($data as &$applicables) {
-			foreach ($applicables as &$mountPoints) {
-				foreach ($mountPoints as &$options) {
-					self::addStorageId($options);
-				}
-			}
-		}
-
 		$content = json_encode($data, JSON_PRETTY_PRINT);
 		@file_put_contents($file, $content);
 		@chmod($file, 0640);
@@ -492,60 +481,4 @@ class OC_Mount_Config {
 		);
 		return hash('md5', $data);
 	}
-
-	/**
-	 * Add storage id to the storage configurations that did not have any.
-	 *
-	 * @param string $user user for which to process storage configs
-	 */
-	private static function addStorageIdToConfig($user) {
-		$config = self::readData($user);
-
-		$needUpdate = false;
-		foreach ($config as &$applicables) {
-			foreach ($applicables as &$mountPoints) {
-				foreach ($mountPoints as &$options) {
-					$needUpdate |= !isset($options['storage_id']);
-				}
-			}
-		}
-
-		if ($needUpdate) {
-			self::writeData($user, $config);
-		}
-	}
-
-	/**
-	 * Get storage id from the numeric storage id and set
-	 * it into the given options argument. Only do this
-	 * if there was no storage id set yet.
-	 *
-	 * This might also fail if a storage wasn't fully configured yet
-	 * and couldn't be mounted, in which case this will simply return false.
-	 *
-	 * @param array $options storage options
-	 *
-	 * @return bool true if the storage id was added, false otherwise
-	 */
-	private static function addStorageId(&$options) {
-		if (isset($options['storage_id'])) {
-			return false;
-		}
-
-		$service = self::$app->getContainer()->query('OCA\Files_External\Service\BackendService');
-		$class = $service->getBackend($options['backend'])->getStorageClass();
-		try {
-			/** @var \OC\Files\Storage\Storage $storage */
-			$storage = new $class($options['options']);
-			// TODO: introduce StorageConfigException
-		} catch (\Exception $e) {
-			// storage might not be fully configured yet (ex: Dropbox)
-			// note that storage instances aren't supposed to open any connections
-			// in the constructor, so this exception is likely to be a config exception
-			return false;
-		}
-
-		$options['storage_id'] = $storage->getCache()->getNumericStorageId();
-		return true;
-	}
 }
-- 
GitLab


From ee1b57d15d17b7306ffbe6fce75c429b644fac78 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 11 Sep 2015 01:55:26 -0400
Subject: [PATCH 227/783] [tx-robot] updated from transifex

---
 apps/files/l10n/es.js              |  2 ++
 apps/files/l10n/es.json            |  2 ++
 apps/files_sharing/l10n/cs_CZ.js   |  1 +
 apps/files_sharing/l10n/cs_CZ.json |  1 +
 apps/files_sharing/l10n/da.js      |  1 +
 apps/files_sharing/l10n/da.json    |  1 +
 apps/files_sharing/l10n/de.js      |  1 +
 apps/files_sharing/l10n/de.json    |  1 +
 apps/files_sharing/l10n/de_DE.js   |  1 +
 apps/files_sharing/l10n/de_DE.json |  1 +
 apps/files_sharing/l10n/el.js      |  1 +
 apps/files_sharing/l10n/el.json    |  1 +
 apps/files_sharing/l10n/en_GB.js   |  1 +
 apps/files_sharing/l10n/en_GB.json |  1 +
 apps/files_sharing/l10n/eo.js      |  1 +
 apps/files_sharing/l10n/eo.json    |  1 +
 apps/files_sharing/l10n/es.js      |  1 +
 apps/files_sharing/l10n/es.json    |  1 +
 apps/files_sharing/l10n/et_EE.js   |  1 +
 apps/files_sharing/l10n/et_EE.json |  1 +
 apps/files_sharing/l10n/fi_FI.js   |  1 +
 apps/files_sharing/l10n/fi_FI.json |  1 +
 apps/files_sharing/l10n/fr.js      |  1 +
 apps/files_sharing/l10n/fr.json    |  1 +
 apps/files_sharing/l10n/gl.js      |  1 +
 apps/files_sharing/l10n/gl.json    |  1 +
 apps/files_sharing/l10n/hu_HU.js   |  1 +
 apps/files_sharing/l10n/hu_HU.json |  1 +
 apps/files_sharing/l10n/id.js      |  1 +
 apps/files_sharing/l10n/id.json    |  1 +
 apps/files_sharing/l10n/it.js      |  1 +
 apps/files_sharing/l10n/it.json    |  1 +
 apps/files_sharing/l10n/ja.js      |  1 +
 apps/files_sharing/l10n/ja.json    |  1 +
 apps/files_sharing/l10n/ko.js      |  1 +
 apps/files_sharing/l10n/ko.json    |  1 +
 apps/files_sharing/l10n/nb_NO.js   |  1 +
 apps/files_sharing/l10n/nb_NO.json |  1 +
 apps/files_sharing/l10n/nl.js      |  1 +
 apps/files_sharing/l10n/nl.json    |  1 +
 apps/files_sharing/l10n/pl.js      |  1 +
 apps/files_sharing/l10n/pl.json    |  1 +
 apps/files_sharing/l10n/pt_BR.js   |  1 +
 apps/files_sharing/l10n/pt_BR.json |  1 +
 apps/files_sharing/l10n/pt_PT.js   |  1 +
 apps/files_sharing/l10n/pt_PT.json |  1 +
 apps/files_sharing/l10n/ru.js      |  1 +
 apps/files_sharing/l10n/ru.json    |  1 +
 apps/files_sharing/l10n/sk_SK.js   |  1 +
 apps/files_sharing/l10n/sk_SK.json |  1 +
 apps/files_sharing/l10n/sl.js      |  1 +
 apps/files_sharing/l10n/sl.json    |  1 +
 apps/files_sharing/l10n/sr.js      |  1 +
 apps/files_sharing/l10n/sr.json    |  1 +
 apps/files_sharing/l10n/sv.js      |  1 +
 apps/files_sharing/l10n/sv.json    |  1 +
 apps/files_sharing/l10n/th_TH.js   |  1 +
 apps/files_sharing/l10n/th_TH.json |  1 +
 apps/files_sharing/l10n/tr.js      |  1 +
 apps/files_sharing/l10n/tr.json    |  1 +
 core/l10n/nb_NO.js                 | 19 +++++++++++++++++++
 core/l10n/nb_NO.json               | 19 +++++++++++++++++++
 settings/l10n/pt_PT.js             |  1 +
 settings/l10n/pt_PT.json           |  1 +
 64 files changed, 102 insertions(+)

diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index 43e32d9ab25..318a86e5884 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Agregado a Favoritos",
     "Favorite" : "Favorito",
+    "{newname} already exists" : "{new_name} ya existe",
     "Upload" : "Subir",
     "Text file" : "Archivo de texto",
+    "New text file.txt" : "Nuevo archivo de texto.txt",
     "Folder" : "Carpeta",
     "New folder" : "Nueva carpeta",
     "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index 4d2e01e7eb8..26761bf2073 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Agregado a Favoritos",
     "Favorite" : "Favorito",
+    "{newname} already exists" : "{new_name} ya existe",
     "Upload" : "Subir",
     "Text file" : "Archivo de texto",
+    "New text file.txt" : "Nuevo archivo de texto.txt",
     "Folder" : "Carpeta",
     "New folder" : "Nueva carpeta",
     "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas",
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index 551a6ef4a00..c16b2c77e59 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
     "Shares" : "Sdílení",
+    "Accept" : "Přijmout",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID",
     "This share is password-protected" : "Toto sdílení je chráněno heslem",
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index 065ab460158..208cc0fa24b 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
     "Shares" : "Sdílení",
+    "Accept" : "Přijmout",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID",
     "This share is password-protected" : "Toto sdílení je chráněno heslem",
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index 0c0f009f6ec..2ab7513f139 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
+    "Accept" : "Acceptér",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Delingen er beskyttet af kodeord",
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index 0f517fbd64d..fe071e1d585 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
+    "Accept" : "Acceptér",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Delingen er beskyttet af kodeord",
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index afe6cae62eb..973aa0f15ac 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt",
     "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben",
     "Shares" : "Freigaben",
+    "Accept" : "Ok",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID",
     "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 17f2b6252b8..5526be3b6bf 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt",
     "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben",
     "Shares" : "Freigaben",
+    "Accept" : "Ok",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID",
     "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 395dbf4f295..47243b8f81d 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
     "You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt",
     "Shares" : "Geteiltes",
+    "Accept" : "Akzeptieren",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID",
     "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 11b953b3bac..b63286de48d 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
     "You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt",
     "Shares" : "Geteiltes",
+    "Accept" : "Akzeptieren",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID",
     "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 804b0984729..037ddcd9d1d 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
+    "Accept" : "Αποδοχή",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου",
     "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index 7cc38fc1085..9eb19b2ba83 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
+    "Accept" : "Αποδοχή",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου",
     "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js
index 40f80be5b61..424fe743088 100644
--- a/apps/files_sharing/l10n/en_GB.js
+++ b/apps/files_sharing/l10n/en_GB.js
@@ -40,6 +40,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s shared %1$s with you",
     "You shared %1$s via link" : "You shared %1$s via link",
     "Shares" : "Shares",
+    "Accept" : "Accept",
     "This share is password-protected" : "This share is password-protected",
     "The password is wrong. Try again." : "The password is wrong. Try again.",
     "Password" : "Password",
diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json
index 5a70bee7212..4e41be946d1 100644
--- a/apps/files_sharing/l10n/en_GB.json
+++ b/apps/files_sharing/l10n/en_GB.json
@@ -38,6 +38,7 @@
     "%2$s shared %1$s with you" : "%2$s shared %1$s with you",
     "You shared %1$s via link" : "You shared %1$s via link",
     "Shares" : "Shares",
+    "Accept" : "Accept",
     "This share is password-protected" : "This share is password-protected",
     "The password is wrong. Try again." : "The password is wrong. Try again.",
     "Password" : "Password",
diff --git a/apps/files_sharing/l10n/eo.js b/apps/files_sharing/l10n/eo.js
index 6c78d555304..ef900774146 100644
--- a/apps/files_sharing/l10n/eo.js
+++ b/apps/files_sharing/l10n/eo.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "You shared %1$s with group %2$s" : "Vi kunhavigis %1$s kun la grupo %2$s",
     "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi",
     "You shared %1$s via link" : "Vi kunhavigis %1$s per ligilo",
+    "Accept" : "Akcepti",
     "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto",
     "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.",
     "Password" : "Pasvorto",
diff --git a/apps/files_sharing/l10n/eo.json b/apps/files_sharing/l10n/eo.json
index 8899e3021ca..cc648a7c60d 100644
--- a/apps/files_sharing/l10n/eo.json
+++ b/apps/files_sharing/l10n/eo.json
@@ -21,6 +21,7 @@
     "You shared %1$s with group %2$s" : "Vi kunhavigis %1$s kun la grupo %2$s",
     "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi",
     "You shared %1$s via link" : "Vi kunhavigis %1$s per ligilo",
+    "Accept" : "Akcepti",
     "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto",
     "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.",
     "Password" : "Pasvorto",
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index c7d6b8253a1..ca1e8c430db 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
     "You shared %1$s via link" : "Ha compartido %1$s vía enlace",
     "Shares" : "Compartidos",
+    "Accept" : "Aceptar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud",
     "This share is password-protected" : "Este elemento compartido está protegido por contraseña",
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index f3666ee785f..4b300e1227f 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
     "You shared %1$s via link" : "Ha compartido %1$s vía enlace",
     "Shares" : "Compartidos",
+    "Accept" : "Aceptar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud",
     "This share is password-protected" : "Este elemento compartido está protegido por contraseña",
diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js
index bdd2bc13afd..ada0a548162 100644
--- a/apps/files_sharing/l10n/et_EE.js
+++ b/apps/files_sharing/l10n/et_EE.js
@@ -31,6 +31,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s jagas sinuga %1$s",
     "You shared %1$s via link" : "Jagasid %1$s lingiga",
     "Shares" : "Jagamised",
+    "Accept" : "Nõustu",
     "This share is password-protected" : "See jagamine on parooliga kaitstud",
     "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.",
     "Password" : "Parool",
diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json
index f6e13620cbd..afa7fc6884d 100644
--- a/apps/files_sharing/l10n/et_EE.json
+++ b/apps/files_sharing/l10n/et_EE.json
@@ -29,6 +29,7 @@
     "%2$s shared %1$s with you" : "%2$s jagas sinuga %1$s",
     "You shared %1$s via link" : "Jagasid %1$s lingiga",
     "Shares" : "Jagamised",
+    "Accept" : "Nõustu",
     "This share is password-protected" : "See jagamine on parooliga kaitstud",
     "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.",
     "Password" : "Parool",
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index af074056ba4..2a3f7937fdc 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
+    "Accept" : "Hyväksy",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta",
     "This share is password-protected" : "Tämä jako on suojattu salasanalla",
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index 96bb63115e4..d7809f57130 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
+    "Accept" : "Hyväksy",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta",
     "This share is password-protected" : "Tämä jako on suojattu salasanalla",
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 721f52d4a67..a59409e008a 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Shares" : "Partages",
+    "Accept" : "Accepter",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud",
     "This share is password-protected" : "Ce partage est protégé par un mot de passe",
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 3f0ee47a381..0bb6f2b1b9e 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Shares" : "Partages",
+    "Accept" : "Accepter",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud",
     "This share is password-protected" : "Ce partage est protégé par un mot de passe",
diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js
index 44dfaa52de2..f2a2d528ffc 100644
--- a/apps/files_sharing/l10n/gl.js
+++ b/apps/files_sharing/l10n/gl.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede",
     "You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón",
     "Shares" : "Comparticións",
+    "Accept" : "Aceptar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Comparte comigo a través do meu ID da nube federada do #ownCloud , vexa %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Comparte comigo a través do meu ID da nube federada do #ownCloud",
     "This share is password-protected" : "Esta compartición está protexida con contrasinal",
diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json
index a9109c5000c..b9998a47a12 100644
--- a/apps/files_sharing/l10n/gl.json
+++ b/apps/files_sharing/l10n/gl.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede",
     "You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón",
     "Shares" : "Comparticións",
+    "Accept" : "Aceptar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Comparte comigo a través do meu ID da nube federada do #ownCloud , vexa %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Comparte comigo a través do meu ID da nube federada do #ownCloud",
     "This share is password-protected" : "Esta compartición está protexida con contrasinal",
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index 738fe6eb6b9..c78bdce652d 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
     "Shares" : "Megosztások",
+    "Accept" : "Elfogadás",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ",
     "This share is password-protected" : "Ez egy jelszóval védett megosztás",
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index 6b60146ffff..22cc1422eb7 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
     "Shares" : "Megosztások",
+    "Accept" : "Elfogadás",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ",
     "This share is password-protected" : "Ez egy jelszóval védett megosztás",
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index 985b424e726..f30c0b53b47 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
     "Shares" : "Dibagikan",
+    "Accept" : "Terima",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya",
     "This share is password-protected" : "Berbagi ini dilindungi sandi",
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index 78f5d2352a7..3b6f65c1a09 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
     "Shares" : "Dibagikan",
+    "Accept" : "Terima",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya",
     "This share is password-protected" : "Berbagi ini dilindungi sandi",
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index ba37858a951..bf041f2b9b6 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
+    "Accept" : "Accetta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud",
     "This share is password-protected" : "Questa condivione è protetta da password",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index 6eae5c0e67b..34a10595f98 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
+    "Accept" : "Accetta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud",
     "This share is password-protected" : "Questa condivione è protetta da password",
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index 0fa2f3c8d0f..413f4a2ac8c 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s は %1$s をあなたと共有しました",
     "You shared %1$s via link" : "リンク経由で %1$s を共有しています",
     "Shares" : "共有",
+    "Accept" : "承諾",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud の「クラウド連携ID」で私と共有できます。こちらを見てください。%s",
     "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud の「クラウド連携ID」で私と共有できます。",
     "This share is password-protected" : "この共有はパスワードで保護されています",
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index 88b94fb5ed7..65d762871de 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s は %1$s をあなたと共有しました",
     "You shared %1$s via link" : "リンク経由で %1$s を共有しています",
     "Shares" : "共有",
+    "Accept" : "承諾",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud の「クラウド連携ID」で私と共有できます。こちらを見てください。%s",
     "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud の「クラウド連携ID」で私と共有できます。",
     "This share is password-protected" : "この共有はパスワードで保護されています",
diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js
index 646a57f7853..2ad6c0422b1 100644
--- a/apps/files_sharing/l10n/ko.js
+++ b/apps/files_sharing/l10n/ko.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
     "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
     "Shares" : "공유",
+    "Accept" : "수락",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨",
     "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다",
diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json
index 4d322770b1a..d31bf0060dd 100644
--- a/apps/files_sharing/l10n/ko.json
+++ b/apps/files_sharing/l10n/ko.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
     "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
     "Shares" : "공유",
+    "Accept" : "수락",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨",
     "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다",
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index 65b13acaf53..4df003d0e4d 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "You shared %1$s via link" : "Du delte %1$s via lenke",
     "Shares" : "Delinger",
+    "Accept" : "Aksepter",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky",
     "This share is password-protected" : "Denne delingen er passordbeskyttet",
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index 4fe4ee008be..079f1e854ac 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "You shared %1$s via link" : "Du delte %1$s via lenke",
     "Shares" : "Delinger",
+    "Accept" : "Aksepter",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky",
     "This share is password-protected" : "Denne delingen er passordbeskyttet",
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index c289e4ccac7..7468819fda7 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "You shared %1$s via link" : "U deelde %1$s via link",
     "Shares" : "Gedeeld",
+    "Accept" : "Accepteren",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID",
     "This share is password-protected" : "Deze share is met een wachtwoord beveiligd",
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index 2e47542b679..57df2d5c155 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "You shared %1$s via link" : "U deelde %1$s via link",
     "Shares" : "Gedeeld",
+    "Accept" : "Accepteren",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID",
     "This share is password-protected" : "Deze share is met een wachtwoord beveiligd",
diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js
index a0efb5ff607..62b128844df 100644
--- a/apps/files_sharing/l10n/pl.js
+++ b/apps/files_sharing/l10n/pl.js
@@ -30,6 +30,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
     "You shared %1$s via link" : "Udostępniasz %1$s przez link",
     "Shares" : "Udziały",
+    "Accept" : "Akceptuj",
     "This share is password-protected" : "Udział ten jest chroniony hasłem",
     "The password is wrong. Try again." : "To hasło jest niewłaściwe. Spróbuj ponownie.",
     "Password" : "Hasło",
diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json
index 6ffad562b7f..76052b1dfb7 100644
--- a/apps/files_sharing/l10n/pl.json
+++ b/apps/files_sharing/l10n/pl.json
@@ -28,6 +28,7 @@
     "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
     "You shared %1$s via link" : "Udostępniasz %1$s przez link",
     "Shares" : "Udziały",
+    "Accept" : "Akceptuj",
     "This share is password-protected" : "Udział ten jest chroniony hasłem",
     "The password is wrong. Try again." : "To hasło jest niewłaściwe. Spróbuj ponownie.",
     "Password" : "Hasło",
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index ccf3fd98300..064e611e11e 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
+    "Accept" : "Aceitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID",
     "This share is password-protected" : "Este compartilhamento esta protegido por senha",
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 90c6deeb347..c1b4c255912 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
+    "Accept" : "Aceitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID",
     "This share is password-protected" : "Este compartilhamento esta protegido por senha",
diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index fb16ea5fbab..dc501ebe048 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo",
     "You shared %1$s via link" : "Partilhou %1$s através de uma hiperligação",
     "Shares" : "Partilhas",
+    "Accept" : "Aceitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud",
     "This share is password-protected" : "Esta partilha está protegida por senha",
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index 6d5c21a5487..9c5bc14e610 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo",
     "You shared %1$s via link" : "Partilhou %1$s através de uma hiperligação",
     "Shares" : "Partilhas",
+    "Accept" : "Aceitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud",
     "This share is password-protected" : "Esta partilha está protegida por senha",
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index 66ef69cac61..2d89b5e3102 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
     "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки",
     "Shares" : "События обмена файлами",
+    "Accept" : "Принять",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ",
     "This share is password-protected" : "Общий ресурс защищен паролем",
diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json
index e4fccaf0800..0f7a152f536 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
     "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки",
     "Shares" : "События обмена файлами",
+    "Accept" : "Принять",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ",
     "This share is password-protected" : "Общий ресурс защищен паролем",
diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js
index e4ff1b4e1c5..677b4f24e21 100644
--- a/apps/files_sharing/l10n/sk_SK.js
+++ b/apps/files_sharing/l10n/sk_SK.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s",
     "You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu",
     "Shares" : "Zdieľanie",
+    "Accept" : "Schváliť",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Toto zdieľanie je chránené heslom",
diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json
index ce516ae314c..f4f6cc3798b 100644
--- a/apps/files_sharing/l10n/sk_SK.json
+++ b/apps/files_sharing/l10n/sk_SK.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s",
     "You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu",
     "Shares" : "Zdieľanie",
+    "Accept" : "Schváliť",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Toto zdieľanie je chránené heslom",
diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js
index d613f169081..3b6622aedf2 100644
--- a/apps/files_sharing/l10n/sl.js
+++ b/apps/files_sharing/l10n/sl.js
@@ -39,6 +39,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s",
     "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave",
     "Shares" : "Souporaba",
+    "Accept" : "Sprejmi",
     "This share is password-protected" : "To mesto je zaščiteno z geslom.",
     "The password is wrong. Try again." : "Geslo je napačno. Poskusite znova.",
     "Password" : "Geslo",
diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json
index fb00547388b..2d443de13d9 100644
--- a/apps/files_sharing/l10n/sl.json
+++ b/apps/files_sharing/l10n/sl.json
@@ -37,6 +37,7 @@
     "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s",
     "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave",
     "Shares" : "Souporaba",
+    "Accept" : "Sprejmi",
     "This share is password-protected" : "To mesto je zaščiteno z geslom.",
     "The password is wrong. Try again." : "Geslo je napačno. Poskusite znova.",
     "Password" : "Geslo",
diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js
index 5676cc5a00c..ddb15bd2183 100644
--- a/apps/files_sharing/l10n/sr.js
+++ b/apps/files_sharing/l10n/sr.js
@@ -40,6 +40,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s подели %1$s са вама",
     "You shared %1$s via link" : "Поделили сте %1$s путем везе",
     "Shares" : "Дељења",
+    "Accept" : "Прихвати",
     "This share is password-protected" : "Дељење је заштићено лозинком",
     "The password is wrong. Try again." : "Лозинка је погрешна. Покушајте поново.",
     "Password" : "Лозинка",
diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json
index fca522a1039..dc44b1fbb60 100644
--- a/apps/files_sharing/l10n/sr.json
+++ b/apps/files_sharing/l10n/sr.json
@@ -38,6 +38,7 @@
     "%2$s shared %1$s with you" : "%2$s подели %1$s са вама",
     "You shared %1$s via link" : "Поделили сте %1$s путем везе",
     "Shares" : "Дељења",
+    "Accept" : "Прихвати",
     "This share is password-protected" : "Дељење је заштићено лозинком",
     "The password is wrong. Try again." : "Лозинка је погрешна. Покушајте поново.",
     "Password" : "Лозинка",
diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js
index 77b1171d9b2..9b1d9ccb591 100644
--- a/apps/files_sharing/l10n/sv.js
+++ b/apps/files_sharing/l10n/sv.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
     "You shared %1$s via link" : "Du delade %1$s via länk",
     "Shares" : "Delningar",
+    "Accept" : "Acceptera",
     "This share is password-protected" : "Den här delningen är lösenordsskyddad",
     "The password is wrong. Try again." : "Lösenordet är fel. Försök igen.",
     "Password" : "Lösenord",
diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json
index a8bb9afd01f..0d13069dfba 100644
--- a/apps/files_sharing/l10n/sv.json
+++ b/apps/files_sharing/l10n/sv.json
@@ -34,6 +34,7 @@
     "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
     "You shared %1$s via link" : "Du delade %1$s via länk",
     "Shares" : "Delningar",
+    "Accept" : "Acceptera",
     "This share is password-protected" : "Den här delningen är lösenordsskyddad",
     "The password is wrong. Try again." : "Lösenordet är fel. Försök igen.",
     "Password" : "Lösenord",
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
index 242b3a8a68b..ea3c8ac7296 100644
--- a/apps/files_sharing/l10n/th_TH.js
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
+    "Accept" : "ยอมรับ",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ",
     "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน",
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
index 4658d45fbbe..196c088abd7 100644
--- a/apps/files_sharing/l10n/th_TH.json
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
+    "Accept" : "ยอมรับ",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ",
     "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน",
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index 9e14e0187cd..bb00dd4295a 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı",
     "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız",
     "Shares" : "Paylaşımlar",
+    "Accept" : "Kabul et",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı",
     "This share is password-protected" : "Bu paylaşım parola korumalı",
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index b11d5be2fd7..1371bf37447 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı",
     "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız",
     "Shares" : "Paylaşımlar",
+    "Accept" : "Kabul et",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı",
     "This share is password-protected" : "Bu paylaşım parola korumalı",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index 352a0ce78a9..2dc995b2a98 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Klarte ikke å sende mail til følgende brukere: %s",
+    "Preparing update" : "Forbereder oppdatering",
     "Turned on maintenance mode" : "Slo på vedlikeholdsmodus",
     "Turned off maintenance mode" : "Slo av vedlikeholdsmodus",
     "Maintenance mode is kept active" : "Vedlikeholdsmodus blir beholdt aktiv",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "Feil ved reparering: ",
     "Following incompatible apps have been disabled: %s" : "Følgende inkompatible apper har blitt deaktivert: %s",
     "Following apps have been disabled: %s" : "Følgende apper har blitt deaktivert: %s",
+    "Already up to date" : "Allerede oppdatert",
+    "File is too big" : "Filen er for stor",
     "Invalid file provided" : "Ugyldig fil oppgitt",
     "No image or file provided" : "Bilde eller fil ikke angitt",
     "Unknown filetype" : "Ukjent filtype",
@@ -35,6 +38,13 @@ OC.L10N.register(
     "Thu." : "To.",
     "Fri." : "Fr.",
     "Sat." : "Lø.",
+    "Su" : "Sø",
+    "Mo" : "Ma",
+    "Tu" : "Ti",
+    "We" : "On",
+    "Th" : "To",
+    "Fr" : "Fr",
+    "Sa" : "Lø",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mars",
@@ -94,6 +104,8 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Intet minne-cache er konfigurert. For å forbedre ytelsen, installer et minne-cache hvis tilgjengelig. Mer informasjon finnes i <a href=\"{docLink}\">dokumentasjonen</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom kan ikke leses av PHP, noe som er sterkt frarådet av sikkerhetshensyn. Mer informasjon finnes i <a href=\"{docLink}\">dokumentasjonen</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Din PHP-versjon ({version}) er ikke <a href=\"{phpLink}\">støttet av PHP</a> lenger. Vi oppfordrer deg til å oppgradere din PHP-versjon for å nyte fordel av ytelses- og sikkerhetsoppdateringer som tilbys av PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Konfigurasjon av reverse proxy-headers er ikke korrekt, eller du aksesserer ownCloud fra en \"trusted proxy\". Hvis du ikke aksesserer ownCloud fra en \"trusted proxy\", er dette en sikkerhetsrisiko som kan la en angriper forfalske IP-addressen sin slik den oppfattes av ownCloud. Mer informasjon i <a href=\"{docLink}\">dokumentasjonen</a>.",
     "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" er ikke konfigurert til minst \"{seconds}\" sekunder. For beste sikkerhet anbefaler vi at HSTS aktiveres som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.",
@@ -162,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Oppdateringen var vellykket. Det oppstod advarsler.",
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
     "Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi token er ugyldig.",
+    "Couldn't reset password because the token is expired" : "Klarte ikke å tilbakestille passordet fordi token er utløpt.",
     "Couldn't send reset email. Please make sure your username is correct." : "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
     "%s password reset" : "%s tilbakestilling av passord",
@@ -235,6 +248,8 @@ OC.L10N.register(
     "Please contact your administrator." : "Vennligst kontakt administratoren din.",
     "An internal error occured." : "Det oppstod en intern feil.",
     "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.",
+    "Log in" : "Logg inn",
+    "Wrong password. Reset it?" : "Feil passord. Nullstille det?",
     "remember" : "husk",
     "Alternative Logins" : "Alternative innlogginger",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>Dette er en beskjed om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis den!</a><br><br>",
@@ -246,6 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.",
     "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et tiltrodd domene",
+    "App update required" : "App-oppdatering kreves",
+    "%s will be updated to version %s" : "%s vil bli oppdatert til versjon %s",
+    "These apps will be updated:" : "Disse appene vil bli oppdatert:",
+    "These incompatible apps will be disabled:" : "Disse ikke-kompatible appene vil bli deaktivert:",
     "The theme %s has been disabled." : "Temaet %s har blitt deaktivert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Forsikre deg om at databasen, config-mappen og datamappen er blitt sikkerhetskopiert før du fortsetter.",
     "Start update" : "Start oppdatering",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index 22afa2b9c92..528913e424a 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Klarte ikke å sende mail til følgende brukere: %s",
+    "Preparing update" : "Forbereder oppdatering",
     "Turned on maintenance mode" : "Slo på vedlikeholdsmodus",
     "Turned off maintenance mode" : "Slo av vedlikeholdsmodus",
     "Maintenance mode is kept active" : "Vedlikeholdsmodus blir beholdt aktiv",
@@ -11,6 +12,8 @@
     "Repair error: " : "Feil ved reparering: ",
     "Following incompatible apps have been disabled: %s" : "Følgende inkompatible apper har blitt deaktivert: %s",
     "Following apps have been disabled: %s" : "Følgende apper har blitt deaktivert: %s",
+    "Already up to date" : "Allerede oppdatert",
+    "File is too big" : "Filen er for stor",
     "Invalid file provided" : "Ugyldig fil oppgitt",
     "No image or file provided" : "Bilde eller fil ikke angitt",
     "Unknown filetype" : "Ukjent filtype",
@@ -33,6 +36,13 @@
     "Thu." : "To.",
     "Fri." : "Fr.",
     "Sat." : "Lø.",
+    "Su" : "Sø",
+    "Mo" : "Ma",
+    "Tu" : "Ti",
+    "We" : "On",
+    "Th" : "To",
+    "Fr" : "Fr",
+    "Sa" : "Lø",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mars",
@@ -92,6 +102,8 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Intet minne-cache er konfigurert. For å forbedre ytelsen, installer et minne-cache hvis tilgjengelig. Mer informasjon finnes i <a href=\"{docLink}\">dokumentasjonen</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom kan ikke leses av PHP, noe som er sterkt frarådet av sikkerhetshensyn. Mer informasjon finnes i <a href=\"{docLink}\">dokumentasjonen</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Din PHP-versjon ({version}) er ikke <a href=\"{phpLink}\">støttet av PHP</a> lenger. Vi oppfordrer deg til å oppgradere din PHP-versjon for å nyte fordel av ytelses- og sikkerhetsoppdateringer som tilbys av PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Konfigurasjon av reverse proxy-headers er ikke korrekt, eller du aksesserer ownCloud fra en \"trusted proxy\". Hvis du ikke aksesserer ownCloud fra en \"trusted proxy\", er dette en sikkerhetsrisiko som kan la en angriper forfalske IP-addressen sin slik den oppfattes av ownCloud. Mer informasjon i <a href=\"{docLink}\">dokumentasjonen</a>.",
     "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" er ikke konfigurert til minst \"{seconds}\" sekunder. For beste sikkerhet anbefaler vi at HSTS aktiveres som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.",
@@ -160,6 +172,7 @@
     "The update was successful. There were warnings." : "Oppdateringen var vellykket. Det oppstod advarsler.",
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
     "Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi token er ugyldig.",
+    "Couldn't reset password because the token is expired" : "Klarte ikke å tilbakestille passordet fordi token er utløpt.",
     "Couldn't send reset email. Please make sure your username is correct." : "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
     "%s password reset" : "%s tilbakestilling av passord",
@@ -233,6 +246,8 @@
     "Please contact your administrator." : "Vennligst kontakt administratoren din.",
     "An internal error occured." : "Det oppstod en intern feil.",
     "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.",
+    "Log in" : "Logg inn",
+    "Wrong password. Reset it?" : "Feil passord. Nullstille det?",
     "remember" : "husk",
     "Alternative Logins" : "Alternative innlogginger",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>Dette er en beskjed om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis den!</a><br><br>",
@@ -244,6 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.",
     "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et tiltrodd domene",
+    "App update required" : "App-oppdatering kreves",
+    "%s will be updated to version %s" : "%s vil bli oppdatert til versjon %s",
+    "These apps will be updated:" : "Disse appene vil bli oppdatert:",
+    "These incompatible apps will be disabled:" : "Disse ikke-kompatible appene vil bli deaktivert:",
     "The theme %s has been disabled." : "Temaet %s har blitt deaktivert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Forsikre deg om at databasen, config-mappen og datamappen er blitt sikkerhetskopiert før du fortsetter.",
     "Start update" : "Start oppdatering",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index f744091d294..627eae28e74 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "settings",
     {
     "APCu" : "APCu",
+    "Redis" : "Redis",
     "Security & setup warnings" : "Avisos de configuração e segurança",
     "Sharing" : "Partilha",
     "External Storage" : "Armazenamento Externo",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index fa8c0a7d21f..f845e56a976 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -1,5 +1,6 @@
 { "translations": {
     "APCu" : "APCu",
+    "Redis" : "Redis",
     "Security & setup warnings" : "Avisos de configuração e segurança",
     "Sharing" : "Partilha",
     "External Storage" : "Armazenamento Externo",
-- 
GitLab


From 732987b99fd4ef113fd8ec1bbe7e98bc9264028e Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Fri, 11 Sep 2015 09:44:00 +0100
Subject: [PATCH 228/783] Make doc links inline

---
 settings/templates/admin.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 2a617387a83..91e76d24fbb 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -128,10 +128,7 @@ if (!$_['has_fileinfo']) {
 if ($_['fileLockingType'] === 'none') {
 	?>
 	<li>
-		<?php p($l->t('Transactional file locking is disabled, this might lead to issues with race conditions, enable \'filelocking.enabled\' in config.php to improve handling of race conditions.')); ?>
-		<a target="_blank" class="icon-info svg"
-		   title="<?php p($l->t('Open documentation')); ?>"
-		   href="<?php p(link_to_docs('admin-transactional-locking')); ?>"></a>
+		<?php print_unescaped($l->t('Transactional file locking is disabled, this might lead to issues with race conditions. Enable \'filelocking.enabled\' in config.php to avoid these problems. See the <a target="_blank" href="%s">documentation ↗</a> for more information.', link_to_docs('admin-transactional-locking'))); ?>
 	</li>
 	<?php
 }
@@ -187,10 +184,7 @@ if ($_['cronErrors']) {
 	<ul class="info hidden">
 		<?php if ($_['fileLockingType'] === 'db'):?>
 		<li>
-			<?php p($l->t('Transactional file locking is using the database as locking backend, for best performance it\'s advised to configure a memcache for locking. Check the admin documentation for more information about locking and memcaches')); ?>
-			<a target="_blank" class="icon-info svg"
-			   title="<?php p($l->t('Open documentation')); ?>"
-			   href="<?php p(link_to_docs('admin-transactional-locking')); ?>"></a>
+			<?php print_unescaped($l->t('Transactional file locking is using the database as locking backend, for best performance it\'s advised to configure a memcache for locking. See the <a target="_blank" href="%s">documentation ↗</a> for more information.', link_to_docs('admin-transactional-locking'))); ?>
 		</li>
 		<?php endif; ?>
 	</ul>
-- 
GitLab


From 188d0e09b857e607b57b7686e95bbf0502359c2b Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Fri, 11 Sep 2015 12:44:53 +0100
Subject: [PATCH 229/783] Add reset method to mimetype loader

Used to solve concurrency issues
---
 lib/private/files/cache/scanner.php  |  2 +-
 lib/private/files/type/loader.php    |  8 ++++++++
 lib/public/files/imimetypeloader.php |  7 +++++++
 tests/lib/repair/repairmimetypes.php | 15 +++------------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index f76ef5ba0dd..fb60ee5aa53 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -377,7 +377,7 @@ class Scanner extends BasicEmitter {
 			// inserted mimetypes but those weren't available yet inside the transaction
 			// To make sure to have the updated mime types in such cases,
 			// we reload them here
-			$this->cache->loadMimetypes();
+			\OC::$server->getMimeTypeLoader()->reset();
 		}
 
 		foreach ($childQueue as $child => $childData) {
diff --git a/lib/private/files/type/loader.php b/lib/private/files/type/loader.php
index df893306615..78bfcf60bff 100644
--- a/lib/private/files/type/loader.php
+++ b/lib/private/files/type/loader.php
@@ -96,6 +96,14 @@ class Loader implements IMimeTypeLoader {
 		return isset($this->mimetypeIds[$mimetype]);
 	}
 
+	/**
+	 * Clear all loaded mimetypes, allow for re-loading
+	 */
+	public function reset() {
+		$this->mimetypes = [];
+		$this->mimetypeIds = [];
+	}
+
 	/**
 	 * Store a mimetype in the DB
 	 *
diff --git a/lib/public/files/imimetypeloader.php b/lib/public/files/imimetypeloader.php
index 24937ea9b86..6d00c4a0b31 100644
--- a/lib/public/files/imimetypeloader.php
+++ b/lib/public/files/imimetypeloader.php
@@ -56,4 +56,11 @@ interface IMimeTypeLoader {
 	 * @since 8.2.0
 	 */
 	public function exists($mimetype);
+
+	/**
+	 * Clear all loaded mimetypes, allow for re-loading
+	 *
+	 * @since 8.2.0
+	 */
+	public function reset();
 }
diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php
index 76d4d7cc656..da36e7de58a 100644
--- a/tests/lib/repair/repairmimetypes.php
+++ b/tests/lib/repair/repairmimetypes.php
@@ -24,13 +24,7 @@ class RepairMimeTypes extends \Test\TestCase {
 		parent::setUp();
 
 		$this->savedMimetypeLoader = \OC::$server->getMimeTypeLoader();
-		$this->mimetypeLoader = $this->getMockBuilder('\OC\Files\Type\Loader')
-			->setConstructorArgs([\OC::$server->getDatabaseConnection()])
-			->setMethods(null)
-			->getMock();
-		\OC::$server->registerService('MimeTypeLoader', function ($c) {
-			return $this->mimetypeLoader;
-		});
+		$this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
 
 		$this->storage = new \OC\Files\Storage\Temporary([]);
 		$this->repair = new \OC\Repair\RepairMimeTypes();
@@ -42,16 +36,13 @@ class RepairMimeTypes extends \Test\TestCase {
 		\OC_DB::executeAudited($sql, [$this->storage->getId()]);
 		$this->clearMimeTypes();
 
-		\OC::$server->registerService('MimeTypeLoader', function($c) {
-			return $this->savedMimetypeLoader;
-		});
-
 		parent::tearDown();
 	}
 
 	private function clearMimeTypes() {
 		$sql = 'DELETE FROM `*PREFIX*mimetypes`';
 		\OC_DB::executeAudited($sql);
+		$this->mimetypeLoader->reset();
 	}
 
 	private function addEntries($entries) {
@@ -97,7 +88,7 @@ class RepairMimeTypes extends \Test\TestCase {
 		$this->repair->run();
 
 		// force mimetype reload
-		self::invokePrivate($this->mimetypeLoader, 'loadMimetypes');
+		$this->mimetypeLoader->reset();
 
 		$this->checkEntries($fixedMimeTypes);
 	}
-- 
GitLab


From 4660fefd016499953b2e3ac93891a3c57041ed80 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Fri, 11 Sep 2015 18:15:36 +0200
Subject: [PATCH 230/783] enforce loading icon in sidebar to be 32x32

---
 apps/files/js/mainfileinfodetailview.js | 6 +++---
 core/css/icons.css                      | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 785eed8d712..efdbb5e2ad1 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -124,7 +124,7 @@
 
 				// TODO: we really need OC.Previews
 				var $iconDiv = this.$el.find('.thumbnail');
-				$iconDiv.addClass('icon-loading');
+				$iconDiv.addClass('icon-loading icon-32');
 				$container = this.$el.find('.thumbnailContainer');
 				if (!this.model.isDirectory()) {
 					this._fileList.lazyLoadPreview({
@@ -137,7 +137,7 @@
 						callback: function(previewUrl, img) {
 							$iconDiv.previewImg = previewUrl;
 							if (img) {
-								$iconDiv.removeClass('icon-loading');
+								$iconDiv.removeClass('icon-loading icon-32');
 								if(img.height > img.width) {
 									$container.addClass('portrait');
 								}
@@ -163,7 +163,7 @@
 							}
 						}.bind(this),
 						error: function() {
-							$iconDiv.removeClass('icon-loading');
+							$iconDiv.removeClass('icon-loading icon-32');
 							this.$el.find('.thumbnailContainer').removeClass('image'); //fall back to regular view
 							$iconDiv.css({
 								'background-image': 'url("' + $iconDiv.previewImg + '")'
diff --git a/core/css/icons.css b/core/css/icons.css
index 88b14449e46..a3819ba9d44 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -23,6 +23,10 @@
 .icon-loading-small {
 	background-image: url('../img/loading-small.gif');
 }
+.icon-32 {
+	-webkit-background-size: 32px !important;
+	background-size: 32px !important;
+}
 
 
 
-- 
GitLab


From 9860a79441b8e3595450e53b6209f314c7537775 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 12 Sep 2015 01:55:35 -0400
Subject: [PATCH 231/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/ko.js         |  3 +++
 apps/encryption/l10n/ko.json       |  3 +++
 apps/files/l10n/id.js              |  2 ++
 apps/files/l10n/id.json            |  2 ++
 apps/files/l10n/ko.js              |  5 +++++
 apps/files/l10n/ko.json            |  5 +++++
 apps/files_external/l10n/ko.js     | 23 +++++++++++++++++++++++
 apps/files_external/l10n/ko.json   | 23 +++++++++++++++++++++++
 apps/files_sharing/l10n/el.js      |  1 +
 apps/files_sharing/l10n/el.json    |  1 +
 apps/files_sharing/l10n/fi_FI.js   |  2 ++
 apps/files_sharing/l10n/fi_FI.json |  2 ++
 apps/files_sharing/l10n/id.js      |  3 +++
 apps/files_sharing/l10n/id.json    |  3 +++
 apps/files_sharing/l10n/ko.js      |  3 +++
 apps/files_sharing/l10n/ko.json    |  3 +++
 apps/files_sharing/l10n/th_TH.js   |  2 ++
 apps/files_sharing/l10n/th_TH.json |  2 ++
 core/l10n/et_EE.js                 | 16 ++++++++++++++++
 core/l10n/et_EE.json               | 16 ++++++++++++++++
 core/l10n/ko.js                    | 19 +++++++++++++++++++
 core/l10n/ko.json                  | 19 +++++++++++++++++++
 lib/l10n/id.js                     |  1 +
 lib/l10n/id.json                   |  1 +
 lib/l10n/ko.js                     |  2 ++
 lib/l10n/ko.json                   |  2 ++
 settings/l10n/ca.js                |  1 -
 settings/l10n/ca.json              |  1 -
 settings/l10n/cs_CZ.js             |  3 ---
 settings/l10n/cs_CZ.json           |  3 ---
 settings/l10n/da.js                |  3 ---
 settings/l10n/da.json              |  3 ---
 settings/l10n/de.js                |  3 ---
 settings/l10n/de.json              |  3 ---
 settings/l10n/de_DE.js             |  2 --
 settings/l10n/de_DE.json           |  2 --
 settings/l10n/el.js                |  3 ---
 settings/l10n/el.json              |  3 ---
 settings/l10n/es.js                |  3 ---
 settings/l10n/es.json              |  3 ---
 settings/l10n/et_EE.js             |  1 -
 settings/l10n/et_EE.json           |  1 -
 settings/l10n/fi_FI.js             |  3 ---
 settings/l10n/fi_FI.json           |  3 ---
 settings/l10n/fr.js                |  3 ---
 settings/l10n/fr.json              |  3 ---
 settings/l10n/gl.js                |  3 ---
 settings/l10n/gl.json              |  3 ---
 settings/l10n/hu_HU.js             |  3 ---
 settings/l10n/hu_HU.json           |  3 ---
 settings/l10n/id.js                |  3 ---
 settings/l10n/id.json              |  3 ---
 settings/l10n/it.js                |  3 ---
 settings/l10n/it.json              |  3 ---
 settings/l10n/ja.js                |  3 ---
 settings/l10n/ja.json              |  3 ---
 settings/l10n/ko.js                | 11 ++++++++---
 settings/l10n/ko.json              | 11 ++++++++---
 settings/l10n/nb_NO.js             |  2 --
 settings/l10n/nb_NO.json           |  2 --
 settings/l10n/nl.js                |  3 ---
 settings/l10n/nl.json              |  3 ---
 settings/l10n/pt_BR.js             |  3 ---
 settings/l10n/pt_BR.json           |  3 ---
 settings/l10n/pt_PT.js             |  1 -
 settings/l10n/pt_PT.json           |  1 -
 settings/l10n/ru.js                |  3 ---
 settings/l10n/ru.json              |  3 ---
 settings/l10n/sk_SK.js             |  2 --
 settings/l10n/sk_SK.json           |  2 --
 settings/l10n/sr.js                |  2 --
 settings/l10n/sr.json              |  2 --
 settings/l10n/th_TH.js             |  3 ---
 settings/l10n/th_TH.json           |  3 ---
 settings/l10n/tr.js                |  3 ---
 settings/l10n/tr.json              |  3 ---
 settings/l10n/zh_CN.js             |  3 ---
 settings/l10n/zh_CN.json           |  3 ---
 settings/l10n/zh_TW.js             |  1 -
 settings/l10n/zh_TW.json           |  1 -
 80 files changed, 180 insertions(+), 138 deletions(-)

diff --git a/apps/encryption/l10n/ko.js b/apps/encryption/l10n/ko.js
index d99e639da44..8bf099b6b36 100644
--- a/apps/encryption/l10n/ko.js
+++ b/apps/encryption/l10n/ko.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
     "Encryption App is enabled and ready" : "암호화 앱이 활성화되었고 준비됨",
+    "one-time password for server-side-encryption" : "서버 측 암호화용 일회용 암호",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 읽을 수 없습니다. 공유된 파일이라면 파일 소유자에게 연락하여 다시 공유해 달라고 요청하십시오.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "안녕하세요,\n\n시스템 관리자가 서버 측 암호화를 활성화하였습니다. 저장된 파일이 암호 '%s'으(로) 암호화되었습니다.\n\n웹 인터페이스에 로그인하여 개인 설정의 'ownCloud 기본 암호화 모듈'로 이동한 다음, '이전 로그인 암호' 필드에 위 암호를 입력하고 현재 로그인 암호로 변경하여 암호화 암호를 업데이트하십시오.\n\n",
     "The share will expire on %s." : "이 공유는 %s 까지 유지됩니다.",
     "Cheers!" : "감사합니다!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "안녕하세요,<br><br>시스템 관리자가 서버 측 암호화를 활성화하였습니다. 저장된 파일이 암호 <strong>%s</strong>으(로) 암호화되었습니다.<br><br>웹 인터페이스에 로그인하여 개인 설정의 'ownCloud 기본 암호화 모듈'로 이동한 다음, '이전 로그인 암호' 필드에 위 암호를 입력하고 현재 로그인 암호로 변경하여 암호화 암호를 업데이트하십시오.<br><br>",
     "Enable recovery key" : "복구 키 활성화",
     "Disable recovery key" : "복구 키 비활성화",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "복구 키는 파일을 암호화하는 추가 키입니다. 사용자가 암호를 잊었을 때 복구할 수 있도록 해 줍니다.",
diff --git a/apps/encryption/l10n/ko.json b/apps/encryption/l10n/ko.json
index e495de4c0e1..a6843bdda45 100644
--- a/apps/encryption/l10n/ko.json
+++ b/apps/encryption/l10n/ko.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
     "Encryption App is enabled and ready" : "암호화 앱이 활성화되었고 준비됨",
+    "one-time password for server-side-encryption" : "서버 측 암호화용 일회용 암호",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 읽을 수 없습니다. 공유된 파일이라면 파일 소유자에게 연락하여 다시 공유해 달라고 요청하십시오.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "안녕하세요,\n\n시스템 관리자가 서버 측 암호화를 활성화하였습니다. 저장된 파일이 암호 '%s'으(로) 암호화되었습니다.\n\n웹 인터페이스에 로그인하여 개인 설정의 'ownCloud 기본 암호화 모듈'로 이동한 다음, '이전 로그인 암호' 필드에 위 암호를 입력하고 현재 로그인 암호로 변경하여 암호화 암호를 업데이트하십시오.\n\n",
     "The share will expire on %s." : "이 공유는 %s 까지 유지됩니다.",
     "Cheers!" : "감사합니다!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "안녕하세요,<br><br>시스템 관리자가 서버 측 암호화를 활성화하였습니다. 저장된 파일이 암호 <strong>%s</strong>으(로) 암호화되었습니다.<br><br>웹 인터페이스에 로그인하여 개인 설정의 'ownCloud 기본 암호화 모듈'로 이동한 다음, '이전 로그인 암호' 필드에 위 암호를 입력하고 현재 로그인 암호로 변경하여 암호화 암호를 업데이트하십시오.<br><br>",
     "Enable recovery key" : "복구 키 활성화",
     "Disable recovery key" : "복구 키 비활성화",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "복구 키는 파일을 암호화하는 추가 키입니다. 사용자가 암호를 잊었을 때 복구할 수 있도록 해 줍니다.",
diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js
index af35544da8a..e41d94643a9 100644
--- a/apps/files/l10n/id.js
+++ b/apps/files/l10n/id.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte"],
     "Favorited" : "Difavoritkan",
     "Favorite" : "Favorit",
+    "{newname} already exists" : "{newname} sudah ada",
     "Upload" : "Unggah",
     "Text file" : "Berkas teks",
+    "New text file.txt" : "Teks baru file.txt",
     "Folder" : "Folder",
     "New folder" : "Map baru",
     "An error occurred while trying to update the tags" : "Terjadi kesalahan saat mencoba untuk memperbarui label",
diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json
index 2c0f8274542..6be0c1a226c 100644
--- a/apps/files/l10n/id.json
+++ b/apps/files/l10n/id.json
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte"],
     "Favorited" : "Difavoritkan",
     "Favorite" : "Favorit",
+    "{newname} already exists" : "{newname} sudah ada",
     "Upload" : "Unggah",
     "Text file" : "Berkas teks",
+    "New text file.txt" : "Teks baru file.txt",
     "Folder" : "Folder",
     "New folder" : "Map baru",
     "An error occurred while trying to update the tags" : "Terjadi kesalahan saat mencoba untuk memperbarui label",
diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js
index 50126226933..709e0faa0cb 100644
--- a/apps/files/l10n/ko.js
+++ b/apps/files/l10n/ko.js
@@ -68,10 +68,14 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner}의 저장 공간이 거의 가득 찼습니다({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "저장 공간이 거의 가득 찼습니다({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}'와(과) 일치"],
+    "Path" : "경로",
+    "_%n byte_::_%n bytes_" : ["%n바이트"],
     "Favorited" : "책갈피에 추가됨",
     "Favorite" : "즐겨찾기",
+    "{newname} already exists" : "{newname} 항목이 이미 존재함",
     "Upload" : "업로드",
     "Text file" : "텍스트 파일",
+    "New text file.txt" : "새 텍스트 파일.txt",
     "Folder" : "폴더",
     "New folder" : "새 폴더",
     "An error occurred while trying to update the tags" : "태그를 업데이트하는 중 오류 발생",
@@ -95,6 +99,7 @@ OC.L10N.register(
     "File handling" : "파일 처리",
     "Maximum upload size" : "최대 업로드 크기",
     "max. possible: " : "최대 가능:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM을 사용하고 있으면 설정 변화가 적용될 때까지 5분 정도 걸릴 수 있습니다.",
     "Save" : "저장",
     "Can not be edited from here due to insufficient permissions." : "권한이 부족하므로 여기에서 편집할 수 없습니다.",
     "Settings" : "설정",
diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json
index 95601323bd1..e8f89a5c142 100644
--- a/apps/files/l10n/ko.json
+++ b/apps/files/l10n/ko.json
@@ -66,10 +66,14 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner}의 저장 공간이 거의 가득 찼습니다({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "저장 공간이 거의 가득 찼습니다({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}'와(과) 일치"],
+    "Path" : "경로",
+    "_%n byte_::_%n bytes_" : ["%n바이트"],
     "Favorited" : "책갈피에 추가됨",
     "Favorite" : "즐겨찾기",
+    "{newname} already exists" : "{newname} 항목이 이미 존재함",
     "Upload" : "업로드",
     "Text file" : "텍스트 파일",
+    "New text file.txt" : "새 텍스트 파일.txt",
     "Folder" : "폴더",
     "New folder" : "새 폴더",
     "An error occurred while trying to update the tags" : "태그를 업데이트하는 중 오류 발생",
@@ -93,6 +97,7 @@
     "File handling" : "파일 처리",
     "Maximum upload size" : "최대 업로드 크기",
     "max. possible: " : "최대 가능:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM을 사용하고 있으면 설정 변화가 적용될 때까지 5분 정도 걸릴 수 있습니다.",
     "Save" : "저장",
     "Can not be edited from here due to insufficient permissions." : "권한이 부족하므로 여기에서 편집할 수 없습니다.",
     "Settings" : "설정",
diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js
index 3b4ef4fd5ab..48ba2f23a59 100644
--- a/apps/files_external/l10n/ko.js
+++ b/apps/files_external/l10n/ko.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Please provide a valid app key and secret." : "올바른 앱 키와 비밀 값을 입력하십시오.",
     "Step 1 failed. Exception: %s" : "1단계 실패. 예외: %s",
     "Step 2 failed. Exception: %s" : "2단계 실패. 예외: %s",
     "External storage" : "외부 저장소",
@@ -22,12 +25,19 @@ OC.L10N.register(
     "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
     "Public key" : "공개 키",
     "Storage with id \"%i\" not found" : "ID가 \"%i\"인 저장소를 찾을 수 없음",
+    "Invalid backend or authentication mechanism class" : "백엔드나 인증 방식 클래스가 잘못됨",
     "Invalid mount point" : "잘못된 마운트 지점",
+    "Objectstore forbidden" : "Objectstore에 접근 금지됨",
     "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"",
+    "Unsatisfied backend parameters" : "백엔드 인자가 부족함",
+    "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함",
+    "Admin-only storage backend \"%s\"" : "관리자만 접근할 수 있는 저장소 백엔드 \"%s\"",
     "Personal" : "개인",
     "System" : "시스템",
     "Grant access" : "접근 권한 부여",
     "Access granted" : "접근 허가됨",
+    "Error configuring OAuth1" : "OAuth1 설정 오류",
+    "Error configuring OAuth2" : "OAuth2 설정 오류",
     "Enable encryption" : "암호화 사용",
     "Enable previews" : "미리 보기 사용",
     "Check for changes" : "변경 사항 감시",
@@ -39,12 +49,19 @@ OC.L10N.register(
     "Saved" : "저장됨",
     "Generate keys" : "키 생성",
     "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
+    "Access key" : "접근 키",
+    "Secret key" : "비밀 키",
+    "Builtin" : "내장",
     "None" : "없음",
+    "OAuth1" : "OAuth1",
     "App key" : "앱 키",
     "App secret" : "앱 비밀 값",
+    "OAuth2" : "OAuth2",
     "Client ID" : "클라이언트 ID",
     "Client secret" : "클라이언트 비밀 값",
+    "Username and password" : "사용자 이름과 암호",
     "Password" : "암호",
+    "Session credentials" : "세션 접근 정보",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "호스트 이름",
     "Port" : "포트",
@@ -55,10 +72,15 @@ OC.L10N.register(
     "URL" : "URL",
     "Secure https://" : "보안 https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "보안 ftps://",
+    "Google Drive" : "Google 드라이브",
     "Local" : "로컬",
     "Location" : "위치",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "루트",
+    "SMB / CIFS" : "SMB/CIFS",
     "<b>Note:</b> " : "<b>메모:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
@@ -70,6 +92,7 @@ OC.L10N.register(
     "Scope" : "범위",
     "External Storage" : "외부 저장소",
     "Folder name" : "폴더 이름",
+    "Authentication" : "인증",
     "Configuration" : "설정",
     "Available for" : "다음으로 사용 가능",
     "Advanced settings" : "고급 설정",
diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json
index eeac61cf666..9a0744a867f 100644
--- a/apps/files_external/l10n/ko.json
+++ b/apps/files_external/l10n/ko.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Please provide a valid app key and secret." : "올바른 앱 키와 비밀 값을 입력하십시오.",
     "Step 1 failed. Exception: %s" : "1단계 실패. 예외: %s",
     "Step 2 failed. Exception: %s" : "2단계 실패. 예외: %s",
     "External storage" : "외부 저장소",
@@ -20,12 +23,19 @@
     "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
     "Public key" : "공개 키",
     "Storage with id \"%i\" not found" : "ID가 \"%i\"인 저장소를 찾을 수 없음",
+    "Invalid backend or authentication mechanism class" : "백엔드나 인증 방식 클래스가 잘못됨",
     "Invalid mount point" : "잘못된 마운트 지점",
+    "Objectstore forbidden" : "Objectstore에 접근 금지됨",
     "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"",
+    "Unsatisfied backend parameters" : "백엔드 인자가 부족함",
+    "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함",
+    "Admin-only storage backend \"%s\"" : "관리자만 접근할 수 있는 저장소 백엔드 \"%s\"",
     "Personal" : "개인",
     "System" : "시스템",
     "Grant access" : "접근 권한 부여",
     "Access granted" : "접근 허가됨",
+    "Error configuring OAuth1" : "OAuth1 설정 오류",
+    "Error configuring OAuth2" : "OAuth2 설정 오류",
     "Enable encryption" : "암호화 사용",
     "Enable previews" : "미리 보기 사용",
     "Check for changes" : "변경 사항 감시",
@@ -37,12 +47,19 @@
     "Saved" : "저장됨",
     "Generate keys" : "키 생성",
     "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
+    "Access key" : "접근 키",
+    "Secret key" : "비밀 키",
+    "Builtin" : "내장",
     "None" : "없음",
+    "OAuth1" : "OAuth1",
     "App key" : "앱 키",
     "App secret" : "앱 비밀 값",
+    "OAuth2" : "OAuth2",
     "Client ID" : "클라이언트 ID",
     "Client secret" : "클라이언트 비밀 값",
+    "Username and password" : "사용자 이름과 암호",
     "Password" : "암호",
+    "Session credentials" : "세션 접근 정보",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "호스트 이름",
     "Port" : "포트",
@@ -53,10 +70,15 @@
     "URL" : "URL",
     "Secure https://" : "보안 https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Secure ftps://" : "보안 ftps://",
+    "Google Drive" : "Google 드라이브",
     "Local" : "로컬",
     "Location" : "위치",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "루트",
+    "SMB / CIFS" : "SMB/CIFS",
     "<b>Note:</b> " : "<b>메모:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
@@ -68,6 +90,7 @@
     "Scope" : "범위",
     "External Storage" : "외부 저장소",
     "Folder name" : "폴더 이름",
+    "Authentication" : "인증",
     "Configuration" : "설정",
     "Available for" : "다음으로 사용 가능",
     "Advanced settings" : "고급 설정",
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 037ddcd9d1d..18ba9bd0d31 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -42,6 +42,7 @@ OC.L10N.register(
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
     "Accept" : "Αποδοχή",
+    "Decline" : "Απόρριψη",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου",
     "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index 9eb19b2ba83..f8e42195d0d 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -40,6 +40,7 @@
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
     "Accept" : "Αποδοχή",
+    "Decline" : "Απόρριψη",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου",
     "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index 2a3f7937fdc..396c4785537 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -41,7 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
+    "You received %s as a remote share from %s" : "Sait etäjaon %s käyttäjältä %s",
     "Accept" : "Hyväksy",
+    "Decline" : "Kieltäydy",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta",
     "This share is password-protected" : "Tämä jako on suojattu salasanalla",
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index d7809f57130..56d64c0e841 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -39,7 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
+    "You received %s as a remote share from %s" : "Sait etäjaon %s käyttäjältä %s",
     "Accept" : "Hyväksy",
+    "Decline" : "Kieltäydy",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta",
     "This share is password-protected" : "Tämä jako on suojattu salasanalla",
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index f30c0b53b47..f0d9fc2aecb 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -41,7 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
     "Shares" : "Dibagikan",
+    "You received %s as a remote share from %s" : "Anda menerima %s sebagai berbagi remote dari %s",
     "Accept" : "Terima",
+    "Decline" : "Tolak",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya",
     "This share is password-protected" : "Berbagi ini dilindungi sandi",
@@ -67,6 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Federated Cloud ID Anda:",
     "Share it:" : "Bagikan:",
+    "Add to your website" : "Tambahkan pada situs web Anda",
     "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud",
     "HTML Code:" : "Kode HTML:"
 },
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index 3b6f65c1a09..b14f4c43789 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -39,7 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
     "Shares" : "Dibagikan",
+    "You received %s as a remote share from %s" : "Anda menerima %s sebagai berbagi remote dari %s",
     "Accept" : "Terima",
+    "Decline" : "Tolak",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya",
     "This share is password-protected" : "Berbagi ini dilindungi sandi",
@@ -65,6 +67,7 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Federated Cloud ID Anda:",
     "Share it:" : "Bagikan:",
+    "Add to your website" : "Tambahkan pada situs web Anda",
     "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud",
     "HTML Code:" : "Kode HTML:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js
index 2ad6c0422b1..d750f827797 100644
--- a/apps/files_sharing/l10n/ko.js
+++ b/apps/files_sharing/l10n/ko.js
@@ -41,7 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
     "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
     "Shares" : "공유",
+    "You received %s as a remote share from %s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다",
     "Accept" : "수락",
+    "Decline" : "거절",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨",
     "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다",
@@ -67,6 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "연합 클라우드",
     "Your Federated Cloud ID:" : "내 연합 클라우드 ID:",
     "Share it:" : "공유하기:",
+    "Add to your website" : "내 웹 사이트에 추가",
     "Share with me via ownCloud" : "ownCloud로 나와 공유하기",
     "HTML Code:" : "HTML 코드:"
 },
diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json
index d31bf0060dd..e9a169be4f7 100644
--- a/apps/files_sharing/l10n/ko.json
+++ b/apps/files_sharing/l10n/ko.json
@@ -39,7 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
     "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
     "Shares" : "공유",
+    "You received %s as a remote share from %s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다",
     "Accept" : "수락",
+    "Decline" : "거절",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨",
     "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다",
@@ -65,6 +67,7 @@
     "Federated Cloud" : "연합 클라우드",
     "Your Federated Cloud ID:" : "내 연합 클라우드 ID:",
     "Share it:" : "공유하기:",
+    "Add to your website" : "내 웹 사이트에 추가",
     "Share with me via ownCloud" : "ownCloud로 나와 공유하기",
     "HTML Code:" : "HTML 코드:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
index ea3c8ac7296..9db7c600102 100644
--- a/apps/files_sharing/l10n/th_TH.js
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -41,7 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
+    "You received %s as a remote share from %s" : "คุณได้รับ %s โดยรีโมทแชร์จาก %s",
     "Accept" : "ยอมรับ",
+    "Decline" : "ลดลง",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ",
     "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน",
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
index 196c088abd7..f630c062643 100644
--- a/apps/files_sharing/l10n/th_TH.json
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -39,7 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
+    "You received %s as a remote share from %s" : "คุณได้รับ %s โดยรีโมทแชร์จาก %s",
     "Accept" : "ยอมรับ",
+    "Decline" : "ลดลง",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ",
     "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index df638a3d7ee..7395970563e 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
+    "Preparing update" : "Uuendamise ettevalmistamine",
     "Turned on maintenance mode" : "Haldusrežiimis sisse lülitatud",
     "Turned off maintenance mode" : "Haldusrežiimis välja lülitatud",
     "Updated database" : "Uuendatud andmebaas",
@@ -10,6 +11,10 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Uuendatud \"%s\" -> %s",
     "Repair warning: " : "Paranda hoiatus:",
     "Repair error: " : "Paranda viga:",
+    "Following incompatible apps have been disabled: %s" : "Järgnevad mitteühilduvad rakendused on välja lülitatud: %s",
+    "Following apps have been disabled: %s" : "Järgnevad rakendused on välja lülitatud: %s",
+    "Already up to date" : "On juba ajakohane",
+    "File is too big" : "Fail on liiga suur",
     "Invalid file provided" : "Vigane fail",
     "No image or file provided" : "Ühtegi pilti või faili pole pakutud",
     "Unknown filetype" : "Tundmatu failitüüp",
@@ -31,6 +36,13 @@ OC.L10N.register(
     "Thu." : "N",
     "Fri." : "R",
     "Sat." : "L",
+    "Su" : "P",
+    "Mo" : "E",
+    "Tu" : "T",
+    "We" : "K",
+    "Th" : "N",
+    "Fr" : "R",
+    "Sa" : "L",
     "January" : "Jaanuar",
     "February" : "Veebruar",
     "March" : "Märts",
@@ -85,6 +97,7 @@ OC.L10N.register(
     "So-so password" : "Enam-vähem sobiv parool",
     "Good password" : "Hea parool",
     "Strong password" : "Väga hea parool",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
     "Error occurred while checking server setup" : "Serveri seadete kontrolimisel tekkis viga",
     "Shared" : "Jagatud",
     "Shared with {recipients}" : "Jagatud {recipients}",
@@ -229,6 +242,9 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.",
     "Add \"%s\" as trusted domain" : "Lisa \"%s\" usaldusväärse domeenina",
+    "App update required" : "Rakenduse uuendus on nõutud",
+    "These apps will be updated:" : "Neid rakendusi uuendatakse:",
+    "These incompatible apps will be disabled:" : "Need mitteühilduvad rakendused lülitatakse välja:",
     "The theme %s has been disabled." : "Teema %s on keelatud.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud.",
     "Start update" : "Käivita uuendus",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index edacdaedca9..43a04a5ddce 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
+    "Preparing update" : "Uuendamise ettevalmistamine",
     "Turned on maintenance mode" : "Haldusrežiimis sisse lülitatud",
     "Turned off maintenance mode" : "Haldusrežiimis välja lülitatud",
     "Updated database" : "Uuendatud andmebaas",
@@ -8,6 +9,10 @@
     "Updated \"%s\" to %s" : "Uuendatud \"%s\" -> %s",
     "Repair warning: " : "Paranda hoiatus:",
     "Repair error: " : "Paranda viga:",
+    "Following incompatible apps have been disabled: %s" : "Järgnevad mitteühilduvad rakendused on välja lülitatud: %s",
+    "Following apps have been disabled: %s" : "Järgnevad rakendused on välja lülitatud: %s",
+    "Already up to date" : "On juba ajakohane",
+    "File is too big" : "Fail on liiga suur",
     "Invalid file provided" : "Vigane fail",
     "No image or file provided" : "Ühtegi pilti või faili pole pakutud",
     "Unknown filetype" : "Tundmatu failitüüp",
@@ -29,6 +34,13 @@
     "Thu." : "N",
     "Fri." : "R",
     "Sat." : "L",
+    "Su" : "P",
+    "Mo" : "E",
+    "Tu" : "T",
+    "We" : "K",
+    "Th" : "N",
+    "Fr" : "R",
+    "Sa" : "L",
     "January" : "Jaanuar",
     "February" : "Veebruar",
     "March" : "Märts",
@@ -83,6 +95,7 @@
     "So-so password" : "Enam-vähem sobiv parool",
     "Good password" : "Hea parool",
     "Strong password" : "Väga hea parool",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
     "Error occurred while checking server setup" : "Serveri seadete kontrolimisel tekkis viga",
     "Shared" : "Jagatud",
     "Shared with {recipients}" : "Jagatud {recipients}",
@@ -227,6 +240,9 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.",
     "Add \"%s\" as trusted domain" : "Lisa \"%s\" usaldusväärse domeenina",
+    "App update required" : "Rakenduse uuendus on nõutud",
+    "These apps will be updated:" : "Neid rakendusi uuendatakse:",
+    "These incompatible apps will be disabled:" : "Need mitteühilduvad rakendused lülitatakse välja:",
     "The theme %s has been disabled." : "Teema %s on keelatud.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud.",
     "Start update" : "Käivita uuendus",
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index c5aef4258d2..56fe67b553b 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "%s 님에게 메일을 보낼 수 없습니다.",
+    "Preparing update" : "업데이트 준비 중",
     "Turned on maintenance mode" : "유지 보수 모드 켜짐",
     "Turned off maintenance mode" : "유지 보수 모드 꺼짐",
     "Maintenance mode is kept active" : "유지 보수 모드가 켜져 있음",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "수리 오류:",
     "Following incompatible apps have been disabled: %s" : "다음 호환되지 않는 앱이 비활성화되었습니다: %s",
     "Following apps have been disabled: %s" : "다음 앱이 비활성화되었습니다: %s",
+    "Already up to date" : "최신 상태임",
+    "File is too big" : "파일이 너무 큼",
     "Invalid file provided" : "잘못된 파일 지정됨",
     "No image or file provided" : "사진이나 파일이 없음",
     "Unknown filetype" : "알려지지 않은 파일 형식",
@@ -35,6 +38,13 @@ OC.L10N.register(
     "Thu." : "목",
     "Fri." : "금",
     "Sat." : "토",
+    "Su" : "일",
+    "Mo" : "월",
+    "Tu" : "화",
+    "We" : "수",
+    "Th" : "목",
+    "Fr" : "금",
+    "Sa" : "토",
     "January" : "1월",
     "February" : "2월",
     "March" : "3월",
@@ -94,6 +104,8 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "인터넷에서 데이터 디렉터리와 파일에 접근할 수 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 직접 접근할 수 없도록 하거나, 데이터 디렉터리를 웹 서버 문서 경로 바깥에 두십시오.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "메모리 캐시가 설정되지 않았습니다. 성능을 향상시키려면 사용 가능한 경우 메모리 캐시를 설정하십시오. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "PHP에서 /dev/urandom을 읽을 수 없으며, 보안상의 이유로 권장되지 않습니다. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "사용하고 있는 PHP 버전({version})은 더 이상 <a href=\"{phpLink}\">PHP에서 지원하지 않습니다.</a> PHP를 업그레이드하여 성능 및 보안 개선을 누리십시오.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "역방향 프록시 헤더 설정이 잘못되었거나, 신뢰할 수 있는 프록시에서 ownCloud에 접근하고 있습니다. 신뢰할 수 있는 프록시에서 ownCloud에 접근하는 것이 아니라면, 이 상황은 보안 문제이며 공격자가 ownCloud에 접근하는 IP 주소를 속일 수 있습니다. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
     "Error occurred while checking server setup" : "서버 설정을 확인하는 중 오류 발생",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 헤더가 \"{expected}\"와(과) 같이 설정되지 않았습니다. 잠재적인 보안 위협이 될 수 있으므로 설정을 변경하는 것을 추천합니다.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP 헤더 \"Strict-Transport-Security\"가 최소한 \"{seconds}\"초 이상으로 설정되어야 합니다. 강화된 보안을 위해서 <a href=\"{docUrl}\">보안 팁</a>에 나타난 것처럼 HSTS를 활성화하는 것을 추천합니다.",
@@ -162,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "업데이트가 성공하였습니다. 일부 경고가 있습니다.",
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "Couldn't reset password because the token is invalid" : "토큰이 잘못되었기 때문에 암호를 초기화할 수 없습니다",
+    "Couldn't reset password because the token is expired" : "토큰이 만료되어 암호를 초기화할 수 없습니다",
     "Couldn't send reset email. Please make sure your username is correct." : "재설정 메일을 보낼 수 없습니다. 사용자 이름이 올바른지 확인하십시오.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "해당 사용자 이름에 등록된 이메일 주소가 없어서 재설정 메일을 보낼 수 없습니다. 관리자에게 문의하십시오.",
     "%s password reset" : "%s 암호 재설정",
@@ -235,6 +248,8 @@ OC.L10N.register(
     "Please contact your administrator." : "관리자에게 문의하십시오.",
     "An internal error occured." : "내부 오류가 발생하였습니다.",
     "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.",
+    "Log in" : "로그인",
+    "Wrong password. Reset it?" : "암호가 잘못되었습니다. 다시 설정하시겠습니까?",
     "remember" : "기억하기",
     "Alternative Logins" : "대체 로그인",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "안녕하세요,<br><br>%s 님이 <strong>%s</strong>을(를) 공유하였음을 알려 드립니다.<br><a href=\"%s\">보러 가기!</a><br><br>",
@@ -246,6 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "관리자에게 연락해 주십시오. 만약 이 인스턴스 관리자라면 config/config.php에서 \"trusted_domain\" 설정을 편집하십시오. 예제 설정 파일은 config/config.sample.php에 있습니다.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "설정에 따라서 관리자 권한으로 아래 단추를 눌러서 이 도메인을 신뢰하도록 설정할 수 있습니다.",
     "Add \"%s\" as trusted domain" : "\"%s\"을(를) 신뢰할 수 있는 도메인으로 추가",
+    "App update required" : "앱 업데이트 필요",
+    "%s will be updated to version %s" : "%s 앱을 버전 %s(으)로 업데이트합니다",
+    "These apps will be updated:" : "다음 앱을 업데이트합니다:",
+    "These incompatible apps will be disabled:" : "다음 호환되지 않는 앱이 비활성화됩니다:",
     "The theme %s has been disabled." : "%s 테마가 비활성화되었습니다.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "계속하기 전에 데이터베이스, 설정 폴더, 데이터 폴더가 백업되어 있는지 확인하십시오.",
     "Start update" : "업데이트 시작",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index b1e133d76ca..1e1f427ecb4 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "%s 님에게 메일을 보낼 수 없습니다.",
+    "Preparing update" : "업데이트 준비 중",
     "Turned on maintenance mode" : "유지 보수 모드 켜짐",
     "Turned off maintenance mode" : "유지 보수 모드 꺼짐",
     "Maintenance mode is kept active" : "유지 보수 모드가 켜져 있음",
@@ -11,6 +12,8 @@
     "Repair error: " : "수리 오류:",
     "Following incompatible apps have been disabled: %s" : "다음 호환되지 않는 앱이 비활성화되었습니다: %s",
     "Following apps have been disabled: %s" : "다음 앱이 비활성화되었습니다: %s",
+    "Already up to date" : "최신 상태임",
+    "File is too big" : "파일이 너무 큼",
     "Invalid file provided" : "잘못된 파일 지정됨",
     "No image or file provided" : "사진이나 파일이 없음",
     "Unknown filetype" : "알려지지 않은 파일 형식",
@@ -33,6 +36,13 @@
     "Thu." : "목",
     "Fri." : "금",
     "Sat." : "토",
+    "Su" : "일",
+    "Mo" : "월",
+    "Tu" : "화",
+    "We" : "수",
+    "Th" : "목",
+    "Fr" : "금",
+    "Sa" : "토",
     "January" : "1월",
     "February" : "2월",
     "March" : "3월",
@@ -92,6 +102,8 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "인터넷에서 데이터 디렉터리와 파일에 접근할 수 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 직접 접근할 수 없도록 하거나, 데이터 디렉터리를 웹 서버 문서 경로 바깥에 두십시오.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "메모리 캐시가 설정되지 않았습니다. 성능을 향상시키려면 사용 가능한 경우 메모리 캐시를 설정하십시오. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "PHP에서 /dev/urandom을 읽을 수 없으며, 보안상의 이유로 권장되지 않습니다. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "사용하고 있는 PHP 버전({version})은 더 이상 <a href=\"{phpLink}\">PHP에서 지원하지 않습니다.</a> PHP를 업그레이드하여 성능 및 보안 개선을 누리십시오.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "역방향 프록시 헤더 설정이 잘못되었거나, 신뢰할 수 있는 프록시에서 ownCloud에 접근하고 있습니다. 신뢰할 수 있는 프록시에서 ownCloud에 접근하는 것이 아니라면, 이 상황은 보안 문제이며 공격자가 ownCloud에 접근하는 IP 주소를 속일 수 있습니다. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
     "Error occurred while checking server setup" : "서버 설정을 확인하는 중 오류 발생",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 헤더가 \"{expected}\"와(과) 같이 설정되지 않았습니다. 잠재적인 보안 위협이 될 수 있으므로 설정을 변경하는 것을 추천합니다.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP 헤더 \"Strict-Transport-Security\"가 최소한 \"{seconds}\"초 이상으로 설정되어야 합니다. 강화된 보안을 위해서 <a href=\"{docUrl}\">보안 팁</a>에 나타난 것처럼 HSTS를 활성화하는 것을 추천합니다.",
@@ -160,6 +172,7 @@
     "The update was successful. There were warnings." : "업데이트가 성공하였습니다. 일부 경고가 있습니다.",
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "Couldn't reset password because the token is invalid" : "토큰이 잘못되었기 때문에 암호를 초기화할 수 없습니다",
+    "Couldn't reset password because the token is expired" : "토큰이 만료되어 암호를 초기화할 수 없습니다",
     "Couldn't send reset email. Please make sure your username is correct." : "재설정 메일을 보낼 수 없습니다. 사용자 이름이 올바른지 확인하십시오.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "해당 사용자 이름에 등록된 이메일 주소가 없어서 재설정 메일을 보낼 수 없습니다. 관리자에게 문의하십시오.",
     "%s password reset" : "%s 암호 재설정",
@@ -233,6 +246,8 @@
     "Please contact your administrator." : "관리자에게 문의하십시오.",
     "An internal error occured." : "내부 오류가 발생하였습니다.",
     "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.",
+    "Log in" : "로그인",
+    "Wrong password. Reset it?" : "암호가 잘못되었습니다. 다시 설정하시겠습니까?",
     "remember" : "기억하기",
     "Alternative Logins" : "대체 로그인",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "안녕하세요,<br><br>%s 님이 <strong>%s</strong>을(를) 공유하였음을 알려 드립니다.<br><a href=\"%s\">보러 가기!</a><br><br>",
@@ -244,6 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "관리자에게 연락해 주십시오. 만약 이 인스턴스 관리자라면 config/config.php에서 \"trusted_domain\" 설정을 편집하십시오. 예제 설정 파일은 config/config.sample.php에 있습니다.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "설정에 따라서 관리자 권한으로 아래 단추를 눌러서 이 도메인을 신뢰하도록 설정할 수 있습니다.",
     "Add \"%s\" as trusted domain" : "\"%s\"을(를) 신뢰할 수 있는 도메인으로 추가",
+    "App update required" : "앱 업데이트 필요",
+    "%s will be updated to version %s" : "%s 앱을 버전 %s(으)로 업데이트합니다",
+    "These apps will be updated:" : "다음 앱을 업데이트합니다:",
+    "These incompatible apps will be disabled:" : "다음 호환되지 않는 앱이 비활성화됩니다:",
     "The theme %s has been disabled." : "%s 테마가 비활성화되었습니다.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "계속하기 전에 데이터베이스, 설정 폴더, 데이터 폴더가 백업되어 있는지 확인하십시오.",
     "Start update" : "업데이트 시작",
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
index 2114b34eddd..0de6a4124fb 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -91,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Gagal membagikan %s, karena pengguna %s tidak ada",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Gagal membagikan %s, karena pengguna %s bukan merupakan anggota dari grup yang %s ikuti",
     "Sharing %s failed, because this item is already shared with %s" : "Gagal membagkan %s, karena item ini sudah dibagikan dengan %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Berbagi %s gagal karena item ini sudah dibagikan dengan pengguna %s",
     "Sharing %s failed, because the group %s does not exist" : "Gagal membagikan %s, karena grup %s tidak ada",
     "Sharing %s failed, because %s is not a member of the group %s" : "Gagal membagikan %s, karena %s bukan anggota dari grup %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Anda perlu memberikan sandi untuk membuat tautan publik, hanya tautan yang terlindungi yang diizinkan",
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index cdc17b6ce8e..e1b3a9f93b0 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -89,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Gagal membagikan %s, karena pengguna %s tidak ada",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Gagal membagikan %s, karena pengguna %s bukan merupakan anggota dari grup yang %s ikuti",
     "Sharing %s failed, because this item is already shared with %s" : "Gagal membagkan %s, karena item ini sudah dibagikan dengan %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Berbagi %s gagal karena item ini sudah dibagikan dengan pengguna %s",
     "Sharing %s failed, because the group %s does not exist" : "Gagal membagikan %s, karena grup %s tidak ada",
     "Sharing %s failed, because %s is not a member of the group %s" : "Gagal membagikan %s, karena %s bukan anggota dari grup %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Anda perlu memberikan sandi untuk membuat tautan publik, hanya tautan yang terlindungi yang diizinkan",
diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js
index a2ec230d59f..bb143bdd527 100644
--- a/lib/l10n/ko.js
+++ b/lib/l10n/ko.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "파일을 읽을 수 없음",
     "App directory already exists" : "앱 디렉터리가 이미 존재합니다.",
     "Can't create app folder. Please fix permissions. %s" : "앱 폴더를 만들 수 없습니다. 권한을 수정하십시오. %s",
+    "Archive does not contain a directory named %s" : "압축 파일에 디렉터리 %s이(가) 없습니다",
     "No source specified when installing app" : "앱을 설치할 때 소스가 지정되지 않았습니다.",
     "No href specified when installing app from http" : "http에서 앱을 설치할 때 href가 지정되지 않았습니다.",
     "No path specified when installing app from local file" : "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다.",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "%s을(를) 공유할 수 없습니다. 사용자 %s이(가) 존재하지 않습니다",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s을(를) 공유할 수 없습니다. 사용자 %s 님은 %s 님이 회원인 어떠한 그룹에도 속해 있지 않습니다",
     "Sharing %s failed, because this item is already shared with %s" : "%s을(를) 공유할 수 없습니다. 이미 %s 님과 공유되어 있습니다",
+    "Sharing %s failed, because this item is already shared with user %s" : "%s을(를) 공유할 수 없습니다. 이 항목을 이미 %s 님과 공유하고 있습니다",
     "Sharing %s failed, because the group %s does not exist" : "%s을(를) 공유할 수 없습니다. 그룹 %s이(가) 존재하지 않습니다",
     "Sharing %s failed, because %s is not a member of the group %s" : "%s을(를) 공유할 수 없습니다. %s 님이 그룹 %s의 구성원이 아닙니다",
     "You need to provide a password to create a public link, only protected links are allowed" : "공개 링크를 만들려면 암호를 입력해야 합니다. 보호된 링크만 사용 가능합니다",
diff --git a/lib/l10n/ko.json b/lib/l10n/ko.json
index fa52b9a8f05..8fea07402ca 100644
--- a/lib/l10n/ko.json
+++ b/lib/l10n/ko.json
@@ -47,6 +47,7 @@
     "Can't read file" : "파일을 읽을 수 없음",
     "App directory already exists" : "앱 디렉터리가 이미 존재합니다.",
     "Can't create app folder. Please fix permissions. %s" : "앱 폴더를 만들 수 없습니다. 권한을 수정하십시오. %s",
+    "Archive does not contain a directory named %s" : "압축 파일에 디렉터리 %s이(가) 없습니다",
     "No source specified when installing app" : "앱을 설치할 때 소스가 지정되지 않았습니다.",
     "No href specified when installing app from http" : "http에서 앱을 설치할 때 href가 지정되지 않았습니다.",
     "No path specified when installing app from local file" : "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다.",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "%s을(를) 공유할 수 없습니다. 사용자 %s이(가) 존재하지 않습니다",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s을(를) 공유할 수 없습니다. 사용자 %s 님은 %s 님이 회원인 어떠한 그룹에도 속해 있지 않습니다",
     "Sharing %s failed, because this item is already shared with %s" : "%s을(를) 공유할 수 없습니다. 이미 %s 님과 공유되어 있습니다",
+    "Sharing %s failed, because this item is already shared with user %s" : "%s을(를) 공유할 수 없습니다. 이 항목을 이미 %s 님과 공유하고 있습니다",
     "Sharing %s failed, because the group %s does not exist" : "%s을(를) 공유할 수 없습니다. 그룹 %s이(가) 존재하지 않습니다",
     "Sharing %s failed, because %s is not a member of the group %s" : "%s을(를) 공유할 수 없습니다. %s 님이 그룹 %s의 구성원이 아닙니다",
     "You need to provide a password to create a public link, only protected links are allowed" : "공개 링크를 만들려면 암호를 입력해야 합니다. 보호된 링크만 사용 가능합니다",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 40430866067..26410969303 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Servidor de correu electrònic",
     "Log" : "Registre",
-    "Server status" : "Estat del servidor",
     "Tips & tricks" : "Consells i trucs",
     "Updates" : "Actualitzacions",
     "Authentication error" : "Error d'autenticació",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index a4836159476..05a02f5e361 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Servidor de correu electrònic",
     "Log" : "Registre",
-    "Server status" : "Estat del servidor",
     "Tips & tricks" : "Consells i trucs",
     "Updates" : "Actualitzacions",
     "Authentication error" : "Error d'autenticació",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index ceee37922cf..91e33842b43 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Emailový server",
     "Log" : "Záznam",
-    "Server status" : "Stav serveru",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizace",
     "Authentication error" : "Chyba přihlášení",
@@ -179,8 +178,6 @@ OC.L10N.register(
     "More" : "Více",
     "Less" : "Méně",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!",
-    "Transactional File Locking is enabled." : "Transakční zamykání souboru je povoleno.",
-    "Transactional File Locking is disabled." : "Transakční zamykání souboru není povoleno.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Je použita databáze SQLite. Pro větší instalace doporučujeme přejít na robustnější databázi.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Pro migraci na jinou databázi lze použít aplikaci pro příkazový řádek: 'occ db:convert-type', nebo nahlédněte do <a target=\"_blank\" href=\"%s\">dokumentace ↗</a>.",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 2dbe29a8cab..7a99e0265f6 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Emailový server",
     "Log" : "Záznam",
-    "Server status" : "Stav serveru",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizace",
     "Authentication error" : "Chyba přihlášení",
@@ -177,8 +176,6 @@
     "More" : "Více",
     "Less" : "Méně",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!",
-    "Transactional File Locking is enabled." : "Transakční zamykání souboru je povoleno.",
-    "Transactional File Locking is disabled." : "Transakční zamykání souboru není povoleno.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Je použita databáze SQLite. Pro větší instalace doporučujeme přejít na robustnější databázi.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Pro migraci na jinou databázi lze použít aplikaci pro příkazový řádek: 'occ db:convert-type', nebo nahlédněte do <a target=\"_blank\" href=\"%s\">dokumentace ↗</a>.",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index a8ad193c646..9a2adf5c2a2 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "E-mailserver",
     "Log" : "Log",
-    "Server status" : "ServerStatus",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "Opdateringer",
     "Authentication error" : "Adgangsfejl",
@@ -186,8 +185,6 @@ OC.L10N.register(
     "More" : "Mere",
     "Less" : "Mindre",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logfilen er større end 100 MB. Det kan tage en del tid at hente den!",
-    "Transactional File Locking is enabled." : "Transaktionel fillåsning er slået til.",
-    "Transactional File Locking is disabled." : "Transaktionel fillåsning er slået fra.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite bruges som database. Til større installationer anbefaler vi at skifte til en anden database-backend.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Brug af SQLite frarådes især når skrivebordsklienten anvendes til filsynkronisering.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For at migrere til en anden database, så brug kommandolinjeværktøjet: \"occ db:convert-type\" eller se <a target=\"_blank\" href=\"%s\">dokumentationen ↗</a>.",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index bb8f5cfba3c..3ae0aeb173f 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "E-mailserver",
     "Log" : "Log",
-    "Server status" : "ServerStatus",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "Opdateringer",
     "Authentication error" : "Adgangsfejl",
@@ -184,8 +183,6 @@
     "More" : "Mere",
     "Less" : "Mindre",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logfilen er større end 100 MB. Det kan tage en del tid at hente den!",
-    "Transactional File Locking is enabled." : "Transaktionel fillåsning er slået til.",
-    "Transactional File Locking is disabled." : "Transaktionel fillåsning er slået fra.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite bruges som database. Til større installationer anbefaler vi at skifte til en anden database-backend.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Brug af SQLite frarådes især når skrivebordsklienten anvendes til filsynkronisering.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For at migrere til en anden database, så brug kommandolinjeværktøjet: \"occ db:convert-type\" eller se <a target=\"_blank\" href=\"%s\">dokumentationen ↗</a>.",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 79c5d57cf13..477b954f657 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "E-Mail-Server",
     "Log" : "Log",
-    "Server status" : "Serverstatus",
     "Tips & tricks" : "Tipps & Tricks",
     "Updates" : "Updates",
     "Authentication error" : "Authentifizierungsfehler",
@@ -179,8 +178,6 @@ OC.L10N.register(
     "More" : "Mehr",
     "Less" : "Weniger",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
-    "Transactional File Locking is enabled." : "Transaktionale Dateisperre ist aktiviert.",
-    "Transactional File Locking is disabled." : "Transaktionale Dateisperre ist deaktiviert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a> schauen.",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 0d0d2eef602..1a7cbdc3c14 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "E-Mail-Server",
     "Log" : "Log",
-    "Server status" : "Serverstatus",
     "Tips & tricks" : "Tipps & Tricks",
     "Updates" : "Updates",
     "Authentication error" : "Authentifizierungsfehler",
@@ -177,8 +176,6 @@
     "More" : "Mehr",
     "Less" : "Weniger",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
-    "Transactional File Locking is enabled." : "Transaktionale Dateisperre ist aktiviert.",
-    "Transactional File Locking is disabled." : "Transaktionale Dateisperre ist deaktiviert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a> schauen.",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 31276630dc0..5c931504348 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -175,8 +175,6 @@ OC.L10N.register(
     "More" : "Mehr",
     "Less" : "Weniger",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
-    "Transactional File Locking is enabled." : "Dateisperren bei Transaktionen sind aktiviert.",
-    "Transactional File Locking is disabled." : "Dateisperren bei Transaktionen sind deaktiviert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um auf eine andere Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: „occ db:convert-type“ oder konsultieren Sie die <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a>.",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index e3fd49d2857..0518e75c4e5 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -173,8 +173,6 @@
     "More" : "Mehr",
     "Less" : "Weniger",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
-    "Transactional File Locking is enabled." : "Dateisperren bei Transaktionen sind aktiviert.",
-    "Transactional File Locking is disabled." : "Dateisperren bei Transaktionen sind deaktiviert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um auf eine andere Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: „occ db:convert-type“ oder konsultieren Sie die <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a>.",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 21b70a65740..cbb366a373b 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Διακομιστής Email",
     "Log" : "Καταγραφές",
-    "Server status" : "Κατάσταση διακομιστή",
     "Tips & tricks" : "Συμβουλές & τεχνάσματα",
     "Updates" : "Ενημερώσεις",
     "Authentication error" : "Σφάλμα πιστοποίησης",
@@ -187,8 +186,6 @@ OC.L10N.register(
     "More" : "Περισσότερα",
     "Less" : "Λιγότερα",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Το αρχείο ιστορικού είναι μεγαλύτερο από 100ΜΒ. Η λήψη του ίσως πάρει λίγη ώρα!",
-    "Transactional File Locking is enabled." : "Το μεταβατικό κλείδωμα αρχείων είναι ενεργοποιημένο.",
-    "Transactional File Locking is disabled." : "Το μεταβατικό κλείδωμα αρχείων είναι απενεργοποιημένο.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Ως βάση δεδομένων χρησιμοποιείται η SQLite. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να επιλέξετε ένα διαφορετικό σύστημα υποστήριξης βάσης δεδομένων.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Ειδικά όταν χρησιμοποιείτε τον πελάτη για συγχρονισμό στον υπολογιστή σας, δεν συνίσταται η χρήση της SQLite.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Για να μετακινηθείτε σε άλλη βάση δεδομένων  χρησιμοποιήσετε το εργαλείο στη γραμμή εντολών:'occ db:convert-type', ή ανατρέξτε <a target=\"_blank\" href=\"%s\"> στις οδηγίες ↗ </a>.",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 87aca13d1bd..6bbac33bcb5 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Διακομιστής Email",
     "Log" : "Καταγραφές",
-    "Server status" : "Κατάσταση διακομιστή",
     "Tips & tricks" : "Συμβουλές & τεχνάσματα",
     "Updates" : "Ενημερώσεις",
     "Authentication error" : "Σφάλμα πιστοποίησης",
@@ -185,8 +184,6 @@
     "More" : "Περισσότερα",
     "Less" : "Λιγότερα",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Το αρχείο ιστορικού είναι μεγαλύτερο από 100ΜΒ. Η λήψη του ίσως πάρει λίγη ώρα!",
-    "Transactional File Locking is enabled." : "Το μεταβατικό κλείδωμα αρχείων είναι ενεργοποιημένο.",
-    "Transactional File Locking is disabled." : "Το μεταβατικό κλείδωμα αρχείων είναι απενεργοποιημένο.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Ως βάση δεδομένων χρησιμοποιείται η SQLite. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να επιλέξετε ένα διαφορετικό σύστημα υποστήριξης βάσης δεδομένων.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Ειδικά όταν χρησιμοποιείτε τον πελάτη για συγχρονισμό στον υπολογιστή σας, δεν συνίσταται η χρήση της SQLite.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Για να μετακινηθείτε σε άλλη βάση δεδομένων  χρησιμοποιήσετε το εργαλείο στη γραμμή εντολών:'occ db:convert-type', ή ανατρέξτε <a target=\"_blank\" href=\"%s\"> στις οδηγίες ↗ </a>.",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index efb56b54c38..1ffc4e9fcf6 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Servidor de correo electrónico",
     "Log" : "Registro",
-    "Server status" : "Estado del servidor",
     "Tips & tricks" : "Sugerencias y trucos",
     "Updates" : "Actualizaciones",
     "Authentication error" : "Error de autenticación",
@@ -186,8 +185,6 @@ OC.L10N.register(
     "More" : "Más",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100 MB. Descargarlo puede tardar.",
-    "Transactional File Locking is enabled." : "Bloqueo de archivos transaccional está habilitado.",
-    "Transactional File Locking is disabled." : "Bloqueo de archivos transaccional está deshabilitado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite está desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar a otra base de datos use la herramienta de línea de comandos: 'occ db:convert-type', o consulte la <a target=\"_blank\" href=\"%s\">documentación ↗</a>.",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index f7e3ce433b7..b3ee25ce612 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Servidor de correo electrónico",
     "Log" : "Registro",
-    "Server status" : "Estado del servidor",
     "Tips & tricks" : "Sugerencias y trucos",
     "Updates" : "Actualizaciones",
     "Authentication error" : "Error de autenticación",
@@ -184,8 +183,6 @@
     "More" : "Más",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100 MB. Descargarlo puede tardar.",
-    "Transactional File Locking is enabled." : "Bloqueo de archivos transaccional está habilitado.",
-    "Transactional File Locking is disabled." : "Bloqueo de archivos transaccional está deshabilitado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite está desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar a otra base de datos use la herramienta de línea de comandos: 'occ db:convert-type', o consulte la <a target=\"_blank\" href=\"%s\">documentación ↗</a>.",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index f2efb0221e6..56e3a7482c0 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "E-kirjade server",
     "Log" : "Logi",
-    "Server status" : "Serveri olek",
     "Tips & tricks" : "Nõuanded ja trikid",
     "Updates" : "Uuendused",
     "Authentication error" : "Autentimise viga",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index b30857398ff..91d078142b4 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "E-kirjade server",
     "Log" : "Logi",
-    "Server status" : "Serveri olek",
     "Tips & tricks" : "Nõuanded ja trikid",
     "Updates" : "Uuendused",
     "Authentication error" : "Autentimise viga",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index cbbdba36bd5..c670d7abb59 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Sähköpostipalvelin",
     "Log" : "Loki",
-    "Server status" : "Palvelimen tila",
     "Tips & tricks" : "Vinkit",
     "Updates" : "Päivitykset",
     "Authentication error" : "Tunnistautumisvirhe",
@@ -177,8 +176,6 @@ OC.L10N.register(
     "More" : "Enemmän",
     "Less" : "Vähemmän",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Lokitiedosto on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken.",
-    "Transactional File Locking is enabled." : "Transaktiopohjainen tiedostolukitus käytössä.",
-    "Transactional File Locking is disabled." : "Transaktiopohjainen tiedostolukitus on pois käytöstä.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLitea käytetään tietokantana. Suuria asennuksia varten on suositeltavaa vaihtaa muuhun tietokantaan.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Käytä komentorivityökalua toiseen tietokantaan migraation yhteydessä: 'occ db:convert-type', tai <a target=\"_blank\" href=\"%s\">lue toki myös dokumentaatio ↗</a>.",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index f4b6bb41749..01b79449331 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Sähköpostipalvelin",
     "Log" : "Loki",
-    "Server status" : "Palvelimen tila",
     "Tips & tricks" : "Vinkit",
     "Updates" : "Päivitykset",
     "Authentication error" : "Tunnistautumisvirhe",
@@ -175,8 +174,6 @@
     "More" : "Enemmän",
     "Less" : "Vähemmän",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Lokitiedosto on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken.",
-    "Transactional File Locking is enabled." : "Transaktiopohjainen tiedostolukitus käytössä.",
-    "Transactional File Locking is disabled." : "Transaktiopohjainen tiedostolukitus on pois käytöstä.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLitea käytetään tietokantana. Suuria asennuksia varten on suositeltavaa vaihtaa muuhun tietokantaan.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Käytä komentorivityökalua toiseen tietokantaan migraation yhteydessä: 'occ db:convert-type', tai <a target=\"_blank\" href=\"%s\">lue toki myös dokumentaatio ↗</a>.",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index c20bef29b3c..83b7d5f76d8 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Serveur e-mail",
     "Log" : "Log",
-    "Server status" : "Statut du serveur",
     "Tips & tricks" : "Trucs et astuces",
     "Updates" : "Mises à jour",
     "Authentication error" : "Erreur d'authentification",
@@ -186,8 +185,6 @@ OC.L10N.register(
     "More" : "Plus",
     "Less" : "Moins",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "La taille du fichier journal excède 100 Mo. Le télécharger peut prendre un certain temps!",
-    "Transactional File Locking is enabled." : "Le verrouillage transactionnel de fichiers est activé",
-    "Transactional File Locking is disabled." : "Le verrouillage transactionnel de fichiers est désactivé",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite est actuellement utilisé comme gestionnaire de base de données. Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "L'utilisation de SQLite est particulièrement déconseillée si vous utilisez le client de bureau pour synchroniser vos données.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type' ou consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a>.",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index b86a44adaf0..3cf724abc26 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Serveur e-mail",
     "Log" : "Log",
-    "Server status" : "Statut du serveur",
     "Tips & tricks" : "Trucs et astuces",
     "Updates" : "Mises à jour",
     "Authentication error" : "Erreur d'authentification",
@@ -184,8 +183,6 @@
     "More" : "Plus",
     "Less" : "Moins",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "La taille du fichier journal excède 100 Mo. Le télécharger peut prendre un certain temps!",
-    "Transactional File Locking is enabled." : "Le verrouillage transactionnel de fichiers est activé",
-    "Transactional File Locking is disabled." : "Le verrouillage transactionnel de fichiers est désactivé",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite est actuellement utilisé comme gestionnaire de base de données. Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "L'utilisation de SQLite est particulièrement déconseillée si vous utilisez le client de bureau pour synchroniser vos données.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type' ou consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a>.",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index dc2a23f5a08..60ea6e3c846 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Servidor de correo",
     "Log" : "Rexistro",
-    "Server status" : "Estado do servidor",
     "Tips & tricks" : "Trucos e consellos",
     "Updates" : "Actualizacións",
     "Authentication error" : "Produciuse un erro de autenticación",
@@ -179,8 +178,6 @@ OC.L10N.register(
     "More" : "Máis",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O ficheiro de rexistro é maior de 100 MB. Pódelle levar un anaco descargalo!",
-    "Transactional File Locking is enabled." : "O bloque transaccional de ficheiros está activado.",
-    "Transactional File Locking is disabled." : "O bloque transaccional de ficheiros está  desactivado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Empregase SQLite como base de datos. Para instalacións grandes recomendámoslle que cambie a unha infraestrutura de base de datos diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconsellámoslle o uso de SQLite",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar cara outra base de datos, empregue a ferramenta en liña de ordes: «occ db:convert-type», ou vexa a <a target=\"_blank\" href=\"%s\">documentación ↗</a>.",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 65939eeb397..16472c0ac34 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Servidor de correo",
     "Log" : "Rexistro",
-    "Server status" : "Estado do servidor",
     "Tips & tricks" : "Trucos e consellos",
     "Updates" : "Actualizacións",
     "Authentication error" : "Produciuse un erro de autenticación",
@@ -177,8 +176,6 @@
     "More" : "Máis",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O ficheiro de rexistro é maior de 100 MB. Pódelle levar un anaco descargalo!",
-    "Transactional File Locking is enabled." : "O bloque transaccional de ficheiros está activado.",
-    "Transactional File Locking is disabled." : "O bloque transaccional de ficheiros está  desactivado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Empregase SQLite como base de datos. Para instalacións grandes recomendámoslle que cambie a unha infraestrutura de base de datos diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconsellámoslle o uso de SQLite",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar cara outra base de datos, empregue a ferramenta en liña de ordes: «occ db:convert-type», ou vexa a <a target=\"_blank\" href=\"%s\">documentación ↗</a>.",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index 0766f2b55aa..226ce7e01d9 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Ütemezett feladatok",
     "Email server" : "E-mail szerver",
     "Log" : "Naplózás",
-    "Server status" : "Szerver állapota",
     "Tips & tricks" : "Tippek és trükkök",
     "Updates" : "Frissítések",
     "Authentication error" : "Azonosítási hiba",
@@ -174,8 +173,6 @@ OC.L10N.register(
     "More" : "Több",
     "Less" : "Kevesebb",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "A naplófájl 100MB-nál nagyobb. A letöltése hosszabb időt vehet igénybe.",
-    "Transactional File Locking is enabled." : "Tranzakciós fájlzárolás engedélyezve.",
-    "Transactional File Locking is disabled." : "Tranzakciós fájlzárolás tiltva.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy váltson másik adatbázis háttérkiszolgálóra",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Amikor az asztali klienset használja fálj szinkronizációra, akkor az SQLite használata nem ajánlott.",
     "How to do backups" : "Hogyan csináljunk biztonsági mentéseket",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index 4f1801fdef4..14577924e94 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -8,7 +8,6 @@
     "Cron" : "Ütemezett feladatok",
     "Email server" : "E-mail szerver",
     "Log" : "Naplózás",
-    "Server status" : "Szerver állapota",
     "Tips & tricks" : "Tippek és trükkök",
     "Updates" : "Frissítések",
     "Authentication error" : "Azonosítási hiba",
@@ -172,8 +171,6 @@
     "More" : "Több",
     "Less" : "Kevesebb",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "A naplófájl 100MB-nál nagyobb. A letöltése hosszabb időt vehet igénybe.",
-    "Transactional File Locking is enabled." : "Tranzakciós fájlzárolás engedélyezve.",
-    "Transactional File Locking is disabled." : "Tranzakciós fájlzárolás tiltva.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy váltson másik adatbázis háttérkiszolgálóra",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Amikor az asztali klienset használja fálj szinkronizációra, akkor az SQLite használata nem ajánlott.",
     "How to do backups" : "Hogyan csináljunk biztonsági mentéseket",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 344805ec1e9..deb5f71d8b3 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Server email",
     "Log" : "Log",
-    "Server status" : "Status Server",
     "Tips & tricks" : "Tips & trik",
     "Updates" : "Pembaruan",
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
@@ -186,8 +185,6 @@ OC.L10N.register(
     "More" : "Lainnya",
     "Less" : "Ciutkan",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Pengunduhan ini memerlukan beberapa saat!",
-    "Transactional File Locking is enabled." : "Penguncian Berkas Transaksional diaktifkan.",
-    "Transactional File Locking is disabled." : "Penguncian Berkas Transaksional dinonaktifkan.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami menyarankan untuk beralih ke backend basis data yang berbeda.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Terutama saat menggunakan klien desktop untuk sinkronisasi berkas, penggunaan SQLite tidak disarankan.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Untuk migrasi ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type', atau lihat <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a>.",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 5d238d81822..956f5a8a6ff 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Server email",
     "Log" : "Log",
-    "Server status" : "Status Server",
     "Tips & tricks" : "Tips & trik",
     "Updates" : "Pembaruan",
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
@@ -184,8 +183,6 @@
     "More" : "Lainnya",
     "Less" : "Ciutkan",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Pengunduhan ini memerlukan beberapa saat!",
-    "Transactional File Locking is enabled." : "Penguncian Berkas Transaksional diaktifkan.",
-    "Transactional File Locking is disabled." : "Penguncian Berkas Transaksional dinonaktifkan.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami menyarankan untuk beralih ke backend basis data yang berbeda.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Terutama saat menggunakan klien desktop untuk sinkronisasi berkas, penggunaan SQLite tidak disarankan.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Untuk migrasi ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type', atau lihat <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a>.",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index e51d43544a8..68f4fe574f9 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Server di posta",
     "Log" : "Log",
-    "Server status" : "Stato del server",
     "Tips & tricks" : "Suggerimenti e trucchi",
     "Updates" : "Aggiornamenti",
     "Authentication error" : "Errore di autenticazione",
@@ -187,8 +186,6 @@ OC.L10N.register(
     "More" : "Altro",
     "Less" : "Meno",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!",
-    "Transactional File Locking is enabled." : "Il blocco file transazionale è abilitato.",
-    "Transactional File Locking is disabled." : "Il blocco file transazionale è disabilitato.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite è utilizzato come database. Per installazioni più grandi consigliamo di passare a un motore di database diverso.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Per migrare a un altro database, usa lo strumento da riga di comando: 'occ db:convert-type', o leggi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a>.",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 66b16c14433..c6491204d7e 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Server di posta",
     "Log" : "Log",
-    "Server status" : "Stato del server",
     "Tips & tricks" : "Suggerimenti e trucchi",
     "Updates" : "Aggiornamenti",
     "Authentication error" : "Errore di autenticazione",
@@ -185,8 +184,6 @@
     "More" : "Altro",
     "Less" : "Meno",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!",
-    "Transactional File Locking is enabled." : "Il blocco file transazionale è abilitato.",
-    "Transactional File Locking is disabled." : "Il blocco file transazionale è disabilitato.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite è utilizzato come database. Per installazioni più grandi consigliamo di passare a un motore di database diverso.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Per migrare a un altro database, usa lo strumento da riga di comando: 'occ db:convert-type', o leggi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a>.",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 56327a2c9a8..43c75680057 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "メールサーバー",
     "Log" : "ログ",
-    "Server status" : "サーバーステータス",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "アップデート",
     "Authentication error" : "認証エラー",
@@ -169,8 +168,6 @@ OC.L10N.register(
     "More" : "もっと見る",
     "Less" : "閉じる",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ログファイルが100MB以上あります。ダウンロードに時間がかかります！",
-    "Transactional File Locking is enabled." : "トランザクショナル ファイルロックが有効です。",
-    "Transactional File Locking is disabled." : "トランザクショナル ファイルロックが無効です。",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLiteがデータベースとして使用されています。大規模な運用では別のデータベースに切り替えることをお勧めします。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です．",
     "How to do backups" : "バックアップ方法",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index bff979e842c..cbc130a24e0 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "メールサーバー",
     "Log" : "ログ",
-    "Server status" : "サーバーステータス",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "アップデート",
     "Authentication error" : "認証エラー",
@@ -167,8 +166,6 @@
     "More" : "もっと見る",
     "Less" : "閉じる",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ログファイルが100MB以上あります。ダウンロードに時間がかかります！",
-    "Transactional File Locking is enabled." : "トランザクショナル ファイルロックが有効です。",
-    "Transactional File Locking is disabled." : "トランザクショナル ファイルロックが無効です。",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLiteがデータベースとして使用されています。大規模な運用では別のデータベースに切り替えることをお勧めします。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特にデスクトップクライアントをファイル同期に使用する場合，SQLiteは非推奨です．",
     "How to do backups" : "バックアップ方法",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index 0bb2fbef5ac..fdfcf281457 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "이메일 서버",
     "Log" : "로그",
-    "Server status" : "서버 상태",
     "Tips & tricks" : "팁과 추가 정보",
     "Updates" : "업데이트",
     "Authentication error" : "인증 오류",
@@ -119,6 +118,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php가 시스템 환경 변수를 올바르게 조회할 수 있도록 설정되지 않았습니다. getenv(\"PATH\")의 값이 비어 있습니다.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "<a target=\"_blank\" href=\"%s\">설치 문서↗</a>를 참조하여 php 설정 방법 및 php 설정을 변경하십시오. php-fpm을 사용한다면 더 주의하십시오.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "읽기 전용 설정이 활성화되었습니다. 이 상태에서는 웹 인터페이스를 통하여 일부 설정을 변경할 수 없습니다. 또한 매 업데이트마다 파일을 쓸 수 있는 상태로 변경해야 합니다.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.",
@@ -131,6 +131,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "도메인의 루트 디렉터리 아래에 설치되어 있지 않고 시스템 cron을 사용한다면 URL 생성에 문제가 발생할 수도 있습니다. 이 문제를 해결하려면 설치본의 웹 루트 경로에 있는 config.php 파일의 \"overwrite.cli.url\" 옵션을 변경하십시오(제안: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI로 cronjob을 실행할 수 없었습니다. 다음 기술적 오류가 발생하였습니다:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" href=\"%s\">설치 가이드 ↗</a>를 다시 확인하시고 <a href=\"#log-section\">로그</a>의 오류 및 경고를 확인하십시오.",
+    "All checks passed." : "모든 검사를 통과하였습니다.",
     "Open documentation" : "문서 열기",
     "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
     "Allow users to share via link" : "사용자별 링크 공유 허용",
@@ -153,6 +154,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
     "Enable server-side encryption" : "서버 측 암호화 사용",
+    "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "서버 측 암호화 작업은 단방향입니다. 암호화를 한 번 활성화하면 그 시점 이후에 서버에 저장되는 모든 파일이 암호화되며 나중에 암호화를 비활성화할 수 없습니다.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud 서버에 관리자 권한을 가지고 있는 임의의 사용자가 요청을 가로채거나 일반 텍스트 세션 파일에 있는 사용자 암호를 읽어서 암호화를 해제할 수 있습니다. 서버 측 암호화는 악의적인 관리자로부터 파일을 보호할 수는 없으나, 외부에 호스팅된 저장소에 있는 파일을 보호할 수 있습니다.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "암호화 방식에 따라서 파일이 저장된 크기가 증가합니다(기본 모듈 사용 시 최소 35%%)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "데이터 손실을 방지하려면 모든 암호화 키를 주기적으로 백업해야 합니다(data/<user>/files_encryption 및 data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
     "Enable encryption" : "암호화 사용",
     "No encryption module loaded, please enable an encryption module in the app menu." : "암호화 모듈을 불러오지 않았습니다. 앱 메뉴에서 암호화 모듈을 활성화하십시오.",
     "Select default encryption module:" : "기본 암호화 모듈 선택:",
@@ -179,8 +186,6 @@ OC.L10N.register(
     "More" : "더 중요함",
     "Less" : "덜 중요함",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "로그 파일이 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수 있습니다!",
-    "Transactional File Locking is enabled." : "트랜잭션 기반 파일 잠금이 활성화 되었습니다.",
-    "Transactional File Locking is disabled." : "트랜잭션 기반 파일 잠금이 비활성화 되었습니다.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정이면, SQLite를 사용하지 않는 것이 좋습니다.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "다른 데이터베이스로 이전하려면 다음 명령을 사용하십시오: 'occ db:convert-type' 다른 명령을 알아보려면 <a target=\"_blank\" href=\"%s\">문서 ↗</a>를 참고하십시오.",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index f5d774aba65..5c05bed51e8 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "이메일 서버",
     "Log" : "로그",
-    "Server status" : "서버 상태",
     "Tips & tricks" : "팁과 추가 정보",
     "Updates" : "업데이트",
     "Authentication error" : "인증 오류",
@@ -117,6 +116,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php가 시스템 환경 변수를 올바르게 조회할 수 있도록 설정되지 않았습니다. getenv(\"PATH\")의 값이 비어 있습니다.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "<a target=\"_blank\" href=\"%s\">설치 문서↗</a>를 참조하여 php 설정 방법 및 php 설정을 변경하십시오. php-fpm을 사용한다면 더 주의하십시오.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "읽기 전용 설정이 활성화되었습니다. 이 상태에서는 웹 인터페이스를 통하여 일부 설정을 변경할 수 없습니다. 또한 매 업데이트마다 파일을 쓸 수 있는 상태로 변경해야 합니다.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.",
@@ -129,6 +129,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "도메인의 루트 디렉터리 아래에 설치되어 있지 않고 시스템 cron을 사용한다면 URL 생성에 문제가 발생할 수도 있습니다. 이 문제를 해결하려면 설치본의 웹 루트 경로에 있는 config.php 파일의 \"overwrite.cli.url\" 옵션을 변경하십시오(제안: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI로 cronjob을 실행할 수 없었습니다. 다음 기술적 오류가 발생하였습니다:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" href=\"%s\">설치 가이드 ↗</a>를 다시 확인하시고 <a href=\"#log-section\">로그</a>의 오류 및 경고를 확인하십시오.",
+    "All checks passed." : "모든 검사를 통과하였습니다.",
     "Open documentation" : "문서 열기",
     "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
     "Allow users to share via link" : "사용자별 링크 공유 허용",
@@ -151,6 +152,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
     "Enable server-side encryption" : "서버 측 암호화 사용",
+    "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "서버 측 암호화 작업은 단방향입니다. 암호화를 한 번 활성화하면 그 시점 이후에 서버에 저장되는 모든 파일이 암호화되며 나중에 암호화를 비활성화할 수 없습니다.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud 서버에 관리자 권한을 가지고 있는 임의의 사용자가 요청을 가로채거나 일반 텍스트 세션 파일에 있는 사용자 암호를 읽어서 암호화를 해제할 수 있습니다. 서버 측 암호화는 악의적인 관리자로부터 파일을 보호할 수는 없으나, 외부에 호스팅된 저장소에 있는 파일을 보호할 수 있습니다.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "암호화 방식에 따라서 파일이 저장된 크기가 증가합니다(기본 모듈 사용 시 최소 35%%)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "데이터 손실을 방지하려면 모든 암호화 키를 주기적으로 백업해야 합니다(data/<user>/files_encryption 및 data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
     "Enable encryption" : "암호화 사용",
     "No encryption module loaded, please enable an encryption module in the app menu." : "암호화 모듈을 불러오지 않았습니다. 앱 메뉴에서 암호화 모듈을 활성화하십시오.",
     "Select default encryption module:" : "기본 암호화 모듈 선택:",
@@ -177,8 +184,6 @@
     "More" : "더 중요함",
     "Less" : "덜 중요함",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "로그 파일이 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수 있습니다!",
-    "Transactional File Locking is enabled." : "트랜잭션 기반 파일 잠금이 활성화 되었습니다.",
-    "Transactional File Locking is disabled." : "트랜잭션 기반 파일 잠금이 비활성화 되었습니다.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정이면, SQLite를 사용하지 않는 것이 좋습니다.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "다른 데이터베이스로 이전하려면 다음 명령을 사용하십시오: 'occ db:convert-type' 다른 명령을 알아보려면 <a target=\"_blank\" href=\"%s\">문서 ↗</a>를 참고하십시오.",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index a3c071b3f2f..e413b16247c 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -175,8 +175,6 @@ OC.L10N.register(
     "More" : "Mer",
     "Less" : "Mindre",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!",
-    "Transactional File Locking is enabled." : "Transaksjonsbasert fil-låsing er aktivert.",
-    "Transactional File Locking is disabled." : "Transaksjonsbasert fil-låsing er deaktivert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite brukes som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type', eller les i <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a>.",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 485cd207008..9b301b3bbbb 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -173,8 +173,6 @@
     "More" : "Mer",
     "Less" : "Mindre",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!",
-    "Transactional File Locking is enabled." : "Transaksjonsbasert fil-låsing er aktivert.",
-    "Transactional File Locking is disabled." : "Transaksjonsbasert fil-låsing er deaktivert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite brukes som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type', eller les i <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a>.",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index d11b77a2183..45b214299e3 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "E-mailserver",
     "Log" : "Log",
-    "Server status" : "Server status",
     "Tips & tricks" : "Tips & trucs",
     "Updates" : "Updates",
     "Authentication error" : "Authenticatie fout",
@@ -187,8 +186,6 @@ OC.L10N.register(
     "More" : "Meer",
     "Less" : "Minder",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Het logbestand is groter dan 100MB. Downloaden kost even tijd!",
-    "Transactional File Locking is enabled." : "Transactionele File Locking is ingeschakeld.",
-    "Transactional File Locking is disabled." : "Transactionele File Locking is uitgeschakeld.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we om te schakelen naar een andere database engine.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type', lees de  <a target=\"_blank\" href=\"%s\">documentatie ↗</a>.",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index a47e0b11403..04d4555116b 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "E-mailserver",
     "Log" : "Log",
-    "Server status" : "Server status",
     "Tips & tricks" : "Tips & trucs",
     "Updates" : "Updates",
     "Authentication error" : "Authenticatie fout",
@@ -185,8 +184,6 @@
     "More" : "Meer",
     "Less" : "Minder",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Het logbestand is groter dan 100MB. Downloaden kost even tijd!",
-    "Transactional File Locking is enabled." : "Transactionele File Locking is ingeschakeld.",
-    "Transactional File Locking is disabled." : "Transactionele File Locking is uitgeschakeld.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we om te schakelen naar een andere database engine.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type', lees de  <a target=\"_blank\" href=\"%s\">documentatie ↗</a>.",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 14cc0211bef..8b29d8c4711 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Servidor de Email",
     "Log" : "Registro",
-    "Server status" : "Status do servidor",
     "Tips & tricks" : "Dicas & Truques",
     "Updates" : "Atualizações",
     "Authentication error" : "Erro de autenticação",
@@ -187,8 +186,6 @@ OC.L10N.register(
     "More" : "Mais",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O arquivo de log é maior que 100 MB. Baixar esse arquivo requer algum tempo!",
-    "Transactional File Locking is enabled." : "Bloqueio de Arquivo Transacional está habilitado.",
-    "Transactional File Locking is disabled." : "Bloqueio de Arquivo Transacional está desabilitado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'db occ: converter-type', verifique a <a target=\"_blank\" href=\"%s\">documentação ↗</a>.",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 2f056645a0c..dc7e78b56d7 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Servidor de Email",
     "Log" : "Registro",
-    "Server status" : "Status do servidor",
     "Tips & tricks" : "Dicas & Truques",
     "Updates" : "Atualizações",
     "Authentication error" : "Erro de autenticação",
@@ -185,8 +184,6 @@
     "More" : "Mais",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O arquivo de log é maior que 100 MB. Baixar esse arquivo requer algum tempo!",
-    "Transactional File Locking is enabled." : "Bloqueio de Arquivo Transacional está habilitado.",
-    "Transactional File Locking is disabled." : "Bloqueio de Arquivo Transacional está desabilitado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'db occ: converter-type', verifique a <a target=\"_blank\" href=\"%s\">documentação ↗</a>.",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 627eae28e74..eeeb9544d23 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -9,7 +9,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Servidor de Correio Eletrónico",
     "Log" : "Registo",
-    "Server status" : "Estado do servidor",
     "Tips & tricks" : "Dicas e truqes",
     "Updates" : "Atualizações",
     "Authentication error" : "Erro na autenticação",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index f845e56a976..46f6dc48da0 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -7,7 +7,6 @@
     "Cron" : "Cron",
     "Email server" : "Servidor de Correio Eletrónico",
     "Log" : "Registo",
-    "Server status" : "Estado do servidor",
     "Tips & tricks" : "Dicas e truqes",
     "Updates" : "Atualizações",
     "Authentication error" : "Erro na autenticação",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 7ccef65d29f..4366083d5c2 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron (планировщик задач)",
     "Email server" : "Почтовый сервер",
     "Log" : "Журнал",
-    "Server status" : "Статус сервера",
     "Tips & tricks" : "Советы и трюки",
     "Updates" : "Обновления",
     "Authentication error" : "Ошибка аутентификации",
@@ -179,8 +178,6 @@ OC.L10N.register(
     "More" : "Больше",
     "Less" : "Меньше",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Лог-файл - больше 100 мб. Его скачивание может занять некоторое время!",
-    "Transactional File Locking is enabled." : "Транзакционная блокировка файлов включена.",
-    "Transactional File Locking is disabled." : "Транзакционная блокировка файлов отключена.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В качестве базы данных используется SQLite. Для больших установок мы рекомендуем переключиться на другую серверную базу данных.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Для перехода на другую базу данных используйте команду: 'occ db:convert-type' или ознакомьтесь с <a target=\"_blank\" href=\"%s\">документацией ↗</a>.",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 88dc9a5ba5d..55a2680ed30 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron (планировщик задач)",
     "Email server" : "Почтовый сервер",
     "Log" : "Журнал",
-    "Server status" : "Статус сервера",
     "Tips & tricks" : "Советы и трюки",
     "Updates" : "Обновления",
     "Authentication error" : "Ошибка аутентификации",
@@ -177,8 +176,6 @@
     "More" : "Больше",
     "Less" : "Меньше",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Лог-файл - больше 100 мб. Его скачивание может занять некоторое время!",
-    "Transactional File Locking is enabled." : "Транзакционная блокировка файлов включена.",
-    "Transactional File Locking is disabled." : "Транзакционная блокировка файлов отключена.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В качестве базы данных используется SQLite. Для больших установок мы рекомендуем переключиться на другую серверную базу данных.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Для перехода на другую базу данных используйте команду: 'occ db:convert-type' или ознакомьтесь с <a target=\"_blank\" href=\"%s\">документацией ↗</a>.",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index f0e7a18839f..e9dc5c50621 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -164,8 +164,6 @@ OC.L10N.register(
     "More" : "Viac",
     "Less" : "Menej",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Súbor protokolu je väčší ako 100 MB. Jeho sťahovanie môže chvíľu trvať!",
-    "Transactional File Locking is enabled." : "Transakčné zamykanie súboru je povolené.",
-    "Transactional File Locking is disabled." : "Transakčné zamykanie súboru je zakázané.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Ako databáza je použitá SQLite. Pre veľké inštalácie odporúčame prejsť na inú databázu.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Najmä pri používaní aplikácie na synchronizáciu s desktopom nie je databáza SQLite doporučená.",
     "How to do backups" : "Ako vytvárať zálohy",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index 890636970af..c29355482a1 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -162,8 +162,6 @@
     "More" : "Viac",
     "Less" : "Menej",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Súbor protokolu je väčší ako 100 MB. Jeho sťahovanie môže chvíľu trvať!",
-    "Transactional File Locking is enabled." : "Transakčné zamykanie súboru je povolené.",
-    "Transactional File Locking is disabled." : "Transakčné zamykanie súboru je zakázané.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Ako databáza je použitá SQLite. Pre veľké inštalácie odporúčame prejsť na inú databázu.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Najmä pri používaní aplikácie na synchronizáciu s desktopom nie je databáza SQLite doporučená.",
     "How to do backups" : "Ako vytvárať zálohy",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index d89fe14c546..38026284af1 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -175,8 +175,6 @@ OC.L10N.register(
     "More" : "Више",
     "Less" : "Мање",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Фајл записника је већи од 100МБ. Преузимање може потрајати!",
-    "Transactional File Locking is enabled." : "Трансакционо закључавање фајла је укључено.",
-    "Transactional File Locking is disabled." : "Трансакционо закључавање фајла је искључено.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite се користи као базе података. За веће инсталације препоручујемо да се пребаците на други модел базе података.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Нарочито ако се користи клијент програм у графичком окружењу, коришћење СКуЛајта није препоручљиво.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "За миграцију на другу базу користите командну линију: 'occ db:convert-type', или погледајте <a target=\"_blank\" href=\"%s\">документацију ↗</a>.",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index e360fcb863c..5206512092d 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -173,8 +173,6 @@
     "More" : "Више",
     "Less" : "Мање",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Фајл записника је већи од 100МБ. Преузимање може потрајати!",
-    "Transactional File Locking is enabled." : "Трансакционо закључавање фајла је укључено.",
-    "Transactional File Locking is disabled." : "Трансакционо закључавање фајла је искључено.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite се користи као базе података. За веће инсталације препоручујемо да се пребаците на други модел базе података.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Нарочито ако се користи клијент програм у графичком окружењу, коришћење СКуЛајта није препоручљиво.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "За миграцију на другу базу користите командну линију: 'occ db:convert-type', или погледајте <a target=\"_blank\" href=\"%s\">документацију ↗</a>.",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index d72dc37b703..5c1f76e14ea 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "อีเมลเซิร์ฟเวอร์",
     "Log" : "บันทึกการเปลี่ยนแปลง",
-    "Server status" : "สถานะเซิฟเวอร์",
     "Tips & tricks" : "เคล็ดลับและเทคนิค",
     "Updates" : "อัพเดท",
     "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
@@ -187,8 +186,6 @@ OC.L10N.register(
     "More" : "มาก",
     "Less" : "น้อย",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ไฟล์บันทึกมีขนาดใหญ่กว่า 100 เมกะไบต์ มันอาจจะใช้เวลาดาวน์โหลดนาน!",
-    "Transactional File Locking is enabled." : "เปิดใช้งานล็อคไฟล์ขณะทำธุรกรรม",
-    "Transactional File Locking is disabled." : "ปิดใช้งานล็อคไฟล์ขณะทำธุรกรรม",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "จะใช้ SQLite เป็นฐานข้อมูล สำหรับการติดตั้งขนาดใหญ่เราขอแนะนำเพื่อสลับไปยังฐานข้อมูลแบ็กเอนด์ที่แตกต่างกัน",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการประสานข้อมูลโดย SQLite",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "การโยกย้ายไปยังฐานข้อมูลอื่นใช้เครื่องมือบรรทัดคำสั่ง: 'occ db:convert-type' หรือดูที่ <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index f2e4af2f838..0f9b3d6dcbd 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "อีเมลเซิร์ฟเวอร์",
     "Log" : "บันทึกการเปลี่ยนแปลง",
-    "Server status" : "สถานะเซิฟเวอร์",
     "Tips & tricks" : "เคล็ดลับและเทคนิค",
     "Updates" : "อัพเดท",
     "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
@@ -185,8 +184,6 @@
     "More" : "มาก",
     "Less" : "น้อย",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ไฟล์บันทึกมีขนาดใหญ่กว่า 100 เมกะไบต์ มันอาจจะใช้เวลาดาวน์โหลดนาน!",
-    "Transactional File Locking is enabled." : "เปิดใช้งานล็อคไฟล์ขณะทำธุรกรรม",
-    "Transactional File Locking is disabled." : "ปิดใช้งานล็อคไฟล์ขณะทำธุรกรรม",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "จะใช้ SQLite เป็นฐานข้อมูล สำหรับการติดตั้งขนาดใหญ่เราขอแนะนำเพื่อสลับไปยังฐานข้อมูลแบ็กเอนด์ที่แตกต่างกัน",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการประสานข้อมูลโดย SQLite",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "การโยกย้ายไปยังฐานข้อมูลอื่นใช้เครื่องมือบรรทัดคำสั่ง: 'occ db:convert-type' หรือดูที่ <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index e23662341fb..13d5ac9687d 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "E-posta sunucusu",
     "Log" : "Günlük",
-    "Server status" : "Sunucu durumu",
     "Tips & tricks" : "İpuçları ve hileler",
     "Updates" : "Güncellemeler",
     "Authentication error" : "Kimlik doğrulama hatası",
@@ -186,8 +185,6 @@ OC.L10N.register(
     "More" : "Daha fazla",
     "Less" : "Daha az",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!",
-    "Transactional File Locking is enabled." : "İşlemsel Dosya Kilidi etkin.",
-    "Transactional File Locking is disabled." : "İşlemsel Dosya Kilidi devre dışı.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için farklı bir veritabanı arka ucuna geçmenizi öneriyoruz.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Başka bir veritabanına geçmek için komut satırı aracını kullanın: 'occ db:convert-type' veya <a target=\"_blank\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 8c7a39f0a2a..a995fcdc928 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "E-posta sunucusu",
     "Log" : "Günlük",
-    "Server status" : "Sunucu durumu",
     "Tips & tricks" : "İpuçları ve hileler",
     "Updates" : "Güncellemeler",
     "Authentication error" : "Kimlik doğrulama hatası",
@@ -184,8 +183,6 @@
     "More" : "Daha fazla",
     "Less" : "Daha az",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!",
-    "Transactional File Locking is enabled." : "İşlemsel Dosya Kilidi etkin.",
-    "Transactional File Locking is disabled." : "İşlemsel Dosya Kilidi devre dışı.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için farklı bir veritabanı arka ucuna geçmenizi öneriyoruz.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Başka bir veritabanına geçmek için komut satırı aracını kullanın: 'occ db:convert-type' veya <a target=\"_blank\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 6fa83464bc0..992d70465e3 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "计划任务",
     "Email server" : "电子邮件服务器",
     "Log" : "日志",
-    "Server status" : "服务器状态",
     "Tips & tricks" : "技巧提示",
     "Updates" : "更新",
     "Authentication error" : "认证错误",
@@ -186,8 +185,6 @@ OC.L10N.register(
     "More" : "更多",
     "Less" : "更少",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "日志文件超过 100 MB。下载可能需要一些时间！",
-    "Transactional File Locking is enabled." : "事务文件锁定已启用。",
-    "Transactional File Locking is disabled." : "事务文件锁定已禁用。",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite 被用作数据库。对于较大数据量的安装和使用，我们建议您切换到不同的数据库后端。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite 。",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "要迁移到另一个数据库请使用命令行工具: 'occ db:convert-type', 或者查看 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 相关文档 ↗</a>.",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 8b34997b2a7..97eae6702a7 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -8,7 +8,6 @@
     "Cron" : "计划任务",
     "Email server" : "电子邮件服务器",
     "Log" : "日志",
-    "Server status" : "服务器状态",
     "Tips & tricks" : "技巧提示",
     "Updates" : "更新",
     "Authentication error" : "认证错误",
@@ -184,8 +183,6 @@
     "More" : "更多",
     "Less" : "更少",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "日志文件超过 100 MB。下载可能需要一些时间！",
-    "Transactional File Locking is enabled." : "事务文件锁定已启用。",
-    "Transactional File Locking is disabled." : "事务文件锁定已禁用。",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite 被用作数据库。对于较大数据量的安装和使用，我们建议您切换到不同的数据库后端。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite 。",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "要迁移到另一个数据库请使用命令行工具: 'occ db:convert-type', 或者查看 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 相关文档 ↗</a>.",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index c386c8e3c3c..9f3946a930f 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "工作排程",
     "Email server" : "郵件伺服器",
     "Log" : "紀錄檔",
-    "Server status" : "伺服器狀態",
     "Tips & tricks" : "技巧 & 提示",
     "Updates" : "更新",
     "Authentication error" : "認證錯誤",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index 40433325edc..ce87ffa614a 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -8,7 +8,6 @@
     "Cron" : "工作排程",
     "Email server" : "郵件伺服器",
     "Log" : "紀錄檔",
-    "Server status" : "伺服器狀態",
     "Tips & tricks" : "技巧 & 提示",
     "Updates" : "更新",
     "Authentication error" : "認證錯誤",
-- 
GitLab


From 1d9128c557739bec9acfbbb07e48ac366e1b7faf Mon Sep 17 00:00:00 2001
From: Raghu Nayyar <hey@raghunayyar.com>
Date: Sat, 12 Sep 2015 15:24:56 +0530
Subject: [PATCH 232/783] Squashing all commits in one, remove typos.

---
 core/css/styles.css      | 6 +++---
 core/templates/login.php | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index dd0110ded3a..add25c6ddc6 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -472,7 +472,7 @@ input[type="submit"].enabled {
 #body-login #submit.login {
 	position: absolute;
 	right: 0;
-	top: 49px;
+	top: 0;
 	border: none;
 	background-color: transparent;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
@@ -491,8 +491,8 @@ input[type="submit"].enabled {
 
 #body-login form {
 	position: relative;
-	width: 22em;
-	margin: 2em auto 2em;
+	width: 280px;
+	margin: 32px auto;
 	padding: 0;
 }
 #body-login form fieldset {
diff --git a/core/templates/login.php b/core/templates/login.php
index 513988876e1..cb33e7cdb17 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -55,10 +55,9 @@ script('core', [
 				autocomplete="on" autocapitalize="off" autocorrect="off" required>
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
+			<input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
 		</p>
 
-		<input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
-
 		<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
 		<a id="lost-password" class="warning" href="">
 			<?php p($l->t('Wrong password. Reset it?')); ?>
-- 
GitLab


From ca921fa1e78ce2cf64877e31b6663c3ad4854aef Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 13 Sep 2015 01:55:24 -0400
Subject: [PATCH 233/783] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/pt_BR.js   | 2 ++
 apps/files_sharing/l10n/pt_BR.json | 2 ++
 settings/l10n/pt_BR.js             | 2 ++
 settings/l10n/pt_BR.json           | 2 ++
 settings/l10n/th_TH.js             | 2 ++
 settings/l10n/th_TH.json           | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 064e611e11e..35c9f970000 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -41,7 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
+    "You received %s as a remote share from %s" : "Você recebeu %s como um compartilhamento remoto de %s",
     "Accept" : "Aceitar",
+    "Decline" : "Rejeitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID",
     "This share is password-protected" : "Este compartilhamento esta protegido por senha",
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index c1b4c255912..ebb2a5a4cce 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -39,7 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
+    "You received %s as a remote share from %s" : "Você recebeu %s como um compartilhamento remoto de %s",
     "Accept" : "Aceitar",
+    "Decline" : "Rejeitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID",
     "This share is password-protected" : "Este compartilhamento esta protegido por senha",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 8b29d8c4711..3819e70d5ac 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -125,11 +125,13 @@ OC.L10N.register(
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s abaixo a versão %2$s está instalado, por razões de estabilidade e desempenho, recomendamos a atualização para uma versão %1$s mais recente.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacional está desativado, isso pode levar a problemas com as condições de corrida. Ativar 'filelocking.enabled' em config.php para evitar esses problemas. Veja  a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informações.",
     "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nós sugerimos a instalação dos pacotes necessários em seu sistema para suportar um dos seguintes locais: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwrite.cli.url\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cron via CLI. Os seguintes erros técnicos têm aparecido:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacional está usando o banco de dados como bloqueio de back-end, para o melhor o desempenho é aconselhável configurar um cache de memória para bloqueio. Veja a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informação.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique os <a target=\"_blank\" href=\"%s\">guias de instalação ↗</a>, e verificar se há erros ou avisos no <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Todas as verificações passaram.",
     "Open documentation" : "Abrir documentação",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index dc7e78b56d7..bba1b4b5847 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -123,11 +123,13 @@
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s abaixo a versão %2$s está instalado, por razões de estabilidade e desempenho, recomendamos a atualização para uma versão %1$s mais recente.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacional está desativado, isso pode levar a problemas com as condições de corrida. Ativar 'filelocking.enabled' em config.php para evitar esses problemas. Veja  a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informações.",
     "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nós sugerimos a instalação dos pacotes necessários em seu sistema para suportar um dos seguintes locais: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwrite.cli.url\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cron via CLI. Os seguintes erros técnicos têm aparecido:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacional está usando o banco de dados como bloqueio de back-end, para o melhor o desempenho é aconselhável configurar um cache de memória para bloqueio. Veja a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informação.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique os <a target=\"_blank\" href=\"%s\">guias de instalação ↗</a>, e verificar se há erros ou avisos no <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Todas as verificações passaram.",
     "Open documentation" : "Abrir documentação",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index 5c1f76e14ea..62f0164c787 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -125,11 +125,13 @@ OC.L10N.register(
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "เซิร์ฟเวอร์ของคุณทำงานบน Microsoft Windows เราขอแนะนำให้ใช้ลินุกซ์หากคุณต้องการ การใช้งานที่ดีที่สุด",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s รุ่นเก่ากว่า %2$s ที่มีการติดตั้ง สำหรับเหตุผลเรื่องเสถียรภาพและประสิทธิภาพการทำงาน เราแนะนำให้อัพเดทเป็นรุ่น %1$s",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "โมดูล PHP 'fileinfo' หายไป เราขอแนะนำให้เปิดใช้งานโมดูลนี้เพื่อให้ได้ผลลัพธ์ที่ดีที่สุดกับการตรวจสอบชนิด mime",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "การทำธุรกรรมล็อคไฟล์ถูกปิดใช้งาน มันอาจเป็นปัญหา ให้เปิดใช้งาน 'filelocking.enabled' ใน config.php เพื่อหลีกเลี่ยงปัญหาเหล่านี้ ดูเพิ่มเติมได้จาก <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
     "System locale can not be set to a one which supports UTF-8." : "ตำแหน่งที่ตั้งของระบบไม่สามารถตั้งค่าให้รองรับ UTF-8",
     "This means that there might be problems with certain characters in file names." : "นี้หมายความว่าอาจจะมีปัญหากับตัวอักษรบางตัวในชื่อไฟล์",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "เราขอแนะนำให้ติดตั้งแพคเกจที่จำเป็นต้องใช้ในระบบของคุณ ให้การสนับสนุนตำแหน่งที่ตั้งดังต่อไปนี้: %s",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "หากการติดตั้งของคุณไม่ได้ติดตั้งในรากของโดเมนและใช้ระบบ cron อาจมีปัญหาเกี่ยวกับการสร้าง URL เพื่อหลีกเลี่ยงปัญหาเหล่านี้โปรดไปตั้งค่า \"overwrite.cli.url\" ในไฟล์ config.php ของคุณไปยังเส้นทาง webroot ของการติดตั้งของคุณ (แนะนำ: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "มันเป็นไปไม่ได้ที่จะดำเนินการ cronjob ผ่านทาง CLI ข้อผิดพลาดทางเทคนิคต่อไปนี้จะปรากฏ:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "การทำธุรกรรมล็อคไฟล์จะใช้ฐานข้อมูลเป็นล็อคแบ็กเอนด์ สำหรับประสิทธิภาพที่ดีที่สุดก็ควรที่จะกำหนดค่า memcache สำหรับล็อค ดูเพิ่มเติมได้จาก <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "กรุณาตรวจสอบ <a target=\"_blank\" href=\"%s\">คู่มือการติดตั้ง</a> และตรวจสอบข้อผิดพลาดหรือคำเตือนใน <a href=\"#log-section\">บันทึก</a>",
     "All checks passed." : "ผ่านการตรวจสอบทั้งหมด",
     "Open documentation" : "เปิดเอกสาร",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index 0f9b3d6dcbd..92670ee82d8 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -123,11 +123,13 @@
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "เซิร์ฟเวอร์ของคุณทำงานบน Microsoft Windows เราขอแนะนำให้ใช้ลินุกซ์หากคุณต้องการ การใช้งานที่ดีที่สุด",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s รุ่นเก่ากว่า %2$s ที่มีการติดตั้ง สำหรับเหตุผลเรื่องเสถียรภาพและประสิทธิภาพการทำงาน เราแนะนำให้อัพเดทเป็นรุ่น %1$s",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "โมดูล PHP 'fileinfo' หายไป เราขอแนะนำให้เปิดใช้งานโมดูลนี้เพื่อให้ได้ผลลัพธ์ที่ดีที่สุดกับการตรวจสอบชนิด mime",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "การทำธุรกรรมล็อคไฟล์ถูกปิดใช้งาน มันอาจเป็นปัญหา ให้เปิดใช้งาน 'filelocking.enabled' ใน config.php เพื่อหลีกเลี่ยงปัญหาเหล่านี้ ดูเพิ่มเติมได้จาก <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
     "System locale can not be set to a one which supports UTF-8." : "ตำแหน่งที่ตั้งของระบบไม่สามารถตั้งค่าให้รองรับ UTF-8",
     "This means that there might be problems with certain characters in file names." : "นี้หมายความว่าอาจจะมีปัญหากับตัวอักษรบางตัวในชื่อไฟล์",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "เราขอแนะนำให้ติดตั้งแพคเกจที่จำเป็นต้องใช้ในระบบของคุณ ให้การสนับสนุนตำแหน่งที่ตั้งดังต่อไปนี้: %s",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "หากการติดตั้งของคุณไม่ได้ติดตั้งในรากของโดเมนและใช้ระบบ cron อาจมีปัญหาเกี่ยวกับการสร้าง URL เพื่อหลีกเลี่ยงปัญหาเหล่านี้โปรดไปตั้งค่า \"overwrite.cli.url\" ในไฟล์ config.php ของคุณไปยังเส้นทาง webroot ของการติดตั้งของคุณ (แนะนำ: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "มันเป็นไปไม่ได้ที่จะดำเนินการ cronjob ผ่านทาง CLI ข้อผิดพลาดทางเทคนิคต่อไปนี้จะปรากฏ:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "การทำธุรกรรมล็อคไฟล์จะใช้ฐานข้อมูลเป็นล็อคแบ็กเอนด์ สำหรับประสิทธิภาพที่ดีที่สุดก็ควรที่จะกำหนดค่า memcache สำหรับล็อค ดูเพิ่มเติมได้จาก <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "กรุณาตรวจสอบ <a target=\"_blank\" href=\"%s\">คู่มือการติดตั้ง</a> และตรวจสอบข้อผิดพลาดหรือคำเตือนใน <a href=\"#log-section\">บันทึก</a>",
     "All checks passed." : "ผ่านการตรวจสอบทั้งหมด",
     "Open documentation" : "เปิดเอกสาร",
-- 
GitLab


From fd745228043d04b5082995d552803e486094643c Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Sun, 13 Sep 2015 11:35:21 +0200
Subject: [PATCH 234/783] make resolve public to avoid boiler plate code

add resolve to public interface
---
 lib/private/appframework/utility/simplecontainer.php |  2 +-
 lib/public/icontainer.php                            | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index 83a08acde26..5d7ea48752b 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -77,7 +77,7 @@ class SimpleContainer extends Container implements IContainer {
 	 * @return stdClass
 	 * @throws QueryException if the class could not be found or instantiated
 	 */
-	private function resolve($name) {
+	public function resolve($name) {
 		$baseMsg = 'Could not resolve ' . $name . '!';
 		try {
 			$class = new ReflectionClass($name);
diff --git a/lib/public/icontainer.php b/lib/public/icontainer.php
index 75ff5e97b69..ffd1d16c97e 100644
--- a/lib/public/icontainer.php
+++ b/lib/public/icontainer.php
@@ -43,6 +43,16 @@ use Closure;
  */
 interface IContainer {
 
+	/**
+	 * If a parameter is not registered in the container try to instantiate it
+	 * by using reflection to find out how to build the class
+	 * @param string $name the class name to resolve
+	 * @return \stdClass
+	 * @since 8.2.0
+	 * @throws QueryException if the class could not be found or instantiated
+	 */
+	public function resolve($name);
+
 	/**
 	 * Look up a service for a given name in the container.
 	 *
-- 
GitLab


From 522619f90e2855cf10ee16147a1c20cf24da689d Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Sun, 13 Sep 2015 21:41:02 +0100
Subject: [PATCH 235/783] Fix dependency check for Swift and SMB_OC

Mistake caused during merging, where the API had changed
---
 apps/files_external/lib/backend/smb_oc.php | 4 +++-
 apps/files_external/lib/backend/swift.php  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php
index 3621682fb8f..d21b0ddaf42 100644
--- a/apps/files_external/lib/backend/smb_oc.php
+++ b/apps/files_external/lib/backend/smb_oc.php
@@ -28,12 +28,15 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Auth\Password\SessionCredentials;
 use \OCA\Files_External\Lib\StorageConfig;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 /**
  * Deprecated SMB_OC class - use SMB with the password::sessioncredentials auth mechanism
  */
 class SMB_OC extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, SessionCredentials $legacyAuth) {
 		$this
 			->setIdentifier('\OC\Files\Storage\SMB_OC')
@@ -48,7 +51,6 @@ class SMB_OC extends Backend {
 				(new DefinitionParameter('root', $l->t('Remote subfolder')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
-			->setDependencyCheck('\OC\Files\Storage\SMB::checkDependencies')
 			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
 			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
 			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
diff --git a/apps/files_external/lib/backend/swift.php b/apps/files_external/lib/backend/swift.php
index c0ac7c08345..2e14855206c 100644
--- a/apps/files_external/lib/backend/swift.php
+++ b/apps/files_external/lib/backend/swift.php
@@ -28,9 +28,12 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Auth\OpenStack\OpenStack;
 use \OCA\Files_External\Lib\Auth\OpenStack\Rackspace;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 class Swift extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
 		$this
 			->setIdentifier('swift')
@@ -46,7 +49,6 @@ class Swift extends Backend {
 				(new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
-			->setDependencyCheck('\OC\Files\Storage\Swift::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
 			->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
 				if (isset($params['options']['key']) && $params['options']['key']) {
-- 
GitLab


From f7e66d49fc4e374071d60109337f47d2d102b53a Mon Sep 17 00:00:00 2001
From: Individual IT Services <info@individual-it.net>
Date: Mon, 14 Sep 2015 10:42:00 +0545
Subject: [PATCH 236/783] allow ".." in folder names

".." are valid in folder names, only ".." by itself is invalid
fix for #18987
---
 apps/files/ajax/upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 4bc2ce8bdf3..7ff02d8db8e 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -148,7 +148,7 @@ if ($maxUploadFileSize >= 0 and $totalSize > $maxUploadFileSize) {
 }
 
 $result = array();
-if (strpos($dir, '..') === false) {
+if (\OC\Files\Filesystem::isValidPath($dir) === true) {
 	$fileCount = count($files['name']);
 	for ($i = 0; $i < $fileCount; $i++) {
 
-- 
GitLab


From 211a2437840ec6897e377a5025f85aec27618263 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 14 Sep 2015 01:55:35 -0400
Subject: [PATCH 237/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/da.js             |  2 +-
 apps/encryption/l10n/da.json           |  2 +-
 apps/encryption/l10n/nb_NO.js          |  3 ++
 apps/encryption/l10n/nb_NO.json        |  3 ++
 apps/files/l10n/az.js                  | 10 +++++
 apps/files/l10n/az.json                | 10 +++++
 apps/files/l10n/cs_CZ.js               |  2 +
 apps/files/l10n/cs_CZ.json             |  2 +
 apps/files/l10n/da.js                  |  4 +-
 apps/files/l10n/da.json                |  4 +-
 apps/files/l10n/nb_NO.js               |  5 +++
 apps/files/l10n/nb_NO.json             |  5 +++
 apps/files_external/l10n/af_ZA.js      |  6 +--
 apps/files_external/l10n/af_ZA.json    |  6 +--
 apps/files_external/l10n/ar.js         |  8 ++--
 apps/files_external/l10n/ar.json       |  8 ++--
 apps/files_external/l10n/ast.js        | 25 +++++--------
 apps/files_external/l10n/ast.json      | 25 +++++--------
 apps/files_external/l10n/az.js         | 28 +++++---------
 apps/files_external/l10n/az.json       | 28 +++++---------
 apps/files_external/l10n/bg_BG.js      | 29 ++++++---------
 apps/files_external/l10n/bg_BG.json    | 29 ++++++---------
 apps/files_external/l10n/bn_BD.js      |  8 ++--
 apps/files_external/l10n/bn_BD.json    |  8 ++--
 apps/files_external/l10n/bn_IN.js      |  4 +-
 apps/files_external/l10n/bn_IN.json    |  4 +-
 apps/files_external/l10n/bs.js         |  4 +-
 apps/files_external/l10n/bs.json       |  4 +-
 apps/files_external/l10n/ca.js         | 30 ++++++---------
 apps/files_external/l10n/ca.json       | 30 ++++++---------
 apps/files_external/l10n/cs_CZ.js      | 32 ++++++----------
 apps/files_external/l10n/cs_CZ.json    | 32 ++++++----------
 apps/files_external/l10n/cy_GB.js      |  4 +-
 apps/files_external/l10n/cy_GB.json    |  4 +-
 apps/files_external/l10n/da.js         | 39 ++++++++------------
 apps/files_external/l10n/da.json       | 39 ++++++++------------
 apps/files_external/l10n/de.js         | 30 ++++++---------
 apps/files_external/l10n/de.json       | 30 ++++++---------
 apps/files_external/l10n/de_AT.js      |  6 +--
 apps/files_external/l10n/de_AT.json    |  6 +--
 apps/files_external/l10n/de_DE.js      | 30 ++++++---------
 apps/files_external/l10n/de_DE.json    | 30 ++++++---------
 apps/files_external/l10n/el.js         | 33 ++++++-----------
 apps/files_external/l10n/el.json       | 33 ++++++-----------
 apps/files_external/l10n/en_GB.js      | 30 ++++++---------
 apps/files_external/l10n/en_GB.json    | 30 ++++++---------
 apps/files_external/l10n/eo.js         | 17 ++++-----
 apps/files_external/l10n/eo.json       | 17 ++++-----
 apps/files_external/l10n/es.js         | 32 ++++++----------
 apps/files_external/l10n/es.json       | 32 ++++++----------
 apps/files_external/l10n/es_AR.js      |  7 ++--
 apps/files_external/l10n/es_AR.json    |  7 ++--
 apps/files_external/l10n/es_CL.js      |  4 +-
 apps/files_external/l10n/es_CL.json    |  4 +-
 apps/files_external/l10n/es_MX.js      |  7 ++--
 apps/files_external/l10n/es_MX.json    |  7 ++--
 apps/files_external/l10n/et_EE.js      | 30 ++++++---------
 apps/files_external/l10n/et_EE.json    | 30 ++++++---------
 apps/files_external/l10n/eu.js         | 23 ++++--------
 apps/files_external/l10n/eu.json       | 23 ++++--------
 apps/files_external/l10n/fa.js         |  7 ++--
 apps/files_external/l10n/fa.json       |  7 ++--
 apps/files_external/l10n/fi_FI.js      | 28 ++++++--------
 apps/files_external/l10n/fi_FI.json    | 28 ++++++--------
 apps/files_external/l10n/fr.js         | 33 ++++++-----------
 apps/files_external/l10n/fr.json       | 33 ++++++-----------
 apps/files_external/l10n/gl.js         | 30 ++++++---------
 apps/files_external/l10n/gl.json       | 30 ++++++---------
 apps/files_external/l10n/he.js         |  6 +--
 apps/files_external/l10n/he.json       |  6 +--
 apps/files_external/l10n/hi.js         |  6 +--
 apps/files_external/l10n/hi.json       |  6 +--
 apps/files_external/l10n/hr.js         | 22 ++++-------
 apps/files_external/l10n/hr.json       | 22 ++++-------
 apps/files_external/l10n/hu_HU.js      | 14 +++----
 apps/files_external/l10n/hu_HU.json    | 14 +++----
 apps/files_external/l10n/ia.js         |  4 +-
 apps/files_external/l10n/ia.json       |  4 +-
 apps/files_external/l10n/id.js         | 33 ++++++-----------
 apps/files_external/l10n/id.json       | 33 ++++++-----------
 apps/files_external/l10n/is.js         |  6 +--
 apps/files_external/l10n/is.json       |  6 +--
 apps/files_external/l10n/it.js         | 33 ++++++-----------
 apps/files_external/l10n/it.json       | 33 ++++++-----------
 apps/files_external/l10n/ja.js         | 30 ++++++---------
 apps/files_external/l10n/ja.json       | 30 ++++++---------
 apps/files_external/l10n/ka_GE.js      |  7 ++--
 apps/files_external/l10n/ka_GE.json    |  7 ++--
 apps/files_external/l10n/km.js         |  6 +--
 apps/files_external/l10n/km.json       |  6 +--
 apps/files_external/l10n/kn.js         |  6 +--
 apps/files_external/l10n/kn.json       |  6 +--
 apps/files_external/l10n/ko.js         | 33 ++++++-----------
 apps/files_external/l10n/ko.json       | 33 ++++++-----------
 apps/files_external/l10n/ku_IQ.js      |  4 +-
 apps/files_external/l10n/ku_IQ.json    |  4 +-
 apps/files_external/l10n/lb.js         |  6 +--
 apps/files_external/l10n/lb.json       |  6 +--
 apps/files_external/l10n/lt_LT.js      |  7 ++--
 apps/files_external/l10n/lt_LT.json    |  7 ++--
 apps/files_external/l10n/lv.js         |  6 +--
 apps/files_external/l10n/lv.json       |  6 +--
 apps/files_external/l10n/mk.js         |  7 ++--
 apps/files_external/l10n/mk.json       |  7 ++--
 apps/files_external/l10n/mn.js         |  4 +-
 apps/files_external/l10n/mn.json       |  4 +-
 apps/files_external/l10n/ms_MY.js      |  4 +-
 apps/files_external/l10n/ms_MY.json    |  4 +-
 apps/files_external/l10n/nb_NO.js      | 51 ++++++++++++++++----------
 apps/files_external/l10n/nb_NO.json    | 51 ++++++++++++++++----------
 apps/files_external/l10n/nl.js         | 33 ++++++-----------
 apps/files_external/l10n/nl.json       | 33 ++++++-----------
 apps/files_external/l10n/nn_NO.js      |  6 +--
 apps/files_external/l10n/nn_NO.json    |  6 +--
 apps/files_external/l10n/oc.js         | 29 +++++----------
 apps/files_external/l10n/oc.json       | 29 +++++----------
 apps/files_external/l10n/pa.js         |  2 +-
 apps/files_external/l10n/pa.json       |  2 +-
 apps/files_external/l10n/pl.js         | 30 ++++++---------
 apps/files_external/l10n/pl.json       | 30 ++++++---------
 apps/files_external/l10n/pt_BR.js      | 33 ++++++-----------
 apps/files_external/l10n/pt_BR.json    | 33 ++++++-----------
 apps/files_external/l10n/pt_PT.js      | 31 ++++++----------
 apps/files_external/l10n/pt_PT.json    | 31 ++++++----------
 apps/files_external/l10n/ro.js         |  9 +++--
 apps/files_external/l10n/ro.json       |  9 +++--
 apps/files_external/l10n/ru.js         | 30 ++++++---------
 apps/files_external/l10n/ru.json       | 30 ++++++---------
 apps/files_external/l10n/si_LK.js      |  6 +--
 apps/files_external/l10n/si_LK.json    |  6 +--
 apps/files_external/l10n/sk_SK.js      | 29 ++++++---------
 apps/files_external/l10n/sk_SK.json    | 29 ++++++---------
 apps/files_external/l10n/sl.js         | 30 ++++++---------
 apps/files_external/l10n/sl.json       | 30 ++++++---------
 apps/files_external/l10n/sq.js         |  6 +--
 apps/files_external/l10n/sq.json       |  6 +--
 apps/files_external/l10n/sr.js         | 30 ++++++---------
 apps/files_external/l10n/sr.json       | 30 ++++++---------
 apps/files_external/l10n/sr@latin.js   | 22 ++++-------
 apps/files_external/l10n/sr@latin.json | 22 ++++-------
 apps/files_external/l10n/sv.js         | 25 +++++--------
 apps/files_external/l10n/sv.json       | 25 +++++--------
 apps/files_external/l10n/ta_LK.js      |  6 +--
 apps/files_external/l10n/ta_LK.json    |  6 +--
 apps/files_external/l10n/te.js         |  2 +-
 apps/files_external/l10n/te.json       |  2 +-
 apps/files_external/l10n/th_TH.js      | 33 ++++++-----------
 apps/files_external/l10n/th_TH.json    | 33 ++++++-----------
 apps/files_external/l10n/tr.js         | 33 ++++++-----------
 apps/files_external/l10n/tr.json       | 33 ++++++-----------
 apps/files_external/l10n/ug.js         |  6 +--
 apps/files_external/l10n/ug.json       |  6 +--
 apps/files_external/l10n/uk.js         | 29 ++++++---------
 apps/files_external/l10n/uk.json       | 29 ++++++---------
 apps/files_external/l10n/ur_PK.js      |  4 +-
 apps/files_external/l10n/ur_PK.json    |  4 +-
 apps/files_external/l10n/vi.js         |  6 +--
 apps/files_external/l10n/vi.json       |  6 +--
 apps/files_external/l10n/zh_CN.js      | 12 +++---
 apps/files_external/l10n/zh_CN.json    | 12 +++---
 apps/files_external/l10n/zh_HK.js      |  6 +--
 apps/files_external/l10n/zh_HK.json    |  6 +--
 apps/files_external/l10n/zh_TW.js      |  7 ++--
 apps/files_external/l10n/zh_TW.json    |  7 ++--
 apps/files_sharing/l10n/cs_CZ.js       |  3 ++
 apps/files_sharing/l10n/cs_CZ.json     |  3 ++
 apps/files_sharing/l10n/da.js          |  2 +
 apps/files_sharing/l10n/da.json        |  2 +
 apps/files_sharing/l10n/el.js          |  1 +
 apps/files_sharing/l10n/el.json        |  1 +
 apps/files_sharing/l10n/it.js          |  2 +
 apps/files_sharing/l10n/it.json        |  2 +
 apps/files_sharing/l10n/nb_NO.js       |  3 ++
 apps/files_sharing/l10n/nb_NO.json     |  3 ++
 apps/user_ldap/l10n/nl.js              |  4 +-
 apps/user_ldap/l10n/nl.json            |  4 +-
 core/l10n/cs_CZ.js                     |  1 +
 core/l10n/cs_CZ.json                   |  1 +
 lib/l10n/cs_CZ.js                      |  1 +
 lib/l10n/cs_CZ.json                    |  1 +
 lib/l10n/da.js                         |  2 +-
 lib/l10n/da.json                       |  2 +-
 lib/l10n/nb_NO.js                      |  2 +
 lib/l10n/nb_NO.json                    |  2 +
 settings/l10n/cs_CZ.js                 |  7 ++++
 settings/l10n/cs_CZ.json               |  7 ++++
 settings/l10n/el.js                    |  2 +
 settings/l10n/el.json                  |  2 +
 settings/l10n/id.js                    |  3 ++
 settings/l10n/id.json                  |  3 ++
 settings/l10n/it.js                    |  2 +
 settings/l10n/it.json                  |  2 +
 settings/l10n/nb_NO.js                 | 15 ++++++++
 settings/l10n/nb_NO.json               | 15 ++++++++
 194 files changed, 1232 insertions(+), 1628 deletions(-)

diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index b1b2b778e94..b5ca0a29e0c 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -27,7 +27,7 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar",
     "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
-    "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.",
+    "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig på ny.",
     "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hejsa,\n\nadministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
     "The share will expire on %s." : "Delingen vil udløbe om %s.",
     "Cheers!" : "Hej!",
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index 8f6b202d590..1ead926ca7c 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -25,7 +25,7 @@
     "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar",
     "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
-    "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.",
+    "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig på ny.",
     "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hejsa,\n\nadministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
     "The share will expire on %s." : "Delingen vil udløbe om %s.",
     "Cheers!" : "Hej!",
diff --git a/apps/encryption/l10n/nb_NO.js b/apps/encryption/l10n/nb_NO.js
index 460b8190488..d5ce6618689 100644
--- a/apps/encryption/l10n/nb_NO.js
+++ b/apps/encryption/l10n/nb_NO.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
     "Encryption App is enabled and ready" : "Krypterings-appen er aktivert og klar",
+    "one-time password for server-side-encryption" : "engangspassord for serverkryptering",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke lese denne filen, som sannsynligvis er en delt fil. Be eieren av filen om å dele den med deg på nytt.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hei,\n\nAdministratoren har aktivert serverkryptering. Filene dine er blitt kryptert med passordet '%s'.\n\nVennligst logg inn på web-grensesnittet, gå til seksjonen 'ownCloud grunnleggende krypteringsmodul' i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet 'gammelt påloggingspassord' sammen med ditt nåværende påloggingspassord.\n\n",
     "The share will expire on %s." : "Delingen vil opphøre %s.",
     "Cheers!" : "Ha det!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hei,<br><br>Administratoren har aktivert serverkryptering. Filene dine er blitt kryptert med passordet <strong>%s</strong>.<br><br>Vennligst logg inn på web-grensesnittet, gå til seksjonen \"ownCloud grunnleggende krypteringsmodul\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet \"gammelt påloggingspassord\" sammen med ditt nåværende påloggingspassord.<br><br>",
     "Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
     "Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt.",
diff --git a/apps/encryption/l10n/nb_NO.json b/apps/encryption/l10n/nb_NO.json
index 8efde0eb05b..8b3e8c11747 100644
--- a/apps/encryption/l10n/nb_NO.json
+++ b/apps/encryption/l10n/nb_NO.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
     "Encryption App is enabled and ready" : "Krypterings-appen er aktivert og klar",
+    "one-time password for server-side-encryption" : "engangspassord for serverkryptering",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke lese denne filen, som sannsynligvis er en delt fil. Be eieren av filen om å dele den med deg på nytt.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hei,\n\nAdministratoren har aktivert serverkryptering. Filene dine er blitt kryptert med passordet '%s'.\n\nVennligst logg inn på web-grensesnittet, gå til seksjonen 'ownCloud grunnleggende krypteringsmodul' i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet 'gammelt påloggingspassord' sammen med ditt nåværende påloggingspassord.\n\n",
     "The share will expire on %s." : "Delingen vil opphøre %s.",
     "Cheers!" : "Ha det!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hei,<br><br>Administratoren har aktivert serverkryptering. Filene dine er blitt kryptert med passordet <strong>%s</strong>.<br><br>Vennligst logg inn på web-grensesnittet, gå til seksjonen \"ownCloud grunnleggende krypteringsmodul\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet \"gammelt påloggingspassord\" sammen med ditt nåværende påloggingspassord.<br><br>",
     "Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
     "Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt.",
diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js
index 7e80b0aa82d..54b17d6df55 100644
--- a/apps/files/l10n/az.js
+++ b/apps/files/l10n/az.js
@@ -36,10 +36,13 @@ OC.L10N.register(
     "Upload cancelled." : "Yüklənmə dayandırıldı.",
     "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
+    "Actions" : "İşlər",
     "Download" : "Yüklə",
     "Select" : "Seç",
     "Pending" : "Gözləmə",
     "Unable to determine date" : "Tarixi təyin etmək mümkün olmadı",
+    "This operation is forbidden" : "Bu əməliyyat qadağandır",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Bu qovluq tapılmir. Xahiş olunur jurnalları yoxlayın ya da inzibatçı ilə əlaqə saxlayın",
     "Error moving file." : "Faylın köçürülməsində səhv baş verdi.",
     "Error moving file" : "Faylın köçürülməsində səhv baş verdi",
     "Error" : "Səhv",
@@ -60,13 +63,19 @@ OC.L10N.register(
     "New" : "Yeni",
     "\"{name}\" is an invalid file name." : "\"{name}\" yalnış fayl adıdır.",
     "File name cannot be empty." : "Faylın adı boş ola bilməz.",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} məlumat anbarı doludur, fayllar artıq yenilənə və ya sinxronizasiya edilə bilməz!",
     "Your storage is full, files can not be updated or synced anymore!" : "Sizin deponuz doludur, fayllar artıq yenilənə və sinxronizasiya edilə bilməz!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} məlumat anbari demək olar ki, doludur ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Sizin depo depo demək olar ki, doludur ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["uyğun '{filter}'","uyğun '{filter}'"],
+    "Path" : "Ünvan",
+    "_%n byte_::_%n bytes_" : ["%n baytlar","%n bytes"],
     "Favorited" : "İstəkləndi",
     "Favorite" : "İstəkli",
+    "{newname} already exists" : "{newname} artıq mövcuddur",
     "Upload" : "Serverə yüklə",
     "Text file" : "Tekst faylı",
+    "New text file.txt" : "Yeni mətn file.txt",
     "Folder" : "Qovluq",
     "New folder" : "Yeni qovluq",
     "An error occurred while trying to update the tags" : "Qeydlərin yenilənməsi müddətində səhv baş verdi ",
@@ -90,6 +99,7 @@ OC.L10N.register(
     "File handling" : "Fayl emalı",
     "Maximum upload size" : "Maksimal yükləmə həcmi",
     "max. possible: " : "maks. ola bilər: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM ilə bu məna yadda saxladıldıqından 5 dəqiqə sonra işə düşə bilər. ",
     "Save" : "Saxlamaq",
     "Can not be edited from here due to insufficient permissions." : "Yetki çatışmamazlığına görə, burdan başlayaraq dəyişiklik edə bilməzsiniz.",
     "Settings" : "Quraşdırmalar",
diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json
index 83347ae9a14..14d728f248a 100644
--- a/apps/files/l10n/az.json
+++ b/apps/files/l10n/az.json
@@ -34,10 +34,13 @@
     "Upload cancelled." : "Yüklənmə dayandırıldı.",
     "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
+    "Actions" : "İşlər",
     "Download" : "Yüklə",
     "Select" : "Seç",
     "Pending" : "Gözləmə",
     "Unable to determine date" : "Tarixi təyin etmək mümkün olmadı",
+    "This operation is forbidden" : "Bu əməliyyat qadağandır",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Bu qovluq tapılmir. Xahiş olunur jurnalları yoxlayın ya da inzibatçı ilə əlaqə saxlayın",
     "Error moving file." : "Faylın köçürülməsində səhv baş verdi.",
     "Error moving file" : "Faylın köçürülməsində səhv baş verdi",
     "Error" : "Səhv",
@@ -58,13 +61,19 @@
     "New" : "Yeni",
     "\"{name}\" is an invalid file name." : "\"{name}\" yalnış fayl adıdır.",
     "File name cannot be empty." : "Faylın adı boş ola bilməz.",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} məlumat anbarı doludur, fayllar artıq yenilənə və ya sinxronizasiya edilə bilməz!",
     "Your storage is full, files can not be updated or synced anymore!" : "Sizin deponuz doludur, fayllar artıq yenilənə və sinxronizasiya edilə bilməz!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} məlumat anbari demək olar ki, doludur ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Sizin depo depo demək olar ki, doludur ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["uyğun '{filter}'","uyğun '{filter}'"],
+    "Path" : "Ünvan",
+    "_%n byte_::_%n bytes_" : ["%n baytlar","%n bytes"],
     "Favorited" : "İstəkləndi",
     "Favorite" : "İstəkli",
+    "{newname} already exists" : "{newname} artıq mövcuddur",
     "Upload" : "Serverə yüklə",
     "Text file" : "Tekst faylı",
+    "New text file.txt" : "Yeni mətn file.txt",
     "Folder" : "Qovluq",
     "New folder" : "Yeni qovluq",
     "An error occurred while trying to update the tags" : "Qeydlərin yenilənməsi müddətində səhv baş verdi ",
@@ -88,6 +97,7 @@
     "File handling" : "Fayl emalı",
     "Maximum upload size" : "Maksimal yükləmə həcmi",
     "max. possible: " : "maks. ola bilər: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM ilə bu məna yadda saxladıldıqından 5 dəqiqə sonra işə düşə bilər. ",
     "Save" : "Saxlamaq",
     "Can not be edited from here due to insufficient permissions." : "Yetki çatışmamazlığına görə, burdan başlayaraq dəyişiklik edə bilməzsiniz.",
     "Settings" : "Quraşdırmalar",
diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js
index d462c1361de..a5c1449e995 100644
--- a/apps/files/l10n/cs_CZ.js
+++ b/apps/files/l10n/cs_CZ.js
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"],
     "Favorited" : "Přidáno k oblíbeným",
     "Favorite" : "Oblíbené",
+    "{newname} already exists" : "{newname} již existuje",
     "Upload" : "Odeslat",
     "Text file" : "Textový soubor",
+    "New text file.txt" : "Nový textový soubor.txt",
     "Folder" : "Složka",
     "New folder" : "Nová složka",
     "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba",
diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json
index 56695a52489..1da4bfb8868 100644
--- a/apps/files/l10n/cs_CZ.json
+++ b/apps/files/l10n/cs_CZ.json
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"],
     "Favorited" : "Přidáno k oblíbeným",
     "Favorite" : "Oblíbené",
+    "{newname} already exists" : "{newname} již existuje",
     "Upload" : "Odeslat",
     "Text file" : "Textový soubor",
+    "New text file.txt" : "Nový textový soubor.txt",
     "Folder" : "Složka",
     "New folder" : "Nová složka",
     "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba",
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index 1ecbcb7e16f..7235176c166 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -42,7 +42,7 @@ OC.L10N.register(
     "Pending" : "Afventer",
     "Unable to determine date" : "Kan ikke fastslå datoen",
     "This operation is forbidden" : "Denne operation er forbudt",
-    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig - tjek venligst loggene eller kontakt administratoren",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig, tjek venligst loggene eller kontakt administratoren",
     "Error moving file." : "Fejl ved flytning af fil",
     "Error moving file" : "Fejl ved flytning af fil",
     "Error" : "Fejl",
@@ -72,8 +72,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Gjort til foretrukken",
     "Favorite" : "Foretrukken",
+    "{newname} already exists" : "{newname} eksistere allerede",
     "Upload" : "Upload",
     "Text file" : "Tekstfil",
+    "New text file.txt" : "Ny tekst file.txt",
     "Folder" : "Mappe",
     "New folder" : "Ny Mappe",
     "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index c85759c5640..adead6621a2 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -40,7 +40,7 @@
     "Pending" : "Afventer",
     "Unable to determine date" : "Kan ikke fastslå datoen",
     "This operation is forbidden" : "Denne operation er forbudt",
-    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig - tjek venligst loggene eller kontakt administratoren",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig, tjek venligst loggene eller kontakt administratoren",
     "Error moving file." : "Fejl ved flytning af fil",
     "Error moving file" : "Fejl ved flytning af fil",
     "Error" : "Fejl",
@@ -70,8 +70,10 @@
     "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Gjort til foretrukken",
     "Favorite" : "Foretrukken",
+    "{newname} already exists" : "{newname} eksistere allerede",
     "Upload" : "Upload",
     "Text file" : "Tekstfil",
+    "New text file.txt" : "Ny tekst file.txt",
     "Folder" : "Mappe",
     "New folder" : "Ny Mappe",
     "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne",
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index 6c7653d05e6..c91f212cf23 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -68,10 +68,14 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lagringsplass for {owner} er nesten full ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
+    "Path" : "Sti",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Er favoritt",
     "Favorite" : "Gjør til favoritt",
+    "{newname} already exists" : "{newname} finnes allerede",
     "Upload" : "Last opp",
     "Text file" : "Tekstfil",
+    "New text file.txt" : "Ny tekstfil.txt",
     "Folder" : "Mappe",
     "New folder" : "Ny mappe",
     "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av taggene",
@@ -95,6 +99,7 @@ OC.L10N.register(
     "File handling" : "Filhåndtering",
     "Maximum upload size" : "Største opplastingsstørrelse",
     "max. possible: " : "max. mulige:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Med PHP-FPM kan det ta inntil 5 minutter fra denne verdien lagres til den trer i kraft.",
     "Save" : "Lagre",
     "Can not be edited from here due to insufficient permissions." : "Kan ikke redigeres her pga. manglende rettigheter.",
     "Settings" : "Innstillinger",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index f75d26d6d1d..cd476ef3bcf 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -66,10 +66,14 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lagringsplass for {owner} er nesten full ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
+    "Path" : "Sti",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Er favoritt",
     "Favorite" : "Gjør til favoritt",
+    "{newname} already exists" : "{newname} finnes allerede",
     "Upload" : "Last opp",
     "Text file" : "Tekstfil",
+    "New text file.txt" : "Ny tekstfil.txt",
     "Folder" : "Mappe",
     "New folder" : "Ny mappe",
     "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av taggene",
@@ -93,6 +97,7 @@
     "File handling" : "Filhåndtering",
     "Maximum upload size" : "Største opplastingsstørrelse",
     "max. possible: " : "max. mulige:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Med PHP-FPM kan det ta inntil 5 minutter fra denne verdien lagres til den trer i kraft.",
     "Save" : "Lagre",
     "Can not be edited from here due to insufficient permissions." : "Kan ikke redigeres her pga. manglende rettigheter.",
     "Settings" : "Innstillinger",
diff --git a/apps/files_external/l10n/af_ZA.js b/apps/files_external/l10n/af_ZA.js
index 25c7d85256c..d28e14d67ce 100644
--- a/apps/files_external/l10n/af_ZA.js
+++ b/apps/files_external/l10n/af_ZA.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Gebruikersnaam",
-    "Share" : "Deel",
     "Personal" : "Persoonlik",
-    "Password" : "Wagwoord"
+    "Username" : "Gebruikersnaam",
+    "Password" : "Wagwoord",
+    "Share" : "Deel"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/af_ZA.json b/apps/files_external/l10n/af_ZA.json
index 6c60aac511a..53622f796ff 100644
--- a/apps/files_external/l10n/af_ZA.json
+++ b/apps/files_external/l10n/af_ZA.json
@@ -1,7 +1,7 @@
 { "translations": {
-    "Username" : "Gebruikersnaam",
-    "Share" : "Deel",
     "Personal" : "Persoonlik",
-    "Password" : "Wagwoord"
+    "Username" : "Gebruikersnaam",
+    "Password" : "Wagwoord",
+    "Share" : "Deel"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/ar.js b/apps/files_external/l10n/ar.js
index 89bd2d61730..3e7438796f4 100644
--- a/apps/files_external/l10n/ar.js
+++ b/apps/files_external/l10n/ar.js
@@ -1,10 +1,6 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "إسم المستخدم",
-    "Bucket" : "الحزمة",
-    "Host" : "المضيف",
-    "Share" : "شارك",
     "Personal" : "شخصي",
     "System" : "النظام",
     "Never" : "أبدا",
@@ -12,15 +8,19 @@ OC.L10N.register(
     "None" : "لا شيء",
     "App key" : "مفتاح التطبيق",
     "App secret" : "التطبيق السري",
+    "Username" : "إسم المستخدم",
     "Password" : "كلمة السر",
+    "Bucket" : "الحزمة",
     "Hostname" : "إسم الإستضافة",
     "Port" : "المنفذ",
     "Region" : "المنطقة",
     "WebDAV" : "WebDAV",
     "URL" : "عنوان الموقع",
+    "Host" : "المضيف",
     "Local" : "محلي",
     "Location" : "المكان",
     "ownCloud" : "ownCloud",
+    "Share" : "شارك",
     "Name" : "اسم",
     "Folder name" : "اسم المجلد",
     "Configuration" : "إعداد",
diff --git a/apps/files_external/l10n/ar.json b/apps/files_external/l10n/ar.json
index e4d4cd3f1e6..29423a07906 100644
--- a/apps/files_external/l10n/ar.json
+++ b/apps/files_external/l10n/ar.json
@@ -1,8 +1,4 @@
 { "translations": {
-    "Username" : "إسم المستخدم",
-    "Bucket" : "الحزمة",
-    "Host" : "المضيف",
-    "Share" : "شارك",
     "Personal" : "شخصي",
     "System" : "النظام",
     "Never" : "أبدا",
@@ -10,15 +6,19 @@
     "None" : "لا شيء",
     "App key" : "مفتاح التطبيق",
     "App secret" : "التطبيق السري",
+    "Username" : "إسم المستخدم",
     "Password" : "كلمة السر",
+    "Bucket" : "الحزمة",
     "Hostname" : "إسم الإستضافة",
     "Port" : "المنفذ",
     "Region" : "المنطقة",
     "WebDAV" : "WebDAV",
     "URL" : "عنوان الموقع",
+    "Host" : "المضيف",
     "Local" : "محلي",
     "Location" : "المكان",
     "ownCloud" : "ownCloud",
+    "Share" : "شارك",
     "Name" : "اسم",
     "Folder name" : "اسم المجلد",
     "Configuration" : "إعداد",
diff --git a/apps/files_external/l10n/ast.js b/apps/files_external/l10n/ast.js
index 0e29e30f865..b6084cc1545 100644
--- a/apps/files_external/l10n/ast.js
+++ b/apps/files_external/l10n/ast.js
@@ -4,22 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Pasu 1 fallíu. Esceición: %s",
     "Step 2 failed. Exception: %s" : "Pasu 2 fallíu. Esceición: %s",
     "External storage" : "Almacenamientu esternu",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nome d'usuariu",
-    "Bucket" : "Depósitu",
-    "Region (optional for OpenStack Object Storage)" : "Rexón (opcional pa OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (necesaria pa Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome d'inquilín (necesariu pa OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (necesaria pa OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempu d'espera de peticiones HTTP en segundos",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
-    "Host" : "Sirvidor",
-    "Username as share" : "Nome d'usuariu como Compartición",
-    "Share" : "Compartir",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Public key" : "Clave pública",
     "Personal" : "Personal",
     "System" : "Sistema",
     "Grant access" : "Conceder accesu",
@@ -32,8 +16,12 @@ OC.L10N.register(
     "App secret" : "App secreta",
     "Client ID" : "ID de veceru",
     "Client secret" : "Veceru secretu",
+    "Username" : "Nome d'usuariu",
     "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Depósitu",
     "Hostname" : "Nome d'agospiu",
     "Port" : "Puertu",
     "Region" : "Rexón",
@@ -41,13 +29,18 @@ OC.L10N.register(
     "Enable Path Style" : "Habilitar Estilu de ruta",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Sirvidor",
     "Secure ftps://" : "Secure ftps://",
     "Local" : "Llocal",
     "Location" : "Llocalización",
     "ownCloud" : "ownCloud",
     "Root" : "Raíz",
+    "Share" : "Compartir",
+    "Username as share" : "Nome d'usuariu como Compartición",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
diff --git a/apps/files_external/l10n/ast.json b/apps/files_external/l10n/ast.json
index e768ff3741f..ccf882952ae 100644
--- a/apps/files_external/l10n/ast.json
+++ b/apps/files_external/l10n/ast.json
@@ -2,22 +2,6 @@
     "Step 1 failed. Exception: %s" : "Pasu 1 fallíu. Esceición: %s",
     "Step 2 failed. Exception: %s" : "Pasu 2 fallíu. Esceición: %s",
     "External storage" : "Almacenamientu esternu",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nome d'usuariu",
-    "Bucket" : "Depósitu",
-    "Region (optional for OpenStack Object Storage)" : "Rexón (opcional pa OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (necesaria pa Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome d'inquilín (necesariu pa OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (necesaria pa OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempu d'espera de peticiones HTTP en segundos",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
-    "Host" : "Sirvidor",
-    "Username as share" : "Nome d'usuariu como Compartición",
-    "Share" : "Compartir",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Public key" : "Clave pública",
     "Personal" : "Personal",
     "System" : "Sistema",
     "Grant access" : "Conceder accesu",
@@ -30,8 +14,12 @@
     "App secret" : "App secreta",
     "Client ID" : "ID de veceru",
     "Client secret" : "Veceru secretu",
+    "Username" : "Nome d'usuariu",
     "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Depósitu",
     "Hostname" : "Nome d'agospiu",
     "Port" : "Puertu",
     "Region" : "Rexón",
@@ -39,13 +27,18 @@
     "Enable Path Style" : "Habilitar Estilu de ruta",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Sirvidor",
     "Secure ftps://" : "Secure ftps://",
     "Local" : "Llocal",
     "Location" : "Llocalización",
     "ownCloud" : "ownCloud",
     "Root" : "Raíz",
+    "Share" : "Compartir",
+    "Username as share" : "Nome d'usuariu como Compartición",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
diff --git a/apps/files_external/l10n/az.js b/apps/files_external/l10n/az.js
index d92296e416b..9c86576c7fc 100644
--- a/apps/files_external/l10n/az.js
+++ b/apps/files_external/l10n/az.js
@@ -4,22 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "1-ci addım səhv oldu. İstisna: %s",
     "Step 2 failed. Exception: %s" : "2-ci addım. İstisna: %s",
     "External storage" : "Kənar informasıya daşıyıcısı",
-    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
-    "Username" : "İstifadəçi adı",
-    "Bucket" : "Vedrə",
-    "Region (optional for OpenStack Object Storage)" : "Ərazi(İstəkdən asılı olaraq OpenStack Obyekt Deposu üçündür)",
-    "API Key (required for Rackspace Cloud Files)" : "API açar (Rackspace Cloud Fayllar üçün tələb edilir)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kirayəçiadı (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Password (required for OpenStack Object Storage)" : "Şifrə (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Service Name (required for OpenStack Object Storage)" : "Servis adi (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Şəxsiyyətin son nöqtəsi URL-i (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Timeout of HTTP requests in seconds" : "HTTP müraciətlər üçün saniyələrlə olan vaxtın bitməsi",
-    "SMB / CIFS using OC login" : "OC login istifadə edir SMB / CIFS",
-    "Host" : "Şəbəkədə ünvan",
-    "Username as share" : "Paylaşım üçün istifadəçi adı",
-    "Share" : "Yayımla",
-    "Remote subfolder" : "Uzaq altqovluğu",
-    "Public key" : "İctimai açar",
     "Storage with id \"%i\" not found" : "\"%i\"-li depo tapılmadı",
     "Invalid mount point" : "Yalnış mount nöqtəsi",
     "Invalid storage backend \"%s\"" : "Yalnış depo arxasonu \"%s\"",
@@ -27,18 +11,21 @@ OC.L10N.register(
     "System" : "Sistem",
     "Grant access" : "Yetkinin verilməsi",
     "Access granted" : "Yetki verildi",
+    "Generate keys" : "Açarları generasiya et",
+    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
     "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.",
     "(group)" : "(qrup)",
     "Saved" : "Saxlanıldı",
-    "Generate keys" : "Açarları generasiya et",
-    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
     "None" : "Heç bir",
     "App key" : "Proqram açarı",
     "App secret" : "Proqram sirri",
     "Client ID" : "Müştəri İD-s",
     "Client secret" : "Müxtəri sirri",
+    "Username" : "İstifadəçi adı",
     "Password" : "Şifrə",
+    "Public key" : "İctimai açar",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Vedrə",
     "Hostname" : "Sahibadı",
     "Port" : "Port",
     "Region" : "Ərazi",
@@ -46,11 +33,16 @@ OC.L10N.register(
     "Enable Path Style" : "Ünvan stilini işə sal",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Uzaq altqovluğu",
     "Secure https://" : "Təhlükəsiz https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Şəbəkədə ünvan",
     "Secure ftps://" : "Təhlükəsiz ftps://",
     "Local" : "Yerli",
     "Location" : "Yerləşdiyiniz ünvan",
+    "Share" : "Yayımla",
+    "Username as share" : "Paylaşım üçün istifadəçi adı",
+    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
     "<b>Note:</b> " : "<b>Qeyd:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də cURL dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də FTP dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
diff --git a/apps/files_external/l10n/az.json b/apps/files_external/l10n/az.json
index 98c1117243b..fa300deea8d 100644
--- a/apps/files_external/l10n/az.json
+++ b/apps/files_external/l10n/az.json
@@ -2,22 +2,6 @@
     "Step 1 failed. Exception: %s" : "1-ci addım səhv oldu. İstisna: %s",
     "Step 2 failed. Exception: %s" : "2-ci addım. İstisna: %s",
     "External storage" : "Kənar informasıya daşıyıcısı",
-    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
-    "Username" : "İstifadəçi adı",
-    "Bucket" : "Vedrə",
-    "Region (optional for OpenStack Object Storage)" : "Ərazi(İstəkdən asılı olaraq OpenStack Obyekt Deposu üçündür)",
-    "API Key (required for Rackspace Cloud Files)" : "API açar (Rackspace Cloud Fayllar üçün tələb edilir)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kirayəçiadı (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Password (required for OpenStack Object Storage)" : "Şifrə (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Service Name (required for OpenStack Object Storage)" : "Servis adi (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Şəxsiyyətin son nöqtəsi URL-i (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Timeout of HTTP requests in seconds" : "HTTP müraciətlər üçün saniyələrlə olan vaxtın bitməsi",
-    "SMB / CIFS using OC login" : "OC login istifadə edir SMB / CIFS",
-    "Host" : "Şəbəkədə ünvan",
-    "Username as share" : "Paylaşım üçün istifadəçi adı",
-    "Share" : "Yayımla",
-    "Remote subfolder" : "Uzaq altqovluğu",
-    "Public key" : "İctimai açar",
     "Storage with id \"%i\" not found" : "\"%i\"-li depo tapılmadı",
     "Invalid mount point" : "Yalnış mount nöqtəsi",
     "Invalid storage backend \"%s\"" : "Yalnış depo arxasonu \"%s\"",
@@ -25,18 +9,21 @@
     "System" : "Sistem",
     "Grant access" : "Yetkinin verilməsi",
     "Access granted" : "Yetki verildi",
+    "Generate keys" : "Açarları generasiya et",
+    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
     "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.",
     "(group)" : "(qrup)",
     "Saved" : "Saxlanıldı",
-    "Generate keys" : "Açarları generasiya et",
-    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
     "None" : "Heç bir",
     "App key" : "Proqram açarı",
     "App secret" : "Proqram sirri",
     "Client ID" : "Müştəri İD-s",
     "Client secret" : "Müxtəri sirri",
+    "Username" : "İstifadəçi adı",
     "Password" : "Şifrə",
+    "Public key" : "İctimai açar",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Vedrə",
     "Hostname" : "Sahibadı",
     "Port" : "Port",
     "Region" : "Ərazi",
@@ -44,11 +31,16 @@
     "Enable Path Style" : "Ünvan stilini işə sal",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Uzaq altqovluğu",
     "Secure https://" : "Təhlükəsiz https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Şəbəkədə ünvan",
     "Secure ftps://" : "Təhlükəsiz ftps://",
     "Local" : "Yerli",
     "Location" : "Yerləşdiyiniz ünvan",
+    "Share" : "Yayımla",
+    "Username as share" : "Paylaşım üçün istifadəçi adı",
+    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
     "<b>Note:</b> " : "<b>Qeyd:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də cURL dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də FTP dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
diff --git a/apps/files_external/l10n/bg_BG.js b/apps/files_external/l10n/bg_BG.js
index 2344fcb17cc..70eae9d1abd 100644
--- a/apps/files_external/l10n/bg_BG.js
+++ b/apps/files_external/l10n/bg_BG.js
@@ -4,40 +4,28 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Стъпка 1 - неуспешна. Грешка: %s",
     "Step 2 failed. Exception: %s" : "Стъпка 2 - неуспешна. Грешка: %s",
     "External storage" : "Външно дисково пространство",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Потребителско Име",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Регион (незадължително за OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (задължително за Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (задължително за OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Парола (задължително за OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (задължително за OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (задължително за OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout за HTTP заявки в секунди",
-    "SMB / CIFS using OC login" : "SMB / CIFS използвайки OC профил",
-    "Host" : "Сървър",
-    "Username as share" : "Потребителско име като споделена папка",
-    "Share" : "Споделяне",
-    "Remote subfolder" : "Външна подпапка",
-    "Public key" : "Публичен ключ",
     "Storage with id \"%i\" not found" : "Хранилище с име \"%i\" не е намерено",
     "Invalid mount point" : "Невалиден път за мониторане на файлова система",
     "Personal" : "Личен",
     "System" : "Системен",
     "Grant access" : "Разреши достъп",
     "Access granted" : "Достъпът разрешен",
+    "Generate keys" : "Генериране на криптографски ключове",
+    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
     "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
     "(group)" : "(група)",
     "Saved" : "Запазено",
-    "Generate keys" : "Генериране на криптографски ключове",
-    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
     "None" : "Няма",
     "App key" : "App key",
     "App secret" : "App secret",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "Username" : "Потребителско Име",
     "Password" : "Парола",
+    "API key" : "API ключ",
+    "Public key" : "Публичен ключ",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Сървър",
     "Port" : "Порт",
     "Region" : "Регион",
@@ -45,13 +33,18 @@ OC.L10N.register(
     "Enable Path Style" : "Включи Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "Интернет Адрес",
+    "Remote subfolder" : "Външна подпапка",
     "Secure https://" : "Подсигурен https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Сървър",
     "Secure ftps://" : "Сигурен ftps://",
     "Local" : "Локален",
     "Location" : "Местоположение",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Споделяне",
+    "Username as share" : "Потребителско име като споделена папка",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Бележка:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
diff --git a/apps/files_external/l10n/bg_BG.json b/apps/files_external/l10n/bg_BG.json
index 5dc36e1f245..731897d4a3a 100644
--- a/apps/files_external/l10n/bg_BG.json
+++ b/apps/files_external/l10n/bg_BG.json
@@ -2,40 +2,28 @@
     "Step 1 failed. Exception: %s" : "Стъпка 1 - неуспешна. Грешка: %s",
     "Step 2 failed. Exception: %s" : "Стъпка 2 - неуспешна. Грешка: %s",
     "External storage" : "Външно дисково пространство",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Потребителско Име",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Регион (незадължително за OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (задължително за Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (задължително за OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Парола (задължително за OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (задължително за OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (задължително за OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout за HTTP заявки в секунди",
-    "SMB / CIFS using OC login" : "SMB / CIFS използвайки OC профил",
-    "Host" : "Сървър",
-    "Username as share" : "Потребителско име като споделена папка",
-    "Share" : "Споделяне",
-    "Remote subfolder" : "Външна подпапка",
-    "Public key" : "Публичен ключ",
     "Storage with id \"%i\" not found" : "Хранилище с име \"%i\" не е намерено",
     "Invalid mount point" : "Невалиден път за мониторане на файлова система",
     "Personal" : "Личен",
     "System" : "Системен",
     "Grant access" : "Разреши достъп",
     "Access granted" : "Достъпът разрешен",
+    "Generate keys" : "Генериране на криптографски ключове",
+    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
     "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
     "(group)" : "(група)",
     "Saved" : "Запазено",
-    "Generate keys" : "Генериране на криптографски ключове",
-    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
     "None" : "Няма",
     "App key" : "App key",
     "App secret" : "App secret",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "Username" : "Потребителско Име",
     "Password" : "Парола",
+    "API key" : "API ключ",
+    "Public key" : "Публичен ключ",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Сървър",
     "Port" : "Порт",
     "Region" : "Регион",
@@ -43,13 +31,18 @@
     "Enable Path Style" : "Включи Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "Интернет Адрес",
+    "Remote subfolder" : "Външна подпапка",
     "Secure https://" : "Подсигурен https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Сървър",
     "Secure ftps://" : "Сигурен ftps://",
     "Local" : "Локален",
     "Location" : "Местоположение",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Споделяне",
+    "Username as share" : "Потребителско име като споделена папка",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Бележка:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
diff --git a/apps/files_external/l10n/bn_BD.js b/apps/files_external/l10n/bn_BD.js
index bc34c5a530f..3676a1a8b51 100644
--- a/apps/files_external/l10n/bn_BD.js
+++ b/apps/files_external/l10n/bn_BD.js
@@ -3,10 +3,6 @@ OC.L10N.register(
     {
     "Step 1 failed. Exception: %s" : "প্রথম ধাপ ব্যার্থ। ব্যতিক্রম: %s",
     "External storage" : "বাহ্যিক সংরক্ষণাগার",
-    "Username" : "ব্যবহারকারী",
-    "Bucket" : "বালতি",
-    "Host" : "হোস্ট",
-    "Share" : "ভাগাভাগি কর",
     "Personal" : "ব্যক্তিগত",
     "Grant access" : "অধিগমনের  অনুমতি প্রদান কর",
     "Access granted" : "অধিগমনের  অনুমতি প্রদান করা হলো",
@@ -16,19 +12,23 @@ OC.L10N.register(
     "App key" : "অ্যাপ কি",
     "App secret" : "অ্যাপ সিক্রেট",
     "Client ID" : "ক্লায়েন্ট পরিচিতি",
+    "Username" : "ব্যবহারকারী",
     "Password" : "কূটশব্দ",
     "Amazon S3" : "আমাজন S3",
+    "Bucket" : "বালতি",
     "Hostname" : "হোস্টনেম",
     "Port" : "পোর্ট",
     "Region" : "এলাকা",
     "Enable SSL" : "SSL সক্রিয় কর",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "হোস্ট",
     "Secure ftps://" : "ftps:// অর্জন কর",
     "Local" : "স্থানীয়",
     "Location" : "অবস্থান",
     "ownCloud" : "ওউনক্লাউড",
     "Root" : "শেকড়",
+    "Share" : "ভাগাভাগি কর",
     "<b>Note:</b> " : "<b>দ্রষ্টব্য:</b> ",
     "Name" : "রাম",
     "External Storage" : "বাহ্যিক সংরক্ষণাগার",
diff --git a/apps/files_external/l10n/bn_BD.json b/apps/files_external/l10n/bn_BD.json
index e4e05addb50..5b7d07da5a2 100644
--- a/apps/files_external/l10n/bn_BD.json
+++ b/apps/files_external/l10n/bn_BD.json
@@ -1,10 +1,6 @@
 { "translations": {
     "Step 1 failed. Exception: %s" : "প্রথম ধাপ ব্যার্থ। ব্যতিক্রম: %s",
     "External storage" : "বাহ্যিক সংরক্ষণাগার",
-    "Username" : "ব্যবহারকারী",
-    "Bucket" : "বালতি",
-    "Host" : "হোস্ট",
-    "Share" : "ভাগাভাগি কর",
     "Personal" : "ব্যক্তিগত",
     "Grant access" : "অধিগমনের  অনুমতি প্রদান কর",
     "Access granted" : "অধিগমনের  অনুমতি প্রদান করা হলো",
@@ -14,19 +10,23 @@
     "App key" : "অ্যাপ কি",
     "App secret" : "অ্যাপ সিক্রেট",
     "Client ID" : "ক্লায়েন্ট পরিচিতি",
+    "Username" : "ব্যবহারকারী",
     "Password" : "কূটশব্দ",
     "Amazon S3" : "আমাজন S3",
+    "Bucket" : "বালতি",
     "Hostname" : "হোস্টনেম",
     "Port" : "পোর্ট",
     "Region" : "এলাকা",
     "Enable SSL" : "SSL সক্রিয় কর",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "হোস্ট",
     "Secure ftps://" : "ftps:// অর্জন কর",
     "Local" : "স্থানীয়",
     "Location" : "অবস্থান",
     "ownCloud" : "ওউনক্লাউড",
     "Root" : "শেকড়",
+    "Share" : "ভাগাভাগি কর",
     "<b>Note:</b> " : "<b>দ্রষ্টব্য:</b> ",
     "Name" : "রাম",
     "External Storage" : "বাহ্যিক সংরক্ষণাগার",
diff --git a/apps/files_external/l10n/bn_IN.js b/apps/files_external/l10n/bn_IN.js
index 323ee6f9edb..31f903204aa 100644
--- a/apps/files_external/l10n/bn_IN.js
+++ b/apps/files_external/l10n/bn_IN.js
@@ -1,11 +1,11 @@
 OC.L10N.register(
     "files_external",
     {
+    "Saved" : "সংরক্ষিত",
     "Username" : "ইউজারনেম",
+    "URL" : "URL",
     "Host" : "হোস্ট",
     "Share" : "শেয়ার",
-    "Saved" : "সংরক্ষিত",
-    "URL" : "URL",
     "Name" : "নাম",
     "Folder name" : "ফোল্ডারের নাম",
     "Delete" : "মুছে ফেলা"
diff --git a/apps/files_external/l10n/bn_IN.json b/apps/files_external/l10n/bn_IN.json
index 63103d7dba2..be89b6f43ea 100644
--- a/apps/files_external/l10n/bn_IN.json
+++ b/apps/files_external/l10n/bn_IN.json
@@ -1,9 +1,9 @@
 { "translations": {
+    "Saved" : "সংরক্ষিত",
     "Username" : "ইউজারনেম",
+    "URL" : "URL",
     "Host" : "হোস্ট",
     "Share" : "শেয়ার",
-    "Saved" : "সংরক্ষিত",
-    "URL" : "URL",
     "Name" : "নাম",
     "Folder name" : "ফোল্ডারের নাম",
     "Delete" : "মুছে ফেলা"
diff --git a/apps/files_external/l10n/bs.js b/apps/files_external/l10n/bs.js
index dad18fbf09f..2cd3cf47509 100644
--- a/apps/files_external/l10n/bs.js
+++ b/apps/files_external/l10n/bs.js
@@ -1,17 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Korisničko ime",
-    "Share" : "Podijeli",
     "Personal" : "Osobno",
     "Saved" : "Spremljeno",
     "None" : "Ništa",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Port" : "Priključak",
     "WebDAV" : "WebDAV",
     "Local" : "Lokalno",
     "Location" : "Lokacija",
     "ownCloud" : "OwnCloud",
+    "Share" : "Podijeli",
     "Name" : "Ime",
     "Delete" : "Izbriši"
 },
diff --git a/apps/files_external/l10n/bs.json b/apps/files_external/l10n/bs.json
index 7db1c69078b..e2d76555f08 100644
--- a/apps/files_external/l10n/bs.json
+++ b/apps/files_external/l10n/bs.json
@@ -1,15 +1,15 @@
 { "translations": {
-    "Username" : "Korisničko ime",
-    "Share" : "Podijeli",
     "Personal" : "Osobno",
     "Saved" : "Spremljeno",
     "None" : "Ništa",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Port" : "Priključak",
     "WebDAV" : "WebDAV",
     "Local" : "Lokalno",
     "Location" : "Lokacija",
     "ownCloud" : "OwnCloud",
+    "Share" : "Podijeli",
     "Name" : "Ime",
     "Delete" : "Izbriši"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/ca.js b/apps/files_external/l10n/ca.js
index 83e99c45c5c..9c10f6d5c50 100644
--- a/apps/files_external/l10n/ca.js
+++ b/apps/files_external/l10n/ca.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "El pas 1 ha fallat. Excepció: %s",
     "Step 2 failed. Exception: %s" : "El pas 2 ha fallat. Excepció: %s",
     "External storage" : "Emmagatzemament extern",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nom d'usuari",
-    "Bucket" : "Cub",
-    "Region (optional for OpenStack Object Storage)" : "Regió (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requerit per fitxers al núvol Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requerit per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasenya (requerit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servei (requerit per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt identificador final (requerit per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Temps d'expera màxim de les peticions HTTP en segons",
-    "SMB / CIFS using OC login" : "SMB / CIFS usant acreditació OC",
-    "Host" : "Equip remot",
-    "Username as share" : "Nom d'usuari per compartir",
-    "Share" : "Comparteix",
-    "Remote subfolder" : "Subcarpeta remota",
-    "SFTP with secret key login" : "Inici de sessió SFTP amb clau secreta",
-    "Public key" : "Clau pública",
     "Storage with id \"%i\" not found" : "No s'ha trobat emmagatzematge amb id \"%i\"",
     "Invalid mount point" : "Punt de muntatge no vàlid",
     "Invalid storage backend \"%s\"" : "Motor d'emmagatzematge no vàlid \"%s\"",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "Sistema",
     "Grant access" : "Concedeix accés",
     "Access granted" : "S'ha concedit l'accés",
+    "Generate keys" : "Generar claus",
+    "Error generating key pair" : "Error en generar el parell de claus",
     "Enable encryption" : "Habilitar xifrat",
     "Enable previews" : "Habilitar vistes prèvies",
     "Check for changes" : "Comproveu si hi ha canvis",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.",
     "(group)" : "(grup)",
     "Saved" : "Desat",
-    "Generate keys" : "Generar claus",
-    "Error generating key pair" : "Error en generar el parell de claus",
     "None" : "Cap",
     "App key" : "Clau de l'aplicació",
     "App secret" : "Secret de l'aplicació",
     "Client ID" : "Client ID",
     "Client secret" : "Secret del client",
+    "Username" : "Nom d'usuari",
     "Password" : "Contrasenya",
+    "API key" : "codi API",
+    "Public key" : "Clau pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cub",
     "Hostname" : "Nom del servidor",
     "Port" : "Port",
     "Region" : "Comarca",
@@ -53,12 +40,17 @@ OC.L10N.register(
     "Enable Path Style" : "Permet l'estil del camí",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
     "Secure https://" : "Protocol segur https://",
+    "Host" : "Equip remot",
     "Secure ftps://" : "Protocol segur ftps://",
     "Local" : "Local",
     "Location" : "Ubicació",
     "ownCloud" : "ownCloud",
     "Root" : "Arrel",
+    "Share" : "Comparteix",
+    "Username as share" : "Nom d'usuari per compartir",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
diff --git a/apps/files_external/l10n/ca.json b/apps/files_external/l10n/ca.json
index 0b5cc866f59..123527688c4 100644
--- a/apps/files_external/l10n/ca.json
+++ b/apps/files_external/l10n/ca.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "El pas 1 ha fallat. Excepció: %s",
     "Step 2 failed. Exception: %s" : "El pas 2 ha fallat. Excepció: %s",
     "External storage" : "Emmagatzemament extern",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nom d'usuari",
-    "Bucket" : "Cub",
-    "Region (optional for OpenStack Object Storage)" : "Regió (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requerit per fitxers al núvol Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requerit per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasenya (requerit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servei (requerit per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt identificador final (requerit per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Temps d'expera màxim de les peticions HTTP en segons",
-    "SMB / CIFS using OC login" : "SMB / CIFS usant acreditació OC",
-    "Host" : "Equip remot",
-    "Username as share" : "Nom d'usuari per compartir",
-    "Share" : "Comparteix",
-    "Remote subfolder" : "Subcarpeta remota",
-    "SFTP with secret key login" : "Inici de sessió SFTP amb clau secreta",
-    "Public key" : "Clau pública",
     "Storage with id \"%i\" not found" : "No s'ha trobat emmagatzematge amb id \"%i\"",
     "Invalid mount point" : "Punt de muntatge no vàlid",
     "Invalid storage backend \"%s\"" : "Motor d'emmagatzematge no vàlid \"%s\"",
@@ -26,6 +9,8 @@
     "System" : "Sistema",
     "Grant access" : "Concedeix accés",
     "Access granted" : "S'ha concedit l'accés",
+    "Generate keys" : "Generar claus",
+    "Error generating key pair" : "Error en generar el parell de claus",
     "Enable encryption" : "Habilitar xifrat",
     "Enable previews" : "Habilitar vistes prèvies",
     "Check for changes" : "Comproveu si hi ha canvis",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.",
     "(group)" : "(grup)",
     "Saved" : "Desat",
-    "Generate keys" : "Generar claus",
-    "Error generating key pair" : "Error en generar el parell de claus",
     "None" : "Cap",
     "App key" : "Clau de l'aplicació",
     "App secret" : "Secret de l'aplicació",
     "Client ID" : "Client ID",
     "Client secret" : "Secret del client",
+    "Username" : "Nom d'usuari",
     "Password" : "Contrasenya",
+    "API key" : "codi API",
+    "Public key" : "Clau pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cub",
     "Hostname" : "Nom del servidor",
     "Port" : "Port",
     "Region" : "Comarca",
@@ -51,12 +38,17 @@
     "Enable Path Style" : "Permet l'estil del camí",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
     "Secure https://" : "Protocol segur https://",
+    "Host" : "Equip remot",
     "Secure ftps://" : "Protocol segur ftps://",
     "Local" : "Local",
     "Location" : "Ubicació",
     "ownCloud" : "ownCloud",
     "Root" : "Arrel",
+    "Share" : "Comparteix",
+    "Username as share" : "Nom d'usuari per compartir",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
index ab352880b7c..70dcb6b792a 100644
--- a/apps/files_external/l10n/cs_CZ.js
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -7,23 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s",
     "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s",
     "External storage" : "Externí úložiště",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Uživatelské jméno",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (nepovinný pro OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API klíč (vyžadován pro Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Jméno nájemce (vyžadováno pro OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (vyžadováno pro OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Název služby (vyžadováno pro OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL identity koncového bodu (vyžadováno pro OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadavků v sekundách",
-    "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
-    "Host" : "Počítač",
-    "Username as share" : "Uživatelské jméno jako sdílený adresář",
-    "Share" : "Sdílet",
-    "Remote subfolder" : "Vzdálený podadresář",
-    "SFTP with secret key login" : "SFTP login s tajným klíčem",
-    "Public key" : "Veřejný klíč",
     "Storage with id \"%i\" not found" : "Úložiště s id \"%i\" nebylo nalezeno",
     "Invalid backend or authentication mechanism class" : "Neplatný backend nebo třída ověřovacího mechanismu",
     "Invalid mount point" : "Neplatný přípojný bod",
@@ -34,6 +17,8 @@ OC.L10N.register(
     "Access granted" : "Přístup povolen",
     "Error configuring OAuth1" : "Chyba nastavení OAuth1",
     "Error configuring OAuth2" : "Chyba nastavení OAuth2",
+    "Generate keys" : "Vytvořit klíče",
+    "Error generating key pair" : "Chyba při vytváření páru klíčů",
     "Enable encryption" : "Povolit šifrování",
     "Enable previews" : "Povolit náhledy",
     "Check for changes" : "Zkontrolovat změny",
@@ -43,8 +28,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Všichni uživatelé. Začněte psát pro výběr uživatelů a skupin.",
     "(group)" : "(skupina)",
     "Saved" : "Uloženo",
-    "Generate keys" : "Vytvořit klíče",
-    "Error generating key pair" : "Chyba při vytváření páru klíčů",
     "Access key" : "Přístupový klíč",
     "Secret key" : "Tajný klíč",
     "None" : "Žádné",
@@ -54,10 +37,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Klientské ID",
     "Client secret" : "Klientské tajemství",
-    "Username and password" : "Uživatelské jméno a heslo",
+    "Username" : "Uživatelské jméno",
     "Password" : "Heslo",
+    "API key" : "Klíč API",
+    "Username and password" : "Uživatelské jméno a heslo",
     "Session credentials" : "Přihlašovací údaje sezení",
+    "Public key" : "Veřejný klíč",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Hostname",
     "Port" : "Port",
     "Region" : "Kraj",
@@ -65,9 +52,11 @@ OC.L10N.register(
     "Enable Path Style" : "Povolit Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Vzdálený podadresář",
     "Secure https://" : "Zabezpečené https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Počítač",
     "Secure ftps://" : "Zabezpečené ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Místní",
@@ -76,6 +65,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Kořen",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Sdílet",
+    "Username as share" : "Uživatelské jméno jako sdílený adresář",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
index 03afeb48b8e..966c209b68e 100644
--- a/apps/files_external/l10n/cs_CZ.json
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -5,23 +5,6 @@
     "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s",
     "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s",
     "External storage" : "Externí úložiště",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Uživatelské jméno",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (nepovinný pro OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API klíč (vyžadován pro Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Jméno nájemce (vyžadováno pro OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (vyžadováno pro OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Název služby (vyžadováno pro OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL identity koncového bodu (vyžadováno pro OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadavků v sekundách",
-    "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
-    "Host" : "Počítač",
-    "Username as share" : "Uživatelské jméno jako sdílený adresář",
-    "Share" : "Sdílet",
-    "Remote subfolder" : "Vzdálený podadresář",
-    "SFTP with secret key login" : "SFTP login s tajným klíčem",
-    "Public key" : "Veřejný klíč",
     "Storage with id \"%i\" not found" : "Úložiště s id \"%i\" nebylo nalezeno",
     "Invalid backend or authentication mechanism class" : "Neplatný backend nebo třída ověřovacího mechanismu",
     "Invalid mount point" : "Neplatný přípojný bod",
@@ -32,6 +15,8 @@
     "Access granted" : "Přístup povolen",
     "Error configuring OAuth1" : "Chyba nastavení OAuth1",
     "Error configuring OAuth2" : "Chyba nastavení OAuth2",
+    "Generate keys" : "Vytvořit klíče",
+    "Error generating key pair" : "Chyba při vytváření páru klíčů",
     "Enable encryption" : "Povolit šifrování",
     "Enable previews" : "Povolit náhledy",
     "Check for changes" : "Zkontrolovat změny",
@@ -41,8 +26,6 @@
     "All users. Type to select user or group." : "Všichni uživatelé. Začněte psát pro výběr uživatelů a skupin.",
     "(group)" : "(skupina)",
     "Saved" : "Uloženo",
-    "Generate keys" : "Vytvořit klíče",
-    "Error generating key pair" : "Chyba při vytváření páru klíčů",
     "Access key" : "Přístupový klíč",
     "Secret key" : "Tajný klíč",
     "None" : "Žádné",
@@ -52,10 +35,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Klientské ID",
     "Client secret" : "Klientské tajemství",
-    "Username and password" : "Uživatelské jméno a heslo",
+    "Username" : "Uživatelské jméno",
     "Password" : "Heslo",
+    "API key" : "Klíč API",
+    "Username and password" : "Uživatelské jméno a heslo",
     "Session credentials" : "Přihlašovací údaje sezení",
+    "Public key" : "Veřejný klíč",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Hostname",
     "Port" : "Port",
     "Region" : "Kraj",
@@ -63,9 +50,11 @@
     "Enable Path Style" : "Povolit Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Vzdálený podadresář",
     "Secure https://" : "Zabezpečené https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Počítač",
     "Secure ftps://" : "Zabezpečené ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Místní",
@@ -74,6 +63,9 @@
     "SFTP" : "SFTP",
     "Root" : "Kořen",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Sdílet",
+    "Username as share" : "Uživatelské jméno jako sdílený adresář",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
diff --git a/apps/files_external/l10n/cy_GB.js b/apps/files_external/l10n/cy_GB.js
index 275d7e9fd9b..4364445be0c 100644
--- a/apps/files_external/l10n/cy_GB.js
+++ b/apps/files_external/l10n/cy_GB.js
@@ -1,14 +1,14 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Enw defnyddiwr",
-    "Share" : "Rhannu",
     "Personal" : "Personol",
     "None" : "Dim",
+    "Username" : "Enw defnyddiwr",
     "Password" : "Cyfrinair",
     "URL" : "URL",
     "Location" : "Lleoliad",
     "ownCloud" : "ownCloud",
+    "Share" : "Rhannu",
     "Name" : "Enw",
     "Delete" : "Dileu"
 },
diff --git a/apps/files_external/l10n/cy_GB.json b/apps/files_external/l10n/cy_GB.json
index eb3568d5e10..4916cb270ab 100644
--- a/apps/files_external/l10n/cy_GB.json
+++ b/apps/files_external/l10n/cy_GB.json
@@ -1,12 +1,12 @@
 { "translations": {
-    "Username" : "Enw defnyddiwr",
-    "Share" : "Rhannu",
     "Personal" : "Personol",
     "None" : "Dim",
+    "Username" : "Enw defnyddiwr",
     "Password" : "Cyfrinair",
     "URL" : "URL",
     "Location" : "Lleoliad",
     "ownCloud" : "ownCloud",
+    "Share" : "Rhannu",
     "Name" : "Enw",
     "Delete" : "Dileu"
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js
index 946ea94169c..b1f058efbb3 100644
--- a/apps/files_external/l10n/da.js
+++ b/apps/files_external/l10n/da.js
@@ -1,29 +1,12 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Tokener til anmodning om hentning mislykkedes. Verificér at din app-nøgle og -hemmelighed er korrekte.",
-    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Tokener for adgang til hentning fejlede. Verificér at din app-nøgle og -hemmelighed er korrekte.",
-    "Please provide a valid app key and secret." : "Angiv venligst en gyldig app-nøgle og -hemmelighed.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Tokener til anmodning om hentning mislykkedes. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Tokener for adgang til hentning fejlede. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Please provide a valid app key and secret." : "Angiv venligst gyldig app-nøgle og -hemmelighed.",
     "Step 1 failed. Exception: %s" : "Trin 1 mislykkedes. Undtagelse: %s",
     "Step 2 failed. Exception: %s" : "Trin 2 mislykkedes. Undtagelse: %s",
     "External storage" : "Eksternt lager",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Brugernavn",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (valgfri for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nøgle (påkrævet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Lejers navn (påkrævet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Adgangskode (påkrævet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Navn (påkrævet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL på slutpunkt for identitet (påkrævet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsudløb for HTTP-forespørgsler i sekunder",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-login",
-    "Host" : "Vært",
-    "Username as share" : "Brugernavn som deling",
-    "Share" : "Del",
-    "Remote subfolder" : "Fjernundermappe",
-    "SFTP with secret key login" : "SFTP med hemmelig nøglelogin",
-    "Public key" : "Offentlig nøgle",
     "Storage with id \"%i\" not found" : "Lager med ID'et \"%i% er ikke fundet",
     "Invalid backend or authentication mechanism class" : "Ugyldig backend eller klasse for godkendelsesmekanisme",
     "Invalid mount point" : "Fokert monteringspunkt",
@@ -31,13 +14,14 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "Forkert lager til backend \"%s\"en",
     "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre",
     "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme",
-    "Admin-only storage backend \"%s\"" : "Kun-for-admin lagringsbackend \"%s\"",
     "Personal" : "Personligt",
     "System" : "System",
     "Grant access" : "Godkend adgang",
     "Access granted" : "Adgang godkendt",
     "Error configuring OAuth1" : "Fejl under konfiguration af OAuth1",
     "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2",
+    "Generate keys" : "Opret nøgler.",
+    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
     "Enable encryption" : "Slå kryptering til",
     "Enable previews" : "Slå forhåndsvisninger til",
     "Check for changes" : "Tjek for ændringer",
@@ -47,8 +31,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Gemt",
-    "Generate keys" : "Opret nøgler.",
-    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
     "Access key" : "Adgangsnøgle",
     "Secret key" : "Hemmelig nøgle",
     "Builtin" : "Indbygget",
@@ -59,10 +41,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Klient-ID",
     "Client secret" : "Klient hemmelighed",
-    "Username and password" : "Brugernavn og kodeord",
+    "Username" : "Brugernavn",
     "Password" : "Kodeord",
+    "API key" : "API nøgle",
+    "Username and password" : "Brugernavn og kodeord",
     "Session credentials" : "Brugeroplysninger for session",
+    "Public key" : "Offentlig nøgle",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Værtsnavn",
     "Port" : "Port",
     "Region" : "Region",
@@ -70,9 +56,11 @@ OC.L10N.register(
     "Enable Path Style" : "Aktivér stil for sti",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Fjernundermappe",
     "Secure https://" : "Sikker https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Vært",
     "Secure ftps://" : "Sikker ftps://",
     "Google Drive" : "Google Drev",
     "Local" : "Lokal",
@@ -81,6 +69,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Del",
+    "Username as share" : "Brugernavn som deling",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json
index 6a291b2b149..811de509421 100644
--- a/apps/files_external/l10n/da.json
+++ b/apps/files_external/l10n/da.json
@@ -1,27 +1,10 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Tokener til anmodning om hentning mislykkedes. Verificér at din app-nøgle og -hemmelighed er korrekte.",
-    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Tokener for adgang til hentning fejlede. Verificér at din app-nøgle og -hemmelighed er korrekte.",
-    "Please provide a valid app key and secret." : "Angiv venligst en gyldig app-nøgle og -hemmelighed.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Tokener til anmodning om hentning mislykkedes. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Tokener for adgang til hentning fejlede. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Please provide a valid app key and secret." : "Angiv venligst gyldig app-nøgle og -hemmelighed.",
     "Step 1 failed. Exception: %s" : "Trin 1 mislykkedes. Undtagelse: %s",
     "Step 2 failed. Exception: %s" : "Trin 2 mislykkedes. Undtagelse: %s",
     "External storage" : "Eksternt lager",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Brugernavn",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (valgfri for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nøgle (påkrævet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Lejers navn (påkrævet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Adgangskode (påkrævet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Navn (påkrævet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL på slutpunkt for identitet (påkrævet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsudløb for HTTP-forespørgsler i sekunder",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-login",
-    "Host" : "Vært",
-    "Username as share" : "Brugernavn som deling",
-    "Share" : "Del",
-    "Remote subfolder" : "Fjernundermappe",
-    "SFTP with secret key login" : "SFTP med hemmelig nøglelogin",
-    "Public key" : "Offentlig nøgle",
     "Storage with id \"%i\" not found" : "Lager med ID'et \"%i% er ikke fundet",
     "Invalid backend or authentication mechanism class" : "Ugyldig backend eller klasse for godkendelsesmekanisme",
     "Invalid mount point" : "Fokert monteringspunkt",
@@ -29,13 +12,14 @@
     "Invalid storage backend \"%s\"" : "Forkert lager til backend \"%s\"en",
     "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre",
     "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme",
-    "Admin-only storage backend \"%s\"" : "Kun-for-admin lagringsbackend \"%s\"",
     "Personal" : "Personligt",
     "System" : "System",
     "Grant access" : "Godkend adgang",
     "Access granted" : "Adgang godkendt",
     "Error configuring OAuth1" : "Fejl under konfiguration af OAuth1",
     "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2",
+    "Generate keys" : "Opret nøgler.",
+    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
     "Enable encryption" : "Slå kryptering til",
     "Enable previews" : "Slå forhåndsvisninger til",
     "Check for changes" : "Tjek for ændringer",
@@ -45,8 +29,6 @@
     "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Gemt",
-    "Generate keys" : "Opret nøgler.",
-    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
     "Access key" : "Adgangsnøgle",
     "Secret key" : "Hemmelig nøgle",
     "Builtin" : "Indbygget",
@@ -57,10 +39,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Klient-ID",
     "Client secret" : "Klient hemmelighed",
-    "Username and password" : "Brugernavn og kodeord",
+    "Username" : "Brugernavn",
     "Password" : "Kodeord",
+    "API key" : "API nøgle",
+    "Username and password" : "Brugernavn og kodeord",
     "Session credentials" : "Brugeroplysninger for session",
+    "Public key" : "Offentlig nøgle",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Værtsnavn",
     "Port" : "Port",
     "Region" : "Region",
@@ -68,9 +54,11 @@
     "Enable Path Style" : "Aktivér stil for sti",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Fjernundermappe",
     "Secure https://" : "Sikker https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Vært",
     "Secure ftps://" : "Sikker ftps://",
     "Google Drive" : "Google Drev",
     "Local" : "Lokal",
@@ -79,6 +67,9 @@
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Del",
+    "Username as share" : "Brugernavn som deling",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index f42ac256897..fc0af67d3d7 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Username" : "Benutzername",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Host" : "Host",
-    "Username as share" : "Benutzername als Freigabe",
-    "Share" : "Share",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "System",
     "Grant access" : "Zugriff gestatten",
     "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "None" : "Keine",
     "App key" : "App-Schlüssel",
     "App secret" : "Geheime Zeichenkette der App",
     "Client ID" : "Client-ID",
     "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Host-Name",
     "Port" : "Port",
     "Region" : "Region",
@@ -53,13 +40,18 @@ OC.L10N.register(
     "Enable Path Style" : "Pfad-Stil aktivieren",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Entfernter Unterordner",
     "Secure https://" : "Sicherer HTTPS://",
     "Dropbox" : "Dropbox",
+    "Host" : "Host",
     "Secure ftps://" : "Sicherer ftps://",
     "Local" : "Lokal",
     "Location" : "Ort",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index 2dd3182812b..4242b817073 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Username" : "Benutzername",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Host" : "Host",
-    "Username as share" : "Benutzername als Freigabe",
-    "Share" : "Share",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
@@ -26,6 +9,8 @@
     "System" : "System",
     "Grant access" : "Zugriff gestatten",
     "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "None" : "Keine",
     "App key" : "App-Schlüssel",
     "App secret" : "Geheime Zeichenkette der App",
     "Client ID" : "Client-ID",
     "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Host-Name",
     "Port" : "Port",
     "Region" : "Region",
@@ -51,13 +38,18 @@
     "Enable Path Style" : "Pfad-Stil aktivieren",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Entfernter Unterordner",
     "Secure https://" : "Sicherer HTTPS://",
     "Dropbox" : "Dropbox",
+    "Host" : "Host",
     "Secure ftps://" : "Sicherer ftps://",
     "Local" : "Lokal",
     "Location" : "Ort",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
diff --git a/apps/files_external/l10n/de_AT.js b/apps/files_external/l10n/de_AT.js
index 9a481a7a008..6c71c45f217 100644
--- a/apps/files_external/l10n/de_AT.js
+++ b/apps/files_external/l10n/de_AT.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Benutzername",
-    "Host" : "Host",
-    "Share" : "Freigeben",
     "Personal" : "Persönlich",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
     "Port" : "Port",
+    "Host" : "Host",
     "Location" : "Ort",
+    "Share" : "Freigeben",
     "Folder name" : "Ordner Name",
     "Delete" : "Löschen"
 },
diff --git a/apps/files_external/l10n/de_AT.json b/apps/files_external/l10n/de_AT.json
index b4ae1adb13c..0d956dc81c6 100644
--- a/apps/files_external/l10n/de_AT.json
+++ b/apps/files_external/l10n/de_AT.json
@@ -1,11 +1,11 @@
 { "translations": {
-    "Username" : "Benutzername",
-    "Host" : "Host",
-    "Share" : "Freigeben",
     "Personal" : "Persönlich",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
     "Port" : "Port",
+    "Host" : "Host",
     "Location" : "Ort",
+    "Share" : "Freigeben",
     "Folder name" : "Ordner Name",
     "Delete" : "Löschen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js
index 309dd8064ea..9d363aecbf6 100644
--- a/apps/files_external/l10n/de_DE.js
+++ b/apps/files_external/l10n/de_DE.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Username" : "Benutzername",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Host" : "Host",
-    "Username as share" : "Benutzername als Freigabe",
-    "Share" : "Share",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "System",
     "Grant access" : "Zugriff gestatten",
     "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "None" : "Keine",
     "App key" : "App-Schlüssel",
     "App secret" : "Geheime Zeichenkette der App",
     "Client ID" : "Client-ID",
     "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Host-Name",
     "Port" : "Port",
     "Region" : "Region",
@@ -53,13 +40,18 @@ OC.L10N.register(
     "Enable Path Style" : "Pfadstil aktivieren",
     "WebDAV" : "WebDAV",
     "URL" : "Adresse",
+    "Remote subfolder" : "Entfernter Unterordner",
     "Secure https://" : "Sicheres https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Host",
     "Secure ftps://" : "Sicheres ftps://",
     "Local" : "Lokal",
     "Location" : "Ort",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json
index 74ca2416554..62fe7b0803c 100644
--- a/apps/files_external/l10n/de_DE.json
+++ b/apps/files_external/l10n/de_DE.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Username" : "Benutzername",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Host" : "Host",
-    "Username as share" : "Benutzername als Freigabe",
-    "Share" : "Share",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
@@ -26,6 +9,8 @@
     "System" : "System",
     "Grant access" : "Zugriff gestatten",
     "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "None" : "Keine",
     "App key" : "App-Schlüssel",
     "App secret" : "Geheime Zeichenkette der App",
     "Client ID" : "Client-ID",
     "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Host-Name",
     "Port" : "Port",
     "Region" : "Region",
@@ -51,13 +38,18 @@
     "Enable Path Style" : "Pfadstil aktivieren",
     "WebDAV" : "WebDAV",
     "URL" : "Adresse",
+    "Remote subfolder" : "Entfernter Unterordner",
     "Secure https://" : "Sicheres https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Host",
     "Secure ftps://" : "Sicheres ftps://",
     "Local" : "Lokal",
     "Location" : "Ort",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js
index 13fb910e79d..5147f924c18 100644
--- a/apps/files_external/l10n/el.js
+++ b/apps/files_external/l10n/el.js
@@ -7,23 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
     "Step 2 failed. Exception: %s" : "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
     "External storage" : "Εξωτερική αποθήκευση",
-    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
-    "Username" : "Όνομα χρήστη",
-    "Bucket" : "Κάδος",
-    "Region (optional for OpenStack Object Storage)" : "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Όνομα ενοίκου (απαιτείται για την Αποθήκευση Αντικειμένων OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα",
-    "SMB / CIFS using OC login" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
-    "Host" : "Διακομιστής",
-    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
-    "Share" : "Διαμοιράστε",
-    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
-    "SFTP with secret key login" : "SFTP με σύνδεση με κρυφό κλειδί",
-    "Public key" : "Δημόσιο κλειδί",
     "Storage with id \"%i\" not found" : "Αποθήκευση με id \"%i\" δεν βρέθηκε",
     "Invalid backend or authentication mechanism class" : "Μη έγκυρη κλάση συστήματος ή μηχανισμού πιστοποίησης",
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
@@ -31,13 +14,14 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "Μή έγκυρο σύστημα υποστήριξης αποθήκευσης  \"%s\"",
     "Unsatisfied backend parameters" : "Ελλιπείς παράμετροι συστήματος",
     "Unsatisfied authentication mechanism parameters" : "Ελλιπείς παράμετροι μηχανισμού πιστοποίησης",
-    "Admin-only storage backend \"%s\"" : "Σύστημα αποθήκευσης μόνο για διαχειριστή \"%s\"",
     "Personal" : "Προσωπικά",
     "System" : "Σύστημα",
     "Grant access" : "Παροχή πρόσβασης",
     "Access granted" : "Πρόσβαση παρασχέθηκε",
     "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1",
     "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2",
+    "Generate keys" : "Δημιουργία κλειδιών",
+    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "Enable previews" : "Ενεργοποίηση προεπισκοπήσεων",
     "Check for changes" : "Έλεγχος για αλλαγές",
@@ -47,8 +31,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
     "(group)" : "(ομάδα)",
     "Saved" : "Αποθηκεύτηκαν",
-    "Generate keys" : "Δημιουργία κλειδιών",
-    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
     "Access key" : "Κλειδί πρόσβασης",
     "Secret key" : "Μυστικό κλειδί",
     "Builtin" : "Builtin",
@@ -59,10 +41,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID πελάτη",
     "Client secret" : "Μυστικό πελάτη",
-    "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
+    "Username" : "Όνομα χρήστη",
     "Password" : "Κωδικός πρόσβασης",
+    "API key" : "Κλειδί Google API",
+    "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
     "Session credentials" : "Διαπιστευτήρια συνεδρίας",
+    "Public key" : "Δημόσιο κλειδί",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Κάδος",
     "Hostname" : "Όνομα Υπολογιστή",
     "Port" : "Θύρα",
     "Region" : "Περιοχή",
@@ -70,9 +56,11 @@ OC.L10N.register(
     "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
     "Secure https://" : "Ασφαλής σύνδεση https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Διακομιστής",
     "Secure ftps://" : "Ασφαλής ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Τοπικός",
@@ -81,6 +69,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Διαμοιράστε",
+    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
+    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
     "<b>Note:</b> " : "<b>Σημείωση:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json
index c2211b18842..46fd7433dff 100644
--- a/apps/files_external/l10n/el.json
+++ b/apps/files_external/l10n/el.json
@@ -5,23 +5,6 @@
     "Step 1 failed. Exception: %s" : "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
     "Step 2 failed. Exception: %s" : "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
     "External storage" : "Εξωτερική αποθήκευση",
-    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
-    "Username" : "Όνομα χρήστη",
-    "Bucket" : "Κάδος",
-    "Region (optional for OpenStack Object Storage)" : "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Όνομα ενοίκου (απαιτείται για την Αποθήκευση Αντικειμένων OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα",
-    "SMB / CIFS using OC login" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
-    "Host" : "Διακομιστής",
-    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
-    "Share" : "Διαμοιράστε",
-    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
-    "SFTP with secret key login" : "SFTP με σύνδεση με κρυφό κλειδί",
-    "Public key" : "Δημόσιο κλειδί",
     "Storage with id \"%i\" not found" : "Αποθήκευση με id \"%i\" δεν βρέθηκε",
     "Invalid backend or authentication mechanism class" : "Μη έγκυρη κλάση συστήματος ή μηχανισμού πιστοποίησης",
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
@@ -29,13 +12,14 @@
     "Invalid storage backend \"%s\"" : "Μή έγκυρο σύστημα υποστήριξης αποθήκευσης  \"%s\"",
     "Unsatisfied backend parameters" : "Ελλιπείς παράμετροι συστήματος",
     "Unsatisfied authentication mechanism parameters" : "Ελλιπείς παράμετροι μηχανισμού πιστοποίησης",
-    "Admin-only storage backend \"%s\"" : "Σύστημα αποθήκευσης μόνο για διαχειριστή \"%s\"",
     "Personal" : "Προσωπικά",
     "System" : "Σύστημα",
     "Grant access" : "Παροχή πρόσβασης",
     "Access granted" : "Πρόσβαση παρασχέθηκε",
     "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1",
     "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2",
+    "Generate keys" : "Δημιουργία κλειδιών",
+    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "Enable previews" : "Ενεργοποίηση προεπισκοπήσεων",
     "Check for changes" : "Έλεγχος για αλλαγές",
@@ -45,8 +29,6 @@
     "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
     "(group)" : "(ομάδα)",
     "Saved" : "Αποθηκεύτηκαν",
-    "Generate keys" : "Δημιουργία κλειδιών",
-    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
     "Access key" : "Κλειδί πρόσβασης",
     "Secret key" : "Μυστικό κλειδί",
     "Builtin" : "Builtin",
@@ -57,10 +39,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID πελάτη",
     "Client secret" : "Μυστικό πελάτη",
-    "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
+    "Username" : "Όνομα χρήστη",
     "Password" : "Κωδικός πρόσβασης",
+    "API key" : "Κλειδί Google API",
+    "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
     "Session credentials" : "Διαπιστευτήρια συνεδρίας",
+    "Public key" : "Δημόσιο κλειδί",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Κάδος",
     "Hostname" : "Όνομα Υπολογιστή",
     "Port" : "Θύρα",
     "Region" : "Περιοχή",
@@ -68,9 +54,11 @@
     "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
     "Secure https://" : "Ασφαλής σύνδεση https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Διακομιστής",
     "Secure ftps://" : "Ασφαλής ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Τοπικός",
@@ -79,6 +67,9 @@
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Διαμοιράστε",
+    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
+    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
     "<b>Note:</b> " : "<b>Σημείωση:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js
index 6c986ed5911..8b1c0cdd328 100644
--- a/apps/files_external/l10n/en_GB.js
+++ b/apps/files_external/l10n/en_GB.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Step 1 failed. Exception: %s",
     "Step 2 failed. Exception: %s" : "Step 2 failed. Exception: %s",
     "External storage" : "External storage",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Username",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (optional for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (required for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (required for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (required for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (required for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (required for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout of HTTP requests in seconds",
-    "SMB / CIFS using OC login" : "SMB / CIFS using OC login",
-    "Host" : "Host",
-    "Username as share" : "Username as share",
-    "Share" : "Share",
-    "Remote subfolder" : "Remote subfolder",
-    "SFTP with secret key login" : "SFTP with secret key login",
-    "Public key" : "Public key",
     "Storage with id \"%i\" not found" : "Storage with id \"%i\" not found",
     "Invalid mount point" : "Invalid mount point",
     "Invalid storage backend \"%s\"" : "Invalid storage backend \"%s\"",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "System",
     "Grant access" : "Grant access",
     "Access granted" : "Access granted",
+    "Generate keys" : "Generate keys",
+    "Error generating key pair" : "Error generating key pair",
     "Enable encryption" : "Enable encryption",
     "Enable previews" : "Enable previews",
     "Check for changes" : "Check for changes",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "All users. Type to select user or group.",
     "(group)" : "(group)",
     "Saved" : "Saved",
-    "Generate keys" : "Generate keys",
-    "Error generating key pair" : "Error generating key pair",
     "None" : "None",
     "App key" : "App key",
     "App secret" : "App secret",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "Username" : "Username",
     "Password" : "Password",
+    "API key" : "API key",
+    "Public key" : "Public key",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Hostname",
     "Port" : "Port",
     "Region" : "Region",
@@ -53,13 +40,18 @@ OC.L10N.register(
     "Enable Path Style" : "Enable Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Remote subfolder",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Host",
     "Secure ftps://" : "Secure ftps://",
     "Local" : "Local",
     "Location" : "Location",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Username as share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json
index c096b074c5c..78feab7a08f 100644
--- a/apps/files_external/l10n/en_GB.json
+++ b/apps/files_external/l10n/en_GB.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "Step 1 failed. Exception: %s",
     "Step 2 failed. Exception: %s" : "Step 2 failed. Exception: %s",
     "External storage" : "External storage",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Username",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (optional for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (required for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (required for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (required for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (required for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (required for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout of HTTP requests in seconds",
-    "SMB / CIFS using OC login" : "SMB / CIFS using OC login",
-    "Host" : "Host",
-    "Username as share" : "Username as share",
-    "Share" : "Share",
-    "Remote subfolder" : "Remote subfolder",
-    "SFTP with secret key login" : "SFTP with secret key login",
-    "Public key" : "Public key",
     "Storage with id \"%i\" not found" : "Storage with id \"%i\" not found",
     "Invalid mount point" : "Invalid mount point",
     "Invalid storage backend \"%s\"" : "Invalid storage backend \"%s\"",
@@ -26,6 +9,8 @@
     "System" : "System",
     "Grant access" : "Grant access",
     "Access granted" : "Access granted",
+    "Generate keys" : "Generate keys",
+    "Error generating key pair" : "Error generating key pair",
     "Enable encryption" : "Enable encryption",
     "Enable previews" : "Enable previews",
     "Check for changes" : "Check for changes",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "All users. Type to select user or group.",
     "(group)" : "(group)",
     "Saved" : "Saved",
-    "Generate keys" : "Generate keys",
-    "Error generating key pair" : "Error generating key pair",
     "None" : "None",
     "App key" : "App key",
     "App secret" : "App secret",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "Username" : "Username",
     "Password" : "Password",
+    "API key" : "API key",
+    "Public key" : "Public key",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Hostname",
     "Port" : "Port",
     "Region" : "Region",
@@ -51,13 +38,18 @@
     "Enable Path Style" : "Enable Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Remote subfolder",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Host",
     "Secure ftps://" : "Secure ftps://",
     "Local" : "Local",
     "Location" : "Location",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Username as share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
diff --git a/apps/files_external/l10n/eo.js b/apps/files_external/l10n/eo.js
index cdd29ce8b84..8a8884777e6 100644
--- a/apps/files_external/l10n/eo.js
+++ b/apps/files_external/l10n/eo.js
@@ -2,16 +2,6 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "Malena memorilo",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Uzantonomo",
-    "Region (optional for OpenStack Object Storage)" : "Regiono (malnepra por OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-klavo (nepra por Rackspace Cloud Files)",
-    "Password (required for OpenStack Object Storage)" : "Pasvorto (nepra por OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Servonomo (nepra por OpenStack Object Storage)",
-    "Host" : "Gastigo",
-    "Share" : "Kunhavigi",
-    "Remote subfolder" : "Malloka subdosierujo",
-    "Public key" : "Publika ŝlosilo",
     "Personal" : "Persona",
     "Grant access" : "Doni alirpermeson",
     "Access granted" : "Alirpermeso donita",
@@ -21,20 +11,27 @@ OC.L10N.register(
     "App secret" : "Aplikaĵosekreto",
     "Client ID" : "Klientidentigilo",
     "Client secret" : "Klientosekreto",
+    "Username" : "Uzantonomo",
     "Password" : "Pasvorto",
+    "API key" : "API-klavo",
+    "Public key" : "Publika ŝlosilo",
     "Amazon S3" : "Amazon S3",
     "Port" : "Pordo",
     "Region" : "Regiono",
     "Enable SSL" : "Kapabligi SSL-on",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Malloka subdosierujo",
     "Secure https://" : "Sekura https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Gastigo",
     "Secure ftps://" : "Sekura ftps://",
     "Local" : "Loka",
     "Location" : "Loko",
     "ownCloud" : "ownCloud",
     "Root" : "Radiko",
+    "Share" : "Kunhavigi",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Noto:</b>",
     "Name" : "Nomo",
     "External Storage" : "Malena memorilo",
diff --git a/apps/files_external/l10n/eo.json b/apps/files_external/l10n/eo.json
index 988097fd8fb..6741a31e72a 100644
--- a/apps/files_external/l10n/eo.json
+++ b/apps/files_external/l10n/eo.json
@@ -1,15 +1,5 @@
 { "translations": {
     "External storage" : "Malena memorilo",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Uzantonomo",
-    "Region (optional for OpenStack Object Storage)" : "Regiono (malnepra por OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-klavo (nepra por Rackspace Cloud Files)",
-    "Password (required for OpenStack Object Storage)" : "Pasvorto (nepra por OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Servonomo (nepra por OpenStack Object Storage)",
-    "Host" : "Gastigo",
-    "Share" : "Kunhavigi",
-    "Remote subfolder" : "Malloka subdosierujo",
-    "Public key" : "Publika ŝlosilo",
     "Personal" : "Persona",
     "Grant access" : "Doni alirpermeson",
     "Access granted" : "Alirpermeso donita",
@@ -19,20 +9,27 @@
     "App secret" : "Aplikaĵosekreto",
     "Client ID" : "Klientidentigilo",
     "Client secret" : "Klientosekreto",
+    "Username" : "Uzantonomo",
     "Password" : "Pasvorto",
+    "API key" : "API-klavo",
+    "Public key" : "Publika ŝlosilo",
     "Amazon S3" : "Amazon S3",
     "Port" : "Pordo",
     "Region" : "Regiono",
     "Enable SSL" : "Kapabligi SSL-on",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Malloka subdosierujo",
     "Secure https://" : "Sekura https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Gastigo",
     "Secure ftps://" : "Sekura ftps://",
     "Local" : "Loka",
     "Location" : "Loko",
     "ownCloud" : "ownCloud",
     "Root" : "Radiko",
+    "Share" : "Kunhavigi",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Noto:</b>",
     "Name" : "Nomo",
     "External Storage" : "Malena memorilo",
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
index 16d87d8d2f2..62d09425f72 100644
--- a/apps/files_external/l10n/es.js
+++ b/apps/files_external/l10n/es.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "El paso 1 falló. Excepción: %s",
     "Step 2 failed. Exception: %s" : "El paso 2 falló. Excepción: %s",
     "External storage" : "Almacenamiento externo",
-    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
-    "Username" : "Nombre de usuario",
-    "Bucket" : "Depósito",
-    "Region (optional for OpenStack Object Storage)" : "Región (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (requerida para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nombre de Inquilino (requerido para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (requerida para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nombre de Servicio (requerido para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos",
-    "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC",
-    "Host" : "Servidor",
-    "Username as share" : "Nombre de usuario como compartir",
-    "Share" : "Compartir",
-    "Remote subfolder" : "Subcarpeta remota",
-    "SFTP with secret key login" : "Inicio de sesión SFTP con clave secreta",
-    "Public key" : "Clave pública",
     "Storage with id \"%i\" not found" : "No se ha encontrado almacenamiento con id \"%i\"",
     "Invalid mount point" : "Punto de montaje no válido",
     "Invalid storage backend \"%s\"" : "Motor de almacenamiento no válido «%s»",
@@ -30,6 +13,8 @@ OC.L10N.register(
     "Access granted" : "Acceso concedido",
     "Error configuring OAuth1" : "Error al configurar OAuth1",
     "Error configuring OAuth2" : "Error al configurar OAuth2",
+    "Generate keys" : "Generar claves",
+    "Error generating key pair" : "Error al generar el par de claves",
     "Enable encryption" : "Habilitar cifrado",
     "Enable previews" : "Habilitar previsualizaciones",
     "Check for changes" : "Comprobar si hay cambios",
@@ -39,8 +24,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Guardado",
-    "Generate keys" : "Generar claves",
-    "Error generating key pair" : "Error al generar el par de claves",
     "Access key" : "Clave de acceso",
     "Secret key" : "Clave secreta",
     "None" : "Ninguno",
@@ -50,10 +33,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID de Cliente",
     "Client secret" : "Cliente secreto",
-    "Username and password" : "Nombre de usuario y contraseña",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Username and password" : "Nombre de usuario y contraseña",
     "Session credentials" : "Credenciales de la sesión",
+    "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Depósito",
     "Hostname" : "Nombre de equipo",
     "Port" : "Puerto",
     "Region" : "Región",
@@ -61,9 +48,11 @@ OC.L10N.register(
     "Enable Path Style" : "Habilitar Estilo de Ruta",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
     "Secure https://" : "—Seguro— https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Servidor",
     "Secure ftps://" : "—Seguro— ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Local",
@@ -72,6 +61,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Raíz",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartir",
+    "Username as share" : "Nombre de usuario como compartir",
+    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
index fe20eca13d2..6bcfca820f5 100644
--- a/apps/files_external/l10n/es.json
+++ b/apps/files_external/l10n/es.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "El paso 1 falló. Excepción: %s",
     "Step 2 failed. Exception: %s" : "El paso 2 falló. Excepción: %s",
     "External storage" : "Almacenamiento externo",
-    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
-    "Username" : "Nombre de usuario",
-    "Bucket" : "Depósito",
-    "Region (optional for OpenStack Object Storage)" : "Región (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (requerida para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nombre de Inquilino (requerido para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (requerida para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nombre de Servicio (requerido para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos",
-    "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC",
-    "Host" : "Servidor",
-    "Username as share" : "Nombre de usuario como compartir",
-    "Share" : "Compartir",
-    "Remote subfolder" : "Subcarpeta remota",
-    "SFTP with secret key login" : "Inicio de sesión SFTP con clave secreta",
-    "Public key" : "Clave pública",
     "Storage with id \"%i\" not found" : "No se ha encontrado almacenamiento con id \"%i\"",
     "Invalid mount point" : "Punto de montaje no válido",
     "Invalid storage backend \"%s\"" : "Motor de almacenamiento no válido «%s»",
@@ -28,6 +11,8 @@
     "Access granted" : "Acceso concedido",
     "Error configuring OAuth1" : "Error al configurar OAuth1",
     "Error configuring OAuth2" : "Error al configurar OAuth2",
+    "Generate keys" : "Generar claves",
+    "Error generating key pair" : "Error al generar el par de claves",
     "Enable encryption" : "Habilitar cifrado",
     "Enable previews" : "Habilitar previsualizaciones",
     "Check for changes" : "Comprobar si hay cambios",
@@ -37,8 +22,6 @@
     "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Guardado",
-    "Generate keys" : "Generar claves",
-    "Error generating key pair" : "Error al generar el par de claves",
     "Access key" : "Clave de acceso",
     "Secret key" : "Clave secreta",
     "None" : "Ninguno",
@@ -48,10 +31,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID de Cliente",
     "Client secret" : "Cliente secreto",
-    "Username and password" : "Nombre de usuario y contraseña",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Username and password" : "Nombre de usuario y contraseña",
     "Session credentials" : "Credenciales de la sesión",
+    "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Depósito",
     "Hostname" : "Nombre de equipo",
     "Port" : "Puerto",
     "Region" : "Región",
@@ -59,9 +46,11 @@
     "Enable Path Style" : "Habilitar Estilo de Ruta",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
     "Secure https://" : "—Seguro— https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Servidor",
     "Secure ftps://" : "—Seguro— ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Local",
@@ -70,6 +59,9 @@
     "SFTP" : "SFTP",
     "Root" : "Raíz",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartir",
+    "Username as share" : "Nombre de usuario como compartir",
+    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
diff --git a/apps/files_external/l10n/es_AR.js b/apps/files_external/l10n/es_AR.js
index 316273f74f6..383b511a75f 100644
--- a/apps/files_external/l10n/es_AR.js
+++ b/apps/files_external/l10n/es_AR.js
@@ -2,21 +2,22 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "Almacenamiento externo",
-    "Username" : "Nombre de usuario",
-    "Host" : "Servidor",
-    "Share" : "Compartir",
     "Personal" : "Personal",
     "Grant access" : "Permitir acceso",
     "Access granted" : "Acceso permitido",
     "Saved" : "Guardado",
     "None" : "Ninguno",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
+    "API key" : "clave API",
     "Port" : "Puerto",
     "Region" : "Provincia",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Servidor",
     "Location" : "Ubicación",
     "ownCloud" : "ownCloud",
+    "Share" : "Compartir",
     "Name" : "Nombre",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
diff --git a/apps/files_external/l10n/es_AR.json b/apps/files_external/l10n/es_AR.json
index 299aba398fa..0389f98e647 100644
--- a/apps/files_external/l10n/es_AR.json
+++ b/apps/files_external/l10n/es_AR.json
@@ -1,20 +1,21 @@
 { "translations": {
     "External storage" : "Almacenamiento externo",
-    "Username" : "Nombre de usuario",
-    "Host" : "Servidor",
-    "Share" : "Compartir",
     "Personal" : "Personal",
     "Grant access" : "Permitir acceso",
     "Access granted" : "Acceso permitido",
     "Saved" : "Guardado",
     "None" : "Ninguno",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
+    "API key" : "clave API",
     "Port" : "Puerto",
     "Region" : "Provincia",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Servidor",
     "Location" : "Ubicación",
     "ownCloud" : "ownCloud",
+    "Share" : "Compartir",
     "Name" : "Nombre",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
diff --git a/apps/files_external/l10n/es_CL.js b/apps/files_external/l10n/es_CL.js
index 828d50df791..6ab87d23bc8 100644
--- a/apps/files_external/l10n/es_CL.js
+++ b/apps/files_external/l10n/es_CL.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Usuario",
-    "Share" : "Compartir",
     "Personal" : "Personal",
+    "Username" : "Usuario",
     "Password" : "Clave",
+    "Share" : "Compartir",
     "Folder name" : "Nombre del directorio"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es_CL.json b/apps/files_external/l10n/es_CL.json
index e07fd9b0531..e2aa9b9adda 100644
--- a/apps/files_external/l10n/es_CL.json
+++ b/apps/files_external/l10n/es_CL.json
@@ -1,8 +1,8 @@
 { "translations": {
-    "Username" : "Usuario",
-    "Share" : "Compartir",
     "Personal" : "Personal",
+    "Username" : "Usuario",
     "Password" : "Clave",
+    "Share" : "Compartir",
     "Folder name" : "Nombre del directorio"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js
index 47265881c2e..a8d1dea1a09 100644
--- a/apps/files_external/l10n/es_MX.js
+++ b/apps/files_external/l10n/es_MX.js
@@ -2,17 +2,18 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "Almacenamiento externo",
-    "Username" : "Nombre de usuario",
-    "Host" : "Servidor",
-    "Share" : "Compartir",
     "Personal" : "Personal",
     "Grant access" : "Conceder acceso",
     "Access granted" : "Acceso concedido",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
+    "API key" : "clave API",
     "Port" : "Puerto",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Servidor",
     "Location" : "Ubicación",
+    "Share" : "Compartir",
     "Name" : "Nombre",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json
index f045006c9b9..3fdea60b775 100644
--- a/apps/files_external/l10n/es_MX.json
+++ b/apps/files_external/l10n/es_MX.json
@@ -1,16 +1,17 @@
 { "translations": {
     "External storage" : "Almacenamiento externo",
-    "Username" : "Nombre de usuario",
-    "Host" : "Servidor",
-    "Share" : "Compartir",
     "Personal" : "Personal",
     "Grant access" : "Conceder acceso",
     "Access granted" : "Acceso concedido",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
+    "API key" : "clave API",
     "Port" : "Puerto",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Servidor",
     "Location" : "Ubicación",
+    "Share" : "Compartir",
     "Name" : "Nombre",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
diff --git a/apps/files_external/l10n/et_EE.js b/apps/files_external/l10n/et_EE.js
index 94c3722ca13..50102a5d2eb 100644
--- a/apps/files_external/l10n/et_EE.js
+++ b/apps/files_external/l10n/et_EE.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Samm 1 ebaõnnestus. Erind: %s",
     "Step 2 failed. Exception: %s" : "Samm 2 ebaõnnestus. Erind: %s",
     "External storage" : "Väline andmehoidla",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Kasutajanimi",
-    "Bucket" : "Korv",
-    "Region (optional for OpenStack Object Storage)" : "Regioon (valikuline OpenStack Object Storage puhul)",
-    "API Key (required for Rackspace Cloud Files)" : "API võti (vajalik Rackspace Cloud Files puhul)",
-    "Tenantname (required for OpenStack Object Storage)" : "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)",
-    "Password (required for OpenStack Object Storage)" : "Parool (vajalik OpenStack Object Storage puhul)",
-    "Service Name (required for OpenStack Object Storage)" : "Teenuse nimi (vajalik OpenStack Object Storage puhul)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)",
-    "Timeout of HTTP requests in seconds" : "HTTP päringute aegumine sekundites",
-    "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
-    "Host" : "Host",
-    "Username as share" : "Kasutajanimi kui jagamine",
-    "Share" : "Jaga",
-    "Remote subfolder" : "Mujahl olev alamkaust",
-    "SFTP with secret key login" : "SFTP koos salajase võtmega logimisega",
-    "Public key" : "Avalik võti",
     "Storage with id \"%i\" not found" : "Salvestuskohta ID-ga \"%i\" ei leitud",
     "Invalid mount point" : "Vigane ühenduspunkt",
     "Invalid storage backend \"%s\"" : "Vigane salvestuskoha taustsüsteem \"%s\"",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "Süsteem",
     "Grant access" : "Anna ligipääs",
     "Access granted" : "Ligipääs on antud",
+    "Generate keys" : "Loo võtmed",
+    "Error generating key pair" : "Viga võtmepaari loomisel",
     "Enable encryption" : "Luba krüpteerimine",
     "Enable previews" : "Luba eelvaated",
     "Check for changes" : "Otsi uuendusi",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
     "(group)" : "(grupp)",
     "Saved" : "Salvestatud",
-    "Generate keys" : "Loo võtmed",
-    "Error generating key pair" : "Viga võtmepaari loomisel",
     "None" : "Pole",
     "App key" : "Rakenduse võti",
     "App secret" : "Rakenduse salasõna",
     "Client ID" : "Kliendi ID",
     "Client secret" : "Kliendi salasõna",
+    "Username" : "Kasutajanimi",
     "Password" : "Parool",
+    "API key" : "API võti",
+    "Public key" : "Avalik võti",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Korv",
     "Hostname" : "Hostinimi",
     "Port" : "Port",
     "Region" : "Piirkond",
@@ -53,13 +40,18 @@ OC.L10N.register(
     "Enable Path Style" : "Luba otsingtee stiilis",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Mujahl olev alamkaust",
     "Secure https://" : "Turvaline https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Host",
     "Secure ftps://" : "Turvaline ftps://",
     "Local" : "Kohalik",
     "Location" : "Asukoht",
     "ownCloud" : "ownCloud",
     "Root" : "Juur",
+    "Share" : "Jaga",
+    "Username as share" : "Kasutajanimi kui jagamine",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Märkus:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
diff --git a/apps/files_external/l10n/et_EE.json b/apps/files_external/l10n/et_EE.json
index 92621d229d4..d307bc9c214 100644
--- a/apps/files_external/l10n/et_EE.json
+++ b/apps/files_external/l10n/et_EE.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "Samm 1 ebaõnnestus. Erind: %s",
     "Step 2 failed. Exception: %s" : "Samm 2 ebaõnnestus. Erind: %s",
     "External storage" : "Väline andmehoidla",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Kasutajanimi",
-    "Bucket" : "Korv",
-    "Region (optional for OpenStack Object Storage)" : "Regioon (valikuline OpenStack Object Storage puhul)",
-    "API Key (required for Rackspace Cloud Files)" : "API võti (vajalik Rackspace Cloud Files puhul)",
-    "Tenantname (required for OpenStack Object Storage)" : "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)",
-    "Password (required for OpenStack Object Storage)" : "Parool (vajalik OpenStack Object Storage puhul)",
-    "Service Name (required for OpenStack Object Storage)" : "Teenuse nimi (vajalik OpenStack Object Storage puhul)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)",
-    "Timeout of HTTP requests in seconds" : "HTTP päringute aegumine sekundites",
-    "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
-    "Host" : "Host",
-    "Username as share" : "Kasutajanimi kui jagamine",
-    "Share" : "Jaga",
-    "Remote subfolder" : "Mujahl olev alamkaust",
-    "SFTP with secret key login" : "SFTP koos salajase võtmega logimisega",
-    "Public key" : "Avalik võti",
     "Storage with id \"%i\" not found" : "Salvestuskohta ID-ga \"%i\" ei leitud",
     "Invalid mount point" : "Vigane ühenduspunkt",
     "Invalid storage backend \"%s\"" : "Vigane salvestuskoha taustsüsteem \"%s\"",
@@ -26,6 +9,8 @@
     "System" : "Süsteem",
     "Grant access" : "Anna ligipääs",
     "Access granted" : "Ligipääs on antud",
+    "Generate keys" : "Loo võtmed",
+    "Error generating key pair" : "Viga võtmepaari loomisel",
     "Enable encryption" : "Luba krüpteerimine",
     "Enable previews" : "Luba eelvaated",
     "Check for changes" : "Otsi uuendusi",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
     "(group)" : "(grupp)",
     "Saved" : "Salvestatud",
-    "Generate keys" : "Loo võtmed",
-    "Error generating key pair" : "Viga võtmepaari loomisel",
     "None" : "Pole",
     "App key" : "Rakenduse võti",
     "App secret" : "Rakenduse salasõna",
     "Client ID" : "Kliendi ID",
     "Client secret" : "Kliendi salasõna",
+    "Username" : "Kasutajanimi",
     "Password" : "Parool",
+    "API key" : "API võti",
+    "Public key" : "Avalik võti",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Korv",
     "Hostname" : "Hostinimi",
     "Port" : "Port",
     "Region" : "Piirkond",
@@ -51,13 +38,18 @@
     "Enable Path Style" : "Luba otsingtee stiilis",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Mujahl olev alamkaust",
     "Secure https://" : "Turvaline https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Host",
     "Secure ftps://" : "Turvaline ftps://",
     "Local" : "Kohalik",
     "Location" : "Asukoht",
     "ownCloud" : "ownCloud",
     "Root" : "Juur",
+    "Share" : "Jaga",
+    "Username as share" : "Kasutajanimi kui jagamine",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Märkus:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js
index 72fc8469ac6..199676d7269 100644
--- a/apps/files_external/l10n/eu.js
+++ b/apps/files_external/l10n/eu.js
@@ -4,21 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "1 Urratsak huts egin du. Salbuespena: %s",
     "Step 2 failed. Exception: %s" : "2 Urratsak huts egin du. Salbuespena: %s",
     "External storage" : "Kanpoko biltegiratzea",
-    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
-    "Username" : "Erabiltzaile izena",
-    "Region (optional for OpenStack Object Storage)" : "Eskualdea (hautazkoa OpenStack Objektu Biltegiratzerako)",
-    "API Key (required for Rackspace Cloud Files)" : "API Giltza (beharrezkoa Rackspace Cloud Filesentzako)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (beharrezkoa OpenStack Objektu Biltegiratzerko)",
-    "Password (required for OpenStack Object Storage)" : "Pasahitza (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "Service Name (required for OpenStack Object Storage)" : "Zerbitzuaren Izena (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nortasun amaierako puntuaren URLa (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "Timeout of HTTP requests in seconds" : "HTTP eskarien gehienezko denbora segundutan",
-    "SMB / CIFS using OC login" : "SMB / CIFS saioa hasteko OC erabiliz",
-    "Host" : "Ostalaria",
-    "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
-    "Share" : "Partekatu",
-    "Remote subfolder" : "Urruneko azpikarpeta",
-    "Public key" : "Gako publikoa",
     "Personal" : "Pertsonala",
     "System" : "Sistema",
     "Grant access" : "Baimendu sarrera",
@@ -31,7 +16,10 @@ OC.L10N.register(
     "App secret" : "App sekretua",
     "Client ID" : "Bezero ID",
     "Client secret" : "Bezeroaren Sekretua",
+    "Username" : "Erabiltzaile izena",
     "Password" : "Pasahitza",
+    "API key" : "APIaren gakoa",
+    "Public key" : "Gako publikoa",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Ostalari izena",
     "Port" : "Portua",
@@ -40,13 +28,18 @@ OC.L10N.register(
     "Enable Path Style" : "Gaitu Bide Estiloa",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Urruneko azpikarpeta",
     "Secure https://" : "https:// segurua",
     "Dropbox" : "Dropbox",
+    "Host" : "Ostalaria",
     "Secure ftps://" : "ftps:// segurua",
     "Local" : "Bertakoa",
     "Location" : "Kokapena",
     "ownCloud" : "ownCloud",
     "Root" : "Erroa",
+    "Share" : "Partekatu",
+    "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
+    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
     "<b>Note:</b> " : "<b>Oharra:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json
index 5a8c3fd6930..f13311954f7 100644
--- a/apps/files_external/l10n/eu.json
+++ b/apps/files_external/l10n/eu.json
@@ -2,21 +2,6 @@
     "Step 1 failed. Exception: %s" : "1 Urratsak huts egin du. Salbuespena: %s",
     "Step 2 failed. Exception: %s" : "2 Urratsak huts egin du. Salbuespena: %s",
     "External storage" : "Kanpoko biltegiratzea",
-    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
-    "Username" : "Erabiltzaile izena",
-    "Region (optional for OpenStack Object Storage)" : "Eskualdea (hautazkoa OpenStack Objektu Biltegiratzerako)",
-    "API Key (required for Rackspace Cloud Files)" : "API Giltza (beharrezkoa Rackspace Cloud Filesentzako)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (beharrezkoa OpenStack Objektu Biltegiratzerko)",
-    "Password (required for OpenStack Object Storage)" : "Pasahitza (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "Service Name (required for OpenStack Object Storage)" : "Zerbitzuaren Izena (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nortasun amaierako puntuaren URLa (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "Timeout of HTTP requests in seconds" : "HTTP eskarien gehienezko denbora segundutan",
-    "SMB / CIFS using OC login" : "SMB / CIFS saioa hasteko OC erabiliz",
-    "Host" : "Ostalaria",
-    "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
-    "Share" : "Partekatu",
-    "Remote subfolder" : "Urruneko azpikarpeta",
-    "Public key" : "Gako publikoa",
     "Personal" : "Pertsonala",
     "System" : "Sistema",
     "Grant access" : "Baimendu sarrera",
@@ -29,7 +14,10 @@
     "App secret" : "App sekretua",
     "Client ID" : "Bezero ID",
     "Client secret" : "Bezeroaren Sekretua",
+    "Username" : "Erabiltzaile izena",
     "Password" : "Pasahitza",
+    "API key" : "APIaren gakoa",
+    "Public key" : "Gako publikoa",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Ostalari izena",
     "Port" : "Portua",
@@ -38,13 +26,18 @@
     "Enable Path Style" : "Gaitu Bide Estiloa",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Urruneko azpikarpeta",
     "Secure https://" : "https:// segurua",
     "Dropbox" : "Dropbox",
+    "Host" : "Ostalaria",
     "Secure ftps://" : "ftps:// segurua",
     "Local" : "Bertakoa",
     "Location" : "Kokapena",
     "ownCloud" : "ownCloud",
     "Root" : "Erroa",
+    "Share" : "Partekatu",
+    "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
+    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
     "<b>Note:</b> " : "<b>Oharra:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
diff --git a/apps/files_external/l10n/fa.js b/apps/files_external/l10n/fa.js
index 7ac00a16718..1a3a06ba391 100644
--- a/apps/files_external/l10n/fa.js
+++ b/apps/files_external/l10n/fa.js
@@ -2,21 +2,22 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "حافظه خارجی",
-    "Username" : "نام کاربری",
-    "Host" : "میزبانی",
-    "Share" : "اشتراک‌گذاری",
     "Personal" : "شخصی",
     "Grant access" : " مجوز اعطا دسترسی",
     "Access granted" : "مجوز دسترسی صادر شد",
     "Saved" : "ذخیره شد",
     "None" : "هیچ‌کدام",
+    "Username" : "نام کاربری",
     "Password" : "گذرواژه",
+    "API key" : "کلید API ",
     "Port" : "درگاه",
     "Region" : "ناحیه",
     "WebDAV" : "WebDAV",
     "URL" : "آدرس",
+    "Host" : "میزبانی",
     "Location" : "محل",
     "ownCloud" : "ownCloud",
+    "Share" : "اشتراک‌گذاری",
     "Name" : "نام",
     "External Storage" : "حافظه خارجی",
     "Folder name" : "نام پوشه",
diff --git a/apps/files_external/l10n/fa.json b/apps/files_external/l10n/fa.json
index 7aec7d92afa..79a599d7390 100644
--- a/apps/files_external/l10n/fa.json
+++ b/apps/files_external/l10n/fa.json
@@ -1,20 +1,21 @@
 { "translations": {
     "External storage" : "حافظه خارجی",
-    "Username" : "نام کاربری",
-    "Host" : "میزبانی",
-    "Share" : "اشتراک‌گذاری",
     "Personal" : "شخصی",
     "Grant access" : " مجوز اعطا دسترسی",
     "Access granted" : "مجوز دسترسی صادر شد",
     "Saved" : "ذخیره شد",
     "None" : "هیچ‌کدام",
+    "Username" : "نام کاربری",
     "Password" : "گذرواژه",
+    "API key" : "کلید API ",
     "Port" : "درگاه",
     "Region" : "ناحیه",
     "WebDAV" : "WebDAV",
     "URL" : "آدرس",
+    "Host" : "میزبانی",
     "Location" : "محل",
     "ownCloud" : "ownCloud",
+    "Share" : "اشتراک‌گذاری",
     "Name" : "نام",
     "External Storage" : "حافظه خارجی",
     "Folder name" : "نام پوشه",
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
index 1e67d9ffc73..12aa1c0f1ca 100644
--- a/apps/files_external/l10n/fi_FI.js
+++ b/apps/files_external/l10n/fi_FI.js
@@ -4,20 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s",
     "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s",
     "External storage" : "Ulkoinen tallennustila",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Käyttäjätunnus",
-    "Region (optional for OpenStack Object Storage)" : "Alue (valinnainen OpenStack Object Storagen käyttöön)",
-    "API Key (required for Rackspace Cloud Files)" : "API-avain (vaaditaan Rackspace Cloud Filesin käyttöön)",
-    "Tenantname (required for OpenStack Object Storage)" : "Vuokralaisnimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Password (required for OpenStack Object Storage)" : "Salasana (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Service Name (required for OpenStack Object Storage)" : "Palvelun nimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Timeout of HTTP requests in seconds" : "HTTP-pyyntöjen aikakatkaisu sekunneissa",
-    "SMB / CIFS using OC login" : "SMB / CIFS käyttäen OC-kirjautumista",
-    "Host" : "Isäntä",
-    "Username as share" : "Käyttäjänimi jakona",
-    "Share" : "Jaa",
-    "Remote subfolder" : "Etäalikansio",
-    "Public key" : "Julkinen avain",
     "Storage with id \"%i\" not found" : "Tallennustilaa tunnisteella \"%i\" ei löytynyt",
     "Invalid mount point" : "Virheellinen liitoskohta",
     "Personal" : "Henkilökohtainen",
@@ -26,6 +12,8 @@ OC.L10N.register(
     "Access granted" : "Pääsy sallittu",
     "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä",
     "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä",
+    "Generate keys" : "Luo avaimet",
+    "Error generating key pair" : "Virhe luotaessa avainparia",
     "Enable encryption" : "Käytä salausta",
     "Enable previews" : "Käytä esikatseluja",
     "Check for changes" : "Tarkista muutokset",
@@ -35,8 +23,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.",
     "(group)" : "(ryhmä)",
     "Saved" : "Tallennettu",
-    "Generate keys" : "Luo avaimet",
-    "Error generating key pair" : "Virhe luotaessa avainparia",
     "None" : "Ei mitään",
     "OAuth1" : "OAuth1",
     "App key" : "Sovellusavain",
@@ -44,17 +30,22 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Asiakkaan tunniste",
     "Client secret" : "Asiakassalaisuus",
-    "Username and password" : "Käyttäjätunnus ja salasana",
+    "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
+    "API key" : "API-avain",
+    "Username and password" : "Käyttäjätunnus ja salasana",
+    "Public key" : "Julkinen avain",
     "Amazon S3" : "Amazon S3",
     "Port" : "Portti",
     "Region" : "Alue",
     "Enable SSL" : "Käytä SSL:ää",
     "WebDAV" : "WebDAV",
     "URL" : "Verkko-osoite",
+    "Remote subfolder" : "Etäalikansio",
     "Secure https://" : "Salattu https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Isäntä",
     "Secure ftps://" : "Salattu ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Paikallinen",
@@ -62,6 +53,9 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Jaa",
+    "Username as share" : "Käyttäjänimi jakona",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Huomio:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
index 3870158899b..715e020273a 100644
--- a/apps/files_external/l10n/fi_FI.json
+++ b/apps/files_external/l10n/fi_FI.json
@@ -2,20 +2,6 @@
     "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s",
     "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s",
     "External storage" : "Ulkoinen tallennustila",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Käyttäjätunnus",
-    "Region (optional for OpenStack Object Storage)" : "Alue (valinnainen OpenStack Object Storagen käyttöön)",
-    "API Key (required for Rackspace Cloud Files)" : "API-avain (vaaditaan Rackspace Cloud Filesin käyttöön)",
-    "Tenantname (required for OpenStack Object Storage)" : "Vuokralaisnimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Password (required for OpenStack Object Storage)" : "Salasana (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Service Name (required for OpenStack Object Storage)" : "Palvelun nimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Timeout of HTTP requests in seconds" : "HTTP-pyyntöjen aikakatkaisu sekunneissa",
-    "SMB / CIFS using OC login" : "SMB / CIFS käyttäen OC-kirjautumista",
-    "Host" : "Isäntä",
-    "Username as share" : "Käyttäjänimi jakona",
-    "Share" : "Jaa",
-    "Remote subfolder" : "Etäalikansio",
-    "Public key" : "Julkinen avain",
     "Storage with id \"%i\" not found" : "Tallennustilaa tunnisteella \"%i\" ei löytynyt",
     "Invalid mount point" : "Virheellinen liitoskohta",
     "Personal" : "Henkilökohtainen",
@@ -24,6 +10,8 @@
     "Access granted" : "Pääsy sallittu",
     "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä",
     "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä",
+    "Generate keys" : "Luo avaimet",
+    "Error generating key pair" : "Virhe luotaessa avainparia",
     "Enable encryption" : "Käytä salausta",
     "Enable previews" : "Käytä esikatseluja",
     "Check for changes" : "Tarkista muutokset",
@@ -33,8 +21,6 @@
     "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.",
     "(group)" : "(ryhmä)",
     "Saved" : "Tallennettu",
-    "Generate keys" : "Luo avaimet",
-    "Error generating key pair" : "Virhe luotaessa avainparia",
     "None" : "Ei mitään",
     "OAuth1" : "OAuth1",
     "App key" : "Sovellusavain",
@@ -42,17 +28,22 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Asiakkaan tunniste",
     "Client secret" : "Asiakassalaisuus",
-    "Username and password" : "Käyttäjätunnus ja salasana",
+    "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
+    "API key" : "API-avain",
+    "Username and password" : "Käyttäjätunnus ja salasana",
+    "Public key" : "Julkinen avain",
     "Amazon S3" : "Amazon S3",
     "Port" : "Portti",
     "Region" : "Alue",
     "Enable SSL" : "Käytä SSL:ää",
     "WebDAV" : "WebDAV",
     "URL" : "Verkko-osoite",
+    "Remote subfolder" : "Etäalikansio",
     "Secure https://" : "Salattu https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Isäntä",
     "Secure ftps://" : "Salattu ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Paikallinen",
@@ -60,6 +51,9 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Jaa",
+    "Username as share" : "Käyttäjänimi jakona",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Huomio:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 8ac5b1a4466..87c7f63bfb5 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -7,23 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s",
     "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nom d'utilisateur",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Région (optionnel pour OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clé API (requis pour Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requis pour le stockage OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Mot de passe (requis pour OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom du service (requis pour le stockage OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Délai d'attente maximal des requêtes HTTP en secondes",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
-    "Host" : "Hôte",
-    "Username as share" : "Nom d'utilisateur comme nom de partage",
-    "Share" : "Partage",
-    "Remote subfolder" : "Sous-dossier distant",
-    "SFTP with secret key login" : "SFTP avec identification par clé",
-    "Public key" : "Clef publique",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
     "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
@@ -31,13 +14,14 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
     "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
     "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
-    "Admin-only storage backend \"%s\"" : "Service de stockage \"%s\" pour admins seulement",
     "Personal" : "Personnel",
     "System" : "Système",
     "Grant access" : "Autoriser l'accès",
     "Access granted" : "Accès autorisé",
     "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1",
     "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2",
+    "Generate keys" : "Générer des clés",
+    "Error generating key pair" : "Erreur lors de la génération des clés",
     "Enable encryption" : "Activer le chiffrement",
     "Enable previews" : "Activer les prévisualisations",
     "Check for changes" : "Rechercher les modifications",
@@ -47,8 +31,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.",
     "(group)" : "(groupe)",
     "Saved" : "Sauvegardé",
-    "Generate keys" : "Générer des clés",
-    "Error generating key pair" : "Erreur lors de la génération des clés",
     "Access key" : "Clé d'accès",
     "Secret key" : "Clé secrète",
     "Builtin" : "inclus",
@@ -59,10 +41,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
-    "Username and password" : "Nom d'utilisateur et mot de passe",
+    "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
+    "API key" : "Clé API",
+    "Username and password" : "Nom d'utilisateur et mot de passe",
     "Session credentials" : "Informations d'identification de session",
+    "Public key" : "Clef publique",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Nom de l'hôte",
     "Port" : "Port",
     "Region" : "Région",
@@ -70,9 +56,11 @@ OC.L10N.register(
     "Enable Path Style" : "Accès par path",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Sous-dossier distant",
     "Secure https://" : "Sécurisation https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Hôte",
     "Secure ftps://" : "Sécurisation ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Local",
@@ -81,6 +69,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Partage",
+    "Username as share" : "Nom d'utilisateur comme nom de partage",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Attention :</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 67b8932202f..dee041e3546 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -5,23 +5,6 @@
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s",
     "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nom d'utilisateur",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Région (optionnel pour OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clé API (requis pour Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requis pour le stockage OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Mot de passe (requis pour OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom du service (requis pour le stockage OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Délai d'attente maximal des requêtes HTTP en secondes",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
-    "Host" : "Hôte",
-    "Username as share" : "Nom d'utilisateur comme nom de partage",
-    "Share" : "Partage",
-    "Remote subfolder" : "Sous-dossier distant",
-    "SFTP with secret key login" : "SFTP avec identification par clé",
-    "Public key" : "Clef publique",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
     "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
@@ -29,13 +12,14 @@
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
     "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
     "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
-    "Admin-only storage backend \"%s\"" : "Service de stockage \"%s\" pour admins seulement",
     "Personal" : "Personnel",
     "System" : "Système",
     "Grant access" : "Autoriser l'accès",
     "Access granted" : "Accès autorisé",
     "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1",
     "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2",
+    "Generate keys" : "Générer des clés",
+    "Error generating key pair" : "Erreur lors de la génération des clés",
     "Enable encryption" : "Activer le chiffrement",
     "Enable previews" : "Activer les prévisualisations",
     "Check for changes" : "Rechercher les modifications",
@@ -45,8 +29,6 @@
     "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.",
     "(group)" : "(groupe)",
     "Saved" : "Sauvegardé",
-    "Generate keys" : "Générer des clés",
-    "Error generating key pair" : "Erreur lors de la génération des clés",
     "Access key" : "Clé d'accès",
     "Secret key" : "Clé secrète",
     "Builtin" : "inclus",
@@ -57,10 +39,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
-    "Username and password" : "Nom d'utilisateur et mot de passe",
+    "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
+    "API key" : "Clé API",
+    "Username and password" : "Nom d'utilisateur et mot de passe",
     "Session credentials" : "Informations d'identification de session",
+    "Public key" : "Clef publique",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Nom de l'hôte",
     "Port" : "Port",
     "Region" : "Région",
@@ -68,9 +54,11 @@
     "Enable Path Style" : "Accès par path",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Sous-dossier distant",
     "Secure https://" : "Sécurisation https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Hôte",
     "Secure ftps://" : "Sécurisation ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Local",
@@ -79,6 +67,9 @@
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Partage",
+    "Username as share" : "Nom d'utilisateur comme nom de partage",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Attention :</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js
index 29d99ec6691..fc4d4ea4931 100644
--- a/apps/files_external/l10n/gl.js
+++ b/apps/files_external/l10n/gl.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Fallou o paso 1. Excepción: %s",
     "Step 2 failed. Exception: %s" : "Fallou o paso 2. Excepción: %s",
     "External storage" : "Almacenamento externo",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nome de usuario",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Rexión (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave da API (obrigatoria para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do inquilino (obrigatorio para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Caducidade, en segundos, das peticións HTTP",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
-    "Host" : "Servidor",
-    "Username as share" : "Nome de usuario como compartición",
-    "Share" : "Compartir",
-    "Remote subfolder" : "Subcartafol remoto",
-    "SFTP with secret key login" : "SFTP con chave secreta de acceso",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Non se atopa o almacenamento co ID «%i» ",
     "Invalid mount point" : "Punto de montaxe incorrecto",
     "Invalid storage backend \"%s\"" : "Infraestrutura de almacenamento «%s» incorrecta",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "Sistema",
     "Grant access" : "Permitir o acceso",
     "Access granted" : "Concedeuse acceso",
+    "Generate keys" : "Xerar chaves",
+    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
     "Enable encryption" : "Activar o cifrado",
     "Enable previews" : "Activar as vistas previas",
     "Check for changes" : "Comprobar se hai cambios",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Gardado",
-    "Generate keys" : "Xerar chaves",
-    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
     "None" : "Ningún",
     "App key" : "Clave da API",
     "App secret" : "Secreto da aplicación",
     "Client ID" : "ID do cliente",
     "Client secret" : "Secreto do cliente",
+    "Username" : "Nome de usuario",
     "Password" : "Contrasinal",
+    "API key" : "Chave da API",
+    "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Nome de máquina",
     "Port" : "Porto",
     "Region" : "Rexión",
@@ -53,13 +40,18 @@ OC.L10N.register(
     "Enable Path Style" : "Activar o estilo de ruta",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subcartafol remoto",
     "Secure https://" : "https:// seguro",
     "Dropbox" : "Dropbox",
+    "Host" : "Servidor",
     "Secure ftps://" : "ftps:// seguro",
     "Local" : "Local",
     "Location" : "Localización",
     "ownCloud" : "ownCloud",
     "Root" : "Root (raíz)",
+    "Share" : "Compartir",
+    "Username as share" : "Nome de usuario como compartición",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json
index cecca37a291..48bd2c62e9a 100644
--- a/apps/files_external/l10n/gl.json
+++ b/apps/files_external/l10n/gl.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "Fallou o paso 1. Excepción: %s",
     "Step 2 failed. Exception: %s" : "Fallou o paso 2. Excepción: %s",
     "External storage" : "Almacenamento externo",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nome de usuario",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Rexión (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave da API (obrigatoria para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do inquilino (obrigatorio para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Caducidade, en segundos, das peticións HTTP",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
-    "Host" : "Servidor",
-    "Username as share" : "Nome de usuario como compartición",
-    "Share" : "Compartir",
-    "Remote subfolder" : "Subcartafol remoto",
-    "SFTP with secret key login" : "SFTP con chave secreta de acceso",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Non se atopa o almacenamento co ID «%i» ",
     "Invalid mount point" : "Punto de montaxe incorrecto",
     "Invalid storage backend \"%s\"" : "Infraestrutura de almacenamento «%s» incorrecta",
@@ -26,6 +9,8 @@
     "System" : "Sistema",
     "Grant access" : "Permitir o acceso",
     "Access granted" : "Concedeuse acceso",
+    "Generate keys" : "Xerar chaves",
+    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
     "Enable encryption" : "Activar o cifrado",
     "Enable previews" : "Activar as vistas previas",
     "Check for changes" : "Comprobar se hai cambios",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Gardado",
-    "Generate keys" : "Xerar chaves",
-    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
     "None" : "Ningún",
     "App key" : "Clave da API",
     "App secret" : "Secreto da aplicación",
     "Client ID" : "ID do cliente",
     "Client secret" : "Secreto do cliente",
+    "Username" : "Nome de usuario",
     "Password" : "Contrasinal",
+    "API key" : "Chave da API",
+    "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Nome de máquina",
     "Port" : "Porto",
     "Region" : "Rexión",
@@ -51,13 +38,18 @@
     "Enable Path Style" : "Activar o estilo de ruta",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subcartafol remoto",
     "Secure https://" : "https:// seguro",
     "Dropbox" : "Dropbox",
+    "Host" : "Servidor",
     "Secure ftps://" : "ftps:// seguro",
     "Local" : "Local",
     "Location" : "Localización",
     "ownCloud" : "ownCloud",
     "Root" : "Root (raíz)",
+    "Share" : "Compartir",
+    "Username as share" : "Nome de usuario como compartición",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
diff --git a/apps/files_external/l10n/he.js b/apps/files_external/l10n/he.js
index 39729016a36..2de5539e7d1 100644
--- a/apps/files_external/l10n/he.js
+++ b/apps/files_external/l10n/he.js
@@ -1,22 +1,22 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "שם משתמש",
-    "Host" : "מארח",
-    "Share" : "שיתוף",
     "Personal" : "אישי",
     "Grant access" : "הענקת גישה",
     "Access granted" : "הוענקה גישה",
     "Saved" : "נשמר",
     "None" : "כלום",
+    "Username" : "שם משתמש",
     "Password" : "סיסמא",
     "Port" : "פורט",
     "Region" : "אזור",
     "WebDAV" : "WebDAV",
     "URL" : "כתובת",
+    "Host" : "מארח",
     "Local" : "מקומי",
     "Location" : "מיקום",
     "ownCloud" : "ownCloud",
+    "Share" : "שיתוף",
     "Name" : "שם",
     "External Storage" : "אחסון חיצוני",
     "Folder name" : "שם התיקייה",
diff --git a/apps/files_external/l10n/he.json b/apps/files_external/l10n/he.json
index d04109504d0..4b4e289c53e 100644
--- a/apps/files_external/l10n/he.json
+++ b/apps/files_external/l10n/he.json
@@ -1,20 +1,20 @@
 { "translations": {
-    "Username" : "שם משתמש",
-    "Host" : "מארח",
-    "Share" : "שיתוף",
     "Personal" : "אישי",
     "Grant access" : "הענקת גישה",
     "Access granted" : "הוענקה גישה",
     "Saved" : "נשמר",
     "None" : "כלום",
+    "Username" : "שם משתמש",
     "Password" : "סיסמא",
     "Port" : "פורט",
     "Region" : "אזור",
     "WebDAV" : "WebDAV",
     "URL" : "כתובת",
+    "Host" : "מארח",
     "Local" : "מקומי",
     "Location" : "מיקום",
     "ownCloud" : "ownCloud",
+    "Share" : "שיתוף",
     "Name" : "שם",
     "External Storage" : "אחסון חיצוני",
     "Folder name" : "שם התיקייה",
diff --git a/apps/files_external/l10n/hi.js b/apps/files_external/l10n/hi.js
index ed6db75b370..3d3b750ebd8 100644
--- a/apps/files_external/l10n/hi.js
+++ b/apps/files_external/l10n/hi.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "प्रयोक्ता का नाम",
-    "Share" : "साझा करें",
     "Personal" : "यक्तिगत",
-    "Password" : "पासवर्ड"
+    "Username" : "प्रयोक्ता का नाम",
+    "Password" : "पासवर्ड",
+    "Share" : "साझा करें"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/hi.json b/apps/files_external/l10n/hi.json
index ea8d878bbd2..6e1117f610e 100644
--- a/apps/files_external/l10n/hi.json
+++ b/apps/files_external/l10n/hi.json
@@ -1,7 +1,7 @@
 { "translations": {
-    "Username" : "प्रयोक्ता का नाम",
-    "Share" : "साझा करें",
     "Personal" : "यक्तिगत",
-    "Password" : "पासवर्ड"
+    "Username" : "प्रयोक्ता का नाम",
+    "Password" : "पासवर्ड",
+    "Share" : "साझा करें"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/hr.js b/apps/files_external/l10n/hr.js
index f410aed4324..7ab17521581 100644
--- a/apps/files_external/l10n/hr.js
+++ b/apps/files_external/l10n/hr.js
@@ -4,21 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspio. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspio. Izuzetak: %s",
     "External storage" : "Vanjsko spremište za pohranu",
-    "OpenStack Object Storage" : "Prostor za pohranu.....",
-    "Username" : "Korisničko ime",
-    "Bucket" : "Kantica",
-    "Region (optional for OpenStack Object Storage)" : "Regija (neobavezno za OpenStack object storage",
-    "API Key (required for Rackspace Cloud Files)" : "API ključ (obavezno za Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Naziv korisnika (obavezno za OpenStack Object storage)",
-    "Password (required for OpenStack Object Storage)" : "Lozinka (obavezno za OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Naziv usluge (Obavezno za OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje točke identiteta (obavezno za OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Vrijeme isteka HTTP zahtjeva u sekundama",
-    "SMB / CIFS using OC login" : "SMB / CIFS uz prijavu putem programa OC",
-    "Host" : "Glavno računalo",
-    "Username as share" : "Korisničko ime kao dijeljeni resurs",
-    "Share" : "Dijeljenje zhajedničkih resursa",
-    "Remote subfolder" : "Udaljena podmapa",
     "Personal" : "Osobno",
     "System" : "Sustav",
     "Grant access" : "Dodijeli pristup",
@@ -31,8 +16,10 @@ OC.L10N.register(
     "App secret" : "Tajna aplikacije",
     "Client ID" : "ID klijenta",
     "Client secret" : "Klijentski tajni ključ",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Kantica",
     "Hostname" : "Naziv poslužitelja",
     "Port" : "Port",
     "Region" : "Regija",
@@ -40,12 +27,17 @@ OC.L10N.register(
     "Enable Path Style" : "Omogućite Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Udaljena podmapa",
     "Secure https://" : "Siguran https://",
+    "Host" : "Glavno računalo",
     "Secure ftps://" : "Sigurni ftps://",
     "Local" : "Lokalno",
     "Location" : "Lokacija",
     "ownCloud" : "OwnCloud",
     "Root" : "Korijen",
+    "Share" : "Dijeljenje zhajedničkih resursa",
+    "Username as share" : "Korisničko ime kao dijeljeni resurs",
+    "OpenStack Object Storage" : "Prostor za pohranu.....",
     "<b>Note:</b> " : "<b>Bilješka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška cURL u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svog administratora sustava da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška FTP u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svotg administratora sustava da je instalira.",
diff --git a/apps/files_external/l10n/hr.json b/apps/files_external/l10n/hr.json
index bd33b34f9d7..23188c55fea 100644
--- a/apps/files_external/l10n/hr.json
+++ b/apps/files_external/l10n/hr.json
@@ -2,21 +2,6 @@
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspio. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspio. Izuzetak: %s",
     "External storage" : "Vanjsko spremište za pohranu",
-    "OpenStack Object Storage" : "Prostor za pohranu.....",
-    "Username" : "Korisničko ime",
-    "Bucket" : "Kantica",
-    "Region (optional for OpenStack Object Storage)" : "Regija (neobavezno za OpenStack object storage",
-    "API Key (required for Rackspace Cloud Files)" : "API ključ (obavezno za Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Naziv korisnika (obavezno za OpenStack Object storage)",
-    "Password (required for OpenStack Object Storage)" : "Lozinka (obavezno za OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Naziv usluge (Obavezno za OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje točke identiteta (obavezno za OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Vrijeme isteka HTTP zahtjeva u sekundama",
-    "SMB / CIFS using OC login" : "SMB / CIFS uz prijavu putem programa OC",
-    "Host" : "Glavno računalo",
-    "Username as share" : "Korisničko ime kao dijeljeni resurs",
-    "Share" : "Dijeljenje zhajedničkih resursa",
-    "Remote subfolder" : "Udaljena podmapa",
     "Personal" : "Osobno",
     "System" : "Sustav",
     "Grant access" : "Dodijeli pristup",
@@ -29,8 +14,10 @@
     "App secret" : "Tajna aplikacije",
     "Client ID" : "ID klijenta",
     "Client secret" : "Klijentski tajni ključ",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Kantica",
     "Hostname" : "Naziv poslužitelja",
     "Port" : "Port",
     "Region" : "Regija",
@@ -38,12 +25,17 @@
     "Enable Path Style" : "Omogućite Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Udaljena podmapa",
     "Secure https://" : "Siguran https://",
+    "Host" : "Glavno računalo",
     "Secure ftps://" : "Sigurni ftps://",
     "Local" : "Lokalno",
     "Location" : "Lokacija",
     "ownCloud" : "OwnCloud",
     "Root" : "Korijen",
+    "Share" : "Dijeljenje zhajedničkih resursa",
+    "Username as share" : "Korisničko ime kao dijeljeni resurs",
+    "OpenStack Object Storage" : "Prostor za pohranu.....",
     "<b>Note:</b> " : "<b>Bilješka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška cURL u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svog administratora sustava da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška FTP u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svotg administratora sustava da je instalira.",
diff --git a/apps/files_external/l10n/hu_HU.js b/apps/files_external/l10n/hu_HU.js
index 39d28c69fd7..563267f66fd 100644
--- a/apps/files_external/l10n/hu_HU.js
+++ b/apps/files_external/l10n/hu_HU.js
@@ -2,13 +2,6 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "Külső tárolók",
-    "Username" : "Felhasználónév",
-    "Bucket" : "Bucket",
-    "Timeout of HTTP requests in seconds" : "A HTTP-kérés időkorlátja másodpercben",
-    "Host" : "Kiszolgáló",
-    "Username as share" : "Felhasználónév és megosztás",
-    "Share" : "Megosztás",
-    "Remote subfolder" : "Távoli alkönyvtár",
     "Personal" : "Személyes",
     "System" : "Rendszer",
     "Grant access" : "Megadom a hozzáférést",
@@ -19,19 +12,26 @@ OC.L10N.register(
     "None" : "Egyik sem",
     "App key" : "App kulcs",
     "App secret" : "App titkos kulcs",
+    "Username" : "Felhasználónév",
     "Password" : "Jelszó",
+    "API key" : "API kulcs",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Hosztnév",
     "Port" : "Port",
     "Region" : "Megye",
     "Enable SSL" : "SSL engedélyezése",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Távoli alkönyvtár",
     "Secure https://" : "Biztonságos https://",
+    "Host" : "Kiszolgáló",
     "Secure ftps://" : "Biztonságos ftps://",
     "Local" : "Helyi",
     "Location" : "Hely",
     "ownCloud" : "ownCloud",
+    "Share" : "Megosztás",
+    "Username as share" : "Felhasználónév és megosztás",
     "<b>Note:</b> " : "<b>Megjegyzés:</b>",
     "Name" : "Név",
     "Storage type" : "Tároló típusa",
diff --git a/apps/files_external/l10n/hu_HU.json b/apps/files_external/l10n/hu_HU.json
index 180ab84c578..a3608dba7b7 100644
--- a/apps/files_external/l10n/hu_HU.json
+++ b/apps/files_external/l10n/hu_HU.json
@@ -1,12 +1,5 @@
 { "translations": {
     "External storage" : "Külső tárolók",
-    "Username" : "Felhasználónév",
-    "Bucket" : "Bucket",
-    "Timeout of HTTP requests in seconds" : "A HTTP-kérés időkorlátja másodpercben",
-    "Host" : "Kiszolgáló",
-    "Username as share" : "Felhasználónév és megosztás",
-    "Share" : "Megosztás",
-    "Remote subfolder" : "Távoli alkönyvtár",
     "Personal" : "Személyes",
     "System" : "Rendszer",
     "Grant access" : "Megadom a hozzáférést",
@@ -17,19 +10,26 @@
     "None" : "Egyik sem",
     "App key" : "App kulcs",
     "App secret" : "App titkos kulcs",
+    "Username" : "Felhasználónév",
     "Password" : "Jelszó",
+    "API key" : "API kulcs",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Hosztnév",
     "Port" : "Port",
     "Region" : "Megye",
     "Enable SSL" : "SSL engedélyezése",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Távoli alkönyvtár",
     "Secure https://" : "Biztonságos https://",
+    "Host" : "Kiszolgáló",
     "Secure ftps://" : "Biztonságos ftps://",
     "Local" : "Helyi",
     "Location" : "Hely",
     "ownCloud" : "ownCloud",
+    "Share" : "Megosztás",
+    "Username as share" : "Felhasználónév és megosztás",
     "<b>Note:</b> " : "<b>Megjegyzés:</b>",
     "Name" : "Név",
     "Storage type" : "Tároló típusa",
diff --git a/apps/files_external/l10n/ia.js b/apps/files_external/l10n/ia.js
index 441a001ca25..d13ee4ac10f 100644
--- a/apps/files_external/l10n/ia.js
+++ b/apps/files_external/l10n/ia.js
@@ -1,14 +1,14 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Nomine de usator",
-    "Share" : "Compartir",
     "Personal" : "Personal",
     "Saved" : "Salveguardate",
+    "Username" : "Nomine de usator",
     "Password" : "Contrasigno",
     "Region" : "Region",
     "URL" : "URL",
     "Location" : "Loco",
+    "Share" : "Compartir",
     "Name" : "Nomine",
     "Folder name" : "Nomine de dossier",
     "Delete" : "Deler"
diff --git a/apps/files_external/l10n/ia.json b/apps/files_external/l10n/ia.json
index 432207ba3c1..43562ce9e5b 100644
--- a/apps/files_external/l10n/ia.json
+++ b/apps/files_external/l10n/ia.json
@@ -1,12 +1,12 @@
 { "translations": {
-    "Username" : "Nomine de usator",
-    "Share" : "Compartir",
     "Personal" : "Personal",
     "Saved" : "Salveguardate",
+    "Username" : "Nomine de usator",
     "Password" : "Contrasigno",
     "Region" : "Region",
     "URL" : "URL",
     "Location" : "Loco",
+    "Share" : "Compartir",
     "Name" : "Nomine",
     "Folder name" : "Nomine de dossier",
     "Delete" : "Deler"
diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js
index e26ad12f3a8..be0abf0bbae 100644
--- a/apps/files_external/l10n/id.js
+++ b/apps/files_external/l10n/id.js
@@ -7,23 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s",
     "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s",
     "External storage" : "Penyimpanan eksternal",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nama Pengguna",
-    "Bucket" : "Keranjang",
-    "Region (optional for OpenStack Object Storage)" : "Daerah (tambahan untuk OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Kunci API (diperlukan untuk Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (diperlukan untuk OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Sandi (diperlukan untuk OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nama Layanan (diperlukan untuk OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (diperlukan untuk OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Batas waktu permintaan HTTP dalam detik",
-    "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login",
-    "Host" : "Host",
-    "Username as share" : "Nama pengguna berbagi",
-    "Share" : "Bagikan",
-    "Remote subfolder" : "Subfolder remote",
-    "SFTP with secret key login" : "SFTP dengan kunci rahasia masuk",
-    "Public key" : "Kunci Public",
     "Storage with id \"%i\" not found" : "Penyimpanan dengan id \"%i\" tidak ditemukan",
     "Invalid backend or authentication mechanism class" : "Beckend atau kelas mekanisme otentikasi salah.",
     "Invalid mount point" : "Mount point salah",
@@ -31,13 +14,14 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
     "Unsatisfied backend parameters" : "Parameter backend tidak lengkap",
     "Unsatisfied authentication mechanism parameters" : "Parameter mekanisme otentikasi tidak lengkap",
-    "Admin-only storage backend \"%s\"" : "Backend penyimpanan hanya-admin \"%s\"",
     "Personal" : "Pribadi",
     "System" : "Sistem",
     "Grant access" : "Berikan hak akses",
     "Access granted" : "Akses diberikan",
     "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1",
     "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2",
+    "Generate keys" : "Hasilkan kunci",
+    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
     "Enable encryption" : "Aktifkan enkripsi",
     "Enable previews" : "Aktifkan pratinjau",
     "Check for changes" : "Periksa perubahan",
@@ -47,8 +31,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
     "(group)" : "(grup)",
     "Saved" : "Disimpan",
-    "Generate keys" : "Hasilkan kunci",
-    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
     "Access key" : "Kunci akses",
     "Secret key" : "Kunci rahasia",
     "Builtin" : "Internal",
@@ -59,10 +41,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID Klien",
     "Client secret" : "Rahasia klien",
-    "Username and password" : "Nama pengguna dan sandi",
+    "Username" : "Nama Pengguna",
     "Password" : "Sandi",
+    "API key" : "Kunci API",
+    "Username and password" : "Nama pengguna dan sandi",
     "Session credentials" : "Kredensial sesi",
+    "Public key" : "Kunci Public",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Keranjang",
     "Hostname" : "Nama Host",
     "Port" : "Port",
     "Region" : "Daerah",
@@ -70,9 +56,11 @@ OC.L10N.register(
     "Enable Path Style" : "Aktifkan Gaya Path",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subfolder remote",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Host",
     "Secure ftps://" : "Secure ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Lokal",
@@ -81,6 +69,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Bagikan",
+    "Username as share" : "Nama pengguna berbagi",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json
index 9c83475f756..6c80a01b970 100644
--- a/apps/files_external/l10n/id.json
+++ b/apps/files_external/l10n/id.json
@@ -5,23 +5,6 @@
     "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s",
     "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s",
     "External storage" : "Penyimpanan eksternal",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nama Pengguna",
-    "Bucket" : "Keranjang",
-    "Region (optional for OpenStack Object Storage)" : "Daerah (tambahan untuk OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Kunci API (diperlukan untuk Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (diperlukan untuk OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Sandi (diperlukan untuk OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nama Layanan (diperlukan untuk OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (diperlukan untuk OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Batas waktu permintaan HTTP dalam detik",
-    "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login",
-    "Host" : "Host",
-    "Username as share" : "Nama pengguna berbagi",
-    "Share" : "Bagikan",
-    "Remote subfolder" : "Subfolder remote",
-    "SFTP with secret key login" : "SFTP dengan kunci rahasia masuk",
-    "Public key" : "Kunci Public",
     "Storage with id \"%i\" not found" : "Penyimpanan dengan id \"%i\" tidak ditemukan",
     "Invalid backend or authentication mechanism class" : "Beckend atau kelas mekanisme otentikasi salah.",
     "Invalid mount point" : "Mount point salah",
@@ -29,13 +12,14 @@
     "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
     "Unsatisfied backend parameters" : "Parameter backend tidak lengkap",
     "Unsatisfied authentication mechanism parameters" : "Parameter mekanisme otentikasi tidak lengkap",
-    "Admin-only storage backend \"%s\"" : "Backend penyimpanan hanya-admin \"%s\"",
     "Personal" : "Pribadi",
     "System" : "Sistem",
     "Grant access" : "Berikan hak akses",
     "Access granted" : "Akses diberikan",
     "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1",
     "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2",
+    "Generate keys" : "Hasilkan kunci",
+    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
     "Enable encryption" : "Aktifkan enkripsi",
     "Enable previews" : "Aktifkan pratinjau",
     "Check for changes" : "Periksa perubahan",
@@ -45,8 +29,6 @@
     "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
     "(group)" : "(grup)",
     "Saved" : "Disimpan",
-    "Generate keys" : "Hasilkan kunci",
-    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
     "Access key" : "Kunci akses",
     "Secret key" : "Kunci rahasia",
     "Builtin" : "Internal",
@@ -57,10 +39,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID Klien",
     "Client secret" : "Rahasia klien",
-    "Username and password" : "Nama pengguna dan sandi",
+    "Username" : "Nama Pengguna",
     "Password" : "Sandi",
+    "API key" : "Kunci API",
+    "Username and password" : "Nama pengguna dan sandi",
     "Session credentials" : "Kredensial sesi",
+    "Public key" : "Kunci Public",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Keranjang",
     "Hostname" : "Nama Host",
     "Port" : "Port",
     "Region" : "Daerah",
@@ -68,9 +54,11 @@
     "Enable Path Style" : "Aktifkan Gaya Path",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subfolder remote",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Host",
     "Secure ftps://" : "Secure ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Lokal",
@@ -79,6 +67,9 @@
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Bagikan",
+    "Username as share" : "Nama pengguna berbagi",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js
index ae7dfcdac03..8af1f2ac0cf 100644
--- a/apps/files_external/l10n/is.js
+++ b/apps/files_external/l10n/is.js
@@ -1,18 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Notendanafn",
-    "Host" : "Netþjónn",
-    "Share" : "Deila",
     "Personal" : "Um mig",
     "Grant access" : "Veita aðgengi",
     "Access granted" : "Aðgengi veitt",
     "Saved" : "Vistað",
     "None" : "Ekkert",
+    "Username" : "Notendanafn",
     "Password" : "Lykilorð",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Netþjónn",
     "Location" : "Staðsetning",
+    "Share" : "Deila",
     "Name" : "Nafn",
     "External Storage" : "Ytri gagnageymsla",
     "Folder name" : "Nafn möppu",
diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json
index 9b1e9a315cc..8abd02bdf0a 100644
--- a/apps/files_external/l10n/is.json
+++ b/apps/files_external/l10n/is.json
@@ -1,16 +1,16 @@
 { "translations": {
-    "Username" : "Notendanafn",
-    "Host" : "Netþjónn",
-    "Share" : "Deila",
     "Personal" : "Um mig",
     "Grant access" : "Veita aðgengi",
     "Access granted" : "Aðgengi veitt",
     "Saved" : "Vistað",
     "None" : "Ekkert",
+    "Username" : "Notendanafn",
     "Password" : "Lykilorð",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Netþjónn",
     "Location" : "Staðsetning",
+    "Share" : "Deila",
     "Name" : "Nafn",
     "External Storage" : "Ytri gagnageymsla",
     "Folder name" : "Nafn möppu",
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index 6e3596e197d..91723215cbf 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -7,23 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Fase 1 non riuscita. Eccezione: %s",
     "Step 2 failed. Exception: %s" : "Fase 2 non riuscita. Eccezione: %s",
     "External storage" : "Archiviazione esterna",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nome utente",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Regione (facoltativa per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chiave API (richiesta per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome tenant (richiesto per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (richiesta per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome servizio (richiesta per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del servizio di identità (richiesto per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tempo massimo in secondi delle richieste HTTP",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizzando le credenziali di OC",
-    "Host" : "Host",
-    "Username as share" : "Nome utente come condivisione",
-    "Share" : "Condividi",
-    "Remote subfolder" : "Sottocartella remota",
-    "SFTP with secret key login" : "SFTP con accesso a chiave segreta",
-    "Public key" : "Chiave pubblica",
     "Storage with id \"%i\" not found" : "Archiviazione con ID \"%i\" non trovata",
     "Invalid backend or authentication mechanism class" : "Motore o classe del meccanismo di autenticazione non valido",
     "Invalid mount point" : "Punto di mount non valido",
@@ -31,13 +14,14 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
     "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
     "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
-    "Admin-only storage backend \"%s\"" : "Motore di archiviazione per soli amministratori \"%s\"",
     "Personal" : "Personale",
     "System" : "Sistema",
     "Grant access" : "Concedi l'accesso",
     "Access granted" : "Accesso consentito",
     "Error configuring OAuth1" : "Errore di configurazione OAuth1",
     "Error configuring OAuth2" : "Errore di configurazione OAuth2",
+    "Generate keys" : "Genera la chiavi",
+    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
     "Enable encryption" : "Abilita cifratura",
     "Enable previews" : "Abilita le anteprime",
     "Check for changes" : "Controlla le modifiche",
@@ -47,8 +31,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.",
     "(group)" : "(gruppo)",
     "Saved" : "Salvato",
-    "Generate keys" : "Genera la chiavi",
-    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
     "Access key" : "Chiave di accesso",
     "Secret key" : "Chiave segreta",
     "Builtin" : "Integrata",
@@ -59,10 +41,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID client",
     "Client secret" : "Segreto del client",
-    "Username and password" : "Nome utente e password",
+    "Username" : "Nome utente",
     "Password" : "Password",
+    "API key" : "Chiave API",
+    "Username and password" : "Nome utente e password",
     "Session credentials" : "Credenziali di sessione",
+    "Public key" : "Chiave pubblica",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Nome host",
     "Port" : "Porta",
     "Region" : "Regione",
@@ -70,9 +56,11 @@ OC.L10N.register(
     "Enable Path Style" : "Abilita stile percorsi",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Sottocartella remota",
     "Secure https://" : "Sicuro https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Host",
     "Secure ftps://" : "Sicuro ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Locale",
@@ -81,6 +69,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Radice",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Condividi",
+    "Username as share" : "Nome utente come condivisione",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 1c64b7dbadd..266d02872d5 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -5,23 +5,6 @@
     "Step 1 failed. Exception: %s" : "Fase 1 non riuscita. Eccezione: %s",
     "Step 2 failed. Exception: %s" : "Fase 2 non riuscita. Eccezione: %s",
     "External storage" : "Archiviazione esterna",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nome utente",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Regione (facoltativa per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chiave API (richiesta per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome tenant (richiesto per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (richiesta per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome servizio (richiesta per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del servizio di identità (richiesto per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tempo massimo in secondi delle richieste HTTP",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizzando le credenziali di OC",
-    "Host" : "Host",
-    "Username as share" : "Nome utente come condivisione",
-    "Share" : "Condividi",
-    "Remote subfolder" : "Sottocartella remota",
-    "SFTP with secret key login" : "SFTP con accesso a chiave segreta",
-    "Public key" : "Chiave pubblica",
     "Storage with id \"%i\" not found" : "Archiviazione con ID \"%i\" non trovata",
     "Invalid backend or authentication mechanism class" : "Motore o classe del meccanismo di autenticazione non valido",
     "Invalid mount point" : "Punto di mount non valido",
@@ -29,13 +12,14 @@
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
     "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
     "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
-    "Admin-only storage backend \"%s\"" : "Motore di archiviazione per soli amministratori \"%s\"",
     "Personal" : "Personale",
     "System" : "Sistema",
     "Grant access" : "Concedi l'accesso",
     "Access granted" : "Accesso consentito",
     "Error configuring OAuth1" : "Errore di configurazione OAuth1",
     "Error configuring OAuth2" : "Errore di configurazione OAuth2",
+    "Generate keys" : "Genera la chiavi",
+    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
     "Enable encryption" : "Abilita cifratura",
     "Enable previews" : "Abilita le anteprime",
     "Check for changes" : "Controlla le modifiche",
@@ -45,8 +29,6 @@
     "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.",
     "(group)" : "(gruppo)",
     "Saved" : "Salvato",
-    "Generate keys" : "Genera la chiavi",
-    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
     "Access key" : "Chiave di accesso",
     "Secret key" : "Chiave segreta",
     "Builtin" : "Integrata",
@@ -57,10 +39,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID client",
     "Client secret" : "Segreto del client",
-    "Username and password" : "Nome utente e password",
+    "Username" : "Nome utente",
     "Password" : "Password",
+    "API key" : "Chiave API",
+    "Username and password" : "Nome utente e password",
     "Session credentials" : "Credenziali di sessione",
+    "Public key" : "Chiave pubblica",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Nome host",
     "Port" : "Porta",
     "Region" : "Regione",
@@ -68,9 +54,11 @@
     "Enable Path Style" : "Abilita stile percorsi",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Sottocartella remota",
     "Secure https://" : "Sicuro https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Host",
     "Secure ftps://" : "Sicuro ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Locale",
@@ -79,6 +67,9 @@
     "SFTP" : "SFTP",
     "Root" : "Radice",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Condividi",
+    "Username as share" : "Nome utente come condivisione",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
index 9af7024d1a3..f5a9720be2e 100644
--- a/apps/files_external/l10n/ja.js
+++ b/apps/files_external/l10n/ja.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
     "Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
     "External storage" : "外部ストレージ",
-    "OpenStack Object Storage" : "OpenStack ObjectStorage",
-    "Username" : "ユーザー名",
-    "Bucket" : "バケット名",
-    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack ObjectStorage)",
-    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace CloudFiles)",
-    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack ObjectStorage)",
-    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack ObjectStorage)",
-    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack ObjectStorage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)",
-    "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
-    "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS",
-    "Host" : "ホスト",
-    "Username as share" : "共有名",
-    "Share" : "共有",
-    "Remote subfolder" : "リモートサブフォルダー",
-    "SFTP with secret key login" : "秘密鍵でSFTPログイン",
-    "Public key" : "公開鍵",
     "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
     "Invalid mount point" : "無効なマウントポイント",
     "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "システム",
     "Grant access" : "アクセスを許可",
     "Access granted" : "アクセスは許可されました",
+    "Generate keys" : "キーを生成",
+    "Error generating key pair" : "キーペアの生成エラー",
     "Enable encryption" : "暗号化を有効に",
     "Enable previews" : "プレビューを有効に",
     "Check for changes" : "変更点を確認",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
     "(group)" : "(グループ)",
     "Saved" : "保存されました",
-    "Generate keys" : "キーを生成",
-    "Error generating key pair" : "キーペアの生成エラー",
     "None" : "なし",
     "App key" : "アプリキー",
     "App secret" : "アプリシークレット",
     "Client ID" : "クライアントID",
     "Client secret" : "クライアント秘密キー",
+    "Username" : "ユーザー名",
     "Password" : "パスワード",
+    "API key" : "APIキー",
+    "Public key" : "公開鍵",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "バケット名",
     "Hostname" : "ホスト名",
     "Port" : "ポート",
     "Region" : "リージョン",
@@ -53,13 +40,18 @@ OC.L10N.register(
     "Enable Path Style" : "パス形式を有効",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "リモートサブフォルダー",
     "Secure https://" : "セキュア https://",
     "Dropbox" : "Dropbox",
+    "Host" : "ホスト",
     "Secure ftps://" : "Secure ftps://",
     "Local" : "ローカル",
     "Location" : "位置",
     "ownCloud" : "ownCloud",
     "Root" : "ルート",
+    "Share" : "共有",
+    "Username as share" : "共有名",
+    "OpenStack Object Storage" : "OpenStack ObjectStorage",
     "<b>Note:</b> " : "<b>注意:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
index 244f38cd3ac..951e86df8ca 100644
--- a/apps/files_external/l10n/ja.json
+++ b/apps/files_external/l10n/ja.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
     "Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
     "External storage" : "外部ストレージ",
-    "OpenStack Object Storage" : "OpenStack ObjectStorage",
-    "Username" : "ユーザー名",
-    "Bucket" : "バケット名",
-    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack ObjectStorage)",
-    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace CloudFiles)",
-    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack ObjectStorage)",
-    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack ObjectStorage)",
-    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack ObjectStorage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)",
-    "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
-    "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS",
-    "Host" : "ホスト",
-    "Username as share" : "共有名",
-    "Share" : "共有",
-    "Remote subfolder" : "リモートサブフォルダー",
-    "SFTP with secret key login" : "秘密鍵でSFTPログイン",
-    "Public key" : "公開鍵",
     "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
     "Invalid mount point" : "無効なマウントポイント",
     "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
@@ -26,6 +9,8 @@
     "System" : "システム",
     "Grant access" : "アクセスを許可",
     "Access granted" : "アクセスは許可されました",
+    "Generate keys" : "キーを生成",
+    "Error generating key pair" : "キーペアの生成エラー",
     "Enable encryption" : "暗号化を有効に",
     "Enable previews" : "プレビューを有効に",
     "Check for changes" : "変更点を確認",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
     "(group)" : "(グループ)",
     "Saved" : "保存されました",
-    "Generate keys" : "キーを生成",
-    "Error generating key pair" : "キーペアの生成エラー",
     "None" : "なし",
     "App key" : "アプリキー",
     "App secret" : "アプリシークレット",
     "Client ID" : "クライアントID",
     "Client secret" : "クライアント秘密キー",
+    "Username" : "ユーザー名",
     "Password" : "パスワード",
+    "API key" : "APIキー",
+    "Public key" : "公開鍵",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "バケット名",
     "Hostname" : "ホスト名",
     "Port" : "ポート",
     "Region" : "リージョン",
@@ -51,13 +38,18 @@
     "Enable Path Style" : "パス形式を有効",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "リモートサブフォルダー",
     "Secure https://" : "セキュア https://",
     "Dropbox" : "Dropbox",
+    "Host" : "ホスト",
     "Secure ftps://" : "Secure ftps://",
     "Local" : "ローカル",
     "Location" : "位置",
     "ownCloud" : "ownCloud",
     "Root" : "ルート",
+    "Share" : "共有",
+    "Username as share" : "共有名",
+    "OpenStack Object Storage" : "OpenStack ObjectStorage",
     "<b>Note:</b> " : "<b>注意:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
diff --git a/apps/files_external/l10n/ka_GE.js b/apps/files_external/l10n/ka_GE.js
index 4fa652a50eb..6f38743a215 100644
--- a/apps/files_external/l10n/ka_GE.js
+++ b/apps/files_external/l10n/ka_GE.js
@@ -2,20 +2,21 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "ექსტერნალ საცავი",
-    "Username" : "მომხმარებლის სახელი",
-    "Host" : "ჰოსტი",
-    "Share" : "გაზიარება",
     "Personal" : "პირადი",
     "Grant access" : "დაშვების მინიჭება",
     "Access granted" : "დაშვება მინიჭებულია",
     "None" : "არა",
+    "Username" : "მომხმარებლის სახელი",
     "Password" : "პაროლი",
+    "API key" : "API გასაღები",
     "Port" : "პორტი",
     "Region" : "რეგიონი",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "ჰოსტი",
     "Location" : "ადგილმდებარეობა",
     "ownCloud" : "ownCloud–ი",
+    "Share" : "გაზიარება",
     "Name" : "სახელი",
     "External Storage" : "ექსტერნალ საცავი",
     "Folder name" : "ფოლდერის სახელი",
diff --git a/apps/files_external/l10n/ka_GE.json b/apps/files_external/l10n/ka_GE.json
index 93bae8532e4..7ca96f6db5d 100644
--- a/apps/files_external/l10n/ka_GE.json
+++ b/apps/files_external/l10n/ka_GE.json
@@ -1,19 +1,20 @@
 { "translations": {
     "External storage" : "ექსტერნალ საცავი",
-    "Username" : "მომხმარებლის სახელი",
-    "Host" : "ჰოსტი",
-    "Share" : "გაზიარება",
     "Personal" : "პირადი",
     "Grant access" : "დაშვების მინიჭება",
     "Access granted" : "დაშვება მინიჭებულია",
     "None" : "არა",
+    "Username" : "მომხმარებლის სახელი",
     "Password" : "პაროლი",
+    "API key" : "API გასაღები",
     "Port" : "პორტი",
     "Region" : "რეგიონი",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "ჰოსტი",
     "Location" : "ადგილმდებარეობა",
     "ownCloud" : "ownCloud–ი",
+    "Share" : "გაზიარება",
     "Name" : "სახელი",
     "External Storage" : "ექსტერნალ საცავი",
     "Folder name" : "ფოლდერის სახელი",
diff --git a/apps/files_external/l10n/km.js b/apps/files_external/l10n/km.js
index ea3d08e965c..7a5c6cb86c8 100644
--- a/apps/files_external/l10n/km.js
+++ b/apps/files_external/l10n/km.js
@@ -2,19 +2,19 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
-    "Username" : "ឈ្មោះ​អ្នកប្រើ",
-    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
-    "Share" : "ចែក​រំលែក",
     "Personal" : "ផ្ទាល់​ខ្លួន",
     "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
     "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
     "Saved" : "បាន​រក្សាទុក",
     "None" : "គ្មាន",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Password" : "ពាក្យសម្ងាត់",
     "Port" : "ច្រក",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
     "Location" : "ទីតាំង",
+    "Share" : "ចែក​រំលែក",
     "Name" : "ឈ្មោះ",
     "External Storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
     "Folder name" : "ឈ្មោះ​ថត",
diff --git a/apps/files_external/l10n/km.json b/apps/files_external/l10n/km.json
index 4dafcd49bde..0375b5bfee2 100644
--- a/apps/files_external/l10n/km.json
+++ b/apps/files_external/l10n/km.json
@@ -1,18 +1,18 @@
 { "translations": {
     "External storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
-    "Username" : "ឈ្មោះ​អ្នកប្រើ",
-    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
-    "Share" : "ចែក​រំលែក",
     "Personal" : "ផ្ទាល់​ខ្លួន",
     "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
     "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
     "Saved" : "បាន​រក្សាទុក",
     "None" : "គ្មាន",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Password" : "ពាក្យសម្ងាត់",
     "Port" : "ច្រក",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
     "Location" : "ទីតាំង",
+    "Share" : "ចែក​រំលែក",
     "Name" : "ឈ្មោះ",
     "External Storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
     "Folder name" : "ឈ្មោះ​ថត",
diff --git a/apps/files_external/l10n/kn.js b/apps/files_external/l10n/kn.js
index c3160c79b32..9d01033e356 100644
--- a/apps/files_external/l10n/kn.js
+++ b/apps/files_external/l10n/kn.js
@@ -1,17 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "ಬಳಕೆಯ ಹೆಸರು",
-    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Personal" : "ವೈಯಕ್ತಿಕ",
     "Saved" : "ಉಳಿಸಿದ",
     "None" : "ಯಾವುದೂ ಇಲ್ಲ",
+    "Username" : "ಬಳಕೆಯ ಹೆಸರು",
     "Password" : "ಗುಪ್ತ ಪದ",
     "Port" : "ರೇವು",
     "WebDAV" : "WebDAV",
     "URL" : "ಜಾಲದ ಕೊಂಡಿ",
+    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
     "Local" : "ಸ್ಥಳೀಯ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Name" : "ಹೆಸರು",
     "Delete" : "ಅಳಿಸಿ"
 },
diff --git a/apps/files_external/l10n/kn.json b/apps/files_external/l10n/kn.json
index e020401c58f..0380f431d1e 100644
--- a/apps/files_external/l10n/kn.json
+++ b/apps/files_external/l10n/kn.json
@@ -1,15 +1,15 @@
 { "translations": {
-    "Username" : "ಬಳಕೆಯ ಹೆಸರು",
-    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Personal" : "ವೈಯಕ್ತಿಕ",
     "Saved" : "ಉಳಿಸಿದ",
     "None" : "ಯಾವುದೂ ಇಲ್ಲ",
+    "Username" : "ಬಳಕೆಯ ಹೆಸರು",
     "Password" : "ಗುಪ್ತ ಪದ",
     "Port" : "ರೇವು",
     "WebDAV" : "WebDAV",
     "URL" : "ಜಾಲದ ಕೊಂಡಿ",
+    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
     "Local" : "ಸ್ಥಳೀಯ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Name" : "ಹೆಸರು",
     "Delete" : "ಅಳಿಸಿ"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js
index 48ba2f23a59..3bed24abe66 100644
--- a/apps/files_external/l10n/ko.js
+++ b/apps/files_external/l10n/ko.js
@@ -7,23 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "1단계 실패. 예외: %s",
     "Step 2 failed. Exception: %s" : "2단계 실패. 예외: %s",
     "External storage" : "외부 저장소",
-    "OpenStack Object Storage" : "OpenStack 객체 저장소",
-    "Username" : "사용자 이름",
-    "Bucket" : "버킷",
-    "Region (optional for OpenStack Object Storage)" : "지역(OpenStack 객체 저장소는 선택 사항)",
-    "API Key (required for Rackspace Cloud Files)" : "API 키(Rackspace 클라우드 파일에 필요함)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname(OpenStack 객체 저장소에 필요함)",
-    "Password (required for OpenStack Object Storage)" : "암호(OpenStack 객체 저장소에 필요함)",
-    "Service Name (required for OpenStack Object Storage)" : "서비스 이름(OpenStack 객체 저장소에 필요함)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Identity 엔드포인트 URL(OpenStack 객체 저장소에 필요함)",
-    "Timeout of HTTP requests in seconds" : "초 단위 HTTP 요청 시간 제한",
-    "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS",
-    "Host" : "호스트",
-    "Username as share" : "사용자 이름으로 공유",
-    "Share" : "공유",
-    "Remote subfolder" : "원격 하위 폴더",
-    "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
-    "Public key" : "공개 키",
     "Storage with id \"%i\" not found" : "ID가 \"%i\"인 저장소를 찾을 수 없음",
     "Invalid backend or authentication mechanism class" : "백엔드나 인증 방식 클래스가 잘못됨",
     "Invalid mount point" : "잘못된 마운트 지점",
@@ -31,13 +14,14 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"",
     "Unsatisfied backend parameters" : "백엔드 인자가 부족함",
     "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함",
-    "Admin-only storage backend \"%s\"" : "관리자만 접근할 수 있는 저장소 백엔드 \"%s\"",
     "Personal" : "개인",
     "System" : "시스템",
     "Grant access" : "접근 권한 부여",
     "Access granted" : "접근 허가됨",
     "Error configuring OAuth1" : "OAuth1 설정 오류",
     "Error configuring OAuth2" : "OAuth2 설정 오류",
+    "Generate keys" : "키 생성",
+    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
     "Enable encryption" : "암호화 사용",
     "Enable previews" : "미리 보기 사용",
     "Check for changes" : "변경 사항 감시",
@@ -47,8 +31,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오",
     "(group)" : "(그룹)",
     "Saved" : "저장됨",
-    "Generate keys" : "키 생성",
-    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
     "Access key" : "접근 키",
     "Secret key" : "비밀 키",
     "Builtin" : "내장",
@@ -59,10 +41,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "클라이언트 ID",
     "Client secret" : "클라이언트 비밀 값",
-    "Username and password" : "사용자 이름과 암호",
+    "Username" : "사용자 이름",
     "Password" : "암호",
+    "API key" : "API 키",
+    "Username and password" : "사용자 이름과 암호",
     "Session credentials" : "세션 접근 정보",
+    "Public key" : "공개 키",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "버킷",
     "Hostname" : "호스트 이름",
     "Port" : "포트",
     "Region" : "지역",
@@ -70,9 +56,11 @@ OC.L10N.register(
     "Enable Path Style" : "경로 스타일 사용",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "원격 하위 폴더",
     "Secure https://" : "보안 https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "호스트",
     "Secure ftps://" : "보안 ftps://",
     "Google Drive" : "Google 드라이브",
     "Local" : "로컬",
@@ -81,6 +69,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "루트",
     "SMB / CIFS" : "SMB/CIFS",
+    "Share" : "공유",
+    "Username as share" : "사용자 이름으로 공유",
+    "OpenStack Object Storage" : "OpenStack 객체 저장소",
     "<b>Note:</b> " : "<b>메모:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json
index 9a0744a867f..86cecf01329 100644
--- a/apps/files_external/l10n/ko.json
+++ b/apps/files_external/l10n/ko.json
@@ -5,23 +5,6 @@
     "Step 1 failed. Exception: %s" : "1단계 실패. 예외: %s",
     "Step 2 failed. Exception: %s" : "2단계 실패. 예외: %s",
     "External storage" : "외부 저장소",
-    "OpenStack Object Storage" : "OpenStack 객체 저장소",
-    "Username" : "사용자 이름",
-    "Bucket" : "버킷",
-    "Region (optional for OpenStack Object Storage)" : "지역(OpenStack 객체 저장소는 선택 사항)",
-    "API Key (required for Rackspace Cloud Files)" : "API 키(Rackspace 클라우드 파일에 필요함)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname(OpenStack 객체 저장소에 필요함)",
-    "Password (required for OpenStack Object Storage)" : "암호(OpenStack 객체 저장소에 필요함)",
-    "Service Name (required for OpenStack Object Storage)" : "서비스 이름(OpenStack 객체 저장소에 필요함)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Identity 엔드포인트 URL(OpenStack 객체 저장소에 필요함)",
-    "Timeout of HTTP requests in seconds" : "초 단위 HTTP 요청 시간 제한",
-    "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS",
-    "Host" : "호스트",
-    "Username as share" : "사용자 이름으로 공유",
-    "Share" : "공유",
-    "Remote subfolder" : "원격 하위 폴더",
-    "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
-    "Public key" : "공개 키",
     "Storage with id \"%i\" not found" : "ID가 \"%i\"인 저장소를 찾을 수 없음",
     "Invalid backend or authentication mechanism class" : "백엔드나 인증 방식 클래스가 잘못됨",
     "Invalid mount point" : "잘못된 마운트 지점",
@@ -29,13 +12,14 @@
     "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"",
     "Unsatisfied backend parameters" : "백엔드 인자가 부족함",
     "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함",
-    "Admin-only storage backend \"%s\"" : "관리자만 접근할 수 있는 저장소 백엔드 \"%s\"",
     "Personal" : "개인",
     "System" : "시스템",
     "Grant access" : "접근 권한 부여",
     "Access granted" : "접근 허가됨",
     "Error configuring OAuth1" : "OAuth1 설정 오류",
     "Error configuring OAuth2" : "OAuth2 설정 오류",
+    "Generate keys" : "키 생성",
+    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
     "Enable encryption" : "암호화 사용",
     "Enable previews" : "미리 보기 사용",
     "Check for changes" : "변경 사항 감시",
@@ -45,8 +29,6 @@
     "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오",
     "(group)" : "(그룹)",
     "Saved" : "저장됨",
-    "Generate keys" : "키 생성",
-    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
     "Access key" : "접근 키",
     "Secret key" : "비밀 키",
     "Builtin" : "내장",
@@ -57,10 +39,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "클라이언트 ID",
     "Client secret" : "클라이언트 비밀 값",
-    "Username and password" : "사용자 이름과 암호",
+    "Username" : "사용자 이름",
     "Password" : "암호",
+    "API key" : "API 키",
+    "Username and password" : "사용자 이름과 암호",
     "Session credentials" : "세션 접근 정보",
+    "Public key" : "공개 키",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "버킷",
     "Hostname" : "호스트 이름",
     "Port" : "포트",
     "Region" : "지역",
@@ -68,9 +54,11 @@
     "Enable Path Style" : "경로 스타일 사용",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "원격 하위 폴더",
     "Secure https://" : "보안 https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "호스트",
     "Secure ftps://" : "보안 ftps://",
     "Google Drive" : "Google 드라이브",
     "Local" : "로컬",
@@ -79,6 +67,9 @@
     "SFTP" : "SFTP",
     "Root" : "루트",
     "SMB / CIFS" : "SMB/CIFS",
+    "Share" : "공유",
+    "Username as share" : "사용자 이름으로 공유",
+    "OpenStack Object Storage" : "OpenStack 객체 저장소",
     "<b>Note:</b> " : "<b>메모:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
diff --git a/apps/files_external/l10n/ku_IQ.js b/apps/files_external/l10n/ku_IQ.js
index 48302034a91..72c1e8313be 100644
--- a/apps/files_external/l10n/ku_IQ.js
+++ b/apps/files_external/l10n/ku_IQ.js
@@ -1,12 +1,12 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "ناوی به‌کارهێنه‌ر",
-    "Share" : "هاوبەشی کردن",
     "None" : "هیچ",
+    "Username" : "ناوی به‌کارهێنه‌ر",
     "Password" : "وشەی تێپەربو",
     "URL" : "ناونیشانی به‌سته‌ر",
     "Location" : "شوێن",
+    "Share" : "هاوبەشی کردن",
     "Name" : "ناو",
     "Folder name" : "ناوی بوخچه"
 },
diff --git a/apps/files_external/l10n/ku_IQ.json b/apps/files_external/l10n/ku_IQ.json
index 329a9a3978d..9ef5a71e818 100644
--- a/apps/files_external/l10n/ku_IQ.json
+++ b/apps/files_external/l10n/ku_IQ.json
@@ -1,10 +1,10 @@
 { "translations": {
-    "Username" : "ناوی به‌کارهێنه‌ر",
-    "Share" : "هاوبەشی کردن",
     "None" : "هیچ",
+    "Username" : "ناوی به‌کارهێنه‌ر",
     "Password" : "وشەی تێپەربو",
     "URL" : "ناونیشانی به‌سته‌ر",
     "Location" : "شوێن",
+    "Share" : "هاوبەشی کردن",
     "Name" : "ناو",
     "Folder name" : "ناوی بوخچه"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/lb.js b/apps/files_external/l10n/lb.js
index b3517fe6824..7e03d3b1b99 100644
--- a/apps/files_external/l10n/lb.js
+++ b/apps/files_external/l10n/lb.js
@@ -1,17 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Benotzernumm",
-    "Host" : "Host",
-    "Share" : "Deelen",
     "Personal" : "Perséinlech",
     "Saved" : "Gespäichert",
+    "Username" : "Benotzernumm",
     "Password" : "Passwuert",
     "Port" : "Port",
     "Region" : "Regioun",
     "URL" : "URL",
+    "Host" : "Host",
     "Location" : "Uert",
     "ownCloud" : "ownCloud",
+    "Share" : "Deelen",
     "Name" : "Numm",
     "Folder name" : "Dossiers Numm:",
     "Delete" : "Läschen"
diff --git a/apps/files_external/l10n/lb.json b/apps/files_external/l10n/lb.json
index 659e57832a6..5c6797533b5 100644
--- a/apps/files_external/l10n/lb.json
+++ b/apps/files_external/l10n/lb.json
@@ -1,15 +1,15 @@
 { "translations": {
-    "Username" : "Benotzernumm",
-    "Host" : "Host",
-    "Share" : "Deelen",
     "Personal" : "Perséinlech",
     "Saved" : "Gespäichert",
+    "Username" : "Benotzernumm",
     "Password" : "Passwuert",
     "Port" : "Port",
     "Region" : "Regioun",
     "URL" : "URL",
+    "Host" : "Host",
     "Location" : "Uert",
     "ownCloud" : "ownCloud",
+    "Share" : "Deelen",
     "Name" : "Numm",
     "Folder name" : "Dossiers Numm:",
     "Delete" : "Läschen"
diff --git a/apps/files_external/l10n/lt_LT.js b/apps/files_external/l10n/lt_LT.js
index bf59d5c44c1..9232ec997d2 100644
--- a/apps/files_external/l10n/lt_LT.js
+++ b/apps/files_external/l10n/lt_LT.js
@@ -2,20 +2,21 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "Išorinė saugykla",
-    "Username" : "Prisijungimo vardas",
-    "Host" : "Mazgas",
-    "Share" : "Dalintis",
     "Personal" : "Asmeniniai",
     "Grant access" : "Suteikti priėjimą",
     "Access granted" : "Priėjimas suteiktas",
     "None" : "Nieko",
+    "Username" : "Prisijungimo vardas",
     "Password" : "Slaptažodis",
+    "API key" : "API raktas",
     "Port" : "Prievadas",
     "Region" : "Regionas",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Mazgas",
     "Location" : "Vieta",
     "ownCloud" : "ownCloud",
+    "Share" : "Dalintis",
     "Name" : "Pavadinimas",
     "External Storage" : "Išorinės saugyklos",
     "Folder name" : "Katalogo pavadinimas",
diff --git a/apps/files_external/l10n/lt_LT.json b/apps/files_external/l10n/lt_LT.json
index 643aac71a9a..d196c8e00bd 100644
--- a/apps/files_external/l10n/lt_LT.json
+++ b/apps/files_external/l10n/lt_LT.json
@@ -1,19 +1,20 @@
 { "translations": {
     "External storage" : "Išorinė saugykla",
-    "Username" : "Prisijungimo vardas",
-    "Host" : "Mazgas",
-    "Share" : "Dalintis",
     "Personal" : "Asmeniniai",
     "Grant access" : "Suteikti priėjimą",
     "Access granted" : "Priėjimas suteiktas",
     "None" : "Nieko",
+    "Username" : "Prisijungimo vardas",
     "Password" : "Slaptažodis",
+    "API key" : "API raktas",
     "Port" : "Prievadas",
     "Region" : "Regionas",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Mazgas",
     "Location" : "Vieta",
     "ownCloud" : "ownCloud",
+    "Share" : "Dalintis",
     "Name" : "Pavadinimas",
     "External Storage" : "Išorinės saugyklos",
     "Folder name" : "Katalogo pavadinimas",
diff --git a/apps/files_external/l10n/lv.js b/apps/files_external/l10n/lv.js
index ea3264a7f5f..2f694de2249 100644
--- a/apps/files_external/l10n/lv.js
+++ b/apps/files_external/l10n/lv.js
@@ -2,20 +2,20 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "Ārējā krātuve",
-    "Username" : "Lietotājvārds",
-    "Host" : "Resursdators",
-    "Share" : "Dalīties",
     "Personal" : "Personīgi",
     "Grant access" : "Piešķirt pieeju",
     "Access granted" : "Piešķirta pieeja",
     "Saved" : "Saglabāts",
     "None" : "Nav",
+    "Username" : "Lietotājvārds",
     "Password" : "Parole",
     "Port" : "Ports",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Resursdators",
     "Location" : "Vieta",
     "ownCloud" : "ownCloud",
+    "Share" : "Dalīties",
     "Name" : "Nosaukums",
     "External Storage" : "Ārējā krātuve",
     "Folder name" : "Mapes nosaukums",
diff --git a/apps/files_external/l10n/lv.json b/apps/files_external/l10n/lv.json
index 03642d43f41..5b281307ec3 100644
--- a/apps/files_external/l10n/lv.json
+++ b/apps/files_external/l10n/lv.json
@@ -1,19 +1,19 @@
 { "translations": {
     "External storage" : "Ārējā krātuve",
-    "Username" : "Lietotājvārds",
-    "Host" : "Resursdators",
-    "Share" : "Dalīties",
     "Personal" : "Personīgi",
     "Grant access" : "Piešķirt pieeju",
     "Access granted" : "Piešķirta pieeja",
     "Saved" : "Saglabāts",
     "None" : "Nav",
+    "Username" : "Lietotājvārds",
     "Password" : "Parole",
     "Port" : "Ports",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Resursdators",
     "Location" : "Vieta",
     "ownCloud" : "ownCloud",
+    "Share" : "Dalīties",
     "Name" : "Nosaukums",
     "External Storage" : "Ārējā krātuve",
     "Folder name" : "Mapes nosaukums",
diff --git a/apps/files_external/l10n/mk.js b/apps/files_external/l10n/mk.js
index fd5f8bfe5e5..3a62a2b580b 100644
--- a/apps/files_external/l10n/mk.js
+++ b/apps/files_external/l10n/mk.js
@@ -1,22 +1,23 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Корисничко име",
-    "Host" : "Домаќин",
-    "Share" : "Сподели",
     "Personal" : "Лично",
     "Grant access" : "Дозволи пристап",
     "Access granted" : "Пристапот е дозволен",
     "Saved" : "Снимено",
     "None" : "Ништо",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
+    "API key" : "API key",
     "Port" : "Порта",
     "Region" : "Регион",
     "WebDAV" : "WebDAV",
     "URL" : "Адреса",
+    "Host" : "Домаќин",
     "Local" : "Локален",
     "Location" : "Локација",
     "ownCloud" : "ownCloud",
+    "Share" : "Сподели",
     "Name" : "Име",
     "External Storage" : "Надворешно складиште",
     "Folder name" : "Име на папка",
diff --git a/apps/files_external/l10n/mk.json b/apps/files_external/l10n/mk.json
index 4fb80152ba1..9fb0994a604 100644
--- a/apps/files_external/l10n/mk.json
+++ b/apps/files_external/l10n/mk.json
@@ -1,20 +1,21 @@
 { "translations": {
-    "Username" : "Корисничко име",
-    "Host" : "Домаќин",
-    "Share" : "Сподели",
     "Personal" : "Лично",
     "Grant access" : "Дозволи пристап",
     "Access granted" : "Пристапот е дозволен",
     "Saved" : "Снимено",
     "None" : "Ништо",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
+    "API key" : "API key",
     "Port" : "Порта",
     "Region" : "Регион",
     "WebDAV" : "WebDAV",
     "URL" : "Адреса",
+    "Host" : "Домаќин",
     "Local" : "Локален",
     "Location" : "Локација",
     "ownCloud" : "ownCloud",
+    "Share" : "Сподели",
     "Name" : "Име",
     "External Storage" : "Надворешно складиште",
     "Folder name" : "Име на папка",
diff --git a/apps/files_external/l10n/mn.js b/apps/files_external/l10n/mn.js
index 5753d2d4e64..a83f8310862 100644
--- a/apps/files_external/l10n/mn.js
+++ b/apps/files_external/l10n/mn.js
@@ -2,7 +2,7 @@ OC.L10N.register(
     "files_external",
     {
     "Username" : "Хэрэглэгчийн нэр",
-    "Share" : "Түгээх",
-    "Password" : "Нууц үг"
+    "Password" : "Нууц үг",
+    "Share" : "Түгээх"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/mn.json b/apps/files_external/l10n/mn.json
index 255007b3c09..e28fa6e52ad 100644
--- a/apps/files_external/l10n/mn.json
+++ b/apps/files_external/l10n/mn.json
@@ -1,6 +1,6 @@
 { "translations": {
     "Username" : "Хэрэглэгчийн нэр",
-    "Share" : "Түгээх",
-    "Password" : "Нууц үг"
+    "Password" : "Нууц үг",
+    "Share" : "Түгээх"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/ms_MY.js b/apps/files_external/l10n/ms_MY.js
index 2e4ba1dc5fb..1b28ef4226a 100644
--- a/apps/files_external/l10n/ms_MY.js
+++ b/apps/files_external/l10n/ms_MY.js
@@ -1,14 +1,14 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Nama pengguna",
-    "Share" : "Kongsi",
     "Personal" : "Peribadi",
+    "Username" : "Nama pengguna",
     "Password" : "Kata laluan",
     "Region" : "Wilayah",
     "URL" : "URL",
     "Location" : "Lokasi",
     "ownCloud" : "ownCloud",
+    "Share" : "Kongsi",
     "Name" : "Nama",
     "Delete" : "Padam"
 },
diff --git a/apps/files_external/l10n/ms_MY.json b/apps/files_external/l10n/ms_MY.json
index 403a877faf7..79293106272 100644
--- a/apps/files_external/l10n/ms_MY.json
+++ b/apps/files_external/l10n/ms_MY.json
@@ -1,12 +1,12 @@
 { "translations": {
-    "Username" : "Nama pengguna",
-    "Share" : "Kongsi",
     "Personal" : "Peribadi",
+    "Username" : "Nama pengguna",
     "Password" : "Kata laluan",
     "Region" : "Wilayah",
     "URL" : "URL",
     "Location" : "Lokasi",
     "ownCloud" : "ownCloud",
+    "Share" : "Kongsi",
     "Name" : "Nama",
     "Delete" : "Padam"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index 8f995c07758..1401bbe7012 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -1,33 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Henting av adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Please provide a valid app key and secret." : "Vær vennlig å oppgi gyldig appnøkkel og hemmelighet.",
     "Step 1 failed. Exception: %s" : "Steg 1 feilet. Unntak: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 feilet. Unntak: %s",
     "External storage" : "Ekstern lagringsplass",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Brukernavn",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (ikke påkrevet for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (påkrevet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (påkrevet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Passord (påkrevet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjenestenavn (påkrevet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL for identity endpoint (påkrevet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsavbrudd for HTTP-forespørsler i sekunder",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-pålogging",
-    "Host" : "Tjener",
-    "Username as share" : "Brukernavn som share",
-    "Share" : "Delt ressurs",
-    "Remote subfolder" : "Ekstern undermappe",
-    "SFTP with secret key login" : "SFTP med hemmelig nøkkel for pålogging",
-    "Public key" : "Offentlig nøkkel",
     "Storage with id \"%i\" not found" : "Lager med id \"%i\" ikke funnet",
+    "Invalid backend or authentication mechanism class" : "Ugyldig server eller type autentiseringsmekanisme",
     "Invalid mount point" : "Ugyldig oppkoblingspunkt",
+    "Objectstore forbidden" : "Objektlager forbudt",
     "Invalid storage backend \"%s\"" : "Ugyldig lagringsserver \"%s\"",
+    "Unsatisfied backend parameters" : "Noen server-parameter mangler",
+    "Unsatisfied authentication mechanism parameters" : "Noen parametre for autentiseringsmekanisme mangler",
     "Personal" : "Personlig",
     "System" : "System",
     "Grant access" : "Gi tilgang",
     "Access granted" : "Tilgang innvilget",
+    "Error configuring OAuth1" : "Feil ved konfigurering av OAuth1",
+    "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2",
+    "Generate keys" : "Generer nøkler",
+    "Error generating key pair" : "Feil ved nøkkelgenerering",
     "Enable encryption" : "Aktiver kryptering",
     "Enable previews" : "Tillat fohåndsvisning",
     "Check for changes" : "Se etter endringer",
@@ -37,15 +31,24 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Lagret",
-    "Generate keys" : "Generer nøkler",
-    "Error generating key pair" : "Feil ved nøkkelgenerering",
+    "Access key" : "Tilgangsnøkkel",
+    "Secret key" : "Hemmelig nøkkel",
+    "Builtin" : "Innebygget",
     "None" : "Ingen",
+    "OAuth1" : "OAuth1",
     "App key" : "App key",
     "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "Username" : "Brukernavn",
     "Password" : "Passord",
+    "API key" : "API-nøkkel",
+    "Username and password" : "Brukernavn og passord",
+    "Session credentials" : "Påloggingsdetaljer for økt",
+    "Public key" : "Offentlig nøkkel",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Servernavn",
     "Port" : "Port",
     "Region" : "Området",
@@ -53,13 +56,22 @@ OC.L10N.register(
     "Enable Path Style" : "Aktiver Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Ekstern undermappe",
     "Secure https://" : "Sikker https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Tjener",
     "Secure ftps://" : "Sikker ftps://",
+    "Google Drive" : "Google Disk",
     "Local" : "Lokal",
     "Location" : "Sted",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Rot",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Delt ressurs",
+    "Username as share" : "Brukernavn som share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Merk:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å få dette installert.",
@@ -71,6 +83,7 @@ OC.L10N.register(
     "Scope" : "Omfang",
     "External Storage" : "Ekstern lagring",
     "Folder name" : "Mappenavn",
+    "Authentication" : "Autentisering",
     "Configuration" : "Konfigurasjon",
     "Available for" : "Tilgjengelig for",
     "Advanced settings" : "Avanserte innstillinger",
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index 8d60736882a..cf6c2d38f9d 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -1,31 +1,25 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Henting av adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Please provide a valid app key and secret." : "Vær vennlig å oppgi gyldig appnøkkel og hemmelighet.",
     "Step 1 failed. Exception: %s" : "Steg 1 feilet. Unntak: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 feilet. Unntak: %s",
     "External storage" : "Ekstern lagringsplass",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Brukernavn",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (ikke påkrevet for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (påkrevet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (påkrevet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Passord (påkrevet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjenestenavn (påkrevet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL for identity endpoint (påkrevet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsavbrudd for HTTP-forespørsler i sekunder",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-pålogging",
-    "Host" : "Tjener",
-    "Username as share" : "Brukernavn som share",
-    "Share" : "Delt ressurs",
-    "Remote subfolder" : "Ekstern undermappe",
-    "SFTP with secret key login" : "SFTP med hemmelig nøkkel for pålogging",
-    "Public key" : "Offentlig nøkkel",
     "Storage with id \"%i\" not found" : "Lager med id \"%i\" ikke funnet",
+    "Invalid backend or authentication mechanism class" : "Ugyldig server eller type autentiseringsmekanisme",
     "Invalid mount point" : "Ugyldig oppkoblingspunkt",
+    "Objectstore forbidden" : "Objektlager forbudt",
     "Invalid storage backend \"%s\"" : "Ugyldig lagringsserver \"%s\"",
+    "Unsatisfied backend parameters" : "Noen server-parameter mangler",
+    "Unsatisfied authentication mechanism parameters" : "Noen parametre for autentiseringsmekanisme mangler",
     "Personal" : "Personlig",
     "System" : "System",
     "Grant access" : "Gi tilgang",
     "Access granted" : "Tilgang innvilget",
+    "Error configuring OAuth1" : "Feil ved konfigurering av OAuth1",
+    "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2",
+    "Generate keys" : "Generer nøkler",
+    "Error generating key pair" : "Feil ved nøkkelgenerering",
     "Enable encryption" : "Aktiver kryptering",
     "Enable previews" : "Tillat fohåndsvisning",
     "Check for changes" : "Se etter endringer",
@@ -35,15 +29,24 @@
     "All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Lagret",
-    "Generate keys" : "Generer nøkler",
-    "Error generating key pair" : "Feil ved nøkkelgenerering",
+    "Access key" : "Tilgangsnøkkel",
+    "Secret key" : "Hemmelig nøkkel",
+    "Builtin" : "Innebygget",
     "None" : "Ingen",
+    "OAuth1" : "OAuth1",
     "App key" : "App key",
     "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "Username" : "Brukernavn",
     "Password" : "Passord",
+    "API key" : "API-nøkkel",
+    "Username and password" : "Brukernavn og passord",
+    "Session credentials" : "Påloggingsdetaljer for økt",
+    "Public key" : "Offentlig nøkkel",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Servernavn",
     "Port" : "Port",
     "Region" : "Området",
@@ -51,13 +54,22 @@
     "Enable Path Style" : "Aktiver Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Ekstern undermappe",
     "Secure https://" : "Sikker https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Tjener",
     "Secure ftps://" : "Sikker ftps://",
+    "Google Drive" : "Google Disk",
     "Local" : "Lokal",
     "Location" : "Sted",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Rot",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Delt ressurs",
+    "Username as share" : "Brukernavn som share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Merk:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å få dette installert.",
@@ -69,6 +81,7 @@
     "Scope" : "Omfang",
     "External Storage" : "Ekstern lagring",
     "Folder name" : "Mappenavn",
+    "Authentication" : "Autentisering",
     "Configuration" : "Konfigurasjon",
     "Available for" : "Tilgjengelig for",
     "Advanced settings" : "Avanserte innstillinger",
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index d43bb0f9794..1f0c219c51e 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -7,23 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Stap 1 is mislukt. Uitzondering: %s",
     "Step 2 failed. Exception: %s" : "Stap 2 is mislukt. Uitzondering: %s",
     "External storage" : "Externe opslag",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Gebruikersnaam",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Regio (optioneel voor OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (verplicht voor Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (Verplicht voor OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Wachtwoord (verplicht voor OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (verplicht voor OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL van identity endpoint (verplicht voor OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Time-out van HTTP-verzoeken in seconden",
-    "SMB / CIFS using OC login" : "SMB / CIFS via OC inlog",
-    "Host" : "Host",
-    "Username as share" : "Gebruikersnaam als share",
-    "Share" : "Share",
-    "Remote subfolder" : "Externe submap",
-    "SFTP with secret key login" : "SFTP met geheime sleutel inlog",
-    "Public key" : "Publieke sleutel",
     "Storage with id \"%i\" not found" : "Opslag met id \"%i\" niet gevonden",
     "Invalid backend or authentication mechanism class" : "Ongeldige backend of authenticatie mechanisme klasse",
     "Invalid mount point" : "Ongeldig aankoppelpunt",
@@ -31,13 +14,14 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "Ongeldig opslagsysteem \"%s\"",
     "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
     "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
-    "Admin-only storage backend \"%s\"" : "Alleen voor beheerders opslagbackend '%s\"",
     "Personal" : "Persoonlijk",
     "System" : "Systeem",
     "Grant access" : "Sta toegang toe",
     "Access granted" : "Toegang toegestaan",
     "Error configuring OAuth1" : "Fout bij configureren OAuth1",
     "Error configuring OAuth2" : "Fout bij configureren OAuth2",
+    "Generate keys" : "Genereer sleutels",
+    "Error generating key pair" : "Fout bij genereren sleutelpaar",
     "Enable encryption" : "Versleuteling inschakelen",
     "Enable previews" : "Activeren voorbeelden",
     "Check for changes" : "Controleren op wijzigingen",
@@ -47,8 +31,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.",
     "(group)" : "(groep)",
     "Saved" : "Bewaard",
-    "Generate keys" : "Genereer sleutels",
-    "Error generating key pair" : "Fout bij genereren sleutelpaar",
     "Access key" : "Access Key",
     "Secret key" : "Geheime sleutel",
     "Builtin" : "Ingebouwd",
@@ -59,10 +41,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
-    "Username and password" : "Gebruikersnaam en wachtwoord",
+    "Username" : "Gebruikersnaam",
     "Password" : "Wachtwoord",
+    "API key" : "API sleutel",
+    "Username and password" : "Gebruikersnaam en wachtwoord",
     "Session credentials" : "Sessie inloggegevens",
+    "Public key" : "Publieke sleutel",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Hostnaam",
     "Port" : "Poort",
     "Region" : "Regio",
@@ -70,9 +56,11 @@ OC.L10N.register(
     "Enable Path Style" : "Activeren pad stijl",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Externe submap",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Host",
     "Secure ftps://" : "Secure ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Lokaal",
@@ -81,6 +69,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Share",
+    "Username as share" : "Gebruikersnaam als share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Let op:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index b5c0bf78542..948845cfa82 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -5,23 +5,6 @@
     "Step 1 failed. Exception: %s" : "Stap 1 is mislukt. Uitzondering: %s",
     "Step 2 failed. Exception: %s" : "Stap 2 is mislukt. Uitzondering: %s",
     "External storage" : "Externe opslag",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Gebruikersnaam",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Regio (optioneel voor OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (verplicht voor Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (Verplicht voor OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Wachtwoord (verplicht voor OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (verplicht voor OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL van identity endpoint (verplicht voor OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Time-out van HTTP-verzoeken in seconden",
-    "SMB / CIFS using OC login" : "SMB / CIFS via OC inlog",
-    "Host" : "Host",
-    "Username as share" : "Gebruikersnaam als share",
-    "Share" : "Share",
-    "Remote subfolder" : "Externe submap",
-    "SFTP with secret key login" : "SFTP met geheime sleutel inlog",
-    "Public key" : "Publieke sleutel",
     "Storage with id \"%i\" not found" : "Opslag met id \"%i\" niet gevonden",
     "Invalid backend or authentication mechanism class" : "Ongeldige backend of authenticatie mechanisme klasse",
     "Invalid mount point" : "Ongeldig aankoppelpunt",
@@ -29,13 +12,14 @@
     "Invalid storage backend \"%s\"" : "Ongeldig opslagsysteem \"%s\"",
     "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
     "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
-    "Admin-only storage backend \"%s\"" : "Alleen voor beheerders opslagbackend '%s\"",
     "Personal" : "Persoonlijk",
     "System" : "Systeem",
     "Grant access" : "Sta toegang toe",
     "Access granted" : "Toegang toegestaan",
     "Error configuring OAuth1" : "Fout bij configureren OAuth1",
     "Error configuring OAuth2" : "Fout bij configureren OAuth2",
+    "Generate keys" : "Genereer sleutels",
+    "Error generating key pair" : "Fout bij genereren sleutelpaar",
     "Enable encryption" : "Versleuteling inschakelen",
     "Enable previews" : "Activeren voorbeelden",
     "Check for changes" : "Controleren op wijzigingen",
@@ -45,8 +29,6 @@
     "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.",
     "(group)" : "(groep)",
     "Saved" : "Bewaard",
-    "Generate keys" : "Genereer sleutels",
-    "Error generating key pair" : "Fout bij genereren sleutelpaar",
     "Access key" : "Access Key",
     "Secret key" : "Geheime sleutel",
     "Builtin" : "Ingebouwd",
@@ -57,10 +39,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
-    "Username and password" : "Gebruikersnaam en wachtwoord",
+    "Username" : "Gebruikersnaam",
     "Password" : "Wachtwoord",
+    "API key" : "API sleutel",
+    "Username and password" : "Gebruikersnaam en wachtwoord",
     "Session credentials" : "Sessie inloggegevens",
+    "Public key" : "Publieke sleutel",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Hostnaam",
     "Port" : "Poort",
     "Region" : "Regio",
@@ -68,9 +54,11 @@
     "Enable Path Style" : "Activeren pad stijl",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Externe submap",
     "Secure https://" : "Secure https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Host",
     "Secure ftps://" : "Secure ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Lokaal",
@@ -79,6 +67,9 @@
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Share",
+    "Username as share" : "Gebruikersnaam als share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Let op:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
diff --git a/apps/files_external/l10n/nn_NO.js b/apps/files_external/l10n/nn_NO.js
index 8c47314f660..325a8a57528 100644
--- a/apps/files_external/l10n/nn_NO.js
+++ b/apps/files_external/l10n/nn_NO.js
@@ -1,16 +1,16 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Brukarnamn",
-    "Host" : "Tenar",
-    "Share" : "Del",
     "Personal" : "Personleg",
+    "Username" : "Brukarnamn",
     "Password" : "Passord",
     "Region" : "Region/fylke",
     "WebDAV" : "WebDAV",
     "URL" : "Nettstad",
+    "Host" : "Tenar",
     "Location" : "Stad",
     "ownCloud" : "ownCloud",
+    "Share" : "Del",
     "Name" : "Namn",
     "Folder name" : "Mappenamn",
     "Configuration" : "Innstillingar",
diff --git a/apps/files_external/l10n/nn_NO.json b/apps/files_external/l10n/nn_NO.json
index 8ba4d2c1d6a..26e6c02d806 100644
--- a/apps/files_external/l10n/nn_NO.json
+++ b/apps/files_external/l10n/nn_NO.json
@@ -1,14 +1,14 @@
 { "translations": {
-    "Username" : "Brukarnamn",
-    "Host" : "Tenar",
-    "Share" : "Del",
     "Personal" : "Personleg",
+    "Username" : "Brukarnamn",
     "Password" : "Passord",
     "Region" : "Region/fylke",
     "WebDAV" : "WebDAV",
     "URL" : "Nettstad",
+    "Host" : "Tenar",
     "Location" : "Stad",
     "ownCloud" : "ownCloud",
+    "Share" : "Del",
     "Name" : "Namn",
     "Folder name" : "Mappenamn",
     "Configuration" : "Innstillingar",
diff --git a/apps/files_external/l10n/oc.js b/apps/files_external/l10n/oc.js
index 81b0f6ace8d..d234d0c62c1 100644
--- a/apps/files_external/l10n/oc.js
+++ b/apps/files_external/l10n/oc.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "L’etapa 1 a fracassat. Error : %s",
     "Step 2 failed. Exception: %s" : "L’etapa 2 a fracassat. Error : %s",
     "External storage" : "Emmagazinatge extèrne",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nom d'utilizaire",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requesit per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nom del locatari (requesit per l'emmagazinatge OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senhal (requesit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servici (requesit per l'emmagazinatge OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt d'accès d'identitat (requesit per l'emmagazinatge OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Relmabi d'espèra maximal de las requèstas HTTP en segondas",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC",
-    "Host" : "Òste",
-    "Username as share" : "Nom d'utilizaire coma nom de partiment",
-    "Share" : "Partejar",
-    "Remote subfolder" : "Sosdorsièr distant",
-    "SFTP with secret key login" : "SFTP amb un identificant secret",
-    "Public key" : "Clau publica",
     "Storage with id \"%i\" not found" : "Emmagazinatge amb l'id \"%i\" pas trobat",
     "Invalid mount point" : "Punt de montatge invalid",
     "Invalid storage backend \"%s\"" : "Servici d'emmagazinatge invalid : \"%s\"",
@@ -28,18 +11,21 @@ OC.L10N.register(
     "System" : "Sistèma",
     "Grant access" : "Autorizar l'accès",
     "Access granted" : "Accès autorizat",
+    "Generate keys" : "Generar de claus",
+    "Error generating key pair" : "Error al moment de la generacion de las claus",
     "Enable encryption" : "Activar lo chiframent",
     "(group)" : "(grop)",
     "Saved" : "Salvat",
-    "Generate keys" : "Generar de claus",
-    "Error generating key pair" : "Error al moment de la generacion de las claus",
     "None" : "Pas cap",
     "App key" : "App key",
     "App secret" : "App secret",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
+    "Username" : "Nom d'utilizaire",
     "Password" : "Senhal",
+    "Public key" : "Clau publica",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Nom de l'òste",
     "Port" : "Pòrt",
     "Region" : "Region",
@@ -47,11 +33,16 @@ OC.L10N.register(
     "Enable Path Style" : "Accès per path",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Sosdorsièr distant",
     "Secure https://" : "Securizacion https://",
+    "Host" : "Òste",
     "Secure ftps://" : "Securizacion ftps://",
     "Local" : "Local",
     "Location" : "Emplaçament",
     "ownCloud" : "ownCloud",
+    "Share" : "Partejar",
+    "Username as share" : "Nom d'utilizaire coma nom de partiment",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Atencion :</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion :</b> La presa en carga de cURL per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> La presa en carga del FTP per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
diff --git a/apps/files_external/l10n/oc.json b/apps/files_external/l10n/oc.json
index b472b21c056..0dfa95426ca 100644
--- a/apps/files_external/l10n/oc.json
+++ b/apps/files_external/l10n/oc.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "L’etapa 1 a fracassat. Error : %s",
     "Step 2 failed. Exception: %s" : "L’etapa 2 a fracassat. Error : %s",
     "External storage" : "Emmagazinatge extèrne",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Nom d'utilizaire",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requesit per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nom del locatari (requesit per l'emmagazinatge OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senhal (requesit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servici (requesit per l'emmagazinatge OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt d'accès d'identitat (requesit per l'emmagazinatge OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Relmabi d'espèra maximal de las requèstas HTTP en segondas",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC",
-    "Host" : "Òste",
-    "Username as share" : "Nom d'utilizaire coma nom de partiment",
-    "Share" : "Partejar",
-    "Remote subfolder" : "Sosdorsièr distant",
-    "SFTP with secret key login" : "SFTP amb un identificant secret",
-    "Public key" : "Clau publica",
     "Storage with id \"%i\" not found" : "Emmagazinatge amb l'id \"%i\" pas trobat",
     "Invalid mount point" : "Punt de montatge invalid",
     "Invalid storage backend \"%s\"" : "Servici d'emmagazinatge invalid : \"%s\"",
@@ -26,18 +9,21 @@
     "System" : "Sistèma",
     "Grant access" : "Autorizar l'accès",
     "Access granted" : "Accès autorizat",
+    "Generate keys" : "Generar de claus",
+    "Error generating key pair" : "Error al moment de la generacion de las claus",
     "Enable encryption" : "Activar lo chiframent",
     "(group)" : "(grop)",
     "Saved" : "Salvat",
-    "Generate keys" : "Generar de claus",
-    "Error generating key pair" : "Error al moment de la generacion de las claus",
     "None" : "Pas cap",
     "App key" : "App key",
     "App secret" : "App secret",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
+    "Username" : "Nom d'utilizaire",
     "Password" : "Senhal",
+    "Public key" : "Clau publica",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Nom de l'òste",
     "Port" : "Pòrt",
     "Region" : "Region",
@@ -45,11 +31,16 @@
     "Enable Path Style" : "Accès per path",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Sosdorsièr distant",
     "Secure https://" : "Securizacion https://",
+    "Host" : "Òste",
     "Secure ftps://" : "Securizacion ftps://",
     "Local" : "Local",
     "Location" : "Emplaçament",
     "ownCloud" : "ownCloud",
+    "Share" : "Partejar",
+    "Username as share" : "Nom d'utilizaire coma nom de partiment",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Atencion :</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion :</b> La presa en carga de cURL per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> La presa en carga del FTP per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
diff --git a/apps/files_external/l10n/pa.js b/apps/files_external/l10n/pa.js
index ce71d10964d..ff376198ae4 100644
--- a/apps/files_external/l10n/pa.js
+++ b/apps/files_external/l10n/pa.js
@@ -2,9 +2,9 @@ OC.L10N.register(
     "files_external",
     {
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
-    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Password" : "ਪਾਸਵਰ",
     "ownCloud" : "ਓਵਨਕਲਾਉਡ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Delete" : "ਹਟਾਓ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/pa.json b/apps/files_external/l10n/pa.json
index 54949c9bbc4..a2ba80af130 100644
--- a/apps/files_external/l10n/pa.json
+++ b/apps/files_external/l10n/pa.json
@@ -1,8 +1,8 @@
 { "translations": {
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
-    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Password" : "ਪਾਸਵਰ",
     "ownCloud" : "ਓਵਨਕਲਾਉਡ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Delete" : "ਹਟਾਓ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js
index 759c90965a1..9fb70e71778 100644
--- a/apps/files_external/l10n/pl.js
+++ b/apps/files_external/l10n/pl.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Krok 1 błędny. Błąd: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 błędny. Błąd: %s",
     "External storage" : "Zewnętrzne zasoby dyskowe",
-    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
-    "Username" : "Nazwa użytkownika",
-    "Bucket" : "Kosz",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcjonalny dla magazynu obiektów OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Klucz API (wymagany dla plików Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Hasło (wymagane dla magazynu obiektów OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Czas nieaktywności żądania HTTP w sekundach",
-    "SMB / CIFS using OC login" : "SMB / CIFS przy użyciu loginu OC",
-    "Host" : "Host",
-    "Username as share" : "Użytkownik jako zasób",
-    "Share" : "Udostępnij",
-    "Remote subfolder" : "Zdalny podfolder",
-    "SFTP with secret key login" : "Logowanie tajnym kluczem do SFTP",
-    "Public key" : "Klucz publiczny",
     "Storage with id \"%i\" not found" : "Id magazynu nie został znaleziony",
     "Invalid mount point" : "Nieprawidłowy punkt montowania",
     "Invalid storage backend \"%s\"" : "Nieprawidłowy magazyn zaplecza \"%s\"",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "System",
     "Grant access" : "Udziel dostępu",
     "Access granted" : "Dostęp do",
+    "Generate keys" : "Wygeneruj klucze",
+    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
     "Enable encryption" : "Włącz szyfrowanie",
     "Enable previews" : "Włącz podgląd",
     "Check for changes" : "Sprawdź zmiany",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.",
     "(group)" : "(grupa)",
     "Saved" : "Zapisano",
-    "Generate keys" : "Wygeneruj klucze",
-    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
     "None" : "Nic",
     "App key" : "Klucz aplikacji",
     "App secret" : "Hasło aplikacji",
     "Client ID" : "ID klienta",
     "Client secret" : "Hasło klienta",
+    "Username" : "Nazwa użytkownika",
     "Password" : "Hasło",
+    "API key" : "Klucz API",
+    "Public key" : "Klucz publiczny",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Kosz",
     "Hostname" : "Nazwa serwera",
     "Port" : "Port",
     "Region" : "Region",
@@ -53,13 +40,18 @@ OC.L10N.register(
     "Enable Path Style" : "Włącz styl ścieżki",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Zdalny podfolder",
     "Secure https://" : "Bezpieczny https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Host",
     "Secure ftps://" : "Bezpieczny ftps://",
     "Local" : "Lokalny",
     "Location" : "Lokalizacja",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Udostępnij",
+    "Username as share" : "Użytkownik jako zasób",
+    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
     "<b>Note:</b> " : "<b>Uwaga:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json
index e328c1afad8..d7cd70b8c36 100644
--- a/apps/files_external/l10n/pl.json
+++ b/apps/files_external/l10n/pl.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "Krok 1 błędny. Błąd: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 błędny. Błąd: %s",
     "External storage" : "Zewnętrzne zasoby dyskowe",
-    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
-    "Username" : "Nazwa użytkownika",
-    "Bucket" : "Kosz",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcjonalny dla magazynu obiektów OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Klucz API (wymagany dla plików Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Hasło (wymagane dla magazynu obiektów OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Czas nieaktywności żądania HTTP w sekundach",
-    "SMB / CIFS using OC login" : "SMB / CIFS przy użyciu loginu OC",
-    "Host" : "Host",
-    "Username as share" : "Użytkownik jako zasób",
-    "Share" : "Udostępnij",
-    "Remote subfolder" : "Zdalny podfolder",
-    "SFTP with secret key login" : "Logowanie tajnym kluczem do SFTP",
-    "Public key" : "Klucz publiczny",
     "Storage with id \"%i\" not found" : "Id magazynu nie został znaleziony",
     "Invalid mount point" : "Nieprawidłowy punkt montowania",
     "Invalid storage backend \"%s\"" : "Nieprawidłowy magazyn zaplecza \"%s\"",
@@ -26,6 +9,8 @@
     "System" : "System",
     "Grant access" : "Udziel dostępu",
     "Access granted" : "Dostęp do",
+    "Generate keys" : "Wygeneruj klucze",
+    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
     "Enable encryption" : "Włącz szyfrowanie",
     "Enable previews" : "Włącz podgląd",
     "Check for changes" : "Sprawdź zmiany",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.",
     "(group)" : "(grupa)",
     "Saved" : "Zapisano",
-    "Generate keys" : "Wygeneruj klucze",
-    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
     "None" : "Nic",
     "App key" : "Klucz aplikacji",
     "App secret" : "Hasło aplikacji",
     "Client ID" : "ID klienta",
     "Client secret" : "Hasło klienta",
+    "Username" : "Nazwa użytkownika",
     "Password" : "Hasło",
+    "API key" : "Klucz API",
+    "Public key" : "Klucz publiczny",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Kosz",
     "Hostname" : "Nazwa serwera",
     "Port" : "Port",
     "Region" : "Region",
@@ -51,13 +38,18 @@
     "Enable Path Style" : "Włącz styl ścieżki",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Zdalny podfolder",
     "Secure https://" : "Bezpieczny https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Host",
     "Secure ftps://" : "Bezpieczny ftps://",
     "Local" : "Lokalny",
     "Location" : "Lokalizacja",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Udostępnij",
+    "Username as share" : "Użytkownik jako zasób",
+    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
     "<b>Note:</b> " : "<b>Uwaga:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index ae9a08fac6b..fefe1e899f5 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -7,23 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Username" : "Nome de Usuário",
-    "Bucket" : "Cesta",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para armazenamento de objetos OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome Tenant (necessário para armazenamento de objetos OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessário para armazenamento de objetos OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para armazenamento de objetos OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Tempo de vencimento do pedido HTTP em segundos",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
-    "Host" : "Host",
-    "Username as share" : "Nome de usuário como compartilhado",
-    "Share" : "Compartilhar",
-    "Remote subfolder" : "Subpasta remota",
-    "SFTP with secret key login" : "SFTP com chave secreta de login",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Armazenamento com id \"%i\" não encontrado",
     "Invalid backend or authentication mechanism class" : "Backend inválido ou classe de mecanismo de autenticação",
     "Invalid mount point" : "Ponto de montagem inválido",
@@ -31,13 +14,14 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "Armazenamento backend inválido \"%s\"",
     "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
     "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
-    "Admin-only storage backend \"%s\"" : "Backend de armazenamento somente de administrador \"%s\"",
     "Personal" : "Pessoal",
     "System" : "Sistema",
     "Grant access" : "Permitir acesso",
     "Access granted" : "Acesso concedido",
     "Error configuring OAuth1" : "Erro configurando OAuth1",
     "Error configuring OAuth2" : "Erro configurando OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar um par de chaves",
     "Enable encryption" : "Ativar criptografia",
     "Enable previews" : "Habilitar visualizações prévias",
     "Check for changes" : "Verifique se há alterações",
@@ -47,8 +31,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Salvo",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar um par de chaves",
     "Access key" : "Chave da acesso",
     "Secret key" : "Chave secreta",
     "Builtin" : "Construídas em",
@@ -59,10 +41,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID do Cliente",
     "Client secret" : "Segredo do cliente",
-    "Username and password" : "Nome de Usuário e senha",
+    "Username" : "Nome de Usuário",
     "Password" : "Senha",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de Usuário e senha",
     "Session credentials" : "Credenciais de Sessão",
+    "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cesta",
     "Hostname" : "Nome do Host",
     "Port" : "Porta",
     "Region" : "Região",
@@ -70,9 +56,11 @@ OC.L10N.register(
     "Enable Path Style" : "Habilitar Estilo do Caminho",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subpasta remota",
     "Secure https://" : "https:// segura",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Host",
     "Secure ftps://" : "Seguro ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Local",
@@ -81,6 +69,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Raiz",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartilhar",
+    "Username as share" : "Nome de usuário como compartilhado",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index 2cf6c696112..f133b469f76 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -5,23 +5,6 @@
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Username" : "Nome de Usuário",
-    "Bucket" : "Cesta",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para armazenamento de objetos OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome Tenant (necessário para armazenamento de objetos OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessário para armazenamento de objetos OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para armazenamento de objetos OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Tempo de vencimento do pedido HTTP em segundos",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
-    "Host" : "Host",
-    "Username as share" : "Nome de usuário como compartilhado",
-    "Share" : "Compartilhar",
-    "Remote subfolder" : "Subpasta remota",
-    "SFTP with secret key login" : "SFTP com chave secreta de login",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Armazenamento com id \"%i\" não encontrado",
     "Invalid backend or authentication mechanism class" : "Backend inválido ou classe de mecanismo de autenticação",
     "Invalid mount point" : "Ponto de montagem inválido",
@@ -29,13 +12,14 @@
     "Invalid storage backend \"%s\"" : "Armazenamento backend inválido \"%s\"",
     "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
     "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
-    "Admin-only storage backend \"%s\"" : "Backend de armazenamento somente de administrador \"%s\"",
     "Personal" : "Pessoal",
     "System" : "Sistema",
     "Grant access" : "Permitir acesso",
     "Access granted" : "Acesso concedido",
     "Error configuring OAuth1" : "Erro configurando OAuth1",
     "Error configuring OAuth2" : "Erro configurando OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar um par de chaves",
     "Enable encryption" : "Ativar criptografia",
     "Enable previews" : "Habilitar visualizações prévias",
     "Check for changes" : "Verifique se há alterações",
@@ -45,8 +29,6 @@
     "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Salvo",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar um par de chaves",
     "Access key" : "Chave da acesso",
     "Secret key" : "Chave secreta",
     "Builtin" : "Construídas em",
@@ -57,10 +39,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID do Cliente",
     "Client secret" : "Segredo do cliente",
-    "Username and password" : "Nome de Usuário e senha",
+    "Username" : "Nome de Usuário",
     "Password" : "Senha",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de Usuário e senha",
     "Session credentials" : "Credenciais de Sessão",
+    "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cesta",
     "Hostname" : "Nome do Host",
     "Port" : "Porta",
     "Region" : "Região",
@@ -68,9 +54,11 @@
     "Enable Path Style" : "Habilitar Estilo do Caminho",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subpasta remota",
     "Secure https://" : "https:// segura",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Host",
     "Secure ftps://" : "Seguro ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Local",
@@ -79,6 +67,9 @@
     "SFTP" : "SFTP",
     "Root" : "Raiz",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartilhar",
+    "Username as share" : "Nome de usuário como compartilhado",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
index 182eb7f17f1..ba1d86a40d0 100644
--- a/apps/files_external/l10n/pt_PT.js
+++ b/apps/files_external/l10n/pt_PT.js
@@ -7,22 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Username" : "Nome de utilizador",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Palavra-passe (necessária para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Expiração de pedidos HTTP em segundos",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
-    "Host" : "Anfitrião",
-    "Username as share" : "Nome de utilizador como partilha",
-    "Share" : "Compartilhar",
-    "Remote subfolder" : "Subpasta remota ",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
     "Invalid mount point" : "Ponto de montagem inválido",
     "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
@@ -33,6 +17,8 @@ OC.L10N.register(
     "Access granted" : "Acesso autorizado",
     "Error configuring OAuth1" : "Erro de configuração OAuth1",
     "Error configuring OAuth2" : "Erro de configuração OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar chave par",
     "Enable encryption" : "Ative a encriptação",
     "Enable previews" : "Ative as pré-visualizações",
     "Check for changes" : "Verifique as suas alterações",
@@ -42,8 +28,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Guardado",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar chave par",
     "Access key" : "Código de acesso",
     "Secret key" : "Código secreto",
     "Builtin" : "Integrado",
@@ -54,10 +38,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Id. do Cliente",
     "Client secret" : "Segredo do cliente\\\\",
-    "Username and password" : "Nome de utilizador e palavra-passe",
+    "Username" : "Nome de utilizador",
     "Password" : "Palavra-passe",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de utilizador e palavra-passe",
     "Session credentials" : "Credenciais da sessão",
+    "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Nome do Anfitrião",
     "Port" : "Porta",
     "Region" : "Região",
@@ -65,9 +53,11 @@ OC.L10N.register(
     "Enable Path Style" : "Ativar Estilo do Caminho",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subpasta remota ",
     "Secure https://" : "https:// Seguro",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Anfitrião",
     "Secure ftps://" : "ftps:// Seguro",
     "Google Drive" : "Google Drive",
     "Local" : "Local",
@@ -76,6 +66,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartilhar",
+    "Username as share" : "Nome de utilizador como partilha",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
index 0f3a9298057..24955db65f6 100644
--- a/apps/files_external/l10n/pt_PT.json
+++ b/apps/files_external/l10n/pt_PT.json
@@ -5,22 +5,6 @@
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Username" : "Nome de utilizador",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Palavra-passe (necessária para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Expiração de pedidos HTTP em segundos",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
-    "Host" : "Anfitrião",
-    "Username as share" : "Nome de utilizador como partilha",
-    "Share" : "Compartilhar",
-    "Remote subfolder" : "Subpasta remota ",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
     "Invalid mount point" : "Ponto de montagem inválido",
     "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
@@ -31,6 +15,8 @@
     "Access granted" : "Acesso autorizado",
     "Error configuring OAuth1" : "Erro de configuração OAuth1",
     "Error configuring OAuth2" : "Erro de configuração OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar chave par",
     "Enable encryption" : "Ative a encriptação",
     "Enable previews" : "Ative as pré-visualizações",
     "Check for changes" : "Verifique as suas alterações",
@@ -40,8 +26,6 @@
     "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Guardado",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar chave par",
     "Access key" : "Código de acesso",
     "Secret key" : "Código secreto",
     "Builtin" : "Integrado",
@@ -52,10 +36,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Id. do Cliente",
     "Client secret" : "Segredo do cliente\\\\",
-    "Username and password" : "Nome de utilizador e palavra-passe",
+    "Username" : "Nome de utilizador",
     "Password" : "Palavra-passe",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de utilizador e palavra-passe",
     "Session credentials" : "Credenciais da sessão",
+    "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Nome do Anfitrião",
     "Port" : "Porta",
     "Region" : "Região",
@@ -63,9 +51,11 @@
     "Enable Path Style" : "Ativar Estilo do Caminho",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subpasta remota ",
     "Secure https://" : "https:// Seguro",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Anfitrião",
     "Secure ftps://" : "ftps:// Seguro",
     "Google Drive" : "Google Drive",
     "Local" : "Local",
@@ -74,6 +64,9 @@
     "SFTP" : "SFTP",
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartilhar",
+    "Username as share" : "Nome de utilizador como partilha",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
diff --git a/apps/files_external/l10n/ro.js b/apps/files_external/l10n/ro.js
index ae064ba3cfb..502d9a5cbef 100644
--- a/apps/files_external/l10n/ro.js
+++ b/apps/files_external/l10n/ro.js
@@ -2,26 +2,27 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "Stocare externă",
-    "Username" : "Nume utilizator",
-    "Host" : "Gazdă",
-    "Share" : "Partajează",
-    "Public key" : "Cheie publică",
     "Personal" : "Personal",
     "Grant access" : "Permite accesul",
     "Access granted" : "Acces permis",
     "Saved" : "Salvat",
     "None" : "Niciuna",
+    "Username" : "Nume utilizator",
     "Password" : "Parolă",
+    "API key" : "Cheie API",
+    "Public key" : "Cheie publică",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Hostname",
     "Port" : "Portul",
     "Region" : "Regiune",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Gazdă",
     "Local" : "Local",
     "Location" : "Locație",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Partajează",
     "Name" : "Nume",
     "Storage type" : "Tip stocare",
     "External Storage" : "Stocare externă",
diff --git a/apps/files_external/l10n/ro.json b/apps/files_external/l10n/ro.json
index 56bbba7ef05..41c844e36b7 100644
--- a/apps/files_external/l10n/ro.json
+++ b/apps/files_external/l10n/ro.json
@@ -1,25 +1,26 @@
 { "translations": {
     "External storage" : "Stocare externă",
-    "Username" : "Nume utilizator",
-    "Host" : "Gazdă",
-    "Share" : "Partajează",
-    "Public key" : "Cheie publică",
     "Personal" : "Personal",
     "Grant access" : "Permite accesul",
     "Access granted" : "Acces permis",
     "Saved" : "Salvat",
     "None" : "Niciuna",
+    "Username" : "Nume utilizator",
     "Password" : "Parolă",
+    "API key" : "Cheie API",
+    "Public key" : "Cheie publică",
     "Amazon S3" : "Amazon S3",
     "Hostname" : "Hostname",
     "Port" : "Portul",
     "Region" : "Regiune",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Gazdă",
     "Local" : "Local",
     "Location" : "Locație",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Partajează",
     "Name" : "Nume",
     "Storage type" : "Tip stocare",
     "External Storage" : "Stocare externă",
diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js
index 2abdc3906ec..f76c5526bca 100644
--- a/apps/files_external/l10n/ru.js
+++ b/apps/files_external/l10n/ru.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
     "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
     "External storage" : "Внешнее хранилище",
-    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
-    "Username" : "Имя пользователя",
-    "Bucket" : "Корзина",
-    "Region (optional for OpenStack Object Storage)" : "Регион (необяз. для Хранилища объектов OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обяз. для Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Имя арендатора (обяз. для Хранилища объектов OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Пароль (обяз. для Хранилища объектов OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах",
-    "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
-    "Host" : "Сервер",
-    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
-    "Share" : "Общий доступ",
-    "Remote subfolder" : "Удаленный подкаталог",
-    "SFTP with secret key login" : "SFTP с помощью секретного ключа",
-    "Public key" : "Открытый ключ",
     "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено",
     "Invalid mount point" : "Неправильная точка входа",
     "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "Система",
     "Grant access" : "Предоставить доступ",
     "Access granted" : "Доступ предоставлен",
+    "Generate keys" : "Создать ключи",
+    "Error generating key pair" : "Ошибка создания ключевой пары",
     "Enable encryption" : "Включить шифрование",
     "Enable previews" : "Включить предпросмотр",
     "Check for changes" : "Проверять изменения",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.",
     "(group)" : "(группа)",
     "Saved" : "Сохранено",
-    "Generate keys" : "Создать ключи",
-    "Error generating key pair" : "Ошибка создания ключевой пары",
     "None" : "Отсутствует",
     "App key" : "Ключ приложения",
     "App secret" : "Секретный ключ ",
     "Client ID" : "Идентификатор клиента",
     "Client secret" : "Клиентский ключ ",
+    "Username" : "Имя пользователя",
     "Password" : "Пароль",
+    "API key" : "Ключ API",
+    "Public key" : "Открытый ключ",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Корзина",
     "Hostname" : "Имя хоста",
     "Port" : "Порт",
     "Region" : "Область",
@@ -53,13 +40,18 @@ OC.L10N.register(
     "Enable Path Style" : "Включить стиль пути",
     "WebDAV" : "WebDAV",
     "URL" : "Ссылка",
+    "Remote subfolder" : "Удаленный подкаталог",
     "Secure https://" : "Безопасный https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Сервер",
     "Secure ftps://" : "Защищённый ftps://",
     "Local" : "Локально",
     "Location" : "Местоположение",
     "ownCloud" : "ownCloud",
     "Root" : "Корневой каталог",
+    "Share" : "Общий доступ",
+    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
+    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
     "<b>Note:</b> " : "<b>Примечание:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json
index ad6c5afdbd8..3428d05ef4b 100644
--- a/apps/files_external/l10n/ru.json
+++ b/apps/files_external/l10n/ru.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
     "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
     "External storage" : "Внешнее хранилище",
-    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
-    "Username" : "Имя пользователя",
-    "Bucket" : "Корзина",
-    "Region (optional for OpenStack Object Storage)" : "Регион (необяз. для Хранилища объектов OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обяз. для Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Имя арендатора (обяз. для Хранилища объектов OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Пароль (обяз. для Хранилища объектов OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах",
-    "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
-    "Host" : "Сервер",
-    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
-    "Share" : "Общий доступ",
-    "Remote subfolder" : "Удаленный подкаталог",
-    "SFTP with secret key login" : "SFTP с помощью секретного ключа",
-    "Public key" : "Открытый ключ",
     "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено",
     "Invalid mount point" : "Неправильная точка входа",
     "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"",
@@ -26,6 +9,8 @@
     "System" : "Система",
     "Grant access" : "Предоставить доступ",
     "Access granted" : "Доступ предоставлен",
+    "Generate keys" : "Создать ключи",
+    "Error generating key pair" : "Ошибка создания ключевой пары",
     "Enable encryption" : "Включить шифрование",
     "Enable previews" : "Включить предпросмотр",
     "Check for changes" : "Проверять изменения",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.",
     "(group)" : "(группа)",
     "Saved" : "Сохранено",
-    "Generate keys" : "Создать ключи",
-    "Error generating key pair" : "Ошибка создания ключевой пары",
     "None" : "Отсутствует",
     "App key" : "Ключ приложения",
     "App secret" : "Секретный ключ ",
     "Client ID" : "Идентификатор клиента",
     "Client secret" : "Клиентский ключ ",
+    "Username" : "Имя пользователя",
     "Password" : "Пароль",
+    "API key" : "Ключ API",
+    "Public key" : "Открытый ключ",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Корзина",
     "Hostname" : "Имя хоста",
     "Port" : "Порт",
     "Region" : "Область",
@@ -51,13 +38,18 @@
     "Enable Path Style" : "Включить стиль пути",
     "WebDAV" : "WebDAV",
     "URL" : "Ссылка",
+    "Remote subfolder" : "Удаленный подкаталог",
     "Secure https://" : "Безопасный https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Сервер",
     "Secure ftps://" : "Защищённый ftps://",
     "Local" : "Локально",
     "Location" : "Местоположение",
     "ownCloud" : "ownCloud",
     "Root" : "Корневой каталог",
+    "Share" : "Общий доступ",
+    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
+    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
     "<b>Note:</b> " : "<b>Примечание:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
diff --git a/apps/files_external/l10n/si_LK.js b/apps/files_external/l10n/si_LK.js
index 492dfc96f47..80a6026ad75 100644
--- a/apps/files_external/l10n/si_LK.js
+++ b/apps/files_external/l10n/si_LK.js
@@ -1,19 +1,19 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "පරිශීලක නම",
-    "Host" : "සත්කාරකය",
-    "Share" : "බෙදා හදා ගන්න",
     "Personal" : "පෞද්ගලික",
     "Grant access" : "පිවිසුම ලබාදෙන්න",
     "Access granted" : "පිවිසීමට හැක",
     "None" : "කිසිවක් නැත",
+    "Username" : "පරිශීලක නම",
     "Password" : "මුර පදය",
     "Port" : "තොට",
     "Region" : "කළාපය",
     "URL" : "URL",
+    "Host" : "සත්කාරකය",
     "Location" : "ස්ථානය",
     "ownCloud" : "ownCloud",
+    "Share" : "බෙදා හදා ගන්න",
     "Name" : "නම",
     "External Storage" : "භාහිර ගබඩාව",
     "Folder name" : "ෆොල්ඩරයේ නම",
diff --git a/apps/files_external/l10n/si_LK.json b/apps/files_external/l10n/si_LK.json
index 792b0f5316c..bc3a9ee11db 100644
--- a/apps/files_external/l10n/si_LK.json
+++ b/apps/files_external/l10n/si_LK.json
@@ -1,17 +1,17 @@
 { "translations": {
-    "Username" : "පරිශීලක නම",
-    "Host" : "සත්කාරකය",
-    "Share" : "බෙදා හදා ගන්න",
     "Personal" : "පෞද්ගලික",
     "Grant access" : "පිවිසුම ලබාදෙන්න",
     "Access granted" : "පිවිසීමට හැක",
     "None" : "කිසිවක් නැත",
+    "Username" : "පරිශීලක නම",
     "Password" : "මුර පදය",
     "Port" : "තොට",
     "Region" : "කළාපය",
     "URL" : "URL",
+    "Host" : "සත්කාරකය",
     "Location" : "ස්ථානය",
     "ownCloud" : "ownCloud",
+    "Share" : "බෙදා හදා ගන්න",
     "Name" : "නම",
     "External Storage" : "භාහිර ගබඩාව",
     "Folder name" : "ෆොල්ඩරයේ නම",
diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js
index 6f444f993f2..87ea8c64bc5 100644
--- a/apps/files_external/l10n/sk_SK.js
+++ b/apps/files_external/l10n/sk_SK.js
@@ -4,42 +4,30 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s",
     "External storage" : "Externé úložisko",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Používateľské meno",
-    "Bucket" : "Sektor",
-    "Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Meno nájomcu (požadované pre OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadaviek v sekundách",
-    "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia",
-    "Host" : "Hostiteľ",
-    "Username as share" : "Používateľské meno ako zdieľaný priečinok",
-    "Share" : "Zdieľať",
-    "Remote subfolder" : "Vzdialený podpriečinok",
-    "Public key" : "Verejný kľúč",
     "Invalid mount point" : "Chybný prípojný bod",
     "Personal" : "Osobné",
     "System" : "Systém",
     "Grant access" : "Povoliť prístup",
     "Access granted" : "Prístup povolený",
+    "Generate keys" : "Vytvoriť kľúče",
+    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
     "Enable encryption" : "Povoliť šifrovanie",
     "Enable previews" : "Povoliť náhľady",
     "Never" : "Nikdy",
     "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.",
     "(group)" : "(skupina)",
     "Saved" : "Uložené",
-    "Generate keys" : "Vytvoriť kľúče",
-    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
     "None" : "Žiadny",
     "App key" : "Kľúč aplikácie",
     "App secret" : "Heslo aplikácie",
     "Client ID" : "Client ID",
     "Client secret" : "Heslo klienta",
+    "Username" : "Používateľské meno",
     "Password" : "Heslo",
+    "API key" : "API kľúč",
+    "Public key" : "Verejný kľúč",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Sektor",
     "Hostname" : "Hostname",
     "Port" : "Port",
     "Region" : "Región",
@@ -47,13 +35,18 @@ OC.L10N.register(
     "Enable Path Style" : "Povoliť štýl cesty",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Vzdialený podpriečinok",
     "Secure https://" : "Zabezpečené https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Hostiteľ",
     "Secure ftps://" : "Zabezpečené ftps://",
     "Local" : "Lokálny",
     "Location" : "Umiestnenie",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Zdieľať",
+    "Username as share" : "Používateľské meno ako zdieľaný priečinok",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json
index 921a9ed4aae..5e7f4d1fa94 100644
--- a/apps/files_external/l10n/sk_SK.json
+++ b/apps/files_external/l10n/sk_SK.json
@@ -2,42 +2,30 @@
     "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s",
     "External storage" : "Externé úložisko",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Používateľské meno",
-    "Bucket" : "Sektor",
-    "Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Meno nájomcu (požadované pre OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadaviek v sekundách",
-    "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia",
-    "Host" : "Hostiteľ",
-    "Username as share" : "Používateľské meno ako zdieľaný priečinok",
-    "Share" : "Zdieľať",
-    "Remote subfolder" : "Vzdialený podpriečinok",
-    "Public key" : "Verejný kľúč",
     "Invalid mount point" : "Chybný prípojný bod",
     "Personal" : "Osobné",
     "System" : "Systém",
     "Grant access" : "Povoliť prístup",
     "Access granted" : "Prístup povolený",
+    "Generate keys" : "Vytvoriť kľúče",
+    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
     "Enable encryption" : "Povoliť šifrovanie",
     "Enable previews" : "Povoliť náhľady",
     "Never" : "Nikdy",
     "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.",
     "(group)" : "(skupina)",
     "Saved" : "Uložené",
-    "Generate keys" : "Vytvoriť kľúče",
-    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
     "None" : "Žiadny",
     "App key" : "Kľúč aplikácie",
     "App secret" : "Heslo aplikácie",
     "Client ID" : "Client ID",
     "Client secret" : "Heslo klienta",
+    "Username" : "Používateľské meno",
     "Password" : "Heslo",
+    "API key" : "API kľúč",
+    "Public key" : "Verejný kľúč",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Sektor",
     "Hostname" : "Hostname",
     "Port" : "Port",
     "Region" : "Región",
@@ -45,13 +33,18 @@
     "Enable Path Style" : "Povoliť štýl cesty",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Vzdialený podpriečinok",
     "Secure https://" : "Zabezpečené https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Hostiteľ",
     "Secure ftps://" : "Zabezpečené ftps://",
     "Local" : "Lokálny",
     "Location" : "Umiestnenie",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Zdieľať",
+    "Username as share" : "Používateľské meno ako zdieľaný priečinok",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js
index 8aa95721a15..b4c9cc00275 100644
--- a/apps/files_external/l10n/sl.js
+++ b/apps/files_external/l10n/sl.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "1. korak je spodletel. Izjemna napaka: %s",
     "Step 2 failed. Exception: %s" : "2. korak je spodletel. Izjemna napaka: %s",
     "External storage" : "Zunanja shramba",
-    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
-    "Username" : "Uporabniško ime",
-    "Bucket" : "Pomnilniško vedro",
-    "Region (optional for OpenStack Object Storage)" : "Območje (zahtevano za shrambo predmeta OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ključ programskega vmesnika (API) (zahtevan je za datoteke v oblaku Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Geslo (zahtevano za shrambo predmeta OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime storitve (zahtevano za shrambo predmeta OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Naslov URL končne točke  uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Časovni zamik zahtev HTTP v sekundah",
-    "SMB / CIFS using OC login" : "SMB / CIFS z uporabo prijave OC",
-    "Host" : "Gostitelj",
-    "Username as share" : "Uporabniško ime za souporabo",
-    "Share" : "Souporaba",
-    "Remote subfolder" : "Oddaljena podrejena mapa",
-    "SFTP with secret key login" : "Prijava preko protokola SFTP z geslom",
-    "Public key" : "Javni ključ",
     "Storage with id \"%i\" not found" : "Shrambe z ID \"%i\" ni mogoče najti.",
     "Invalid mount point" : "Neveljavna priklopna točka",
     "Invalid storage backend \"%s\"" : "Neveljaven ozadnji program shrambe \"%s\"",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "Sistem",
     "Grant access" : "Odobri dostop",
     "Access granted" : "Dostop je odobren",
+    "Generate keys" : "Ustvari ključe",
+    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "Enable encryption" : "Omogoči šifriranje",
     "Enable previews" : "Omogoči predogled",
     "Check for changes" : "Preveri za spremembe",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
     "(group)" : "(skupina)",
     "Saved" : "Shranjeno",
-    "Generate keys" : "Ustvari ključe",
-    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "None" : "Brez",
     "App key" : "Programski ključ",
     "App secret" : "Skrivni programski ključ",
     "Client ID" : "ID odjemalca",
     "Client secret" : "Skrivni ključ odjemalca",
+    "Username" : "Uporabniško ime",
     "Password" : "Geslo",
+    "API key" : "Ključ API",
+    "Public key" : "Javni ključ",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Pomnilniško vedro",
     "Hostname" : "Ime gostitelja",
     "Port" : "Vrata",
     "Region" : "Območje",
@@ -53,13 +40,18 @@ OC.L10N.register(
     "Enable Path Style" : "Omogoči slog poti",
     "WebDAV" : "WebDAV",
     "URL" : "Naslov URL",
+    "Remote subfolder" : "Oddaljena podrejena mapa",
     "Secure https://" : "Varni način https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Gostitelj",
     "Secure ftps://" : "Varni način ftps://",
     "Local" : "Krajevno",
     "Location" : "Mesto",
     "ownCloud" : "ownCloud",
     "Root" : "Koren",
+    "Share" : "Souporaba",
+    "Username as share" : "Uporabniško ime za souporabo",
+    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
     "<b>Note:</b> " : "<b>Opomba:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json
index 2ac8cf8bb98..56b64fb17cc 100644
--- a/apps/files_external/l10n/sl.json
+++ b/apps/files_external/l10n/sl.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "1. korak je spodletel. Izjemna napaka: %s",
     "Step 2 failed. Exception: %s" : "2. korak je spodletel. Izjemna napaka: %s",
     "External storage" : "Zunanja shramba",
-    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
-    "Username" : "Uporabniško ime",
-    "Bucket" : "Pomnilniško vedro",
-    "Region (optional for OpenStack Object Storage)" : "Območje (zahtevano za shrambo predmeta OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ključ programskega vmesnika (API) (zahtevan je za datoteke v oblaku Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Geslo (zahtevano za shrambo predmeta OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime storitve (zahtevano za shrambo predmeta OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Naslov URL končne točke  uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Časovni zamik zahtev HTTP v sekundah",
-    "SMB / CIFS using OC login" : "SMB / CIFS z uporabo prijave OC",
-    "Host" : "Gostitelj",
-    "Username as share" : "Uporabniško ime za souporabo",
-    "Share" : "Souporaba",
-    "Remote subfolder" : "Oddaljena podrejena mapa",
-    "SFTP with secret key login" : "Prijava preko protokola SFTP z geslom",
-    "Public key" : "Javni ključ",
     "Storage with id \"%i\" not found" : "Shrambe z ID \"%i\" ni mogoče najti.",
     "Invalid mount point" : "Neveljavna priklopna točka",
     "Invalid storage backend \"%s\"" : "Neveljaven ozadnji program shrambe \"%s\"",
@@ -26,6 +9,8 @@
     "System" : "Sistem",
     "Grant access" : "Odobri dostop",
     "Access granted" : "Dostop je odobren",
+    "Generate keys" : "Ustvari ključe",
+    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "Enable encryption" : "Omogoči šifriranje",
     "Enable previews" : "Omogoči predogled",
     "Check for changes" : "Preveri za spremembe",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
     "(group)" : "(skupina)",
     "Saved" : "Shranjeno",
-    "Generate keys" : "Ustvari ključe",
-    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "None" : "Brez",
     "App key" : "Programski ključ",
     "App secret" : "Skrivni programski ključ",
     "Client ID" : "ID odjemalca",
     "Client secret" : "Skrivni ključ odjemalca",
+    "Username" : "Uporabniško ime",
     "Password" : "Geslo",
+    "API key" : "Ključ API",
+    "Public key" : "Javni ključ",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Pomnilniško vedro",
     "Hostname" : "Ime gostitelja",
     "Port" : "Vrata",
     "Region" : "Območje",
@@ -51,13 +38,18 @@
     "Enable Path Style" : "Omogoči slog poti",
     "WebDAV" : "WebDAV",
     "URL" : "Naslov URL",
+    "Remote subfolder" : "Oddaljena podrejena mapa",
     "Secure https://" : "Varni način https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Gostitelj",
     "Secure ftps://" : "Varni način ftps://",
     "Local" : "Krajevno",
     "Location" : "Mesto",
     "ownCloud" : "ownCloud",
     "Root" : "Koren",
+    "Share" : "Souporaba",
+    "Username as share" : "Uporabniško ime za souporabo",
+    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
     "<b>Note:</b> " : "<b>Opomba:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js
index a9a0daf8af2..61262e8c8b1 100644
--- a/apps/files_external/l10n/sq.js
+++ b/apps/files_external/l10n/sq.js
@@ -1,17 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "Përdoruesi",
-    "Host" : "Pritësi",
-    "Share" : "Ndaj",
     "Personal" : "Personale",
     "Saved" : "U ruajt",
     "None" : "Asgjë",
+    "Username" : "Përdoruesi",
     "Password" : "fjalëkalim",
     "Port" : "Porta",
     "WebDAV" : "WebDAV",
     "URL" : "URL-i",
+    "Host" : "Pritësi",
     "Location" : "Vendndodhja",
+    "Share" : "Ndaj",
     "Name" : "Emri",
     "Folder name" : "Emri i Skedarit",
     "Delete" : "Elimino"
diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json
index bf308bca3f7..20ebd508480 100644
--- a/apps/files_external/l10n/sq.json
+++ b/apps/files_external/l10n/sq.json
@@ -1,15 +1,15 @@
 { "translations": {
-    "Username" : "Përdoruesi",
-    "Host" : "Pritësi",
-    "Share" : "Ndaj",
     "Personal" : "Personale",
     "Saved" : "U ruajt",
     "None" : "Asgjë",
+    "Username" : "Përdoruesi",
     "Password" : "fjalëkalim",
     "Port" : "Porta",
     "WebDAV" : "WebDAV",
     "URL" : "URL-i",
+    "Host" : "Pritësi",
     "Location" : "Vendndodhja",
+    "Share" : "Ndaj",
     "Name" : "Emri",
     "Folder name" : "Emri i Skedarit",
     "Delete" : "Elimino"
diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js
index e0fea10c9a1..ddc5878f1f5 100644
--- a/apps/files_external/l10n/sr.js
+++ b/apps/files_external/l10n/sr.js
@@ -4,23 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Корак 1 није успео. Изузетак: %s",
     "Step 2 failed. Exception: %s" : "Корак 2 није успео. Изузетак: %s",
     "External storage" : "Спољашње складиште",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Корисничко име",
-    "Bucket" : "Канта",
-    "Region (optional for OpenStack Object Storage)" : "Регион (није обавезно за OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (потребан за Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (потребно за OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Лозинка (потребна за OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Име сервиса (потребно за OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Адреса идентитета крајње тачке (потребно за OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Време истека ХТТП захтева у секундама",
-    "SMB / CIFS using OC login" : "СМБ/ЦИФС користећи оунКлауд пријаву",
-    "Host" : "Домаћин",
-    "Username as share" : "Корисничко име као дељење",
-    "Share" : "Дели",
-    "Remote subfolder" : "Удаљена потфасцикла",
-    "SFTP with secret key login" : "СФТП са пријавом помоћу тајног кључа",
-    "Public key" : "Јавни кључ",
     "Storage with id \"%i\" not found" : "Складиште са идентификацијом \"%i\" није пронађено",
     "Invalid mount point" : "Неисправна тачка монтирања",
     "Invalid storage backend \"%s\"" : "Неисправна позадина складишта „%s“",
@@ -28,6 +11,8 @@ OC.L10N.register(
     "System" : "Систем",
     "Grant access" : "Одобри приступ",
     "Access granted" : "Приступ одобрен",
+    "Generate keys" : "Генериши кључеве",
+    "Error generating key pair" : "Грешка при генерисању пара кључева",
     "Enable encryption" : "Укључи шифровање",
     "Enable previews" : "Укључи прегледе",
     "Check for changes" : "Провери измене",
@@ -37,15 +22,17 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.",
     "(group)" : "(група)",
     "Saved" : "Сачувано",
-    "Generate keys" : "Генериши кључеве",
-    "Error generating key pair" : "Грешка при генерисању пара кључева",
     "None" : "Ништа",
     "App key" : "Кључ апликације",
     "App secret" : "Тајна апликације",
     "Client ID" : "ИД клијента",
     "Client secret" : "Тајна клијента",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
+    "API key" : "API кључ",
+    "Public key" : "Јавни кључ",
     "Amazon S3" : "Амазон С3",
+    "Bucket" : "Канта",
     "Hostname" : "Име домаћина",
     "Port" : "Порт",
     "Region" : "Регија",
@@ -53,12 +40,17 @@ OC.L10N.register(
     "Enable Path Style" : "Омогући стил путање",
     "WebDAV" : "ВебДАВ",
     "URL" : "УРЛ",
+    "Remote subfolder" : "Удаљена потфасцикла",
     "Secure https://" : "Сигурни https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Домаћин",
     "Secure ftps://" : "Сигурни ftps://",
     "Local" : "локална",
     "Location" : "Локација",
     "ownCloud" : "оунКлауд",
+    "Share" : "Дели",
+    "Username as share" : "Корисничко име као дељење",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Напомена:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> cURL подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> ФТП подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json
index a0d3e6991aa..bc7dc4de21a 100644
--- a/apps/files_external/l10n/sr.json
+++ b/apps/files_external/l10n/sr.json
@@ -2,23 +2,6 @@
     "Step 1 failed. Exception: %s" : "Корак 1 није успео. Изузетак: %s",
     "Step 2 failed. Exception: %s" : "Корак 2 није успео. Изузетак: %s",
     "External storage" : "Спољашње складиште",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Корисничко име",
-    "Bucket" : "Канта",
-    "Region (optional for OpenStack Object Storage)" : "Регион (није обавезно за OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (потребан за Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (потребно за OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Лозинка (потребна за OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Име сервиса (потребно за OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Адреса идентитета крајње тачке (потребно за OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Време истека ХТТП захтева у секундама",
-    "SMB / CIFS using OC login" : "СМБ/ЦИФС користећи оунКлауд пријаву",
-    "Host" : "Домаћин",
-    "Username as share" : "Корисничко име као дељење",
-    "Share" : "Дели",
-    "Remote subfolder" : "Удаљена потфасцикла",
-    "SFTP with secret key login" : "СФТП са пријавом помоћу тајног кључа",
-    "Public key" : "Јавни кључ",
     "Storage with id \"%i\" not found" : "Складиште са идентификацијом \"%i\" није пронађено",
     "Invalid mount point" : "Неисправна тачка монтирања",
     "Invalid storage backend \"%s\"" : "Неисправна позадина складишта „%s“",
@@ -26,6 +9,8 @@
     "System" : "Систем",
     "Grant access" : "Одобри приступ",
     "Access granted" : "Приступ одобрен",
+    "Generate keys" : "Генериши кључеве",
+    "Error generating key pair" : "Грешка при генерисању пара кључева",
     "Enable encryption" : "Укључи шифровање",
     "Enable previews" : "Укључи прегледе",
     "Check for changes" : "Провери измене",
@@ -35,15 +20,17 @@
     "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.",
     "(group)" : "(група)",
     "Saved" : "Сачувано",
-    "Generate keys" : "Генериши кључеве",
-    "Error generating key pair" : "Грешка при генерисању пара кључева",
     "None" : "Ништа",
     "App key" : "Кључ апликације",
     "App secret" : "Тајна апликације",
     "Client ID" : "ИД клијента",
     "Client secret" : "Тајна клијента",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
+    "API key" : "API кључ",
+    "Public key" : "Јавни кључ",
     "Amazon S3" : "Амазон С3",
+    "Bucket" : "Канта",
     "Hostname" : "Име домаћина",
     "Port" : "Порт",
     "Region" : "Регија",
@@ -51,12 +38,17 @@
     "Enable Path Style" : "Омогући стил путање",
     "WebDAV" : "ВебДАВ",
     "URL" : "УРЛ",
+    "Remote subfolder" : "Удаљена потфасцикла",
     "Secure https://" : "Сигурни https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Домаћин",
     "Secure ftps://" : "Сигурни ftps://",
     "Local" : "локална",
     "Location" : "Локација",
     "ownCloud" : "оунКлауд",
+    "Share" : "Дели",
+    "Username as share" : "Корисничко име као дељење",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Напомена:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> cURL подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> ФТП подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
diff --git a/apps/files_external/l10n/sr@latin.js b/apps/files_external/l10n/sr@latin.js
index afd68779a6f..64301b4a026 100644
--- a/apps/files_external/l10n/sr@latin.js
+++ b/apps/files_external/l10n/sr@latin.js
@@ -4,21 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspeo. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspeo. Izuzetak: %s",
     "External storage" : "Spoljašnje skladište",
-    "OpenStack Object Storage" : "OpenStack skladište objekata",
-    "Username" : "Korisničko ime",
-    "Bucket" : "Korpa",
-    "Region (optional for OpenStack Object Storage)" : "Region (opciono za OpenStack skladište objekata)",
-    "API Key (required for Rackspace Cloud Files)" : "API ključ (neophodno za Rackspace datoteke u oblaku)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime stanara (neophodno za OpenStack skladište objekata)",
-    "Password (required for OpenStack Object Storage)" : "Lozinka (neophodno za OpenStack skladište objekata)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime Servisa (neophodno za OpenStack skladište objekata)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje tačke identiteta (neophodno za OpenStack skladište objekata)",
-    "Timeout of HTTP requests in seconds" : "Ograničenje vremena veze HTTP zahteva u sekundama",
-    "SMB / CIFS using OC login" : "SMB / CIFS koji koristi OC prijavljivanje",
-    "Host" : "Računar",
-    "Username as share" : "Korisničko ime i deljeni direktorijum",
-    "Share" : "Podeli",
-    "Remote subfolder" : "Udaljeni poddirektorijum",
     "Personal" : "Lično",
     "System" : "Sistemsko",
     "Grant access" : "Dozvoli pristup",
@@ -30,8 +15,10 @@ OC.L10N.register(
     "App secret" : "Tajna lozinka Aplikacije",
     "Client ID" : "Identifikator klijenta",
     "Client secret" : "Tajna lozinka klijenta",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Korpa",
     "Hostname" : "Ime računara",
     "Port" : "Port",
     "Region" : "Regija",
@@ -39,11 +26,16 @@ OC.L10N.register(
     "Enable Path Style" : "Omogući stil putanje",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Udaljeni poddirektorijum",
     "Secure https://" : "Sigurni https://",
+    "Host" : "Računar",
     "Secure ftps://" : "Sigurni ftps://",
     "Local" : "Lokalno",
     "Location" : "Lokacija",
     "Root" : "Koren",
+    "Share" : "Podeli",
+    "Username as share" : "Korisničko ime i deljeni direktorijum",
+    "OpenStack Object Storage" : "OpenStack skladište objekata",
     "<b>Note:</b> " : "<b>Obratite pažnju:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju</b> Podrška za cURL u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da se obratite Vašem sistem administratoru da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju:</b> FTP podrška u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da tražite od Vašeg sistem administratora da je instalira.",
diff --git a/apps/files_external/l10n/sr@latin.json b/apps/files_external/l10n/sr@latin.json
index 3bdf78e041a..72fc20844bd 100644
--- a/apps/files_external/l10n/sr@latin.json
+++ b/apps/files_external/l10n/sr@latin.json
@@ -2,21 +2,6 @@
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspeo. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspeo. Izuzetak: %s",
     "External storage" : "Spoljašnje skladište",
-    "OpenStack Object Storage" : "OpenStack skladište objekata",
-    "Username" : "Korisničko ime",
-    "Bucket" : "Korpa",
-    "Region (optional for OpenStack Object Storage)" : "Region (opciono za OpenStack skladište objekata)",
-    "API Key (required for Rackspace Cloud Files)" : "API ključ (neophodno za Rackspace datoteke u oblaku)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime stanara (neophodno za OpenStack skladište objekata)",
-    "Password (required for OpenStack Object Storage)" : "Lozinka (neophodno za OpenStack skladište objekata)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime Servisa (neophodno za OpenStack skladište objekata)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje tačke identiteta (neophodno za OpenStack skladište objekata)",
-    "Timeout of HTTP requests in seconds" : "Ograničenje vremena veze HTTP zahteva u sekundama",
-    "SMB / CIFS using OC login" : "SMB / CIFS koji koristi OC prijavljivanje",
-    "Host" : "Računar",
-    "Username as share" : "Korisničko ime i deljeni direktorijum",
-    "Share" : "Podeli",
-    "Remote subfolder" : "Udaljeni poddirektorijum",
     "Personal" : "Lično",
     "System" : "Sistemsko",
     "Grant access" : "Dozvoli pristup",
@@ -28,8 +13,10 @@
     "App secret" : "Tajna lozinka Aplikacije",
     "Client ID" : "Identifikator klijenta",
     "Client secret" : "Tajna lozinka klijenta",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Korpa",
     "Hostname" : "Ime računara",
     "Port" : "Port",
     "Region" : "Regija",
@@ -37,11 +24,16 @@
     "Enable Path Style" : "Omogući stil putanje",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Udaljeni poddirektorijum",
     "Secure https://" : "Sigurni https://",
+    "Host" : "Računar",
     "Secure ftps://" : "Sigurni ftps://",
     "Local" : "Lokalno",
     "Location" : "Lokacija",
     "Root" : "Koren",
+    "Share" : "Podeli",
+    "Username as share" : "Korisničko ime i deljeni direktorijum",
+    "OpenStack Object Storage" : "OpenStack skladište objekata",
     "<b>Note:</b> " : "<b>Obratite pažnju:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju</b> Podrška za cURL u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da se obratite Vašem sistem administratoru da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju:</b> FTP podrška u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da tražite od Vašeg sistem administratora da je instalira.",
diff --git a/apps/files_external/l10n/sv.js b/apps/files_external/l10n/sv.js
index ac7439ea081..08175a56562 100644
--- a/apps/files_external/l10n/sv.js
+++ b/apps/files_external/l10n/sv.js
@@ -4,22 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Steg 1 flaerade. Undantag: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 falerade. Undantag: %s",
     "External storage" : "Extern lagring",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Användarnamn",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (valfritt för OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nyckel (krävs för Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (krävs för OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Lösenord (krävs för OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjänstens namn (krävs för OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL för identitetens slutpunkt (krävs för OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout för HTTP-anrop i sekunder",
-    "SMB / CIFS using OC login" : "SMB / CIFS använder OC inloggning",
-    "Host" : "Server",
-    "Username as share" : "Användarnamn till utdelning",
-    "Share" : "Dela",
-    "Remote subfolder" : "Fjärrmapp",
-    "Public key" : "Publik nyckel",
     "Personal" : "Personligt",
     "System" : "System",
     "Grant access" : "Bevilja åtkomst",
@@ -32,8 +16,12 @@ OC.L10N.register(
     "App secret" : "App-hemlighet",
     "Client ID" : "Klient ID",
     "Client secret" : "klient secret",
+    "Username" : "Användarnamn",
     "Password" : "Lösenord",
+    "API key" : "API-nyckel",
+    "Public key" : "Publik nyckel",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Värdnamn",
     "Port" : "Port",
     "Region" : "Län",
@@ -41,13 +29,18 @@ OC.L10N.register(
     "Enable Path Style" : "Aktivera Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Fjärrmapp",
     "Secure https://" : "Säker https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Server",
     "Secure ftps://" : "Säker ftps://",
     "Local" : "Lokal",
     "Location" : "Plats",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Dela",
+    "Username as share" : "Användarnamn till utdelning",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b> OBS: </ b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> cURL-stöd i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> FTP-stödet i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
diff --git a/apps/files_external/l10n/sv.json b/apps/files_external/l10n/sv.json
index 75d33f5861a..c44ad337ab3 100644
--- a/apps/files_external/l10n/sv.json
+++ b/apps/files_external/l10n/sv.json
@@ -2,22 +2,6 @@
     "Step 1 failed. Exception: %s" : "Steg 1 flaerade. Undantag: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 falerade. Undantag: %s",
     "External storage" : "Extern lagring",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Användarnamn",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Region (valfritt för OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nyckel (krävs för Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (krävs för OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Lösenord (krävs för OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjänstens namn (krävs för OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL för identitetens slutpunkt (krävs för OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout för HTTP-anrop i sekunder",
-    "SMB / CIFS using OC login" : "SMB / CIFS använder OC inloggning",
-    "Host" : "Server",
-    "Username as share" : "Användarnamn till utdelning",
-    "Share" : "Dela",
-    "Remote subfolder" : "Fjärrmapp",
-    "Public key" : "Publik nyckel",
     "Personal" : "Personligt",
     "System" : "System",
     "Grant access" : "Bevilja åtkomst",
@@ -30,8 +14,12 @@
     "App secret" : "App-hemlighet",
     "Client ID" : "Klient ID",
     "Client secret" : "klient secret",
+    "Username" : "Användarnamn",
     "Password" : "Lösenord",
+    "API key" : "API-nyckel",
+    "Public key" : "Publik nyckel",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Värdnamn",
     "Port" : "Port",
     "Region" : "Län",
@@ -39,13 +27,18 @@
     "Enable Path Style" : "Aktivera Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Fjärrmapp",
     "Secure https://" : "Säker https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Server",
     "Secure ftps://" : "Säker ftps://",
     "Local" : "Lokal",
     "Location" : "Plats",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "Share" : "Dela",
+    "Username as share" : "Användarnamn till utdelning",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b> OBS: </ b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> cURL-stöd i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> FTP-stödet i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
diff --git a/apps/files_external/l10n/ta_LK.js b/apps/files_external/l10n/ta_LK.js
index fdf2639d4d6..382d5e943a1 100644
--- a/apps/files_external/l10n/ta_LK.js
+++ b/apps/files_external/l10n/ta_LK.js
@@ -1,19 +1,19 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "பயனாளர் பெயர்",
-    "Host" : "ஓம்புனர்",
-    "Share" : "பகிர்வு",
     "Personal" : "தனிப்பட்ட",
     "Grant access" : "அனுமதியை வழங்கல்",
     "Access granted" : "அனுமதி வழங்கப்பட்டது",
     "None" : "ஒன்றுமில்லை",
+    "Username" : "பயனாளர் பெயர்",
     "Password" : "கடவுச்சொல்",
     "Port" : "துறை ",
     "Region" : "பிரதேசம்",
     "URL" : "URL",
+    "Host" : "ஓம்புனர்",
     "Location" : "இடம்",
     "ownCloud" : "OwnCloud",
+    "Share" : "பகிர்வு",
     "Name" : "பெயர்",
     "External Storage" : "வெளி சேமிப்பு",
     "Folder name" : "கோப்புறை பெயர்",
diff --git a/apps/files_external/l10n/ta_LK.json b/apps/files_external/l10n/ta_LK.json
index bd346816691..c838cbe0173 100644
--- a/apps/files_external/l10n/ta_LK.json
+++ b/apps/files_external/l10n/ta_LK.json
@@ -1,17 +1,17 @@
 { "translations": {
-    "Username" : "பயனாளர் பெயர்",
-    "Host" : "ஓம்புனர்",
-    "Share" : "பகிர்வு",
     "Personal" : "தனிப்பட்ட",
     "Grant access" : "அனுமதியை வழங்கல்",
     "Access granted" : "அனுமதி வழங்கப்பட்டது",
     "None" : "ஒன்றுமில்லை",
+    "Username" : "பயனாளர் பெயர்",
     "Password" : "கடவுச்சொல்",
     "Port" : "துறை ",
     "Region" : "பிரதேசம்",
     "URL" : "URL",
+    "Host" : "ஓம்புனர்",
     "Location" : "இடம்",
     "ownCloud" : "OwnCloud",
+    "Share" : "பகிர்வு",
     "Name" : "பெயர்",
     "External Storage" : "வெளி சேமிப்பு",
     "Folder name" : "கோப்புறை பெயர்",
diff --git a/apps/files_external/l10n/te.js b/apps/files_external/l10n/te.js
index b5f887f08f6..155676d9a8f 100644
--- a/apps/files_external/l10n/te.js
+++ b/apps/files_external/l10n/te.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "వాడుకరి పేరు",
     "Personal" : "వ్యక్తిగతం",
+    "Username" : "వాడుకరి పేరు",
     "Password" : "సంకేతపదం",
     "Name" : "పేరు",
     "Folder name" : "సంచయం పేరు",
diff --git a/apps/files_external/l10n/te.json b/apps/files_external/l10n/te.json
index b0db38ef4c5..5a55f60376a 100644
--- a/apps/files_external/l10n/te.json
+++ b/apps/files_external/l10n/te.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Username" : "వాడుకరి పేరు",
     "Personal" : "వ్యక్తిగతం",
+    "Username" : "వాడుకరి పేరు",
     "Password" : "సంకేతపదం",
     "Name" : "పేరు",
     "Folder name" : "సంచయం పేరు",
diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js
index 5926a806437..35e4da7b1d5 100644
--- a/apps/files_external/l10n/th_TH.js
+++ b/apps/files_external/l10n/th_TH.js
@@ -7,23 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "ขั้นตอนที่ 1 ล้มเหลว ข้อยกเว้น: %s",
     "Step 2 failed. Exception: %s" : "ขั้นตอนที่ 2 ล้มเหลว ข้อยกเว้น: %s",
     "External storage" : "จัดเก็บข้อมูลภายนอก",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "ชื่อผู้ใช้งาน",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "ภูมิภาค (จำเป็นสำหรับ OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (จำเป็นสำหรับ Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "ชื่อผู้เช่า (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "รหัสผ่าน (ที่จำเป็นสำหรับ OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "ชื่อบริการ (จำเป็นสำหรับ OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "ตัวตนของ URL ปลายทาง (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "หมดเวลาของการร้องขอ HTTP ในไม่กี่วินาที",
-    "SMB / CIFS using OC login" : "SMB/CIFS กำลังใช้ OC เข้าสู่ระบบ",
-    "Host" : "โฮสต์",
-    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
-    "Share" : "แชร์",
-    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
-    "SFTP with secret key login" : "SFTP กับคีย์ลับสำหรับเข้าสู่ระบบ",
-    "Public key" : "คีย์สาธารณะ",
     "Storage with id \"%i\" not found" : "ไม่พบจัดการเก็บข้อมูลของ ID \"%i\"",
     "Invalid backend or authentication mechanism class" : "แบ็กเอนด์ไม่ถูกต้องหรือระดับการรับรองความถูกต้องไม่เพียงพอ",
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
@@ -31,13 +14,14 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "การจัดเก็บข้อมูลแบ็กเอนด์ไม่ถูกต้อง \"%s\"",
     "Unsatisfied backend parameters" : "พารามิเตอร์แบ็กเอนด์ไม่ได้รับอนุญาต",
     "Unsatisfied authentication mechanism parameters" : "การรับรองความถูกต้องไม่เพียงพอ",
-    "Admin-only storage backend \"%s\"" : "จัดเก็บแบ็กเอนด์ของผู้ดูแลระบบเท่านั้น \"%s\"",
     "Personal" : "ส่วนตัว",
     "System" : "ระบบ",
     "Grant access" : "อนุญาตให้เข้าถึงได้",
     "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
     "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1",
     "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2",
+    "Generate keys" : "สร้างคีย์",
+    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "Enable previews" : "เปิดใช้งานการแสดงตัวอย่าง",
     "Check for changes" : "ตรวจสอบการเปลี่ยนแปลง",
@@ -47,8 +31,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "ผู้ใช้ทุกคน พิมพ์เพื่อเลือกผู้ใช้หรือกลุ่ม",
     "(group)" : "(กลุ่ม)",
     "Saved" : "บันทึกแล้ว",
-    "Generate keys" : "สร้างคีย์",
-    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
     "Access key" : "คีย์การเข้าถึง",
     "Secret key" : "คีย์ลับ",
     "Builtin" : "ในตัว",
@@ -59,10 +41,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
-    "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
+    "Username" : "ชื่อผู้ใช้งาน",
     "Password" : "รหัสผ่าน",
+    "API key" : "รหัส API",
+    "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
     "Session credentials" : "ข้อมูลของเซสชั่น",
+    "Public key" : "คีย์สาธารณะ",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "ชื่อโฮสต์",
     "Port" : "พอร์ต",
     "Region" : "พื้นที่",
@@ -70,9 +56,11 @@ OC.L10N.register(
     "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
     "Secure https://" : "โหมดปลอดภัย https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "โฮสต์",
     "Secure ftps://" : "โหมดปลอดภัย ftps://",
     "Google Drive" : "กูเกิ้ลไดร์ฟ",
     "Local" : "ต้นทาง",
@@ -81,6 +69,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "รูท",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "แชร์",
+    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>หมายเหตุ:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน FTP ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json
index c927a5980b9..d9d3661a2ae 100644
--- a/apps/files_external/l10n/th_TH.json
+++ b/apps/files_external/l10n/th_TH.json
@@ -5,23 +5,6 @@
     "Step 1 failed. Exception: %s" : "ขั้นตอนที่ 1 ล้มเหลว ข้อยกเว้น: %s",
     "Step 2 failed. Exception: %s" : "ขั้นตอนที่ 2 ล้มเหลว ข้อยกเว้น: %s",
     "External storage" : "จัดเก็บข้อมูลภายนอก",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "ชื่อผู้ใช้งาน",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "ภูมิภาค (จำเป็นสำหรับ OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (จำเป็นสำหรับ Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "ชื่อผู้เช่า (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "รหัสผ่าน (ที่จำเป็นสำหรับ OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "ชื่อบริการ (จำเป็นสำหรับ OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "ตัวตนของ URL ปลายทาง (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "หมดเวลาของการร้องขอ HTTP ในไม่กี่วินาที",
-    "SMB / CIFS using OC login" : "SMB/CIFS กำลังใช้ OC เข้าสู่ระบบ",
-    "Host" : "โฮสต์",
-    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
-    "Share" : "แชร์",
-    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
-    "SFTP with secret key login" : "SFTP กับคีย์ลับสำหรับเข้าสู่ระบบ",
-    "Public key" : "คีย์สาธารณะ",
     "Storage with id \"%i\" not found" : "ไม่พบจัดการเก็บข้อมูลของ ID \"%i\"",
     "Invalid backend or authentication mechanism class" : "แบ็กเอนด์ไม่ถูกต้องหรือระดับการรับรองความถูกต้องไม่เพียงพอ",
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
@@ -29,13 +12,14 @@
     "Invalid storage backend \"%s\"" : "การจัดเก็บข้อมูลแบ็กเอนด์ไม่ถูกต้อง \"%s\"",
     "Unsatisfied backend parameters" : "พารามิเตอร์แบ็กเอนด์ไม่ได้รับอนุญาต",
     "Unsatisfied authentication mechanism parameters" : "การรับรองความถูกต้องไม่เพียงพอ",
-    "Admin-only storage backend \"%s\"" : "จัดเก็บแบ็กเอนด์ของผู้ดูแลระบบเท่านั้น \"%s\"",
     "Personal" : "ส่วนตัว",
     "System" : "ระบบ",
     "Grant access" : "อนุญาตให้เข้าถึงได้",
     "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
     "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1",
     "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2",
+    "Generate keys" : "สร้างคีย์",
+    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "Enable previews" : "เปิดใช้งานการแสดงตัวอย่าง",
     "Check for changes" : "ตรวจสอบการเปลี่ยนแปลง",
@@ -45,8 +29,6 @@
     "All users. Type to select user or group." : "ผู้ใช้ทุกคน พิมพ์เพื่อเลือกผู้ใช้หรือกลุ่ม",
     "(group)" : "(กลุ่ม)",
     "Saved" : "บันทึกแล้ว",
-    "Generate keys" : "สร้างคีย์",
-    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
     "Access key" : "คีย์การเข้าถึง",
     "Secret key" : "คีย์ลับ",
     "Builtin" : "ในตัว",
@@ -57,10 +39,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
-    "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
+    "Username" : "ชื่อผู้ใช้งาน",
     "Password" : "รหัสผ่าน",
+    "API key" : "รหัส API",
+    "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
     "Session credentials" : "ข้อมูลของเซสชั่น",
+    "Public key" : "คีย์สาธารณะ",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "ชื่อโฮสต์",
     "Port" : "พอร์ต",
     "Region" : "พื้นที่",
@@ -68,9 +54,11 @@
     "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
     "Secure https://" : "โหมดปลอดภัย https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "โฮสต์",
     "Secure ftps://" : "โหมดปลอดภัย ftps://",
     "Google Drive" : "กูเกิ้ลไดร์ฟ",
     "Local" : "ต้นทาง",
@@ -79,6 +67,9 @@
     "SFTP" : "SFTP",
     "Root" : "รูท",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "แชร์",
+    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>หมายเหตุ:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน FTP ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js
index 68e69034857..652bc611866 100644
--- a/apps/files_external/l10n/tr.js
+++ b/apps/files_external/l10n/tr.js
@@ -7,23 +7,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
     "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
     "External storage" : "Harici depolama",
-    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
-    "Username" : "Kullanıcı Adı",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)",
-    "API Key (required for Rackspace Cloud Files)" : "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)",
-    "Password (required for OpenStack Object Storage)" : "Parola (OpenStack Nesne Depolaması için gerekli)",
-    "Service Name (required for OpenStack Object Storage)" : "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)",
-    "Timeout of HTTP requests in seconds" : "Saniye cinsinden HTTP istek zaman aşımı",
-    "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
-    "Host" : "Sunucu",
-    "Username as share" : "Paylaşım olarak kullanıcı adı",
-    "Share" : "Paylaş",
-    "Remote subfolder" : "Uzak alt klasör",
-    "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
-    "Public key" : "Ortak anahtar",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
     "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
@@ -31,13 +14,14 @@ OC.L10N.register(
     "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"",
     "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri",
     "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri",
-    "Admin-only storage backend \"%s\"" : "Sadece yönetici erişimli depolama arkaucu \"%s\"",
     "Personal" : "Kişisel",
     "System" : "Sistem",
     "Grant access" : "Erişimi sağla",
     "Access granted" : "Giriş kabul edildi",
     "Error configuring OAuth1" : "OAuth1 yapılandırma hatası",
     "Error configuring OAuth2" : "OAuth2 yapılandırma hatası",
+    "Generate keys" : "Anahtarlar üret",
+    "Error generating key pair" : "Anahtar çifti üretirken hata",
     "Enable encryption" : "Şifrelemeyi aç",
     "Enable previews" : "Önizlemeleri aç",
     "Check for changes" : "Değişiklikleri denetle",
@@ -47,8 +31,6 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tüm kullanıcılar. Kullanıcı veya grup seçmek için yazın.",
     "(group)" : "(grup)",
     "Saved" : "Kaydedildi",
-    "Generate keys" : "Anahtarlar üret",
-    "Error generating key pair" : "Anahtar çifti üretirken hata",
     "Access key" : "Erişim anahtarı",
     "Secret key" : "Gizli anahtar",
     "Builtin" : "Yerleşik",
@@ -59,10 +41,14 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "İstemci kimliği",
     "Client secret" : "İstemci parolası",
-    "Username and password" : "Kullanıcı adı ve parola",
+    "Username" : "Kullanıcı Adı",
     "Password" : "Parola",
+    "API key" : "API anahtarı",
+    "Username and password" : "Kullanıcı adı ve parola",
     "Session credentials" : "Oturum bilgileri",
+    "Public key" : "Ortak anahtar",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Makine adı",
     "Port" : "Port",
     "Region" : "Bölge",
@@ -70,9 +56,11 @@ OC.L10N.register(
     "Enable Path Style" : "Yol Biçemini Etkinleştir",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Uzak alt klasör",
     "Secure https://" : "Güvenli https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Sunucu",
     "Secure ftps://" : "Güvenli ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Yerel",
@@ -81,6 +69,9 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "Root" : "Kök",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Paylaş",
+    "Username as share" : "Paylaşım olarak kullanıcı adı",
+    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
     "<b>Note:</b> " : "<b>Not:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json
index 7859e8e08dc..328ecab466f 100644
--- a/apps/files_external/l10n/tr.json
+++ b/apps/files_external/l10n/tr.json
@@ -5,23 +5,6 @@
     "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
     "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
     "External storage" : "Harici depolama",
-    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
-    "Username" : "Kullanıcı Adı",
-    "Bucket" : "Bucket",
-    "Region (optional for OpenStack Object Storage)" : "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)",
-    "API Key (required for Rackspace Cloud Files)" : "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)",
-    "Password (required for OpenStack Object Storage)" : "Parola (OpenStack Nesne Depolaması için gerekli)",
-    "Service Name (required for OpenStack Object Storage)" : "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)",
-    "Timeout of HTTP requests in seconds" : "Saniye cinsinden HTTP istek zaman aşımı",
-    "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
-    "Host" : "Sunucu",
-    "Username as share" : "Paylaşım olarak kullanıcı adı",
-    "Share" : "Paylaş",
-    "Remote subfolder" : "Uzak alt klasör",
-    "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
-    "Public key" : "Ortak anahtar",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
     "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
@@ -29,13 +12,14 @@
     "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"",
     "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri",
     "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri",
-    "Admin-only storage backend \"%s\"" : "Sadece yönetici erişimli depolama arkaucu \"%s\"",
     "Personal" : "Kişisel",
     "System" : "Sistem",
     "Grant access" : "Erişimi sağla",
     "Access granted" : "Giriş kabul edildi",
     "Error configuring OAuth1" : "OAuth1 yapılandırma hatası",
     "Error configuring OAuth2" : "OAuth2 yapılandırma hatası",
+    "Generate keys" : "Anahtarlar üret",
+    "Error generating key pair" : "Anahtar çifti üretirken hata",
     "Enable encryption" : "Şifrelemeyi aç",
     "Enable previews" : "Önizlemeleri aç",
     "Check for changes" : "Değişiklikleri denetle",
@@ -45,8 +29,6 @@
     "All users. Type to select user or group." : "Tüm kullanıcılar. Kullanıcı veya grup seçmek için yazın.",
     "(group)" : "(grup)",
     "Saved" : "Kaydedildi",
-    "Generate keys" : "Anahtarlar üret",
-    "Error generating key pair" : "Anahtar çifti üretirken hata",
     "Access key" : "Erişim anahtarı",
     "Secret key" : "Gizli anahtar",
     "Builtin" : "Yerleşik",
@@ -57,10 +39,14 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "İstemci kimliği",
     "Client secret" : "İstemci parolası",
-    "Username and password" : "Kullanıcı adı ve parola",
+    "Username" : "Kullanıcı Adı",
     "Password" : "Parola",
+    "API key" : "API anahtarı",
+    "Username and password" : "Kullanıcı adı ve parola",
     "Session credentials" : "Oturum bilgileri",
+    "Public key" : "Ortak anahtar",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
     "Hostname" : "Makine adı",
     "Port" : "Port",
     "Region" : "Bölge",
@@ -68,9 +54,11 @@
     "Enable Path Style" : "Yol Biçemini Etkinleştir",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Uzak alt klasör",
     "Secure https://" : "Güvenli https://",
     "Dropbox" : "Dropbox",
     "FTP" : "FTP",
+    "Host" : "Sunucu",
     "Secure ftps://" : "Güvenli ftps://",
     "Google Drive" : "Google Drive",
     "Local" : "Yerel",
@@ -79,6 +67,9 @@
     "SFTP" : "SFTP",
     "Root" : "Kök",
     "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Paylaş",
+    "Username as share" : "Paylaşım olarak kullanıcı adı",
+    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
     "<b>Note:</b> " : "<b>Not:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
diff --git a/apps/files_external/l10n/ug.js b/apps/files_external/l10n/ug.js
index 5f3babc62b7..37adb851973 100644
--- a/apps/files_external/l10n/ug.js
+++ b/apps/files_external/l10n/ug.js
@@ -2,17 +2,17 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "سىرتقى ساقلىغۇچ",
-    "Username" : "ئىشلەتكۈچى ئاتى",
-    "Host" : "باش ئاپپارات",
-    "Share" : "ھەمبەھىر",
     "Personal" : "شەخسىي",
     "None" : "يوق",
+    "Username" : "ئىشلەتكۈچى ئاتى",
     "Password" : "ئىم",
     "Port" : "ئېغىز",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "باش ئاپپارات",
     "Location" : "ئورنى",
     "ownCloud" : "ownCloud",
+    "Share" : "ھەمبەھىر",
     "Name" : "ئاتى",
     "Folder name" : "قىسقۇچ ئاتى",
     "Configuration" : "سەپلىمە",
diff --git a/apps/files_external/l10n/ug.json b/apps/files_external/l10n/ug.json
index 129e146763c..f7a072bfe38 100644
--- a/apps/files_external/l10n/ug.json
+++ b/apps/files_external/l10n/ug.json
@@ -1,16 +1,16 @@
 { "translations": {
     "External storage" : "سىرتقى ساقلىغۇچ",
-    "Username" : "ئىشلەتكۈچى ئاتى",
-    "Host" : "باش ئاپپارات",
-    "Share" : "ھەمبەھىر",
     "Personal" : "شەخسىي",
     "None" : "يوق",
+    "Username" : "ئىشلەتكۈچى ئاتى",
     "Password" : "ئىم",
     "Port" : "ئېغىز",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "باش ئاپپارات",
     "Location" : "ئورنى",
     "ownCloud" : "ownCloud",
+    "Share" : "ھەمبەھىر",
     "Name" : "ئاتى",
     "Folder name" : "قىسقۇچ ئاتى",
     "Configuration" : "سەپلىمە",
diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js
index 2ed42a012db..024d4fcf982 100644
--- a/apps/files_external/l10n/uk.js
+++ b/apps/files_external/l10n/uk.js
@@ -4,22 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "1-й крок невдалий. Виключення: %s",
     "Step 2 failed. Exception: %s" : "2-й крок невдалий. Виключення: %s",
     "External storage" : "Зовнішнє сховище",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Ім'я користувача",
-    "Bucket" : "Кошик",
-    "Region (optional for OpenStack Object Storage)" : "Регіон (опціонально для OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обов'язково для Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ім'я орендатора (обов'язково для OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Пароль (обов’язково для OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Назва сервісу (обов’язково для OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL підтвердження кінцевої точки (обов'язково для OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP запитів на секунду",
-    "SMB / CIFS using OC login" : "SMB / CIFS з використанням логіна OC",
-    "Host" : "Хост",
-    "Username as share" : "Ім'я для відкритого доступу",
-    "Share" : "Поділитися",
-    "Remote subfolder" : "Віддалений підкаталог",
-    "Public key" : "Відкритий ключ",
     "Storage with id \"%i\" not found" : "Сховище з id \"%i\" не знайдено",
     "Invalid mount point" : "Невірна точка монтування",
     "Invalid storage backend \"%s\"" : "Невірне сховище \"%s\"",
@@ -27,19 +11,23 @@ OC.L10N.register(
     "System" : "Система",
     "Grant access" : "Дозволити доступ",
     "Access granted" : "Доступ дозволено",
+    "Generate keys" : "Створити ключі",
+    "Error generating key pair" : "Помилка створення ключової пари",
     "Enable encryption" : "Увімкнути шифрування",
     "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
     "(group)" : "(група)",
     "Saved" : "Збережено",
-    "Generate keys" : "Створити ключі",
-    "Error generating key pair" : "Помилка створення ключової пари",
     "None" : "Жоден",
     "App key" : "Ключ додатку",
     "App secret" : "Секретний ключ додатку",
     "Client ID" : "Ідентифікатор клієнта",
     "Client secret" : "Ключ клієнта",
+    "Username" : "Ім'я користувача",
     "Password" : "Пароль",
+    "API key" : "ключ API",
+    "Public key" : "Відкритий ключ",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Кошик",
     "Hostname" : "Ім'я хоста",
     "Port" : "Порт",
     "Region" : "Регіон",
@@ -47,13 +35,18 @@ OC.L10N.register(
     "Enable Path Style" : "Включити стиль шляху",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Віддалений підкаталог",
     "Secure https://" : "Захищений https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Хост",
     "Secure ftps://" : "Захищений ftps://",
     "Local" : "Локально",
     "Location" : "Місце",
     "ownCloud" : "ownCloud",
     "Root" : "Батьківський каталог",
+    "Share" : "Поділитися",
+    "Username as share" : "Ім'я для відкритого доступу",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Примітка:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
diff --git a/apps/files_external/l10n/uk.json b/apps/files_external/l10n/uk.json
index 6024c5b02d5..fe5c43a8f39 100644
--- a/apps/files_external/l10n/uk.json
+++ b/apps/files_external/l10n/uk.json
@@ -2,22 +2,6 @@
     "Step 1 failed. Exception: %s" : "1-й крок невдалий. Виключення: %s",
     "Step 2 failed. Exception: %s" : "2-й крок невдалий. Виключення: %s",
     "External storage" : "Зовнішнє сховище",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Username" : "Ім'я користувача",
-    "Bucket" : "Кошик",
-    "Region (optional for OpenStack Object Storage)" : "Регіон (опціонально для OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обов'язково для Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ім'я орендатора (обов'язково для OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Пароль (обов’язково для OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Назва сервісу (обов’язково для OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL підтвердження кінцевої точки (обов'язково для OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP запитів на секунду",
-    "SMB / CIFS using OC login" : "SMB / CIFS з використанням логіна OC",
-    "Host" : "Хост",
-    "Username as share" : "Ім'я для відкритого доступу",
-    "Share" : "Поділитися",
-    "Remote subfolder" : "Віддалений підкаталог",
-    "Public key" : "Відкритий ключ",
     "Storage with id \"%i\" not found" : "Сховище з id \"%i\" не знайдено",
     "Invalid mount point" : "Невірна точка монтування",
     "Invalid storage backend \"%s\"" : "Невірне сховище \"%s\"",
@@ -25,19 +9,23 @@
     "System" : "Система",
     "Grant access" : "Дозволити доступ",
     "Access granted" : "Доступ дозволено",
+    "Generate keys" : "Створити ключі",
+    "Error generating key pair" : "Помилка створення ключової пари",
     "Enable encryption" : "Увімкнути шифрування",
     "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
     "(group)" : "(група)",
     "Saved" : "Збережено",
-    "Generate keys" : "Створити ключі",
-    "Error generating key pair" : "Помилка створення ключової пари",
     "None" : "Жоден",
     "App key" : "Ключ додатку",
     "App secret" : "Секретний ключ додатку",
     "Client ID" : "Ідентифікатор клієнта",
     "Client secret" : "Ключ клієнта",
+    "Username" : "Ім'я користувача",
     "Password" : "Пароль",
+    "API key" : "ключ API",
+    "Public key" : "Відкритий ключ",
     "Amazon S3" : "Amazon S3",
+    "Bucket" : "Кошик",
     "Hostname" : "Ім'я хоста",
     "Port" : "Порт",
     "Region" : "Регіон",
@@ -45,13 +33,18 @@
     "Enable Path Style" : "Включити стиль шляху",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Віддалений підкаталог",
     "Secure https://" : "Захищений https://",
     "Dropbox" : "Dropbox",
+    "Host" : "Хост",
     "Secure ftps://" : "Захищений ftps://",
     "Local" : "Локально",
     "Location" : "Місце",
     "ownCloud" : "ownCloud",
     "Root" : "Батьківський каталог",
+    "Share" : "Поділитися",
+    "Username as share" : "Ім'я для відкритого доступу",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Примітка:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
diff --git a/apps/files_external/l10n/ur_PK.js b/apps/files_external/l10n/ur_PK.js
index b0571dbf198..55c8ee1f1bc 100644
--- a/apps/files_external/l10n/ur_PK.js
+++ b/apps/files_external/l10n/ur_PK.js
@@ -1,12 +1,12 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "یوزر نیم",
-    "Share" : "تقسیم",
     "Personal" : "شخصی",
+    "Username" : "یوزر نیم",
     "Password" : "پاسورڈ",
     "URL" : "یو ار ایل",
     "Location" : "مقام",
+    "Share" : "تقسیم",
     "Name" : "اسم",
     "Delete" : "حذف کریں"
 },
diff --git a/apps/files_external/l10n/ur_PK.json b/apps/files_external/l10n/ur_PK.json
index f9a4d5e26e2..e8b9c79e1f1 100644
--- a/apps/files_external/l10n/ur_PK.json
+++ b/apps/files_external/l10n/ur_PK.json
@@ -1,10 +1,10 @@
 { "translations": {
-    "Username" : "یوزر نیم",
-    "Share" : "تقسیم",
     "Personal" : "شخصی",
+    "Username" : "یوزر نیم",
     "Password" : "پاسورڈ",
     "URL" : "یو ار ایل",
     "Location" : "مقام",
+    "Share" : "تقسیم",
     "Name" : "اسم",
     "Delete" : "حذف کریں"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/vi.js b/apps/files_external/l10n/vi.js
index 6701ba4f324..49c746851eb 100644
--- a/apps/files_external/l10n/vi.js
+++ b/apps/files_external/l10n/vi.js
@@ -2,21 +2,21 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "Lưu trữ ngoài",
-    "Username" : "Tên đăng nhập",
-    "Host" : "Máy chủ",
-    "Share" : "Chia sẻ",
     "Personal" : "Cá nhân",
     "Grant access" : "Cấp quyền truy cập",
     "Access granted" : "Đã cấp quyền truy cập",
     "Saved" : "Đã lưu",
     "None" : "Không gì cả",
+    "Username" : "Tên đăng nhập",
     "Password" : "Mật khẩu",
     "Port" : "Cổng",
     "Region" : "Vùng/miền",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Máy chủ",
     "Location" : "Vị trí",
     "ownCloud" : "ownCloud",
+    "Share" : "Chia sẻ",
     "Name" : "Tên",
     "External Storage" : "Lưu trữ ngoài",
     "Folder name" : "Tên thư mục",
diff --git a/apps/files_external/l10n/vi.json b/apps/files_external/l10n/vi.json
index 6a643399297..4daddc7ae57 100644
--- a/apps/files_external/l10n/vi.json
+++ b/apps/files_external/l10n/vi.json
@@ -1,20 +1,20 @@
 { "translations": {
     "External storage" : "Lưu trữ ngoài",
-    "Username" : "Tên đăng nhập",
-    "Host" : "Máy chủ",
-    "Share" : "Chia sẻ",
     "Personal" : "Cá nhân",
     "Grant access" : "Cấp quyền truy cập",
     "Access granted" : "Đã cấp quyền truy cập",
     "Saved" : "Đã lưu",
     "None" : "Không gì cả",
+    "Username" : "Tên đăng nhập",
     "Password" : "Mật khẩu",
     "Port" : "Cổng",
     "Region" : "Vùng/miền",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "Máy chủ",
     "Location" : "Vị trí",
     "ownCloud" : "ownCloud",
+    "Share" : "Chia sẻ",
     "Name" : "Tên",
     "External Storage" : "Lưu trữ ngoài",
     "Folder name" : "Tên thư mục",
diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js
index 43941ac917c..535d945b028 100644
--- a/apps/files_external/l10n/zh_CN.js
+++ b/apps/files_external/l10n/zh_CN.js
@@ -4,12 +4,6 @@ OC.L10N.register(
     "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s",
     "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s",
     "External storage" : "外部存储",
-    "OpenStack Object Storage" : "OpenStack 对象存储",
-    "Username" : "用户名",
-    "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息",
-    "Host" : "主机",
-    "Share" : "共享",
-    "Remote subfolder" : "远程子文件夹",
     "Personal" : "个人",
     "System" : "系统",
     "Grant access" : "授权",
@@ -17,7 +11,9 @@ OC.L10N.register(
     "Enable encryption" : "启用加密",
     "Saved" : "已保存",
     "None" : "无",
+    "Username" : "用户名",
     "Password" : "密码",
+    "API key" : "API密匙",
     "Amazon S3" : "Amazon S3",
     "Port" : "端口",
     "Region" : "地区",
@@ -25,12 +21,16 @@ OC.L10N.register(
     "Enable Path Style" : "启用 Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "远程子文件夹",
     "Secure https://" : "安全 https://",
+    "Host" : "主机",
     "Secure ftps://" : "安全 ftps://",
     "Local" : "本地",
     "Location" : "地点",
     "ownCloud" : "ownCloud",
     "Root" : "根路径",
+    "Share" : "共享",
+    "OpenStack Object Storage" : "OpenStack 对象存储",
     "<b>Note:</b> " : "<b>注意：</b>",
     "Name" : "名称",
     "Storage type" : "存储类型",
diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json
index 18402568132..ac75d680c7e 100644
--- a/apps/files_external/l10n/zh_CN.json
+++ b/apps/files_external/l10n/zh_CN.json
@@ -2,12 +2,6 @@
     "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s",
     "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s",
     "External storage" : "外部存储",
-    "OpenStack Object Storage" : "OpenStack 对象存储",
-    "Username" : "用户名",
-    "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息",
-    "Host" : "主机",
-    "Share" : "共享",
-    "Remote subfolder" : "远程子文件夹",
     "Personal" : "个人",
     "System" : "系统",
     "Grant access" : "授权",
@@ -15,7 +9,9 @@
     "Enable encryption" : "启用加密",
     "Saved" : "已保存",
     "None" : "无",
+    "Username" : "用户名",
     "Password" : "密码",
+    "API key" : "API密匙",
     "Amazon S3" : "Amazon S3",
     "Port" : "端口",
     "Region" : "地区",
@@ -23,12 +19,16 @@
     "Enable Path Style" : "启用 Path Style",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "远程子文件夹",
     "Secure https://" : "安全 https://",
+    "Host" : "主机",
     "Secure ftps://" : "安全 ftps://",
     "Local" : "本地",
     "Location" : "地点",
     "ownCloud" : "ownCloud",
     "Root" : "根路径",
+    "Share" : "共享",
+    "OpenStack Object Storage" : "OpenStack 对象存储",
     "<b>Note:</b> " : "<b>注意：</b>",
     "Name" : "名称",
     "Storage type" : "存储类型",
diff --git a/apps/files_external/l10n/zh_HK.js b/apps/files_external/l10n/zh_HK.js
index ffeaab660a0..7a38dd7ffed 100644
--- a/apps/files_external/l10n/zh_HK.js
+++ b/apps/files_external/l10n/zh_HK.js
@@ -1,16 +1,16 @@
 OC.L10N.register(
     "files_external",
     {
-    "Username" : "用戶名稱",
-    "Host" : "主機",
-    "Share" : "分享",
     "Personal" : "個人",
     "Saved" : "已儲存",
     "None" : "空",
+    "Username" : "用戶名稱",
     "Password" : "密碼",
     "Port" : "連接埠",
     "WebDAV" : "WebDAV",
     "URL" : "網址",
+    "Host" : "主機",
+    "Share" : "分享",
     "Name" : "名稱",
     "Folder name" : "資料夾名稱",
     "Delete" : "刪除"
diff --git a/apps/files_external/l10n/zh_HK.json b/apps/files_external/l10n/zh_HK.json
index 5ad37c40925..befeede4bbe 100644
--- a/apps/files_external/l10n/zh_HK.json
+++ b/apps/files_external/l10n/zh_HK.json
@@ -1,14 +1,14 @@
 { "translations": {
-    "Username" : "用戶名稱",
-    "Host" : "主機",
-    "Share" : "分享",
     "Personal" : "個人",
     "Saved" : "已儲存",
     "None" : "空",
+    "Username" : "用戶名稱",
     "Password" : "密碼",
     "Port" : "連接埠",
     "WebDAV" : "WebDAV",
     "URL" : "網址",
+    "Host" : "主機",
+    "Share" : "分享",
     "Name" : "名稱",
     "Folder name" : "資料夾名稱",
     "Delete" : "刪除"
diff --git a/apps/files_external/l10n/zh_TW.js b/apps/files_external/l10n/zh_TW.js
index 61874198eb9..e4e01cd2d59 100644
--- a/apps/files_external/l10n/zh_TW.js
+++ b/apps/files_external/l10n/zh_TW.js
@@ -2,25 +2,26 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "外部儲存",
-    "Username" : "使用者名稱",
-    "Host" : "主機",
-    "Share" : "分享",
     "Personal" : "個人",
     "System" : "系統",
     "Grant access" : "允許存取",
     "Access granted" : "允許存取",
     "Saved" : "已儲存",
     "None" : "無",
+    "Username" : "使用者名稱",
     "Password" : "密碼",
+    "API key" : "API金鑰",
     "Amazon S3" : "Amazon S3",
     "Port" : "連接埠",
     "Region" : "地區",
     "Enable SSL" : "啟用 SSL",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "主機",
     "Local" : "本地",
     "Location" : "地點",
     "ownCloud" : "ownCloud",
+    "Share" : "分享",
     "<b>Note:</b> " : "<b>警告:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 %s，請洽您的系統管理員將其安裝並啓用。",
diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json
index 28bb079fc7e..1ed049bc079 100644
--- a/apps/files_external/l10n/zh_TW.json
+++ b/apps/files_external/l10n/zh_TW.json
@@ -1,24 +1,25 @@
 { "translations": {
     "External storage" : "外部儲存",
-    "Username" : "使用者名稱",
-    "Host" : "主機",
-    "Share" : "分享",
     "Personal" : "個人",
     "System" : "系統",
     "Grant access" : "允許存取",
     "Access granted" : "允許存取",
     "Saved" : "已儲存",
     "None" : "無",
+    "Username" : "使用者名稱",
     "Password" : "密碼",
+    "API key" : "API金鑰",
     "Amazon S3" : "Amazon S3",
     "Port" : "連接埠",
     "Region" : "地區",
     "Enable SSL" : "啟用 SSL",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Host" : "主機",
     "Local" : "本地",
     "Location" : "地點",
     "ownCloud" : "ownCloud",
+    "Share" : "分享",
     "<b>Note:</b> " : "<b>警告:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 %s，請洽您的系統管理員將其安裝並啓用。",
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index c16b2c77e59..bb8480e2a35 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -41,7 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
     "Shares" : "Sdílení",
+    "You received %s as a remote share from %s" : "Obdrželi jste %s nově nasdílená vzdáleně od %s ",
     "Accept" : "Přijmout",
+    "Decline" : "Zamítnout",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID",
     "This share is password-protected" : "Toto sdílení je chráněno heslem",
@@ -67,6 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Sdružený cloud",
     "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:",
     "Share it:" : "Sdílet:",
+    "Add to your website" : "Přidat na svou webovou stránku",
     "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud",
     "HTML Code:" : "HTML kód:"
 },
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index 208cc0fa24b..677e982b6b0 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -39,7 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
     "Shares" : "Sdílení",
+    "You received %s as a remote share from %s" : "Obdrželi jste %s nově nasdílená vzdáleně od %s ",
     "Accept" : "Přijmout",
+    "Decline" : "Zamítnout",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID",
     "This share is password-protected" : "Toto sdílení je chráněno heslem",
@@ -65,6 +67,7 @@
     "Federated Cloud" : "Sdružený cloud",
     "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:",
     "Share it:" : "Sdílet:",
+    "Add to your website" : "Přidat na svou webovou stránku",
     "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud",
     "HTML Code:" : "HTML kód:"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index 2ab7513f139..87595f6cc56 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -41,7 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
+    "You received %s as a remote share from %s" : "Du modtog %s som et ekstern deling fra %s",
     "Accept" : "Acceptér",
+    "Decline" : "Afvis",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Delingen er beskyttet af kodeord",
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index fe071e1d585..c9ac959da2e 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -39,7 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
+    "You received %s as a remote share from %s" : "Du modtog %s som et ekstern deling fra %s",
     "Accept" : "Acceptér",
+    "Decline" : "Afvis",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Delingen er beskyttet af kodeord",
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 18ba9bd0d31..ef688424777 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
+    "You received %s as a remote share from %s" : "Λάβατε το %s ως απομακρυσμένο διαμοιρασμό από %s",
     "Accept" : "Αποδοχή",
     "Decline" : "Απόρριψη",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index f8e42195d0d..829ff61ceaa 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
+    "You received %s as a remote share from %s" : "Λάβατε το %s ως απομακρυσμένο διαμοιρασμό από %s",
     "Accept" : "Αποδοχή",
     "Decline" : "Απόρριψη",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index bf041f2b9b6..9ddf9b5f385 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -41,7 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
+    "You received %s as a remote share from %s" : "Hai ricevuto %s come condivisione remota da %s",
     "Accept" : "Accetta",
+    "Decline" : "Rifiuta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud",
     "This share is password-protected" : "Questa condivione è protetta da password",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index 34a10595f98..2ff7f2d13b5 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -39,7 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
+    "You received %s as a remote share from %s" : "Hai ricevuto %s come condivisione remota da %s",
     "Accept" : "Accetta",
+    "Decline" : "Rifiuta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud",
     "This share is password-protected" : "Questa condivione è protetta da password",
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index 4df003d0e4d..a83ce84d26d 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -41,7 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "You shared %1$s via link" : "Du delte %1$s via lenke",
     "Shares" : "Delinger",
+    "You received %s as a remote share from %s" : "Du mottok %s som en ekstern deling fra %s",
     "Accept" : "Aksepter",
+    "Decline" : "Avslå",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky",
     "This share is password-protected" : "Denne delingen er passordbeskyttet",
@@ -67,6 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Sammenknyttet sky",
     "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:",
     "Share it:" : "Del den:",
+    "Add to your website" : "Legg på websiden din",
     "Share with me via ownCloud" : "Del med meg via ownCloud",
     "HTML Code:" : "HTML-kode:"
 },
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index 079f1e854ac..6eedd895f4f 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -39,7 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "You shared %1$s via link" : "Du delte %1$s via lenke",
     "Shares" : "Delinger",
+    "You received %s as a remote share from %s" : "Du mottok %s som en ekstern deling fra %s",
     "Accept" : "Aksepter",
+    "Decline" : "Avslå",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky",
     "This share is password-protected" : "Denne delingen er passordbeskyttet",
@@ -65,6 +67,7 @@
     "Federated Cloud" : "Sammenknyttet sky",
     "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:",
     "Share it:" : "Del den:",
+    "Add to your website" : "Legg på websiden din",
     "Share with me via ownCloud" : "Del med meg via ownCloud",
     "HTML Code:" : "HTML-kode:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index 8586d939692..1606f1de128 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -63,7 +63,7 @@ OC.L10N.register(
     "Search groups" : "Zoeken groepen",
     "Available groups" : "Beschikbare groepen",
     "Selected groups" : "Geselecteerde groepen",
-    "Edit LDAP Query" : "Bewerken LDAP bevraging",
+    "Edit LDAP Query" : "Bewerken LDAP opvraging",
     "LDAP Filter:" : "LDAP Filter:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Dit filter geeft aan welke LDAP groepen toegang hebben tot %s.",
     "Verify settings and count groups" : "Verifiëren instellingen en tel groepen",
@@ -142,7 +142,7 @@ OC.L10N.register(
     "in bytes" : "in bytes",
     "Email Field" : "E-mailveld",
     "User Home Folder Naming Rule" : "Gebruikers Home map naamgevingsregel",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laat leeg voor de gebruikersnaam (standaard). Of specificeer een LDAP/AD attribuut.",
     "Internal Username" : "Interne gebruikersnaam",
     "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standaard wordt de interne gebruikersnaam aangemaakt op basis van het UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle *DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van vóór ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op gekoppelde (toegevoegde) LDAP-gebruikers.",
     "Internal Username Attribute:" : "Interne gebruikersnaam attribuut:",
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index a82c03a8edd..4b930d7b4c9 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -61,7 +61,7 @@
     "Search groups" : "Zoeken groepen",
     "Available groups" : "Beschikbare groepen",
     "Selected groups" : "Geselecteerde groepen",
-    "Edit LDAP Query" : "Bewerken LDAP bevraging",
+    "Edit LDAP Query" : "Bewerken LDAP opvraging",
     "LDAP Filter:" : "LDAP Filter:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Dit filter geeft aan welke LDAP groepen toegang hebben tot %s.",
     "Verify settings and count groups" : "Verifiëren instellingen en tel groepen",
@@ -140,7 +140,7 @@
     "in bytes" : "in bytes",
     "Email Field" : "E-mailveld",
     "User Home Folder Naming Rule" : "Gebruikers Home map naamgevingsregel",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laat leeg voor de gebruikersnaam (standaard). Of specificeer een LDAP/AD attribuut.",
     "Internal Username" : "Interne gebruikersnaam",
     "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standaard wordt de interne gebruikersnaam aangemaakt op basis van het UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle *DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van vóór ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op gekoppelde (toegevoegde) LDAP-gebruikers.",
     "Internal Username Attribute:" : "Interne gebruikersnaam attribuut:",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 54ed40e9a5b..0ee3a06e45f 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -173,6 +173,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Aktualizace byla úspěšná. Zachycen výskyt varování.",
     "The update was successful. Redirecting you to ownCloud now." : "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Heslo nebylo změněno kvůli neplatnému tokenu",
+    "Couldn't reset password because the token is expired" : "Heslo nebylo změněno z důvodu vypršení tokenu",
     "Couldn't send reset email. Please make sure your username is correct." : "Nelze odeslat email pro změnu hesla. Ujistěte se prosím, že zadáváte správné uživatelské jméno.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena emailová adresa. Kontaktujte prosím svého správce systému.",
     "%s password reset" : "reset hesla %s",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index da343b7791a..1c38e7cc152 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -171,6 +171,7 @@
     "The update was successful. There were warnings." : "Aktualizace byla úspěšná. Zachycen výskyt varování.",
     "The update was successful. Redirecting you to ownCloud now." : "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Heslo nebylo změněno kvůli neplatnému tokenu",
+    "Couldn't reset password because the token is expired" : "Heslo nebylo změněno z důvodu vypršení tokenu",
     "Couldn't send reset email. Please make sure your username is correct." : "Nelze odeslat email pro změnu hesla. Ujistěte se prosím, že zadáváte správné uživatelské jméno.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena emailová adresa. Kontaktujte prosím svého správce systému.",
     "%s password reset" : "reset hesla %s",
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js
index 715b834d2bf..65ff43b4f23 100644
--- a/lib/l10n/cs_CZ.js
+++ b/lib/l10n/cs_CZ.js
@@ -91,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Sdílení položky %s selhalo, protože uživatel %s neexistuje",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Sdílení položky %s selhalo, protože uživatel %s není členem žádné skupiny společné s uživatelem %s",
     "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena",
+    "Sharing %s failed, because this item is already shared with user %s" : "Sdílení položky %s selhalo, protože ta je již s uživatelem %s sdílena",
     "Sharing %s failed, because the group %s does not exist" : "Sdílení položky %s selhalo, protože skupina %s neexistuje",
     "Sharing %s failed, because %s is not a member of the group %s" : "Sdílení položky %s selhalo, protože uživatel %s není členem skupiny %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Pro vytvoření veřejného odkazu je nutné zadat heslo, jsou povoleny pouze chráněné odkazy",
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json
index 891b30850ab..501210dd0f8 100644
--- a/lib/l10n/cs_CZ.json
+++ b/lib/l10n/cs_CZ.json
@@ -89,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Sdílení položky %s selhalo, protože uživatel %s neexistuje",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Sdílení položky %s selhalo, protože uživatel %s není členem žádné skupiny společné s uživatelem %s",
     "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena",
+    "Sharing %s failed, because this item is already shared with user %s" : "Sdílení položky %s selhalo, protože ta je již s uživatelem %s sdílena",
     "Sharing %s failed, because the group %s does not exist" : "Sdílení položky %s selhalo, protože skupina %s neexistuje",
     "Sharing %s failed, because %s is not a member of the group %s" : "Sdílení položky %s selhalo, protože uživatel %s není členem skupiny %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Pro vytvoření veřejného odkazu je nutné zadat heslo, jsou povoleny pouze chráněné odkazy",
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index d644d7d3426..285e9ac55d1 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -132,7 +132,7 @@ OC.L10N.register(
     "PHP setting \"%s\" is not set to \"%s\"." : "PHP-indstillingen \"%s\" er ikke angivet til \"%s\".",
     "Adjusting this setting in php.ini will make ownCloud run again" : "Justeres denne indstilling i php.ini, så vil ownCloud kunne køre igen",
     "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload er angivet til \"%s\", i stedet for den forventede værdi \"0\"",
-    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "For at rette dette problem, så angiv\n<code>mbstring.func_overload</code> til <code>0</code> i din php.ini",
+    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "For at rette dette problem, angiv\n<code>mbstring.func_overload</code> til <code>0</code> i din php.ini",
     "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP er tilsyneladende sat op til at fjerne indlejrede doc-blokke. Dette vil gøre adskillige kerneprogrammer utilgængelige.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
     "PHP modules have been installed, but they are still listed as missing?" : "Der er installeret PHP-moduler, men de fremstår stadig som fraværende?",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index d57ea2a92ae..1b9ed304596 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -130,7 +130,7 @@
     "PHP setting \"%s\" is not set to \"%s\"." : "PHP-indstillingen \"%s\" er ikke angivet til \"%s\".",
     "Adjusting this setting in php.ini will make ownCloud run again" : "Justeres denne indstilling i php.ini, så vil ownCloud kunne køre igen",
     "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload er angivet til \"%s\", i stedet for den forventede værdi \"0\"",
-    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "For at rette dette problem, så angiv\n<code>mbstring.func_overload</code> til <code>0</code> i din php.ini",
+    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "For at rette dette problem, angiv\n<code>mbstring.func_overload</code> til <code>0</code> i din php.ini",
     "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP er tilsyneladende sat op til at fjerne indlejrede doc-blokke. Dette vil gøre adskillige kerneprogrammer utilgængelige.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
     "PHP modules have been installed, but they are still listed as missing?" : "Der er installeret PHP-moduler, men de fremstår stadig som fraværende?",
diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js
index d09fa5ca6e8..af629c5ef34 100644
--- a/lib/l10n/nb_NO.js
+++ b/lib/l10n/nb_NO.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Kan ikke lese fil",
     "App directory already exists" : "App-mappe finnes allerede",
     "Can't create app folder. Please fix permissions. %s" : "Kan ikke opprette app-mappe.  Vennligst ordne opp i tillatelser. %s",
+    "Archive does not contain a directory named %s" : "Arkivet inneholder ikke en mappe med navn %s",
     "No source specified when installing app" : "Ingen kilde spesifisert ved installering av app",
     "No href specified when installing app from http" : "Ingen href spesifisert ved installering av app fra http",
     "No path specified when installing app from local file" : "Ingen sti spesifisert ved installering av app fra lokal fil",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Deling av %s feilet, fordi brukeren %s ikke finnes",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Deling av %s feilet, fordi brukeren %s ikke er medlem av noen grupper som %s er medlem av",
     "Sharing %s failed, because this item is already shared with %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med bruker %s",
     "Sharing %s failed, because the group %s does not exist" : "Deling av %s feilet, fordi gruppen %s ikke finnes",
     "Sharing %s failed, because %s is not a member of the group %s" : "Deling av %s feilet, fordi %s ikke er medlem av gruppen %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Du må oppgi et passord for å lage en offentlig lenke. Bare beskyttede lenker er tillatt",
diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json
index 665ae866969..29f9e7f1365 100644
--- a/lib/l10n/nb_NO.json
+++ b/lib/l10n/nb_NO.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Kan ikke lese fil",
     "App directory already exists" : "App-mappe finnes allerede",
     "Can't create app folder. Please fix permissions. %s" : "Kan ikke opprette app-mappe.  Vennligst ordne opp i tillatelser. %s",
+    "Archive does not contain a directory named %s" : "Arkivet inneholder ikke en mappe med navn %s",
     "No source specified when installing app" : "Ingen kilde spesifisert ved installering av app",
     "No href specified when installing app from http" : "Ingen href spesifisert ved installering av app fra http",
     "No path specified when installing app from local file" : "Ingen sti spesifisert ved installering av app fra lokal fil",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Deling av %s feilet, fordi brukeren %s ikke finnes",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Deling av %s feilet, fordi brukeren %s ikke er medlem av noen grupper som %s er medlem av",
     "Sharing %s failed, because this item is already shared with %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med bruker %s",
     "Sharing %s failed, because the group %s does not exist" : "Deling av %s feilet, fordi gruppen %s ikke finnes",
     "Sharing %s failed, because %s is not a member of the group %s" : "Deling av %s feilet, fordi %s ikke er medlem av gruppen %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Du må oppgi et passord for å lage en offentlig lenke. Bare beskyttede lenker er tillatt",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 91e33842b43..17f02402aee 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -130,6 +130,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Instalace mimo kořenový adresář domény a používání systémového příkazu cron může způsobit problém s generováním správné URL. Pro zabránění těmto chybám nastavte prosím správnou cestu ve svém config.php souboru v hodnotě \"overwrite.cli.url\" (Je doporučena tato: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Nebylo možné spustit službu cron v CLI. Došlo k následujícím technickým chybám:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Ověřte znovu prosím informace z <a target=\"_blank\" href=\"%s\">instalační příručky ↗</a> a zkontrolujte <a href=\"#log-section\">log</a> na výskyt chyb a varování.",
+    "All checks passed." : "Všechny testy byly úspěšné.",
     "Open documentation" : "Otevřít dokumentaci",
     "Allow apps to use the Share API" : "Povolit aplikacím používat API sdílení",
     "Allow users to share via link" : "Povolit uživatelům sdílení pomocí odkazů",
@@ -152,6 +153,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
     "Enable server-side encryption" : "Povolit šifrování na straně serveru",
+    "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Šifrování dat na serveru je nevratný proces. Po zapnutí šifrování jsou všechny datové soubory zašifrovány a toto již poté nelze vypnout",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Kdokoliv s administrátorským přístupem k tomuto ownCloud serveru má možnost dešifrovat data, buď zachycením požadavků nebo získáním uživatelských hesel, která jsou uložena v čitelné podobě v souborech sezení. Šifrování dat na serveru proto nechrání před administrátory serveru, ale je užitečné jako ochrana vašich dat na externě hostovaném úložišti.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "V závislosti na použitém šifrovacím modulu je velikost zašifrovaných souborů navýšena (o 35%% nebo více při použití výchozího modulu)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Pro zabránění ztráty dat je třeba pravidelně zálohovat všechny šifrovací klíče (data/<user>/files_encryption a data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
     "Enable encryption" : "Povolit šifrování",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.",
     "Select default encryption module:" : "Vybrat výchozí šifrovací modul:",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 7a99e0265f6..455280dbeb8 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -128,6 +128,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Instalace mimo kořenový adresář domény a používání systémového příkazu cron může způsobit problém s generováním správné URL. Pro zabránění těmto chybám nastavte prosím správnou cestu ve svém config.php souboru v hodnotě \"overwrite.cli.url\" (Je doporučena tato: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Nebylo možné spustit službu cron v CLI. Došlo k následujícím technickým chybám:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Ověřte znovu prosím informace z <a target=\"_blank\" href=\"%s\">instalační příručky ↗</a> a zkontrolujte <a href=\"#log-section\">log</a> na výskyt chyb a varování.",
+    "All checks passed." : "Všechny testy byly úspěšné.",
     "Open documentation" : "Otevřít dokumentaci",
     "Allow apps to use the Share API" : "Povolit aplikacím používat API sdílení",
     "Allow users to share via link" : "Povolit uživatelům sdílení pomocí odkazů",
@@ -150,6 +151,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
     "Enable server-side encryption" : "Povolit šifrování na straně serveru",
+    "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Šifrování dat na serveru je nevratný proces. Po zapnutí šifrování jsou všechny datové soubory zašifrovány a toto již poté nelze vypnout",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Kdokoliv s administrátorským přístupem k tomuto ownCloud serveru má možnost dešifrovat data, buď zachycením požadavků nebo získáním uživatelských hesel, která jsou uložena v čitelné podobě v souborech sezení. Šifrování dat na serveru proto nechrání před administrátory serveru, ale je užitečné jako ochrana vašich dat na externě hostovaném úložišti.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "V závislosti na použitém šifrovacím modulu je velikost zašifrovaných souborů navýšena (o 35%% nebo více při použití výchozího modulu)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Pro zabránění ztráty dat je třeba pravidelně zálohovat všechny šifrovací klíče (data/<user>/files_encryption a data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
     "Enable encryption" : "Povolit šifrování",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.",
     "Select default encryption module:" : "Vybrat výchozí šifrovací modul:",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index cbb366a373b..e1ca38deeee 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -125,11 +125,13 @@ OC.L10N.register(
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ο διακομιστής σας τρέχει σε Microsoft Windows. Συστήνουμε ιδιαίτερα Linux για τη βέλτιστη εμπειρία του χρήστη.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Είναι εγκατεστημένο το %1$s έκδοση %2$s, για λόγους σταθερότητας και απόδοσης συστήνουμε να αναβαθμίσετε σε νεότερη έκδοση του %1$s.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. ",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Το Transactional file locking είναι απενεργοποιημένο, αυτό μπορεί να οδηγήσει σε προβλήματα με τις race conditions. Ενεργοποιήστε το 'filelocking.enabled' στο config.php για να αποφύγετε αυτά τα προβλήματα. Δείτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση ↗</a> για περισσότερες πληροφορίες.",
     "System locale can not be set to a one which supports UTF-8." : "Οι ρυθμίσεις τοποθεσίας συστήματος δεν μπορούν να οριστούν σε κάποιες που δεν υποστηρίζουν UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Αυτό σημαίνει ότι μπορεί να υπάρχουν προβλήματα με κάποιους χαρακτήρες στα ονόματα αρχείων.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Προτείνουμε ανεπιφύλακτα να εγκαταστήσετε  στο σύστημά σας τα απαιτούμενα πακέτα έτσι ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν έχει γίνει στο root του τομέα  και χρησιμοποιείται το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή  \"overwrite.cli.url\" στο αρχείο  config.php που βρίσκεται στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Δεν ήταν δυνατή η εκτέλεση της cronjob μέσω τερματικού. Εμφανίστηκαν τα παρακάτω τεχνικά σφάλματα:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Το Transactional file locking χρησιμοποιεί τη βάση δεδομένων ως locking backend, για καλύτερες επιδόσεις συστήνουμς τη διαμόρφωση μιας memcache για το κλείδωμα. Δείτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση ↗</a> για περισσότερες πληροφορίες.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Παρακαλώ ελέγξτε ξανά <a target=\"_blank\" href=\"%s\">τους οδηγούς εγκατάστασης,  καθώς επίσης και για τυχόν σφάλματα ή προειδοποιήσεις στο <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Όλοι οι έλεγχοι επιτυχείς.",
     "Open documentation" : "Ανοιχτή τεκμηρίωση.",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 6bbac33bcb5..92873fb1675 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -123,11 +123,13 @@
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ο διακομιστής σας τρέχει σε Microsoft Windows. Συστήνουμε ιδιαίτερα Linux για τη βέλτιστη εμπειρία του χρήστη.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Είναι εγκατεστημένο το %1$s έκδοση %2$s, για λόγους σταθερότητας και απόδοσης συστήνουμε να αναβαθμίσετε σε νεότερη έκδοση του %1$s.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. ",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Το Transactional file locking είναι απενεργοποιημένο, αυτό μπορεί να οδηγήσει σε προβλήματα με τις race conditions. Ενεργοποιήστε το 'filelocking.enabled' στο config.php για να αποφύγετε αυτά τα προβλήματα. Δείτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση ↗</a> για περισσότερες πληροφορίες.",
     "System locale can not be set to a one which supports UTF-8." : "Οι ρυθμίσεις τοποθεσίας συστήματος δεν μπορούν να οριστούν σε κάποιες που δεν υποστηρίζουν UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Αυτό σημαίνει ότι μπορεί να υπάρχουν προβλήματα με κάποιους χαρακτήρες στα ονόματα αρχείων.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Προτείνουμε ανεπιφύλακτα να εγκαταστήσετε  στο σύστημά σας τα απαιτούμενα πακέτα έτσι ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν έχει γίνει στο root του τομέα  και χρησιμοποιείται το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή  \"overwrite.cli.url\" στο αρχείο  config.php που βρίσκεται στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Δεν ήταν δυνατή η εκτέλεση της cronjob μέσω τερματικού. Εμφανίστηκαν τα παρακάτω τεχνικά σφάλματα:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Το Transactional file locking χρησιμοποιεί τη βάση δεδομένων ως locking backend, για καλύτερες επιδόσεις συστήνουμς τη διαμόρφωση μιας memcache για το κλείδωμα. Δείτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση ↗</a> για περισσότερες πληροφορίες.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Παρακαλώ ελέγξτε ξανά <a target=\"_blank\" href=\"%s\">τους οδηγούς εγκατάστασης,  καθώς επίσης και για τυχόν σφάλματα ή προειδοποιήσεις στο <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Όλοι οι έλεγχοι επιτυχείς.",
     "Open documentation" : "Ανοιχτή τεκμηρίωση.",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index deb5f71d8b3..141b155da83 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -118,17 +118,20 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "kelihatannya php tidak diatur dengan benar untuk variabel lingkungan sistem kueri. Pemeriksaan dengan getenv(\"PATH\") hanya mengembalikan respon kosong.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Silakan periksa <a target=\"_blank\" href=\"%s\">dokumentasi instalasi ↗</a> untuk membaca catatan konfigurasi dan konfigurasi php pada server Anda, terutama ketika menggunakan php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP tampaknya disetel menjadi strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s dibawah versi %2$s telah diinstal, untuk alasan kestabilan dan performa, kami menyarankan untuk memperbarui ke versi %1$s yang lebih baru.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksi penguncian berkas dinonaktifkan, hal ini dapat menyebabkan masalah dengan kondisi race. Aktifkan 'filelocking.enabled' pada config.php untuk menghindari masalah ini. Baca <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a> untuk informasi lebih lanjut.",
     "System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Kamu sangat menyarankan untuk menginstal paket-paket yang dibutuhkan pada sistem agar mendukung lokal berikut: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak di root domain dan menggunakan sistem cron, hal tersebut dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah tersebut, mohon atur opsi \"overwrite.cli.url\" pada berkas config.php Anda ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Tidak mungkin untuk mengeksekusi cronjob via CLI. Kesalahan teknis berikut muncul:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksi penguncian berkas menggunakan basis data sebagai backend penguncian, untuk mendapatkan kinerja terbaik, disarankan mengkonfigurasi memcache sebagai penguncian. Baca <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a> untuk informasi lebih lanjut.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon periksa dua kali <a target=\"_blank\" href=\"%s\">panduan instalasi ↗</a>, dan periksa segala kesalahan atau peringatan pada <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Semua pemeriksaan lulus.",
     "Open documentation" : "Buka dokumentasi",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 956f5a8a6ff..fcc2b647465 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -116,17 +116,20 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "kelihatannya php tidak diatur dengan benar untuk variabel lingkungan sistem kueri. Pemeriksaan dengan getenv(\"PATH\") hanya mengembalikan respon kosong.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Silakan periksa <a target=\"_blank\" href=\"%s\">dokumentasi instalasi ↗</a> untuk membaca catatan konfigurasi dan konfigurasi php pada server Anda, terutama ketika menggunakan php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP tampaknya disetel menjadi strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s dibawah versi %2$s telah diinstal, untuk alasan kestabilan dan performa, kami menyarankan untuk memperbarui ke versi %1$s yang lebih baru.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksi penguncian berkas dinonaktifkan, hal ini dapat menyebabkan masalah dengan kondisi race. Aktifkan 'filelocking.enabled' pada config.php untuk menghindari masalah ini. Baca <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a> untuk informasi lebih lanjut.",
     "System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Kamu sangat menyarankan untuk menginstal paket-paket yang dibutuhkan pada sistem agar mendukung lokal berikut: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak di root domain dan menggunakan sistem cron, hal tersebut dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah tersebut, mohon atur opsi \"overwrite.cli.url\" pada berkas config.php Anda ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Tidak mungkin untuk mengeksekusi cronjob via CLI. Kesalahan teknis berikut muncul:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksi penguncian berkas menggunakan basis data sebagai backend penguncian, untuk mendapatkan kinerja terbaik, disarankan mengkonfigurasi memcache sebagai penguncian. Baca <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a> untuk informasi lebih lanjut.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon periksa dua kali <a target=\"_blank\" href=\"%s\">panduan instalasi ↗</a>, dan periksa segala kesalahan atau peringatan pada <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Semua pemeriksaan lulus.",
     "Open documentation" : "Buka dokumentasi",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 68f4fe574f9..4e6fab34c74 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -125,11 +125,13 @@ OC.L10N.register(
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Il tuo server è in esecuzione su Microsoft Windows. Consigliamo vivamente Linux per un'esperienza utente ottimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "La versione di %1$s installata è anteriore alla %2$s, per motivi di stabilità e prestazioni, consigliamo di aggiornare una una versione di %1$s più recente.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Il blocco del file transazionale è disabilitato, ciò potrebbe comportare problemi di race condition. Abilita 'filelocking.enabled' nel config-php per evitare questi problemi. Vedi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a> per ulteriori informazioni.",
     "System locale can not be set to a one which supports UTF-8." : "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle localizzazioni seguenti: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwrite.cli.url\"  nel file config.php al percorso della radice del sito della tua installazione (Consigliato: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non è stato possibile eseguire il job di cron tramite CLI. Sono apparsi i seguenti errori tecnici:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Il blocco del file transazionale sta utilizzando il database come motore di blocco, per avere prestazioni migliori, è consigliato configurare una cache di memoria per il blocco. Vedi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a> per ulteriori informazioni.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Leggi attentamente le  <a target=\"_blank\" href=\"%s\">guide d'installazione ↗</a>, e controlla gli errori o gli avvisi nel <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Tutti i controlli passati.",
     "Open documentation" : "Apri la documentazione",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index c6491204d7e..9c2d6fd6a91 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -123,11 +123,13 @@
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Il tuo server è in esecuzione su Microsoft Windows. Consigliamo vivamente Linux per un'esperienza utente ottimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "La versione di %1$s installata è anteriore alla %2$s, per motivi di stabilità e prestazioni, consigliamo di aggiornare una una versione di %1$s più recente.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Il blocco del file transazionale è disabilitato, ciò potrebbe comportare problemi di race condition. Abilita 'filelocking.enabled' nel config-php per evitare questi problemi. Vedi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a> per ulteriori informazioni.",
     "System locale can not be set to a one which supports UTF-8." : "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle localizzazioni seguenti: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwrite.cli.url\"  nel file config.php al percorso della radice del sito della tua installazione (Consigliato: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non è stato possibile eseguire il job di cron tramite CLI. Sono apparsi i seguenti errori tecnici:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Il blocco del file transazionale sta utilizzando il database come motore di blocco, per avere prestazioni migliori, è consigliato configurare una cache di memoria per il blocco. Vedi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a> per ulteriori informazioni.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Leggi attentamente le  <a target=\"_blank\" href=\"%s\">guide d'installazione ↗</a>, e controlla gli errori o gli avvisi nel <a href=\"#log-section\">log</a>.",
     "All checks passed." : "Tutti i controlli passati.",
     "Open documentation" : "Apri la documentazione",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index e413b16247c..84466f61617 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -30,7 +30,9 @@ OC.L10N.register(
     "Unable to change password" : "Kunne ikke endre passord",
     "Enabled" : "Aktiv",
     "Not enabled" : "Ikke aktivert",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "installering og oppdatering av apper via app-butikken eller ved deling i Sammenknyttet sky",
     "Federated Cloud Sharing" : "Sammenknyttet sky-deling",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL bruker en utdatert %s-versjon (%s). Vennligst oppdater operativsystemet ditt; ellers vil ikke funksjoner som %s virke korrekt.",
     "A problem occurred, please check your log files (Error: %s)" : "Det oppstod et problem. Sjekk loggfilene (Feil: %s)",
     "Migration Completed" : "Migrering ferdig",
     "Group already exists." : "Gruppe finnes allerede.",
@@ -75,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Avinstallerer ....",
     "Error while uninstalling app" : "Feil ved avinstallering av app",
     "Uninstall" : "Avinstaller",
+    "An error occurred: {message}" : "Det oppstod en feil: {message}",
     "Select a profile picture" : "Velg et profilbilde",
     "Very weak password" : "Veldig svakt passord",
     "Weak password" : "Svakt passord",
@@ -115,18 +118,22 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP ser ikke ut til å være satt opp riktig for å lese systemets miljøvariabler. Testen med getenv(\"PATH\") returnerer bare et tomt svar.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Sjekk <a target=\"_blank\" href=\"%s\">installasjonsdokumentasjonen ↗</a> for notiser om PHP-konfigurering og om konfigurering av serveren, spesielt ved bruk av php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfigurasjonen er blitt aktivert. Dette forhindrer setting av visse konfigureringer via web-grensesnittet. Videre må config-filen gjøres skrivbar manuelt for hver oppdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Serveren din kjører på Microsoft Windows. Vi anbefaler strekt Linux for en optimal brukeropplevelse.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s lavere enn versjon %2$s er installert. Vi anbefaler å oppgradere til en nyere %1$s-versjon for å få bedre stabilitet og ytelse.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksjonsbasert fil-låsing er deaktivert. Dette kan føre til problemer med kappløpssituasjoner. Aktiver 'filelocking.enabled' i config.php for å unngå disse problemene. Se <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a> for mer informasjon.",
     "System locale can not be set to a one which supports UTF-8." : "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Dette betyr at det kan forekomme problemer med visse tegn i filnavn.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Vi anbefaler sterkt å installere de påkrevde pakkene på systemet ditt for å støtte en av følgende nasjonale innstillinger: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis installasjonen din ikke er installert i roten av domenet og bruker systemets cron, kan det bli problemer med URL-genereringen. For å unngå disse problemene, sett \"overwrite.cli.url\" i filen config.php til web-roten for installasjonen din (Foreslått: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke mulig å kjøre cron-jobben vi CLI. Følgende tekniske feil oppstod:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksjonsbasert fil-låsing bruker databasen som låsemekanisme. For best ytelse anbefales det å konfigurerer en memcache for låsing. Se <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a> for mer informasjon.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Vennligst dobbeltsjekk <a target=\"_blank\" href=\"%s\">Installasjonsveiledningene ↗</a> og se etter feil og advarsler i <a href=\"#log-section\">loggen</a>.",
+    "All checks passed." : "Alle sjekker bestått.",
     "Open documentation" : "Åpne dokumentasjonen",
     "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
     "Allow users to share via link" : "Tillat brukere å dele via lenke",
@@ -149,6 +156,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
     "Enable server-side encryption" : "Aktiver serverkryptering",
+    "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Serverkryptering er en enveisprosess. Når kryptering er blitt aktivert, vil alle filer fra det tidspunktet av bli kryptert på serveren og det vil ikke være mulig å deaktivere kryptering senere.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Alle som har privilegert tilgang til ownCloud-serveren din kan dekryptere filene dine enten ved å fange opp forespørsler eller ved å lese brukerpassord som er lagret i klartekst i økt-filer. Serverkryptering beskytter derfor ikke mot uærlige administratorer, men det er nyttig for å beskytte dine data på eksternt oppkoblede lagringsplasser.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Avhengig av den faktiske krypteringsmodulen økes filstørrelsen generelt (med 35%% eller mer ved bruk av standardmodulen)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør ta periodisk sikkerhetskopi av alle krypteringsnøkler for å forhindre permanent tap av data (data/<user>/files_encryption og data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
     "Enable encryption" : "Aktiver kryptering",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul er lastet. Aktiver en krypteringsmodul i app-menyen.",
     "Select default encryption module:" : "Velg standard krypteringsmodul:",
@@ -192,6 +205,7 @@ OC.L10N.register(
     "licensed" : "lisensiert",
     "Documentation:" : "Dokumentasjon:",
     "User documentation" : "Brukerdokumentasjon",
+    "Admin documentation" : "Admin-dokumentasjon",
     "Show description …" : "Vis beskrivelse …",
     "Hide description …" : "Skjul beskrivelse …",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Denne appen kan ikke installeres fordi følgende avhengigheter ikke er tilfredsstilt:",
@@ -230,6 +244,7 @@ OC.L10N.register(
     "Upload new" : "Last opp nytt",
     "Select new from Files" : "Velg nytt fra Filer",
     "Remove image" : "Fjern bilde",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Enten png eller jpg. Helst kvadratisk, men du kan beskjære bildet. Filen kan ikke være større enn 20 MB.",
     "Your avatar is provided by your original account." : "Avataren din kommer fra din opprinnelige konto.",
     "Cancel" : "Avbryt",
     "Choose as profile image" : "Velg som profilbilde",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 9b301b3bbbb..6b3bd343762 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -28,7 +28,9 @@
     "Unable to change password" : "Kunne ikke endre passord",
     "Enabled" : "Aktiv",
     "Not enabled" : "Ikke aktivert",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "installering og oppdatering av apper via app-butikken eller ved deling i Sammenknyttet sky",
     "Federated Cloud Sharing" : "Sammenknyttet sky-deling",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL bruker en utdatert %s-versjon (%s). Vennligst oppdater operativsystemet ditt; ellers vil ikke funksjoner som %s virke korrekt.",
     "A problem occurred, please check your log files (Error: %s)" : "Det oppstod et problem. Sjekk loggfilene (Feil: %s)",
     "Migration Completed" : "Migrering ferdig",
     "Group already exists." : "Gruppe finnes allerede.",
@@ -73,6 +75,7 @@
     "Uninstalling ...." : "Avinstallerer ....",
     "Error while uninstalling app" : "Feil ved avinstallering av app",
     "Uninstall" : "Avinstaller",
+    "An error occurred: {message}" : "Det oppstod en feil: {message}",
     "Select a profile picture" : "Velg et profilbilde",
     "Very weak password" : "Veldig svakt passord",
     "Weak password" : "Svakt passord",
@@ -113,18 +116,22 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP ser ikke ut til å være satt opp riktig for å lese systemets miljøvariabler. Testen med getenv(\"PATH\") returnerer bare et tomt svar.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Sjekk <a target=\"_blank\" href=\"%s\">installasjonsdokumentasjonen ↗</a> for notiser om PHP-konfigurering og om konfigurering av serveren, spesielt ved bruk av php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfigurasjonen er blitt aktivert. Dette forhindrer setting av visse konfigureringer via web-grensesnittet. Videre må config-filen gjøres skrivbar manuelt for hver oppdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Serveren din kjører på Microsoft Windows. Vi anbefaler strekt Linux for en optimal brukeropplevelse.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s lavere enn versjon %2$s er installert. Vi anbefaler å oppgradere til en nyere %1$s-versjon for å få bedre stabilitet og ytelse.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksjonsbasert fil-låsing er deaktivert. Dette kan føre til problemer med kappløpssituasjoner. Aktiver 'filelocking.enabled' i config.php for å unngå disse problemene. Se <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a> for mer informasjon.",
     "System locale can not be set to a one which supports UTF-8." : "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Dette betyr at det kan forekomme problemer med visse tegn i filnavn.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Vi anbefaler sterkt å installere de påkrevde pakkene på systemet ditt for å støtte en av følgende nasjonale innstillinger: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis installasjonen din ikke er installert i roten av domenet og bruker systemets cron, kan det bli problemer med URL-genereringen. For å unngå disse problemene, sett \"overwrite.cli.url\" i filen config.php til web-roten for installasjonen din (Foreslått: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke mulig å kjøre cron-jobben vi CLI. Følgende tekniske feil oppstod:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksjonsbasert fil-låsing bruker databasen som låsemekanisme. For best ytelse anbefales det å konfigurerer en memcache for låsing. Se <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a> for mer informasjon.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Vennligst dobbeltsjekk <a target=\"_blank\" href=\"%s\">Installasjonsveiledningene ↗</a> og se etter feil og advarsler i <a href=\"#log-section\">loggen</a>.",
+    "All checks passed." : "Alle sjekker bestått.",
     "Open documentation" : "Åpne dokumentasjonen",
     "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
     "Allow users to share via link" : "Tillat brukere å dele via lenke",
@@ -147,6 +154,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
     "Enable server-side encryption" : "Aktiver serverkryptering",
+    "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Serverkryptering er en enveisprosess. Når kryptering er blitt aktivert, vil alle filer fra det tidspunktet av bli kryptert på serveren og det vil ikke være mulig å deaktivere kryptering senere.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Alle som har privilegert tilgang til ownCloud-serveren din kan dekryptere filene dine enten ved å fange opp forespørsler eller ved å lese brukerpassord som er lagret i klartekst i økt-filer. Serverkryptering beskytter derfor ikke mot uærlige administratorer, men det er nyttig for å beskytte dine data på eksternt oppkoblede lagringsplasser.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Avhengig av den faktiske krypteringsmodulen økes filstørrelsen generelt (med 35%% eller mer ved bruk av standardmodulen)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør ta periodisk sikkerhetskopi av alle krypteringsnøkler for å forhindre permanent tap av data (data/<user>/files_encryption og data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
     "Enable encryption" : "Aktiver kryptering",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul er lastet. Aktiver en krypteringsmodul i app-menyen.",
     "Select default encryption module:" : "Velg standard krypteringsmodul:",
@@ -190,6 +203,7 @@
     "licensed" : "lisensiert",
     "Documentation:" : "Dokumentasjon:",
     "User documentation" : "Brukerdokumentasjon",
+    "Admin documentation" : "Admin-dokumentasjon",
     "Show description …" : "Vis beskrivelse …",
     "Hide description …" : "Skjul beskrivelse …",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Denne appen kan ikke installeres fordi følgende avhengigheter ikke er tilfredsstilt:",
@@ -228,6 +242,7 @@
     "Upload new" : "Last opp nytt",
     "Select new from Files" : "Velg nytt fra Filer",
     "Remove image" : "Fjern bilde",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Enten png eller jpg. Helst kvadratisk, men du kan beskjære bildet. Filen kan ikke være større enn 20 MB.",
     "Your avatar is provided by your original account." : "Avataren din kommer fra din opprinnelige konto.",
     "Cancel" : "Avbryt",
     "Choose as profile image" : "Velg som profilbilde",
-- 
GitLab


From 1601e8acfe3df25d29760edaaa9ad29259f88c11 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 12 Aug 2015 09:33:11 +0200
Subject: [PATCH 238/783] Added js tests for jquery.avatar

* Ceil avatar request size
---
 core/js/jquery.avatar.js                 |   2 +-
 core/js/tests/specs/jquery.avatarSpec.js | 240 +++++++++++++++++++++++
 2 files changed, 241 insertions(+), 1 deletion(-)
 create mode 100644 core/js/tests/specs/jquery.avatarSpec.js

diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index b0d1ca7d88f..552657877e7 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -77,7 +77,7 @@
 
 		var url = OC.generateUrl(
 			'/avatar/{user}/{size}',
-			{user: user, size: size * window.devicePixelRatio});
+			{user: user, size: Math.ceil(size * window.devicePixelRatio)});
 
 		$.get(url, function(result) {
 			if (typeof(result) === 'object') {
diff --git a/core/js/tests/specs/jquery.avatarSpec.js b/core/js/tests/specs/jquery.avatarSpec.js
new file mode 100644
index 00000000000..f5caae10020
--- /dev/null
+++ b/core/js/tests/specs/jquery.avatarSpec.js
@@ -0,0 +1,240 @@
+/**
+ * Copyright (c) 2015 Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+describe('jquery.avatar tests', function() {
+	
+	var $div;
+	var devicePixelRatio
+
+	beforeEach(function() {
+		$('#testArea').append($('<div id="avatardiv">'));
+		$div = $('#avatardiv');
+
+		devicePixelRatio = window.devicePixelRatio;
+		window.devicePixelRatio = 1;
+	});
+
+	afterEach(function() {
+		$div.remove();
+
+		window.devicePixelRatio = devicePixelRatio
+	});
+
+	describe('size', function() {
+		it('undefined', function() {
+			$div.avatar('foo');
+
+			expect($div.height()).toEqual(64);
+			expect($div.width()).toEqual(64);
+		});
+
+		it('undefined but div has height', function() {
+			$div.height(9);
+			$div.avatar('foo');
+
+			expect($div.height()).toEqual(9);
+			expect($div.width()).toEqual(9);
+		});
+
+		it('undefined but data size is set', function() {
+			$div.data('size', 10);
+			$div.avatar('foo');
+
+			expect($div.height()).toEqual(10);
+			expect($div.width()).toEqual(10);
+		});
+
+
+		it('defined', function() {
+			$div.avatar('foo', 8);
+
+			expect($div.height()).toEqual(8);
+			expect($div.width()).toEqual(8);
+		});
+	});
+
+	it('undefined user', function() {
+		spyOn($div, 'imageplaceholder');
+
+		$div.avatar();
+		
+		expect($div.imageplaceholder).toHaveBeenCalledWith('x');
+	});
+
+	describe('no avatar', function() {
+		it('show placeholder for existing user', function() {
+			spyOn($div, 'imageplaceholder');
+			$div.avatar('foo');
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					data: {displayname: 'bar'}
+				})
+			);
+
+			expect($div.imageplaceholder).toHaveBeenCalledWith('foo', 'bar');
+		});
+
+		it('show placeholder for non existing user', function() {
+			spyOn($div, 'imageplaceholder');
+			$div.avatar('foo');
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					data: {}
+				})
+			);
+
+			expect($div.imageplaceholder).toHaveBeenCalledWith('foo', 'X');
+		});
+
+		it('show no placeholder', function() {
+			spyOn($div, 'imageplaceholder');
+			$div.avatar('foo', undefined, undefined, true);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					data: {}
+				})
+			);
+
+			expect($div.imageplaceholder.calls.any()).toEqual(false);
+			expect($div.css('display')).toEqual('none');
+		});
+	});
+
+	describe('url generation', function() {
+		beforeEach(function() {
+			window.devicePixelRatio = 1;
+		});
+
+		it('default', function() {
+			window.devicePixelRatio = 1;
+			$div.avatar('foo', 32);
+
+			expect(fakeServer.requests[0].method).toEqual('GET');
+			expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/avatar/foo/32');
+		});
+
+		it('high DPI icon', function() {
+			window.devicePixelRatio = 4;
+			$div.avatar('foo', 32);
+
+			expect(fakeServer.requests[0].method).toEqual('GET');
+			expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/avatar/foo/128');
+		});
+
+		it('high DPI icon round up size', function() {
+			window.devicePixelRatio = 1.9;
+			$div.avatar('foo', 32);
+
+			expect(fakeServer.requests[0].method).toEqual('GET');
+			expect(fakeServer.requests[0].url).toEqual('http://localhost/index.php/avatar/foo/61');
+		});
+	});
+
+	describe('valid avatar', function() {
+		beforeEach(function() {
+			window.devicePixelRatio = 1;
+		});
+
+		it('default (no ie8 fix)', function() {
+			$div.avatar('foo', 32);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'image/jpeg' },
+				''
+			);
+
+			var img = $div.children('img')[0];
+
+			expect(img.height).toEqual(32);
+			expect(img.width).toEqual(32);
+			expect(img.src).toEqual('http://localhost/index.php/avatar/foo/32');
+		});
+
+		it('default high DPI icon', function() {
+			window.devicePixelRatio = 1.9;
+
+			$div.avatar('foo', 32);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'image/jpeg' },
+				''
+			);
+
+			var img = $div.children('img')[0];
+
+			expect(img.height).toEqual(32);
+			expect(img.width).toEqual(32);
+			expect(img.src).toEqual('http://localhost/index.php/avatar/foo/61');
+		});
+
+		it('with ie8 fix', function() {
+			sinon.stub(Math, 'random', function() {
+				return 0.5;
+			});
+
+			$div.avatar('foo', 32, true);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'image/jpeg' },
+				''
+			);
+
+			var img = $div.children('img')[0];
+
+			expect(img.height).toEqual(32);
+			expect(img.width).toEqual(32);
+			expect(img.src).toEqual('http://localhost/index.php/avatar/foo/32#500');
+		});
+
+		it('unhide div', function() {
+			$div.hide();
+
+			$div.avatar('foo', 32);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'image/jpeg' },
+				''
+			);
+
+			expect($div.css('display')).toEqual('block');
+		});
+
+		it('callback called', function() {
+			var observer = {callback: function() { dump("FOO"); }};
+
+			spyOn(observer, 'callback');
+
+			$div.avatar('foo', 32, undefined, undefined, function() {
+				observer.callback();
+			});
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'image/jpeg' },
+				''
+			);
+
+			expect(observer.callback).toHaveBeenCalled();
+		});
+	});
+});
-- 
GitLab


From 3adbfbfd694d09b165be41df108480ea16bb4d29 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 14 Sep 2015 11:22:34 +0200
Subject: [PATCH 239/783] Use / instead of an empty string as cookie path

When an empty string is used as cookie path PHP will assign the current directory as cookie path.

This means when an user had installed an ownCloud under "/", which is mapped to an empty string in \OC::$WEBROOT, and accessed it the cookie was set to values such as "/index.php/apps/files" since the web browser assumed this to be a directory. This means that multiple encryption cookies were set for the same domain resulting in potential havoc.

With this patch the path will be set to "/" in case an empty web root is installed which makes the cookie accessible to the whole domain.

To test this setup multiple ownCloud instances on the same domain under different ports and have both installed under "/", then try to login in both of it and previously this can in some cases lead to a lockout of the user.

Note that this affects the cookies that the browsers do sent and thus to test this you need to clear all cookies from your browser previously. I consider this an acceptable behaviour for now since this code is only in master.

Fixes https://github.com/owncloud/core/issues/18919
---
 lib/private/session/cryptowrapper.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/private/session/cryptowrapper.php b/lib/private/session/cryptowrapper.php
index 62bdcbfb719..261514d683e 100644
--- a/lib/private/session/cryptowrapper.php
+++ b/lib/private/session/cryptowrapper.php
@@ -77,7 +77,11 @@ class CryptoWrapper {
 			$secureCookie = $request->getServerProtocol() === 'https';
 			// FIXME: Required for CI
 			if (!defined('PHPUNIT_RUN')) {
-				setcookie(self::COOKIE_NAME, $this->passphrase, 0, \OC::$WEBROOT, '', $secureCookie, true);
+				$webRoot = \OC::$WEBROOT;
+				if($webRoot === '') {
+					$webRoot = '/';
+				}
+				setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);
 			}
 		}
 	}
-- 
GitLab


From 7f459c64cb3bc011d8eb72ddb78cbd678949c675 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 11 Sep 2015 21:18:13 +0200
Subject: [PATCH 240/783] check for the right user if we can change his
 password

---
 apps/encryption/appinfo/application.php       |  1 +
 apps/encryption/hooks/userhooks.php           | 10 ++-
 apps/encryption/tests/hooks/UserHooksTest.php | 65 +++++++++++++++++--
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index 75107b2723c..1155c61aba1 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -83,6 +83,7 @@ class Application extends \OCP\AppFramework\App {
 
 			$hookManager->registerHook([
 				new UserHooks($container->query('KeyManager'),
+					$server->getUserManager(),
 					$server->getLogger(),
 					$container->query('UserSetup'),
 					$server->getUserSession(),
diff --git a/apps/encryption/hooks/userhooks.php b/apps/encryption/hooks/userhooks.php
index 8b6f17bec6d..5bd5e39f3c5 100644
--- a/apps/encryption/hooks/userhooks.php
+++ b/apps/encryption/hooks/userhooks.php
@@ -24,6 +24,7 @@
 namespace OCA\Encryption\Hooks;
 
 
+use OCP\IUserManager;
 use OCP\Util as OCUtil;
 use OCA\Encryption\Hooks\Contracts\IHook;
 use OCA\Encryption\KeyManager;
@@ -41,6 +42,10 @@ class UserHooks implements IHook {
 	 * @var KeyManager
 	 */
 	private $keyManager;
+	/**
+	 * @var IUserManager
+	 */
+	private $userManager;
 	/**
 	 * @var ILogger
 	 */
@@ -74,6 +79,7 @@ class UserHooks implements IHook {
 	 * UserHooks constructor.
 	 *
 	 * @param KeyManager $keyManager
+	 * @param IUserManager $userManager
 	 * @param ILogger $logger
 	 * @param Setup $userSetup
 	 * @param IUserSession $user
@@ -83,6 +89,7 @@ class UserHooks implements IHook {
 	 * @param Recovery $recovery
 	 */
 	public function __construct(KeyManager $keyManager,
+								IUserManager $userManager,
 								ILogger $logger,
 								Setup $userSetup,
 								IUserSession $user,
@@ -92,6 +99,7 @@ class UserHooks implements IHook {
 								Recovery $recovery) {
 
 		$this->keyManager = $keyManager;
+		$this->userManager = $userManager;
 		$this->logger = $logger;
 		$this->userSetup = $userSetup;
 		$this->user = $user;
@@ -196,7 +204,7 @@ class UserHooks implements IHook {
 	public function preSetPassphrase($params) {
 		if (App::isEnabled('encryption')) {
 
-			$user = $this->user->getUser();
+			$user = $this->userManager->get($params['uid']);
 
 			if ($user && !$user->canChangePassword()) {
 				$this->setPassphrase($params);
diff --git a/apps/encryption/tests/hooks/UserHooksTest.php b/apps/encryption/tests/hooks/UserHooksTest.php
index aa16a4d8703..0b0222ce861 100644
--- a/apps/encryption/tests/hooks/UserHooksTest.php
+++ b/apps/encryption/tests/hooks/UserHooksTest.php
@@ -47,6 +47,11 @@ class UserHooksTest extends TestCase {
 	 * @var \PHPUnit_Framework_MockObject_MockObject
 	 */
 	private $keyManagerMock;
+	/**
+	 * @var \PHPUnit_Framework_MockObject_MockObject
+	 */
+	private $userManagerMock;
+
 	/**
 	 * @var \PHPUnit_Framework_MockObject_MockObject
 	 */
@@ -101,11 +106,58 @@ class UserHooksTest extends TestCase {
 		$this->assertNull($this->instance->postDeleteUser($this->params));
 	}
 
-	public function testPreSetPassphrase() {
-		$this->userSessionMock->expects($this->once())
-			->method('canChangePassword');
+	/**
+	 * @dataProvider dataTestPreSetPassphrase
+	 */
+	public function testPreSetPassphrase($canChange) {
+
+		/** @var UserHooks | \PHPUnit_Framework_MockObject_MockObject  $instance */
+		$instance = $this->getMockBuilder('OCA\Encryption\Hooks\UserHooks')
+			->setConstructorArgs(
+				[
+					$this->keyManagerMock,
+					$this->userManagerMock,
+					$this->loggerMock,
+					$this->userSetupMock,
+					$this->userSessionMock,
+					$this->utilMock,
+					$this->sessionMock,
+					$this->cryptMock,
+					$this->recoveryMock
+				]
+			)
+			->setMethods(['setPassphrase'])
+			->getMock();
+
+		$userMock = $this->getMock('OCP\IUser');
+
+		$this->userManagerMock->expects($this->once())
+			->method('get')
+			->with($this->params['uid'])
+			->willReturn($userMock);
+		$userMock->expects($this->once())
+			->method('canChangePassword')
+			->willReturn($canChange);
+
+		if ($canChange) {
+			// in this case the password will be changed in the post hook
+			$instance->expects($this->never())->method('setPassphrase');
+		} else {
+			// if user can't change the password we update the encryption
+			// key password already in the pre hook
+			$instance->expects($this->once())
+				->method('setPassphrase')
+				->with($this->params);
+		}
+
+		$instance->preSetPassphrase($this->params);
+	}
 
-		$this->assertNull($this->instance->preSetPassphrase($this->params));
+	public function dataTestPreSetPassphrase() {
+		return [
+			[true],
+			[false]
+		];
 	}
 
 	public function testSetPassphrase() {
@@ -186,6 +238,7 @@ class UserHooksTest extends TestCase {
 			->willReturn(false);
 
 		$userHooks = new UserHooks($this->keyManagerMock,
+			$this->userManagerMock,
 			$this->loggerMock,
 			$this->userSetupMock,
 			$userSessionMock,
@@ -216,6 +269,9 @@ class UserHooksTest extends TestCase {
 		$this->keyManagerMock = $this->getMockBuilder('OCA\Encryption\KeyManager')
 			->disableOriginalConstructor()
 			->getMock();
+		$this->userManagerMock = $this->getMockBuilder('OCP\IUserManager')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->userSetupMock = $this->getMockBuilder('OCA\Encryption\Users\Setup')
 			->disableOriginalConstructor()
 			->getMock();
@@ -258,6 +314,7 @@ class UserHooksTest extends TestCase {
 		$this->recoveryMock = $recoveryMock;
 		$this->utilMock = $utilMock;
 		$this->instance = new UserHooks($this->keyManagerMock,
+			$this->userManagerMock,
 			$this->loggerMock,
 			$this->userSetupMock,
 			$this->userSessionMock,
-- 
GitLab


From 69b64b5b10f66e2826d9b59e26695ae2fa9ef161 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 14 Sep 2015 12:00:39 +0200
Subject: [PATCH 241/783] use the same pattern for the command name like every
 other command

---
 core/command/encryption/encryptall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index db413a33d92..7f33e18ecbb 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -83,7 +83,7 @@ class EncryptAll extends Command {
 	protected function configure() {
 		parent::configure();
 
-		$this->setName('encryption:encrypt_all');
+		$this->setName('encryption:encrypt-all');
 		$this->setDescription(
 			'This will encrypt all files for all users. '
 			. 'Please make sure that no user access his files during this process!'
-- 
GitLab


From 0e805d53105397aa8edbe4aab53eddc6af359275 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 11 Sep 2015 12:11:40 +0200
Subject: [PATCH 242/783] Do not compare the value on Oracle

As per docs: http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286
> Large objects (LOBs) are not supported in comparison conditions.
---
 lib/private/appconfig.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index 7ee64980fd0..cf2a057f224 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -175,11 +175,21 @@ class AppConfig implements IAppConfig {
 			->set('configvalue', $sql->createParameter('configvalue'))
 			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
 			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
-			->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue')))
 			->setParameter('configvalue', $value)
 			->setParameter('app', $app)
-			->setParameter('configkey', $key)
-			->setParameter('configvalue', $value);
+			->setParameter('configkey', $key);
+
+		/*
+		 * Only limit to the existing value for non-Oracle DBs:
+		 * http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286
+		 * > Large objects (LOBs) are not supported in comparison conditions.
+		 */
+		if (!($this->conn instanceof \OC\DB\OracleConnection)) {
+			// Only update the value when it is not the same
+			$sql->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue')))
+				->setParameter('configvalue', $value);
+		}
+
 		$changedRow = (bool) $sql->execute();
 
 		$this->cache[$app][$key] = $value;
-- 
GitLab


From be2023dae34ff9178e6395ab53d90b5e2d0d1b55 Mon Sep 17 00:00:00 2001
From: Nicolai Ehemann <en@enlightened.de>
Date: Thu, 3 Apr 2014 15:39:19 +0200
Subject: [PATCH 243/783] lib/private/files.php: adapted to minimally changed
 ZipStreamer API

---
 3rdparty              | 2 +-
 lib/private/files.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/3rdparty b/3rdparty
index b94f7d38f6e..0f862d433ad 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit b94f7d38f6e13825fd34c7113827d3c369a689ad
+Subproject commit 0f862d433ad146ebca97e356c703369777c2a30f
diff --git a/lib/private/files.php b/lib/private/files.php
index 0172f1ca6af..ec586a7a08a 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -41,7 +41,7 @@
  */
 
 // TODO: get rid of this using proper composer packages
-require_once 'mcnetic/phpzipstreamer/ZipStreamer.php';
+require_once 'mcnetic/phpzipstreamer/src/ZipStreamer.php';
 
 use OC\Lock\NoopLockingProvider;
 use OCP\Lock\ILockingProvider;
@@ -121,7 +121,7 @@ class OC_Files {
 		if ($get_type === self::FILE) {
 			$zip = false;
 		} else {
-			$zip = new ZipStreamer(false);
+			$zip = new ZipStreamer\ZipStreamer();
 		}
 		OC_Util::obEnd();
 
-- 
GitLab


From c39db52cfa4115f9790ba6b3ffa66052a097765e Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 30 Jul 2015 20:31:27 +0200
Subject: [PATCH 244/783] Use srcset to select best avatar size

* Allow the browser to select the best available avatar for the screen
---
 core/templates/layout.user.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 0910047032d..4d9e3ae93d5 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -67,8 +67,10 @@
 					<?php if ($_['enableAvatars']): ?>
 					<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
 						<?php if ($_['userAvatarSet']): ?>
-							<img src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32]));?>?requesttoken=<?php p(urlencode($_['requesttoken'])); ?>"
-								alt="">
+							<img alt="" width="32" height="32"
+							src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32]));?>"
+							srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128]));?> 4x"
+							>
 						<?php endif; ?>
 					</div>
 					<?php endif; ?>
-- 
GitLab


From 2d0f0e898dfe36d1c2d4919b772a0c886317274b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 14 Sep 2015 15:27:06 +0200
Subject: [PATCH 245/783] Only check the "was updated/inserted" when not on
 Oracle...

---
 tests/lib/appconfig.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/lib/appconfig.php b/tests/lib/appconfig.php
index 5ea446aee51..98420abe7bc 100644
--- a/tests/lib/appconfig.php
+++ b/tests/lib/appconfig.php
@@ -191,7 +191,10 @@ class AppConfig extends TestCase {
 		$this->assertEquals('1.2.3', $config->getValue('testapp', 'installed_version'));
 		$this->assertConfigKey('testapp', 'installed_version', '1.2.3');
 
-		$this->assertFalse($config->setValue('testapp', 'installed_version', '1.2.3'));
+		$wasModified = $config->setValue('testapp', 'installed_version', '1.2.3');
+		if (!(\OC::$server->getDatabaseConnection() instanceof \OC\DB\OracleConnection)) {
+			$this->assertFalse($wasModified);
+		}
 
 		$this->assertEquals('1.2.3', $config->getValue('testapp', 'installed_version'));
 		$this->assertConfigKey('testapp', 'installed_version', '1.2.3');
@@ -218,7 +221,10 @@ class AppConfig extends TestCase {
 		$this->assertEquals('somevalue', $config->getValue('someapp', 'somekey'));
 		$this->assertConfigKey('someapp', 'somekey', 'somevalue');
 
-		$this->assertFalse($config->setValue('someapp', 'somekey', 'somevalue'));
+		$wasInserted = $config->setValue('someapp', 'somekey', 'somevalue');
+		if (!(\OC::$server->getDatabaseConnection() instanceof \OC\DB\OracleConnection)) {
+			$this->assertFalse($wasInserted);
+		}
 	}
 
 	public function testDeleteKey() {
-- 
GitLab


From 6c6be72e6bedce42082b4955e36eb1ad1fb8cfdd Mon Sep 17 00:00:00 2001
From: Nicolai Ehemann <en@enlightened.de>
Date: Mon, 14 Sep 2015 15:33:28 +0200
Subject: [PATCH 246/783] use zipstreamer via composer

---
 3rdparty              | 2 +-
 lib/private/files.php | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/3rdparty b/3rdparty
index 0f862d433ad..70d9c4096e7 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 0f862d433ad146ebca97e356c703369777c2a30f
+Subproject commit 70d9c4096e767b4103960ffad96b87e3e511ee61
diff --git a/lib/private/files.php b/lib/private/files.php
index ec586a7a08a..658e708e5de 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -40,9 +40,6 @@
  *
  */
 
-// TODO: get rid of this using proper composer packages
-require_once 'mcnetic/phpzipstreamer/src/ZipStreamer.php';
-
 use OC\Lock\NoopLockingProvider;
 use OCP\Lock\ILockingProvider;
 
-- 
GitLab


From dad56921aeca0da7750039362777764998d86aee Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 14 Sep 2015 16:58:25 +0100
Subject: [PATCH 247/783] Register valid root for all installed apps in console

We need to use commands from apps that aren't enabled (so don't get loaded).
---
 lib/private/console/application.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/private/console/application.php b/lib/private/console/application.php
index 7c709927219..edfb45c8577 100644
--- a/lib/private/console/application.php
+++ b/lib/private/console/application.php
@@ -55,7 +55,9 @@ class Application {
 			if (!\OCP\Util::needUpgrade()) {
 				OC_App::loadApps();
 				foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
-					$file = OC_App::getAppPath($app) . '/appinfo/register_command.php';
+					$appPath = \OC_App::getAppPath($app);
+					\OC::$loader->addValidRoot($appPath);
+					$file = $appPath . '/appinfo/register_command.php';
 					if (file_exists($file)) {
 						require $file;
 					}
-- 
GitLab


From 209abaadbb6bf6c5b375a11f61e61fe47fb9b917 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Jul 2015 15:12:36 +0200
Subject: [PATCH 248/783] expose locking api in sabre connector

---
 lib/private/connector/sabre/node.php | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index 7f4bf8ffed1..30faf9941bd 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -67,6 +67,7 @@ abstract class Node implements \Sabre\DAV\INode {
 
 	/**
 	 * Sets up the node, expects a full path name
+	 *
 	 * @param \OC\Files\View $view
 	 * @param \OCP\Files\FileInfo $info
 	 */
@@ -82,6 +83,7 @@ abstract class Node implements \Sabre\DAV\INode {
 
 	/**
 	 *  Returns the name of the node
+	 *
 	 * @return string
 	 */
 	public function getName() {
@@ -99,6 +101,7 @@ abstract class Node implements \Sabre\DAV\INode {
 
 	/**
 	 * Renames the node
+	 *
 	 * @param string $name The new name
 	 * @throws \Sabre\DAV\Exception\BadRequest
 	 * @throws \Sabre\DAV\Exception\Forbidden
@@ -131,6 +134,7 @@ abstract class Node implements \Sabre\DAV\INode {
 
 	/**
 	 * Returns the last modification time, as a unix timestamp
+	 *
 	 * @return int timestamp as integer
 	 */
 	public function getLastModified() {
@@ -212,7 +216,7 @@ abstract class Node implements \Sabre\DAV\INode {
 	 * @return string|null
 	 */
 	public function getDavPermissions() {
-		$p ='';
+		$p = '';
 		if ($this->info->isShared()) {
 			$p .= 'S';
 		}
@@ -248,4 +252,25 @@ abstract class Node implements \Sabre\DAV\INode {
 			throw new InvalidPath($ex->getMessage());
 		}
 	}
+
+	/**
+	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+	 */
+	public function acquireLock($type) {
+		$this->fileView->lockFile($this->path, $type);
+	}
+
+	/**
+	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+	 */
+	public function releaseLock($type) {
+		$this->fileView->unlockFile($this->path, $type);
+	}
+
+	/**
+	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+	 */
+	public function changeLock($type) {
+		$this->fileView->changeLock($this->path, $type);
+	}
 }
-- 
GitLab


From e612d3123f2b3d6ffd6d0e8b4da331cc5c6a8b3b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Jul 2015 15:28:56 +0200
Subject: [PATCH 249/783] wrap the entire put operation in a read lock

---
 lib/private/connector/sabre/directory.php     |  2 +
 lib/private/connector/sabre/file.php          | 11 +--
 lib/private/connector/sabre/lockplugin.php    | 93 +++++++++++++++++++
 lib/private/connector/sabre/serverfactory.php |  1 +
 4 files changed, 98 insertions(+), 9 deletions(-)
 create mode 100644 lib/private/connector/sabre/lockplugin.php

diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index 551176e4bd2..0261ab18047 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -30,6 +30,7 @@ namespace OC\Connector\Sabre;
 
 use OC\Connector\Sabre\Exception\InvalidPath;
 use OC\Connector\Sabre\Exception\FileLocked;
+use OCP\Lock\ILockingProvider;
 use OCP\Lock\LockedException;
 use Sabre\DAV\Exception\Locked;
 
@@ -110,6 +111,7 @@ class Directory extends \OC\Connector\Sabre\Node
 			// using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete
 			$info = new \OC\Files\FileInfo($path, null, null, array(), null);
 			$node = new \OC\Connector\Sabre\File($this->fileView, $info);
+			$node->acquireLock(ILockingProvider::LOCK_SHARED);
 			return $node->put($data);
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
 			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index b7d0c547f24..1730feee264 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -114,12 +114,6 @@ class File extends Node implements IFile {
 			$partFilePath = $this->path;
 		}
 
-		try {
-			$this->fileView->lockFile($this->path, ILockingProvider::LOCK_SHARED);
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-
 		// the part file and target file might be on a different storage in case of a single file storage (e.g. single file share)
 		/** @var \OC\Files\Storage\Storage $partStorage */
 		list($partStorage, $internalPartPath) = $this->fileView->resolvePath($partFilePath);
@@ -176,7 +170,7 @@ class File extends Node implements IFile {
 			}
 
 			try {
-				$this->fileView->changeLock($this->path, ILockingProvider::LOCK_EXCLUSIVE);
+				$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
 			} catch (LockedException $e) {
 				if ($needsPartFile) {
 					$partStorage->unlink($internalPartPath);
@@ -202,7 +196,7 @@ class File extends Node implements IFile {
 			}
 
 			try {
-				$this->fileView->changeLock($this->path, ILockingProvider::LOCK_SHARED);
+				$this->changeLock(ILockingProvider::LOCK_SHARED);
 			} catch (LockedException $e) {
 				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
 			}
@@ -233,7 +227,6 @@ class File extends Node implements IFile {
 				}
 			}
 			$this->refreshInfo();
-			$this->fileView->unlockFile($this->path, ILockingProvider::LOCK_SHARED);
 		} catch (StorageNotAvailableException $e) {
 			throw new ServiceUnavailable("Failed to check file size: " . $e->getMessage());
 		}
diff --git a/lib/private/connector/sabre/lockplugin.php b/lib/private/connector/sabre/lockplugin.php
new file mode 100644
index 00000000000..d3e4e9e4d10
--- /dev/null
+++ b/lib/private/connector/sabre/lockplugin.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Connector\Sabre;
+
+use OC\Connector\Sabre\Exception\FileLocked;
+use OCP\Lock\ILockingProvider;
+use OCP\Lock\LockedException;
+use Sabre\DAV\Exception\NotFound;
+use \Sabre\DAV\PropFind;
+use \Sabre\DAV\PropPatch;
+use Sabre\DAV\ServerPlugin;
+use Sabre\DAV\Tree;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
+
+class LockPlugin extends ServerPlugin {
+	/**
+	 * Reference to main server object
+	 *
+	 * @var \Sabre\DAV\Server
+	 */
+	private $server;
+
+	/**
+	 * @var \Sabre\DAV\Tree
+	 */
+	private $tree;
+
+	/**
+	 * @param \Sabre\DAV\Tree $tree tree
+	 */
+	public function __construct(Tree $tree) {
+		$this->tree = $tree;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function initialize(\Sabre\DAV\Server $server) {
+		$this->server = $server;
+		$this->server->on('beforeMethod', [$this, 'getLock'], 50);
+		$this->server->on('afterMethod', [$this, 'releaseLock'], 50);
+	}
+
+	public function getLock(RequestInterface $request) {
+		// we cant listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
+		// so instead we limit ourselves to the PUT method manually
+		if ($request->getMethod() !== 'PUT') {
+			return;
+		}
+		try {
+			$node = $this->tree->getNodeForPath($request->getPath());
+		} catch (NotFound $e) {
+			return;
+		}
+		if ($node instanceof Node) {
+			try {
+				$node->acquireLock(ILockingProvider::LOCK_SHARED);
+			} catch (LockedException $e) {
+				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+			}
+		}
+	}
+
+	public function releaseLock(RequestInterface $request) {
+		if ($request->getMethod() !== 'PUT') {
+			return;
+		}
+		$node = $this->tree->getNodeForPath($request->getPath());
+		if ($node instanceof Node) {
+			$node->releaseLock(ILockingProvider::LOCK_SHARED);
+		}
+	}
+}
diff --git a/lib/private/connector/sabre/serverfactory.php b/lib/private/connector/sabre/serverfactory.php
index 525ff0104cd..86f60633541 100644
--- a/lib/private/connector/sabre/serverfactory.php
+++ b/lib/private/connector/sabre/serverfactory.php
@@ -70,6 +70,7 @@ class ServerFactory {
 		$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
 		$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin($this->config));
 		$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
+		$server->addPlugin(new \OC\Connector\Sabre\LockPlugin($objectTree));
 
 		// wait with registering these until auth is handled and the filesystem is setup
 		$server->on('beforeMethod', function () use ($server, $objectTree, $viewCallBack) {
-- 
GitLab


From 17b671ee253bd232c18f9e27e4ee75b25f791296 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 24 Jul 2015 14:12:50 +0200
Subject: [PATCH 250/783] adjust tests to handle before/after locking

---
 tests/lib/connector/sabre/file.php | 48 ++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index 246f7f6d0a2..835ca2ed242 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -114,7 +114,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->atLeastOnce())
 			->method('resolvePath')
 			->will($this->returnCallback(
-				function($path) use ($storage){
+				function ($path) use ($storage) {
 					return [$storage, $path];
 				}
 			));
@@ -172,7 +172,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->atLeastOnce())
 			->method('resolvePath')
 			->will($this->returnCallback(
-				function($path) use ($storage){
+				function ($path) use ($storage) {
 					return [$storage, $path];
 				}
 			));
@@ -249,7 +249,15 @@ class File extends \Test\TestCase {
 
 		$file = new \OC\Connector\Sabre\File($view, $info);
 
-		return $file->put($this->getStream('test data'));
+		// beforeMethod locks
+		$view->lockFile($path, ILockingProvider::LOCK_SHARED);
+
+		$result = $file->put($this->getStream('test data'));
+
+		// afterMethod unlocks
+		$view->unlockFile($path, ILockingProvider::LOCK_SHARED);
+
+		return $result;
 	}
 
 	/**
@@ -431,7 +439,13 @@ class File extends \Test\TestCase {
 		// action
 		$thrown = false;
 		try {
+			// beforeMethod locks
+			$view->lockFile('/test.txt', ILockingProvider::LOCK_SHARED);
+
 			$file->put($this->getStream('test data'));
+
+			// afterMethod unlocks
+			$view->unlockFile('/test.txt', ILockingProvider::LOCK_SHARED);
 		} catch (\Sabre\DAV\Exception\BadRequest $e) {
 			$thrown = true;
 		}
@@ -458,7 +472,13 @@ class File extends \Test\TestCase {
 		// action
 		$thrown = false;
 		try {
+			// beforeMethod locks
+			$view->lockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
+
 			$file->put($this->getStream('test data'));
+
+			// afterMethod unlocks
+			$view->unlockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
 		} catch (\OC\Connector\Sabre\Exception\FileLocked $e) {
 			$thrown = true;
 		}
@@ -519,7 +539,13 @@ class File extends \Test\TestCase {
 		// action
 		$thrown = false;
 		try {
+			// beforeMethod locks
+			$view->lockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
+
 			$file->put($this->getStream('test data'));
+
+			// afterMethod unlocks
+			$view->unlockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
 		} catch (\OC\Connector\Sabre\Exception\InvalidPath $e) {
 			$thrown = true;
 		}
@@ -577,7 +603,13 @@ class File extends \Test\TestCase {
 		// action
 		$thrown = false;
 		try {
+			// beforeMethod locks
+			$view->lockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
+
 			$file->put($this->getStream('test data'));
+
+			// afterMethod unlocks
+			$view->unlockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
 		} catch (\Sabre\DAV\Exception\BadRequest $e) {
 			$thrown = true;
 		}
@@ -702,7 +734,7 @@ class File extends \Test\TestCase {
 		$eventHandler->expects($this->once())
 			->method('writeCallback')
 			->will($this->returnCallback(
-				function() use ($view, $path, &$wasLockedPre){
+				function () use ($view, $path, &$wasLockedPre) {
 					$wasLockedPre = $this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_SHARED);
 					$wasLockedPre = $wasLockedPre && !$this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE);
 				}
@@ -710,7 +742,7 @@ class File extends \Test\TestCase {
 		$eventHandler->expects($this->once())
 			->method('postWriteCallback')
 			->will($this->returnCallback(
-				function() use ($view, $path, &$wasLockedPost){
+				function () use ($view, $path, &$wasLockedPost) {
 					$wasLockedPost = $this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_SHARED);
 					$wasLockedPost = $wasLockedPost && !$this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE);
 				}
@@ -729,8 +761,14 @@ class File extends \Test\TestCase {
 			'postWriteCallback'
 		);
 
+		// beforeMethod locks
+		$view->lockFile($path, ILockingProvider::LOCK_SHARED);
+
 		$this->assertNotEmpty($file->put($this->getStream('test data')));
 
+		// afterMethod unlocks
+		$view->unlockFile($path, ILockingProvider::LOCK_SHARED);
+
 		$this->assertTrue($wasLockedPre, 'File was locked during pre-hooks');
 		$this->assertTrue($wasLockedPost, 'File was locked during post-hooks');
 
-- 
GitLab


From b4241514597585b69816d02d46ece6fda6cf7012 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 12 Aug 2015 14:13:03 +0200
Subject: [PATCH 251/783] handle notfound exceptions in lock plugin

---
 lib/private/connector/sabre/lockplugin.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/private/connector/sabre/lockplugin.php b/lib/private/connector/sabre/lockplugin.php
index d3e4e9e4d10..a3a7bb84e39 100644
--- a/lib/private/connector/sabre/lockplugin.php
+++ b/lib/private/connector/sabre/lockplugin.php
@@ -85,7 +85,11 @@ class LockPlugin extends ServerPlugin {
 		if ($request->getMethod() !== 'PUT') {
 			return;
 		}
-		$node = $this->tree->getNodeForPath($request->getPath());
+		try {
+			$node = $this->tree->getNodeForPath($request->getPath());
+		} catch (NotFound $e) {
+			return;
+		}
 		if ($node instanceof Node) {
 			$node->releaseLock(ILockingProvider::LOCK_SHARED);
 		}
-- 
GitLab


From 63863271503384e124e39833d0598e8652d3a380 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 12 Aug 2015 15:06:59 +0200
Subject: [PATCH 252/783] work directly on storages when doing a chunked upload
 assembly

---
 lib/private/connector/sabre/file.php | 117 +++++++++++++++++----------
 lib/private/filechunking.php         |  27 +++----
 2 files changed, 87 insertions(+), 57 deletions(-)

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 1730feee264..a7e529183b6 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -35,6 +35,7 @@ namespace OC\Connector\Sabre;
 use OC\Connector\Sabre\Exception\EntityTooLarge;
 use OC\Connector\Sabre\Exception\FileLocked;
 use OC\Connector\Sabre\Exception\UnsupportedMediaType;
+use OC\Files\Filesystem;
 use OCP\Encryption\Exceptions\GenericEncryptionException;
 use OCP\Files\EntityTooLargeException;
 use OCP\Files\InvalidContentException;
@@ -126,7 +127,7 @@ class File extends Node implements IFile {
 				// because we have no clue about the cause we can only throw back a 500/Internal Server Error
 				throw new Exception('Could not write file contents');
 			}
-			list($count, ) = \OC_Helper::streamCopy($data, $target);
+			list($count,) = \OC_Helper::streamCopy($data, $target);
 			fclose($target);
 
 			// if content length is sent by client:
@@ -148,25 +149,8 @@ class File extends Node implements IFile {
 
 		try {
 			$view = \OC\Files\Filesystem::getView();
-			$run = true;
 			if ($view) {
-				$hookPath = $view->getRelativePath($this->fileView->getAbsolutePath($this->path));
-
-				if (!$exists) {
-					\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_create, array(
-						\OC\Files\Filesystem::signal_param_path => $hookPath,
-						\OC\Files\Filesystem::signal_param_run => &$run,
-					));
-				} else {
-					\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_update, array(
-						\OC\Files\Filesystem::signal_param_path => $hookPath,
-						\OC\Files\Filesystem::signal_param_run => &$run,
-					));
-				}
-				\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_write, array(
-					\OC\Files\Filesystem::signal_param_path => $hookPath,
-					\OC\Files\Filesystem::signal_param_run => &$run,
-				));
+				$this->emitPreHooks($exists);
 			}
 
 			try {
@@ -181,11 +165,9 @@ class File extends Node implements IFile {
 			if ($needsPartFile) {
 				// rename to correct path
 				try {
-					if ($run) {
-						$renameOkay = $storage->moveFromStorage($partStorage, $internalPartPath, $internalPath);
-						$fileExists = $storage->file_exists($internalPath);
-					}
-					if (!$run || $renameOkay === false || $fileExists === false) {
+					$renameOkay = $storage->moveFromStorage($partStorage, $internalPartPath, $internalPath);
+					$fileExists = $storage->file_exists($internalPath);
+					if ($renameOkay === false || $fileExists === false) {
 						\OCP\Util::writeLog('webdav', 'renaming part file to final file failed', \OCP\Util::ERROR);
 						throw new Exception('Could not rename part file to final file');
 					}
@@ -205,18 +187,7 @@ class File extends Node implements IFile {
 			$this->fileView->getUpdater()->update($this->path);
 
 			if ($view) {
-				if (!$exists) {
-					\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_create, array(
-						\OC\Files\Filesystem::signal_param_path => $hookPath
-					));
-				} else {
-					\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_update, array(
-						\OC\Files\Filesystem::signal_param_path => $hookPath
-					));
-				}
-				\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_write, array(
-					\OC\Files\Filesystem::signal_param_path => $hookPath
-				));
+				$this->emitPostHooks($exists);
 			}
 
 			// allow sync clients to send the mtime along in a header
@@ -234,6 +205,43 @@ class File extends Node implements IFile {
 		return '"' . $this->info->getEtag() . '"';
 	}
 
+	private function emitPreHooks($exists) {
+		$hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($this->path));
+		$run = true;
+
+		if (!$exists) {
+			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_create, array(
+				\OC\Files\Filesystem::signal_param_path => $hookPath,
+				\OC\Files\Filesystem::signal_param_run => &$run,
+			));
+		} else {
+			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_update, array(
+				\OC\Files\Filesystem::signal_param_path => $hookPath,
+				\OC\Files\Filesystem::signal_param_run => &$run,
+			));
+		}
+		\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_write, array(
+			\OC\Files\Filesystem::signal_param_path => $hookPath,
+			\OC\Files\Filesystem::signal_param_run => &$run,
+		));
+	}
+
+	private function emitPostHooks($exists) {
+		$hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($this->path));
+		if (!$exists) {
+			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_create, array(
+				\OC\Files\Filesystem::signal_param_path => $hookPath
+			));
+		} else {
+			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_update, array(
+				\OC\Files\Filesystem::signal_param_path => $hookPath
+			));
+		}
+		\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_write, array(
+			\OC\Files\Filesystem::signal_param_path => $hookPath
+		));
+	}
+
 	/**
 	 * Returns the data
 	 *
@@ -347,15 +355,30 @@ class File extends Node implements IFile {
 			$needsPartFile = $this->needsPartFile($storage);
 			$partFile = null;
 
+			$targetPath = $path . '/' . $info['name'];
+			/** @var \OC\Files\Storage\Storage $targetStorage */
+			list($targetStorage, $targetInternalPath) = $this->fileView->resolvePath($targetPath);
+
+			$exists = $this->fileView->file_exists($targetPath);
+
 			try {
-				$targetPath = $path . '/' . $info['name'];
+				$this->emitPreHooks($exists);
+
+				$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
+
 				if ($needsPartFile) {
 					// we first assembly the target file as a part file
 					$partFile = $path . '/' . $info['name'] . '.ocTransferId' . $info['transferid'] . '.part';
-					$chunk_handler->file_assemble($partFile);
+
+
+					list($partStorage, $partInternalPath) = $this->fileView->resolvePath($partFile);
+
+
+					$chunk_handler->file_assemble($partStorage, $partInternalPath, $this->fileView->getAbsolutePath($targetPath));
 
 					// here is the final atomic rename
-					$renameOkay = $this->fileView->rename($partFile, $targetPath);
+					$renameOkay = $targetStorage->moveFromStorage($partStorage, $partInternalPath, $targetInternalPath);
+
 					$fileExists = $this->fileView->file_exists($targetPath);
 					if ($renameOkay === false || $fileExists === false) {
 						\OCP\Util::writeLog('webdav', '\OC\Files\Filesystem::rename() failed', \OCP\Util::ERROR);
@@ -364,28 +387,36 @@ class File extends Node implements IFile {
 							// set to null to avoid double-deletion when handling exception
 							// stray part file
 							$partFile = null;
-							$this->fileView->unlink($targetPath);
+							$targetStorage->unlink($targetInternalPath);
 						}
+						$this->changeLock(ILockingProvider::LOCK_SHARED);
 						throw new Exception('Could not rename part file assembled from chunks');
 					}
 				} else {
 					// assemble directly into the final file
-					$chunk_handler->file_assemble($targetPath);
+					$chunk_handler->file_assemble($targetStorage, $targetInternalPath, $this->fileView->getAbsolutePath($targetPath));
 				}
 
 				// allow sync clients to send the mtime along in a header
 				$request = \OC::$server->getRequest();
 				if (isset($request->server['HTTP_X_OC_MTIME'])) {
-					if ($this->fileView->touch($targetPath, $request->server['HTTP_X_OC_MTIME'])) {
+					if ($targetStorage->touch($targetInternalPath, $request->server['HTTP_X_OC_MTIME'])) {
 						header('X-OC-MTime: accepted');
 					}
 				}
 
+				$this->changeLock(ILockingProvider::LOCK_SHARED);
+
+				// since we skipped the view we need to scan and emit the hooks ourselves
+				$this->fileView->getUpdater()->update($this->path);
+
+				$this->emitPostHooks($exists);
+
 				$info = $this->fileView->getFileInfo($targetPath);
 				return $info->getEtag();
 			} catch (\Exception $e) {
 				if ($partFile !== null) {
-					$this->fileView->unlink($partFile);
+					$targetStorage->unlink($targetInternalPath);
 				}
 				$this->convertToSabreException($e);
 			}
diff --git a/lib/private/filechunking.php b/lib/private/filechunking.php
index 82bf61fa7b1..64399ad4366 100644
--- a/lib/private/filechunking.php
+++ b/lib/private/filechunking.php
@@ -178,27 +178,26 @@ class OC_FileChunking {
 	 * Assembles the chunks into the file specified by the path.
 	 * Also triggers the relevant hooks and proxies.
 	 *
-	 * @param string $path target path
+	 * @param \OC\Files\Storage\Storage $storage
+	 * @param string $path target path relative to the storage
+	 * @param string $absolutePath
+	 * @return bool assembled file size or false if file could not be created
 	 *
-	 * @return boolean assembled file size or false if file could not be created
-	 *
-	 * @throws \OC\InsufficientStorageException when file could not be fully
-	 * assembled due to lack of free space
+	 * @throws \OC\ServerNotAvailableException
 	 */
-	public function file_assemble($path) {
-		$absolutePath = \OC\Files\Filesystem::normalizePath(\OC\Files\Filesystem::getView()->getAbsolutePath($path));
+	public function file_assemble($storage, $path, $absolutePath) {
 		$data = '';
 		// use file_put_contents as method because that best matches what this function does
 		if (\OC\Files\Filesystem::isValidPath($path)) {
-			$path = \OC\Files\Filesystem::getView()->getRelativePath($absolutePath);
-			$exists = \OC\Files\Filesystem::file_exists($path);
+			$exists = $storage->file_exists($path);
 			$run = true;
+			$hookPath = \OC\Files\Filesystem::getView()->getRelativePath($absolutePath);
 			if(!$exists) {
 				OC_Hook::emit(
 					\OC\Files\Filesystem::CLASSNAME,
 					\OC\Files\Filesystem::signal_create,
 					array(
-						\OC\Files\Filesystem::signal_param_path => $path,
+						\OC\Files\Filesystem::signal_param_path => $hookPath,
 						\OC\Files\Filesystem::signal_param_run => &$run
 					)
 				);
@@ -207,14 +206,14 @@ class OC_FileChunking {
 				\OC\Files\Filesystem::CLASSNAME,
 				\OC\Files\Filesystem::signal_write,
 				array(
-					\OC\Files\Filesystem::signal_param_path => $path,
+					\OC\Files\Filesystem::signal_param_path => $hookPath,
 					\OC\Files\Filesystem::signal_param_run => &$run
 				)
 			);
 			if(!$run) {
 				return false;
 			}
-			$target = \OC\Files\Filesystem::fopen($path, 'w');
+			$target = $storage->fopen($path, 'w');
 			if($target) {
 				$count = $this->assemble($target);
 				fclose($target);
@@ -222,13 +221,13 @@ class OC_FileChunking {
 					OC_Hook::emit(
 						\OC\Files\Filesystem::CLASSNAME,
 						\OC\Files\Filesystem::signal_post_create,
-						array( \OC\Files\Filesystem::signal_param_path => $path)
+						array( \OC\Files\Filesystem::signal_param_path => $hookPath)
 					);
 				}
 				OC_Hook::emit(
 					\OC\Files\Filesystem::CLASSNAME,
 					\OC\Files\Filesystem::signal_post_write,
-					array( \OC\Files\Filesystem::signal_param_path => $path)
+					array( \OC\Files\Filesystem::signal_param_path => $hookPath)
 				);
 				return $count > 0;
 			}else{
-- 
GitLab


From 80f054ddd347a7b828594d8a4c52fb79b7a89506 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 12 Aug 2015 15:18:30 +0200
Subject: [PATCH 253/783] also verify cache in dav upload tests

---
 .../sabre/requesttest/uploadtest.php          | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/tests/lib/connector/sabre/requesttest/uploadtest.php b/tests/lib/connector/sabre/requesttest/uploadtest.php
index 2cc912d07f2..b8cd44afda7 100644
--- a/tests/lib/connector/sabre/requesttest/uploadtest.php
+++ b/tests/lib/connector/sabre/requesttest/uploadtest.php
@@ -19,18 +19,26 @@ class UploadTest extends RequestTest {
 		$this->assertEquals(201, $response->getStatus());
 		$this->assertTrue($view->file_exists('foo.txt'));
 		$this->assertEquals('asd', $view->file_get_contents('foo.txt'));
+
+		$info = $view->getFileInfo('foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
+		$this->assertEquals(3, $info->getSize());
 	}
 
 	public function testUploadOverWrite() {
 		$user = $this->getUniqueID();
 		$view = $this->setupUser($user, 'pass');
 
-		$view->file_put_contents('foo.txt', 'bar');
+		$view->file_put_contents('foo.txt', 'foobar');
 
 		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
 
 		$this->assertEquals(204, $response->getStatus());
 		$this->assertEquals('asd', $view->file_get_contents('foo.txt'));
+
+		$info = $view->getFileInfo('foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
+		$this->assertEquals(3, $info->getSize());
 	}
 
 	public function testChunkedUpload() {
@@ -49,6 +57,10 @@ class UploadTest extends RequestTest {
 		$this->assertTrue($view->file_exists('foo.txt'));
 
 		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
+
+		$info = $view->getFileInfo('foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
+		$this->assertEquals(6, $info->getSize());
 	}
 
 	public function testChunkedUploadOverWrite() {
@@ -66,6 +78,10 @@ class UploadTest extends RequestTest {
 		$this->assertEquals(201, $response->getStatus());
 
 		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
+
+		$info = $view->getFileInfo('foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
+		$this->assertEquals(6, $info->getSize());
 	}
 
 	public function testChunkedUploadOutOfOrder() {
@@ -84,5 +100,9 @@ class UploadTest extends RequestTest {
 		$this->assertTrue($view->file_exists('foo.txt'));
 
 		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
+
+		$info = $view->getFileInfo('foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
+		$this->assertEquals(6, $info->getSize());
 	}
 }
-- 
GitLab


From 75f126da49acefb54f64f4ce04cc1915bb3fbbcc Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 12 Aug 2015 15:22:33 +0200
Subject: [PATCH 254/783] use the correct path for cache updates when doing
 chunked assembly

---
 lib/private/connector/sabre/file.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index a7e529183b6..c9f81b98aa5 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -205,8 +205,11 @@ class File extends Node implements IFile {
 		return '"' . $this->info->getEtag() . '"';
 	}
 
-	private function emitPreHooks($exists) {
-		$hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($this->path));
+	private function emitPreHooks($exists, $path = null) {
+		if (is_null($path)) {
+			$path = $this->path;
+		}
+		$hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($path));
 		$run = true;
 
 		if (!$exists) {
@@ -226,8 +229,11 @@ class File extends Node implements IFile {
 		));
 	}
 
-	private function emitPostHooks($exists) {
-		$hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($this->path));
+	private function emitPostHooks($exists, $path = null) {
+		if (is_null($path)) {
+			$path = $this->path;
+		}
+		$hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($path));
 		if (!$exists) {
 			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_create, array(
 				\OC\Files\Filesystem::signal_param_path => $hookPath
@@ -362,7 +368,7 @@ class File extends Node implements IFile {
 			$exists = $this->fileView->file_exists($targetPath);
 
 			try {
-				$this->emitPreHooks($exists);
+				$this->emitPreHooks($exists, $targetPath);
 
 				$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
 
@@ -408,9 +414,9 @@ class File extends Node implements IFile {
 				$this->changeLock(ILockingProvider::LOCK_SHARED);
 
 				// since we skipped the view we need to scan and emit the hooks ourselves
-				$this->fileView->getUpdater()->update($this->path);
+				$this->fileView->getUpdater()->update($targetPath);
 
-				$this->emitPostHooks($exists);
+				$this->emitPostHooks($exists, $targetPath);
 
 				$info = $this->fileView->getFileInfo($targetPath);
 				return $info->getEtag();
-- 
GitLab


From 9202d2f45a2de77709378aff15c7397f0ae099ce Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 12 Aug 2015 16:44:43 +0200
Subject: [PATCH 255/783] fix chunking tests

---
 tests/lib/connector/sabre/file.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index 835ca2ed242..e5605dd7cc5 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -210,7 +210,9 @@ class File extends \Test\TestCase {
 		$caughtException = null;
 		try {
 			// last chunk
+			$file->acquireLock(ILockingProvider::LOCK_SHARED);
 			$file->put('test data two');
+			$file->releaseLock(ILockingProvider::LOCK_SHARED);
 		} catch (\Exception $e) {
 			$caughtException = $e;
 		}
-- 
GitLab


From 688981b55c1c27fbd18fd0a3facb08f491fcf9bb Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 12 Aug 2015 16:44:50 +0200
Subject: [PATCH 256/783] allow hook cancel

---
 lib/private/connector/sabre/file.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index c9f81b98aa5..17659c96b07 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -150,7 +150,9 @@ class File extends Node implements IFile {
 		try {
 			$view = \OC\Files\Filesystem::getView();
 			if ($view) {
-				$this->emitPreHooks($exists);
+				$run = $this->emitPreHooks($exists);
+			} else {
+				$run = true;
 			}
 
 			try {
@@ -165,9 +167,11 @@ class File extends Node implements IFile {
 			if ($needsPartFile) {
 				// rename to correct path
 				try {
-					$renameOkay = $storage->moveFromStorage($partStorage, $internalPartPath, $internalPath);
-					$fileExists = $storage->file_exists($internalPath);
-					if ($renameOkay === false || $fileExists === false) {
+					if ($run) {
+						$renameOkay = $storage->moveFromStorage($partStorage, $internalPartPath, $internalPath);
+						$fileExists = $storage->file_exists($internalPath);
+					}
+					if (!$run || $renameOkay === false || $fileExists === false) {
 						\OCP\Util::writeLog('webdav', 'renaming part file to final file failed', \OCP\Util::ERROR);
 						throw new Exception('Could not rename part file to final file');
 					}
@@ -227,6 +231,7 @@ class File extends Node implements IFile {
 			\OC\Files\Filesystem::signal_param_path => $hookPath,
 			\OC\Files\Filesystem::signal_param_run => &$run,
 		));
+		return $run;
 	}
 
 	private function emitPostHooks($exists, $path = null) {
-- 
GitLab


From 8a6574e81a7c0d44c908ce2b4740f004124f63c8 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 13 Aug 2015 12:55:22 +0200
Subject: [PATCH 257/783] Keep right sidebar open, add Details action

---
 apps/files/js/filelist.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c52e414e3a7..d8d73c8a00c 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -219,6 +219,17 @@
 				this._detailsView.addDetailView(new OCA.Files.MainFileInfoDetailView({fileList: this, fileActions: this.fileActions}));
 				this._detailsView.$el.insertBefore(this.$el);
 				this._detailsView.$el.addClass('disappear');
+
+				this.fileActions.registerAction({
+					name: 'Details',
+					mime: 'all',
+					permissions: OC.PERMISSION_READ,
+					actionHandler: function(fileName, context) {
+						var fileInfo = self.elementToFile(context.$file);
+						self._updateDetailsView(fileInfo);
+						OC.Apps.showAppSidebar();
+					}
+				});
 			}
 
 			this.$el.find('#controls').prepend(this.breadcrumb.$el);
@@ -366,7 +377,6 @@
 			}
 
 			if (!fileName) {
-				OC.Apps.hideAppSidebar(this._detailsView.$el);
 				this._detailsView.setFileInfo(null);
 				if (this._currentFileModel) {
 					this._currentFileModel.off();
@@ -384,7 +394,6 @@
 
 			this._detailsView.setFileInfo(model);
 			this._detailsView.$el.scrollTop(0);
-			_.defer(OC.Apps.showAppSidebar, this._detailsView.$el);
 		},
 
 		/**
-- 
GitLab


From d0cea829698294621edff40502feae90a2d3b5ef Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 2 Sep 2015 10:41:08 +0200
Subject: [PATCH 258/783] Fixed sidebar toggle entry

Properly highlight the row after selecting the item.
This also fixes the unit tests by changing the order of registration of
file actions.
---
 apps/files/js/filelist.js | 44 +++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index d8d73c8a00c..3e12573c046 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -193,7 +193,19 @@
 			this.$container = options.scrollContainer || $(window);
 			this.$table = $el.find('table:first');
 			this.$fileList = $el.find('#fileList');
+
+			if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) {
+				this._detailsView = new OCA.Files.DetailsView();
+				this._detailsView.$el.insertBefore(this.$el);
+				this._detailsView.$el.addClass('disappear');
+			}
+
 			this._initFileActions(options.fileActions);
+
+			if (this._detailsView) {
+				this._detailsView.addDetailView(new OCA.Files.MainFileInfoDetailView({fileList: this, fileActions: this.fileActions}));
+			}
+
 			this.files = [];
 			this._selectedFiles = {};
 			this._selectionSummary = new OCA.Files.FileSummary();
@@ -214,24 +226,6 @@
 			}
 			this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions);
 
-			if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) {
-				this._detailsView = new OCA.Files.DetailsView();
-				this._detailsView.addDetailView(new OCA.Files.MainFileInfoDetailView({fileList: this, fileActions: this.fileActions}));
-				this._detailsView.$el.insertBefore(this.$el);
-				this._detailsView.$el.addClass('disappear');
-
-				this.fileActions.registerAction({
-					name: 'Details',
-					mime: 'all',
-					permissions: OC.PERMISSION_READ,
-					actionHandler: function(fileName, context) {
-						var fileInfo = self.elementToFile(context.$file);
-						self._updateDetailsView(fileInfo);
-						OC.Apps.showAppSidebar();
-					}
-				});
-			}
-
 			this.$el.find('#controls').prepend(this.breadcrumb.$el);
 
 			this._renderNewButton();
@@ -296,11 +290,25 @@
 		 * @param {OCA.Files.FileActions} fileActions file actions
 		 */
 		_initFileActions: function(fileActions) {
+			var self = this;
 			this.fileActions = fileActions;
 			if (!this.fileActions) {
 				this.fileActions = new OCA.Files.FileActions();
 				this.fileActions.registerDefaultActions();
 			}
+
+			if (this._detailsView) {
+				this.fileActions.registerAction({
+					name: 'Details',
+					mime: 'all',
+					permissions: OC.PERMISSION_READ,
+					actionHandler: function(fileName, context) {
+						self._updateDetailsView(fileName);
+						OC.Apps.showAppSidebar();
+					}
+				});
+			}
+
 			this._onFileActionsUpdated = _.debounce(_.bind(this._onFileActionsUpdated, this), 100);
 			this.fileActions.on('registerAction', this._onFileActionsUpdated);
 			this.fileActions.on('setDefault', this._onFileActionsUpdated);
-- 
GitLab


From 31a8949adf2cd0daae07fda74960e130bd23ef03 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 14 Sep 2015 22:36:40 +0100
Subject: [PATCH 259/783] Prevent warning decoding content

---
 lib/private/appframework/http/request.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index b430673f9a9..e58c435d9a0 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -410,7 +410,9 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 			}
 		}
 
-		$this->items['parameters'] = array_merge($this->items['parameters'], $params);
+		if (is_array($params)) {
+			$this->items['parameters'] = array_merge($this->items['parameters'], $params);
+		}
 		$this->contentDecoded = true;
 	}
 
-- 
GitLab


From 24d2cbf3de49dab44978061b33d0580d24d89d58 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 15 Sep 2015 01:54:50 -0400
Subject: [PATCH 260/783] [tx-robot] updated from transifex

---
 apps/files_external/l10n/cs_CZ.js   |  2 ++
 apps/files_external/l10n/cs_CZ.json |  2 ++
 apps/files_external/l10n/el.js      | 11 +++++++++++
 apps/files_external/l10n/el.json    | 11 +++++++++++
 apps/files_external/l10n/fi_FI.js   |  3 +++
 apps/files_external/l10n/fi_FI.json |  3 +++
 apps/files_external/l10n/it.js      |  5 +++++
 apps/files_external/l10n/it.json    |  5 +++++
 apps/files_external/l10n/th_TH.js   | 11 +++++++++++
 apps/files_external/l10n/th_TH.json | 11 +++++++++++
 10 files changed, 64 insertions(+)

diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
index 70dcb6b792a..503d00893e9 100644
--- a/apps/files_external/l10n/cs_CZ.js
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -37,11 +37,13 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Klientské ID",
     "Client secret" : "Klientské tajemství",
+    "OpenStack" : "OpenStack",
     "Username" : "Uživatelské jméno",
     "Password" : "Heslo",
     "API key" : "Klíč API",
     "Username and password" : "Uživatelské jméno a heslo",
     "Session credentials" : "Přihlašovací údaje sezení",
+    "RSA public key" : "RSA veřejný klíč",
     "Public key" : "Veřejný klíč",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
index 966c209b68e..74aa6cc82e3 100644
--- a/apps/files_external/l10n/cs_CZ.json
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -35,11 +35,13 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Klientské ID",
     "Client secret" : "Klientské tajemství",
+    "OpenStack" : "OpenStack",
     "Username" : "Uživatelské jméno",
     "Password" : "Heslo",
     "API key" : "Klíč API",
     "Username and password" : "Uživatelské jméno a heslo",
     "Session credentials" : "Přihlašovací údaje sezení",
+    "RSA public key" : "RSA veřejný klíč",
     "Public key" : "Veřejný klíč",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js
index 5147f924c18..b311d615c32 100644
--- a/apps/files_external/l10n/el.js
+++ b/apps/files_external/l10n/el.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
     "Objectstore forbidden" : "Απαγορευμένο objectstore",
     "Invalid storage backend \"%s\"" : "Μή έγκυρο σύστημα υποστήριξης αποθήκευσης  \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Μη επιτρεπόμενο σύστημα υποστήριξης \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Μη επιτρεπόμενος μηχανισμός πιστοποίησης \"%s\"",
     "Unsatisfied backend parameters" : "Ελλιπείς παράμετροι συστήματος",
     "Unsatisfied authentication mechanism parameters" : "Ελλιπείς παράμετροι μηχανισμού πιστοποίησης",
     "Personal" : "Προσωπικά",
@@ -41,11 +43,16 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID πελάτη",
     "Client secret" : "Μυστικό πελάτη",
+    "OpenStack" : "OpenStack",
     "Username" : "Όνομα χρήστη",
     "Password" : "Κωδικός πρόσβασης",
+    "Tenant name" : "Όνομα \"ένοικου\"",
+    "Identity endpoint URL" : "URL τελικού σημείου ταυτοποίησης",
+    "Rackspace" : "Rackspace",
     "API key" : "Κλειδί Google API",
     "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
     "Session credentials" : "Διαπιστευτήρια συνεδρίας",
+    "RSA public key" : "Δημόσιο κλειδί RSA",
     "Public key" : "Δημόσιο κλειδί",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Κάδος",
@@ -68,10 +75,14 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP με σύνδεση με κρυφό κλειδί [ΠΑΡΩΧΗΜΕΝΟ]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Διαμοιράστε",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC [ΠΑΡΩΧΗΜΕΝΟ]",
     "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
     "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
+    "Service name" : "Όνομα υπηρεσίας",
+    "Request timeout (seconds)" : "Χρονικό όριο αιτήματος (δευτερόλεπτα)",
     "<b>Note:</b> " : "<b>Σημείωση:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json
index 46fd7433dff..f42a610cc55 100644
--- a/apps/files_external/l10n/el.json
+++ b/apps/files_external/l10n/el.json
@@ -10,6 +10,8 @@
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
     "Objectstore forbidden" : "Απαγορευμένο objectstore",
     "Invalid storage backend \"%s\"" : "Μή έγκυρο σύστημα υποστήριξης αποθήκευσης  \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Μη επιτρεπόμενο σύστημα υποστήριξης \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Μη επιτρεπόμενος μηχανισμός πιστοποίησης \"%s\"",
     "Unsatisfied backend parameters" : "Ελλιπείς παράμετροι συστήματος",
     "Unsatisfied authentication mechanism parameters" : "Ελλιπείς παράμετροι μηχανισμού πιστοποίησης",
     "Personal" : "Προσωπικά",
@@ -39,11 +41,16 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID πελάτη",
     "Client secret" : "Μυστικό πελάτη",
+    "OpenStack" : "OpenStack",
     "Username" : "Όνομα χρήστη",
     "Password" : "Κωδικός πρόσβασης",
+    "Tenant name" : "Όνομα \"ένοικου\"",
+    "Identity endpoint URL" : "URL τελικού σημείου ταυτοποίησης",
+    "Rackspace" : "Rackspace",
     "API key" : "Κλειδί Google API",
     "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
     "Session credentials" : "Διαπιστευτήρια συνεδρίας",
+    "RSA public key" : "Δημόσιο κλειδί RSA",
     "Public key" : "Δημόσιο κλειδί",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Κάδος",
@@ -66,10 +73,14 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP με σύνδεση με κρυφό κλειδί [ΠΑΡΩΧΗΜΕΝΟ]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Διαμοιράστε",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC [ΠΑΡΩΧΗΜΕΝΟ]",
     "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
     "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
+    "Service name" : "Όνομα υπηρεσίας",
+    "Request timeout (seconds)" : "Χρονικό όριο αιτήματος (δευτερόλεπτα)",
     "<b>Note:</b> " : "<b>Σημείωση:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
index 12aa1c0f1ca..2243f5f5526 100644
--- a/apps/files_external/l10n/fi_FI.js
+++ b/apps/files_external/l10n/fi_FI.js
@@ -30,10 +30,12 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Asiakkaan tunniste",
     "Client secret" : "Asiakassalaisuus",
+    "OpenStack" : "OpenStack",
     "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
     "API key" : "API-avain",
     "Username and password" : "Käyttäjätunnus ja salasana",
+    "RSA public key" : "Julkinen RSA-avain",
     "Public key" : "Julkinen avain",
     "Amazon S3" : "Amazon S3",
     "Port" : "Portti",
@@ -56,6 +58,7 @@ OC.L10N.register(
     "Share" : "Jaa",
     "Username as share" : "Käyttäjänimi jakona",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Palvelun nimi",
     "<b>Note:</b> " : "<b>Huomio:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
index 715e020273a..b629fad87c6 100644
--- a/apps/files_external/l10n/fi_FI.json
+++ b/apps/files_external/l10n/fi_FI.json
@@ -28,10 +28,12 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Asiakkaan tunniste",
     "Client secret" : "Asiakassalaisuus",
+    "OpenStack" : "OpenStack",
     "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
     "API key" : "API-avain",
     "Username and password" : "Käyttäjätunnus ja salasana",
+    "RSA public key" : "Julkinen RSA-avain",
     "Public key" : "Julkinen avain",
     "Amazon S3" : "Amazon S3",
     "Port" : "Portti",
@@ -54,6 +56,7 @@
     "Share" : "Jaa",
     "Username as share" : "Käyttäjänimi jakona",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Palvelun nimi",
     "<b>Note:</b> " : "<b>Huomio:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index 91723215cbf..9c49d95fc31 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -41,11 +41,15 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID client",
     "Client secret" : "Segreto del client",
+    "OpenStack" : "OpenStack",
     "Username" : "Nome utente",
     "Password" : "Password",
+    "Tenant name" : "Nome tenant",
+    "Rackspace" : "Rackspace",
     "API key" : "Chiave API",
     "Username and password" : "Nome utente e password",
     "Session credentials" : "Credenziali di sessione",
+    "RSA public key" : "Chiave pubblica RSA",
     "Public key" : "Chiave pubblica",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -72,6 +76,7 @@ OC.L10N.register(
     "Share" : "Condividi",
     "Username as share" : "Nome utente come condivisione",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nome servizio",
     "<b>Note:</b> " : "<b>Nota:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 266d02872d5..3f6020708d2 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -39,11 +39,15 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID client",
     "Client secret" : "Segreto del client",
+    "OpenStack" : "OpenStack",
     "Username" : "Nome utente",
     "Password" : "Password",
+    "Tenant name" : "Nome tenant",
+    "Rackspace" : "Rackspace",
     "API key" : "Chiave API",
     "Username and password" : "Nome utente e password",
     "Session credentials" : "Credenziali di sessione",
+    "RSA public key" : "Chiave pubblica RSA",
     "Public key" : "Chiave pubblica",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -70,6 +74,7 @@
     "Share" : "Condividi",
     "Username as share" : "Nome utente come condivisione",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nome servizio",
     "<b>Note:</b> " : "<b>Nota:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js
index 35e4da7b1d5..34c1f74ecf8 100644
--- a/apps/files_external/l10n/th_TH.js
+++ b/apps/files_external/l10n/th_TH.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
     "Objectstore forbidden" : "เก็บวัตถุต้องห้าม",
     "Invalid storage backend \"%s\"" : "การจัดเก็บข้อมูลแบ็กเอนด์ไม่ถูกต้อง \"%s\"",
+    "Not permitted to use backend \"%s\"" : "ไม่อนุญาตให้ใช้แบ็กเอนด์ \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "ไม่อนุญาตให้ตรวจสอบการรับรองความถูกต้อง \"%s\"",
     "Unsatisfied backend parameters" : "พารามิเตอร์แบ็กเอนด์ไม่ได้รับอนุญาต",
     "Unsatisfied authentication mechanism parameters" : "การรับรองความถูกต้องไม่เพียงพอ",
     "Personal" : "ส่วนตัว",
@@ -41,11 +43,16 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "OpenStack" : "OpenStack",
     "Username" : "ชื่อผู้ใช้งาน",
     "Password" : "รหัสผ่าน",
+    "Tenant name" : "ชื่อผู้เช่า",
+    "Identity endpoint URL" : "ตัวตนของ URL ปลายทาง",
+    "Rackspace" : "Rackspace",
     "API key" : "รหัส API",
     "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
     "Session credentials" : "ข้อมูลของเซสชั่น",
+    "RSA public key" : "RSA คีย์สาธารณะ",
     "Public key" : "คีย์สาธารณะ",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -68,10 +75,14 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "รูท",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP กับรหัสลับเข้าสู่ระบบ [ยกเลิก]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "แชร์",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS กำลังใช้ OC เข้าสู่ระบบ [ยกเลิก]",
     "Username as share" : "ชื่อผู้ใช้ที่แชร์",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "ชื่อบริการ",
+    "Request timeout (seconds)" : "หมดเวลาการร้องขอ (วินาที)",
     "<b>Note:</b> " : "<b>หมายเหตุ:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน FTP ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json
index d9d3661a2ae..cb18b221c4a 100644
--- a/apps/files_external/l10n/th_TH.json
+++ b/apps/files_external/l10n/th_TH.json
@@ -10,6 +10,8 @@
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
     "Objectstore forbidden" : "เก็บวัตถุต้องห้าม",
     "Invalid storage backend \"%s\"" : "การจัดเก็บข้อมูลแบ็กเอนด์ไม่ถูกต้อง \"%s\"",
+    "Not permitted to use backend \"%s\"" : "ไม่อนุญาตให้ใช้แบ็กเอนด์ \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "ไม่อนุญาตให้ตรวจสอบการรับรองความถูกต้อง \"%s\"",
     "Unsatisfied backend parameters" : "พารามิเตอร์แบ็กเอนด์ไม่ได้รับอนุญาต",
     "Unsatisfied authentication mechanism parameters" : "การรับรองความถูกต้องไม่เพียงพอ",
     "Personal" : "ส่วนตัว",
@@ -39,11 +41,16 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "OpenStack" : "OpenStack",
     "Username" : "ชื่อผู้ใช้งาน",
     "Password" : "รหัสผ่าน",
+    "Tenant name" : "ชื่อผู้เช่า",
+    "Identity endpoint URL" : "ตัวตนของ URL ปลายทาง",
+    "Rackspace" : "Rackspace",
     "API key" : "รหัส API",
     "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
     "Session credentials" : "ข้อมูลของเซสชั่น",
+    "RSA public key" : "RSA คีย์สาธารณะ",
     "Public key" : "คีย์สาธารณะ",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -66,10 +73,14 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "รูท",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP กับรหัสลับเข้าสู่ระบบ [ยกเลิก]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "แชร์",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS กำลังใช้ OC เข้าสู่ระบบ [ยกเลิก]",
     "Username as share" : "ชื่อผู้ใช้ที่แชร์",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "ชื่อบริการ",
+    "Request timeout (seconds)" : "หมดเวลาการร้องขอ (วินาที)",
     "<b>Note:</b> " : "<b>หมายเหตุ:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน FTP ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
-- 
GitLab


From 5ca690e2f8be9fae50a6d29786ab0da9188a71ad Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 10 Sep 2015 22:01:02 +0100
Subject: [PATCH 261/783] Use integer for availability instead of bool

---
 db_structure.xml                    | 4 ++--
 lib/private/files/cache/storage.php | 8 +++++---
 version.php                         | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index c7b7ffec601..6efcf497cf7 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -104,8 +104,8 @@
 
 			<field>
 				<name>available</name>
-				<type>boolean</type>
-				<default>true</default>
+				<type>integer</type>
+				<default>1</default>
 				<notnull>true</notnull>
 			</field>
 
diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php
index 338d8308281..a116e84b3f2 100644
--- a/lib/private/files/cache/storage.php
+++ b/lib/private/files/cache/storage.php
@@ -58,7 +58,8 @@ class Storage {
 			$this->numericId = $row['numeric_id'];
 		} else {
 			$connection = \OC_DB::getConnection();
-			if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $isAvailable])) {
+			$available = $isAvailable ? 1 : 0;
+			if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
 				$this->numericId = \OC_DB::insertid('*PREFIX*storages');
 			} else {
 				if ($row = self::getStorageById($this->storageId)) {
@@ -141,7 +142,7 @@ class Storage {
 	public function getAvailability() {
 		if ($row = self::getStorageById($this->storageId)) {
 			return [
-				'available' => $row['available'],
+				'available' => ($row['available'] === 1),
 				'last_checked' => $row['last_checked']
 			];
 		} else {
@@ -154,7 +155,8 @@ class Storage {
 	 */
 	public function setAvailability($isAvailable) {
 		$sql = 'UPDATE `*PREFIX*storages` SET `available` = ?, `last_checked` = ? WHERE `id` = ?';
-		\OC_DB::executeAudited($sql, array($isAvailable, time(), $this->storageId));
+		$available = $isAvailable ? 1 : 0;
+		\OC_DB::executeAudited($sql, array($available, time(), $this->storageId));
 	}
 
 	/**
diff --git a/version.php b/version.php
index a6b49d9dc74..cfc4db82995 100644
--- a/version.php
+++ b/version.php
@@ -23,7 +23,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = [8, 2, 0, 4];
+$OC_Version = [8, 2, 0, 5];
 
 // The human readable string
 $OC_VersionString = '8.2 pre alpha';
-- 
GitLab


From 65ebba44cef19713ab31c77841706c31b1475e0b Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 14 Sep 2015 20:55:53 +0200
Subject: [PATCH 262/783] Allow /tests folder in autoloader by default

Given the fact that "/tests" is not shipped by default and this has broken some applications and frustrated quite some people we should add "/tests" to the default allowed autoloading set.

I do consider the security impact marginally since the /tests folder is not shipped within the release as well as usually has a hard requirement on being called by phpunit.
---
 lib/base.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 5f8a7ed0f19..fcb3ff0b561 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -528,7 +528,8 @@ class OC {
 			OC::$SERVERROOT . '/settings',
 			OC::$SERVERROOT . '/ocs',
 			OC::$SERVERROOT . '/ocs-provider',
-			OC::$SERVERROOT . '/3rdparty'
+			OC::$SERVERROOT . '/3rdparty',
+			OC::$SERVERROOT . '/tests',
 		]);
 		spl_autoload_register(array(self::$loader, 'load'));
 		$loaderEnd = microtime(true);
-- 
GitLab


From f8619870eae323098a47eb880e570f1c6eca37ff Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 14 Sep 2015 17:40:30 +0100
Subject: [PATCH 263/783] Remove get_temp_dir()

---
 lib/base.php                   | 8 --------
 lib/private/preview/office.php | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 5f8a7ed0f19..1e353df86dd 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -1116,14 +1116,6 @@ class OC {
 		return true;
 	}
 
-	/**
-	 * Get the temporary dir to store uploaded data
-	 * @return null|string Path to the temporary directory or null
-	 */
-	function get_temp_dir() {
-		return \OC::$server->getTempManager()->t_get_temp_dir();
-	}
-
 }
 
 
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index 30398147aa6..ac6b4afa0cc 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -36,7 +36,7 @@ abstract class Office extends Provider {
 
 		$absPath = $fileview->toTmpFile($path);
 
-		$tmpDir = get_temp_dir();
+		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
 
 		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
 		$clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
-- 
GitLab


From cd90685af13d3fa14b3bd15aa5e6d4ddeee84eb3 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 14 Sep 2015 14:01:34 +0200
Subject: [PATCH 264/783] Do not add sensitive request headers for cross domain
 requests

Prevents leaking the CSRF token to another third-party domain by mistake.
---
 core/js/oc-requesttoken.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js
index 2f7548ecb77..d5dcecdb5ab 100644
--- a/core/js/oc-requesttoken.js
+++ b/core/js/oc-requesttoken.js
@@ -1,4 +1,6 @@
-$(document).on('ajaxSend',function(elm, xhr) {
-	xhr.setRequestHeader('requesttoken', oc_requesttoken);
-	xhr.setRequestHeader('OCS-APIREQUEST', 'true');
+$(document).on('ajaxSend',function(elm, xhr, settings) {
+	if(settings.crossDomain === false) {
+		xhr.setRequestHeader('requesttoken', oc_requesttoken);
+		xhr.setRequestHeader('OCS-APIREQUEST', 'true');
+	}
 });
-- 
GitLab


From f2d63d351852bea601680da25bc881a3c76701da Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 14 Sep 2015 14:08:16 +0200
Subject: [PATCH 265/783] Disable automatic evaluation of responses

If a response to a $.ajax() request returns a content type of "application/javascript"
JQuery would previously execute the response body. This is a pretty unexpected
behaviour and can result in a bypass of our Content-Security-Policy as well as
multiple unexpected XSS vectors.
---
 core/js/js.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/js/js.js b/core/js/js.js
index 8d3756ae2ec..de773dc1221 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1215,6 +1215,20 @@ function object(o) {
  * Initializes core
  */
 function initCore() {
+	/**
+	 * Disable automatic evaluation of responses for $.ajax() functions (and its
+	 * higher-level alternatives like $.get() and $.post()).
+	 *
+	 * If a response to a $.ajax() request returns a content type of "application/javascript"
+	 * JQuery would previously execute the response body. This is a pretty unexpected
+	 * behaviour and can result in a bypass of our Content-Security-Policy as well as
+	 * multiple unexpected XSS vectors.
+	 */
+	$.ajaxSetup({
+		contents: {
+			script: false
+		}
+	});
 
 	/**
 	 * Set users locale to moment.js as soon as possible
-- 
GitLab


From 4680691ca6912cb5448cc1a09250464b28396474 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 15 Sep 2015 11:55:23 +0200
Subject: [PATCH 266/783] Define allowed app roots earlier

The autoloader needs to be run before including the app.php, otherwise it depends on what app gets executed first and apps that rely on the dependency of other apps in app.php may break.
---
 lib/private/app.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index f6a81f9945f..58ae770fe25 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -101,6 +101,12 @@ class OC_App {
 		}
 		// Load the enabled apps here
 		$apps = self::getEnabledApps();
+
+		// Add each apps' folder as allowed class path
+		foreach($apps as $app) {
+			\OC::$loader->addValidRoot(self::getAppPath($app));
+		}
+
 		// prevent app.php from printing output
 		ob_start();
 		foreach ($apps as $app) {
@@ -122,7 +128,6 @@ class OC_App {
 	 */
 	public static function loadApp($app, $checkUpgrade = true) {
 		self::$loadedApps[] = $app;
-		\OC::$loader->addValidRoot(self::getAppPath($app));
 		if (is_file(self::getAppPath($app) . '/appinfo/app.php')) {
 			\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
 			if ($checkUpgrade and self::shouldUpgrade($app)) {
-- 
GitLab


From 8e1b403b16e78a6e748144feacdac76db72c1130 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 15 Sep 2015 12:09:48 +0200
Subject: [PATCH 267/783] Catch apps which have been removed manually

---
 lib/private/app.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index 58ae770fe25..e42fba525e4 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -104,7 +104,10 @@ class OC_App {
 
 		// Add each apps' folder as allowed class path
 		foreach($apps as $app) {
-			\OC::$loader->addValidRoot(self::getAppPath($app));
+			$path = self::getAppPath($app);
+			if($path !== false) {
+				\OC::$loader->addValidRoot($path);
+			}
 		}
 
 		// prevent app.php from printing output
-- 
GitLab


From 665716095b719a9804f9104c42ce72254d3125ff Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 15 Sep 2015 12:14:14 +0200
Subject: [PATCH 268/783] Fix parameter name to match the specs

---
 apps/files_sharing/api/sharees.php           |  4 ++--
 apps/files_sharing/tests/api/shareestest.php | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index d7eabb9a550..924a9dd1cd7 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -292,7 +292,7 @@ class Sharees {
 		$search = isset($_GET['search']) ? (string) $_GET['search'] : '';
 		$itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
 		$page = !empty($_GET['page']) ? max(1, (int) $_GET['page']) : 1;
-		$perPage = !empty($_GET['limit']) ? max(1, (int) $_GET['limit']) : 200;
+		$perPage = !empty($_GET['perPage']) ? max(1, (int) $_GET['perPage']) : 200;
 
 		$shareTypes = [
 			Share::SHARE_TYPE_USER,
@@ -374,7 +374,7 @@ class Sharees {
 				'search' => $search,
 				'itemType' => $itemType,
 				'shareType' => $shareTypes,
-				'limit' => $perPage,
+				'perPage' => $perPage,
 			]));
 		}
 
diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index 1e4438acd88..1e28cb8ed5a 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -668,21 +668,21 @@ class ShareesTest extends TestCase {
 				'page' => 10,
 			], '', true, '', null, $allTypes, 10, 200, false],
 
-			// Test limit
+			// Test perPage
 			[[
-				'limit' => 0,
+				'perPage' => 0,
 			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
-				'limit' => '0',
+				'perPage' => '0',
 			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
-				'limit' => -1,
+				'perPage' => -1,
 			], '', true, '', null, $allTypes, 1, 1, false],
 			[[
-				'limit' => 1,
+				'perPage' => 1,
 			], '', true, '', null, $allTypes, 1, 1, false],
 			[[
-				'limit' => 10,
+				'perPage' => 10,
 			], '', true, '', null, $allTypes, 1, 10, false],
 
 			// Test $shareWithGroupOnly setting
@@ -951,8 +951,8 @@ class ShareesTest extends TestCase {
 
 	public function dataGetPaginationLink() {
 		return [
-			[1, '/ocs/v1.php', ['limit' => 2], '<?limit=2&page=2>; rel="next"'],
-			[10, '/ocs/v2.php', ['limit' => 2], '<?limit=2&page=11>; rel="next"'],
+			[1, '/ocs/v1.php', ['perPage' => 2], '<?perPage=2&page=2>; rel="next"'],
+			[10, '/ocs/v2.php', ['perPage' => 2], '<?perPage=2&page=11>; rel="next"'],
 		];
 	}
 
-- 
GitLab


From 7953cc9494537c368b117c5e0d759b4e7b318db7 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 15 Sep 2015 14:02:10 +0200
Subject: [PATCH 269/783] Function does return void

This function does return void and not a bool.
---
 apps/encryption/lib/crypto/encryption.php   | 3 +--
 lib/public/encryption/iencryptionmodule.php | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index d2925e1b6be..c62afac83c1 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -421,10 +421,9 @@ class Encryption implements IEncryptionModule {
 	 *
 	 * @param InputInterface $input
 	 * @param OutputInterface $output write some status information to the terminal during encryption
-	 * @return bool
 	 */
 	public function encryptAll(InputInterface $input, OutputInterface $output) {
-		return $this->encryptAll->encryptAll($input, $output);
+		$this->encryptAll->encryptAll($input, $output);
 	}
 
 	/**
diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php
index a5cd7075691..0fa0dc570db 100644
--- a/lib/public/encryption/iencryptionmodule.php
+++ b/lib/public/encryption/iencryptionmodule.php
@@ -141,7 +141,6 @@ interface IEncryptionModule {
 	 *
 	 * @param InputInterface $input
 	 * @param OutputInterface $output write some status information to the terminal during encryption
-	 * @return bool
 	 * @since 8.2.0
 	 */
 	public function encryptAll(InputInterface $input, OutputInterface $output);
-- 
GitLab


From 1c792b9f434f08b1d538a7fdfea305b190a5621a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 11 Sep 2015 15:24:14 +0200
Subject: [PATCH 270/783] normal margins for portrait previews

---
 apps/files/css/detailsView.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index 8eded7acda1..ad9c50b8354 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -25,6 +25,10 @@
 	margin-top: -15px;
 }
 
+#app-sidebar .thumbnailContainer.image.portrait {
+	margin: 0; /* if we dont fit the image anyway we give it back the margin */
+}
+
 #app-sidebar .image .thumbnail {
 	width:100%;
 	display:block;
-- 
GitLab


From 19e1d35373ba6fe4cd015fda583da813738cf008 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 11 Sep 2015 15:24:33 +0200
Subject: [PATCH 271/783] Fix path for fileinfomodel in subdirectories

---
 apps/files/js/filelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c52e414e3a7..1a04512323c 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -327,7 +327,7 @@
 			// and contain existing models that can be used.
 			// This method would in the future simply retrieve the matching model from the collection.
 			var model = new OCA.Files.FileInfoModel(this.elementToFile($tr));
-			if (!model.has('path')) {
+			if (!model.get('path')) {
 				model.set('path', this.getCurrentDirectory(), {silent: true});
 			}
 
-- 
GitLab


From a7346066495b5831293ef85df2319f921ec9185b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 11 Sep 2015 15:25:42 +0200
Subject: [PATCH 272/783] Various thumbnail fixes

- Show square images as portrait
- Set max height based on sidebar width
- cleanup
---
 apps/files/js/mainfileinfodetailview.js | 106 ++++++++++++++----------
 1 file changed, 62 insertions(+), 44 deletions(-)

diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index efdbb5e2ad1..eb33ae0993f 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -125,51 +125,9 @@
 				// TODO: we really need OC.Previews
 				var $iconDiv = this.$el.find('.thumbnail');
 				$iconDiv.addClass('icon-loading icon-32');
-				$container = this.$el.find('.thumbnailContainer');
+				var $container = this.$el.find('.thumbnailContainer');
 				if (!this.model.isDirectory()) {
-					this._fileList.lazyLoadPreview({
-						path: this.model.getFullPath(),
-						mime: this.model.get('mimetype'),
-						etag: this.model.get('etag'),
-						y: this.model.isImage() ? 250: 75,
-						x: this.model.isImage() ? 99999 /* only limit on y */ : 75,
-						a: this.model.isImage() ? 1 : null,
-						callback: function(previewUrl, img) {
-							$iconDiv.previewImg = previewUrl;
-							if (img) {
-								$iconDiv.removeClass('icon-loading icon-32');
-								if(img.height > img.width) {
-									$container.addClass('portrait');
-								}
-							}
-							if (this.model.isImage() && img) {
-								$iconDiv.parent().addClass('image');
-								var targetHeight = img.height / window.devicePixelRatio;
-								if (targetHeight <= 75) {
-									$container.removeClass('image'); // small enough to fit in normaly
-									targetHeight = 75;
-								}
-							} else {
-								targetHeight = 75;
-							}
-
-							// only set background when we have an actual preview
-							// when we dont have a preview we show the mime icon in the error handler
-							if (img) {
-								$iconDiv.css({
-									'background-image': 'url("' + previewUrl + '")',
-									'height': targetHeight
-								});
-							}
-						}.bind(this),
-						error: function() {
-							$iconDiv.removeClass('icon-loading icon-32');
-							this.$el.find('.thumbnailContainer').removeClass('image'); //fall back to regular view
-							$iconDiv.css({
-								'background-image': 'url("' + $iconDiv.previewImg + '")'
-							});
-						}.bind(this)
-					});
+					this.loadPreview(this.model.getFullPath(), this.model.get('mimetype'), this.model.get('etag'), $iconDiv, $container, this.model.isImage());
 				} else {
 					// TODO: special icons / shared / external
 					$iconDiv.css('background-image', 'url("' + OC.MimeType.getIconUrl('dir') + '")');
@@ -179,6 +137,66 @@
 				this.$el.empty();
 			}
 			this.delegateEvents();
+		},
+
+		loadPreview: function(path, mime, etag, $iconDiv, $container, isImage) {
+			var maxImageHeight = ($container.parent().width() + 50) / (16/9); // 30px for negative margin
+			var smallPreviewSize = 75;
+
+			var isLandscape = function(img) {
+				return img.width > (img.height * 1.2);
+			};
+
+			var getTargetHeight = function(img) {
+				if(isImage) {
+					var targetHeight = img.height / window.devicePixelRatio;
+					if (targetHeight <= smallPreviewSize) {
+						targetHeight = smallPreviewSize;
+					}
+					return targetHeight;
+				}else{
+					return smallPreviewSize;
+				}
+			};
+
+			this._fileList.lazyLoadPreview({
+				path: path,
+				mime: mime,
+				etag: etag,
+				y: isImage ? maxImageHeight : smallPreviewSize,
+				x: isImage ? 99999 /* only limit on y */ : smallPreviewSize,
+				a: isImage ? 1 : null,
+				callback: function (previewUrl, img) {
+					$iconDiv.previewImg = previewUrl;
+
+					// as long as we only have the mimetype icon, we only save it in case there is no preview
+					if (!img) {
+						return;
+					}
+					$iconDiv.removeClass('icon-loading  icon-32');
+					var targetHeight = getTargetHeight(img);
+					if (this.model.isImage() && targetHeight > smallPreviewSize) {
+						if (!isLandscape(img)) {
+							$container.addClass('portrait');
+						}
+						$container.addClass('image');
+					}
+
+					// only set background when we have an actual preview
+					// when we dont have a preview we show the mime icon in the error handler
+					$iconDiv.css({
+						'background-image': 'url("' + previewUrl + '")',
+						'height': targetHeight
+					});
+				}.bind(this),
+				error: function () {
+					$iconDiv.removeClass('icon-loading');
+					this.$el.find('.thumbnailContainer').removeClass('image'); //fall back to regular view
+					$iconDiv.css({
+						'background-image': 'url("' + $iconDiv.previewImg + '")'
+					});
+				}.bind(this)
+			});
 		}
 	});
 
-- 
GitLab


From 98966329bfc67030db8e3088ddd4362390a1b651 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 11 Sep 2015 15:26:47 +0200
Subject: [PATCH 273/783] crop to the center for landscape images

---
 apps/files/css/detailsView.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index ad9c50b8354..2de4093805b 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -34,12 +34,16 @@
 	display:block;
 	height: 250px;
 	background-repeat: no-repeat;
-	background-position: 50% top;
+	background-position: center;
 	background-size: 100%;
 	float: none;
 	margin: 0;
 }
 
+#app-sidebar .image.portrait .thumbnail {
+	background-position: 50% top;
+}
+
 #app-sidebar .image.portrait .thumbnail {
 	background-size: contain;
 }
-- 
GitLab


From 72cfeaf157d28c72c61b4ff69a71119deebd5648 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 11 Sep 2015 16:18:27 +0200
Subject: [PATCH 274/783] recognize eps, psd and illustrator as image

---
 apps/files/js/fileinfomodel.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/files/js/fileinfomodel.js b/apps/files/js/fileinfomodel.js
index 22b1ca9ff0c..de1b143a160 100644
--- a/apps/files/js/fileinfomodel.js
+++ b/apps/files/js/fileinfomodel.js
@@ -57,7 +57,13 @@
 		 * @return {boolean} true if this is an image, false otherwise
 		 */
 		isImage: function() {
-			return this.has('mimetype') ? this.get('mimetype').substr(0, 6) === 'image/' : false;
+			if (!this.has('mimetype')) {
+				return false;
+			}
+			return this.get('mimetype').substr(0, 6) === 'image/'
+				|| this.get('mimetype') === 'application/postscript'
+				|| this.get('mimetype') === 'application/illustrator'
+				|| this.get('mimetype') === 'application/x-photoshop';
 		},
 
 		/**
-- 
GitLab


From aa8b1b2894637f3e2692e4d0f189c07dcb150e63 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 15 Sep 2015 12:37:09 +0200
Subject: [PATCH 275/783] Throw an error when the page count or perPage setting
 is invalid

---
 apps/files_sharing/api/sharees.php           |  13 ++-
 apps/files_sharing/tests/api/shareestest.php | 111 ++++++++++++++-----
 2 files changed, 96 insertions(+), 28 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 924a9dd1cd7..f3c91c18dc9 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -291,8 +291,15 @@ class Sharees {
 	public function search() {
 		$search = isset($_GET['search']) ? (string) $_GET['search'] : '';
 		$itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
-		$page = !empty($_GET['page']) ? max(1, (int) $_GET['page']) : 1;
-		$perPage = !empty($_GET['perPage']) ? max(1, (int) $_GET['perPage']) : 200;
+		$page = isset($_GET['page']) ? (int) $_GET['page'] : 1;
+		$perPage = isset($_GET['perPage']) ? (int) $_GET['perPage'] : 200;
+
+		if ($perPage <= 0) {
+			return new \OC_OCS_Result(null, 401, 'Invalid perPage argument');
+		}
+		if ($page <= 0) {
+			return new \OC_OCS_Result(null, 402, 'Invalid page');
+		}
 
 		$shareTypes = [
 			Share::SHARE_TYPE_USER,
@@ -348,7 +355,7 @@ class Sharees {
 	protected function searchSharees($search, $itemType, array $shareTypes, $page, $perPage) {
 		// Verify arguments
 		if ($itemType === null) {
-			return new \OC_OCS_Result(null, 400, 'missing itemType');
+			return new \OC_OCS_Result(null, 400, 'Missing itemType');
 		}
 
 		// Get users
diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index 1e28cb8ed5a..65354aef8c6 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -652,15 +652,6 @@ class ShareesTest extends TestCase {
 			], '', false, '', null, [0, 1], 1, 200, false],
 
 			// Test pagination
-			[[
-				'page' => 0,
-			], '', true, '', null, $allTypes, 1, 200, false],
-			[[
-				'page' => '0',
-			], '', true, '', null, $allTypes, 1, 200, false],
-			[[
-				'page' => -1,
-			], '', true, '', null, $allTypes, 1, 200, false],
 			[[
 				'page' => 1,
 			], '', true, '', null, $allTypes, 1, 200, false],
@@ -669,15 +660,6 @@ class ShareesTest extends TestCase {
 			], '', true, '', null, $allTypes, 10, 200, false],
 
 			// Test perPage
-			[[
-				'perPage' => 0,
-			], '', true, '', null, $allTypes, 1, 200, false],
-			[[
-				'perPage' => '0',
-			], '', true, '', null, $allTypes, 1, 200, false],
-			[[
-				'perPage' => -1,
-			], '', true, '', null, $allTypes, 1, 1, false],
 			[[
 				'perPage' => 1,
 			], '', true, '', null, $allTypes, 1, 1, false],
@@ -758,6 +740,76 @@ class ShareesTest extends TestCase {
 		$_GET = $oldGet;
 	}
 
+	public function dataSearchInvalid() {
+		return [
+			// Test invalid pagination
+			[[
+				'page' => 0,
+			], 402, 'Invalid page'],
+			[[
+				'page' => '0',
+			], 402, 'Invalid page'],
+			[[
+				'page' => -1,
+			], 402, 'Invalid page'],
+
+			// Test invalid perPage
+			[[
+				'perPage' => 0,
+			], 401, 'Invalid perPage argument'],
+			[[
+				'perPage' => '0',
+			], 401, 'Invalid perPage argument'],
+			[[
+				'perPage' => -1,
+			], 401, 'Invalid perPage argument'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSearchInvalid
+	 *
+	 * @param array $getData
+	 * @param int $code
+	 * @param string $message
+	 */
+	public function testSearchInvalid($getData, $code, $message) {
+		$oldGet = $_GET;
+		$_GET = $getData;
+
+		$config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$config->expects($this->never())
+			->method('getAppValue');
+
+		$sharees = $this->getMockBuilder('\OCA\Files_Sharing\API\Sharees')
+			->setConstructorArgs([
+				$this->groupManager,
+				$this->userManager,
+				$this->contactsManager,
+				$config,
+				$this->session,
+				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\IRequest')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
+			])
+			->setMethods(array('searchSharees', 'isRemoteSharingAllowed'))
+			->getMock();
+		$sharees->expects($this->never())
+			->method('searchSharees');
+		$sharees->expects($this->never())
+			->method('isRemoteSharingAllowed');
+
+		/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\API\Sharees $sharees */
+		$ocs = $sharees->search();
+		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
+
+		$this->assertOCSError($ocs, $code, $message);
+
+		$_GET = $oldGet;
+	}
+
 	public function dataIsRemoteSharingAllowed() {
 		return [
 			['file', true],
@@ -940,13 +992,7 @@ class ShareesTest extends TestCase {
 		$ocs = $this->invokePrivate($this->sharees, 'searchSharees', ['', null, [], [], 0, 0, false]);
 		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
 
-		$this->assertSame(400, $ocs->getStatusCode(), 'Expected status code 400');
-		$this->assertSame([], $ocs->getData(), 'Expected that no data is send');
-
-		$meta = $ocs->getMeta();
-		$this->assertNotEmpty($meta);
-		$this->assertArrayHasKey('message', $meta);
-		$this->assertSame('missing itemType', $meta['message']);
+		$this->assertOCSError($ocs, 400, 'Missing itemType');
 	}
 
 	public function dataGetPaginationLink() {
@@ -992,4 +1038,19 @@ class ShareesTest extends TestCase {
 
 		$this->assertEquals($expected, $this->invokePrivate($this->sharees, 'isV2'));
 	}
+
+	/**
+	 * @param \OC_OCS_Result $ocs
+	 * @param int $code
+	 * @param string $message
+	 */
+	protected function assertOCSError(\OC_OCS_Result $ocs, $code, $message) {
+		$this->assertSame($code, $ocs->getStatusCode(), 'Expected status code ' . $code);
+		$this->assertSame([], $ocs->getData(), 'Expected that no data is send');
+
+		$meta = $ocs->getMeta();
+		$this->assertNotEmpty($meta);
+		$this->assertArrayHasKey('message', $meta);
+		$this->assertSame($message, $meta['message']);
+	}
 }
-- 
GitLab


From 91dfcab0553a8bbc13df4b57e9fed061741bea74 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 12 Sep 2015 16:25:23 +0200
Subject: [PATCH 276/783] Expose federated sharing capabilities to
 authenticated users

---
 apps/files_sharing/lib/capabilities.php   |  7 +++++
 apps/files_sharing/tests/capabilities.php | 35 +++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/apps/files_sharing/lib/capabilities.php b/apps/files_sharing/lib/capabilities.php
index ea71c47a05c..b24eb8d61f0 100644
--- a/apps/files_sharing/lib/capabilities.php
+++ b/apps/files_sharing/lib/capabilities.php
@@ -67,6 +67,13 @@ class Capabilities implements ICapability {
 
 		$res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';
 
+
+		//Federated sharing
+		$res['federation'] = [
+			'outgoing'  => $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes',
+			'incoming' => $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'yes'
+		];
+
 		return [
 			'files_sharing' => $res,
 		];
diff --git a/apps/files_sharing/tests/capabilities.php b/apps/files_sharing/tests/capabilities.php
index 5b9789ce324..f1a9626db9b 100644
--- a/apps/files_sharing/tests/capabilities.php
+++ b/apps/files_sharing/tests/capabilities.php
@@ -202,5 +202,40 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 		$this->assertFalse($result['public']['upload']);
 	}
 
+	public function testFederatedSharingIncomming() {
+		$map = [
+			['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'yes'],
+		];
+		$result = $this->getResults($map);
+		$this->assertArrayHasKey('federation', $result);
+		$this->assertTrue($result['federation']['incoming']);
+	}
+
+	public function testFederatedSharingNoIncomming() {
+		$map = [
+			['files_sharing', 'incoming_server2server_share_enabled', 'yes', 'no'],
+		];
+		$result = $this->getResults($map);
+		$this->assertArrayHasKey('federation', $result);
+		$this->assertFalse($result['federation']['incoming']);
+	}
+
+	public function testFederatedSharingOutgoing() {
+		$map = [
+			['files_sharing', 'outgoing_server2server_share_enabled', 'yes', 'yes'],
+		];
+		$result = $this->getResults($map);
+		$this->assertArrayHasKey('federation', $result);
+		$this->assertTrue($result['federation']['outgoing']);
+	}
+
+	public function testFederatedSharingNoOutgoing() {
+		$map = [
+			['files_sharing', 'outgoing_server2server_share_enabled', 'yes', 'no'],
+		];
+		$result = $this->getResults($map);
+		$this->assertArrayHasKey('federation', $result);
+		$this->assertFalse($result['federation']['outgoing']);
+	}
 
 }
-- 
GitLab


From 8767c2b3bea95cb6020496536c124891be32243e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 15 Sep 2015 15:40:42 +0200
Subject: [PATCH 277/783] fix small mimetype icons

---
 apps/files/js/mainfileinfodetailview.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index eb33ae0993f..830f074f3f1 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -124,9 +124,9 @@
 
 				// TODO: we really need OC.Previews
 				var $iconDiv = this.$el.find('.thumbnail');
-				$iconDiv.addClass('icon-loading icon-32');
 				var $container = this.$el.find('.thumbnailContainer');
 				if (!this.model.isDirectory()) {
+					$iconDiv.addClass('icon-loading icon-32');
 					this.loadPreview(this.model.getFullPath(), this.model.get('mimetype'), this.model.get('etag'), $iconDiv, $container, this.model.isImage());
 				} else {
 					// TODO: special icons / shared / external
@@ -173,7 +173,7 @@
 					if (!img) {
 						return;
 					}
-					$iconDiv.removeClass('icon-loading  icon-32');
+					$iconDiv.removeClass('icon-loading icon-32');
 					var targetHeight = getTargetHeight(img);
 					if (this.model.isImage() && targetHeight > smallPreviewSize) {
 						if (!isLandscape(img)) {
@@ -190,7 +190,7 @@
 					});
 				}.bind(this),
 				error: function () {
-					$iconDiv.removeClass('icon-loading');
+					$iconDiv.removeClass('icon-loading icon-32');
 					this.$el.find('.thumbnailContainer').removeClass('image'); //fall back to regular view
 					$iconDiv.css({
 						'background-image': 'url("' + $iconDiv.previewImg + '")'
-- 
GitLab


From 754850f4732845b752e9b2177b78a2bdbc8ae368 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 15 Sep 2015 15:51:54 +0200
Subject: [PATCH 278/783] Fix status code

---
 apps/files_sharing/api/sharees.php           |  7 ++---
 apps/files_sharing/tests/api/shareestest.php | 27 +++++++++-----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index f3c91c18dc9..9e324078dad 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -20,6 +20,7 @@
  */
 namespace OCA\Files_Sharing\API;
 
+use OCP\AppFramework\Http;
 use OCP\Contacts\IManager;
 use OCP\IGroup;
 use OCP\IGroupManager;
@@ -295,10 +296,10 @@ class Sharees {
 		$perPage = isset($_GET['perPage']) ? (int) $_GET['perPage'] : 200;
 
 		if ($perPage <= 0) {
-			return new \OC_OCS_Result(null, 401, 'Invalid perPage argument');
+			return new \OC_OCS_Result(null, Http::STATUS_BAD_REQUEST, 'Invalid perPage argument');
 		}
 		if ($page <= 0) {
-			return new \OC_OCS_Result(null, 402, 'Invalid page');
+			return new \OC_OCS_Result(null, Http::STATUS_BAD_REQUEST, 'Invalid page');
 		}
 
 		$shareTypes = [
@@ -355,7 +356,7 @@ class Sharees {
 	protected function searchSharees($search, $itemType, array $shareTypes, $page, $perPage) {
 		// Verify arguments
 		if ($itemType === null) {
-			return new \OC_OCS_Result(null, 400, 'Missing itemType');
+			return new \OC_OCS_Result(null, Http::STATUS_BAD_REQUEST, 'Missing itemType');
 		}
 
 		// Get users
diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index 65354aef8c6..5c5d5b0d309 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -21,10 +21,9 @@
 
 namespace OCA\Files_Sharing\Tests\API;
 
-use Doctrine\DBAL\Connection;
-use OC\Share\Constants;
 use OCA\Files_Sharing\API\Sharees;
 use OCA\Files_sharing\Tests\TestCase;
+use OCP\AppFramework\Http;
 use OCP\Share;
 
 class ShareesTest extends TestCase {
@@ -745,24 +744,24 @@ class ShareesTest extends TestCase {
 			// Test invalid pagination
 			[[
 				'page' => 0,
-			], 402, 'Invalid page'],
+			], 'Invalid page'],
 			[[
 				'page' => '0',
-			], 402, 'Invalid page'],
+			], 'Invalid page'],
 			[[
 				'page' => -1,
-			], 402, 'Invalid page'],
+			], 'Invalid page'],
 
 			// Test invalid perPage
 			[[
 				'perPage' => 0,
-			], 401, 'Invalid perPage argument'],
+			], 'Invalid perPage argument'],
 			[[
 				'perPage' => '0',
-			], 401, 'Invalid perPage argument'],
+			], 'Invalid perPage argument'],
 			[[
 				'perPage' => -1,
-			], 401, 'Invalid perPage argument'],
+			], 'Invalid perPage argument'],
 		];
 	}
 
@@ -770,10 +769,9 @@ class ShareesTest extends TestCase {
 	 * @dataProvider dataSearchInvalid
 	 *
 	 * @param array $getData
-	 * @param int $code
 	 * @param string $message
 	 */
-	public function testSearchInvalid($getData, $code, $message) {
+	public function testSearchInvalid($getData, $message) {
 		$oldGet = $_GET;
 		$_GET = $getData;
 
@@ -805,7 +803,7 @@ class ShareesTest extends TestCase {
 		$ocs = $sharees->search();
 		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
 
-		$this->assertOCSError($ocs, $code, $message);
+		$this->assertOCSError($ocs, $message);
 
 		$_GET = $oldGet;
 	}
@@ -992,7 +990,7 @@ class ShareesTest extends TestCase {
 		$ocs = $this->invokePrivate($this->sharees, 'searchSharees', ['', null, [], [], 0, 0, false]);
 		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
 
-		$this->assertOCSError($ocs, 400, 'Missing itemType');
+		$this->assertOCSError($ocs, 'Missing itemType');
 	}
 
 	public function dataGetPaginationLink() {
@@ -1041,11 +1039,10 @@ class ShareesTest extends TestCase {
 
 	/**
 	 * @param \OC_OCS_Result $ocs
-	 * @param int $code
 	 * @param string $message
 	 */
-	protected function assertOCSError(\OC_OCS_Result $ocs, $code, $message) {
-		$this->assertSame($code, $ocs->getStatusCode(), 'Expected status code ' . $code);
+	protected function assertOCSError(\OC_OCS_Result $ocs, $message) {
+		$this->assertSame(Http::STATUS_BAD_REQUEST, $ocs->getStatusCode(), 'Expected status code 400');
 		$this->assertSame([], $ocs->getData(), 'Expected that no data is send');
 
 		$meta = $ocs->getMeta();
-- 
GitLab


From 7ef937d8ad33ed2cd3e452bcde386e9d125e6a54 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Mon, 17 Aug 2015 21:40:03 +0300
Subject: [PATCH 279/783] Add versions obligation

---
 apps/files_versions/appinfo/application.php |  11 ++
 apps/files_versions/lib/expiration.php      | 160 ++++++++++++++++
 apps/files_versions/lib/storage.php         |  42 +++-
 apps/files_versions/tests/expiration.php    | 200 ++++++++++++++++++++
 config/config.sample.php                    |  28 +++
 5 files changed, 437 insertions(+), 4 deletions(-)
 create mode 100644 apps/files_versions/lib/expiration.php
 create mode 100644 apps/files_versions/tests/expiration.php

diff --git a/apps/files_versions/appinfo/application.php b/apps/files_versions/appinfo/application.php
index bab36b48510..b61b03dab13 100644
--- a/apps/files_versions/appinfo/application.php
+++ b/apps/files_versions/appinfo/application.php
@@ -22,6 +22,7 @@
 namespace OCA\Files_Versions\AppInfo;
 
 use OCP\AppFramework\App;
+use OCA\Files_Versions\Expiration;
 
 class Application extends App {
 	public function __construct(array $urlParams = array()) {
@@ -33,5 +34,15 @@ class Application extends App {
 		 * Register capabilities
 		 */
 		$container->registerCapability('OCA\Files_Versions\Capabilities');
+
+		/*
+		 * Register expiration
+		 */
+		$container->registerService('Expiration', function($c) {
+			return  new Expiration(
+				$c->query('ServerContainer')->getConfig(),
+				$c->query('OCP\AppFramework\Utility\ITimeFactory')
+			);
+		});
 	}
 }
diff --git a/apps/files_versions/lib/expiration.php b/apps/files_versions/lib/expiration.php
new file mode 100644
index 00000000000..e1c7f50a20d
--- /dev/null
+++ b/apps/files_versions/lib/expiration.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_Versions;
+
+use \OCP\IConfig;
+use \OCP\AppFramework\Utility\ITimeFactory;
+
+class Expiration {
+
+	// how long do we keep files a version if no other value is defined in the config file (unit: days)
+	const DEFAULT_RETENTION_OBLIGATION = 30;
+	const NO_OBLIGATION = -1;
+
+	/** @var ITimeFactory */
+	private $timeFactory;
+
+	/** @var string */
+	private $retentionObligation;
+
+	/** @var int */
+	private $minAge;
+
+	/** @var int */
+	private $maxAge;
+
+	/** @var bool */
+	private $canPurgeToSaveSpace;
+
+	public function __construct(IConfig $config,ITimeFactory $timeFactory){
+		$this->timeFactory = $timeFactory;
+		$this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto');
+
+		if ($this->retentionObligation !== 'disabled') {
+			$this->parseRetentionObligation();
+		}
+	}
+
+	/**
+	 * Is versions expiration enabled
+	 * @return bool
+	 */
+	public function isEnabled(){
+		return $this->retentionObligation !== 'disabled';
+	}
+
+	/**
+	 * Is default expiration active
+	 */
+	public function shouldAutoExpire(){
+		return $this->minAge === self::NO_OBLIGATION
+				|| $this->maxAge === self::NO_OBLIGATION;
+	}
+
+	/**
+	 * Check if given timestamp in expiration range
+	 * @param int $timestamp
+	 * @param bool $quotaExceeded
+	 * @return bool
+	 */
+	public function isExpired($timestamp, $quotaExceeded = false){
+		// No expiration if disabled
+		if (!$this->isEnabled()) {
+			return false;
+		}
+
+		// Purge to save space (if allowed)
+		if ($quotaExceeded && $this->canPurgeToSaveSpace) {
+			return true;
+		}
+
+		$time = $this->timeFactory->getTime();
+		// Never expire dates in future e.g. misconfiguration or negative time
+		// adjustment
+		if ($time<$timestamp) {
+			return false;
+		}
+
+		// Purge as too old
+		if ($this->maxAge !== self::NO_OBLIGATION) {
+			$maxTimestamp = $time - ($this->maxAge * 86400);
+			$isOlderThanMax = $timestamp < $maxTimestamp;
+		} else {
+			$isOlderThanMax = false;
+		}
+
+		if ($this->minAge !== self::NO_OBLIGATION) {
+			// older than Min obligation and we are running out of quota?
+			$minTimestamp = $time - ($this->minAge * 86400);
+			$isMinReached = ($timestamp < $minTimestamp) && $quotaExceeded;
+		} else {
+			$isMinReached = false;
+		}
+
+		return $isOlderThanMax || $isMinReached;
+	}
+
+	private function parseRetentionObligation(){
+		$splitValues = explode(',', $this->retentionObligation);
+		if (!isset($splitValues[0])) {
+			$minValue = self::DEFAULT_RETENTION_OBLIGATION;
+		} else {
+			$minValue = trim($splitValues[0]);
+		}
+
+		if (!isset($splitValues[1]) && $minValue === 'auto') {
+			$maxValue = 'auto';
+		} elseif (!isset($splitValues[1])) {
+			$maxValue = self::DEFAULT_RETENTION_OBLIGATION;
+		} else {
+			$maxValue = trim($splitValues[1]);
+		}
+
+		if ($minValue === 'auto' && $maxValue === 'auto') {
+			// Default: Keep for 30 days but delete anytime if space needed
+			$this->minAge = self::DEFAULT_RETENTION_OBLIGATION;
+			$this->maxAge = self::NO_OBLIGATION;
+			$this->canPurgeToSaveSpace = true;
+		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
+			// Keep for X days but delete anytime if space needed
+			$this->minAge = intval($minValue);
+			$this->maxAge = self::NO_OBLIGATION;
+			$this->canPurgeToSaveSpace = true;
+		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
+			// Delete anytime if space needed, Delete all older than max automatically
+			$this->minAge = self::NO_OBLIGATION;
+			$this->maxAge = intval($maxValue);
+			$this->canPurgeToSaveSpace = true;
+		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
+			// Delete all older than max OR older than min if space needed
+
+			// Max < Min as per https://github.com/owncloud/core/issues/16301
+			if ($maxValue < $minValue) {
+				$maxValue = $minValue;
+			}
+
+			$this->minAge = intval($minValue);
+			$this->maxAge = intval($maxValue);
+			$this->canPurgeToSaveSpace = false;
+		}
+	}
+}
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index e0034f6165f..b190ea307e2 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -40,6 +40,7 @@
 
 namespace OCA\Files_Versions;
 
+use OCA\Files_Versions\AppInfo\Application;
 use OCA\Files_Versions\Command\Expire;
 
 class Storage {
@@ -482,7 +483,33 @@ class Storage {
 	 * @return array containing the list of to deleted versions and the size of them
 	 */
 	protected static function getExpireList($time, $versions) {
+		$application = new Application();
+		$expiration = $application->getContainer()->query('Expiration');
 
+		if ($expiration->shouldAutoExpire()) {
+			return self::getAutoExpireList($time, $versions);
+		}
+
+		$size = 0;
+		$toDelete = [];  // versions we want to delete
+		
+		foreach ($versions as $key => $version) {
+			if ($expiration->isExpired($version['version'])) {
+				$toDelete[$key] = $version['path'] . '.v' . $version['version'];
+				$size += $version['size'];
+			}
+		}
+
+		return array($toDelete, $size);
+	}
+
+	/**
+	 * get list of files we want to expire
+	 * @param array $versions list of versions
+	 * @param integer $time
+	 * @return array containing the list of to deleted versions and the size of them
+	 */
+	protected static function getAutoExpireList($time, $versions) {
 		$size = 0;
 		$toDelete = array();  // versions we want to delete
 
@@ -529,7 +556,6 @@ class Storage {
 		}
 
 		return array($toDelete, $size);
-
 	}
 
 	/**
@@ -541,8 +567,13 @@ class Storage {
 	 * @param int $neededSpace requested versions size
 	 */
 	private static function scheduleExpire($uid, $fileName, $versionsSize = null, $neededSpace = 0) {
-		$command = new Expire($uid, $fileName, $versionsSize, $neededSpace);
-		\OC::$server->getCommandBus()->push($command);
+		// let the admin disable auto expire
+		$application = new Application();
+		$expiration = $application->getContainer()->query('Expiration');
+		if ($expiration->isEnabled()) {
+			$command = new Expire($uid, $fileName, $versionsSize, $neededSpace);
+			\OC::$server->getCommandBus()->push($command);
+		}
 	}
 
 	/**
@@ -555,7 +586,10 @@ class Storage {
 	 */
 	public static function expire($filename, $versionsSize = null, $offset = 0) {
 		$config = \OC::$server->getConfig();
-		if($config->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+		$application = new Application();
+		$expiration = $application->getContainer()->query('Expiration');
+		
+		if($config->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' && $expiration->isEnabled()) {
 			list($uid, $filename) = self::getUidAndFilename($filename);
 			if (empty($filename)) {
 				// file maybe renamed or deleted
diff --git a/apps/files_versions/tests/expiration.php b/apps/files_versions/tests/expiration.php
new file mode 100644
index 00000000000..44d911c74b4
--- /dev/null
+++ b/apps/files_versions/tests/expiration.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_Versions;
+
+class Expiration_Test extends \PHPUnit_Framework_TestCase {
+	const SECONDS_PER_DAY = 86400; //60*60*24
+
+	public function expirationData(){
+		$today = 100*self::SECONDS_PER_DAY;
+		$back10Days = (100-10)*self::SECONDS_PER_DAY;
+		$back20Days = (100-20)*self::SECONDS_PER_DAY;
+		$back30Days = (100-30)*self::SECONDS_PER_DAY;
+		$back35Days = (100-35)*self::SECONDS_PER_DAY;
+
+		// it should never happen, but who knows :/
+		$ahead100Days = (100+100)*self::SECONDS_PER_DAY;
+
+		return [
+			// Expiration is disabled - always should return false
+			[ 'disabled', $today, $back10Days, false, false],
+			[ 'disabled', $today, $back10Days, true, false],
+			[ 'disabled', $today, $ahead100Days, true, false],
+
+			// Default: expire in 30 days or earlier when quota requirements are met
+			[ 'auto', $today, $back10Days, false, false],
+			[ 'auto', $today, $back35Days, false, false],
+			[ 'auto', $today, $back10Days, true, true],
+			[ 'auto', $today, $back35Days, true, true],
+			[ 'auto', $today, $ahead100Days, true, true],
+
+			// The same with 'auto'
+			[ 'auto, auto', $today, $back10Days, false, false],
+			[ 'auto, auto', $today, $back35Days, false, false],
+			[ 'auto, auto', $today, $back10Days, true, true],
+			[ 'auto, auto', $today, $back35Days, true, true],
+
+			// Keep for 15 days but expire anytime if space needed
+			[ '15, auto', $today, $back10Days, false, false],
+			[ '15, auto', $today, $back20Days, false, false],
+			[ '15, auto', $today, $back10Days, true, true],
+			[ '15, auto', $today, $back20Days, true, true],
+			[ '15, auto', $today, $ahead100Days, true, true],
+
+			// Expire anytime if space needed, Expire all older than max
+			[ 'auto, 15', $today, $back10Days, false, false],
+			[ 'auto, 15', $today, $back20Days, false, true],
+			[ 'auto, 15', $today, $back10Days, true, true],
+			[ 'auto, 15', $today, $back20Days, true, true],
+			[ 'auto, 15', $today, $ahead100Days, true, true],
+
+			// Expire all older than max OR older than min if space needed
+			[ '15, 25', $today, $back10Days, false, false],
+			[ '15, 25', $today, $back20Days, false, false],
+			[ '15, 25', $today, $back30Days, false, true],
+			[ '15, 25', $today, $back10Days, false, false],
+			[ '15, 25', $today, $back20Days, true, true],
+			[ '15, 25', $today, $back30Days, true, true],
+			[ '15, 25', $today, $ahead100Days, true, false],
+
+			// Expire all older than max OR older than min if space needed
+			// Max<Min case
+			[ '25, 15', $today, $back10Days, false, false],
+			[ '25, 15', $today, $back20Days, false, false],
+			[ '25, 15', $today, $back30Days, false, true],
+			[ '25, 15', $today, $back10Days, false, false],
+			[ '25, 15', $today, $back20Days, true, false],
+			[ '25, 15', $today, $back30Days, true, true],
+			[ '25, 15', $today, $ahead100Days, true, false],
+		];
+	}
+
+	/**
+	 * @dataProvider expirationData
+	 *
+	 * @param string $retentionObligation
+	 * @param int $timeNow
+	 * @param int $timestamp
+	 * @param bool $quotaExceeded
+	 * @param string $expectedResult
+	 */
+	public function testExpiration($retentionObligation, $timeNow, $timestamp, $quotaExceeded, $expectedResult){
+		$mockedConfig = $this->getMockedConfig($retentionObligation);
+		$mockedTimeFactory = $this->getMockedTimeFactory($timeNow);
+
+		$expiration = new Expiration($mockedConfig, $mockedTimeFactory);
+		$actualResult = $expiration->isExpired($timestamp, $quotaExceeded);
+
+		$this->assertEquals($expectedResult, $actualResult);
+	}
+
+
+	public function configData(){
+		return [
+			[ 'disabled', null, null, null],
+			[ 'auto', Expiration::DEFAULT_RETENTION_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ 'auto,auto', Expiration::DEFAULT_RETENTION_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ 'auto, auto', Expiration::DEFAULT_RETENTION_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ 'auto, 3', Expiration::NO_OBLIGATION, 3, true ],
+			[ '5, auto', 5, Expiration::NO_OBLIGATION, true ],
+			[ '3, 5', 3, 5, false ],
+			[ '10, 3', 10, 10, false ],
+		];
+	}
+
+
+	/**
+	 * @dataProvider configData
+	 *
+	 * @param string $configValue
+	 * @param int $expectedMinAge
+	 * @param int $expectedMaxAge
+	 * @param bool $expectedCanPurgeToSaveSpace
+	 */
+	public function testParseRetentionObligation($configValue, $expectedMinAge, $expectedMaxAge, $expectedCanPurgeToSaveSpace){
+		$mockedConfig = $this->getMockedConfig($configValue);
+		$mockedTimeFactory = $this->getMockedTimeFactory(
+				time()
+		);
+
+		$expiration = new Expiration($mockedConfig, $mockedTimeFactory);
+		$this->assertAttributeEquals($expectedMinAge, 'minAge', $expiration);
+		$this->assertAttributeEquals($expectedMaxAge, 'maxAge', $expiration);
+		$this->assertAttributeEquals($expectedCanPurgeToSaveSpace, 'canPurgeToSaveSpace', $expiration);
+	}
+
+	/**
+	 *
+	 * @param int $time
+	 * @return \OCP\AppFramework\Utility\ITimeFactory
+	 */
+	private function getMockedTimeFactory($time){
+		$mockedTimeFactory = $this->getMockBuilder('\OCP\AppFramework\Utility\ITimeFactory')
+				->disableOriginalConstructor()
+				->setMethods(['getTime'])
+				->getMock()
+		;
+		$mockedTimeFactory->expects($this->any())->method('getTime')->will(
+				$this->returnValue($time)
+		);
+
+		return $mockedTimeFactory;
+	}
+
+	/**
+	 *
+	 * @param string $returnValue
+	 * @return \OCP\IConfig
+	 */
+	private function getMockedConfig($returnValue){
+		$mockedConfig = $this->getMockBuilder('\OCP\IConfig')
+				->disableOriginalConstructor()
+				->setMethods(
+					[
+						'setSystemValues',
+						'setSystemValue',
+						'getSystemValue',
+						'deleteSystemValue',
+						'getAppKeys',
+						'setAppValue',
+						'getAppValue',
+						'deleteAppValue',
+						'deleteAppValues',
+						'setUserValue',
+						'getUserValue',
+						'getUserValueForUsers',
+						'getUserKeys',
+						'deleteUserValue',
+						'deleteAllUserValues',
+						'deleteAppFromAllUsers',
+						'getUsersForUserValue'
+					]
+				)
+				->getMock()
+		;
+		$mockedConfig->expects($this->any())->method('getSystemValue')->will(
+				$this->returnValue($returnValue)
+		);
+
+		return $mockedConfig;
+	}
+}
diff --git a/config/config.sample.php b/config/config.sample.php
index a841831f018..a2889a57a7f 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -434,6 +434,34 @@ $CONFIG = array(
 'trashbin_retention_obligation' => 'auto',
 
 
+/**
+ * If the versions app is enabled (default), this setting defines the policy
+ * for when versions will be permanently deleted.
+ * The app allows for two settings, a minimum time for version retention,
+ * and a maximum time for version retention.
+ * Minimum time is the number of days a version will be kept, after which it
+ * may be deleted. Maximum time is the number of days at which it is guaranteed
+ * to be deleted.
+ * Both minimum and maximum times can be set together to explicitly define
+ * version deletion. For migration purposes, this setting is installed
+ * initially set to "auto", which is equivalent to the default setting in
+ * ownCloud 8.1 and before.
+ *
+ * Available values:
+ *   ``auto``      default setting. keeps versions for 30 days and automatically
+ *                 deletes anytime after that if space is needed (note: files
+ *                 may not be deleted if space is not needed).
+ *   ``D, auto``   keeps versions for D+ days, delete anytime if space needed
+ *                 (note: files may not be deleted
+ *                 if space is not needed)
+ * * ``auto, D``   delete all versions that are older than D days automatically,
+ *                 delete other files anytime if space needed
+ * * ``D1, D2``    keep versions for at least D1 days and delete when exceeds D2 days
+ *   ``disabled``  versions auto clean disabled, versions will be kept forever
+ */
+'versions_retention_obligation' => 'auto',
+
+
 /**
  * ownCloud Verifications
  *
-- 
GitLab


From b95d1e668370c74d027330cdabe5e65e242ef18d Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 19 Aug 2015 00:00:18 +0300
Subject: [PATCH 280/783] Add quota status to expiration check

---
 apps/files_versions/lib/storage.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index b190ea307e2..269d43befb8 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -482,25 +482,25 @@ class Storage {
 	 * @param integer $time
 	 * @return array containing the list of to deleted versions and the size of them
 	 */
-	protected static function getExpireList($time, $versions) {
+	protected static function getExpireList($time, $versions, $quotaExceeded = false) {
 		$application = new Application();
 		$expiration = $application->getContainer()->query('Expiration');
 
 		if ($expiration->shouldAutoExpire()) {
-			return self::getAutoExpireList($time, $versions);
+			list($toDelete, $size) = self::getAutoExpireList($time, $versions);
+		} else {
+			$size = 0;
+			$toDelete = [];  // versions we want to delete
 		}
 
-		$size = 0;
-		$toDelete = [];  // versions we want to delete
-		
 		foreach ($versions as $key => $version) {
-			if ($expiration->isExpired($version['version'])) {
-				$toDelete[$key] = $version['path'] . '.v' . $version['version'];
+			if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {
 				$size += $version['size'];
+				$toDelete[$key] = $version['path'] . '.v' . $version['version'];
 			}
 		}
 
-		return array($toDelete, $size);
+		return [$toDelete, $size];
 	}
 
 	/**
@@ -633,7 +633,7 @@ class Storage {
 			$allVersions = Storage::getVersions($uid, $filename);
 
 			$time = time();
-			list($toDelete, $sizeOfDeletedVersions) = self::getExpireList($time, $allVersions);
+			list($toDelete, $sizeOfDeletedVersions) = self::getExpireList($time, $allVersions, $availableSpace <= 0);
 
 			$availableSpace = $availableSpace + $sizeOfDeletedVersions;
 			$versionsSize = $versionsSize - $sizeOfDeletedVersions;
@@ -644,7 +644,7 @@ class Storage {
 				$allVersions = $result['all'];
 
 				foreach ($result['by_file'] as $versions) {
-					list($toDeleteNew, $size) = self::getExpireList($time, $versions);
+					list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);
 					$toDelete = array_merge($toDelete, $toDeleteNew);
 					$sizeOfDeletedVersions += $size;
 				}
-- 
GitLab


From c3e055549e79b59de19fac46d949f55225998f32 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Thu, 20 Aug 2015 18:32:41 +0300
Subject: [PATCH 281/783] Improvements

---
 apps/files_versions/lib/expiration.php   | 37 +++++++++++++++++++-----
 apps/files_versions/lib/storage.php      | 19 ++++++++----
 apps/files_versions/tests/expiration.php |  8 +++--
 config/config.sample.php                 |  2 +-
 4 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/apps/files_versions/lib/expiration.php b/apps/files_versions/lib/expiration.php
index e1c7f50a20d..02885e823ca 100644
--- a/apps/files_versions/lib/expiration.php
+++ b/apps/files_versions/lib/expiration.php
@@ -27,7 +27,6 @@ use \OCP\AppFramework\Utility\ITimeFactory;
 class Expiration {
 
 	// how long do we keep files a version if no other value is defined in the config file (unit: days)
-	const DEFAULT_RETENTION_OBLIGATION = 30;
 	const NO_OBLIGATION = -1;
 
 	/** @var ITimeFactory */
@@ -116,22 +115,44 @@ class Expiration {
 	private function parseRetentionObligation(){
 		$splitValues = explode(',', $this->retentionObligation);
 		if (!isset($splitValues[0])) {
-			$minValue = self::DEFAULT_RETENTION_OBLIGATION;
+			$minValue = 'auto';
 		} else {
 			$minValue = trim($splitValues[0]);
 		}
 
-		if (!isset($splitValues[1]) && $minValue === 'auto') {
-			$maxValue = 'auto';
-		} elseif (!isset($splitValues[1])) {
-			$maxValue = self::DEFAULT_RETENTION_OBLIGATION;
+		if (!isset($splitValues[1])) {
+			$maxValue = self::NO_OBLIGATION;
 		} else {
 			$maxValue = trim($splitValues[1]);
 		}
 
+		$isValid = true;
+		// Validate
+		if (!ctype_digit($minValue) && $minValue !== 'auto') {
+			$isValid = false;
+			\OC::$server->getLogger()->warning(
+					$minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
+					['app'=>'files_versions']
+			);
+		}
+
+		if (!ctype_digit($maxValue) && $maxValue !== 'auto') {
+			$isValid = false;
+			\OC::$server->getLogger()->warning(
+					$maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
+					['app'=>'files_versions']
+			);
+		}
+
+		if (!$isValid){
+			$minValue = 'auto';
+			$maxValue = 'auto';
+		}
+
+
 		if ($minValue === 'auto' && $maxValue === 'auto') {
-			// Default: Keep for 30 days but delete anytime if space needed
-			$this->minAge = self::DEFAULT_RETENTION_OBLIGATION;
+			// Default: Delete anytime if space needed
+			$this->minAge = self::NO_OBLIGATION;
 			$this->maxAge = self::NO_OBLIGATION;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index 269d43befb8..90fe308e970 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -480,11 +480,11 @@ class Storage {
 	 * get list of files we want to expire
 	 * @param array $versions list of versions
 	 * @param integer $time
+	 * @param bool $quotaExceeded is versions storage limit reached
 	 * @return array containing the list of to deleted versions and the size of them
 	 */
 	protected static function getExpireList($time, $versions, $quotaExceeded = false) {
-		$application = new Application();
-		$expiration = $application->getContainer()->query('Expiration');
+		$expiration = self::getExpiration();
 
 		if ($expiration->shouldAutoExpire()) {
 			list($toDelete, $size) = self::getAutoExpireList($time, $versions);
@@ -568,8 +568,7 @@ class Storage {
 	 */
 	private static function scheduleExpire($uid, $fileName, $versionsSize = null, $neededSpace = 0) {
 		// let the admin disable auto expire
-		$application = new Application();
-		$expiration = $application->getContainer()->query('Expiration');
+		$expiration = self::getExpiration();
 		if ($expiration->isEnabled()) {
 			$command = new Expire($uid, $fileName, $versionsSize, $neededSpace);
 			\OC::$server->getCommandBus()->push($command);
@@ -586,8 +585,7 @@ class Storage {
 	 */
 	public static function expire($filename, $versionsSize = null, $offset = 0) {
 		$config = \OC::$server->getConfig();
-		$application = new Application();
-		$expiration = $application->getContainer()->query('Expiration');
+		$expiration = self::getExpiration();
 		
 		if($config->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' && $expiration->isEnabled()) {
 			list($uid, $filename) = self::getUidAndFilename($filename);
@@ -706,4 +704,13 @@ class Storage {
 		}
 	}
 
+	/**
+	 * Static workaround
+	 * @return Expiration
+	 */
+	protected static function getExpiration(){
+		$application = new Application();
+		return $application->getContainer()->query('Expiration');
+	}
+
 }
diff --git a/apps/files_versions/tests/expiration.php b/apps/files_versions/tests/expiration.php
index 44d911c74b4..fd5e022f689 100644
--- a/apps/files_versions/tests/expiration.php
+++ b/apps/files_versions/tests/expiration.php
@@ -111,13 +111,15 @@ class Expiration_Test extends \PHPUnit_Framework_TestCase {
 	public function configData(){
 		return [
 			[ 'disabled', null, null, null],
-			[ 'auto', Expiration::DEFAULT_RETENTION_OBLIGATION, Expiration::NO_OBLIGATION, true ],
-			[ 'auto,auto', Expiration::DEFAULT_RETENTION_OBLIGATION, Expiration::NO_OBLIGATION, true ],
-			[ 'auto, auto', Expiration::DEFAULT_RETENTION_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ 'auto', Expiration::NO_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ 'auto,auto', Expiration::NO_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ 'auto, auto', Expiration::NO_OBLIGATION, Expiration::NO_OBLIGATION, true ],
 			[ 'auto, 3', Expiration::NO_OBLIGATION, 3, true ],
 			[ '5, auto', 5, Expiration::NO_OBLIGATION, true ],
 			[ '3, 5', 3, 5, false ],
 			[ '10, 3', 10, 10, false ],
+			[ 'g,a,r,b,a,g,e',  Expiration::NO_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ '-3,8',  Expiration::NO_OBLIGATION, Expiration::NO_OBLIGATION, true ]
 		];
 	}
 
diff --git a/config/config.sample.php b/config/config.sample.php
index a2889a57a7f..a6d3fbcb659 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -451,7 +451,7 @@ $CONFIG = array(
  *   ``auto``      default setting. keeps versions for 30 days and automatically
  *                 deletes anytime after that if space is needed (note: files
  *                 may not be deleted if space is not needed).
- *   ``D, auto``   keeps versions for D+ days, delete anytime if space needed
+ *   ``D, auto``   keep versions for D+ days, delete anytime if space needed
  *                 (note: files may not be deleted
  *                 if space is not needed)
  * * ``auto, D``   delete all versions that are older than D days automatically,
-- 
GitLab


From f46b434a122377596f7861a75fc50106ea514e8e Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 9 Sep 2015 18:37:33 +0300
Subject: [PATCH 282/783] Namespacing, reusing

---
 apps/files_versions/lib/storage.php      | 9 +++++++--
 apps/files_versions/tests/expiration.php | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index 90fe308e970..ba2b78ff4d2 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -68,6 +68,9 @@ class Storage {
 		//until the end one version per week
 		6 => array('intervalEndsAfter' => -1,      'step' => 604800),
 	);
+	
+	/** @var \OCA\Files_Versions\AppInfo\Application */
+	private static $application;
 
 	public static function getUidAndFilename($filename) {
 		$uid = \OC\Files\Filesystem::getOwner($filename);
@@ -709,8 +712,10 @@ class Storage {
 	 * @return Expiration
 	 */
 	protected static function getExpiration(){
-		$application = new Application();
-		return $application->getContainer()->query('Expiration');
+		if (is_null(self::$application)) {
+			self::$application = new Application();
+		}
+		return self::$application->getContainer()->query('Expiration');
 	}
 
 }
diff --git a/apps/files_versions/tests/expiration.php b/apps/files_versions/tests/expiration.php
index fd5e022f689..54024b85b78 100644
--- a/apps/files_versions/tests/expiration.php
+++ b/apps/files_versions/tests/expiration.php
@@ -19,9 +19,11 @@
  *
  */
 
-namespace OCA\Files_Versions;
+namespace OCA\Files_Versions\Tests;
 
-class Expiration_Test extends \PHPUnit_Framework_TestCase {
+use \OCA\Files_Versions\Expiration;
+
+class Expiration_Test extends \Test\TestCase {
 	const SECONDS_PER_DAY = 86400; //60*60*24
 
 	public function expirationData(){
-- 
GitLab


From c3dc5b0317fed0e5beeb3f9480ca89ba2606da6d Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Fri, 11 Sep 2015 18:17:24 +0300
Subject: [PATCH 283/783] Add  method docblock

---
 apps/files_versions/lib/expiration.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files_versions/lib/expiration.php b/apps/files_versions/lib/expiration.php
index 02885e823ca..d42c62f0ee3 100644
--- a/apps/files_versions/lib/expiration.php
+++ b/apps/files_versions/lib/expiration.php
@@ -112,6 +112,10 @@ class Expiration {
 		return $isOlderThanMax || $isMinReached;
 	}
 
+	/**
+	* Read versions_retention_obligation, validate it 
+	* and set private members accordingly
+	*/
 	private function parseRetentionObligation(){
 		$splitValues = explode(',', $this->retentionObligation);
 		if (!isset($splitValues[0])) {
-- 
GitLab


From d57f3bf9cc8796e89290ea1462eaaf2553922d07 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Fri, 11 Sep 2015 21:06:42 +0300
Subject: [PATCH 284/783] Update options description

---
 config/config.sample.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index a6d3fbcb659..b9035e3988a 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -448,14 +448,13 @@ $CONFIG = array(
  * ownCloud 8.1 and before.
  *
  * Available values:
- *   ``auto``      default setting. keeps versions for 30 days and automatically
- *                 deletes anytime after that if space is needed (note: files
- *                 may not be deleted if space is not needed).
- *   ``D, auto``   keep versions for D+ days, delete anytime if space needed
- *                 (note: files may not be deleted
- *                 if space is not needed)
+ *   ``auto``      default setting. Automatically expire versions according to
+ *                 expire rules. Please refer to Files_versions online documentation 
+ *                 for more info.
+ *   ``D, auto``   keep versions at least for D days, apply expire rules to all
+ *                 versions that older than D days
  * * ``auto, D``   delete all versions that are older than D days automatically,
- *                 delete other files anytime if space needed
+ *                 delete other versions according to expire rules
  * * ``D1, D2``    keep versions for at least D1 days and delete when exceeds D2 days
  *   ``disabled``  versions auto clean disabled, versions will be kept forever
  */
-- 
GitLab


From cb529acc5ca25ce34d41a89c6280a170780d14c2 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Mon, 14 Sep 2015 15:59:28 +0300
Subject: [PATCH 285/783] Follow PSR

---
 apps/files_versions/tests/{expiration.php => expirationtest.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename apps/files_versions/tests/{expiration.php => expirationtest.php} (100%)

diff --git a/apps/files_versions/tests/expiration.php b/apps/files_versions/tests/expirationtest.php
similarity index 100%
rename from apps/files_versions/tests/expiration.php
rename to apps/files_versions/tests/expirationtest.php
-- 
GitLab


From cb5ebef5df1e8c93143f820f7b757e89375abc85 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 15 Sep 2015 16:14:31 +0200
Subject: [PATCH 286/783] add details icon

---
 core/css/icons.css           |   4 ++++
 core/img/actions/details.png | Bin 0 -> 295 bytes
 core/img/actions/details.svg |   4 ++++
 3 files changed, 8 insertions(+)
 create mode 100644 core/img/actions/details.png
 create mode 100644 core/img/actions/details.svg

diff --git a/core/css/icons.css b/core/css/icons.css
index a3819ba9d44..2461ee46c9f 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -70,6 +70,10 @@
 	background-image: url('../img/actions/delete-hover.svg');
 }
 
+.icon-details {
+	background-image: url('../img/actions/details.svg');
+}
+
 .icon-download {
 	background-image: url('../img/actions/download.svg');
 }
diff --git a/core/img/actions/details.png b/core/img/actions/details.png
new file mode 100644
index 0000000000000000000000000000000000000000..9145025be26c0e86e294ce98e1f883199c4d6366
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQpuQx;Tbd
z^e(+%$j9g?(e_Y%iq#^4@PLj>yeeMl0hX;!YcH>w+Zd+mxHix$#H?ge=$jYUj9%yd
z^L+OE-WmIv^d@UJ`;_9F%13S9Z~E2zpp$)>$Ekgf^j~F6)eK9KpOGLPotL0{+n)Ei
zhS-Y)VV2Di2WNW=@SL7<d*Pf#KQ%)%1-=}zdHkzCA$)?SNXcQF1^tB+HToy#{Fk1#
j;wV>`MUp^t&m-196XYg8U)UW5bT5OatDnm{r-UW|QXFm+

literal 0
HcmV?d00001

diff --git a/core/img/actions/details.svg b/core/img/actions/details.svg
new file mode 100644
index 00000000000..296d8825cbc
--- /dev/null
+++ b/core/img/actions/details.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m4.9999 7.4745c0.1553 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7587-1.4279 1.6616-0.3421-0.3681 2.0169-0.8342 4.0167-1.1711 6.0387-0.3916 1.115 0.635 2.068 1.6379 1.312 1.0779-0.503 1.9915-1.288 2.9275-2.012-0.144-0.322-0.25-0.789-0.596-0.346-0.4687 0.239-1.4695 1.317-1.6967 0.471 0.3154-2.181 0.9755-4.2953 1.3654-6.4616 0.3973-1.0049-0.3645-2.2233-1.3997-1.3634-1.2565 0.6173-2.2895 1.5844-3.3734 2.4575zm4.4593-7.4718c-1.3075-0.017336-1.9056 2.1455-0.6427 2.6795 1.0224 0.378 2.0768-0.7138 1.7898-1.7504-0.098-0.54186-0.598-0.96979-1.1471-0.92912h-0.000001z"/>
+</svg>
-- 
GitLab


From a446b43bccc2f366a3e64df25320d8e05cd68acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 15 Sep 2015 16:52:12 +0200
Subject: [PATCH 287/783] Revert "Allow Remote avatars"

---
 core/avatar/avatarcontroller.php           |  6 +----
 tests/core/avatar/avatarcontrollertest.php | 29 +++++++++-------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index 0c270bee53e..945e022600a 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -90,18 +90,14 @@ class AvatarController extends Controller {
 	}
 
 	/**
+	 * @NoAdminRequired
 	 * @NoCSRFRequired
-	 * @PublicPage
 	 *
 	 * @param string $userId
 	 * @param int $size
 	 * @return DataResponse|DataDisplayResponse
 	 */
 	public function getAvatar($userId, $size) {
-		if (!$this->userManager->userExists($userId)) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
 		if ($size > 2048) {
 			$size = 2048;
 		} elseif ($size <= 0) {
diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/avatar/avatarcontrollertest.php
index 9accd5181c6..e8fb977fae1 100644
--- a/tests/core/avatar/avatarcontrollertest.php
+++ b/tests/core/avatar/avatarcontrollertest.php
@@ -96,12 +96,8 @@ class AvatarControllerTest extends \Test\TestCase {
 		// Configure userMock
 		$this->userMock->method('getDisplayName')->willReturn($this->user);
 		$this->userMock->method('getUID')->willReturn($this->user);
-		$this->container['UserManager']
-			->method('get')
+		$this->container['UserManager']->method('get')
 			->willReturnMap([[$this->user, $this->userMock]]);
-		$this->container['UserManager']
-			->method('userExists')
-			->willReturnMap([[$this->user, true]]);
 		$this->container['UserSession']->method('getUser')->willReturn($this->userMock);
 
 	}
@@ -124,10 +120,11 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * Fetch an avatar if a user has no avatar
 	 */
 	public function testGetAvatarNoAvatar() {
-		$this->container['UserManager']->expects($this->once())->method('userExists');
-		$this->container['AvatarManager']->expects($this->once())->method('getAvatar')->willReturn($this->avatarMock);
+		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
 		$response = $this->avatarController->getAvatar($this->user, 32);
 
+		//Comment out until JS is fixed
+		//$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
 		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
 		$this->assertEquals($this->user, $response->getData()['data']['displayname']);
 	}
@@ -136,11 +133,9 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * Fetch the user's avatar
 	 */
 	public function testGetAvatar() {
-		$this->container['UserManager']->expects($this->once())->method('userExists');
-
 		$image = new Image(OC::$SERVERROOT.'/tests/data/testimage.jpg');
-		$this->avatarMock->expects($this->once())->method('get')->willReturn($image);
-		$this->container['AvatarManager']->expects($this->once())->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarMock->method('get')->willReturn($image);
+		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
 
 		$response = $this->avatarController->getAvatar($this->user, 32);
 
@@ -155,19 +150,21 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * Fetch the avatar of a non-existing user
 	 */
 	public function testGetAvatarNoUser() {
-		$this->container['UserManager']->expects($this->once())->method('userExists');
+		$this->avatarMock->method('get')->willReturn(null);
+		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+
 		$response = $this->avatarController->getAvatar($this->user . 'doesnotexist', 32);
 
 		//Comment out until JS is fixed
-		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
-		$this->assertEquals([], $response->getData());
+		//$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+		$this->assertEquals('', $response->getData()['data']['displayname']);
 	}
 
 	/**
 	 * Make sure we get the correct size
 	 */
 	public function testGetAvatarSize() {
-		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$this->avatarMock->expects($this->once())
 						 ->method('get')
 						 ->with($this->equalTo(32));
@@ -181,7 +178,6 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * We cannot get avatars that are 0 or negative
 	 */
 	public function testGetAvatarSizeMin() {
-		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$this->avatarMock->expects($this->once())
 						 ->method('get')
 						 ->with($this->equalTo(64));
@@ -195,7 +191,6 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * We do not support avatars larger than 2048*2048
 	 */
 	public function testGetAvatarSizeMax() {
-		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$this->avatarMock->expects($this->once())
 						 ->method('get')
 						 ->with($this->equalTo(2048));
-- 
GitLab


From accebae356eeea4f71cde8fe1300bf9790533465 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 15 Sep 2015 17:03:43 +0200
Subject: [PATCH 288/783] fix filename display in sidebar, fix #18981

---
 apps/files/css/detailsView.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index 2de4093805b..ea9d48b470c 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -72,10 +72,13 @@
 #app-sidebar .fileName h3 {
 	max-width: 300px;
 	float:left;
+	padding: 5px 0;
+	margin: -5px 0;
 }
 
 #app-sidebar .file-details {
 	margin-top: 3px;
+	margin-bottom: 15px;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
 	opacity: .5;
 	float:left;
-- 
GitLab


From fe8ef0dd36f4a2eea2806cc7b4f89cf5b734d51e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Sun, 30 Aug 2015 14:23:36 +0200
Subject: [PATCH 289/783] Add reshare activities for the parent sharee and the
 original file owner

---
 apps/files_sharing/lib/activity.php | 42 ++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/apps/files_sharing/lib/activity.php b/apps/files_sharing/lib/activity.php
index 204c0a037b9..1257e7a445c 100644
--- a/apps/files_sharing/lib/activity.php
+++ b/apps/files_sharing/lib/activity.php
@@ -23,9 +23,9 @@
 
 namespace OCA\Files_Sharing;
 
-use OC\L10N\Factory;
 use OCP\Activity\IExtension;
 use OCP\IURLGenerator;
+use OCP\L10N\IFactory;
 
 class Activity implements IExtension {
 	const FILES_SHARING_APP = 'files_sharing';
@@ -55,19 +55,22 @@ class Activity implements IExtension {
 	const SUBJECT_SHARED_GROUP_SELF = 'shared_group_self';
 	const SUBJECT_SHARED_LINK_SELF = 'shared_link_self';
 	const SUBJECT_SHARED_USER_SELF = 'shared_user_self';
+	const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
+	const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
+	const SUBJECT_RESHARED_USER_BY = 'reshared_user_by';
 	const SUBJECT_SHARED_WITH_BY = 'shared_with_by';
 
-	/** @var Factory */
+	/** @var IFactory */
 	protected $languageFactory;
 
 	/** @var IURLGenerator */
 	protected $URLGenerator;
 
 	/**
-	 * @param Factory $languageFactory
+	 * @param IFactory $languageFactory
 	 * @param IURLGenerator $URLGenerator
 	 */
-	public function __construct(Factory $languageFactory, IURLGenerator $URLGenerator) {
+	public function __construct(IFactory $languageFactory, IURLGenerator $URLGenerator) {
 		$this->languageFactory = $languageFactory;
 		$this->URLGenerator = $URLGenerator;
 	}
@@ -169,6 +172,12 @@ class Activity implements IExtension {
 					return (string) $l->t('You shared %1$s with %2$s', $params);
 				case self::SUBJECT_SHARED_GROUP_SELF:
 					return (string) $l->t('You shared %1$s with group %2$s', $params);
+				case self::SUBJECT_RESHARED_USER_BY:
+					return (string) $l->t('%2$s shared %1$s with %3$s', $params);
+				case self::SUBJECT_RESHARED_GROUP_BY:
+					return (string) $l->t('%2$s shared %1$s with group %3$s', $params);
+				case self::SUBJECT_RESHARED_LINK_BY:
+					return (string) $l->t('%2$s shared %1$s via link', $params);
 				case self::SUBJECT_SHARED_WITH_BY:
 					return (string) $l->t('%2$s shared %1$s with you', $params);
 				case self::SUBJECT_SHARED_LINK_SELF:
@@ -212,15 +221,35 @@ class Activity implements IExtension {
 					);
 				case self::SUBJECT_SHARED_LINK_SELF:
 					return [0 => 'file'];
+				case self::SUBJECT_RESHARED_LINK_BY:
+					return [
+						0 => 'file',
+						1 => 'username',
+						2 => '',
+					];
+
 				case self::SUBJECT_SHARED_USER_SELF:
 				case self::SUBJECT_SHARED_WITH_BY:
 					return [0 => 'file', 1 => 'username'];
+				case self::SUBJECT_RESHARED_USER_BY:
+					return [
+						0 => 'file',
+						1 => 'username',
+						2 => 'username',
+					];
 
 				case self::SUBJECT_SHARED_GROUP_SELF:
 					return [
 						0 => 'file',
 						1 => 'group',
 					];
+
+				case self::SUBJECT_RESHARED_GROUP_BY:
+					return [
+						0 => 'file',
+						1 => 'username',
+						2 => 'group',
+					];
 			}
 		}
 
@@ -245,6 +274,11 @@ class Activity implements IExtension {
 				case self::SUBJECT_SHARED_GROUP_SELF:
 					// Group by user/group
 					return 1;
+				case self::SUBJECT_RESHARED_USER_BY:
+				case self::SUBJECT_RESHARED_GROUP_BY:
+					// Group by user/group
+					// FIXME: Grouping does currently not work with more then 2 parameters
+					// return 2;
 			}
 		}
 
-- 
GitLab


From 7ab57f7f271c27754543933cca30752549f3ce96 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 17:52:01 +0200
Subject: [PATCH 290/783] Add details icon for details menu item

---
 apps/files/js/filelist.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 3e12573c046..3e4cdaf8be3 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -301,6 +301,7 @@
 				this.fileActions.registerAction({
 					name: 'Details',
 					mime: 'all',
+					icon: OC.imagePath('core', 'actions/details'),
 					permissions: OC.PERMISSION_READ,
 					actionHandler: function(fileName, context) {
 						self._updateDetailsView(fileName);
-- 
GitLab


From 00d756b4d1d418cd8f100cdf8e3910040a6f1d67 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 15 Sep 2015 18:11:44 +0200
Subject: [PATCH 291/783] adjust multiselect bar to controls bar, fix #18989

---
 apps/files/css/files.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 05033dc2fed..3bd1840687f 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -254,7 +254,7 @@ table thead th {
 	background-color: #fff;
 }
 table.multiselect thead th {
-	background-color: rgba(248,248,248,.8); /* #f8f8f8 like other hover style */
+	background-color: rgba(255, 255, 255, 0.95); /* like controls bar */
 	color: #000;
 	font-weight: bold;
 	border-bottom: 0;
-- 
GitLab


From 11555a9c06ddf62306393c86ad860735930eeab6 Mon Sep 17 00:00:00 2001
From: Carla Schroder <carla@owncloud.com>
Date: Tue, 15 Sep 2015 09:17:59 -0700
Subject: [PATCH 292/783] correction to logging levels

---
 config/config.sample.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index a841831f018..0f39ad185cc 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -505,7 +505,7 @@ $CONFIG = array(
 
 /**
  * Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
- * Warning, 3 = Error. The default value is Warning.
+ * Warning, 3 = Error, and 4 = Fatal. The default value is Warning.
  */
 'loglevel' => 2,
 
-- 
GitLab


From 1d56d74c3f0db8ab1a02325380d5bd3897e31a52 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 15 Sep 2015 19:25:49 +0200
Subject: [PATCH 293/783] fix height of 'All files' entry in sidebar

---
 apps/files/css/files.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 05033dc2fed..62b94acf77e 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -110,10 +110,6 @@
 	cursor: pointer;
 }
 
-#app-navigation .nav-files a {
-	display: inline-block;
-}
-
 #app-navigation .nav-files a.new.hidden {
 	display: none;
 }
-- 
GitLab


From 0cefbd76b9369135075fda8c210dfa9ff88a264c Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Mon, 31 Aug 2015 23:52:00 +0300
Subject: [PATCH 294/783] Add expiration for versions older than max

---
 apps/files_versions/appinfo/app.php           |   8 +-
 apps/files_versions/appinfo/install.php       |  23 ++++
 apps/files_versions/appinfo/update.php        |   3 +
 .../lib/backgroundjob/expireversions.php      | 106 ++++++++++++++++++
 apps/files_versions/lib/expiration.php        |  13 +++
 apps/files_versions/lib/storage.php           |  28 +++++
 6 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 apps/files_versions/appinfo/install.php
 create mode 100644 apps/files_versions/lib/backgroundjob/expireversions.php

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 967f2e73a34..218d5351152 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -19,6 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-OCP\Util::addStyle('files_versions', 'versions');
+
+namespace OCA\Files_Versions\AppInfo;
+
+$app = new Application();
+$container = $app->getContainer();
+
+\OCP\Util::addStyle('files_versions', 'versions');
 
 \OCA\Files_Versions\Hooks::connectHooks();
diff --git a/apps/files_versions/appinfo/install.php b/apps/files_versions/appinfo/install.php
new file mode 100644
index 00000000000..d72ba2f56e5
--- /dev/null
+++ b/apps/files_versions/appinfo/install.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+ 
+// Cron job for deleting expired trash items
+\OC::$server->getJobList()->add('OCA\Files_Versions\BackgroundJob\ExpireVersions');
diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
index 524f9bd153f..687e5d3b5d4 100644
--- a/apps/files_versions/appinfo/update.php
+++ b/apps/files_versions/appinfo/update.php
@@ -24,3 +24,6 @@ $installedVersion=OCP\Config::getAppValue('files_versions', 'installed_version')
 if (version_compare($installedVersion, '1.0.4', '<')) {
 	\OC_DB::dropTable("files_versions");
 }
+
+// Cron job for deleting expired trash items
+\OC::$server->getJobList()->add('OCA\Files_Versions\BackgroundJob\ExpireVersions');
diff --git a/apps/files_versions/lib/backgroundjob/expireversions.php b/apps/files_versions/lib/backgroundjob/expireversions.php
new file mode 100644
index 00000000000..8aa1fcb0635
--- /dev/null
+++ b/apps/files_versions/lib/backgroundjob/expireversions.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_Versions\BackgroundJob;
+
+use OCP\IDBConnection;
+use OCP\IUserManager;
+use OCA\Files_Versions\AppInfo\Application;
+use OCA\Files_Versions\Storage;
+use OCA\Files_Versions\Expiration;
+
+class ExpireVersions extends \OC\BackgroundJob\TimedJob {
+
+	const ITEMS_PER_SESSION = 1000;
+
+	/**
+	 * @var Expiration
+	 */
+	private $expiration;
+
+	/**
+	 * @var IDBConnection
+	 */
+	private $dbConnection;
+	
+	/**
+	 * @var IUserManager
+	 */
+	private $userManager;
+
+	public function __construct(IDBConnection $dbConnection = null, IUserManager $userManager = null, Expiration $expiration = null) {
+		// Run once per 30 minutes
+		$this->setInterval(60 * 30);
+
+		if (is_null($expiration) || is_null($userManager) || is_null($dbConnection)) {
+			$this->fixDIForJobs();
+		} else {
+			$this->dbConnection = $dbConnection;
+			$this->expiration = $expiration;
+			$this->userManager = $userManager;
+		}
+	}
+
+	protected function fixDIForJobs() {
+		$application = new Application();
+		$this->dbConnection = \OC::$server->getDatabaseConnection();
+		$this->expiration = $application->getContainer()->query('Expiration');
+		$this->userManager = \OC::$server->getUserManager();
+	}
+
+	protected function run($argument) {
+		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
+		if (!$maxAge) {
+			return;
+		}
+
+		$users = $this->userManager->search('');
+		$isFSready = false;
+		foreach ($users as $user) {
+			$uid = $user->getUID();
+			if (!$isFSready) {
+				if (!$this->setupFS($uid)) {
+					continue;
+				}
+				$isFSready = true;
+			}
+			Storage::expireOlderThan($uid);
+		}
+
+		\OC_Util::tearDownFS();
+	}
+
+	/**
+	 * Act on behalf on trash item owner
+	 * @param string $user
+	 * @return boolean
+	 */
+	private function setupFS($user){
+		if (!$this->userManager->userExists($user)) {
+			return false;
+		}
+
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($user);
+
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/apps/files_versions/lib/expiration.php b/apps/files_versions/lib/expiration.php
index d42c62f0ee3..fba705251e9 100644
--- a/apps/files_versions/lib/expiration.php
+++ b/apps/files_versions/lib/expiration.php
@@ -112,6 +112,19 @@ class Expiration {
 		return $isOlderThanMax || $isMinReached;
 	}
 
+	/**
+	 * Get maximal retention obligation as a timestamp
+	 * @return int
+	 */
+	public function getMaxAgeAsTimestamp(){
+		$maxAge = false;
+		if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
+			$time = $this->timeFactory->getTime();
+			$maxAge = $time - ($this->maxAge * 86400);
+		}
+		return $maxAge;
+	}
+
 	/**
 	* Read versions_retention_obligation, validate it 
 	* and set private members accordingly
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index ba2b78ff4d2..1f9d0fa04a1 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -403,6 +403,34 @@ class Storage {
 		return $versions;
 	}
 
+	public static function expireOlderThan($uid){
+		$expiration = self::getExpiration();
+		$threshold = $expiration->getMaxAgeAsTimestamp();
+		$versions = self::getAllVersions($uid);
+		if (!$threshold || !array_key_exists('all', $versions)) {
+			return;
+		}
+
+		$toDelete = [];
+		foreach (array_reverse($versions['all']) as $key => $version) {
+			if (intval($version['version'])<$threshold) {
+				$toDelete[$key] = $version;
+			} else {
+				//Versions are sorted by time - nothing mo to iterate.
+				break;
+			}
+		}
+
+		$view = new \OC\Files\View('/' . $uid . '/files_versions');
+		if (!empty($toDelete)) {
+			foreach ($toDelete as $version) {
+				\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version']));
+				self::deleteVersion($view, $version['path'] . '.v' . $version['version']);
+				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version']));
+			}
+		}
+	}
+
 	/**
 	 * translate a timestamp into a string like "5 days ago"
 	 * @param int $timestamp
-- 
GitLab


From 1f7ac2c309b7a43746a65f4676373071a8c3b359 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Tue, 15 Sep 2015 21:11:52 +0300
Subject: [PATCH 295/783] Postrebase cleanup

---
 apps/files_versions/appinfo/app.php                |  5 -----
 .../lib/backgroundjob/expireversions.php           | 14 +++-----------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 218d5351152..eadc7c69a23 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -20,11 +20,6 @@
  *
  */
 
-namespace OCA\Files_Versions\AppInfo;
-
-$app = new Application();
-$container = $app->getContainer();
-
 \OCP\Util::addStyle('files_versions', 'versions');
 
 \OCA\Files_Versions\Hooks::connectHooks();
diff --git a/apps/files_versions/lib/backgroundjob/expireversions.php b/apps/files_versions/lib/backgroundjob/expireversions.php
index 8aa1fcb0635..ec5612b5a67 100644
--- a/apps/files_versions/lib/backgroundjob/expireversions.php
+++ b/apps/files_versions/lib/backgroundjob/expireversions.php
@@ -21,7 +21,6 @@
 
 namespace OCA\Files_Versions\BackgroundJob;
 
-use OCP\IDBConnection;
 use OCP\IUserManager;
 use OCA\Files_Versions\AppInfo\Application;
 use OCA\Files_Versions\Storage;
@@ -35,25 +34,19 @@ class ExpireVersions extends \OC\BackgroundJob\TimedJob {
 	 * @var Expiration
 	 */
 	private $expiration;
-
-	/**
-	 * @var IDBConnection
-	 */
-	private $dbConnection;
 	
 	/**
 	 * @var IUserManager
 	 */
 	private $userManager;
 
-	public function __construct(IDBConnection $dbConnection = null, IUserManager $userManager = null, Expiration $expiration = null) {
+	public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
 		// Run once per 30 minutes
 		$this->setInterval(60 * 30);
 
-		if (is_null($expiration) || is_null($userManager) || is_null($dbConnection)) {
+		if (is_null($expiration) || is_null($userManager)) {
 			$this->fixDIForJobs();
 		} else {
-			$this->dbConnection = $dbConnection;
 			$this->expiration = $expiration;
 			$this->userManager = $userManager;
 		}
@@ -61,7 +54,6 @@ class ExpireVersions extends \OC\BackgroundJob\TimedJob {
 
 	protected function fixDIForJobs() {
 		$application = new Application();
-		$this->dbConnection = \OC::$server->getDatabaseConnection();
 		$this->expiration = $application->getContainer()->query('Expiration');
 		$this->userManager = \OC::$server->getUserManager();
 	}
@@ -103,4 +95,4 @@ class ExpireVersions extends \OC\BackgroundJob\TimedJob {
 
 		return true;
 	}
-}
\ No newline at end of file
+}
-- 
GitLab


From 9bd4f2d41e5a211ad60a83bfcdc60b8633076a54 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 24 Aug 2015 12:03:53 +0200
Subject: [PATCH 296/783] occ script to disable encryption and to decrypt all
 files again

---
 apps/encryption/appinfo/application.php       |  15 +
 apps/encryption/lib/crypto/decryptall.php     | 143 ++++++++
 apps/encryption/lib/crypto/encryption.php     |  36 +-
 apps/encryption/lib/session.php               |  60 +++-
 apps/encryption/tests/lib/SessionTest.php     |  55 +++
 .../tests/lib/crypto/decryptalltest.php       | 125 +++++++
 .../tests/lib/crypto/encryptionTest.php       |  78 +++++
 core/command/encryption/decryptall.php        | 148 ++++++++
 core/register_command.php                     |   7 +
 lib/private/encryption/decryptall.php         | 268 +++++++++++++++
 lib/public/encryption/iencryptionmodule.php   |  11 +
 .../command/encryption/decryptalltest.php     | 215 ++++++++++++
 tests/lib/encryption/decryptalltest.php       | 321 ++++++++++++++++++
 .../lib/files/storage/wrapper/encryption.php  |   2 +-
 tests/lib/files/stream/encryption.php         |   2 +-
 15 files changed, 1482 insertions(+), 4 deletions(-)
 create mode 100644 apps/encryption/lib/crypto/decryptall.php
 create mode 100644 apps/encryption/tests/lib/crypto/decryptalltest.php
 create mode 100644 core/command/encryption/decryptall.php
 create mode 100644 lib/private/encryption/decryptall.php
 create mode 100644 tests/core/command/encryption/decryptalltest.php
 create mode 100644 tests/lib/encryption/decryptalltest.php

diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index 75107b2723c..515a408fa2c 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -30,6 +30,7 @@ use OCA\Encryption\Controller\RecoveryController;
 use OCA\Encryption\Controller\SettingsController;
 use OCA\Encryption\Controller\StatusController;
 use OCA\Encryption\Crypto\Crypt;
+use OCA\Encryption\Crypto\DecryptAll;
 use OCA\Encryption\Crypto\EncryptAll;
 use OCA\Encryption\Crypto\Encryption;
 use OCA\Encryption\HookManager;
@@ -113,7 +114,9 @@ class Application extends \OCP\AppFramework\App {
 				$container->query('Crypt'),
 				$container->query('KeyManager'),
 				$container->query('Util'),
+				$container->query('Session'),
 				$container->query('EncryptAll'),
+				$container->query('DecryptAll'),
 				$container->getServer()->getLogger(),
 				$container->getServer()->getL10N($container->getAppName())
 			);
@@ -242,6 +245,18 @@ class Application extends \OCP\AppFramework\App {
 			}
 		);
 
+		$container->registerService('DecryptAll',
+			function (IAppContainer $c) {
+				return new DecryptAll(
+					$c->query('Util'),
+					$c->query('KeyManager'),
+					$c->query('Crypt'),
+					$c->query('Session'),
+					new QuestionHelper()
+				);
+			}
+		);
+
 	}
 
 	public function registerSettings() {
diff --git a/apps/encryption/lib/crypto/decryptall.php b/apps/encryption/lib/crypto/decryptall.php
new file mode 100644
index 00000000000..599cd82aa4d
--- /dev/null
+++ b/apps/encryption/lib/crypto/decryptall.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace OCA\Encryption\Crypto;
+
+
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Session;
+use OCA\Encryption\Util;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Console\Question\Question;
+
+class DecryptAll {
+
+	/** @var Util  */
+	protected $util;
+
+	/** @var QuestionHelper  */
+	protected $questionHelper;
+
+	/** @var  Crypt */
+	protected $crypt;
+
+	/** @var  KeyManager */
+	protected $keyManager;
+
+	/** @var Session  */
+	protected $session;
+
+	/**
+	 * @param Util $util
+	 * @param KeyManager $keyManager
+	 * @param Crypt $crypt
+	 * @param Session $session
+	 * @param QuestionHelper $questionHelper
+	 */
+	public function __construct(
+		Util $util,
+		KeyManager $keyManager,
+		Crypt $crypt,
+		Session $session,
+		QuestionHelper $questionHelper
+	) {
+		$this->util = $util;
+		$this->keyManager = $keyManager;
+		$this->crypt = $crypt;
+		$this->session = $session;
+		$this->questionHelper = $questionHelper;
+	}
+
+	/**
+	 * prepare encryption module to decrypt all files
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 * @param $user
+	 * @return bool
+	 */
+	public function prepare(InputInterface $input, OutputInterface $output, $user) {
+
+		$question = new Question('Please enter the recovery key password: ');
+		$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
+
+		if (!empty($user)) {
+			$questionUseLoginPassword = new ConfirmationQuestion(
+				'Do you want to use the users login password to decrypt all files? (y/n) ',
+				false
+			);
+			$useLoginPassword = $this->questionHelper->ask($input, $output, $questionUseLoginPassword);
+			if ($useLoginPassword) {
+				$question = new Question('Please enter the users login password: ');
+			} else if ($this->util->isRecoveryEnabledForUser($user) === false) {
+				$output->writeln('No recovery key available for user ' . $user);
+				return false;
+			} else {
+				$user = $recoveryKeyId;
+			}
+		} else {
+			$user = $recoveryKeyId;
+		}
+
+		$question->setHidden(true);
+		$question->setHiddenFallback(false);
+		$password = $this->questionHelper->ask($input, $output, $question);
+		$privateKey = $this->getPrivateKey($user, $password);
+		if ($privateKey !== false) {
+			$this->updateSession($user, $privateKey);
+			return true;
+		} else {
+			$output->writeln('Could not decrypt private key, maybe you entered the wrong password?');
+		}
+
+
+		return false;
+	}
+
+	/**
+	 * get the private key which will be used to decrypt all files
+	 *
+	 * @param string $user
+	 * @param string $password
+	 * @return bool|string
+	 * @throws \OCA\Encryption\Exceptions\PrivateKeyMissingException
+	 */
+	protected function getPrivateKey($user, $password) {
+		$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
+		if ($user === $recoveryKeyId) {
+			$recoveryKey = $this->keyManager->getSystemPrivateKey($recoveryKeyId);
+			$privateKey = $this->crypt->decryptPrivateKey($recoveryKey, $password);
+		} else {
+			$userKey = $this->keyManager->getPrivateKey($user);
+			$privateKey = $this->crypt->decryptPrivateKey($userKey, $password, $user);
+		}
+
+		return $privateKey;
+	}
+
+	protected function updateSession($user, $privateKey) {
+		$this->session->prepareDecryptAll($user, $privateKey);
+	}
+}
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index c62afac83c1..fde4a2c4a9c 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -30,6 +30,7 @@ namespace OCA\Encryption\Crypto;
 
 use OC\Encryption\Exceptions\DecryptionFailedException;
 use OCA\Encryption\Exceptions\PublicKeyMissingException;
+use OCA\Encryption\Session;
 use OCA\Encryption\Util;
 use OCP\Encryption\IEncryptionModule;
 use OCA\Encryption\KeyManager;
@@ -75,6 +76,9 @@ class Encryption implements IEncryptionModule {
 	/** @var Util */
 	private $util;
 
+	/** @var  Session */
+	private $session;
+
 	/** @var  ILogger */
 	private $logger;
 
@@ -87,25 +91,34 @@ class Encryption implements IEncryptionModule {
 	/** @var  bool */
 	private $useMasterPassword;
 
+	/** @var DecryptAll  */
+	private $decryptAll;
+
 	/**
 	 *
 	 * @param Crypt $crypt
 	 * @param KeyManager $keyManager
 	 * @param Util $util
+	 * @param Session $session
 	 * @param EncryptAll $encryptAll
+	 * @param DecryptAll $decryptAll
 	 * @param ILogger $logger
 	 * @param IL10N $il10n
 	 */
 	public function __construct(Crypt $crypt,
 								KeyManager $keyManager,
 								Util $util,
+								Session $session,
 								EncryptAll $encryptAll,
+								DecryptAll $decryptAll,
 								ILogger $logger,
 								IL10N $il10n) {
 		$this->crypt = $crypt;
 		$this->keyManager = $keyManager;
 		$this->util = $util;
+		$this->session = $session;
 		$this->encryptAll = $encryptAll;
+		$this->decryptAll = $decryptAll;
 		$this->logger = $logger;
 		$this->l = $il10n;
 		$this->useMasterPassword = $util->isMasterKeyEnabled();
@@ -150,7 +163,15 @@ class Encryption implements IEncryptionModule {
 		$this->isWriteOperation = false;
 		$this->writeCache = '';
 
-		$this->fileKey = $this->keyManager->getFileKey($this->path, $this->user);
+		if ($this->session->decryptAllModeActivated()) {
+			$encryptedFileKey = $this->keyManager->getEncryptedFileKey($this->path);
+			$shareKey = $this->keyManager->getShareKey($this->path, $this->session->getDecryptAllUid());
+			$this->fileKey = $this->crypt->multiKeyDecrypt($encryptedFileKey,
+				$shareKey,
+				$this->session->getDecryptAllKey());
+		} else {
+			$this->fileKey = $this->keyManager->getFileKey($this->path, $this->user);
+		}
 
 		if (
 			$mode === 'w'
@@ -426,6 +447,19 @@ class Encryption implements IEncryptionModule {
 		$this->encryptAll->encryptAll($input, $output);
 	}
 
+	/**
+	 * prepare module to perform decrypt all operation
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 * @param string $user
+	 * @return bool
+	 */
+	public function prepareDecryptAll(InputInterface $input, OutputInterface $output, $user = '') {
+		return $this->decryptAll->prepare($input, $output, $user);
+	}
+
+
 	/**
 	 * @param string $path
 	 * @return string
diff --git a/apps/encryption/lib/session.php b/apps/encryption/lib/session.php
index c3759c3fc56..1d0c3711487 100644
--- a/apps/encryption/lib/session.php
+++ b/apps/encryption/lib/session.php
@@ -25,6 +25,7 @@
 
 namespace OCA\Encryption;
 
+use OCA\Encryption\Exceptions\PrivateKeyMissingException;
 use \OCP\ISession;
 
 class Session {
@@ -106,6 +107,61 @@ class Session {
 		$this->session->set('privateKey', $key);
 	}
 
+	/**
+	 * store data needed for the decrypt all operation in the session
+	 *
+	 * @param string $user
+	 * @param string $key
+	 */
+	public function prepareDecryptAll($user, $key) {
+		$this->session->set('decryptAll', true);
+		$this->session->set('decryptAllKey', $key);
+		$this->session->set('decryptAllUid', $user);
+	}
+
+	/**
+	 * check if we are in decrypt all mode
+	 *
+	 * @return bool
+	 */
+	public function decryptAllModeActivated() {
+		$decryptAll = $this->session->get('decryptAll');
+		return ($decryptAll === true);
+	}
+
+	/**
+	 * get uid used for decrypt all operation
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	public function getDecryptAllUid() {
+		$uid = $this->session->get('decryptAllUid');
+		if (is_null($uid) && $this->decryptAllModeActivated()) {
+			throw new \Exception('No uid found while in decrypt all mode');
+		} elseif (is_null($uid)) {
+			throw new \Exception('Please activate decrypt all mode first');
+		}
+
+		return $uid;
+	}
+
+	/**
+	 * get private key for decrypt all operation
+	 *
+	 * @return string
+	 * @throws PrivateKeyMissingException
+	 */
+	public function getDecryptAllKey() {
+		$privateKey = $this->session->get('decryptAllKey');
+		if (is_null($privateKey) && $this->decryptAllModeActivated()) {
+			throw new PrivateKeyMissingException('No private key found while in decrypt all mode');
+		} elseif (is_null($privateKey)) {
+			throw new PrivateKeyMissingException('Please activate decrypt all mode first');
+		}
+
+		return $privateKey;
+	}
 
 	/**
 	 * remove keys from session
@@ -114,7 +170,9 @@ class Session {
 		$this->session->remove('publicSharePrivateKey');
 		$this->session->remove('privateKey');
 		$this->session->remove('encryptionInitialized');
-
+		$this->session->remove('decryptAll');
+		$this->session->remove('decryptAllKey');
+		$this->session->remove('decryptAllUid');
 	}
 
 }
diff --git a/apps/encryption/tests/lib/SessionTest.php b/apps/encryption/tests/lib/SessionTest.php
index e036c439939..0fa48666d70 100644
--- a/apps/encryption/tests/lib/SessionTest.php
+++ b/apps/encryption/tests/lib/SessionTest.php
@@ -56,6 +56,7 @@ class SessionTest extends TestCase {
 	 * @depends testSetAndGetPrivateKey
 	 */
 	public function testIsPrivateKeySet() {
+		$this->instance->setPrivateKey('dummyPrivateKey');
 		$this->assertTrue($this->instance->isPrivateKeySet());
 
 		unset(self::$tempStorage['privateKey']);
@@ -65,6 +66,51 @@ class SessionTest extends TestCase {
 		self::$tempStorage['privateKey'] = 'dummyPrivateKey';
 	}
 
+	public function testDecryptAllModeActivated() {
+		$this->instance->prepareDecryptAll('user1', 'usersKey');
+		$this->assertTrue($this->instance->decryptAllModeActivated());
+		$this->assertSame('user1', $this->instance->getDecryptAllUid());
+		$this->assertSame('usersKey', $this->instance->getDecryptAllKey());
+	}
+
+	public function testDecryptAllModeDeactivated() {
+		$this->assertFalse($this->instance->decryptAllModeActivated());
+	}
+
+	/**
+	 * @expectedException \Exception
+	 * @expectExceptionMessage 'Please activate decrypt all mode first'
+	 */
+	public function testGetDecryptAllUidException() {
+		$this->instance->getDecryptAllUid();
+	}
+
+	/**
+	 * @expectedException \Exception
+	 * @expectExceptionMessage 'No uid found while in decrypt all mode'
+	 */
+	public function testGetDecryptAllUidException2() {
+		$this->instance->prepareDecryptAll(null, 'key');
+		$this->instance->getDecryptAllUid();
+	}
+
+	/**
+	 * @expectedException \OCA\Encryption\Exceptions\PrivateKeyMissingException
+	 * @expectExceptionMessage 'Please activate decrypt all mode first'
+	 */
+	public function testGetDecryptAllKeyException() {
+		$this->instance->getDecryptAllKey();
+	}
+
+	/**
+	 * @expectedException \OCA\Encryption\Exceptions\PrivateKeyMissingException
+	 * @expectExceptionMessage 'No key found while in decrypt all mode'
+	 */
+	public function testGetDecryptAllKeyException2() {
+		$this->instance->prepareDecryptAll('user', null);
+		$this->instance->getDecryptAllKey();
+	}
+
 	/**
 	 *
 	 */
@@ -112,6 +158,10 @@ class SessionTest extends TestCase {
 	 *
 	 */
 	public function testClearWillRemoveValues() {
+		$this->instance->setPrivateKey('privateKey');
+		$this->instance->setStatus('initStatus');
+		$this->instance->prepareDecryptAll('user', 'key');
+		$this->assertNotEmpty(self::$tempStorage);
 		$this->instance->clear();
 		$this->assertEmpty(self::$tempStorage);
 	}
@@ -138,4 +188,9 @@ class SessionTest extends TestCase {
 
 		$this->instance = new Session($this->sessionMock);
 	}
+
+	protected function tearDown() {
+		self::$tempStorage = [];
+		parent::tearDown();
+	}
 }
diff --git a/apps/encryption/tests/lib/crypto/decryptalltest.php b/apps/encryption/tests/lib/crypto/decryptalltest.php
new file mode 100644
index 00000000000..d6a52fe97c0
--- /dev/null
+++ b/apps/encryption/tests/lib/crypto/decryptalltest.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace OCA\Encryption\Tests\lib\Crypto;
+
+
+use OCA\Encryption\Crypto\Crypt;
+use OCA\Encryption\Crypto\DecryptAll;
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Session;
+use OCA\Encryption\Util;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Test\TestCase;
+
+class DecryptAllTest extends TestCase {
+
+	/** @var  DecryptAll */
+	protected $instance;
+
+	/** @var Util | \PHPUnit_Framework_MockObject_MockObject  */
+	protected $util;
+
+	/** @var KeyManager | \PHPUnit_Framework_MockObject_MockObject  */
+	protected $keyManager;
+
+	/** @var  Crypt | \PHPUnit_Framework_MockObject_MockObject */
+	protected $crypt;
+
+	/** @var  Session | \PHPUnit_Framework_MockObject_MockObject */
+	protected $session;
+
+	/** @var QuestionHelper | \PHPUnit_Framework_MockObject_MockObject  */
+	protected $questionHelper;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->util = $this->getMockBuilder('OCA\Encryption\Util')
+			->disableOriginalConstructor()->getMock();
+		$this->keyManager = $this->getMockBuilder('OCA\Encryption\KeyManager')
+			->disableOriginalConstructor()->getMock();
+		$this->crypt = $this->getMockBuilder('OCA\Encryption\Crypto\Crypt')
+			->disableOriginalConstructor()->getMock();
+		$this->session = $this->getMockBuilder('OCA\Encryption\Session')
+			->disableOriginalConstructor()->getMock();
+		$this->questionHelper = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
+			->disableOriginalConstructor()->getMock();
+
+		$this->instance = new DecryptAll(
+			$this->util,
+			$this->keyManager,
+			$this->crypt,
+			$this->session,
+			$this->questionHelper
+		);
+	}
+
+	public function testUpdateSession() {
+		$this->session->expects($this->once())->method('prepareDecryptAll')
+			->with('user1', 'key1');
+
+		$this->invokePrivate($this->instance, 'updateSession', ['user1', 'key1']);
+	}
+
+	/**
+	 * @dataProvider dataTestGetPrivateKey
+	 *
+	 * @param string $user
+	 * @param string $recoveryKeyId
+	 */
+	public function testGetPrivateKey($user, $recoveryKeyId) {
+		$password = 'passwd';
+		$recoveryKey = 'recoveryKey';
+		$userKey = 'userKey';
+		$unencryptedKey = 'unencryptedKey';
+
+		$this->keyManager->expects($this->any())->method('getRecoveryKeyId')
+			->willReturn($recoveryKeyId);
+
+		if ($user === $recoveryKeyId) {
+			$this->keyManager->expects($this->once())->method('getSystemPrivateKey')
+				->with($recoveryKeyId)->willReturn($recoveryKey);
+			$this->keyManager->expects($this->never())->method('getPrivateKey');
+			$this->crypt->expects($this->once())->method('decryptPrivateKey')
+				->with($recoveryKey, $password)->willReturn($unencryptedKey);
+		} else {
+			$this->keyManager->expects($this->never())->method('getSystemPrivateKey');
+			$this->keyManager->expects($this->once())->method('getPrivateKey')
+				->with($user)->willReturn($userKey);
+			$this->crypt->expects($this->once())->method('decryptPrivateKey')
+				->with($userKey, $password, $user)->willReturn($unencryptedKey);
+		}
+
+		$this->assertSame($unencryptedKey,
+			$this->invokePrivate($this->instance, 'getPrivateKey', [$user, $password])
+		);
+	}
+
+	public function dataTestGetPrivateKey() {
+		return [
+			['user1', 'recoveryKey'],
+			['recoveryKeyId', 'recoveryKeyId']
+		];
+	}
+
+}
diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php
index f58aa5d3ccb..9e0cb2f09d1 100644
--- a/apps/encryption/tests/lib/crypto/encryptionTest.php
+++ b/apps/encryption/tests/lib/crypto/encryptionTest.php
@@ -39,6 +39,12 @@ class EncryptionTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	private $encryptAllMock;
 
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	private $decryptAllMock;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	private $sessionMock;
+
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	private $cryptMock;
 
@@ -63,9 +69,15 @@ class EncryptionTest extends TestCase {
 		$this->keyManagerMock = $this->getMockBuilder('OCA\Encryption\KeyManager')
 			->disableOriginalConstructor()
 			->getMock();
+		$this->sessionMock = $this->getMockBuilder('OCA\Encryption\Session')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->encryptAllMock = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
 			->disableOriginalConstructor()
 			->getMock();
+		$this->decryptAllMock = $this->getMockBuilder('OCA\Encryption\Crypto\DecryptAll')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->loggerMock = $this->getMockBuilder('OCP\ILogger')
 			->disableOriginalConstructor()
 			->getMock();
@@ -81,7 +93,9 @@ class EncryptionTest extends TestCase {
 			$this->cryptMock,
 			$this->keyManagerMock,
 			$this->utilMock,
+			$this->sessionMock,
 			$this->encryptAllMock,
+			$this->decryptAllMock,
 			$this->loggerMock,
 			$this->l10nMock
 		);
@@ -170,6 +184,16 @@ class EncryptionTest extends TestCase {
 	 */
 	public function testBegin($mode, $header, $legacyCipher, $defaultCipher, $fileKey, $expected) {
 
+		$this->sessionMock->expects($this->once())
+			->method('decryptAllModeActivated')
+			->willReturn(false);
+
+		$this->sessionMock->expects($this->never())->method('getDecryptAllUid');
+		$this->sessionMock->expects($this->never())->method('getDecryptAllKey');
+		$this->keyManagerMock->expects($this->never())->method('getEncryptedFileKey');
+		$this->keyManagerMock->expects($this->never())->method('getShareKey');
+		$this->cryptMock->expects($this->never())->method('multiKeyDecrypt');
+
 		$this->cryptMock->expects($this->any())
 			->method('getCipher')
 			->willReturn($defaultCipher);
@@ -209,6 +233,49 @@ class EncryptionTest extends TestCase {
 		);
 	}
 
+
+	/**
+	 * test begin() if decryptAll mode was activated
+	 */
+	public function testBeginDecryptAll() {
+
+		$path = '/user/files/foo.txt';
+		$recoveryKeyId = 'recoveryKeyId';
+		$recoveryShareKey = 'recoveryShareKey';
+		$decryptAllKey = 'decryptAllKey';
+		$fileKey = 'fileKey';
+
+		$this->sessionMock->expects($this->once())
+			->method('decryptAllModeActivated')
+			->willReturn(true);
+		$this->sessionMock->expects($this->once())
+			->method('getDecryptAllUid')
+			->willReturn($recoveryKeyId);
+		$this->sessionMock->expects($this->once())
+			->method('getDecryptAllKey')
+			->willReturn($decryptAllKey);
+
+		$this->keyManagerMock->expects($this->once())
+			->method('getEncryptedFileKey')
+			->willReturn('encryptedFileKey');
+		$this->keyManagerMock->expects($this->once())
+			->method('getShareKey')
+			->with($path, $recoveryKeyId)
+			->willReturn($recoveryShareKey);
+		$this->cryptMock->expects($this->once())
+			->method('multiKeyDecrypt')
+			->with('encryptedFileKey', $recoveryShareKey, $decryptAllKey)
+			->willReturn($fileKey);
+
+		$this->keyManagerMock->expects($this->never())->method('getFileKey');
+
+		$this->instance->begin($path, 'user', 'r', [], []);
+
+		$this->assertSame($fileKey,
+			$this->invokePrivate($this->instance, 'fileKey')
+		);
+	}
+
 	/**
 	 * @dataProvider dataTestUpdate
 	 *
@@ -273,4 +340,15 @@ class EncryptionTest extends TestCase {
 	public function testDecrypt() {
 		$this->instance->decrypt('abc');
 	}
+
+	public function testPrepareDecryptAll() {
+		$input = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$output = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+
+		$this->decryptAllMock->expects($this->once())->method('prepare')
+			->with($input, $output, 'user');
+
+		$this->instance->prepareDecryptAll($input, $output, 'user');
+	}
+
 }
diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php
new file mode 100644
index 00000000000..374f635725f
--- /dev/null
+++ b/core/command/encryption/decryptall.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Core\Command\Encryption;
+
+use OCP\App\IAppManager;
+use OCP\Encryption\IManager;
+use OCP\IConfig;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+class DecryptAll extends Command {
+
+	/** @var IManager */
+	protected $encryptionManager;
+
+	/** @var  IAppManager */
+	protected $appManager;
+
+	/** @var IConfig */
+	protected $config;
+
+	/** @var  QuestionHelper */
+	protected $questionHelper;
+
+	/** @var bool */
+	protected $wasTrashbinEnabled;
+
+	/** @var  bool */
+	protected $wasSingleUserModeEnabled;
+
+	/** @var \OC\Encryption\DecryptAll */
+	protected $decryptAll;
+
+	/**
+	 * @param IManager $encryptionManager
+	 * @param IAppManager $appManager
+	 * @param IConfig $config
+	 * @param \OC\Encryption\DecryptAll $decryptAll
+	 * @param QuestionHelper $questionHelper
+	 */
+	public function __construct(
+		IManager $encryptionManager,
+		IAppManager $appManager,
+		IConfig $config,
+		\OC\Encryption\DecryptAll $decryptAll,
+		QuestionHelper $questionHelper
+	) {
+		parent::__construct();
+
+		$this->appManager = $appManager;
+		$this->encryptionManager = $encryptionManager;
+		$this->config = $config;
+		$this->decryptAll = $decryptAll;
+		$this->questionHelper = $questionHelper;
+
+		$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
+		$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleUser', false);
+		$this->config->setSystemValue('singleUser', true);
+		$this->appManager->disableApp('files_trashbin');
+	}
+
+	public function __destruct() {
+		$this->config->setSystemValue('singleUser', $this->wasSingleUserModeEnabled);
+		if ($this->wasTrashbinEnabled) {
+			$this->appManager->enableApp('files_trashbin');
+		}
+	}
+
+	protected function configure() {
+		parent::configure();
+
+		$this->setName('encryption:decrypt-all');
+		$this->setDescription(
+			'This will disable server-side encryption and decrypt all files for '
+			. 'all users if it is supported by your encryption module. '
+			. 'Please make sure that no user access his files during this process!'
+		);
+		$this->addArgument(
+			'user',
+			InputArgument::OPTIONAL,
+			'user for which you want to decrypt all files (optional)'
+		);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+
+		try {
+			if ($this->encryptionManager->isEnabled() === true) {
+				$output->write('Disable server side encryption... ');
+				$this->config->setAppValue('core', 'encryption_enabled', 'no');
+				$output->writeln('done.');
+			} else {
+				$output->writeln('Server side encryption not enabled. Nothing to do.');
+				return;
+
+			}
+
+			$output->writeln("\n");
+			$output->writeln('You are about to start to decrypt all files stored in your ownCloud.');
+			$output->writeln('It will depend on the encryption module and your setup if this is possible.');
+			$output->writeln('Depending on the number and size of your files this can take some time');
+			$output->writeln('Please make sure that no user access his files during this process!');
+			$output->writeln('');
+			$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
+			if ($this->questionHelper->ask($input, $output, $question)) {
+				$user = $input->getArgument('user');
+				$result = $this->decryptAll->decryptAll($input, $output, $user);
+				if ($result === false) {
+					$this->output->writeln(' aborted.');
+					$this->config->setAppValue('core', 'encryption_enabled', 'yes');
+				}
+			} else {
+				$output->write('Enable server side encryption... ');
+				$this->config->setAppValue('core', 'encryption_enabled', 'yes');
+				$output->writeln('done.');
+				$output->writeln('aborted');
+			}
+		} catch (\Exception $e) {
+			// enable server side encryption again if something went wrong
+			$this->config->setAppValue('core', 'encryption_enabled', 'yes');
+			throw $e;
+		}
+	}
+
+}
diff --git a/core/register_command.php b/core/register_command.php
index d3c04ad0671..114e115c491 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -58,6 +58,13 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
 	$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
 	$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
+	$application->add(new OC\Core\Command\Encryption\DecryptAll(
+		\OC::$server->getEncryptionManager(),
+		\OC::$server->getAppManager(),
+		\OC::$server->getConfig(),
+		new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
+		new \Symfony\Component\Console\Helper\QuestionHelper())
+	);
 
 	$application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Log\OwnCloud(\OC::$server->getConfig()));
diff --git a/lib/private/encryption/decryptall.php b/lib/private/encryption/decryptall.php
new file mode 100644
index 00000000000..e59be17886d
--- /dev/null
+++ b/lib/private/encryption/decryptall.php
@@ -0,0 +1,268 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace OC\Encryption;
+
+use OC\Encryption\Exceptions\DecryptionFailedException;
+use OC\Files\View;
+use \OCP\Encryption\IEncryptionModule;
+use OCP\IUserManager;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class DecryptAll {
+
+	/** @var  OutputInterface */
+	protected $output;
+
+	/** @var  InputInterface */
+	protected $input;
+
+	/** @var  Manager */
+	protected $encryptionManager;
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var View */
+	protected $rootView;
+
+	/** @var  array files which couldn't be decrypted */
+	protected $failed;
+
+	/**
+	 * @param Manager $encryptionManager
+	 * @param IUserManager $userManager
+	 * @param View $rootView
+	 */
+	public function __construct(
+		Manager $encryptionManager,
+		IUserManager $userManager,
+		View $rootView
+	) {
+		$this->encryptionManager = $encryptionManager;
+		$this->userManager = $userManager;
+		$this->rootView = $rootView;
+		$this->failed = [];
+	}
+
+	/**
+	 * start to decrypt all files
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 * @param string $user which users data folder should be decrypted, default = all users
+	 * @return bool
+	 * @throws \Exception
+	 */
+	public function decryptAll(InputInterface $input, OutputInterface $output, $user = '') {
+
+		$this->input = $input;
+		$this->output = $output;
+
+		$this->output->writeln('prepare encryption modules...');
+		if ($this->prepareEncryptionModules($user) === false) {
+			return false;
+		}
+		$this->output->writeln(' done.');
+
+		$this->decryptAllUsersFiles($user);
+
+		if (empty($this->failed)) {
+			$this->output->writeln('all files could be decrypted successfully!');
+		} else {
+			$this->output->writeln('Files for following users couldn\'t be decrypted, ');
+			$this->output->writeln('maybe the user is not set up in a way that supports this operation: ');
+			foreach ($this->failed as $uid => $paths) {
+				$this->output->writeln('    ' . $uid);
+			}
+			$this->output->writeln('');
+		}
+
+		return true;
+	}
+
+	/**
+	 * prepare encryption modules to perform the decrypt all function
+	 *
+	 * @param $user
+	 * @return bool
+	 */
+	protected function prepareEncryptionModules($user) {
+		// prepare all encryption modules for decrypt all
+		$encryptionModules = $this->encryptionManager->getEncryptionModules();
+		foreach ($encryptionModules as $moduleDesc) {
+			/** @var IEncryptionModule $module */
+			$module = call_user_func($moduleDesc['callback']);
+			if ($module->prepareDecryptAll($this->input, $this->output, $user) === false) {
+				$this->output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!');
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * iterate over all user and encrypt their files
+	 * @param string $user which users files should be decrypted, default = all users
+	 */
+	protected function decryptAllUsersFiles($user = '') {
+
+		$this->output->writeln("\n");
+
+		$userList = [];
+		if (empty($user)) {
+
+			$fetchUsersProgress = new ProgressBar($this->output);
+			$fetchUsersProgress->setFormat(" %message% \n [%bar%]");
+			$fetchUsersProgress->start();
+			$fetchUsersProgress->setMessage("Fetch list of users...");
+			$fetchUsersProgress->advance();
+
+			foreach ($this->userManager->getBackends() as $backend) {
+				$limit = 500;
+				$offset = 0;
+				do {
+					$users = $backend->getUsers('', $limit, $offset);
+					foreach ($users as $user) {
+						$userList[] = $user;
+					}
+					$offset += $limit;
+					$fetchUsersProgress->advance();
+				} while (count($users) >= $limit);
+				$fetchUsersProgress->setMessage("Fetch list of users... finished");
+				$fetchUsersProgress->finish();
+			}
+		} else {
+			$userList[] = $user;
+		}
+
+		$this->output->writeln("\n\n");
+
+		$progress = new ProgressBar($this->output);
+		$progress->setFormat(" %message% \n [%bar%]");
+		$progress->start();
+		$progress->setMessage("starting to decrypt files...");
+		$progress->advance();
+
+		$numberOfUsers = count($userList);
+		$userNo = 1;
+		foreach ($userList as $uid) {
+			$userCount = "$uid ($userNo of $numberOfUsers)";
+			$this->decryptUsersFiles($uid, $progress, $userCount);
+			$userNo++;
+		}
+
+		$progress->setMessage("starting to decrypt files... finished");
+		$progress->finish();
+
+		$this->output->writeln("\n\n");
+
+	}
+
+	/**
+	 * encrypt files from the given user
+	 *
+	 * @param string $uid
+	 * @param ProgressBar $progress
+	 * @param string $userCount
+	 */
+	protected function decryptUsersFiles($uid, ProgressBar $progress, $userCount) {
+
+		$this->setupUserFS($uid);
+		$directories = array();
+		$directories[] =  '/' . $uid . '/files';
+
+		while($root = array_pop($directories)) {
+			$content = $this->rootView->getDirectoryContent($root);
+			foreach ($content as $file) {
+				$path = $root . '/' . $file['name'];
+				if ($this->rootView->is_dir($path)) {
+					$directories[] = $path;
+					continue;
+				} else {
+					try {
+						$progress->setMessage("decrypt files for user $userCount: $path");
+						$progress->advance();
+						if ($this->decryptFile($path) === false) {
+							$progress->setMessage("decrypt files for user $userCount: $path (already decrypted)");
+							$progress->advance();
+						}
+					} catch (\Exception $e) {
+						if (isset($this->failed[$uid])) {
+							$this->failed[$uid][] = $path;
+						} else {
+							$this->failed[$uid] = [$path];
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * encrypt file
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	protected function decryptFile($path) {
+
+		$source = $path;
+		$target = $path . '.decrypted.' . $this->getTimestamp();
+
+		try {
+			$this->rootView->copy($source, $target);
+			$this->rootView->rename($target, $source);
+		} catch (DecryptionFailedException $e) {
+			if ($this->rootView->file_exists($target)) {
+				$this->rootView->unlink($target);
+			}
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * get current timestamp
+	 *
+	 * @return int
+	 */
+	protected function getTimestamp() {
+		return time();
+	}
+
+
+	/**
+	 * setup user file system
+	 *
+	 * @param string $uid
+	 */
+	protected function setupUserFS($uid) {
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($uid);
+	}
+
+}
diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php
index 0fa0dc570db..66cf1a80e0d 100644
--- a/lib/public/encryption/iencryptionmodule.php
+++ b/lib/public/encryption/iencryptionmodule.php
@@ -145,4 +145,15 @@ interface IEncryptionModule {
 	 */
 	public function encryptAll(InputInterface $input, OutputInterface $output);
 
+	/**
+	 * prepare encryption module to decrypt all files
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output write some status information to the terminal during encryption
+	 * @param $user (optional) for which the files should be decrypted, default = all users
+	 * @return bool return false on failure or if it isn't supported by the module
+	 * @since 8.2.0
+	 */
+	public function prepareDecryptAll(InputInterface $input, OutputInterface $output, $user = '');
+
 }
diff --git a/tests/core/command/encryption/decryptalltest.php b/tests/core/command/encryption/decryptalltest.php
new file mode 100644
index 00000000000..b7fd630e9b0
--- /dev/null
+++ b/tests/core/command/encryption/decryptalltest.php
@@ -0,0 +1,215 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace Tests\Core\Command\Encryption;
+
+
+use OC\Core\Command\Encryption\DecryptAll;
+use Test\TestCase;
+
+class DecryptAllTest extends TestCase {
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IConfig */
+	protected $config;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\Encryption\IManager  */
+	protected $encryptionManager;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\App\IAppManager  */
+	protected $appManager;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject  | \Symfony\Component\Console\Input\InputInterface */
+	protected $consoleInput;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Output\OutputInterface */
+	protected $consoleOutput;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Helper\QuestionHelper */
+	protected $questionHelper;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Encryption\DecryptAll */
+	protected $decryptAll;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->encryptionManager = $this->getMockBuilder('OCP\Encryption\IManager')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->appManager = $this->getMockBuilder('OCP\App\IAppManager')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->questionHelper = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->decryptAll = $this->getMockBuilder('OC\Encryption\DecryptAll')
+			->disableOriginalConstructor()->getMock();
+		$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+
+		$this->config->expects($this->any())
+			->method('getSystemValue')
+			->with('singleUser', false)
+			->willReturn(false);
+		$this->appManager->expects($this->any())
+			->method('isEnabledForUser')
+			->with('files_trashbin')->willReturn(true);
+
+	}
+
+	public function testConstructDesctruct() {
+		// on construct we enable single-user-mode and disable the trash bin
+		$this->config->expects($this->at(1))
+			->method('setSystemValue')
+			->with('singleUser', true);
+		$this->appManager->expects($this->once())
+			->method('disableApp')
+			->with('files_trashbin');
+
+		// on destruct wi disable single-user-mode again and enable the trash bin
+		$this->config->expects($this->at(2))
+			->method('setSystemValue')
+			->with('singleUser', false);
+		$this->appManager->expects($this->once())
+			->method('enableApp')
+			->with('files_trashbin');
+
+		$instance = new DecryptAll(
+			$this->encryptionManager,
+			$this->appManager,
+			$this->config,
+			$this->decryptAll,
+			$this->questionHelper
+		);
+
+		$this->assertTrue(
+			$this->invokePrivate($instance, 'wasTrashbinEnabled')
+		);
+
+		$this->assertFalse(
+			$this->invokePrivate($instance, 'wasSingleUserModeEnabled')
+		);
+	}
+
+	/**
+	 * @dataProvider dataTestExecute
+	 */
+	public function testExecute($encryptionEnabled, $continue) {
+
+		$instance = new DecryptAll(
+			$this->encryptionManager,
+			$this->appManager,
+			$this->config,
+			$this->decryptAll,
+			$this->questionHelper
+		);
+
+		$this->encryptionManager->expects($this->once())
+			->method('isEnabled')
+			->willReturn($encryptionEnabled);
+
+		$this->consoleInput->expects($this->any())
+			->method('getArgument')
+			->with('user')
+			->willReturn('user1');
+
+		if ($encryptionEnabled) {
+			$this->config->expects($this->at(0))
+				->method('setAppValue')
+				->with('core', 'encryption_enabled', 'no');
+			$this->questionHelper->expects($this->once())
+				->method('ask')
+				->willReturn($continue);
+			if ($continue) {
+				$this->decryptAll->expects($this->once())
+					->method('decryptAll')
+					->with($this->consoleInput, $this->consoleOutput, 'user1');
+			} else {
+				$this->decryptAll->expects($this->never())->method('decryptAll');
+				$this->config->expects($this->at(1))
+					->method('setAppValue')
+					->with('core', 'encryption_enabled', 'yes');
+			}
+		} else {
+			$this->config->expects($this->never())->method('setAppValue');
+			$this->decryptAll->expects($this->never())->method('decryptAll');
+			$this->questionHelper->expects($this->never())->method('ask');
+		}
+
+		$this->invokePrivate($instance, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function dataTestExecute() {
+		return [
+			[true, true],
+			[true, false],
+			[false, true],
+			[false, false]
+		];
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testExecuteFailure() {
+		$instance = new DecryptAll(
+			$this->encryptionManager,
+			$this->appManager,
+			$this->config,
+			$this->decryptAll,
+			$this->questionHelper
+		);
+
+		$this->config->expects($this->at(0))
+			->method('setAppValue')
+			->with('core', 'encryption_enabled', 'no');
+
+		// make sure that we enable encryption again after a exception was thrown
+		$this->config->expects($this->at(1))
+			->method('setAppValue')
+			->with('core', 'encryption_enabled', 'yes');
+
+		$this->encryptionManager->expects($this->once())
+			->method('isEnabled')
+			->willReturn(true);
+
+		$this->consoleInput->expects($this->any())
+			->method('getArgument')
+			->with('user')
+			->willReturn('user1');
+
+		$this->questionHelper->expects($this->once())
+			->method('ask')
+			->willReturn(true);
+
+		$this->decryptAll->expects($this->once())
+			->method('decryptAll')
+			->with($this->consoleInput, $this->consoleOutput, 'user1')
+			->willReturnCallback(function() { throw new \Exception(); });
+
+		$this->invokePrivate($instance, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+}
diff --git a/tests/lib/encryption/decryptalltest.php b/tests/lib/encryption/decryptalltest.php
new file mode 100644
index 00000000000..eb3bc721f86
--- /dev/null
+++ b/tests/lib/encryption/decryptalltest.php
@@ -0,0 +1,321 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+namespace Test\Encryption;
+
+
+use OC\Encryption\DecryptAll;
+use OC\Encryption\Exceptions\DecryptionFailedException;
+use OC\Encryption\Manager;
+use OC\Files\View;
+use OCP\IUserManager;
+use Test\TestCase;
+
+class DecryptAllTest extends TestCase {
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | IUserManager */
+	protected $userManager;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | Manager */
+	protected $encryptionManager;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | View */
+	protected $view;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Input\InputInterface */
+	protected $inputInterface;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Output\OutputInterface */
+	protected $outputInterface;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\UserInterface */
+	protected $userInterface;
+
+	/** @var  DecryptAll */
+	protected $instance;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->userManager = $this->getMockBuilder('OCP\IUserManager')
+			->disableOriginalConstructor()->getMock();
+		$this->encryptionManager = $this->getMockBuilder('OC\Encryption\Manager')
+			->disableOriginalConstructor()->getMock();
+		$this->view = $this->getMockBuilder('OC\Files\View')
+			->disableOriginalConstructor()->getMock();
+		$this->inputInterface = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')
+			->disableOriginalConstructor()->getMock();
+		$this->outputInterface = $this->getMockBuilder('Symfony\Component\Console\Output\OutputInterface')
+			->disableOriginalConstructor()->getMock();
+		$this->userInterface = $this->getMockBuilder('OCP\UserInterface')
+			->disableOriginalConstructor()->getMock();
+
+		$this->outputInterface->expects($this->any())->method('getFormatter')
+			->willReturn($this->getMock('\Symfony\Component\Console\Formatter\OutputFormatterInterface'));
+
+		$this->instance = new DecryptAll($this->encryptionManager, $this->userManager, $this->view);
+
+		$this->invokePrivate($this->instance, 'input', [$this->inputInterface]);
+		$this->invokePrivate($this->instance, 'output', [$this->outputInterface]);
+	}
+
+	/**
+	 * @dataProvider dataTrueFalse
+	 */
+	public function testDecryptAll($prepareResult) {
+
+		$user = 'user1';
+
+		/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject |  $instance */
+		$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
+			->setConstructorArgs(
+				[
+					$this->encryptionManager,
+					$this->userManager,
+					$this->view
+				]
+			)
+			->setMethods(['prepareEncryptionModules', 'decryptAllUsersFiles'])
+			->getMock();
+
+		$instance->expects($this->once())
+			->method('prepareEncryptionModules')
+			->with($user)
+			->willReturn($prepareResult);
+
+		if ($prepareResult) {
+			$instance->expects($this->once())
+				->method('decryptAllUsersFiles')
+				->with($user);
+		} else {
+			$instance->expects($this->never())->method('decryptAllUsersFiles');
+		}
+
+		$instance->decryptAll($this->inputInterface, $this->outputInterface, $user);
+	}
+
+	public function dataTrueFalse() {
+		return [
+			[true],
+			[false]
+		];
+	}
+
+	/**
+	 * @dataProvider dataTrueFalse
+	 */
+	public function testPrepareEncryptionModules($success) {
+
+		$user = 'user1';
+
+		$dummyEncryptionModule = $this->getMockBuilder('OCP\Encryption\IEncryptionModule')
+			->disableOriginalConstructor()->getMock();
+
+		$dummyEncryptionModule->expects($this->once())
+			->method('prepareDecryptAll')
+			->with($this->inputInterface, $this->outputInterface, $user)
+			->willReturn($success);
+
+		$callback = function() use ($dummyEncryptionModule) {return $dummyEncryptionModule;};
+		$moduleDescription = [
+			'id' => 'id',
+			'displayName' => 'displayName',
+			'callback' => $callback
+		];
+
+		$this->encryptionManager->expects($this->once())
+			->method('getEncryptionModules')
+			->willReturn([$moduleDescription]);
+
+		$this->assertSame($success,
+			$this->invokePrivate($this->instance, 'prepareEncryptionModules', [$user])
+		);
+	}
+
+	/**
+	 * @dataProvider dataTestDecryptAllUsersFiles
+	 */
+	public function testDecryptAllUsersFiles($user) {
+
+		/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject |  $instance */
+		$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
+			->setConstructorArgs(
+				[
+					$this->encryptionManager,
+					$this->userManager,
+					$this->view
+				]
+			)
+			->setMethods(['decryptUsersFiles'])
+			->getMock();
+
+		$this->invokePrivate($instance, 'input', [$this->inputInterface]);
+		$this->invokePrivate($instance, 'output', [$this->outputInterface]);
+
+		if (empty($user)) {
+			$this->userManager->expects($this->once())
+				->method('getBackends')
+				->willReturn([$this->userInterface]);
+			$this->userInterface->expects($this->any())
+				->method('getUsers')
+				->willReturn(['user1', 'user2']);
+			$instance->expects($this->at(0))
+				->method('decryptUsersFiles')
+				->with('user1');
+			$instance->expects($this->at(1))
+				->method('decryptUsersFiles')
+				->with('user2');
+		} else {
+			$instance->expects($this->once())
+				->method('decryptUsersFiles')
+				->with($user);
+		}
+
+		$this->invokePrivate($instance, 'decryptAllUsersFiles', [$user]);
+	}
+
+	public function dataTestDecryptAllUsersFiles() {
+		return [
+			['user1'],
+			['']
+		];
+	}
+
+	public function testDecryptUsersFiles() {
+		/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject  $instance */
+		$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
+			->setConstructorArgs(
+				[
+					$this->encryptionManager,
+					$this->userManager,
+					$this->view
+				]
+			)
+			->setMethods(['decryptFile'])
+			->getMock();
+
+		$this->view->expects($this->at(0))->method('getDirectoryContent')
+			->with('/user1/files')->willReturn(
+				[
+					['name' => 'foo', 'type'=>'dir'],
+					['name' => 'bar', 'type'=>'file'],
+				]
+			);
+
+		$this->view->expects($this->at(3))->method('getDirectoryContent')
+			->with('/user1/files/foo')->willReturn(
+				[
+					['name' => 'subfile', 'type'=>'file']
+				]
+			);
+
+		$this->view->expects($this->any())->method('is_dir')
+			->willReturnCallback(
+				function($path) {
+					if ($path === '/user1/files/foo') {
+						return true;
+					}
+					return false;
+				}
+			);
+
+		$instance->expects($this->at(0))
+			->method('decryptFile')
+			->with('/user1/files/bar');
+		$instance->expects($this->at(1))
+			->method('decryptFile')
+			->with('/user1/files/foo/subfile');
+
+		$progressBar = $this->getMockBuilder('Symfony\Component\Console\Helper\ProgressBar')
+			->disableOriginalConstructor()->getMock();
+
+		$this->invokePrivate($instance, 'decryptUsersFiles', ['user1', $progressBar, '']);
+
+	}
+
+	public function testDecryptFile() {
+
+		$path = 'test.txt';
+
+		/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject  $instance */
+		$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
+			->setConstructorArgs(
+				[
+					$this->encryptionManager,
+					$this->userManager,
+					$this->view
+				]
+			)
+			->setMethods(['getTimestamp'])
+			->getMock();
+
+		$instance->expects($this->any())->method('getTimestamp')->willReturn(42);
+
+		$this->view->expects($this->once())
+			->method('copy')
+			->with($path, $path . '.decrypted.42');
+		$this->view->expects($this->once())
+			->method('rename')
+			->with($path . '.decrypted.42', $path);
+
+		$this->assertTrue(
+			$this->invokePrivate($instance, 'decryptFile', [$path])
+		);
+	}
+
+	public function testDecryptFileFailure() {
+		$path = 'test.txt';
+
+		/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject  $instance */
+		$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
+			->setConstructorArgs(
+				[
+					$this->encryptionManager,
+					$this->userManager,
+					$this->view
+				]
+			)
+			->setMethods(['getTimestamp'])
+			->getMock();
+
+		$instance->expects($this->any())->method('getTimestamp')->willReturn(42);
+
+		$this->view->expects($this->once())
+			->method('copy')
+			->with($path, $path . '.decrypted.42')
+			->willReturnCallback(function() { throw new DecryptionFailedException();});
+
+		$this->view->expects($this->never())->method('rename');
+		$this->view->expects($this->once())
+			->method('file_exists')
+			->with($path . '.decrypted.42')
+			->willReturn(true);
+		$this->view->expects($this->once())
+			->method('unlink')
+			->with($path . '.decrypted.42');
+
+		$this->assertFalse(
+			$this->invokePrivate($instance, 'decryptFile', [$path])
+		);
+	}
+
+}
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index 36a5b288c64..44e910b901f 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -194,7 +194,7 @@ class Encryption extends \Test\Files\Storage\Storage {
 	protected function buildMockModule() {
 		$this->encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule')
 			->disableOriginalConstructor()
-			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable', 'encryptAll'])
+			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable', 'encryptAll', 'prepareDecryptAll'])
 			->getMock();
 
 		$this->encryptionModule->expects($this->any())->method('getId')->willReturn('UNIT_TEST_MODULE');
diff --git a/tests/lib/files/stream/encryption.php b/tests/lib/files/stream/encryption.php
index ed3b5b1b156..f9d8f076b63 100644
--- a/tests/lib/files/stream/encryption.php
+++ b/tests/lib/files/stream/encryption.php
@@ -305,7 +305,7 @@ class Encryption extends \Test\TestCase {
 	protected function buildMockModule() {
 		$encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule')
 			->disableOriginalConstructor()
-			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable', 'encryptAll'])
+			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable', 'encryptAll', 'prepareDecryptAll'])
 			->getMock();
 
 		$encryptionModule->expects($this->any())->method('getId')->willReturn('UNIT_TEST_MODULE');
-- 
GitLab


From 17d1358aee1fe8f1dde6a780b8ac021413bfb986 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Tue, 15 Sep 2015 16:40:52 +0100
Subject: [PATCH 297/783] AmazonS3 Ceph tests

---
 .../tests/backends/amazons3.php               |  6 +-
 .../tests/env/start-amazons3-ceph.sh          | 81 +++++++++++++++++++
 .../tests/env/stop-amazons3-ceph.sh           | 36 +++++++++
 3 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100755 apps/files_external/tests/env/start-amazons3-ceph.sh
 create mode 100755 apps/files_external/tests/env/stop-amazons3-ceph.sh

diff --git a/apps/files_external/tests/backends/amazons3.php b/apps/files_external/tests/backends/amazons3.php
index 1923ddc30b1..7e88f3d0b74 100644
--- a/apps/files_external/tests/backends/amazons3.php
+++ b/apps/files_external/tests/backends/amazons3.php
@@ -32,11 +32,11 @@ class AmazonS3 extends Storage {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->config = include('files_external/tests/config.php');
-		if ( ! is_array($this->config) or ! isset($this->config['amazons3']) or ! $this->config['amazons3']['run']) {
+		$this->config = include('files_external/tests/config.amazons3.php');
+		if ( ! is_array($this->config) or ! $this->config['run']) {
 			$this->markTestSkipped('AmazonS3 backend not configured');
 		}
-		$this->instance = new \OC\Files\Storage\AmazonS3($this->config['amazons3']);
+		$this->instance = new \OC\Files\Storage\AmazonS3($this->config);
 	}
 
 	protected function tearDown() {
diff --git a/apps/files_external/tests/env/start-amazons3-ceph.sh b/apps/files_external/tests/env/start-amazons3-ceph.sh
new file mode 100755
index 00000000000..5f274f10ca2
--- /dev/null
+++ b/apps/files_external/tests/env/start-amazons3-ceph.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+#
+# ownCloud
+#
+# This script start a docker container to test the files_external tests
+# against. It will also change the files_external config to use the docker
+# container as testing environment. This is reverted in the stop step.W
+#
+# Set environment variable DEBUG to print config file
+#
+# @author Morris Jobke
+# @author Robin McCorkell
+# @copyright 2015 ownCloud
+
+if ! command -v docker >/dev/null 2>&1; then
+    echo "No docker executable found - skipped docker setup"
+    exit 0;
+fi
+
+echo "Docker executable found - setup docker"
+
+docker_image=xenopathic/ceph-keystone
+
+echo "Fetch recent ${docker_image} docker image"
+docker pull ${docker_image}
+
+# retrieve current folder to place the config in the parent folder
+thisFolder=`echo $0 | replace "env/start-amazons3-ceph.sh" ""`
+
+if [ -z "$thisFolder" ]; then
+    thisFolder="."
+fi;
+
+user=test
+accesskey=aaabbbccc
+secretkey=cccbbbaaa
+bucket=testbucket
+port=80
+
+container=`docker run -d \
+    -e RGW_CIVETWEB_PORT=$port \
+    ${docker_image}`
+
+host=`docker inspect $container | grep IPAddress | cut -d '"' -f 4`
+
+
+echo "${docker_image} container: $container"
+
+# put container IDs into a file to drop them after the test run (keep in mind that multiple tests run in parallel on the same host)
+echo $container >> $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.amazons3
+
+# TODO find a way to determine the successful initialization inside the docker container
+echo "Waiting 20 seconds for ceph initialization ... "
+sleep 20
+
+echo "Create ceph user"
+docker exec $container radosgw-admin user create \
+    --uid="$user" --display-name="$user" \
+    --access-key="$accesskey" --secret="$secretkey" \
+    >/dev/null
+
+cat > $thisFolder/config.amazons3.php <<DELIM
+<?php
+
+return array(
+    'run'=>true,
+    'bucket'=>'$bucket',
+    'hostname'=>'$host',
+    'port'=>'$port',
+    'key'=>'$accesskey',
+    'secret'=>'$secretkey',
+    'use_ssl'=>false,
+    'use_path_style'=>true,
+);
+
+DELIM
+
+if [ -n "$DEBUG" ]; then
+    cat $thisFolder/config.amazons3.php
+    cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.amazons3
+fi
diff --git a/apps/files_external/tests/env/stop-amazons3-ceph.sh b/apps/files_external/tests/env/stop-amazons3-ceph.sh
new file mode 100755
index 00000000000..01b39b4c680
--- /dev/null
+++ b/apps/files_external/tests/env/stop-amazons3-ceph.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# ownCloud
+#
+# This script stops the docker container the files_external tests were run
+# against. It will also revert the config changes done in start step.
+#
+# @author Morris Jobke
+# @author Robin McCorkell
+# @copyright 2015 ownCloud
+
+if ! command -v docker >/dev/null 2>&1; then
+    echo "No docker executable found - skipped docker stop"
+    exit 0;
+fi
+
+echo "Docker executable found - stop and remove docker containers"
+
+# retrieve current folder to remove the config from the parent folder
+thisFolder=`echo $0 | replace "env/stop-amazons3-ceph.sh" ""`
+
+if [ -z "$thisFolder" ]; then
+    thisFolder="."
+fi;
+
+# stopping and removing docker containers
+for container in `cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.amazons3`; do
+    echo "Stopping and removing docker container $container"
+    # kills running container and removes it
+    docker rm -f $container
+done;
+
+# cleanup
+rm $thisFolder/config.amazons3.php
+rm $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.amazons3
+
-- 
GitLab


From 7fc545470c1f5200476363d85781fe88ba9b16c8 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 16 Sep 2015 02:02:59 +0100
Subject: [PATCH 298/783] Make AmazonS3 path style actually work

---
 apps/files_external/lib/amazons3.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 7c6ac4cbdd5..34e8974a6d5 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -592,7 +592,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			'key' => $this->params['key'],
 			'secret' => $this->params['secret'],
 			'base_url' => $base_url,
-			'region' => $this->params['region']
+			'region' => $this->params['region'],
+			S3Client::COMMAND_PARAMS => [
+				'PathStyle' => $this->params['use_path_style'],
+			],
 		));
 
 		if (!$this->connection->isValidBucketName($this->bucket)) {
-- 
GitLab


From 59967599acbf2f574b013a9c1fc350e618b1033d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 15 Sep 2015 23:23:00 +0200
Subject: [PATCH 299/783] Fix the parameter order in the translation

---
 apps/files_sharing/lib/notifier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/notifier.php b/apps/files_sharing/lib/notifier.php
index cc2deb3f439..02765fcfd1c 100644
--- a/apps/files_sharing/lib/notifier.php
+++ b/apps/files_sharing/lib/notifier.php
@@ -55,7 +55,7 @@ class Notifier implements INotifier {
 			case 'remote_share':
 				$params = $notification->getSubjectParameters();
 				$notification->setParsedSubject(
-					(string) $l->t('You received %s as a remote share from %s', $params)
+					(string) $l->t('You received %2$s as a remote share from %1$s', $params)
 				);
 
 				// Deal with the actions for a known subject
-- 
GitLab


From edd163a6113664921a2fda730037dcf68bfe08ae Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 31 Jul 2015 00:07:41 +0200
Subject: [PATCH 300/783] refactor share dialog for multi-purpose use
 (dropdown, sidebar) and better maintainability

---
 apps/files_sharing/appinfo/app.php      |   3 +-
 apps/files_sharing/css/sharetabview.css |  69 +++++++
 core/js/share.js                        |  25 ++-
 core/js/sharedialogview.js              | 253 ++++++++++++++++++++++++
 core/js/shareitemmodel.js               | 113 +++++++++++
 lib/private/share/share.php             |   2 +
 6 files changed, 462 insertions(+), 3 deletions(-)
 create mode 100644 core/js/sharedialogview.js
 create mode 100644 core/js/shareitemmodel.js

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 20f1b046d35..3049dc6a263 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -55,8 +55,9 @@ $application->setupPropagation();
 \OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
 
 \OCP\Util::addScript('files_sharing', 'share');
+\OCP\Util::addScript('files_sharing', 'sharetabview');
 \OCP\Util::addScript('files_sharing', 'external');
-\OCP\Util::addStyle('files_sharing', 'sharetabview');
+// \OCP\Util::addStyle('files_sharing', 'sharetabview');
 
 \OC::$server->getActivityManager()->registerExtension(function() {
 		return new \OCA\Files_Sharing\Activity(
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 42c9bee7173..8b9af852531 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -1,3 +1,72 @@
 .app-files .shareTabView {
 	min-height: 100px;
 }
+
+.shareTabView .oneline { white-space: nowrap; }
+
+.shareTabView .shareWithLoading {
+	display: inline-block !important;
+	padding-left: 10px;
+	position: relative;
+	right: 30px;
+	top: 2px;
+}
+
+.shareTabView .shareWithRemoteInfo {
+	padding: 11px 0 11px 10px
+}
+
+.shareTabView label {
+	font-weight:400;
+	white-space: nowrap;
+}
+
+.shareTabView input[type="checkbox"] {
+	margin:0 3px 0 8px;
+	vertical-align: middle;
+}
+
+.shareTabView input[type="text"], .shareTabView input[type="password"] {
+	width: 91%;
+	margin-left: 7px;
+}
+
+.shareTabView form {
+	font-size: 100%;
+	margin-left: 0;
+	margin-right: 0;
+}
+
+#shareWithList {
+	list-style-type:none;
+	padding:8px;
+}
+
+#shareWithList li {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	font-weight: bold;
+	line-height: 21px;
+	white-space: normal;
+}
+
+#shareWithList .unshare img, #shareWithList .showCruds img {
+	vertical-align:text-bottom; /* properly align icons */
+}
+
+#shareWithList label input[type=checkbox]{
+	margin-left: 0;
+	position: relative;
+}
+#shareWithList .username{
+	padding-right: 8px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	max-width: 254px;
+	display: inline-block;
+	overflow: hidden;
+	vertical-align: middle;
+}
+#shareWithList li label{
+	margin-right: 8px;
+}
diff --git a/core/js/share.js b/core/js/share.js
index cd4a614e9d1..5d3253e6d5c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -3,7 +3,7 @@
 /**
  * @namespace
  */
-OC.Share={
+OC.Share = _.extend(OC.Share, {
 	SHARE_TYPE_USER:0,
 	SHARE_TYPE_GROUP:1,
 	SHARE_TYPE_LINK:3,
@@ -289,6 +289,12 @@ OC.Share={
 		}
 		img.attr('src', image);
 	},
+	/**
+	 *
+	 * @param itemType
+	 * @param itemSource
+	 * @returns {OC.Share.Types.ShareInfo}
+	 */
 	loadItem:function(itemType, itemSource) {
 		var data = '';
 		var checkReshare = true;
@@ -371,6 +377,21 @@ OC.Share={
 		});
 	},
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
+		var itemModel = new OC.Share.ShareItemModel(itemType, itemSource);
+		var dialogView = new OC.Share.ShareDialogView('dropdown');
+		dialogView.setContainerClasses('drop shareDropDown');
+		dialogView.setShowLink(link);
+		dialogView.setPossiblePermissions(possiblePermissions);
+		dialogView.setItemModel(itemModel);
+		var $dialog = dialogView.render();
+		$dialog.appendTo(appendTo);
+		$dialog.attr('data-item-source-name', filename);
+		$dialog.slideDown(OC.menuSpeed, function() {
+			OC.Share.droppedDown = true;
+		});
+		return;
+
+
 		var data = OC.Share.loadItem(itemType, itemSource);
 		var dropDownEl;
 		var html = '<div id="dropdown" class="drop shareDropDown" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
@@ -897,7 +918,7 @@ OC.Share={
 		}
 		return expireDateString;
 	}
-};
+});
 
 $(document).ready(function() {
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
new file mode 100644
index 00000000000..cbab9694afe
--- /dev/null
+++ b/core/js/sharedialogview.js
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if(!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE_BASE =
+		'<div id="{{containerID}}" {{{containerClasses}}}>' +
+		'    {{{resharerInfo}}}' +
+		'    <label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
+		'    <div class="oneline">' +
+		'        <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
+		'        <span class="shareWithLoading icon-loading-small hidden"></span>'+
+		'    </div>' +
+			// FIXME: find a good position for remoteShareInfo
+		'    {{{remoteShareInfo}}}' +
+		'    <ul id="shareWithList">' +
+		'    </ul>' +
+		'    {{{linkShare}}}' +
+		'</div>';
+
+	var TEMPLATE_RESHARER_INFO =
+		'<span class="reshare">' +
+		'    {{#if avatarEnabled}}' +
+		'    <div class="avatar"></div>' +
+		'    {{/if}}' +
+		'    {{sharedByText}}' +
+		'</span><br />';
+
+	var TEMPLATE_REMOTE_SHARE_INFO =
+		'<a target="_blank" class="icon-info svg shareWithRemoteInfo" href="{{docLink}}" ' +
+		'title="{{tooltip}}"></a>';
+
+	var TEMPLATE_LINK_SHARE =
+			'<div id="link" class="linkShare">' +
+			'    <span class="icon-loading-small hidden"></span>' +
+			'    <input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
+			'    <br />' +
+			'    <label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
+			'    <input id="linkText" type="text" readonly="readonly" />' +
+			'    <input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
+			'    <div id="linkPass">' +
+			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
+			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
+			'        <span class="icon-loading-small hidden"></span>' +
+			'    </div>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogView
+	 * @classdesc
+	 *
+	 * Represents the GUI of the share dialogue
+	 *
+	 */
+	var ShareDialogView = function(id) {
+		this.initialize(id);
+	};
+
+	/**
+	 * @memberof OCA.Sharing
+	 */
+	ShareDialogView.prototype = {
+		/** @member {OC.Share.ShareItemModel} **/
+		_itemModel: null,
+
+		/** @var {string} **/
+		_id: null,
+
+		/** @var {Object} **/
+		_templates: {},
+
+		/** @var {string} **/
+		_containerClasses: '',
+
+		/** @var {boolean} **/
+		_showLink: true,
+
+		/** @var {unknown} **/
+		_possiblePermissions: null,
+
+		initialize: function (id) {
+			this._id = id;
+		},
+
+		render: function() {
+			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
+
+			var $dialog = $(baseTemplate({
+				containerID: this._id,
+				containerClasses: this._renderContainerClasses(),
+				shareLabel: t('core', 'Share'),
+				resharerInfo: this._renderResharerInfo(),
+				sharePlaceholder: this._renderSharePlaceholderPart(),
+				remoteShareInfo: this._renderRemoteShareInfoPart(),
+				linkShare: this._renderLinkSharePart()
+			}));
+
+			return $dialog;
+		},
+
+		setItemModel: function(model) {
+			if(model instanceof OC.Share.ShareItemModel) {
+				this._itemModel = model;
+			} else {
+				console.warn('model is not an instance of OC.Share.ShareItemModel');
+			}
+		},
+
+		/**
+		 * sets the classes the main container should get additionally
+		 * TODO:: figure out whether this is really necessary
+		 *
+		 * @param {string} classes whitespace seperated
+		 */
+		setContainerClasses: function(classes) {
+			this._containerClasses = classes;
+		},
+
+		/**
+		 * sets whether share by link should be displayed or not. Default is
+		 * true.
+		 *
+		 * @param {bool} showLink
+		 */
+		setShowLink: function(showLink) {
+			this._showLink = (typeof showLink === 'boolean') ? showLink : true;
+		},
+
+		setPossiblePermissions: function(permissions) {
+			//TODO: maybe move to model? Whatever this is.
+			this._possiblePermissions = permissions;
+		},
+
+		_renderResharerInfo: function() {
+			var resharerInfo = '';
+			if (   this._itemModel.hasReshare()
+				&& this._itemModel.getReshareOwner() !== OC.currentUser)
+			{
+				var reshareTemplate = this._getReshareTemplate();
+				var sharedByText = '';
+				if (this._itemModel.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
+					sharedByText = t(
+						'core',
+						'Shared with you and the group {group} by {owner}',
+						{
+							group: this._itemModel.getReshareWith(),
+							owner: this._itemModel.getReshareOwnerDisplayname()
+						}
+					);
+				}  else {
+					sharedByText = t(
+						'core',
+						'Shared with you by {owner}',
+						{ owner: this._itemModel.getReshareOwnerDisplayname() }
+					);
+				}
+
+
+				resharerInfo = reshareTemplate({
+					avatarEnabled: oc_config.enable_avatars === true,
+					sharedByText: sharedByText
+				});
+			}
+		},
+
+		_renderContainerClasses: function() {
+			var classes = '';
+			if(this._containerClasses) {
+				classes = 'class="' + this._containerClasses + '"';
+			}
+			return classes;
+		},
+
+		_renderRemoteShareInfoPart: function() {
+			var remoteShareInfo = '';
+			if(oc_appconfig.core.remoteShareAllowed) {
+				var infoTemplate = this._getRemoteShareInfoTemplate();
+				remoteShareInfo = infoTemplate({
+					docLink: oc_appconfig.core.federatedCloudShareDoc,
+					tooltip: t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud')
+				});
+			}
+			return remoteShareInfo;
+		},
+
+		_renderLinkSharePart: function() {
+			var linkShare = '';
+			if(this._showLink && $('#allowShareWithLink').val() === 'yes') {
+				var linkShareTemplate = this._getLinkShareTemplate();
+				linkShare = linkShareTemplate({
+					linkShareLabel: t('core', 'Share link'),
+					urlLabel: t('core', 'Link'),
+					enablePasswordLabel: t('core', 'Password protect'),
+					passwordLabel: t('core', 'Password'),
+					passwordPlaceholder: t('core', 'Choose a password for the public link')
+				});
+			}
+			return linkShare;
+		},
+
+		_renderSharePlaceholderPart: function () {
+			var sharePlaceholder = t('core', 'Share with users or groups …');
+			if (oc_appconfig.core.remoteShareAllowed) {
+				sharePlaceholder = t('core', 'Share with users, groups or remote users …');
+			}
+			return sharePlaceholder;
+		},
+
+		_getTemplate: function (key, template) {
+			if (!this._templates[key]) {
+				this._templates[key] = Handlebars.compile(template);
+			}
+			return this._templates[key];
+		},
+
+		/**
+		 * returns the info template for remote sharing
+		 *
+		 * @returns {Handlebars}
+		 * @private
+		 */
+		_getRemoteShareInfoTemplate: function() {
+			return this._getTemplate('remoteShareInfo', TEMPLATE_REMOTE_SHARE_INFO);
+		},
+
+		/**
+		 * returns the info template for link sharing
+		 *
+		 * @returns {Handlebars}
+		 * @private
+		 */
+		_getLinkShareTemplate: function() {
+			return this._getTemplate('linkShare', TEMPLATE_LINK_SHARE);
+		},
+
+		_getReshareTemplate: function() {
+			return this._getTemplate('reshare', TEMPLATE_RESHARER_INFO);
+		},
+	};
+
+	OC.Share.ShareDialogView = ShareDialogView;
+
+})();
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
new file mode 100644
index 00000000000..1db49536db5
--- /dev/null
+++ b/core/js/shareitemmodel.js
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if(!OC.Share) {
+		OC.Share = {};
+		OC.Share.Types = {};
+	}
+
+	/**
+	 * @typedef {object} OC.Share.Types.Reshare
+	 * @property {string} uid_owner
+	 * @property {number} share_type
+	 * @property {string} share_with
+	 * @property {string} displayname_owner
+	 * @property {number} permissions
+	 */
+
+	/**
+	 * @typedef {object} OC.Share.Types.ShareInfo
+	 * @property {number} share_type
+	 * @property {number} permissions
+	 * @property {number} file_source optional
+	 * @property {number} item_source
+	 * @property {string} token
+	 * @property {string} share_with
+	 * @property {string} share_with_displayname
+	 * @property {string} share_mail_send
+	 * @property {bool} collection //TODO: verify
+	 * @property {Date} expiration optional?
+	 * @property {number} stime optional?
+	 */
+
+	/**
+	 * @typedef {object} OC.Share.Types.ShareItemInfo
+	 * @property {OC.Share.Types.Reshare} reshare
+	 * @property {OC.Share.Types.ShareInfo[]} shares
+	 */
+
+	/**
+	 * @class OCA.Share.ShareItemModel
+	 * @classdesc
+	 *
+	 * Represents the GUI of the share dialogue
+	 *
+	 */
+	var ShareItemModel = function(itemType, itemSource) {
+		this.initialize(itemType, itemSource);
+	};
+
+	/**
+	 * @memberof OCA.Sharing
+	 */
+	ShareItemModel.prototype = {
+		/** @var {string} **/
+		_itemType: null,
+		/** @var {mixed} **/	//TODO: what type?
+		_itemSource: null,
+
+		/** @var {OC.Share.Types.Reshare} **/
+		_reshare: null,
+
+		/** @var {OC.Share.Types.ShareInfo[]} **/
+		_shares: null,
+
+		initialize: function(itemType, itemSource) {
+			this._itemType = itemType;
+			this._itemSource = itemSource;
+			this._retrieveData();
+		},
+
+		hasReshare: function() {
+			return _.isObject(this._reshare) && !_.isUndefined(this._reshare.uid_owner);
+		},
+
+		getReshareOwner: function() {
+			return this._reshare.uid_owner;
+		},
+
+		getReshareOwnerDisplayname: function() {
+			return this._reshare.displayname_owner;
+		},
+
+		getReshareWith: function() {
+			return this._reshare.share_with;
+		},
+
+		getReshareType: function() {
+			return this._reshare.share_type;
+		},
+
+		_retrieveData: function() {
+			/** var {OC.Share.Types.ShareItemInfo} **/
+			var data = OC.Share.loadItem(this._itemType, this._itemSource);
+			if(data === false) {
+				console.warn('no data was returned');
+				return;
+			}
+			this._reshare = data.reshare;
+			this._shares = data.shares;
+
+		}
+	};
+
+	OC.Share.ShareItemModel = ShareItemModel;
+})();
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 6ad36d60fe8..65968f581f5 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -83,6 +83,8 @@ class Share extends Constants {
 					'supportedFileExtensions' => $supportedFileExtensions
 				);
 				if(count(self::$backendTypes) === 1) {
+					\OC_Util::addScript('core', 'shareitemmodel');
+					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
 					\OC_Util::addStyle('core', 'share');
 				}
-- 
GitLab


From e7b5921206a6c602aa22614907b79f14b8ad39c9 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 8 Aug 2015 00:23:06 +0200
Subject: [PATCH 301/783] share dialog view takes advantage of OC.Backbone.View

---
 core/js/share.js           |  14 +++--
 core/js/sharedialogview.js | 106 ++++++++++++-------------------------
 2 files changed, 43 insertions(+), 77 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 5d3253e6d5c..9aba894f676 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -378,14 +378,18 @@ OC.Share = _.extend(OC.Share, {
 	},
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
 		var itemModel = new OC.Share.ShareItemModel(itemType, itemSource);
-		var dialogView = new OC.Share.ShareDialogView('dropdown');
-		dialogView.setContainerClasses('drop shareDropDown');
+		var dialogView = new OC.Share.ShareDialogView({
+			id: 'dropdown',
+			model: itemModel,
+			className: 'drop shareDropDown',
+			attributes: {
+				'data-item-source-name': filename
+			}
+		});
 		dialogView.setShowLink(link);
 		dialogView.setPossiblePermissions(possiblePermissions);
-		dialogView.setItemModel(itemModel);
-		var $dialog = dialogView.render();
+		var $dialog = dialogView.render().$el;
 		$dialog.appendTo(appendTo);
-		$dialog.attr('data-item-source-name', filename);
 		$dialog.slideDown(OC.menuSpeed, function() {
 			OC.Share.droppedDown = true;
 		});
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index cbab9694afe..e085e85dd41 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -14,19 +14,17 @@
 	}
 
 	var TEMPLATE_BASE =
-		'<div id="{{containerID}}" {{{containerClasses}}}>' +
-		'    {{{resharerInfo}}}' +
-		'    <label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
-		'    <div class="oneline">' +
-		'        <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
-		'        <span class="shareWithLoading icon-loading-small hidden"></span>'+
-		'    </div>' +
+		'{{{resharerInfo}}}' +
+		'<label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
+		'<div class="oneline">' +
+		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
+		'    <span class="shareWithLoading icon-loading-small hidden"></span>'+
+		'</div>' +
 			// FIXME: find a good position for remoteShareInfo
-		'    {{{remoteShareInfo}}}' +
-		'    <ul id="shareWithList">' +
-		'    </ul>' +
-		'    {{{linkShare}}}' +
-		'</div>';
+		'{{{remoteShareInfo}}}' +
+		'<ul id="shareWithList">' +
+		'</ul>' +
+		'{{{linkShare}}}';
 
 	var TEMPLATE_RESHARER_INFO =
 		'<span class="reshare">' +
@@ -57,47 +55,37 @@
 
 	/**
 	 * @class OCA.Share.ShareDialogView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
 	 * @classdesc
 	 *
 	 * Represents the GUI of the share dialogue
 	 *
 	 */
-	var ShareDialogView = function(id) {
-		this.initialize(id);
-	};
-
-	/**
-	 * @memberof OCA.Sharing
-	 */
-	ShareDialogView.prototype = {
-		/** @member {OC.Share.ShareItemModel} **/
-		_itemModel: null,
-
-		/** @var {string} **/
-		_id: null,
-
-		/** @var {Object} **/
+	var ShareDialogView = OC.Backbone.View.extend({
+		/** @type {Object} **/
 		_templates: {},
 
-		/** @var {string} **/
-		_containerClasses: '',
-
-		/** @var {boolean} **/
+		/** @type {boolean} **/
 		_showLink: true,
 
-		/** @var {unknown} **/
+		/** @type {unknown} **/
 		_possiblePermissions: null,
 
-		initialize: function (id) {
-			this._id = id;
+		/** @type {string} **/
+		tagName: 'div',
+
+		initialize: function() {
+			if(!this.model instanceof OC.Share.ShareItemModel) {
+				console.warn('model is not an instance of OC.Share.ShareItemModel');
+			}
 		},
 
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
-			var $dialog = $(baseTemplate({
-				containerID: this._id,
-				containerClasses: this._renderContainerClasses(),
+			this.$el.html(baseTemplate({
 				shareLabel: t('core', 'Share'),
 				resharerInfo: this._renderResharerInfo(),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
@@ -105,25 +93,7 @@
 				linkShare: this._renderLinkSharePart()
 			}));
 
-			return $dialog;
-		},
-
-		setItemModel: function(model) {
-			if(model instanceof OC.Share.ShareItemModel) {
-				this._itemModel = model;
-			} else {
-				console.warn('model is not an instance of OC.Share.ShareItemModel');
-			}
-		},
-
-		/**
-		 * sets the classes the main container should get additionally
-		 * TODO:: figure out whether this is really necessary
-		 *
-		 * @param {string} classes whitespace seperated
-		 */
-		setContainerClasses: function(classes) {
-			this._containerClasses = classes;
+			return this;
 		},
 
 		/**
@@ -143,25 +113,25 @@
 
 		_renderResharerInfo: function() {
 			var resharerInfo = '';
-			if (   this._itemModel.hasReshare()
-				&& this._itemModel.getReshareOwner() !== OC.currentUser)
+			if (   this.model.hasReshare()
+				&& this.model.getReshareOwner() !== OC.currentUser)
 			{
 				var reshareTemplate = this._getReshareTemplate();
 				var sharedByText = '';
-				if (this._itemModel.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
+				if (this.model.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
 					sharedByText = t(
 						'core',
 						'Shared with you and the group {group} by {owner}',
 						{
-							group: this._itemModel.getReshareWith(),
-							owner: this._itemModel.getReshareOwnerDisplayname()
+							group: this.model.getReshareWith(),
+							owner: this.model.getReshareOwnerDisplayname()
 						}
 					);
 				}  else {
 					sharedByText = t(
 						'core',
 						'Shared with you by {owner}',
-						{ owner: this._itemModel.getReshareOwnerDisplayname() }
+						{ owner: this.model.getReshareOwnerDisplayname() }
 					);
 				}
 
@@ -173,14 +143,6 @@
 			}
 		},
 
-		_renderContainerClasses: function() {
-			var classes = '';
-			if(this._containerClasses) {
-				classes = 'class="' + this._containerClasses + '"';
-			}
-			return classes;
-		},
-
 		_renderRemoteShareInfoPart: function() {
 			var remoteShareInfo = '';
 			if(oc_appconfig.core.remoteShareAllowed) {
@@ -245,8 +207,8 @@
 
 		_getReshareTemplate: function() {
 			return this._getTemplate('reshare', TEMPLATE_RESHARER_INFO);
-		},
-	};
+		}
+	});
 
 	OC.Share.ShareDialogView = ShareDialogView;
 
-- 
GitLab


From ea6e380efe68e7249917d6470ecdffb25edbcc47 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 10 Aug 2015 21:46:46 +0200
Subject: [PATCH 302/783] remove possibly unreliable code and fix JSdoc

---
 core/js/sharedialogview.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index e085e85dd41..38b98a218aa 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -76,12 +76,6 @@
 		/** @type {string} **/
 		tagName: 'div',
 
-		initialize: function() {
-			if(!this.model instanceof OC.Share.ShareItemModel) {
-				console.warn('model is not an instance of OC.Share.ShareItemModel');
-			}
-		},
-
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
@@ -178,6 +172,13 @@
 			return sharePlaceholder;
 		},
 
+		/**
+		 *
+		 * @param {string} key - an identifier for the template
+		 * @param {string} template - the HTML to be compiled by Handlebars
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
 		_getTemplate: function (key, template) {
 			if (!this._templates[key]) {
 				this._templates[key] = Handlebars.compile(template);
@@ -188,7 +189,7 @@
 		/**
 		 * returns the info template for remote sharing
 		 *
-		 * @returns {Handlebars}
+		 * @returns {Function}
 		 * @private
 		 */
 		_getRemoteShareInfoTemplate: function() {
@@ -198,7 +199,7 @@
 		/**
 		 * returns the info template for link sharing
 		 *
-		 * @returns {Handlebars}
+		 * @returns {Function}
 		 * @private
 		 */
 		_getLinkShareTemplate: function() {
-- 
GitLab


From 1651b8212cf67e2ca59cf890cefe6097fbfa6a8a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 10 Aug 2015 22:23:52 +0200
Subject: [PATCH 303/783] started to port the Model to Backbone`s

---
 core/js/share.js          |  3 ++-
 core/js/shareitemmodel.js | 43 ++++++++++++++++-----------------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 9aba894f676..59467427eb3 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -377,7 +377,8 @@ OC.Share = _.extend(OC.Share, {
 		});
 	},
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
-		var itemModel = new OC.Share.ShareItemModel(itemType, itemSource);
+		var attributes = {itemType: itemType, itemSource: itemSource};
+		var itemModel = new OC.Share.ShareItemModel(attributes);
 		var dialogView = new OC.Share.ShareDialogView({
 			id: 'dropdown',
 			model: itemModel,
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 1db49536db5..2914b281ee1 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -55,59 +55,50 @@
 		this.initialize(itemType, itemSource);
 	};
 
+	// FIXME: migration is to Backbone.Model still WIP, only pushing for the night.
+
 	/**
 	 * @memberof OCA.Sharing
 	 */
-	ShareItemModel.prototype = {
-		/** @var {string} **/
-		_itemType: null,
-		/** @var {mixed} **/	//TODO: what type?
-		_itemSource: null,
-
-		/** @var {OC.Share.Types.Reshare} **/
-		_reshare: null,
-
-		/** @var {OC.Share.Types.ShareInfo[]} **/
-		_shares: null,
-
-		initialize: function(itemType, itemSource) {
-			this._itemType = itemType;
-			this._itemSource = itemSource;
-			this._retrieveData();
+	var ShareItemModel = OC.Backbone.Model.extend({
+		initialize: function() {
+			this._retrieveData(); // TODO I need to get my head around fetch() respectively sync() and url(). Left for later, it's late.
 		},
 
 		hasReshare: function() {
-			return _.isObject(this._reshare) && !_.isUndefined(this._reshare.uid_owner);
+			return _.isObject(this.get('reshare')) && !_.isUndefined(this.get('reshare').uid_owner);
 		},
 
 		getReshareOwner: function() {
-			return this._reshare.uid_owner;
+			return this.get('reshare').uid_owner;
 		},
 
 		getReshareOwnerDisplayname: function() {
-			return this._reshare.displayname_owner;
+			return this.get('reshare').displayname_owner;
 		},
 
 		getReshareWith: function() {
-			return this._reshare.share_with;
+			return this.get('reshare').share_with;
 		},
 
 		getReshareType: function() {
-			return this._reshare.share_type;
+			return this.get('reshare').share_type;
 		},
 
 		_retrieveData: function() {
 			/** var {OC.Share.Types.ShareItemInfo} **/
-			var data = OC.Share.loadItem(this._itemType, this._itemSource);
+			var data = OC.Share.loadItem(this.get('itemType'), this.get('itemSource'));
 			if(data === false) {
 				console.warn('no data was returned');
 				return;
 			}
-			this._reshare = data.reshare;
-			this._shares = data.shares;
-
+			var attributes = {
+				reshare: data.reshare,
+				shares: data.shares
+			};
+			this.set(attributes);
 		}
-	};
+	});
 
 	OC.Share.ShareItemModel = ShareItemModel;
 })();
-- 
GitLab


From 7971bc1ac0a52ed5171a3a663b6e18dcda93bbc3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 11 Aug 2015 14:10:25 +0200
Subject: [PATCH 304/783] model now extends Backbone's model and isadjusted

---
 core/js/shareitemmodel.js | 40 ++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 2914b281ee1..74e696e7200 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -50,53 +50,67 @@
 	 *
 	 * Represents the GUI of the share dialogue
 	 *
-	 */
-	var ShareItemModel = function(itemType, itemSource) {
-		this.initialize(itemType, itemSource);
-	};
-
-	// FIXME: migration is to Backbone.Model still WIP, only pushing for the night.
-
-	/**
-	 * @memberof OCA.Sharing
+	 * // FIXME: use OC Share API once #17143 is done
 	 */
 	var ShareItemModel = OC.Backbone.Model.extend({
 		initialize: function() {
-			this._retrieveData(); // TODO I need to get my head around fetch() respectively sync() and url(). Left for later, it's late.
+			this.fetch();
 		},
 
+		/**
+		 * whether this item has reshare information
+		 * @returns {boolean}
+		 */
 		hasReshare: function() {
 			return _.isObject(this.get('reshare')) && !_.isUndefined(this.get('reshare').uid_owner);
 		},
 
+		/**
+		 * @returns {string}
+		 */
 		getReshareOwner: function() {
 			return this.get('reshare').uid_owner;
 		},
 
+		/**
+		 * @returns {string}
+		 */
 		getReshareOwnerDisplayname: function() {
 			return this.get('reshare').displayname_owner;
 		},
 
+		/**
+		 * @returns {string}
+		 */
 		getReshareWith: function() {
 			return this.get('reshare').share_with;
 		},
 
+		/**
+		 * @returns {number}
+		 */
 		getReshareType: function() {
 			return this.get('reshare').share_type;
 		},
 
-		_retrieveData: function() {
+		fetch: function() {
 			/** var {OC.Share.Types.ShareItemInfo} **/
 			var data = OC.Share.loadItem(this.get('itemType'), this.get('itemSource'));
+			var attributes = this.parse(data);
+			this.set(attributes);
+			console.warn(this.attributes);
+		},
+
+		parse: function(data) {
 			if(data === false) {
 				console.warn('no data was returned');
-				return;
+				return {};
 			}
 			var attributes = {
 				reshare: data.reshare,
 				shares: data.shares
 			};
-			this.set(attributes);
+			return attributes;
 		}
 	});
 
-- 
GitLab


From e6edc3e05dfc17584c81d11c52b444ffcf965c62 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 11 Aug 2015 22:34:08 +0200
Subject: [PATCH 305/783] make loadItems work async if a callback is provided

not beautiful, but good enough. share.js will not be around too much longer.
---
 core/js/share.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 59467427eb3..d84da322274 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -293,23 +293,28 @@ OC.Share = _.extend(OC.Share, {
 	 *
 	 * @param itemType
 	 * @param itemSource
+	 * @param callback
 	 * @returns {OC.Share.Types.ShareInfo}
 	 */
-	loadItem:function(itemType, itemSource) {
+	loadItem:function(itemType, itemSource, callback) {
 		var data = '';
 		var checkReshare = true;
+		var async = !_.isUndefined(callback);
 		if (typeof OC.Share.statuses[itemSource] === 'undefined') {
 			// NOTE: Check does not always work and misses some shares, fix later
 			var checkShares = true;
 		} else {
 			var checkShares = true;
 		}
-		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, itemSource: itemSource, checkReshare: checkReshare, checkShares: checkShares }, async: false, success: function(result) {
+		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, itemSource: itemSource, checkReshare: checkReshare, checkShares: checkShares }, async: async, success: function(result) {
 			if (result && result.status === 'success') {
 				data = result.data;
 			} else {
 				data = false;
 			}
+			if(async) {
+				callback(data);
+			}
 		}});
 
 		return data;
-- 
GitLab


From 97b5fe0b1e7ece1c402f9226f13a6e9d711055cf Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 11 Aug 2015 22:36:28 +0200
Subject: [PATCH 306/783] switch to async item loading, take care stuff is
 updated subsequently

---
 core/js/sharedialogview.js | 12 ++++++++++++
 core/js/shareitemmodel.js  | 18 +++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 38b98a218aa..3c12bedca86 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -76,10 +76,22 @@
 		/** @type {string} **/
 		tagName: 'div',
 
+		initialize: function() {
+			var view = this;
+			this.model.on('change', function() {
+				view.render();
+			});
+
+			this.model.on('fetchError', function() {
+				OC.Notification.showTemporary(t('core', 'Share details could not be loaded for this item.'));
+			});
+		},
+
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
 			this.$el.html(baseTemplate({
+
 				shareLabel: t('core', 'Share'),
 				resharerInfo: this._renderResharerInfo(),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 74e696e7200..fe7aed46509 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -65,6 +65,14 @@
 			return _.isObject(this.get('reshare')) && !_.isUndefined(this.get('reshare').uid_owner);
 		},
 
+		/**
+		 * whether this item has reshare information
+		 * @returns {boolean}
+		 */
+		hasShares: function() {
+			return _.isObject(this.get('shares'));
+		},
+
 		/**
 		 * @returns {string}
 		 */
@@ -94,16 +102,16 @@
 		},
 
 		fetch: function() {
-			/** var {OC.Share.Types.ShareItemInfo} **/
-			var data = OC.Share.loadItem(this.get('itemType'), this.get('itemSource'));
-			var attributes = this.parse(data);
-			this.set(attributes);
-			console.warn(this.attributes);
+			var model = this;
+			OC.Share.loadItem(this.get('itemType'), this.get('itemSource'), function(data) {
+				model.set(model.parse(data));
+			});
 		},
 
 		parse: function(data) {
 			if(data === false) {
 				console.warn('no data was returned');
+				trigger('fetchError');
 				return {};
 			}
 			var attributes = {
-- 
GitLab


From b015eff2e92ba83c6bf95c0084e283ddc7a5df70 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 11 Aug 2015 23:14:44 +0200
Subject: [PATCH 307/783] improve reshare rendering part and move permission
 calculation to model

---
 core/js/share.js           |  7 +++--
 core/js/sharedialogview.js | 62 +++++++++++++++++---------------------
 core/js/shareitemmodel.js  | 57 ++++++++++++++++++++++++++++++++++-
 3 files changed, 87 insertions(+), 39 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index d84da322274..db35a2e111c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -382,18 +382,19 @@ OC.Share = _.extend(OC.Share, {
 		});
 	},
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
-		var attributes = {itemType: itemType, itemSource: itemSource};
+		var attributes = {itemType: itemType, itemSource: itemSource, possiblePermissions: possiblePermissions};
 		var itemModel = new OC.Share.ShareItemModel(attributes);
 		var dialogView = new OC.Share.ShareDialogView({
 			id: 'dropdown',
 			model: itemModel,
 			className: 'drop shareDropDown',
 			attributes: {
-				'data-item-source-name': filename
+				'data-item-source-name': filename,
+				'data-item-type': itemType,
+				'data-item-soruce': itemSource
 			}
 		});
 		dialogView.setShowLink(link);
-		dialogView.setPossiblePermissions(possiblePermissions);
 		var $dialog = dialogView.render().$el;
 		$dialog.appendTo(appendTo);
 		$dialog.slideDown(OC.menuSpeed, function() {
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 3c12bedca86..4ff4eb9a94e 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -70,9 +70,6 @@
 		/** @type {boolean} **/
 		_showLink: true,
 
-		/** @type {unknown} **/
-		_possiblePermissions: null,
-
 		/** @type {string} **/
 		tagName: 'div',
 
@@ -91,7 +88,6 @@
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
 			this.$el.html(baseTemplate({
-
 				shareLabel: t('core', 'Share'),
 				resharerInfo: this._renderResharerInfo(),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
@@ -112,41 +108,37 @@
 			this._showLink = (typeof showLink === 'boolean') ? showLink : true;
 		},
 
-		setPossiblePermissions: function(permissions) {
-			//TODO: maybe move to model? Whatever this is.
-			this._possiblePermissions = permissions;
-		},
-
 		_renderResharerInfo: function() {
 			var resharerInfo = '';
-			if (   this.model.hasReshare()
-				&& this.model.getReshareOwner() !== OC.currentUser)
+			if (   !this.model.hasReshare()
+				|| !this.model.getReshareOwner() !== OC.currentUser)
 			{
-				var reshareTemplate = this._getReshareTemplate();
-				var sharedByText = '';
-				if (this.model.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
-					sharedByText = t(
-						'core',
-						'Shared with you and the group {group} by {owner}',
-						{
-							group: this.model.getReshareWith(),
-							owner: this.model.getReshareOwnerDisplayname()
-						}
-					);
-				}  else {
-					sharedByText = t(
-						'core',
-						'Shared with you by {owner}',
-						{ owner: this.model.getReshareOwnerDisplayname() }
-					);
-				}
-
-
-				resharerInfo = reshareTemplate({
-					avatarEnabled: oc_config.enable_avatars === true,
-					sharedByText: sharedByText
-				});
+				return '';
 			}
+
+			var reshareTemplate = this._getReshareTemplate();
+			var sharedByText = '';
+			if (this.model.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
+				sharedByText = t(
+					'core',
+					'Shared with you and the group {group} by {owner}',
+					{
+						group: this.model.getReshareWith(),
+						owner: this.model.getReshareOwnerDisplayname()
+					}
+				);
+			}  else {
+				sharedByText = t(
+					'core',
+					'Shared with you by {owner}',
+					{ owner: this.model.getReshareOwnerDisplayname() }
+				);
+			}
+
+			return reshareTemplate({
+				avatarEnabled: oc_config.enable_avatars === true,
+				sharedByText: sharedByText
+			});
 		},
 
 		_renderRemoteShareInfoPart: function() {
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index fe7aed46509..efce69f0f3e 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -57,6 +57,22 @@
 			this.fetch();
 		},
 
+		defaults: {
+			allowPublicUploadStatus: false
+		},
+
+		/**
+		 * @returns {boolean|jQuery}
+		 */
+		isPublicUploadEnabled: function() {
+			// FIXME: this really needs a better place
+			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
+			if (_.isUndefined(publicUploadEnabled)) {
+				publicUploadEnabled = 'no';
+			}
+			return publicUploadEnabled;
+		},
+
 		/**
 		 * whether this item has reshare information
 		 * @returns {boolean}
@@ -101,6 +117,26 @@
 			return this.get('reshare').share_type;
 		},
 
+		/**
+		 * @returns {number}
+		 */
+		getPermissions: function() {
+			var permissions = this.get('permissions');
+			if(_.isUndefined(permissions)) {
+				// model was not properly initialized
+				console.warn('Sharing error: undefined permissions');
+				permissions = 0;
+			}
+			return permissions;
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		hasSharePermission: function() {
+			return (this.getPermissions & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
+		},
+
 		fetch: function() {
 			var model = this;
 			OC.Share.loadItem(this.get('itemType'), this.get('itemSource'), function(data) {
@@ -114,10 +150,29 @@
 				trigger('fetchError');
 				return {};
 			}
+
+			var permissions = this.get('possiblePermissions');
+			if(!_.isUndefined(data.reshare) && !_.isUndefined(data.reshare.permissions)) {
+				permissions = permissions & data.reshare.permissions;
+			}
+
+			var allowPublicUploadStatus = false;
+			if(!_.isUndefined(data.shares)) {
+				$.each(data.shares, function (key, value) {
+					if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
+						allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
+						return true;
+					}
+				});
+			}
+
 			var attributes = {
 				reshare: data.reshare,
-				shares: data.shares
+				shares: data.shares,
+				permissions: permissions,
+				allowPublicUploadStatus: allowPublicUploadStatus
 			};
+
 			return attributes;
 		}
 	});
-- 
GitLab


From 83d91ddf20bd2e61b9f01c82817ac8b815d3ac66 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 13 Aug 2015 02:38:14 +0200
Subject: [PATCH 308/783] further work on reimplementing the dialog layout

---
 core/js/share.js            |   4 +-
 core/js/shareconfigmodel.js |  54 +++++++++++++++++
 core/js/sharedialogview.js  | 112 ++++++++++++++++++++++++++++++++++--
 core/js/shareitemmodel.js   |  39 +++++++++----
 lib/private/share/share.php |   1 +
 5 files changed, 193 insertions(+), 17 deletions(-)
 create mode 100644 core/js/shareconfigmodel.js

diff --git a/core/js/share.js b/core/js/share.js
index db35a2e111c..8d25749a107 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -382,11 +382,13 @@ OC.Share = _.extend(OC.Share, {
 		});
 	},
 	showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions, filename) {
+		var configModel = new OC.Share.ShareConfigModel();
 		var attributes = {itemType: itemType, itemSource: itemSource, possiblePermissions: possiblePermissions};
-		var itemModel = new OC.Share.ShareItemModel(attributes);
+		var itemModel = new OC.Share.ShareItemModel(attributes, {configModel: configModel});
 		var dialogView = new OC.Share.ShareDialogView({
 			id: 'dropdown',
 			model: itemModel,
+			configModel: configModel,
 			className: 'drop shareDropDown',
 			attributes: {
 				'data-item-source-name': filename,
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
new file mode 100644
index 00000000000..371cc96df5e
--- /dev/null
+++ b/core/js/shareconfigmodel.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+		OC.Share.Types = {};
+	}
+
+	var ShareConfigModel = OC.Backbone.Model.extend({
+		defaults: {
+			publicUploadEnabled: false
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isPublicUploadEnabled: function() {
+			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
+			return !_.isUndefined(publicUploadEnabled);
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isMailPublicNotificationEnabled: function() {
+			return $('input:hidden[name=mailPublicNotificationEnabled]').val() === 'yes';
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isDefaultExpireDateEnforced: function() {
+			return oc_appconfig.core.defaultExpireDateEnforced === true;
+		},
+
+		/**
+		 * @returns {number}
+		 */
+		getDefaultExpireDate: function () {
+			return oc_appconfig.core.defaultExpireDate;
+		}
+	});
+
+
+	OC.Share.ShareConfigModel = ShareConfigModel;
+})();
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 4ff4eb9a94e..7b0af2bc84c 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -24,7 +24,13 @@
 		'{{{remoteShareInfo}}}' +
 		'<ul id="shareWithList">' +
 		'</ul>' +
-		'{{{linkShare}}}';
+		'{{#if shareAllowed}}' +
+		'{{{linkShare}}}' +
+		'{{else}}' +
+		'{{{noSharing}}}' +
+		'{{/if}}' +
+		'{{{expiration}}}'
+		;
 
 	var TEMPLATE_RESHARER_INFO =
 		'<span class="reshare">' +
@@ -50,9 +56,37 @@
 			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
 			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
 			'        <span class="icon-loading-small hidden"></span>' +
-			'    </div>'
+			'    </div>' +
+			'    {{#if publicUpload}}' +
+			'    <div id="allowPublicUploadWrapper" class="hidden">' +
+			'        <span class="icon-loading-small hidden"></span>' +
+			'        <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
+			'        <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
+			'    </div>' +
+			'    {{/if}}' +
+			'    {{#if mailPublicNotificationEnabled}}' +
+			'    <form id="emailPrivateLink">' +
+			'        <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
+			'        <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
+			'    </form>' +
+			'    {{/if}}' +
+			'</div>'
 		;
 
+	var TEMPLATE_NO_SHARING =
+		'<input id="shareWith" type="text" placeholder="{{placeholder}}" disabled="disabled"/>'
+	;
+
+	var TEMPLATE_EXPIRATION =
+		'<div id="expiration">' +
+		'    <input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" />' +
+		'    <label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
+		'    <label for="expirationDate" class="hidden-visually">{{expirationLabel}}</label>' +
+		'    <input id="expirationDate" type="text" placeholder="{{expirationDatePlaceholder}}" class="hidden" />' +
+		'    <em id="defaultExpireMessage">{{defaultExpireMessage}}</em>' +
+		'</div>'
+	;
+
 	/**
 	 * @class OCA.Share.ShareDialogView
 	 * @member {OC.Share.ShareItemModel} model
@@ -73,7 +107,10 @@
 		/** @type {string} **/
 		tagName: 'div',
 
-		initialize: function() {
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		initialize: function(options) {
 			var view = this;
 			this.model.on('change', function() {
 				view.render();
@@ -82,6 +119,12 @@
 			this.model.on('fetchError', function() {
 				OC.Notification.showTemporary(t('core', 'Share details could not be loaded for this item.'));
 			});
+
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				console.warn('missing OC.Share.ShareConfigModel');
+			}
 		},
 
 		render: function() {
@@ -92,7 +135,10 @@
 				resharerInfo: this._renderResharerInfo(),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
-				linkShare: this._renderLinkSharePart()
+				linkShare: this._renderLinkSharePart(),
+				shareAllowed: this.model.hasSharePermission(),
+				noSharing: this._renderNoSharing(),
+				expiration: this._renderExpirationPart()
 			}));
 
 			return this;
@@ -155,14 +201,34 @@
 
 		_renderLinkSharePart: function() {
 			var linkShare = '';
-			if(this._showLink && $('#allowShareWithLink').val() === 'yes') {
+			if(    this.model.hasSharePermission()
+				&& this._showLink
+				&& $('#allowShareWithLink').val() === 'yes')
+			{
 				var linkShareTemplate = this._getLinkShareTemplate();
+
+				var publicUpload =
+					   this.model.isFolder()
+					&& this.model.hasCreatePermission()
+					&& this.configModel.isPublicUploadEnabled();
+
+				var publicUploadChecked = '';
+				if(this.model.isPublicUploadAllowed) {
+					publicUploadChecked = 'checked="checked"';
+				}
+
 				linkShare = linkShareTemplate({
 					linkShareLabel: t('core', 'Share link'),
 					urlLabel: t('core', 'Link'),
 					enablePasswordLabel: t('core', 'Password protect'),
 					passwordLabel: t('core', 'Password'),
-					passwordPlaceholder: t('core', 'Choose a password for the public link')
+					passwordPlaceholder: t('core', 'Choose a password for the public link'),
+					publicUpload: publicUpload,
+					publicUploadChecked: publicUploadChecked,
+					publicUploadLabel: t('core', 'Allow editing'),
+					mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
+					mailPrivatePlaceholder: t('core', 'Email link to person'),
+					mailButtonText: t('core', 'Send')
 				});
 			}
 			return linkShare;
@@ -176,6 +242,40 @@
 			return sharePlaceholder;
 		},
 
+		_renderNoSharing: function () {
+			var noSharing = '';
+			if(!this.model.hasSharePermission()) {
+				var noSharingTemplate = this._getTemplate('noSharing', TEMPLATE_NO_SHARING);
+				noSharing = noSharingTemplate({
+					placeholder: t('core', 'Resharing is not allowed')
+				});
+			}
+			return noSharing;
+		},
+
+		_renderExpirationPart: function() {
+			var expirationTemplate = this._getTemplate('expiration', TEMPLATE_EXPIRATION);
+
+			var defaultExpireMessage = '';
+			if((   this.model.isFolder() || this.model.isFile())
+				&& this.configModel.isDefaultExpireDateEnforced()) {
+				defaultExpireMessage = t(
+						'core',
+						'The public link will expire no later than {days} days after it is created',
+						{'days': this.configModel.getDefaultExpireDate()}
+				);
+			}
+
+			var expiration = expirationTemplate({
+				setExpirationLabel: t('core', 'Set expiration date'),
+				expirationLabel: t('core', 'Expiration'),
+				expirationDatePlaceholder: t('core', 'Expiration date'),
+				defaultExpireMessage: defaultExpireMessage
+			});
+
+			return expiration;
+		},
+
 		/**
 		 *
 		 * @param {string} key - an identifier for the template
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index efce69f0f3e..eb93b91ce92 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -53,7 +53,10 @@
 	 * // FIXME: use OC Share API once #17143 is done
 	 */
 	var ShareItemModel = OC.Backbone.Model.extend({
-		initialize: function() {
+		initialize: function(attributes, options) {
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			}
 			this.fetch();
 		},
 
@@ -62,15 +65,24 @@
 		},
 
 		/**
-		 * @returns {boolean|jQuery}
+		 * @returns {boolean}
 		 */
-		isPublicUploadEnabled: function() {
-			// FIXME: this really needs a better place
-			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
-			if (_.isUndefined(publicUploadEnabled)) {
-				publicUploadEnabled = 'no';
-			}
-			return publicUploadEnabled;
+		isPublicUploadAllowed: function() {
+			return this.get('allowPublicUploadStatus');
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isFolder: function() {
+			return this.get('itemType') === 'folder';
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isFile: function() {
+			return this.get('itemType') === 'file';
 		},
 
 		/**
@@ -134,7 +146,14 @@
 		 * @returns {boolean}
 		 */
 		hasSharePermission: function() {
-			return (this.getPermissions & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
+			return (this.getPermissions() & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		hasCreatePermission: function() {
+			return (this.getPermissions() & OC.PERMISSION_CREATE) === OC.PERMISSION_CREATE;
 		},
 
 		fetch: function() {
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 65968f581f5..cd3f0cbfb34 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -83,6 +83,7 @@ class Share extends Constants {
 					'supportedFileExtensions' => $supportedFileExtensions
 				);
 				if(count(self::$backendTypes) === 1) {
+					\OC_Util::addScript('core', 'shareconfigmodel');
 					\OC_Util::addScript('core', 'shareitemmodel');
 					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
-- 
GitLab


From a57ff13a23ce06846160c1264369ff4b07619890 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 18 Aug 2015 12:13:08 +0200
Subject: [PATCH 309/783] move remaining global settings to configModel

---
 core/js/shareconfigmodel.js | 28 ++++++++++++++++++++++++++++
 core/js/sharedialogview.js  | 10 +++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 371cc96df5e..857e356a351 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -19,6 +19,13 @@
 			publicUploadEnabled: false
 		},
 
+		/**
+		 * @returns {boolean}
+		 */
+		areAvatarsEnabled: function() {
+			return oc_config.enable_avatars === true;
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
@@ -41,6 +48,27 @@
 			return oc_appconfig.core.defaultExpireDateEnforced === true;
 		},
 
+		/**
+		 * @returns {boolean}
+		 */
+		isRemoteShareAllowed: function() {
+			return oc_appconfig.core.remoteShareAllowed;
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		isShareWithLinkAllowed: function() {
+			return $('#allowShareWithLink').val() === 'yes';
+		},
+
+		/**
+		 * @returns {string}
+		 */
+		getFederatedShareDocLink: function() {
+			return oc_appconfig.core.federatedCloudShareDoc;
+		},
+
 		/**
 		 * @returns {number}
 		 */
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 7b0af2bc84c..abf45a6bf45 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -182,17 +182,17 @@
 			}
 
 			return reshareTemplate({
-				avatarEnabled: oc_config.enable_avatars === true,
+				avatarEnabled: this.configModel.areAvatarsEnabled(),
 				sharedByText: sharedByText
 			});
 		},
 
 		_renderRemoteShareInfoPart: function() {
 			var remoteShareInfo = '';
-			if(oc_appconfig.core.remoteShareAllowed) {
+			if(this.configModel.isRemoteShareAllowed()) {
 				var infoTemplate = this._getRemoteShareInfoTemplate();
 				remoteShareInfo = infoTemplate({
-					docLink: oc_appconfig.core.federatedCloudShareDoc,
+					docLink: this.configModel.getFederatedShareDocLink(),
 					tooltip: t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud')
 				});
 			}
@@ -203,7 +203,7 @@
 			var linkShare = '';
 			if(    this.model.hasSharePermission()
 				&& this._showLink
-				&& $('#allowShareWithLink').val() === 'yes')
+				&& this.configModel.isShareWithLinkAllowed())
 			{
 				var linkShareTemplate = this._getLinkShareTemplate();
 
@@ -236,7 +236,7 @@
 
 		_renderSharePlaceholderPart: function () {
 			var sharePlaceholder = t('core', 'Share with users or groups …');
-			if (oc_appconfig.core.remoteShareAllowed) {
+			if (this.configModel.isRemoteShareAllowed()) {
 				sharePlaceholder = t('core', 'Share with users, groups or remote users …');
 			}
 			return sharePlaceholder;
-- 
GitLab


From e3fd96fa8ef2aa5b5fd3881e75b95c7a869895fa Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 18 Aug 2015 13:04:02 +0200
Subject: [PATCH 310/783] improve doc

---
 core/js/share.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 8d25749a107..84da511497e 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -293,7 +293,9 @@ OC.Share = _.extend(OC.Share, {
 	 *
 	 * @param itemType
 	 * @param itemSource
-	 * @param callback
+	 * @param callback - optional. If a callback is given this method works
+	 * asynchronous and the callback will be provided with data when the request
+	 * is done.
 	 * @returns {OC.Share.Types.ShareInfo}
 	 */
 	loadItem:function(itemType, itemSource, callback) {
-- 
GitLab


From 1bd6942be70da621da9acae56a23a39040ef24bf Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 18 Aug 2015 17:23:32 +0200
Subject: [PATCH 311/783] show tooltips and load avatar

---
 core/js/sharedialogview.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index abf45a6bf45..5e3fb8b8d97 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -41,7 +41,7 @@
 		'</span><br />';
 
 	var TEMPLATE_REMOTE_SHARE_INFO =
-		'<a target="_blank" class="icon-info svg shareWithRemoteInfo" href="{{docLink}}" ' +
+		'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
 		'title="{{tooltip}}"></a>';
 
 	var TEMPLATE_LINK_SHARE =
@@ -141,6 +141,9 @@
 				expiration: this._renderExpirationPart()
 			}));
 
+			this.$el.find('.hasTooltip').tooltip();
+			this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
+
 			return this;
 		},
 
@@ -196,6 +199,7 @@
 					tooltip: t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud')
 				});
 			}
+
 			return remoteShareInfo;
 		},
 
-- 
GitLab


From dcb084a617b2ee24031a14bce8b8e9749c821b75 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 19 Aug 2015 00:04:16 +0200
Subject: [PATCH 312/783] split ShareDialogResharerInfoView from base view

---
 core/js/sharedialogresharerinfoview.js | 117 +++++++++++++++++++++++++
 core/js/sharedialogview.js             |  62 ++++---------
 core/js/shareitemmodel.js              |   1 +
 lib/private/share/share.php            |   1 +
 4 files changed, 138 insertions(+), 43 deletions(-)
 create mode 100644 core/js/sharedialogresharerinfoview.js

diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
new file mode 100644
index 00000000000..3f996bb6d21
--- /dev/null
+++ b/core/js/sharedialogresharerinfoview.js
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE =
+		'<span class="reshare">' +
+		'    {{#if avatarEnabled}}' +
+		'    <div class="avatar"></div>' +
+		'    {{/if}}' +
+		'    {{sharedByText}}' +
+		'</span><br/>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
+	 * @classdesc
+	 *
+	 * Represents the GUI of the share dialogue
+	 *
+	 */
+	var ShareDialogResharerInfoView = OC.Backbone.View.extend({
+		/** @type {string} **/
+		id: 'shareDialogResharerInfo',
+
+		/** @type {string} **/
+		tagName: 'div',
+
+		/** @type {string} **/
+		className: 'reshare',
+
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		/** @type {Function} **/
+		_template: undefined,
+
+		initialize: function(options) {
+			var view = this;
+
+			//FIXME: specific to reshares stuff
+			this.model.on('change', function() {
+				view.render();
+			});
+
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				console.warn('missing OC.Share.ShareConfigModel');
+			}
+		},
+
+		render: function() {
+			if (   !this.model.hasReshare()
+				|| !this.model.getReshareOwner() !== OC.currentUser)
+			{
+				this.$el.html('');
+				return this;
+			}
+
+			var reshareTemplate = this.template();
+			var ownerDisplayName = this.model.getReshareOwnerDisplayname();
+			var sharedByText = '';
+			if (this.model.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
+				sharedByText = t(
+					'core',
+					'Shared with you and the group {group} by {owner}',
+					{
+						group: this.model.getReshareWith(),
+						owner: ownerDisplayName
+					}
+				);
+			}  else {
+				sharedByText = t(
+					'core',
+					'Shared with you by {owner}',
+					{ owner: ownerDisplayName }
+				);
+			}
+
+			this.$el.html(reshareTemplate({
+				avatarEnabled: this.configModel.areAvatarsEnabled(),
+				sharedByText: sharedByText
+			}));
+
+			return this;
+		},
+
+		/**
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
+		template: function () {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template;
+		}
+
+	});
+
+	OC.Share.ShareDialogResharerInfoView = ShareDialogResharerInfoView;
+
+})();
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 5e3fb8b8d97..179d818e90f 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -32,14 +32,6 @@
 		'{{{expiration}}}'
 		;
 
-	var TEMPLATE_RESHARER_INFO =
-		'<span class="reshare">' +
-		'    {{#if avatarEnabled}}' +
-		'    <div class="avatar"></div>' +
-		'    {{/if}}' +
-		'    {{sharedByText}}' +
-		'</span><br />';
-
 	var TEMPLATE_REMOTE_SHARE_INFO =
 		'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
 		'title="{{tooltip}}"></a>';
@@ -110,6 +102,9 @@
 		/** @type {OC.Share.ShareConfigModel} **/
 		configModel: undefined,
 
+		/** @type {object} **/
+		resharerInfoView: undefined,
+
 		initialize: function(options) {
 			var view = this;
 			this.model.on('change', function() {
@@ -125,14 +120,26 @@
 			} else {
 				console.warn('missing OC.Share.ShareConfigModel');
 			}
+
+			var subViewOptions = {
+				model: this.model,
+				configModel: this.configModel
+			};
+
+			this.resharerInfoView = _.isUndefined(options.resharerInfoView)
+				? new OC.Share.ShareDialogResharerInfoView(subViewOptions)
+				: options.resharerInfoView;
+
 		},
 
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
+			this.resharerInfoView.render();
+
 			this.$el.html(baseTemplate({
 				shareLabel: t('core', 'Share'),
-				resharerInfo: this._renderResharerInfo(),
+				resharerInfo: this.resharerInfoView.el.innerHTML,
 				sharePlaceholder: this._renderSharePlaceholderPart(),
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
 				linkShare: this._renderLinkSharePart(),
@@ -142,7 +149,9 @@
 			}));
 
 			this.$el.find('.hasTooltip').tooltip();
-			this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
+			if(this.configModel.areAvatarsEnabled()) {
+				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
+			}
 
 			return this;
 		},
@@ -157,39 +166,6 @@
 			this._showLink = (typeof showLink === 'boolean') ? showLink : true;
 		},
 
-		_renderResharerInfo: function() {
-			var resharerInfo = '';
-			if (   !this.model.hasReshare()
-				|| !this.model.getReshareOwner() !== OC.currentUser)
-			{
-				return '';
-			}
-
-			var reshareTemplate = this._getReshareTemplate();
-			var sharedByText = '';
-			if (this.model.getReshareType() === OC.Share.SHARE_TYPE_GROUP) {
-				sharedByText = t(
-					'core',
-					'Shared with you and the group {group} by {owner}',
-					{
-						group: this.model.getReshareWith(),
-						owner: this.model.getReshareOwnerDisplayname()
-					}
-				);
-			}  else {
-				sharedByText = t(
-					'core',
-					'Shared with you by {owner}',
-					{ owner: this.model.getReshareOwnerDisplayname() }
-				);
-			}
-
-			return reshareTemplate({
-				avatarEnabled: this.configModel.areAvatarsEnabled(),
-				sharedByText: sharedByText
-			});
-		},
-
 		_renderRemoteShareInfoPart: function() {
 			var remoteShareInfo = '';
 			if(this.configModel.isRemoteShareAllowed()) {
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index eb93b91ce92..0d2bce8b2ef 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -112,6 +112,7 @@
 		 * @returns {string}
 		 */
 		getReshareOwnerDisplayname: function() {
+			return 'foo';
 			return this.get('reshare').displayname_owner;
 		},
 
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index cd3f0cbfb34..10d0480ab89 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -85,6 +85,7 @@ class Share extends Constants {
 				if(count(self::$backendTypes) === 1) {
 					\OC_Util::addScript('core', 'shareconfigmodel');
 					\OC_Util::addScript('core', 'shareitemmodel');
+					\OC_Util::addScript('core', 'sharedialogresharerinfoview');
 					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
 					\OC_Util::addStyle('core', 'share');
-- 
GitLab


From 277b786886de7979fea308595e4cf658e85aacf7 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 15:00:15 +0200
Subject: [PATCH 313/783] ShareDialogResharerInfoView improvements

---
 core/js/sharedialogresharerinfoview.js | 8 ++++----
 core/js/sharedialogview.js             | 8 ++++----
 core/js/shareitemmodel.js              | 3 ++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index 3f996bb6d21..8970d857fc3 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -51,8 +51,7 @@
 		initialize: function(options) {
 			var view = this;
 
-			//FIXME: specific to reshares stuff
-			this.model.on('change', function() {
+			this.model.on('change:reshare', function() {
 				view.render();
 			});
 
@@ -67,7 +66,7 @@
 			if (   !this.model.hasReshare()
 				|| !this.model.getReshareOwner() !== OC.currentUser)
 			{
-				this.$el.html('');
+				this.$el.empty();
 				return this;
 			}
 
@@ -91,7 +90,8 @@
 				);
 			}
 
-			this.$el.html(reshareTemplate({
+			this.$el.empty();
+			this.$el.append(reshareTemplate({
 				avatarEnabled: this.configModel.areAvatarsEnabled(),
 				sharedByText: sharedByText
 			}));
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 179d818e90f..67017778632 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -14,7 +14,7 @@
 	}
 
 	var TEMPLATE_BASE =
-		'{{{resharerInfo}}}' +
+		'<div class="resharerInfo"></div>' +
 		'<label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
 		'<div class="oneline">' +
 		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
@@ -135,11 +135,8 @@
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
-			this.resharerInfoView.render();
-
 			this.$el.html(baseTemplate({
 				shareLabel: t('core', 'Share'),
-				resharerInfo: this.resharerInfoView.el.innerHTML,
 				sharePlaceholder: this._renderSharePlaceholderPart(),
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
 				linkShare: this._renderLinkSharePart(),
@@ -148,6 +145,9 @@
 				expiration: this._renderExpirationPart()
 			}));
 
+			this.resharerInfoView.$el = this.$el.find('.resharerInfo');
+			this.resharerInfoView.render();
+
 			this.$el.find('.hasTooltip').tooltip();
 			if(this.configModel.areAvatarsEnabled()) {
 				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 0d2bce8b2ef..9c4a8141cda 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -90,7 +90,8 @@
 		 * @returns {boolean}
 		 */
 		hasReshare: function() {
-			return _.isObject(this.get('reshare')) && !_.isUndefined(this.get('reshare').uid_owner);
+			var reshare = this.get('reshare');
+			return _.isObject(reshare) && !_.isUndefined(reshare.uid_owner);
 		},
 
 		/**
-- 
GitLab


From f9c232c4ce16b101fce233f1f20e0cafc7e4d1fa Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 15:40:50 +0200
Subject: [PATCH 314/783] split off linkShareView

---
 core/js/sharedialoglinkshareview.js | 143 ++++++++++++++++++++++++++++
 core/js/sharedialogview.js          |  94 +++---------------
 lib/private/share/share.php         |   1 +
 3 files changed, 158 insertions(+), 80 deletions(-)
 create mode 100644 core/js/sharedialoglinkshareview.js

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
new file mode 100644
index 00000000000..ccd705803f6
--- /dev/null
+++ b/core/js/sharedialoglinkshareview.js
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE =
+			'<div id="link" class="linkShare">' +
+			'    <span class="icon-loading-small hidden"></span>' +
+			'    <input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
+			'    <br />' +
+			'    <label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
+			'    <input id="linkText" type="text" readonly="readonly" />' +
+			'    <input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
+			'    <div id="linkPass">' +
+			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
+			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
+			'        <span class="icon-loading-small hidden"></span>' +
+			'    </div>' +
+			'    {{#if publicUpload}}' +
+			'    <div id="allowPublicUploadWrapper" class="hidden">' +
+			'        <span class="icon-loading-small hidden"></span>' +
+			'        <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
+			'        <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
+			'    </div>' +
+			'    {{/if}}' +
+			'    {{#if mailPublicNotificationEnabled}}' +
+			'    <form id="emailPrivateLink">' +
+			'        <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
+			'        <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
+			'    </form>' +
+			'    {{/if}}' +
+			'</div>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogLinkShareView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
+	 * @classdesc
+	 *
+	 * Represents the GUI of the share dialogue
+	 *
+	 */
+	var ShareDialogLinkShareView = OC.Backbone.View.extend({
+		/** @type {string} **/
+		id: 'shareDialogLinkShare',
+
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		/** @type {Function} **/
+		_template: undefined,
+
+		/** @type {boolean} **/
+		showLink: true,
+
+		initialize: function(options) {
+			var view = this;
+
+			this.model.on('change:permissions', function() {
+				view.render();
+			});
+
+			this.model.on('change:itemType', function() {
+				view.render();
+			});
+
+			this.model.on('change:allowPublicUploadStatus', function() {
+				view.render();
+			});
+
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				console.warn('missing OC.Share.ShareConfigModel');
+			}
+		},
+
+		render: function() {
+			if(    !this.model.hasSharePermission()
+				|| !this.showLink
+				|| !this.configModel.isShareWithLinkAllowed())
+			{
+				this.$el.empty();
+				return this;
+			}
+
+			var publicUpload =
+				this.model.isFolder()
+				&& this.model.hasCreatePermission()
+				&& this.configModel.isPublicUploadEnabled();
+
+			var publicUploadChecked = '';
+			if(this.model.isPublicUploadAllowed()) {
+				publicUploadChecked = 'checked="checked"';
+			}
+
+			var linkShareTemplate = this.template();
+			this.$el.empty();
+			this.$el.append(linkShareTemplate({
+				linkShareLabel: t('core', 'Share link'),
+				urlLabel: t('core', 'Link'),
+				enablePasswordLabel: t('core', 'Password protect'),
+				passwordLabel: t('core', 'Password'),
+				passwordPlaceholder: t('core', 'Choose a password for the public link'),
+				publicUpload: publicUpload,
+				publicUploadChecked: publicUploadChecked,
+				publicUploadLabel: t('core', 'Allow editing'),
+				mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
+				mailPrivatePlaceholder: t('core', 'Email link to person'),
+				mailButtonText: t('core', 'Send')
+			}));
+
+			return this;
+		},
+
+		/**
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
+		template: function () {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template;
+		}
+
+	});
+
+	OC.Share.ShareDialogLinkShareView = ShareDialogLinkShareView;
+
+})();
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 67017778632..cc9590815a7 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -25,7 +25,7 @@
 		'<ul id="shareWithList">' +
 		'</ul>' +
 		'{{#if shareAllowed}}' +
-		'{{{linkShare}}}' +
+		'<div class="linkShare"></div>' +
 		'{{else}}' +
 		'{{{noSharing}}}' +
 		'{{/if}}' +
@@ -36,35 +36,6 @@
 		'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
 		'title="{{tooltip}}"></a>';
 
-	var TEMPLATE_LINK_SHARE =
-			'<div id="link" class="linkShare">' +
-			'    <span class="icon-loading-small hidden"></span>' +
-			'    <input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
-			'    <br />' +
-			'    <label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
-			'    <input id="linkText" type="text" readonly="readonly" />' +
-			'    <input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
-			'    <div id="linkPass">' +
-			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
-			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
-			'        <span class="icon-loading-small hidden"></span>' +
-			'    </div>' +
-			'    {{#if publicUpload}}' +
-			'    <div id="allowPublicUploadWrapper" class="hidden">' +
-			'        <span class="icon-loading-small hidden"></span>' +
-			'        <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
-			'        <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
-			'    </div>' +
-			'    {{/if}}' +
-			'    {{#if mailPublicNotificationEnabled}}' +
-			'    <form id="emailPrivateLink">' +
-			'        <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
-			'        <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
-			'    </form>' +
-			'    {{/if}}' +
-			'</div>'
-		;
-
 	var TEMPLATE_NO_SHARING =
 		'<input id="shareWith" type="text" placeholder="{{placeholder}}" disabled="disabled"/>'
 	;
@@ -105,6 +76,9 @@
 		/** @type {object} **/
 		resharerInfoView: undefined,
 
+		/** @type {object} **/
+		linkShareView: undefined,
+
 		initialize: function(options) {
 			var view = this;
 			this.model.on('change', function() {
@@ -130,6 +104,10 @@
 				? new OC.Share.ShareDialogResharerInfoView(subViewOptions)
 				: options.resharerInfoView;
 
+			this.linkShareView = _.isUndefined(options.linkShareView)
+				? new OC.Share.ShareDialogLinkShareView(subViewOptions)
+				: options.linkShareView;
+
 		},
 
 		render: function() {
@@ -139,7 +117,6 @@
 				shareLabel: t('core', 'Share'),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
-				linkShare: this._renderLinkSharePart(),
 				shareAllowed: this.model.hasSharePermission(),
 				noSharing: this._renderNoSharing(),
 				expiration: this._renderExpirationPart()
@@ -148,6 +125,11 @@
 			this.resharerInfoView.$el = this.$el.find('.resharerInfo');
 			this.resharerInfoView.render();
 
+			if(this.model.hasSharePermission()) {
+				this.linkShareView.$el = this.$el.find('.linkShare');
+				this.linkShareView.render();
+			}
+
 			this.$el.find('.hasTooltip').tooltip();
 			if(this.configModel.areAvatarsEnabled()) {
 				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
@@ -164,6 +146,7 @@
 		 */
 		setShowLink: function(showLink) {
 			this._showLink = (typeof showLink === 'boolean') ? showLink : true;
+			this.linkShareView.showLink = this._showLink;
 		},
 
 		_renderRemoteShareInfoPart: function() {
@@ -179,41 +162,6 @@
 			return remoteShareInfo;
 		},
 
-		_renderLinkSharePart: function() {
-			var linkShare = '';
-			if(    this.model.hasSharePermission()
-				&& this._showLink
-				&& this.configModel.isShareWithLinkAllowed())
-			{
-				var linkShareTemplate = this._getLinkShareTemplate();
-
-				var publicUpload =
-					   this.model.isFolder()
-					&& this.model.hasCreatePermission()
-					&& this.configModel.isPublicUploadEnabled();
-
-				var publicUploadChecked = '';
-				if(this.model.isPublicUploadAllowed) {
-					publicUploadChecked = 'checked="checked"';
-				}
-
-				linkShare = linkShareTemplate({
-					linkShareLabel: t('core', 'Share link'),
-					urlLabel: t('core', 'Link'),
-					enablePasswordLabel: t('core', 'Password protect'),
-					passwordLabel: t('core', 'Password'),
-					passwordPlaceholder: t('core', 'Choose a password for the public link'),
-					publicUpload: publicUpload,
-					publicUploadChecked: publicUploadChecked,
-					publicUploadLabel: t('core', 'Allow editing'),
-					mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
-					mailPrivatePlaceholder: t('core', 'Email link to person'),
-					mailButtonText: t('core', 'Send')
-				});
-			}
-			return linkShare;
-		},
-
 		_renderSharePlaceholderPart: function () {
 			var sharePlaceholder = t('core', 'Share with users or groups …');
 			if (this.configModel.isRemoteShareAllowed()) {
@@ -278,20 +226,6 @@
 		 */
 		_getRemoteShareInfoTemplate: function() {
 			return this._getTemplate('remoteShareInfo', TEMPLATE_REMOTE_SHARE_INFO);
-		},
-
-		/**
-		 * returns the info template for link sharing
-		 *
-		 * @returns {Function}
-		 * @private
-		 */
-		_getLinkShareTemplate: function() {
-			return this._getTemplate('linkShare', TEMPLATE_LINK_SHARE);
-		},
-
-		_getReshareTemplate: function() {
-			return this._getTemplate('reshare', TEMPLATE_RESHARER_INFO);
 		}
 	});
 
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 10d0480ab89..ea4f01c0a95 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -86,6 +86,7 @@ class Share extends Constants {
 					\OC_Util::addScript('core', 'shareconfigmodel');
 					\OC_Util::addScript('core', 'shareitemmodel');
 					\OC_Util::addScript('core', 'sharedialogresharerinfoview');
+					\OC_Util::addScript('core', 'sharedialoglinkshareview');
 					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
 					\OC_Util::addStyle('core', 'share');
-- 
GitLab


From ffd4e0dc5a1977885b639b3ba1bb87a533e6a75a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 19:35:13 +0200
Subject: [PATCH 315/783] split off expirationView

---
 core/js/sharedialogexpirationview.js | 93 ++++++++++++++++++++++++++++
 core/js/sharedialogview.js           | 54 +++++-----------
 lib/private/share/share.php          |  1 +
 3 files changed, 109 insertions(+), 39 deletions(-)
 create mode 100644 core/js/sharedialogexpirationview.js

diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
new file mode 100644
index 00000000000..e752c66bf35
--- /dev/null
+++ b/core/js/sharedialogexpirationview.js
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE =
+			'<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" />' +
+			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
+			'<label for="expirationDate" class="hidden-visually">{{expirationLabel}}</label>' +
+			'<input id="expirationDate" type="text" placeholder="{{expirationDatePlaceholder}}" class="hidden" />' +
+			'<em id="defaultExpireMessage">{{defaultExpireMessage}}</em>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogExpirationView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
+	 * @classdesc
+	 *
+	 * Represents the expiration part in the GUI of the share dialogue
+	 *
+	 */
+	var ShareDialogExpirationView = OC.Backbone.View.extend({
+		/** @type {string} **/
+		id: 'shareDialogLinkShare',
+
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		/** @type {Function} **/
+		_template: undefined,
+
+		/** @type {boolean} **/
+		showLink: true,
+
+		initialize: function(options) {
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				console.warn('missing OC.Share.ShareConfigModel');
+			}
+		},
+
+		render: function() {
+			var defaultExpireMessage = '';
+			if(    (this.model.isFolder() || this.model.isFile())
+				&& this.configModel.isDefaultExpireDateEnforced()) {
+				defaultExpireMessage = t(
+					'core',
+					'The public link will expire no later than {days} days after it is created',
+					{'days': this.configModel.getDefaultExpireDate()}
+				);
+			}
+
+			var expirationTemplate = this.template();
+			this.$el.empty();
+			this.$el.append(expirationTemplate({
+				setExpirationLabel: t('core', 'Set expiration date'),
+				expirationLabel: t('core', 'Expiration'),
+				expirationDatePlaceholder: t('core', 'Expiration date'),
+				defaultExpireMessage: defaultExpireMessage
+			}));
+
+			return this;
+		},
+
+		/**
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
+		template: function () {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template;
+		}
+
+	});
+
+	OC.Share.ShareDialogExpirationView = ShareDialogExpirationView;
+
+})();
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index cc9590815a7..cdf5214fa65 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -14,7 +14,7 @@
 	}
 
 	var TEMPLATE_BASE =
-		'<div class="resharerInfo"></div>' +
+		'<div class="resharerInfoView"></div>' +
 		'<label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
 		'<div class="oneline">' +
 		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
@@ -25,11 +25,11 @@
 		'<ul id="shareWithList">' +
 		'</ul>' +
 		'{{#if shareAllowed}}' +
-		'<div class="linkShare"></div>' +
+		'<div class="linkShareView"></div>' +
 		'{{else}}' +
 		'{{{noSharing}}}' +
 		'{{/if}}' +
-		'{{{expiration}}}'
+		'<div class="expirationView"></div>'
 		;
 
 	var TEMPLATE_REMOTE_SHARE_INFO =
@@ -40,16 +40,6 @@
 		'<input id="shareWith" type="text" placeholder="{{placeholder}}" disabled="disabled"/>'
 	;
 
-	var TEMPLATE_EXPIRATION =
-		'<div id="expiration">' +
-		'    <input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" />' +
-		'    <label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
-		'    <label for="expirationDate" class="hidden-visually">{{expirationLabel}}</label>' +
-		'    <input id="expirationDate" type="text" placeholder="{{expirationDatePlaceholder}}" class="hidden" />' +
-		'    <em id="defaultExpireMessage">{{defaultExpireMessage}}</em>' +
-		'</div>'
-	;
-
 	/**
 	 * @class OCA.Share.ShareDialogView
 	 * @member {OC.Share.ShareItemModel} model
@@ -79,6 +69,9 @@
 		/** @type {object} **/
 		linkShareView: undefined,
 
+		/** @type {object} **/
+		expirationView: undefined,
+
 		initialize: function(options) {
 			var view = this;
 			this.model.on('change', function() {
@@ -108,6 +101,10 @@
 				? new OC.Share.ShareDialogLinkShareView(subViewOptions)
 				: options.linkShareView;
 
+			this.expirationView = _.isUndefined(options.expirationView)
+				? new OC.Share.ShareDialogExpirationView(subViewOptions)
+				: options.expirationView;
+
 		},
 
 		render: function() {
@@ -119,14 +116,16 @@
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
 				shareAllowed: this.model.hasSharePermission(),
 				noSharing: this._renderNoSharing(),
-				expiration: this._renderExpirationPart()
 			}));
 
-			this.resharerInfoView.$el = this.$el.find('.resharerInfo');
+			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
 			this.resharerInfoView.render();
 
+			this.expirationView.$el = this.$el.find('.expirationView');
+			this.expirationView.render();
+
 			if(this.model.hasSharePermission()) {
-				this.linkShareView.$el = this.$el.find('.linkShare');
+				this.linkShareView.$el = this.$el.find('.linkShareView');
 				this.linkShareView.render();
 			}
 
@@ -181,29 +180,6 @@
 			return noSharing;
 		},
 
-		_renderExpirationPart: function() {
-			var expirationTemplate = this._getTemplate('expiration', TEMPLATE_EXPIRATION);
-
-			var defaultExpireMessage = '';
-			if((   this.model.isFolder() || this.model.isFile())
-				&& this.configModel.isDefaultExpireDateEnforced()) {
-				defaultExpireMessage = t(
-						'core',
-						'The public link will expire no later than {days} days after it is created',
-						{'days': this.configModel.getDefaultExpireDate()}
-				);
-			}
-
-			var expiration = expirationTemplate({
-				setExpirationLabel: t('core', 'Set expiration date'),
-				expirationLabel: t('core', 'Expiration'),
-				expirationDatePlaceholder: t('core', 'Expiration date'),
-				defaultExpireMessage: defaultExpireMessage
-			});
-
-			return expiration;
-		},
-
 		/**
 		 *
 		 * @param {string} key - an identifier for the template
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index ea4f01c0a95..b5d508b30ba 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -87,6 +87,7 @@ class Share extends Constants {
 					\OC_Util::addScript('core', 'shareitemmodel');
 					\OC_Util::addScript('core', 'sharedialogresharerinfoview');
 					\OC_Util::addScript('core', 'sharedialoglinkshareview');
+					\OC_Util::addScript('core', 'sharedialogexpirationview');
 					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
 					\OC_Util::addStyle('core', 'share');
-- 
GitLab


From 8f3884145e3992ec5195d6bdd7c4c97926c0c582 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 20:05:50 +0200
Subject: [PATCH 316/783] less stupid initalization of subviews

---
 core/js/sharedialogview.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index cdf5214fa65..b33130a83dc 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -93,18 +93,18 @@
 				configModel: this.configModel
 			};
 
-			this.resharerInfoView = _.isUndefined(options.resharerInfoView)
-				? new OC.Share.ShareDialogResharerInfoView(subViewOptions)
-				: options.resharerInfoView;
-
-			this.linkShareView = _.isUndefined(options.linkShareView)
-				? new OC.Share.ShareDialogLinkShareView(subViewOptions)
-				: options.linkShareView;
-
-			this.expirationView = _.isUndefined(options.expirationView)
-				? new OC.Share.ShareDialogExpirationView(subViewOptions)
-				: options.expirationView;
+			var subViews = {
+				resharerInfoView: 'ShareDialogResharerInfoView',
+				linkShareView: 'ShareDialogLinkShareView',
+				expirationView: 'ShareDialogExpirationView'
+			};
 
+			for(var name in subViews) {
+				var className = subViews[name];
+				this[name] = _.isUndefined(options[name])
+					? new OC.Share[className](subViewOptions)
+					: options[name];
+			}
 		},
 
 		render: function() {
-- 
GitLab


From 6af6024e172bc4810691f54ccaa2da6912395962 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 20:29:12 +0200
Subject: [PATCH 317/783] integraton noshare part into ShareDialogLinkShareView

---
 core/js/sharedialoglinkshareview.js | 52 +++++++++++++++++------------
 core/js/sharedialogview.js          | 25 ++------------
 2 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index ccd705803f6..ca6413761b0 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -14,32 +14,34 @@
 	}
 
 	var TEMPLATE =
-			'<div id="link" class="linkShare">' +
+			'{{#if shareAllowed}}' +
+			'<span class="icon-loading-small hidden"></span>' +
+			'<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
+			'<br />' +
+			'<label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
+			'<input id="linkText" type="text" readonly="readonly" />' +
+			'<input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
+			'<div id="linkPass">' +
+			'    <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
+			'    <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
 			'    <span class="icon-loading-small hidden"></span>' +
-			'    <input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
-			'    <br />' +
-			'    <label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
-			'    <input id="linkText" type="text" readonly="readonly" />' +
-			'    <input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
-			'    <div id="linkPass">' +
-			'        <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
-			'        <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
-			'        <span class="icon-loading-small hidden"></span>' +
-			'    </div>' +
+			'</div>' +
 			'    {{#if publicUpload}}' +
-			'    <div id="allowPublicUploadWrapper" class="hidden">' +
-			'        <span class="icon-loading-small hidden"></span>' +
-			'        <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
-			'        <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
-			'    </div>' +
+			'<div id="allowPublicUploadWrapper" class="hidden">' +
+			'    <span class="icon-loading-small hidden"></span>' +
+			'    <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
+			'    <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
+			'</div>' +
 			'    {{/if}}' +
 			'    {{#if mailPublicNotificationEnabled}}' +
-			'    <form id="emailPrivateLink">' +
-			'        <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
-			'        <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
-			'    </form>' +
+			'<form id="emailPrivateLink">' +
+			'    <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
+			'    <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
+			'</form>' +
 			'    {{/if}}' +
-			'</div>'
+			'{{else}}' +
+			'<input id="shareWith" type="text" placeholder="{{noSharingPlaceholder}}" disabled="disabled"/>' +
+			'{{/if}}'
 		;
 
 	/**
@@ -88,11 +90,17 @@
 		},
 
 		render: function() {
+			var linkShareTemplate = this.template();
+
 			if(    !this.model.hasSharePermission()
 				|| !this.showLink
 				|| !this.configModel.isShareWithLinkAllowed())
 			{
 				this.$el.empty();
+				this.$el.append(linkShareTemplate({
+					shareAllowed: false,
+					noSharingPlaceholder: t('core', 'Resharing is not allowed')
+				}));
 				return this;
 			}
 
@@ -106,9 +114,9 @@
 				publicUploadChecked = 'checked="checked"';
 			}
 
-			var linkShareTemplate = this.template();
 			this.$el.empty();
 			this.$el.append(linkShareTemplate({
+				shareAllowed: true,
 				linkShareLabel: t('core', 'Share link'),
 				urlLabel: t('core', 'Link'),
 				enablePasswordLabel: t('core', 'Password protect'),
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index b33130a83dc..63c3473252f 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -24,11 +24,7 @@
 		'{{{remoteShareInfo}}}' +
 		'<ul id="shareWithList">' +
 		'</ul>' +
-		'{{#if shareAllowed}}' +
 		'<div class="linkShareView"></div>' +
-		'{{else}}' +
-		'{{{noSharing}}}' +
-		'{{/if}}' +
 		'<div class="expirationView"></div>'
 		;
 
@@ -114,21 +110,17 @@
 				shareLabel: t('core', 'Share'),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
-				shareAllowed: this.model.hasSharePermission(),
-				noSharing: this._renderNoSharing(),
 			}));
 
 			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
 			this.resharerInfoView.render();
 
+			this.linkShareView.$el = this.$el.find('.linkShareView');
+			this.linkShareView.render();
+
 			this.expirationView.$el = this.$el.find('.expirationView');
 			this.expirationView.render();
 
-			if(this.model.hasSharePermission()) {
-				this.linkShareView.$el = this.$el.find('.linkShareView');
-				this.linkShareView.render();
-			}
-
 			this.$el.find('.hasTooltip').tooltip();
 			if(this.configModel.areAvatarsEnabled()) {
 				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
@@ -169,17 +161,6 @@
 			return sharePlaceholder;
 		},
 
-		_renderNoSharing: function () {
-			var noSharing = '';
-			if(!this.model.hasSharePermission()) {
-				var noSharingTemplate = this._getTemplate('noSharing', TEMPLATE_NO_SHARING);
-				noSharing = noSharingTemplate({
-					placeholder: t('core', 'Resharing is not allowed')
-				});
-			}
-			return noSharing;
-		},
-
 		/**
 		 *
 		 * @param {string} key - an identifier for the template
-- 
GitLab


From 018d07b3e55fd7234008c51d0a124b7b681a1a4f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 24 Aug 2015 13:00:03 +0200
Subject: [PATCH 318/783] Add share dialog into share tab

---
 apps/files_sharing/appinfo/app.php    | 13 ++++++---
 apps/files_sharing/js/share.js        |  4 +--
 apps/files_sharing/js/sharetabview.js | 38 ++++++++++++++++++++++-----
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 3049dc6a263..2bb872eaad6 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -54,9 +54,16 @@ $application->setupPropagation();
 \OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 \OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
 
-\OCP\Util::addScript('files_sharing', 'share');
-\OCP\Util::addScript('files_sharing', 'sharetabview');
-\OCP\Util::addScript('files_sharing', 'external');
+$eventDispatcher = \OC::$server->getEventDispatcher();
+$eventDispatcher->addListener(
+	'OCA\Files::loadAdditionalScripts',
+	function() {
+		\OCP\Util::addScript('files_sharing', 'share');
+		\OCP\Util::addScript('files_sharing', 'sharetabview');
+		\OCP\Util::addScript('files_sharing', 'external');
+	}
+);
+
 // \OCP\Util::addStyle('files_sharing', 'sharetabview');
 
 \OC::$server->getActivityManager()->registerExtension(function() {
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index c124d390d04..a4ae7fad899 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -151,9 +151,7 @@
 				}
 			});
 
-			OC.addScript('files_sharing', 'sharetabview').done(function() {
-				fileList.registerTabView(new OCA.Sharing.ShareTabView('shareTabView'));
-			});
+			fileList.registerTabView(new OCA.Sharing.ShareTabView('shareTabView'));
 		},
 
 		/**
diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index ee572b747ea..99a5a0fb1db 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -10,7 +10,10 @@
 
 (function() {
 	var TEMPLATE =
-		'<div><ul>{{#if owner}}<li>Owner: {{owner}}</li>{{/if}}</ul></div>';
+		'<div>' +
+		'<ul>{{#if owner}}<li>Owner: {{owner}}</li>{{/if}}</ul>' +
+		'<div class="dialogContainer"></div>' +
+		'</div>';
 
 	/**
 	 * @memberof OCA.Sharing
@@ -20,7 +23,12 @@
 		id: 'shareTabView',
 		className: 'tab shareTabView',
 
-		_template: null,
+		template: function(params) {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template(params);
+		},
 
 		getLabel: function() {
 			return t('files_sharing', 'Sharing');
@@ -30,10 +38,10 @@
 		 * Renders this details view
 		 */
 		render: function() {
-			this.$el.empty();
-
-			if (!this._template) {
-				this._template = Handlebars.compile(TEMPLATE);
+			if (this._dialog) {
+				// remove/destroy older instance
+				this._dialog.remove();
+				this._dialog = null;
 			}
 
 			if (this.model) {
@@ -42,11 +50,27 @@
 				if (owner === OC.currentUser) {
 					owner = null;
 				}
-				this.$el.append(this._template({
+				this.$el.html(this.template({
 					owner: owner
 				}));
 
+				var attributes = {
+					itemType: 'file',
+				   	itemSource: this.model.get('id'),
+					// TODO: make these available
+				   	possiblePermissions: this.model.get('sharingPossiblePermissions')
+				};
+				var shareModel = new OC.Share.ShareItemModel(attributes, {configModel: configModel});
+				var configModel = new OC.Share.ShareConfigModel();
+				this._dialog = new OC.Share.ShareDialogView({
+					configModel: configModel,
+					model: shareModel
+				});
+				this.$el.find('.dialogContainer').append(this._dialog.$el);
+				this._dialog.render();
+				shareModel.fetch();
 			} else {
+				this.$el.empty();
 				// TODO: render placeholder text?
 			}
 		}
-- 
GitLab


From f709022559d434612f995ecce56a65b034590f6b Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 24 Aug 2015 13:15:33 +0200
Subject: [PATCH 319/783] Fix share permissions for share tab

---
 apps/files_sharing/js/sharetabview.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 99a5a0fb1db..11f25c0c47c 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -57,8 +57,7 @@
 				var attributes = {
 					itemType: 'file',
 				   	itemSource: this.model.get('id'),
-					// TODO: make these available
-				   	possiblePermissions: this.model.get('sharingPossiblePermissions')
+					possiblePermissions: this.model.get('sharePermissions')
 				};
 				var shareModel = new OC.Share.ShareItemModel(attributes, {configModel: configModel});
 				var configModel = new OC.Share.ShareConfigModel();
-- 
GitLab


From fdb95613e9b133feed7b7dbad22dc289a54ef094 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 24 Aug 2015 23:20:01 +0200
Subject: [PATCH 320/783] simplification, and throwing where throwing is needed

---
 core/js/sharedialogexpirationview.js   | 5 ++---
 core/js/sharedialoglinkshareview.js    | 8 +++-----
 core/js/sharedialogresharerinfoview.js | 5 ++---
 core/js/sharedialogview.js             | 2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index e752c66bf35..4c628f5498a 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -48,7 +48,7 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
-				console.warn('missing OC.Share.ShareConfigModel');
+				throw 'missing OC.Share.ShareConfigModel';
 			}
 		},
 
@@ -64,8 +64,7 @@
 			}
 
 			var expirationTemplate = this.template();
-			this.$el.empty();
-			this.$el.append(expirationTemplate({
+			this.$el.html(expirationTemplate({
 				setExpirationLabel: t('core', 'Set expiration date'),
 				expirationLabel: t('core', 'Expiration'),
 				expirationDatePlaceholder: t('core', 'Expiration date'),
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index ca6413761b0..ff22b629dc4 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -85,7 +85,7 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
-				console.warn('missing OC.Share.ShareConfigModel');
+				throw 'missing OC.Share.ShareConfigModel';
 			}
 		},
 
@@ -96,8 +96,7 @@
 				|| !this.showLink
 				|| !this.configModel.isShareWithLinkAllowed())
 			{
-				this.$el.empty();
-				this.$el.append(linkShareTemplate({
+				this.$el.html(linkShareTemplate({
 					shareAllowed: false,
 					noSharingPlaceholder: t('core', 'Resharing is not allowed')
 				}));
@@ -114,8 +113,7 @@
 				publicUploadChecked = 'checked="checked"';
 			}
 
-			this.$el.empty();
-			this.$el.append(linkShareTemplate({
+			this.$el.html(linkShareTemplate({
 				shareAllowed: true,
 				linkShareLabel: t('core', 'Share link'),
 				urlLabel: t('core', 'Link'),
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index 8970d857fc3..63df25b4ed8 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -58,7 +58,7 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
-				console.warn('missing OC.Share.ShareConfigModel');
+				throw 'missing OC.Share.ShareConfigModel';
 			}
 		},
 
@@ -90,8 +90,7 @@
 				);
 			}
 
-			this.$el.empty();
-			this.$el.append(reshareTemplate({
+			this.$el.html(reshareTemplate({
 				avatarEnabled: this.configModel.areAvatarsEnabled(),
 				sharedByText: sharedByText
 			}));
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 63c3473252f..e07a5cee49a 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -81,7 +81,7 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
-				console.warn('missing OC.Share.ShareConfigModel');
+				throw 'missing OC.Share.ShareConfigModel';
 			}
 
 			var subViewOptions = {
-- 
GitLab


From f2fb20ed1cfc88c5e37c2ecc84ec4ec77d98f371 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 24 Aug 2015 23:27:43 +0200
Subject: [PATCH 321/783] no auto-fetch in model

---
 core/js/share.js          | 1 +
 core/js/shareitemmodel.js | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 84da511497e..1fc1ac9e20c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -404,6 +404,7 @@ OC.Share = _.extend(OC.Share, {
 		$dialog.slideDown(OC.menuSpeed, function() {
 			OC.Share.droppedDown = true;
 		});
+		itemModel.fetch();
 		return;
 
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 9c4a8141cda..0d823f05749 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -57,7 +57,6 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			}
-			this.fetch();
 		},
 
 		defaults: {
-- 
GitLab


From 755d4016b11cd90806e29b0aafcd2ad09161ae57 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 24 Aug 2015 23:37:04 +0200
Subject: [PATCH 322/783] set default value and remove now superflous method

---
 core/js/shareitemmodel.js | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 0d823f05749..c5d0581390c 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -60,7 +60,8 @@
 		},
 
 		defaults: {
-			allowPublicUploadStatus: false
+			allowPublicUploadStatus: false,
+			permissions: 0
 		},
 
 		/**
@@ -130,31 +131,18 @@
 			return this.get('reshare').share_type;
 		},
 
-		/**
-		 * @returns {number}
-		 */
-		getPermissions: function() {
-			var permissions = this.get('permissions');
-			if(_.isUndefined(permissions)) {
-				// model was not properly initialized
-				console.warn('Sharing error: undefined permissions');
-				permissions = 0;
-			}
-			return permissions;
-		},
-
 		/**
 		 * @returns {boolean}
 		 */
 		hasSharePermission: function() {
-			return (this.getPermissions() & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
+			return (this.get('permissions') & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
 		},
 
 		/**
 		 * @returns {boolean}
 		 */
 		hasCreatePermission: function() {
-			return (this.getPermissions() & OC.PERMISSION_CREATE) === OC.PERMISSION_CREATE;
+			return (this.get('permissions') & OC.PERMISSION_CREATE) === OC.PERMISSION_CREATE;
 		},
 
 		fetch: function() {
@@ -186,14 +174,12 @@
 				});
 			}
 
-			var attributes = {
+			return {
 				reshare: data.reshare,
 				shares: data.shares,
 				permissions: permissions,
 				allowPublicUploadStatus: allowPublicUploadStatus
 			};
-
-			return attributes;
 		}
 	});
 
-- 
GitLab


From f62a3be59069510f4afa479316a665011cd014f5 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Aug 2015 14:41:52 +0200
Subject: [PATCH 323/783] cleanup

---
 core/js/sharedialogview.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index e07a5cee49a..8cd68962d42 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -32,10 +32,6 @@
 		'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
 		'title="{{tooltip}}"></a>';
 
-	var TEMPLATE_NO_SHARING =
-		'<input id="shareWith" type="text" placeholder="{{placeholder}}" disabled="disabled"/>'
-	;
-
 	/**
 	 * @class OCA.Share.ShareDialogView
 	 * @member {OC.Share.ShareItemModel} model
-- 
GitLab


From c17d022ca42dda31f321276f2c4973ca2e43c8a4 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 25 Aug 2015 16:07:14 +0200
Subject: [PATCH 324/783] started to implement sharee list view. not completed
 yet, do not cry please.

---
 core/js/shareconfigmodel.js          |   7 ++
 core/js/sharedialogshareelistview.js | 111 +++++++++++++++++++++++++++
 core/js/sharedialogview.js           |   9 ++-
 lib/private/share/share.php          |   1 +
 4 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 core/js/sharedialogshareelistview.js

diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 857e356a351..e948c57cbac 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -55,6 +55,13 @@
 			return oc_appconfig.core.remoteShareAllowed;
 		},
 
+		/**
+		 * @returns {boolean}
+		 */
+		isResharingAllowed: function() {
+			return oc_appconfig.core.resharingAllowed
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
new file mode 100644
index 00000000000..177e0b4a899
--- /dev/null
+++ b/core/js/sharedialogshareelistview.js
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	if (!OC.Share) {
+		OC.Share = {};
+	}
+
+	var TEMPLATE =
+			'<ul id="shareWithList">' +
+			'{{#each sharees}}' +
+			'    <li data-share-type="{{shareType}}" data-share-with="{{shareWith}}" title="{{shareWith}}">' +
+			'        <a href="#" class="unshare"><img class="svg" alt="{{unshareLabel}}" title="{{unshareLabel}}" src="{{unshareImage}}" /></a>' +
+			'        {{#if avatarEnabled}}' +
+			'        <div class="avatar"></div>' +
+			'        {{/if}}' +
+			'        <span class="username">{{shareWithDisplayName}}</span>' +
+			'        {{#if mailPublicNotificationEnabled}} {{#unless isRemoteShare}}' +
+			'        <label><input type="checkbox" name="mailNotification" class="mailNotification" {{isMailSent}} />{{notifyByMailLabel}}</label>' +
+			'        {{/unless}} {{/if}}' +
+			'        {{#if isResharingAllowed}} {{#if hasSharePermission}}' +
+			'        {{/if}} {{/if}}' +
+			'    </li>' +
+			'{{/each}}' +
+			'</ul>'
+		;
+
+	/**
+	 * @class OCA.Share.ShareDialogShareeListView
+	 * @member {OC.Share.ShareItemModel} model
+	 * @member {jQuery} $el
+	 * @memberof OCA.Sharing
+	 * @classdesc
+	 *
+	 * Represents the sharee list part in the GUI of the share dialogue
+	 *
+	 */
+	var ShareDialogShareeListView = OC.Backbone.View.extend({
+		/** @type {string} **/
+		id: 'shareDialogLinkShare',
+
+		/** @type {OC.Share.ShareConfigModel} **/
+		configModel: undefined,
+
+		/** @type {Function} **/
+		_template: undefined,
+
+		/** @type {boolean} **/
+		showLink: true,
+
+		initialize: function(options) {
+			if(!_.isUndefined(options.configModel)) {
+				this.configModel = options.configModel;
+			} else {
+				throw 'missing OC.Share.ShareConfigModel';
+			}
+		},
+
+		getShareeList: function() {
+			var universal = {
+				avatarEnabled: this.configModel.areAvatarsEnabled(),
+				mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
+				notifyByMailLabel: t('core', 'notify by email'),
+				unshareLabel: t('core', 'Unshare'),
+				unshareImage: OC.imagePath('core', 'actions/delete')
+			};
+
+			// TODO: sharess must have following attributes
+			// shareType
+			// shareWith
+			// shareWithDisplayName
+			// isRemoteShare
+			// isMailSent
+
+			var list = _.extend({}, universal);
+
+			return list;
+		},
+
+		render: function() {
+			var shareeListTemplate = this.template();
+			this.$el.html(shareeListTemplate({
+				sharees: this.getShareeList()
+			}));
+
+			return this;
+		},
+
+		/**
+		 * @returns {Function} from Handlebars
+		 * @private
+		 */
+		template: function () {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+			return this._template;
+		}
+
+	});
+
+	OC.Share.ShareDialogShareeListView = ShareDialogShareeListView;
+
+})();
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 8cd68962d42..2348c14bb88 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -22,8 +22,7 @@
 		'</div>' +
 			// FIXME: find a good position for remoteShareInfo
 		'{{{remoteShareInfo}}}' +
-		'<ul id="shareWithList">' +
-		'</ul>' +
+		'<div class="shareeListView"></div>' +
 		'<div class="linkShareView"></div>' +
 		'<div class="expirationView"></div>'
 		;
@@ -88,7 +87,8 @@
 			var subViews = {
 				resharerInfoView: 'ShareDialogResharerInfoView',
 				linkShareView: 'ShareDialogLinkShareView',
-				expirationView: 'ShareDialogExpirationView'
+				expirationView: 'ShareDialogExpirationView',
+				shareeListView: 'ShareDialogShareeListView'
 			};
 
 			for(var name in subViews) {
@@ -117,6 +117,9 @@
 			this.expirationView.$el = this.$el.find('.expirationView');
 			this.expirationView.render();
 
+			this.shareeListView.$el = this.$el.find('.shareeListView');
+			this.shareeListView.redner();
+
 			this.$el.find('.hasTooltip').tooltip();
 			if(this.configModel.areAvatarsEnabled()) {
 				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index b5d508b30ba..802b146cfb6 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -88,6 +88,7 @@ class Share extends Constants {
 					\OC_Util::addScript('core', 'sharedialogresharerinfoview');
 					\OC_Util::addScript('core', 'sharedialoglinkshareview');
 					\OC_Util::addScript('core', 'sharedialogexpirationview');
+					\OC_Util::addScript('core', 'sharedialogshareelistview');
 					\OC_Util::addScript('core', 'sharedialogview');
 					\OC_Util::addScript('core', 'share');
 					\OC_Util::addStyle('core', 'share');
-- 
GitLab


From 5db1db38efffc2110e34886263f3a1117fe8efa5 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 1 Sep 2015 12:43:04 +0200
Subject: [PATCH 325/783] continue to reimplement sharee list view. still WIP

---
 core/js/sharedialoglinkshareview.js    |   4 +-
 core/js/sharedialogresharerinfoview.js |   3 +-
 core/js/sharedialogshareelistview.js   | 113 ++++++++++++-
 core/js/sharedialogview.js             |  14 +-
 core/js/shareitemmodel.js              | 212 ++++++++++++++++++++++++-
 5 files changed, 327 insertions(+), 19 deletions(-)

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index ff22b629dc4..eebf8a34247 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -92,7 +92,7 @@
 		render: function() {
 			var linkShareTemplate = this.template();
 
-			if(    !this.model.hasSharePermission()
+			if(    !this.model.sharePermissionPossible()
 				|| !this.showLink
 				|| !this.configModel.isShareWithLinkAllowed())
 			{
@@ -105,7 +105,7 @@
 
 			var publicUpload =
 				this.model.isFolder()
-				&& this.model.hasCreatePermission()
+				&& this.model.createPermissionPossible()
 				&& this.configModel.isPublicUploadEnabled();
 
 			var publicUploadChecked = '';
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index 63df25b4ed8..f7de90e264f 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -16,7 +16,7 @@
 	var TEMPLATE =
 		'<span class="reshare">' +
 		'    {{#if avatarEnabled}}' +
-		'    <div class="avatar"></div>' +
+		'    <div class="avatar" data-userName="{{reshareOwner}}"></div>' +
 		'    {{/if}}' +
 		'    {{sharedByText}}' +
 		'</span><br/>'
@@ -92,6 +92,7 @@
 
 			this.$el.html(reshareTemplate({
 				avatarEnabled: this.configModel.areAvatarsEnabled(),
+				reshareOwner: this.model.getReshareOwner(),
 				sharedByText: sharedByText
 			}));
 
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 177e0b4a899..8179926ad51 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -16,18 +16,41 @@
 	var TEMPLATE =
 			'<ul id="shareWithList">' +
 			'{{#each sharees}}' +
+			'    {{#if isCollection}}' +
+			'    <li data-collection="{{collectionID}}">{{text}}</li>' +
+			'    {{/if}}' +
+			'    {{#unless isCollection}}' +
 			'    <li data-share-type="{{shareType}}" data-share-with="{{shareWith}}" title="{{shareWith}}">' +
 			'        <a href="#" class="unshare"><img class="svg" alt="{{unshareLabel}}" title="{{unshareLabel}}" src="{{unshareImage}}" /></a>' +
 			'        {{#if avatarEnabled}}' +
-			'        <div class="avatar"></div>' +
+			'        <div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
 			'        {{/if}}' +
 			'        <span class="username">{{shareWithDisplayName}}</span>' +
 			'        {{#if mailPublicNotificationEnabled}} {{#unless isRemoteShare}}' +
-			'        <label><input type="checkbox" name="mailNotification" class="mailNotification" {{isMailSent}} />{{notifyByMailLabel}}</label>' +
+			'        <label><input type="checkbox" name="mailNotification" class="mailNotification" {{#if wasMailSent}}checked="checked"{{/if}} />{{notifyByMailLabel}}</label>' +
 			'        {{/unless}} {{/if}}' +
-			'        {{#if isResharingAllowed}} {{#if hasSharePermission}}' +
+			'        {{#if isResharingAllowed}} {{#if sharePermissionPossible}}' +
+			'        <label><input id="canShare-{{shareWith}}" type="checkbox" name="share" class="permissions" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />{{canShareLabel}}</label>' +
 			'        {{/if}} {{/if}}' +
+			'        {{#if editPermissionPossible}}' +
+			'        <label><input id="canEdit-{{shareWith}}" type="checkbox" name="edit" class="permissions" {{#if hasEditPermission}}checked="checked"{{/if}} />{{canEditLabel}}</label>' +
+			'        {{/if}}' +
+			'        {{#unless isRemoteShare}}' +
+			'        <a href="#" class="showCruds"><img class="svg" alt="{{crudsLabel}}" src="{{triangleSImage}}"/></a>' +
+			'        <div class="cruds" class="hidden">' +
+			'            {{#if createPermissionPossible}}' +
+			'            <label><input id="canCreate-{{shareWith}}" type="checkbox" name="create" class="permissions" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>{{createPermissionLabel}}</label>' +
+			'            {{/if}}' +
+			'            {{#if updatePermissionPossible}}' +
+			'            <label><input id="canUpdate-{{shareWith}}" type="checkbox" name="update" class="permissions" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>{{updatePermissionLabel}}</label>' +
+			'            {{/if}}' +
+			'            {{#if deletePermissionPossible}}' +
+			'            <label><input id="canDelete-{{shareWith}}" type="checkbox" name="delete" class="permissions" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>{{deletePermissionLabel}}</label>' +
+			'            {{/if}}' +
+			'        </div>' +
+			'        {{/unless}}' +
 			'    </li>' +
+			'    {{/unless}}' +
 			'{{/each}}' +
 			'</ul>'
 		;
@@ -61,6 +84,54 @@
 			} else {
 				throw 'missing OC.Share.ShareConfigModel';
 			}
+
+			var view = this;
+			this.model.on('change:shares', function() {
+				view.render();
+			});
+		},
+
+		getCollectionObject: function(shareIndex) {
+			var type = this.model.getCollectionType(shareIndex);
+			var id = this.model.getCollectionPath(shareIndex);
+			if(type !== 'file' && type !== 'folder') {
+				id = this.model.getCollectionSource(shareIndex);
+			}
+			return {
+				collectionID: id,
+				text: t('core', 'Shared in {item} with {user}', {'item': id, user: this.model.getShareWithDisplayName(shareIndex)})
+			}
+		},
+
+		/**
+		 *
+		 * @param {OC.Share.Types.ShareInfo} shareInfo
+		 * @returns {object}
+		 */
+		getShareeObject: function(shareIndex) {
+			var shareWith = this.model.getShareWith(shareIndex);
+			var shareWithDisplayName = this.model.getShareWithDisplayName(shareIndex);
+			var shareType = this.model.getShareType(shareIndex);
+
+			if (shareType === OC.Share.SHARE_TYPE_GROUP) {
+				shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
+			} else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
+				shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
+			}
+
+
+			return {
+				hasSharePermission: this.model.hasSharePermission(shareIndex),
+				hasEditPermission: this.model.hasEditPermission(shareIndex),
+				hasCreatePermission: this.model.hasCreatePermission(shareIndex),
+				hasUpdatePermission: this.model.hasUpdatePermission(shareIndex),
+				hasDeletePermission: this.model.hasDeletePermission(shareIndex),
+				wasMailSent: this.model.notificationMailWasSent(shareIndex),
+				shareWith: shareWith,
+				shareWithDisplayName: shareWithDisplayName,
+				shareType: shareType,
+				modSeed: shareType !== OC.Share.SHARE_TYPE_USER
+			};
 		},
 
 		getShareeList: function() {
@@ -69,23 +140,49 @@
 				mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
 				notifyByMailLabel: t('core', 'notify by email'),
 				unshareLabel: t('core', 'Unshare'),
-				unshareImage: OC.imagePath('core', 'actions/delete')
+				unshareImage: OC.imagePath('core', 'actions/delete'),
+				canShareLabel: t('core', 'can share'),
+				canEditLabel: t('core', 'can edit'),
+				createPermissionLabel: t('core', 'create'),
+				updatePermissionLabel: t('core', 'change'),
+				deletePermissionLabel: t('core', 'delete'),
+				crudsLabel: t('core', 'access control'),
+				triangleSImage: OC.imagePath('core', 'actions/triangle-s'),
+				isResharingAllowed: this.configModel.isResharingAllowed(),
+				sharePermissionPossible: this.model.sharePermissionPossible(),
+				editPermissionPossible: this.model.editPermissionPossible(),
+				createPermissionPossible: this.model.createPermissionPossible(),
+				updatePermissionPossible: this.model.updatePermissionPossible(),
+				deletePermissionPossible: this.model.deletePermissionPossible(),
+				sharePermission: OC.PERMISSION_SHARE,
+				createPermission: OC.PERMISSION_CREATE,
+				updatePermission: OC.PERMISSION_UPDATE,
+				deletePermission: OC.PERMISSION_DELETE
 			};
 
 			// TODO: sharess must have following attributes
-			// shareType
-			// shareWith
-			// shareWithDisplayName
 			// isRemoteShare
 			// isMailSent
 
-			var list = _.extend({}, universal);
+			if(!this.model.hasShares()) {
+				return [];
+			}
+
+			var list = [];
+			for(var index in this.model.get('shares')) {
+				if(this.model.isCollection(index)) {
+					list.unshift(this.getCollectionObject(index));
+				} else {
+					list.push(_.extend(this.getShareeObject(index), universal))
+				}
+			}
 
 			return list;
 		},
 
 		render: function() {
 			var shareeListTemplate = this.template();
+			var list = this.getShareeList();
 			this.$el.html(shareeListTemplate({
 				sharees: this.getShareeList()
 			}));
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 2348c14bb88..9bfe38eea3c 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -63,6 +63,9 @@
 		/** @type {object} **/
 		expirationView: undefined,
 
+		/** @type {object} **/
+		shareeListView: undefined,
+
 		initialize: function(options) {
 			var view = this;
 			this.model.on('change', function() {
@@ -118,11 +121,18 @@
 			this.expirationView.render();
 
 			this.shareeListView.$el = this.$el.find('.shareeListView');
-			this.shareeListView.redner();
+			this.shareeListView.render();
 
 			this.$el.find('.hasTooltip').tooltip();
 			if(this.configModel.areAvatarsEnabled()) {
-				this.$el.find('.avatar').avatar(this.model.getReshareOwner, 32);
+				this.$el.find('.avatar').each(function() {
+					var $this = $(this);
+					$this.avatar($this.data('username'), 32);
+				});
+				this.$el.find('.avatar.imageplaceholderseed').each(function() {
+					var $this = $(this);
+					$this.imageplaceholder($this.data('seed'));
+				});
 			}
 
 			return this;
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index c5d0581390c..b5370faca0a 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -14,6 +14,13 @@
 		OC.Share.Types = {};
 	}
 
+	/**
+	 * @typedef {object} OC.Share.Types.Collection
+	 * @property {string} item_type
+	 * @property {string} path
+	 * @property {string} item_source TODO: verify
+	 */
+
 	/**
 	 * @typedef {object} OC.Share.Types.Reshare
 	 * @property {string} uid_owner
@@ -33,7 +40,7 @@
 	 * @property {string} share_with
 	 * @property {string} share_with_displayname
 	 * @property {string} share_mail_send
-	 * @property {bool} collection //TODO: verify
+	 * @property {OC.Share.Types.Collection|undefined} collection
 	 * @property {Date} expiration optional?
 	 * @property {number} stime optional?
 	 */
@@ -95,13 +102,79 @@
 		},
 
 		/**
-		 * whether this item has reshare information
+		 * whether this item has share information
 		 * @returns {boolean}
 		 */
 		hasShares: function() {
-			return _.isObject(this.get('shares'));
+			var shares = this.get('shares');
+			return _.isArray(this.get('shares'));
 		},
 
+		/**
+		 * @param {number} shareIndex
+		 * @returns {string}
+		 */
+		getCollectionType: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			} else if(_.isUndefined(share.collection)) {
+				throw "Share is not a collection";
+			}
+
+			return share.collection.item_type;
+		},
+
+		/**
+		 * @param {number} shareIndex
+		 * @returns {string}
+		 */
+		getCollectionPath: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			} else if(_.isUndefined(share.collection)) {
+				throw "Share is not a collection";
+			}
+
+			return share.collection.path;
+		},
+
+		/**
+		 * @param {number} shareIndex
+		 * @returns {string}
+		 */
+		getCollectionSource: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			} else if(_.isUndefined(share.collection)) {
+				throw "Share is not a collection";
+			}
+
+			return share.collection.item_source;
+		},
+
+		/**
+		 * @param {number} shareIndex
+		 * @returns {boolean}
+		 */
+		isCollection: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			if(_.isUndefined(share.collection)) {
+				return false;
+			}
+			return true;
+		},
+
+
 		/**
 		 * @returns {string}
 		 */
@@ -131,20 +204,145 @@
 			return this.get('reshare').share_type;
 		},
 
+		/**
+		 * @param shareIndex
+		 * @returns {string}
+		 */
+		getShareWith: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			return share.share_with;
+		},
+
+		/**
+		 * @param shareIndex
+		 * @returns {string}
+		 */
+		getShareWithDisplayName: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			return share.share_with_displayname;
+		},
+
+		getShareType: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			return share.share_type;
+		},
+
+		/**
+		 * whether a share from shares has the requested permission
+		 *
+		 * @param {number} shareIndex
+		 * @param {number} permission
+		 * @returns {boolean}
+		 * @private
+		 */
+		_shareHasPermission: function(shareIndex, permission) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			return (share.permissions & permission) === permission;
+		},
+
+		notificationMailWasSent: function(shareIndex) {
+			/** @type OC.Share.Types.ShareInfo **/
+			var share = this.get('shares')[shareIndex];
+			if(!_.isObject(share)) {
+				throw "Unknown Share";
+			}
+			return share.share_mail_send === '1';
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-		hasSharePermission: function() {
+		sharePermissionPossible: function() {
 			return (this.get('permissions') & OC.PERMISSION_SHARE) === OC.PERMISSION_SHARE;
 		},
 
+		/**
+		 * @param {number} shareIndex
+		 * @returns {boolean}
+		 */
+		hasSharePermission: function(shareIndex) {
+			return this._shareHasPermission(shareIndex, OC.PERMISSION_SHARE);
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-		hasCreatePermission: function() {
+		createPermissionPossible: function() {
 			return (this.get('permissions') & OC.PERMISSION_CREATE) === OC.PERMISSION_CREATE;
 		},
 
+		/**
+		 * @param {number} shareIndex
+		 * @returns {boolean}
+		 */
+		hasCreatePermission: function(shareIndex) {
+			return this._shareHasPermission(shareIndex, OC.PERMISSION_CREATE);
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		updatePermissionPossible: function() {
+			return (this.get('permissions') & OC.PERMISSION_UPDATE) === OC.PERMISSION_UPDATE;
+		},
+
+		/**
+		 * @param {number} shareIndex
+		 * @returns {boolean}
+		 */
+		hasUpdatePermission: function(shareIndex) {
+			return this._shareHasPermission(shareIndex, OC.PERMISSION_UPDATE);
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		deletePermissionPossible: function() {
+			return (this.get('permissions') & OC.PERMISSION_DELETE) === OC.PERMISSION_DELETE;
+		},
+
+		/**
+		 * @param {number} shareIndex
+		 * @returns {boolean}
+		 */
+		hasDeletePermission: function(shareIndex) {
+			return this._shareHasPermission(shareIndex, OC.PERMISSION_DELETE);
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		editPermissionPossible: function() {
+			return    this.createPermissionPossible()
+				   || this.updatePermissionPossible()
+				   || this.deletePermissionPossible();
+		},
+
+		/**
+		 * @returns {boolean}
+		 */
+		hasEditPermission: function(shareIndex) {
+			return    this.hasCreatePermission(shareIndex)
+				   || this.hasUpdatePermission(shareIndex)
+				   || this.hasDeletePermission(shareIndex);
+		},
+
 		fetch: function() {
 			var model = this;
 			OC.Share.loadItem(this.get('itemType'), this.get('itemSource'), function(data) {
@@ -159,6 +357,8 @@
 				return {};
 			}
 
+			console.log(data.shares);
+
 			var permissions = this.get('possiblePermissions');
 			if(!_.isUndefined(data.reshare) && !_.isUndefined(data.reshare.permissions)) {
 				permissions = permissions & data.reshare.permissions;
@@ -176,7 +376,7 @@
 
 			return {
 				reshare: data.reshare,
-				shares: data.shares,
+				shares: $.map(data.shares, function(value) { return [value]; }),
 				permissions: permissions,
 				allowPublicUploadStatus: allowPublicUploadStatus
 			};
-- 
GitLab


From 44ecdde10d347dc0e77576b35dc3d066dfc0fce6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 2 Sep 2015 13:06:00 +0200
Subject: [PATCH 326/783] sharee list view: better handle collections

---
 core/js/sharedialogshareelistview.js | 41 ++++++++++++++++++++++++----
 core/js/shareitemmodel.js            |  4 +--
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 8179926ad51..8e08e2b4f76 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -78,6 +78,9 @@
 		/** @type {boolean} **/
 		showLink: true,
 
+		/** @type {object} **/
+		_collections: {},
+
 		initialize: function(options) {
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
@@ -91,6 +94,23 @@
 			});
 		},
 
+		processCollectionShare: function(shareIndex) {
+			var type = this.model.getCollectionType(shareIndex);
+			var id = this.model.getCollectionPath(shareIndex);
+			if(type !== 'file' && type !== 'folder') {
+				id = this.model.getCollectionSource(shareIndex);
+			}
+			var displayName = this.model.getShareWithDisplayName(shareIndex);
+			if(!_.isUndefined(this._collections[id])) {
+				this._collections[id].text = this._collections[id].text + ", " + displayName;
+			} else {
+				this._collections[id] = {};
+				this._collections[id].text = t('core', 'Shared in {item} with {user}', {'item': id, user: displayName});
+				this._collections[id].id = id;
+				this._collections[id].isCollection = true;
+			}
+		},
+
 		getCollectionObject: function(shareIndex) {
 			var type = this.model.getCollectionType(shareIndex);
 			var id = this.model.getCollectionPath(shareIndex);
@@ -119,7 +139,6 @@
 				shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
 			}
 
-
 			return {
 				hasSharePermission: this.model.hasSharePermission(shareIndex),
 				hasEditPermission: this.model.hasEditPermission(shareIndex),
@@ -160,21 +179,34 @@
 				deletePermission: OC.PERMISSION_DELETE
 			};
 
+			this._collections = {};
+
 			// TODO: sharess must have following attributes
 			// isRemoteShare
-			// isMailSent
 
 			if(!this.model.hasShares()) {
 				return [];
 			}
 
+			var shares = this.model.get('shares');
 			var list = [];
-			for(var index in this.model.get('shares')) {
+			for(var index = 0; index < shares.length; index++) {
+
+				// #### FIXME: LEGACY ####
+				// this does not belong to a view
+				var shareType = this.model.getShareType(index);
+				if (!OC.Share.currentShares[shareType]) {
+					OC.Share.currentShares[shareType] = [];
+				}
+				OC.Share.currentShares[shareType].push(this.model.getShareWith(index));
+				// #### /FIXME: LEGACY ####
+
 				if(this.model.isCollection(index)) {
-					list.unshift(this.getCollectionObject(index));
+					this.processCollectionShare(index);
 				} else {
 					list.push(_.extend(this.getShareeObject(index), universal))
 				}
+				list = _.union(_.values(this._collections), list);
 			}
 
 			return list;
@@ -182,7 +214,6 @@
 
 		render: function() {
 			var shareeListTemplate = this.template();
-			var list = this.getShareeList();
 			this.$el.html(shareeListTemplate({
 				sharees: this.getShareeList()
 			}));
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index b5370faca0a..d4fbc3543a7 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -357,8 +357,6 @@
 				return {};
 			}
 
-			console.log(data.shares);
-
 			var permissions = this.get('possiblePermissions');
 			if(!_.isUndefined(data.reshare) && !_.isUndefined(data.reshare.permissions)) {
 				permissions = permissions & data.reshare.permissions;
@@ -376,7 +374,7 @@
 
 			return {
 				reshare: data.reshare,
-				shares: $.map(data.shares, function(value) { return [value]; }),
+				shares: _.toArray(data.shares),
 				permissions: permissions,
 				allowPublicUploadStatus: allowPublicUploadStatus
 			};
-- 
GitLab


From 60abfcdab16ed674015422a6300bd28f3baa5e91 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 2 Sep 2015 16:47:25 +0200
Subject: [PATCH 327/783] old OC.Share.addShareWith now reimplemented

---
 core/js/share.js                     | 106 ---------------------------
 core/js/sharedialogshareelistview.js |  28 +------
 core/js/shareitemmodel.js            |  26 ++++++-
 3 files changed, 27 insertions(+), 133 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 1fc1ac9e20c..bd87ab10d40 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -685,112 +685,6 @@ OC.Share = _.extend(OC.Share, {
 			}
 		});
 	},
-	addShareWith:function(shareType, shareWith, shareWithDisplayName, permissions, possiblePermissions, mailSend, collection) {
-		var shareItem = {
-			share_type: shareType,
-			share_with: shareWith,
-			share_with_displayname: shareWithDisplayName,
-			permissions: permissions
-		};
-		if (shareType === OC.Share.SHARE_TYPE_GROUP) {
-			shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
-		}
-		if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
-			shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
-		}
-		if (!OC.Share.itemShares[shareType]) {
-			OC.Share.itemShares[shareType] = [];
-		}
-		OC.Share.itemShares[shareType].push(shareWith);
-		if (collection) {
-			if (collection.item_type == 'file' || collection.item_type == 'folder') {
-				var item = collection.path;
-			} else {
-				var item = collection.item_source;
-			}
-			var collectionList = $('#shareWithList li').filterAttr('data-collection', item);
-			if (collectionList.length > 0) {
-				$(collectionList).append(', '+shareWithDisplayName);
-			} else {
-				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in {item} with {user}', {'item': item, user: shareWithDisplayName})+'</li>';
-				$('#shareWithList').prepend(html);
-			}
-		} else {
-			var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
-			if (permissions & OC.PERMISSION_CREATE) {
-				createChecked = 'checked="checked"';
-				editChecked = 'checked="checked"';
-			}
-			if (permissions & OC.PERMISSION_UPDATE) {
-				updateChecked = 'checked="checked"';
-				editChecked = 'checked="checked"';
-			}
-			if (permissions & OC.PERMISSION_DELETE) {
-				deleteChecked = 'checked="checked"';
-				editChecked = 'checked="checked"';
-			}
-			if (permissions & OC.PERMISSION_SHARE) {
-				shareChecked = 'checked="checked"';
-			}
-			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')+'" title="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
-			if (oc_config.enable_avatars === true) {
-				html += '<div class="avatar"></div>';
-			}
-			html += '<span class="username">' + escapeHTML(shareWithDisplayName) + '</span>';
-			var mailNotificationEnabled = $('input:hidden[name=mailNotificationEnabled]').val();
-			if (mailNotificationEnabled === 'yes' && shareType !== OC.Share.SHARE_TYPE_REMOTE) {
-				var checked = '';
-				if (mailSend === '1') {
-					checked = 'checked';
-				}
-				html += '<label><input type="checkbox" name="mailNotification" class="mailNotification" ' + checked + ' />'+t('core', 'notify by email')+'</label> ';
-			}
-			if (oc_appconfig.core.resharingAllowed && (possiblePermissions & OC.PERMISSION_SHARE)) {
-				html += '<label><input id="canShare-'+escapeHTML(shareWith)+'" type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />'+t('core', 'can share')+'</label>';
-			}
-			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
-				html += '<label><input id="canEdit-'+escapeHTML(shareWith)+'" type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label>';
-			}
-			if (shareType !== OC.Share.SHARE_TYPE_REMOTE) {
-				showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+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 id="canCreate-' + escapeHTML(shareWith) + '" type="checkbox" name="create" class="permissions" ' + createChecked + ' data-permissions="' + OC.PERMISSION_CREATE + '"/>' + t('core', 'create') + '</label>';
-			}
-			if (possiblePermissions & OC.PERMISSION_UPDATE) {
-				html += '<label><input id="canUpdate-' + escapeHTML(shareWith) + '" type="checkbox" name="update" class="permissions" ' + updateChecked + ' data-permissions="' + OC.PERMISSION_UPDATE + '"/>' + t('core', 'change') + '</label>';
-			}
-			if (possiblePermissions & OC.PERMISSION_DELETE) {
-				html += '<label><input id="canDelete-' + escapeHTML(shareWith) + '" type="checkbox" name="delete" class="permissions" ' + deleteChecked + ' data-permissions="' + OC.PERMISSION_DELETE + '"/>' + t('core', 'delete') + '</label>';
-			}
-			html += '</div>';
-			html += '</li>';
-			html = $(html).appendTo('#shareWithList');
-			if (oc_config.enable_avatars === true) {
-				if (shareType === OC.Share.SHARE_TYPE_USER) {
-					html.find('.avatar').avatar(escapeHTML(shareWith), 32);
-				} else {
-					//Add sharetype to generate different seed if there is a group and use with the same name
-					html.find('.avatar').imageplaceholder(escapeHTML(shareWith) + ' ' + shareType);
-				}
-			}
-			// insert cruds button into last label element
-			var lastLabel = html.find('>label:last');
-			if (lastLabel.exists()){
-				lastLabel.append(showCrudsButton);
-			}
-			else{
-				html.find('.cruds').before(showCrudsButton);
-			}
-			if (!OC.Share.currentShares[shareType]) {
-				OC.Share.currentShares[shareType] = [];
-			}
-			OC.Share.currentShares[shareType].push(shareItem);
-		}
-	},
 	showLink:function(token, password, itemSource) {
 		OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
 		$('#linkCheckbox').attr('checked', true);
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 8e08e2b4f76..f9d725bf51e 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -111,18 +111,6 @@
 			}
 		},
 
-		getCollectionObject: function(shareIndex) {
-			var type = this.model.getCollectionType(shareIndex);
-			var id = this.model.getCollectionPath(shareIndex);
-			if(type !== 'file' && type !== 'folder') {
-				id = this.model.getCollectionSource(shareIndex);
-			}
-			return {
-				collectionID: id,
-				text: t('core', 'Shared in {item} with {user}', {'item': id, user: this.model.getShareWithDisplayName(shareIndex)})
-			}
-		},
-
 		/**
 		 *
 		 * @param {OC.Share.Types.ShareInfo} shareInfo
@@ -149,7 +137,8 @@
 				shareWith: shareWith,
 				shareWithDisplayName: shareWithDisplayName,
 				shareType: shareType,
-				modSeed: shareType !== OC.Share.SHARE_TYPE_USER
+				modSeed: shareType !== OC.Share.SHARE_TYPE_USER,
+				isRemoteShare: shareType === OC.Share.SHARE_TYPE_REMOTE
 			};
 		},
 
@@ -181,9 +170,6 @@
 
 			this._collections = {};
 
-			// TODO: sharess must have following attributes
-			// isRemoteShare
-
 			if(!this.model.hasShares()) {
 				return [];
 			}
@@ -191,16 +177,6 @@
 			var shares = this.model.get('shares');
 			var list = [];
 			for(var index = 0; index < shares.length; index++) {
-
-				// #### FIXME: LEGACY ####
-				// this does not belong to a view
-				var shareType = this.model.getShareType(index);
-				if (!OC.Share.currentShares[shareType]) {
-					OC.Share.currentShares[shareType] = [];
-				}
-				OC.Share.currentShares[shareType].push(this.model.getShareWith(index));
-				// #### /FIXME: LEGACY ####
-
 				if(this.model.isCollection(index)) {
 					this.processCollectionShare(index);
 				} else {
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index d4fbc3543a7..8afc4954902 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -350,6 +350,27 @@
 			});
 		},
 
+		legacyFillCurrentShares: function(shares) {
+			OC.Share.currentShares = {};
+			OC.Share.itemShares = [];
+			_.each(shares,
+				/**
+				 * @param {OC.Share.Types.ShareInfo} share
+				 */
+				function(share) {
+					if (!OC.Share.currentShares[share.share_type]) {
+						OC.Share.currentShares[share.share_type] = [];
+					}
+					OC.Share.currentShares[share.share_type].push(share);
+
+					if (!OC.Share.itemShares[share.share_type]) {
+						OC.Share.itemShares[share.share_type] = [];
+					}
+					OC.Share.itemShares[share.share_type].push(share.share_with);
+				}
+			);
+		},
+
 		parse: function(data) {
 			if(data === false) {
 				console.warn('no data was returned');
@@ -372,9 +393,12 @@
 				});
 			}
 
+			var shares = _.toArray(data.shares);
+			this.legacyFillCurrentShares(shares);
+
 			return {
 				reshare: data.reshare,
-				shares: _.toArray(data.shares),
+				shares: shares,
 				permissions: permissions,
 				allowPublicUploadStatus: allowPublicUploadStatus
 			};
-- 
GitLab


From 5dc2c35ce5f3023ccea4cc599cf54d6b1c0e2c01 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 2 Sep 2015 17:27:25 +0200
Subject: [PATCH 328/783] fixed set of possible permissions for remote shares

---
 core/js/sharedialogshareelistview.js | 19 ++++++++++++-------
 core/js/shareitemmodel.js            |  6 ++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index f9d725bf51e..6a356b8144c 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -29,9 +29,9 @@
 			'        {{#if mailPublicNotificationEnabled}} {{#unless isRemoteShare}}' +
 			'        <label><input type="checkbox" name="mailNotification" class="mailNotification" {{#if wasMailSent}}checked="checked"{{/if}} />{{notifyByMailLabel}}</label>' +
 			'        {{/unless}} {{/if}}' +
-			'        {{#if isResharingAllowed}} {{#if sharePermissionPossible}}' +
+			'        {{#if isResharingAllowed}} {{#if sharePermissionPossible}} {{#unless isRemoteShare}}' +
 			'        <label><input id="canShare-{{shareWith}}" type="checkbox" name="share" class="permissions" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />{{canShareLabel}}</label>' +
-			'        {{/if}} {{/if}}' +
+			'        {{/unless}} {{/if}} {{/if}}' +
 			'        {{#if editPermissionPossible}}' +
 			'        <label><input id="canEdit-{{shareWith}}" type="checkbox" name="edit" class="permissions" {{#if hasEditPermission}}checked="checked"{{/if}} />{{canEditLabel}}</label>' +
 			'        {{/if}}' +
@@ -44,9 +44,9 @@
 			'            {{#if updatePermissionPossible}}' +
 			'            <label><input id="canUpdate-{{shareWith}}" type="checkbox" name="update" class="permissions" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>{{updatePermissionLabel}}</label>' +
 			'            {{/if}}' +
-			'            {{#if deletePermissionPossible}}' +
+			'            {{#if deletePermissionPossible}} {{#unless isRemoteShare}}' +
 			'            <label><input id="canDelete-{{shareWith}}" type="checkbox" name="delete" class="permissions" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>{{deletePermissionLabel}}</label>' +
-			'            {{/if}}' +
+			'            {{/unless}} {{/if}}' +
 			'        </div>' +
 			'        {{/unless}}' +
 			'    </li>' +
@@ -121,13 +121,18 @@
 			var shareWithDisplayName = this.model.getShareWithDisplayName(shareIndex);
 			var shareType = this.model.getShareType(shareIndex);
 
+			var hasPermissionOverride = {};
 			if (shareType === OC.Share.SHARE_TYPE_GROUP) {
 				shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
 			} else if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
 				shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'remote') + ')';
+				hasPermissionOverride = {
+					createPermissionPossible: true,
+					updatePermissionPossible: true
+				};
 			}
 
-			return {
+			return _.extend(hasPermissionOverride, {
 				hasSharePermission: this.model.hasSharePermission(shareIndex),
 				hasEditPermission: this.model.hasEditPermission(shareIndex),
 				hasCreatePermission: this.model.hasCreatePermission(shareIndex),
@@ -139,7 +144,7 @@
 				shareType: shareType,
 				modSeed: shareType !== OC.Share.SHARE_TYPE_USER,
 				isRemoteShare: shareType === OC.Share.SHARE_TYPE_REMOTE
-			};
+			});
 		},
 
 		getShareeList: function() {
@@ -180,7 +185,7 @@
 				if(this.model.isCollection(index)) {
 					this.processCollectionShare(index);
 				} else {
-					list.push(_.extend(this.getShareeObject(index), universal))
+					list.push(_.extend(universal, this.getShareeObject(index)))
 				}
 				list = _.union(_.values(this._collections), list);
 			}
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 8afc4954902..acaa890be11 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -253,6 +253,12 @@
 			if(!_.isObject(share)) {
 				throw "Unknown Share";
 			}
+			if(   share.share_type === OC.Share.SHARE_TYPE_REMOTE
+			   && (   permission === OC.PERMISSION_SHARE
+				   || permission === OC.PERMISSION_DELETE))
+			{
+				return false;
+			}
 			return (share.permissions & permission) === permission;
 		},
 
-- 
GitLab


From ce1b0c650e3a0e4cb701609ee08a13182909219a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 3 Sep 2015 15:53:17 +0200
Subject: [PATCH 329/783] show link share

---
 apps/files_sharing/js/sharetabview.js |  6 ++-
 core/css/share.css                    |  4 --
 core/js/shareconfigmodel.js           |  3 +-
 core/js/sharedialogexpirationview.js  | 10 ++++-
 core/js/sharedialoglinkshareview.js   | 32 ++++++++++-----
 core/js/shareitemmodel.js             | 57 ++++++++++++++++++++++++++-
 6 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 11f25c0c47c..6836107306a 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -45,7 +45,6 @@
 			}
 
 			if (this.model) {
-				console.log(this.model);
 				var owner = this.model.get('shareOwner');
 				if (owner === OC.currentUser) {
 					owner = null;
@@ -59,8 +58,11 @@
 				   	itemSource: this.model.get('id'),
 					possiblePermissions: this.model.get('sharePermissions')
 				};
-				var shareModel = new OC.Share.ShareItemModel(attributes, {configModel: configModel});
 				var configModel = new OC.Share.ShareConfigModel();
+				var shareModel = new OC.Share.ShareItemModel(attributes, {
+					configModel: configModel,
+					fileInfoModel: this.model
+				});
 				this._dialog = new OC.Share.ShareDialogView({
 					configModel: configModel,
 					model: shareModel
diff --git a/core/css/share.css b/core/css/share.css
index 0d687cb76da..bdf34e9a863 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -126,10 +126,6 @@ a.unshare {
 	margin-right: 0;
 }
 
-#linkText,#linkPass,#expiration {
-	display:none;
-}
-
 #link #showPassword img {
 	padding-left:5px;
 	width:12px;
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index e948c57cbac..846b2692ecb 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -16,7 +16,8 @@
 
 	var ShareConfigModel = OC.Backbone.Model.extend({
 		defaults: {
-			publicUploadEnabled: false
+			publicUploadEnabled: false,
+			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink
 		},
 
 		/**
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index 4c628f5498a..9fb404a090e 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -14,11 +14,14 @@
 	}
 
 	var TEMPLATE =
+			// well that could go to linkShareView…
+			'{{#if isLinkShare}}' +
 			'<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" />' +
 			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
 			'<label for="expirationDate" class="hidden-visually">{{expirationLabel}}</label>' +
 			'<input id="expirationDate" type="text" placeholder="{{expirationDatePlaceholder}}" class="hidden" />' +
-			'<em id="defaultExpireMessage">{{defaultExpireMessage}}</em>'
+			'<em id="defaultExpireMessage">{{defaultExpireMessage}}</em>' +
+			'{{/if}}'
 		;
 
 	/**
@@ -44,6 +47,8 @@
 		/** @type {boolean} **/
 		showLink: true,
 
+		className: 'hidden',
+
 		initialize: function(options) {
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
@@ -68,7 +73,8 @@
 				setExpirationLabel: t('core', 'Set expiration date'),
 				expirationLabel: t('core', 'Expiration'),
 				expirationDatePlaceholder: t('core', 'Expiration date'),
-				defaultExpireMessage: defaultExpireMessage
+				defaultExpireMessage: defaultExpireMessage,
+				isLinkShare: this.model.get('linkShare').isLinkShare
 			}));
 
 			return this;
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index eebf8a34247..373d6d180bc 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -16,16 +16,20 @@
 	var TEMPLATE =
 			'{{#if shareAllowed}}' +
 			'<span class="icon-loading-small hidden"></span>' +
-			'<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
+			'<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" {{#if isLinkShare}}checked="checked"{{/if}} /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
 			'<br />' +
 			'<label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
-			'<input id="linkText" type="text" readonly="readonly" />' +
-			'<input type="checkbox" name="showPassword" id="showPassword" value="1" class="hidden" /><label for="showPassword" class="hidden-visually">{{enablePasswordLabel}}</label>' +
+			'<input id="linkText" {{#unless isLinkShare}}class="hidden"{{/unless}} type="text" readonly="readonly" value="{{shareLinkURL}}" />' +
+			'   {{#if showPasswordCheckBox}}' +
+			'<input type="checkbox" name="showPassword" id="showPassword" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" /><label for="showPassword">{{enablePasswordLabel}}</label>' +
+			'   {{/if}}' +
+			'   {{#if isPasswordSet}}' +
 			'<div id="linkPass">' +
 			'    <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
-			'    <input id="linkPassText" type="password" placeholder="passwordPlaceholder" />' +
+			'    <input id="linkPassText" type="password" placeholder="{{passwordPlaceholder}}" />' +
 			'    <span class="icon-loading-small hidden"></span>' +
 			'</div>' +
+			'   {{/if}}' +
 			'    {{#if publicUpload}}' +
 			'<div id="allowPublicUploadWrapper" class="hidden">' +
 			'    <span class="icon-loading-small hidden"></span>' +
@@ -35,8 +39,8 @@
 			'    {{/if}}' +
 			'    {{#if mailPublicNotificationEnabled}}' +
 			'<form id="emailPrivateLink">' +
-			'    <input id="email" class="hidden" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
-			'    <input id="emailButton" class="hidden" type="submit" value="{{mailButtonText}}" />' +
+			'    <input id="email" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
+			'    <input id="emailButton" type="submit" value="{{mailButtonText}}" />' +
 			'</form>' +
 			'    {{/if}}' +
 			'{{else}}' +
@@ -113,17 +117,27 @@
 				publicUploadChecked = 'checked="checked"';
 			}
 
+			var isLinkShare = this.model.get('linkShare').isLinkShare;
+			var isPasswordSet = !!this.model.get('linkShare').password;
+			var showPasswordCheckBox = isLinkShare
+				&& (   !this.configModel.get('enforcePasswordForPublicLink')
+					|| !this.model.get('linkShare').password);
+
 			this.$el.html(linkShareTemplate({
 				shareAllowed: true,
+				isLinkShare: isLinkShare,
+				shareLinkURL: this.model.get('linkShare').link,
 				linkShareLabel: t('core', 'Share link'),
 				urlLabel: t('core', 'Link'),
 				enablePasswordLabel: t('core', 'Password protect'),
 				passwordLabel: t('core', 'Password'),
-				passwordPlaceholder: t('core', 'Choose a password for the public link'),
-				publicUpload: publicUpload,
+				passwordPlaceholder: isPasswordSet ? '**********' : t('core', 'Choose a password for the public link'),
+				isPasswordSet: isPasswordSet,
+				showPasswordCheckBox: showPasswordCheckBox,
+				publicUpload: publicUpload && isLinkShare,
 				publicUploadChecked: publicUploadChecked,
 				publicUploadLabel: t('core', 'Allow editing'),
-				mailPublicNotificationEnabled: this.configModel.isMailPublicNotificationEnabled(),
+				mailPublicNotificationEnabled: isLinkShare && this.configModel.isMailPublicNotificationEnabled(),
 				mailPrivatePlaceholder: t('core', 'Email link to person'),
 				mailButtonText: t('core', 'Send')
 			}));
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index acaa890be11..e8371e16e0a 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -14,6 +14,14 @@
 		OC.Share.Types = {};
 	}
 
+	/**
+	 * @typedef {object} OC.Share.Types.LinkShareInfo
+	 * @property {bool} isLinkShare
+	 * @property {string} token
+	 * @property {string|null} password
+	 * @property {string} link
+	 */
+
 	/**
 	 * @typedef {object} OC.Share.Types.Collection
 	 * @property {string} item_type
@@ -49,6 +57,7 @@
 	 * @typedef {object} OC.Share.Types.ShareItemInfo
 	 * @property {OC.Share.Types.Reshare} reshare
 	 * @property {OC.Share.Types.ShareInfo[]} shares
+	 * @property {OC.Share.Types.LinkShareInfo|undefined} linkShare
 	 */
 
 	/**
@@ -64,11 +73,16 @@
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			}
+			if(!_.isUndefined(options.fileInfoModel)) {
+				/** @type {OC.Files.FileInfo} **/
+				this.fileInfoModel = options.fileInfoModel;
+			}
 		},
 
 		defaults: {
 			allowPublicUploadStatus: false,
-			permissions: 0
+			permissions: 0,
+			linkShare: {}
 		},
 
 		/**
@@ -186,7 +200,6 @@
 		 * @returns {string}
 		 */
 		getReshareOwnerDisplayname: function() {
-			return 'foo';
 			return this.get('reshare').displayname_owner;
 		},
 
@@ -399,12 +412,52 @@
 				});
 			}
 
+			/** @type {OC.Share.Types.ShareInfo[]} **/
 			var shares = _.toArray(data.shares);
 			this.legacyFillCurrentShares(shares);
 
+			var linkShare = { isLinkShare: false };
+			// filter out the share by link
+			shares = _.reject(shares,
+				/**
+				 * @param {OC.Share.Types.ShareInfo} share
+				 */
+				function(share) {
+					var isShareLink =
+						share.share_type === OC.Share.SHARE_TYPE_LINK
+						&& (   share.file_source === this.get('itemSource')
+						|| share.item_source === this.get('itemSource'));
+
+					if (isShareLink) {
+						var link = window.location.protocol + '//' + window.location.host;
+						if (!share.token) {
+							// pre-token link
+							var fullPath = this.fileInfoModel.get('path') + '/' +
+								this.fileInfoModel.get('name');
+							var location = '/' + OC.currentUser + '/files' + fullPath;
+							var type = this.fileInfoModel.isDirectory() ? 'folder' : 'file';
+							link += OC.linkTo('', 'public.php') + '?service=files&' +
+								type + '=' + encodeURIComponent(location);
+						} else {
+							link += OC.generateUrl('/s/') + share.token;
+						}
+						linkShare = {
+							isLinkShare: true,
+							token: share.token,
+							password: share.share_with,
+							link: link
+						};
+
+						return share;
+					}
+				},
+				this
+			);
+
 			return {
 				reshare: data.reshare,
 				shares: shares,
+				linkShare: linkShare,
 				permissions: permissions,
 				allowPublicUploadStatus: allowPublicUploadStatus
 			};
-- 
GitLab


From 858a2a4e6c42f8cc68212439930c16029a6bba36 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 4 Sep 2015 15:31:45 +0200
Subject: [PATCH 330/783] display expiration info

---
 core/js/shareconfigmodel.js          | 18 ++-------
 core/js/sharedialogexpirationview.js | 57 ++++++++++++++++++++++++----
 core/js/sharedialogview.js           |  1 +
 core/js/shareitemmodel.js            |  7 +++-
 4 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 846b2692ecb..472fdcc75d7 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -17,7 +17,9 @@
 	var ShareConfigModel = OC.Backbone.Model.extend({
 		defaults: {
 			publicUploadEnabled: false,
-			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink
+			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink,
+			isDefaultExpireDateEnforced: oc_appconfig.core.defaultExpireDateEnforced === true,
+			defaultExpireDate: oc_appconfig.core.defaultExpireDate,
 		},
 
 		/**
@@ -42,13 +44,6 @@
 			return $('input:hidden[name=mailPublicNotificationEnabled]').val() === 'yes';
 		},
 
-		/**
-		 * @returns {boolean}
-		 */
-		isDefaultExpireDateEnforced: function() {
-			return oc_appconfig.core.defaultExpireDateEnforced === true;
-		},
-
 		/**
 		 * @returns {boolean}
 		 */
@@ -75,13 +70,6 @@
 		 */
 		getFederatedShareDocLink: function() {
 			return oc_appconfig.core.federatedCloudShareDoc;
-		},
-
-		/**
-		 * @returns {number}
-		 */
-		getDefaultExpireDate: function () {
-			return oc_appconfig.core.defaultExpireDate;
 		}
 	});
 
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index 9fb404a090e..56473cdb1fa 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -14,13 +14,22 @@
 	}
 
 	var TEMPLATE =
-			// well that could go to linkShareView…
+			// currently expiration is only effective for link share.
+			// this is about to change in future. Therefore this is not included
+			// in the LinkShareView to ease reusing it in future. Then,
+			// modifications (getting rid of IDs) are still necessary.
 			'{{#if isLinkShare}}' +
-			'<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" />' +
+			'<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" ' +
+				'{{#if isExpirationSet}}checked="checked"{{/if}} {{#if disableCheckbox}}disabled="disabled"{{/if}} />' +
 			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
-			'<label for="expirationDate" class="hidden-visually">{{expirationLabel}}</label>' +
-			'<input id="expirationDate" type="text" placeholder="{{expirationDatePlaceholder}}" class="hidden" />' +
+			'    {{#if isExpirationSet}}' +
+			'<label for="expirationDate" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' +
+			'<input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" />' +
+			'    {{/if}}' +
+			'    {{#if isExpirationEnforced}}' +
+				// originally the expire message was shown when a default date was set, however it never had text
 			'<em id="defaultExpireMessage">{{defaultExpireMessage}}</em>' +
+			'    {{/if}}' +
 			'{{/if}}'
 		;
 
@@ -59,24 +68,58 @@
 
 		render: function() {
 			var defaultExpireMessage = '';
+			var defaultExpireDays = this.configModel.get('defaultExpireDate');
 			if(    (this.model.isFolder() || this.model.isFile())
-				&& this.configModel.isDefaultExpireDateEnforced()) {
+				&& this.configModel.get('isDefaultExpireDateEnforced')) {
 				defaultExpireMessage = t(
 					'core',
 					'The public link will expire no later than {days} days after it is created',
-					{'days': this.configModel.getDefaultExpireDate()}
+					{'days': defaultExpireDays }
 				);
 			}
 
+			var isExpirationSet = !!this.model.get('linkShare').expiration;
+			var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
+
 			var expirationTemplate = this.template();
 			this.$el.html(expirationTemplate({
 				setExpirationLabel: t('core', 'Set expiration date'),
 				expirationLabel: t('core', 'Expiration'),
 				expirationDatePlaceholder: t('core', 'Expiration date'),
 				defaultExpireMessage: defaultExpireMessage,
-				isLinkShare: this.model.get('linkShare').isLinkShare
+				isLinkShare: this.model.get('linkShare').isLinkShare,
+				isExpirationSet: isExpirationSet,
+				isExpirationEnforced: isExpirationEnforced,
+				disableCheckbox: isExpirationEnforced && isExpirationSet,
+				expirationValue: this.model.get('linkShare').expiration
 			}));
 
+			if(isExpirationSet) {
+				// what if there is another date picker on that page?
+				var minDate = new Date();
+				// min date should always be the next day
+				minDate.setDate(minDate.getDate()+1);
+
+				var maxDate = null;
+				if(isExpirationEnforced) {
+					// TODO: hack: backend returns string instead of integer
+					var shareTime = this.model.get('linkShare').stime;
+					if (_.isNumber(shareTime)) {
+						shareTime = new Date(shareTime * 1000);
+					}
+					if (!shareTime) {
+						shareTime = new Date(); // now
+					}
+					shareTime = OC.Util.stripTime(shareTime).getTime();
+					maxDate = new Date(shareTime + defaultExpireDays * 24 * 3600 * 1000);
+				}
+
+				$.datepicker.setDefaults({
+					minDate: minDate,
+					maxDate: maxDate
+				});
+			}
+
 			return this;
 		},
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 9bfe38eea3c..12e682a3b82 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -134,6 +134,7 @@
 					$this.imageplaceholder($this.data('seed'));
 				});
 			}
+			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
 
 			return this;
 		},
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index e8371e16e0a..24aa5fe344d 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -20,6 +20,8 @@
 	 * @property {string} token
 	 * @property {string|null} password
 	 * @property {string} link
+	 * @property {Date} expiration
+	 * @property {number} stime share time
 	 */
 
 	/**
@@ -445,7 +447,10 @@
 							isLinkShare: true,
 							token: share.token,
 							password: share.share_with,
-							link: link
+							link: link,
+							// currently expiration is only effective for link shares.
+							expiration: share.expiration,
+							stime: share.stime
 						};
 
 						return share;
-- 
GitLab


From 258a2e2696c0c2a1e784fe27cbd8ca9a4dc8b8ca Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 5 Sep 2015 02:02:55 +0200
Subject: [PATCH 331/783] now you even can share

---
 apps/files_sharing/appinfo/app.php      |  1 +
 apps/files_sharing/css/sharetabview.css |  1 -
 core/js/shareconfigmodel.js             |  8 +----
 core/js/sharedialogshareelistview.js    |  8 +++--
 core/js/sharedialogview.js              | 46 +++++++++++++++++++++++++
 core/js/shareitemmodel.js               | 41 ++++++++++++++++++++++
 6 files changed, 94 insertions(+), 11 deletions(-)

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 2bb872eaad6..8d919d1466f 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -61,6 +61,7 @@ $eventDispatcher->addListener(
 		\OCP\Util::addScript('files_sharing', 'share');
 		\OCP\Util::addScript('files_sharing', 'sharetabview');
 		\OCP\Util::addScript('files_sharing', 'external');
+		\OCP\Util::addStyle('files_sharing', 'sharetabview');
 	}
 );
 
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 8b9af852531..96a75717c53 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -5,7 +5,6 @@
 .shareTabView .oneline { white-space: nowrap; }
 
 .shareTabView .shareWithLoading {
-	display: inline-block !important;
 	padding-left: 10px;
 	position: relative;
 	right: 30px;
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 472fdcc75d7..98280e01eb6 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -20,6 +20,7 @@
 			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink,
 			isDefaultExpireDateEnforced: oc_appconfig.core.defaultExpireDateEnforced === true,
 			defaultExpireDate: oc_appconfig.core.defaultExpireDate,
+			isResharingAllowed: oc_appconfig.core.resharingAllowed
 		},
 
 		/**
@@ -51,13 +52,6 @@
 			return oc_appconfig.core.remoteShareAllowed;
 		},
 
-		/**
-		 * @returns {boolean}
-		 */
-		isResharingAllowed: function() {
-			return oc_appconfig.core.resharingAllowed
-		},
-
 		/**
 		 * @returns {boolean}
 		 */
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 6a356b8144c..4ac669ee2b9 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -161,7 +161,7 @@
 				deletePermissionLabel: t('core', 'delete'),
 				crudsLabel: t('core', 'access control'),
 				triangleSImage: OC.imagePath('core', 'actions/triangle-s'),
-				isResharingAllowed: this.configModel.isResharingAllowed(),
+				isResharingAllowed: this.configModel.get('isResharingAllowed'),
 				sharePermissionPossible: this.model.sharePermissionPossible(),
 				editPermissionPossible: this.model.editPermissionPossible(),
 				createPermissionPossible: this.model.createPermissionPossible(),
@@ -185,10 +185,12 @@
 				if(this.model.isCollection(index)) {
 					this.processCollectionShare(index);
 				} else {
-					list.push(_.extend(universal, this.getShareeObject(index)))
+					// first empty {} is necessary, otherwise we get in trouble
+					// with references
+					list.push(_.extend({}, universal, this.getShareeObject(index)));
 				}
-				list = _.union(_.values(this._collections), list);
 			}
+			list = _.union(_.values(this._collections), list);
 
 			return list;
 		},
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 12e682a3b82..e3da0384fa4 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -100,6 +100,36 @@
 					? new OC.Share[className](subViewOptions)
 					: options[name];
 			}
+
+			_.bindAll(this, 'autocompleteHandler');
+		},
+
+		autocompleteHandler: function (search, response) {
+			var view = this;
+			var $loading = this.$el.find('.shareWithLoading');
+			$loading.removeClass('hidden');
+			$loading.addClass('inlineblock');
+			$.get(OC.filePath('core', 'ajax', 'share.php'), {
+				fetch: 'getShareWith',
+				search: search.term.trim(),
+				limit: 200,
+				itemShares: OC.Share.itemShares,
+				itemType: view.model.get('itemType')
+			}, function (result) {
+				$loading.addClass('hidden');
+				$loading.removeClass('inlineblock');
+				if (result.status == 'success' && result.data.length > 0) {
+					$("#shareWith").autocomplete("option", "autoFocus", true);
+					response(result.data);
+				} else {
+					response();
+				}
+			}).fail(function () {
+				$loading.addClass('hidden');
+				$loading.removeClass('inlineblock');
+				OC.Notification.show(t('core', 'An error occured. Please try again'));
+				window.setTimeout(OC.Notification.hide, 5000);
+			});
 		},
 
 		render: function() {
@@ -111,6 +141,22 @@
 				remoteShareInfo: this._renderRemoteShareInfoPart(),
 			}));
 
+			var view = this;
+			this.$el.find('#shareWith').autocomplete({
+				minLength: 2,
+				delay: 750,
+				source: this.autocompleteHandler,
+				select: function(e, s) {
+					var expiration = '';
+					if($('#expirationCheckbox').is(':checked') === true) {
+						expiration = view.$el.find('#expirationDate').val()
+					}
+					view.model.addShare(e, s, {
+						expiration: expiration
+					});
+				}
+			});
+
 			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
 			this.resharerInfoView.render();
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 24aa5fe344d..81e905b082e 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -79,6 +79,8 @@
 				/** @type {OC.Files.FileInfo} **/
 				this.fileInfoModel = options.fileInfoModel;
 			}
+
+			_.bindAll(this, 'addShare');
 		},
 
 		defaults: {
@@ -87,6 +89,45 @@
 			linkShare: {}
 		},
 
+		addShare: function(event, selected, options) {
+			event.preventDefault();
+
+			//console.warn(selected);
+			//return false;
+
+			var shareType = selected.item.value.shareType;
+			var shareWith = selected.item.value.shareWith;
+			var fileName = this.fileInfoModel.get('name');
+			options = options || {};
+
+			// Default permissions are Edit (CRUD) and Share
+			// Check if these permissions are possible
+			var permissions = OC.PERMISSION_READ;
+			if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
+				permissions = OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_READ;
+			} else {
+				if (this.updatePermissionPossible()) {
+					permissions = permissions | OC.PERMISSION_UPDATE;
+				}
+				if (this.createPermissionPossible()) {
+					permissions = permissions | OC.PERMISSION_CREATE;
+				}
+				if (this.deletePermissionPossible()) {
+					permissions = permissions | OC.PERMISSION_DELETE;
+				}
+				if (this.configModel.get('isResharingAllowed') && (this.sharePermissionPossible())) {
+					permissions = permissions | OC.PERMISSION_SHARE;
+				}
+			}
+
+			var model = this;
+			OC.Share.share(this.get('itemType'), this.get('itemSource'), shareType, shareWith, permissions, fileName, options.expiration, function() {
+				model.fetch()
+				//FIXME: updateIcon belongs to view
+				OC.Share.updateIcon(itemType, itemSource);
+			});
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-- 
GitLab


From 5fad379bf1ba0bc6502055ba92869663b36c9a84 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 12 Sep 2015 12:01:36 +0200
Subject: [PATCH 332/783] remove obsolete file action

---
 apps/files_sharing/js/share.js | 55 ----------------------------------
 1 file changed, 55 deletions(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index a4ae7fad899..c3d567fec86 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -32,7 +32,6 @@
 			if (fileList.id === 'trashbin' || fileList.id === 'files.public') {
 				return;
 			}
-			var fileActions = fileList.fileActions;
 			var oldCreateRow = fileList._createRow;
 			fileList._createRow = function(fileData) {
 				var tr = oldCreateRow.apply(this, arguments);
@@ -97,60 +96,6 @@
 				}
 			});
 
-			fileActions.registerAction({
-				name: 'Share',
-				displayName: '',
-				mime: 'all',
-				permissions: OC.PERMISSION_SHARE,
-				icon: OC.imagePath('core', 'actions/share'),
-				type: OCA.Files.FileActions.TYPE_INLINE,
-				actionHandler: function(filename, context) {
-					var $tr = context.$file;
-					var itemType = 'file';
-					if ($tr.data('type') === 'dir') {
-						itemType = 'folder';
-					}
-					var possiblePermissions = $tr.data('share-permissions');
-					if (_.isUndefined(possiblePermissions)) {
-						possiblePermissions = $tr.data('permissions');
-					}
-
-					var appendTo = $tr.find('td.filename');
-					// Check if drop down is already visible for a different file
-					if (OC.Share.droppedDown) {
-						if ($tr.attr('data-id') !== $('#dropdown').attr('data-item-source')) {
-							OC.Share.hideDropDown(function () {
-								$tr.addClass('mouseOver');
-								OC.Share.showDropDown(itemType, $tr.data('id'), appendTo, true, possiblePermissions, filename);
-							});
-						} else {
-							OC.Share.hideDropDown();
-						}
-					} else {
-						$tr.addClass('mouseOver');
-						OC.Share.showDropDown(itemType, $tr.data('id'), appendTo, true, possiblePermissions, filename);
-					}
-					$('#dropdown').on('sharesChanged', function(ev) {
-						// files app current cannot show recipients on load, so we don't update the
-						// icon when changed for consistency
-						if (context.fileList.$el.closest('#app-content-files').length) {
-							return;
-						}
-						var recipients = _.pluck(ev.shares[OC.Share.SHARE_TYPE_USER], 'share_with_displayname');
-						var groupRecipients = _.pluck(ev.shares[OC.Share.SHARE_TYPE_GROUP], 'share_with_displayname');
-						recipients = recipients.concat(groupRecipients);
-						// note: we only update the data attribute because updateIcon()
-						// is called automatically after this event
-						if (recipients.length) {
-							$tr.attr('data-share-recipients', OCA.Sharing.Util.formatRecipients(recipients));
-						}
-						else {
-							$tr.removeAttr('data-share-recipients');
-						}
-					});
-				}
-			});
-
 			fileList.registerTabView(new OCA.Sharing.ShareTabView('shareTabView'));
 		},
 
-- 
GitLab


From 4c702aa8fdfb28bea4b021e55e7df5eeeb6999d2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 12 Sep 2015 12:17:15 +0200
Subject: [PATCH 333/783] format groups and remotes in autocomplete list

---
 core/js/sharedialogview.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index e3da0384fa4..6588da7d429 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -132,6 +132,24 @@
 			});
 		},
 
+		autocompleteRenderItem: function(ul, item) {
+			var insert = $("<a>");
+			var text = item.label;
+			if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
+				text = text +  ' ('+t('core', 'group')+')';
+			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
+				text = text +  ' ('+t('core', 'remote')+')';
+			}
+			insert.text(text);
+			if(item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
+				insert = insert.wrapInner('<strong></strong>');
+			}
+			return $("<li>")
+				.addClass((item.value.shareType === OC.Share.SHARE_TYPE_GROUP) ? 'group' : 'user')
+				.append(insert)
+				.appendTo(ul);
+		},
+
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
@@ -155,7 +173,7 @@
 						expiration: expiration
 					});
 				}
-			});
+			}).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem;
 
 			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
 			this.resharerInfoView.render();
-- 
GitLab


From f29b51682bc0be785e1a3e4e5901db3255e4a377 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 12 Sep 2015 14:21:14 +0200
Subject: [PATCH 334/783] share and unshare via link (not yet password). also
 some internal changes to reduce unnecessary rendering

---
 core/js/share.js                       | 74 --------------------------
 core/js/shareconfigmodel.js            | 23 +++++---
 core/js/sharedialogexpirationview.js   | 22 ++++++--
 core/js/sharedialoglinkshareview.js    | 37 +++++++++++--
 core/js/sharedialogresharerinfoview.js |  7 +++
 core/js/sharedialogshareelistview.js   | 11 ++++
 core/js/sharedialogview.js             | 22 +++-----
 core/js/shareitemmodel.js              | 33 ++++++++++--
 8 files changed, 121 insertions(+), 108 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index bd87ab10d40..6581c401281 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -956,80 +956,6 @@ $(document).ready(function() {
 			permissions);
 	});
 
-	$(document).on('change', '#dropdown #linkCheckbox', function() {
-		var $dropDown = $('#dropdown');
-		var itemType = $dropDown.data('item-type');
-		var itemSource = $dropDown.data('item-source');
-		var itemSourceName = $dropDown.data('item-source-name');
-		var $loading = $dropDown.find('#link .icon-loading-small');
-		var $button = $(this);
-
-		if (!$loading.hasClass('hidden')) {
-			// already in progress
-			return false;
-		}
-
-		if (this.checked) {
-			// Reset password placeholder
-			$('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link'));
-			// Reset link
-			$('#linkText').val('');
-			$('#showPassword').prop('checked', false);
-			$('#linkPass').hide();
-			$('#sharingDialogAllowPublicUpload').prop('checked', false);
-			$('#expirationCheckbox').prop('checked', false);
-			$('#expirationDate').hide();
-			var expireDateString = '';
-			// Create a link
-			if (oc_appconfig.core.enforcePasswordForPublicLink === false) {
-				expireDateString = OC.Share.getDefaultExpirationDate();
-				$loading.removeClass('hidden');
-				$button.addClass('hidden');
-				$button.prop('disabled', true);
-
-				OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, expireDateString, function(data) {
-					$loading.addClass('hidden');
-					$button.removeClass('hidden');
-					$button.prop('disabled', false);
-					OC.Share.showLink(data.token, null, itemSource);
-					$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-					OC.Share.updateIcon(itemType, itemSource);
-				});
-			} else {
-				$('#linkPass').slideToggle(OC.menuSpeed);
-				// TODO drop with IE8 drop
-				if($('html').hasClass('ie8')) {
-					$('#linkPassText').attr('placeholder', null);
-					$('#linkPassText').val('');
-				}
-				$('#linkPassText').focus();
-			}
-			if (expireDateString !== '') {
-				OC.Share.showExpirationDate(expireDateString);
-			}
-		} else {
-			// Delete private link
-			OC.Share.hideLink();
-			$('#expiration').slideUp(OC.menuSpeed);
-			if ($('#linkText').val() !== '') {
-				$loading.removeClass('hidden');
-				$button.addClass('hidden');
-				$button.prop('disabled', true);
-				OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
-					$loading.addClass('hidden');
-					$button.removeClass('hidden');
-					$button.prop('disabled', false);
-					OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
-					$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-					OC.Share.updateIcon(itemType, itemSource);
-					if (typeof OC.Share.statuses[itemSource] === 'undefined') {
-						$('#expiration').slideUp(OC.menuSpeed);
-					}
-				});
-			}
-		}
-	});
-
 	$(document).on('click', '#dropdown #linkText', function() {
 		$(this).focus();
 		$(this).select();
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 98280e01eb6..c6891154c98 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -19,6 +19,8 @@
 			publicUploadEnabled: false,
 			enforcePasswordForPublicLink: oc_appconfig.core.enforcePasswordForPublicLink,
 			isDefaultExpireDateEnforced: oc_appconfig.core.defaultExpireDateEnforced === true,
+			isDefaultExpireDateEnabled: oc_appconfig.core.defaultExpireDateEnabled === true,
+			isRemoteShareAllowed: oc_appconfig.core.remoteShareAllowed,
 			defaultExpireDate: oc_appconfig.core.defaultExpireDate,
 			isResharingAllowed: oc_appconfig.core.resharingAllowed
 		},
@@ -45,13 +47,6 @@
 			return $('input:hidden[name=mailPublicNotificationEnabled]').val() === 'yes';
 		},
 
-		/**
-		 * @returns {boolean}
-		 */
-		isRemoteShareAllowed: function() {
-			return oc_appconfig.core.remoteShareAllowed;
-		},
-
 		/**
 		 * @returns {boolean}
 		 */
@@ -64,6 +59,20 @@
 		 */
 		getFederatedShareDocLink: function() {
 			return oc_appconfig.core.federatedCloudShareDoc;
+		},
+
+		getDefaultExpirationDateString: function () {
+			var expireDateString = '';
+			if (this.get('isDefaultExpireDateEnabled')) {
+				var date = new Date().getTime();
+				var expireAfterMs = this.get('defaultExpireDate') * 24 * 60 * 60 * 1000;
+				var expireDate = new Date(date + expireAfterMs);
+				var month = expireDate.getMonth() + 1;
+				var year = expireDate.getFullYear();
+				var day = expireDate.getDate();
+				expireDateString = year + "-" + month + '-' + day + ' 00:00:00';
+			}
+			return expireDateString;
 		}
 	});
 
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index 56473cdb1fa..f244fe56548 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -24,7 +24,7 @@
 			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
 			'    {{#if isExpirationSet}}' +
 			'<label for="expirationDate" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' +
-			'<input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" />' +
+			'<input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{expirationValue}}" />' +
 			'    {{/if}}' +
 			'    {{#if isExpirationEnforced}}' +
 				// originally the expire message was shown when a default date was set, however it never had text
@@ -64,13 +64,28 @@
 			} else {
 				throw 'missing OC.Share.ShareConfigModel';
 			}
+
+			var view = this;
+			this.configModel.on('change:isDefaultExpireDateEnforced', function() {
+				view.render();
+			});
+
+			this.model.on('change:itemType', function() {
+				view.render();
+			});
+
+			this.model.on('change:linkShare', function() {
+				view.render();
+			});
 		},
 
 		render: function() {
 			var defaultExpireMessage = '';
 			var defaultExpireDays = this.configModel.get('defaultExpireDate');
+			var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
+
 			if(    (this.model.isFolder() || this.model.isFile())
-				&& this.configModel.get('isDefaultExpireDateEnforced')) {
+				&& isExpirationEnforced) {
 				defaultExpireMessage = t(
 					'core',
 					'The public link will expire no later than {days} days after it is created',
@@ -79,7 +94,6 @@
 			}
 
 			var isExpirationSet = !!this.model.get('linkShare').expiration;
-			var isExpirationEnforced = this.configModel.get('isDefaultExpireDateEnforced');
 
 			var expirationTemplate = this.template();
 			this.$el.html(expirationTemplate({
@@ -120,6 +134,8 @@
 				});
 			}
 
+			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
+
 			return this;
 		},
 
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 373d6d180bc..b94f1c3e70b 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -23,13 +23,11 @@
 			'   {{#if showPasswordCheckBox}}' +
 			'<input type="checkbox" name="showPassword" id="showPassword" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" /><label for="showPassword">{{enablePasswordLabel}}</label>' +
 			'   {{/if}}' +
-			'   {{#if isPasswordSet}}' +
-			'<div id="linkPass">' +
+			'<div id="linkPass" {{#unless isPasswordSet}}class="hidden"{{/unless}}>' +
 			'    <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
 			'    <input id="linkPassText" type="password" placeholder="{{passwordPlaceholder}}" />' +
 			'    <span class="icon-loading-small hidden"></span>' +
 			'</div>' +
-			'   {{/if}}' +
 			'    {{#if publicUpload}}' +
 			'<div id="allowPublicUploadWrapper" class="hidden">' +
 			'    <span class="icon-loading-small hidden"></span>' +
@@ -86,11 +84,42 @@
 				view.render();
 			});
 
+			this.model.on('change:linkShare', function() {
+				view.render();
+			});
+
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
 			} else {
 				throw 'missing OC.Share.ShareConfigModel';
 			}
+
+			_.bindAll(this, 'onLinkCheckBoxChange');
+		},
+
+		onLinkCheckBoxChange: function() {
+			var $checkBox = this.$el.find('#linkCheckbox');
+			var $loading = $checkBox.siblings('.icon-loading-small');
+			if(!$loading.hasClass('hidden')) {
+				return false;
+			}
+
+			if($checkBox.is(':checked')) {
+				if(this.configModel.get('enforcePasswordForPublicLink') === false) {
+					$loading.removeClass('hidden');
+					this.model.addLinkShare();
+				} else {
+					this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
+					// TODO drop with IE8 drop
+					if($('html').hasClass('ie8')) {
+						this.$el.find('#linkPassText').attr('placeholder', null);
+						this.$el.find('#linkPassText').val('');
+					}
+					this.$el.find('#linkPassText').focus();
+				}
+			} else {
+				this.model.removeLinkShare();
+			}
 		},
 
 		render: function() {
@@ -142,6 +171,8 @@
 				mailButtonText: t('core', 'Send')
 			}));
 
+			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
+
 			return this;
 		},
 
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index f7de90e264f..f6b927c08c5 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -96,6 +96,13 @@
 				sharedByText: sharedByText
 			}));
 
+			if(this.configModel.areAvatarsEnabled()) {
+				this.$el.find('.avatar').each(function() {
+					var $this = $(this);
+					$this.avatar($this.data('username'), 32);
+				});
+			}
+
 			return this;
 		},
 
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 4ac669ee2b9..895f14508d5 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -201,6 +201,17 @@
 				sharees: this.getShareeList()
 			}));
 
+			if(this.configModel.areAvatarsEnabled()) {
+				this.$el.find('.avatar').each(function() {
+					var $this = $(this);
+					$this.avatar($this.data('username'), 32);
+				});
+				this.$el.find('.avatar.imageplaceholderseed').each(function() {
+					var $this = $(this);
+					$this.imageplaceholder($this.data('seed'));
+				});
+			}
+
 			return this;
 		},
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 6588da7d429..7a7fe692c13 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -68,9 +68,6 @@
 
 		initialize: function(options) {
 			var view = this;
-			this.model.on('change', function() {
-				view.render();
-			});
 
 			this.model.on('fetchError', function() {
 				OC.Notification.showTemporary(t('core', 'Share details could not be loaded for this item.'));
@@ -82,6 +79,10 @@
 				throw 'missing OC.Share.ShareConfigModel';
 			}
 
+			this.configModel.on('change:isRemoteShareAllowed', function() {
+				view.render();
+			});
+
 			var subViewOptions = {
 				model: this.model,
 				configModel: this.configModel
@@ -188,17 +189,6 @@
 			this.shareeListView.render();
 
 			this.$el.find('.hasTooltip').tooltip();
-			if(this.configModel.areAvatarsEnabled()) {
-				this.$el.find('.avatar').each(function() {
-					var $this = $(this);
-					$this.avatar($this.data('username'), 32);
-				});
-				this.$el.find('.avatar.imageplaceholderseed').each(function() {
-					var $this = $(this);
-					$this.imageplaceholder($this.data('seed'));
-				});
-			}
-			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
 
 			return this;
 		},
@@ -216,7 +206,7 @@
 
 		_renderRemoteShareInfoPart: function() {
 			var remoteShareInfo = '';
-			if(this.configModel.isRemoteShareAllowed()) {
+			if(this.configModel.get('isRemoteShareAllowed')) {
 				var infoTemplate = this._getRemoteShareInfoTemplate();
 				remoteShareInfo = infoTemplate({
 					docLink: this.configModel.getFederatedShareDocLink(),
@@ -229,7 +219,7 @@
 
 		_renderSharePlaceholderPart: function () {
 			var sharePlaceholder = t('core', 'Share with users or groups …');
-			if (this.configModel.isRemoteShareAllowed()) {
+			if (this.configModel.get('isRemoteShareAllowed')) {
 				sharePlaceholder = t('core', 'Share with users, groups or remote users …');
 			}
 			return sharePlaceholder;
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 81e905b082e..9e153dcb3e5 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -89,12 +89,33 @@
 			linkShare: {}
 		},
 
+		addLinkShare: function() {
+			var model = this;
+			var expiration = this.configModel.getDefaultExpirationDateString();
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, this.fileInfoModel.get('name'), expiration, function(data) {
+				model.fetch();
+				//FIXME: updateIcon belongs to view
+				OC.Share.updateIcon(itemType, itemSource);
+			});
+		},
+
+		removeLinkShare: function() {
+			var model = this;
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+
+			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
+				model.fetch();
+				//FIXME: updateIcon belongs to view
+				OC.Share.updateIcon(itemType, itemSource);
+			});
+		},
+
 		addShare: function(event, selected, options) {
 			event.preventDefault();
 
-			//console.warn(selected);
-			//return false;
-
 			var shareType = selected.item.value.shareType;
 			var shareWith = selected.item.value.shareWith;
 			var fileName = this.fileInfoModel.get('name');
@@ -121,8 +142,10 @@
 			}
 
 			var model = this;
-			OC.Share.share(this.get('itemType'), this.get('itemSource'), shareType, shareWith, permissions, fileName, options.expiration, function() {
-				model.fetch()
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+			OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, fileName, options.expiration, function() {
+				model.fetch();
 				//FIXME: updateIcon belongs to view
 				OC.Share.updateIcon(itemType, itemSource);
 			});
-- 
GitLab


From 5dfaa0c82d93a075d063cc24ea4345a5943b0b1f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 12 Sep 2015 15:53:05 +0200
Subject: [PATCH 335/783] mark url on click

---
 core/js/share.js                    | 5 -----
 core/js/sharedialoglinkshareview.js | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 6581c401281..4b1e773c1ac 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -956,11 +956,6 @@ $(document).ready(function() {
 			permissions);
 	});
 
-	$(document).on('click', '#dropdown #linkText', function() {
-		$(this).focus();
-		$(this).select();
-	});
-
 	// Handle the Allow Public Upload Checkbox
 	$(document).on('click', '#sharingDialogAllowPublicUpload', function() {
 
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index b94f1c3e70b..3e3ef2d5029 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -122,6 +122,11 @@
 			}
 		},
 
+		onLinkTextClick: function() {
+			this.focus();
+			this.select();
+		},
+
 		render: function() {
 			var linkShareTemplate = this.template();
 
@@ -172,6 +177,7 @@
 			}));
 
 			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
+			this.$el.find('#linkText').click(this.onLinkTextClick);
 
 			return this;
 		},
-- 
GitLab


From 9fe6d7c568221a77686de80634870e4a40e6ac29 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 12 Sep 2015 17:02:03 +0200
Subject: [PATCH 336/783] implements setting and removing password for link
 shares, including forced ones

---
 apps/files_sharing/css/sharetabview.css |  4 ++
 core/js/share.js                        | 70 -------------------------
 core/js/sharedialoglinkshareview.js     | 32 ++++++++++-
 core/js/sharedialogview.js              |  2 +-
 core/js/shareitemmodel.js               | 24 ++++++++-
 5 files changed, 58 insertions(+), 74 deletions(-)

diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 96a75717c53..0cc812e917c 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -69,3 +69,7 @@
 #shareWithList li label{
 	margin-right: 8px;
 }
+
+.shareTabView .icon-loading-small {
+	margin-left: -30px;
+}
diff --git a/core/js/share.js b/core/js/share.js
index 4b1e773c1ac..f97a91bd3ab 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -996,76 +996,6 @@ $(document).ready(function() {
 		});
 	});
 
-	$(document).on('click', '#dropdown #showPassword', function() {
-		$('#linkPass').slideToggle(OC.menuSpeed);
-		if (!$('#showPassword').is(':checked') ) {
-			var itemType = $('#dropdown').data('item-type');
-			var itemSource = $('#dropdown').data('item-source');
-			var itemSourceName = $('#dropdown').data('item-source-name');
-			var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
-			var permissions = 0;
-			var $loading = $('#showPassword .icon-loading-small');
-
-			// Calculate permissions
-			if (allowPublicUpload) {
-				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
-			} else {
-				permissions = OC.PERMISSION_READ;
-			}
-
-			$loading.removeClass('hidden');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName).then(function() {
-				$loading.addClass('hidden');
-				$('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link'));
-			});
-		} else {
-			$('#linkPassText').focus();
-		}
-	});
-
-	$(document).on('focusout keyup', '#dropdown #linkPassText', function(event) {
-		var linkPassText = $('#linkPassText');
-		if ( linkPassText.val() != '' && (event.type == 'focusout' || event.keyCode == 13) ) {
-			var allowPublicUpload = $('#sharingDialogAllowPublicUpload').is(':checked');
-			var dropDown = $('#dropdown');
-			var itemType = dropDown.data('item-type');
-			var itemSource = dropDown.data('item-source');
-			var itemSourceName = $('#dropdown').data('item-source-name');
-			var permissions = 0;
-			var $loading = dropDown.find('#linkPass .icon-loading-small');
-
-			// Calculate permissions
-			if (allowPublicUpload) {
-				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
-			} else {
-				permissions = OC.PERMISSION_READ;
-			}
-
-			var expireDateString = OC.Share.getDefaultExpirationDate();
-
-			$loading.removeClass('hidden');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, expireDateString, function(data) {
-				$loading.addClass('hidden');
-				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);
-				}
-				$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-			}, function(result) {
-				$loading.addClass('hidden');
-				linkPassText.val('');
-				linkPassText.attr('placeholder', result.data.message);
-			});
-
-			if (expireDateString !== '') {
-				OC.Share.showExpirationDate(expireDateString);
-			}
-		}
-	});
-
 	$(document).on('click', '#dropdown #expirationCheckbox', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 3e3ef2d5029..d95b3d82020 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -94,7 +94,7 @@
 				throw 'missing OC.Share.ShareConfigModel';
 			}
 
-			_.bindAll(this, 'onLinkCheckBoxChange');
+			_.bindAll(this, 'onLinkCheckBoxChange', 'onPasswordEntered', 'onShowPasswordClick');
 		},
 
 		onLinkCheckBoxChange: function() {
@@ -127,6 +127,28 @@
 			this.select();
 		},
 
+		onShowPasswordClick: function() {
+			this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
+			if(!this.$el.find('#showPassword').is(':checked')) {
+				this.model.addLinkShare({password: ''});
+			} else {
+				this.$el.find('#linkPassText').focus();
+			}
+		},
+
+		onPasswordEntered: function() {
+			var password = this.$el.find('#linkPassText').val();
+			if(password === '') {
+				return;
+			}
+
+			this.$el.find('#linkPass .icon-loading-small')
+				.removeClass('hidden')
+				.addClass('inlineblock');
+
+			this.model.addLinkShare({password: password});
+		},
+
 		render: function() {
 			var linkShareTemplate = this.template();
 
@@ -178,6 +200,14 @@
 
 			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
 			this.$el.find('#linkText').click(this.onLinkTextClick);
+			this.$el.find('#showPassword').click(this.onShowPasswordClick);
+			this.$el.find('#linkPassText').focusout(this.onPasswordEntered);
+			var view = this;
+			this.$el.find('#linkPassText').keyup(function(event) {
+				if(event.keyCode == 13) {
+					view.onPasswordEntered();
+				}
+			});
 
 			return this;
 		},
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 7a7fe692c13..416fff53de4 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -157,7 +157,7 @@
 			this.$el.html(baseTemplate({
 				shareLabel: t('core', 'Share'),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
-				remoteShareInfo: this._renderRemoteShareInfoPart(),
+				remoteShareInfo: this._renderRemoteShareInfoPart()
 			}));
 
 			var view = this;
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 9e153dcb3e5..9e3f829e457 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -20,6 +20,7 @@
 	 * @property {string} token
 	 * @property {string|null} password
 	 * @property {string} link
+	 * @property {number} permissions
 	 * @property {Date} expiration
 	 * @property {number} stime share time
 	 */
@@ -89,12 +90,30 @@
 			linkShare: {}
 		},
 
-		addLinkShare: function() {
+		addLinkShare: function(options) {
 			var model = this;
 			var expiration = this.configModel.getDefaultExpirationDateString();
 			var itemType = this.get('itemType');
 			var itemSource = this.get('itemSource');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, this.fileInfoModel.get('name'), expiration, function(data) {
+
+			var options = options || {};
+			var requiredOptions = [
+				{ name: 'password',	   defaultValue: '' },
+				{ name: 'permissions', defaultValue: OC.PERMISSION_READ }
+			];
+			_.each(requiredOptions, function(option) {
+				// a provided options overrides a present value of the link
+				// share. If neither is given, the default value is used.
+				if(_.isUndefined(options[option.name])) {
+					options[option.name] = option.defaultValue;
+					var currentValue = model.get('linkShare')[option.name];
+					if(!_.isUndefined(currentValue)) {
+						options[option.name] = currentValue;
+					}
+				}
+			});
+
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, options.password, options.permissions, this.fileInfoModel.get('name'), expiration, function(data) {
 				model.fetch();
 				//FIXME: updateIcon belongs to view
 				OC.Share.updateIcon(itemType, itemSource);
@@ -512,6 +531,7 @@
 							token: share.token,
 							password: share.share_with,
 							link: link,
+							permissions: share.permissions,
 							// currently expiration is only effective for link shares.
 							expiration: share.expiration,
 							stime: share.stime
-- 
GitLab


From 6d832359b6f00bed5b2444b8d3cd0680a459619e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 00:43:11 +0200
Subject: [PATCH 337/783] fix allow upload checkbox appeareance

---
 apps/files_sharing/js/sharetabview.js | 2 +-
 core/js/shareconfigmodel.js           | 2 +-
 core/js/sharedialoglinkshareview.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 6836107306a..9f6c71d1924 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -54,7 +54,7 @@
 				}));
 
 				var attributes = {
-					itemType: 'file',
+					itemType: this.model.isDirectory() ? 'folder' : 'file',
 				   	itemSource: this.model.get('id'),
 					possiblePermissions: this.model.get('sharePermissions')
 				};
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index c6891154c98..16f7e2514d8 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -37,7 +37,7 @@
 		 */
 		isPublicUploadEnabled: function() {
 			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
-			return !_.isUndefined(publicUploadEnabled);
+			return publicUploadEnabled === 'yes';
 		},
 
 		/**
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index d95b3d82020..04ea41e5e00 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -29,7 +29,7 @@
 			'    <span class="icon-loading-small hidden"></span>' +
 			'</div>' +
 			'    {{#if publicUpload}}' +
-			'<div id="allowPublicUploadWrapper" class="hidden">' +
+			'<div id="allowPublicUploadWrapper">' +
 			'    <span class="icon-loading-small hidden"></span>' +
 			'    <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
 			'    <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
-- 
GitLab


From 7ae84e0e5c60a5b891dcc4183b0a1cff83f36090 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 01:01:02 +0200
Subject: [PATCH 338/783] make 'Allow editing' (aka public upload) checkbox
 work

---
 core/js/share.js                    | 40 -----------------------------
 core/js/sharedialoglinkshareview.js | 10 +++++++-
 core/js/shareitemmodel.js           |  9 +++++++
 3 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index f97a91bd3ab..0157bcdba7c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -956,46 +956,6 @@ $(document).ready(function() {
 			permissions);
 	});
 
-	// Handle the Allow Public Upload Checkbox
-	$(document).on('click', '#sharingDialogAllowPublicUpload', function() {
-
-		// Gather data
-		var $dropDown = $('#dropdown');
-		var allowPublicUpload = $(this).is(':checked');
-		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;
-		var $button = $(this);
-		var $loading = $dropDown.find('#allowPublicUploadWrapper .icon-loading-small');
-
-		if (!$loading.hasClass('hidden')) {
-			// already in progress
-			return false;
-		}
-
-		// Calculate permissions
-		if (allowPublicUpload) {
-			permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
-		} else {
-			permissions = OC.PERMISSION_READ;
-		}
-
-		// Update the share information
-		$button.addClass('hidden');
-		$button.prop('disabled', true);
-		$loading.removeClass('hidden');
-		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, expirationDate, function(data) {
-			$loading.addClass('hidden');
-			$button.removeClass('hidden');
-			$button.prop('disabled', false);
-		});
-	});
-
 	$(document).on('click', '#dropdown #expirationCheckbox', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 04ea41e5e00..f49a73f291b 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -94,7 +94,8 @@
 				throw 'missing OC.Share.ShareConfigModel';
 			}
 
-			_.bindAll(this, 'onLinkCheckBoxChange', 'onPasswordEntered', 'onShowPasswordClick');
+			_.bindAll(this, 'onLinkCheckBoxChange', 'onPasswordEntered',
+				'onShowPasswordClick', 'onAllowPublicUploadChange');
 		},
 
 		onLinkCheckBoxChange: function() {
@@ -149,6 +150,12 @@
 			this.model.addLinkShare({password: password});
 		},
 
+		onAllowPublicUploadChange: function() {
+			this.$el.find('#sharingDialogAllowPublicUpload')
+					.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
+			this.model.setPublicUpload(this.$el.find('#sharingDialogAllowPublicUpload').is(':checked'));
+		},
+
 		render: function() {
 			var linkShareTemplate = this.template();
 
@@ -199,6 +206,7 @@
 			}));
 
 			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
+			this.$el.find('#sharingDialogAllowPublicUpload').change(this.onAllowPublicUploadChange);
 			this.$el.find('#linkText').click(this.onLinkTextClick);
 			this.$el.find('#showPassword').click(this.onShowPasswordClick);
 			this.$el.find('#linkPassText').focusout(this.onPasswordEntered);
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 9e3f829e457..3569c6ffd1a 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -132,6 +132,15 @@
 			});
 		},
 
+		setPublicUpload: function(allow) {
+			var permissions = OC.PERMISSION_READ;
+			if(allow) {
+				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+			}
+
+			this.addLinkShare({permissions: permissions});
+		},
+
 		addShare: function(event, selected, options) {
 			event.preventDefault();
 
-- 
GitLab


From a5b0ea031de3036fc75c3b1d6b3c030a824c1736 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 01:24:21 +0200
Subject: [PATCH 339/783] make unshare work

---
 core/js/share.js                     | 34 ----------------------------
 core/js/sharedialogshareelistview.js | 21 +++++++++++++++++
 core/js/shareitemmodel.js            | 22 ++++++++++--------
 3 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 0157bcdba7c..85b920a6913 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -885,40 +885,6 @@ $(document).ready(function() {
 		return false;
 	});
 
-	$(document).on('click', '#dropdown .unshare', function() {
-		var $li = $(this).closest('li');
-		var itemType = $('#dropdown').data('item-type');
-		var itemSource = $('#dropdown').data('item-source');
-		var shareType = $li.data('share-type');
-		var shareWith = $li.attr('data-share-with');
-		var $button = $(this);
-
-		if (!$button.is('a')) {
-			$button = $button.closest('a');
-		}
-
-		if ($button.hasClass('icon-loading-small')) {
-			// deletion in progress
-			return false;
-		}
-		$button.empty().addClass('icon-loading-small');
-
-		OC.Share.unshare(itemType, itemSource, shareType, shareWith, function() {
-			$li.remove();
-			var index = OC.Share.itemShares[shareType].indexOf(shareWith);
-			OC.Share.itemShares[shareType].splice(index, 1);
-			// updated list of shares
-			OC.Share.currentShares[shareType].splice(index, 1);
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-			OC.Share.updateIcon(itemType, itemSource);
-			if (typeof OC.Share.statuses[itemSource] === 'undefined') {
-				$('#expiration').slideUp(OC.menuSpeed);
-			}
-		});
-
-		return false;
-	});
-
 	$(document).on('change', '#dropdown .permissions', function() {
 		var li = $(this).closest('li');
 		if ($(this).attr('name') == 'edit') {
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 895f14508d5..dda2fe949ac 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -212,6 +212,9 @@
 				});
 			}
 
+			var view = this;
+			this.$el.find('.unshare').click(function() { view.onUnshare(this, view); });
+
 			return this;
 		},
 
@@ -224,6 +227,24 @@
 				this._template = Handlebars.compile(TEMPLATE);
 			}
 			return this._template;
+		},
+
+		onUnshare: function(element, view) {
+			var $element = $(element);
+
+			if($element.hasClass('icon-loading-small')) {
+				// in process
+				return;
+			}
+			$element.empty().addClass('icon-loading-small');
+
+			var $li = $element.closest('li');
+			var shareType = $li.data('share-type');
+			var shareWith = $li.attr('data-share-with');
+
+			view.model.removeShare(shareType, shareWith);
+
+			return false;
 		}
 
 	});
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 3569c6ffd1a..dabcc65c0a1 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -121,15 +121,7 @@
 		},
 
 		removeLinkShare: function() {
-			var model = this;
-			var itemType = this.get('itemType');
-			var itemSource = this.get('itemSource');
-
-			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
-				model.fetch();
-				//FIXME: updateIcon belongs to view
-				OC.Share.updateIcon(itemType, itemSource);
-			});
+			this.removeShare(OC.Share.SHARE_TYPE_LINK, '');
 		},
 
 		setPublicUpload: function(allow) {
@@ -179,6 +171,18 @@
 			});
 		},
 
+		removeShare: function(shareType, shareWith) {
+			var model = this;
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+
+			OC.Share.unshare(itemType, itemSource, shareType, shareWith, function() {
+				model.fetch();
+				//FIXME: updateIcon belongs to view
+				OC.Share.updateIcon(itemType, itemSource);
+			});
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-- 
GitLab


From d4bbc062be79f48633f047e142800f37efa04e1f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 01:26:38 +0200
Subject: [PATCH 340/783] cleanup

---
 core/js/share.js | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 85b920a6913..7c87fb88cfd 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -846,30 +846,6 @@ $(document).ready(function() {
 			minDate : minDate
 		});
 	}
-	$(document).on('click', 'a.share', function(event) {
-		event.stopPropagation();
-		if ($(this).data('item-type') !== undefined && $(this).data('item') !== undefined) {
-			var itemType = $(this).data('item-type');
-			var itemSource = $(this).data('item');
-			var appendTo = $(this).parent().parent();
-			var link = false;
-			var possiblePermissions = $(this).data('possible-permissions');
-			if ($(this).data('link') !== undefined && $(this).data('link') == true) {
-				link = true;
-			}
-			if (OC.Share.droppedDown) {
-				if (itemSource != $('#dropdown').data('item')) {
-					OC.Share.hideDropDown(function () {
-						OC.Share.showDropDown(itemType, itemSource, appendTo, link, possiblePermissions);
-					});
-				} else {
-					OC.Share.hideDropDown();
-				}
-			} else {
-				OC.Share.showDropDown(itemType, itemSource, appendTo, link, possiblePermissions);
-			}
-		}
-	});
 
 	$(this).click(function(event) {
 		var target = $(event.target);
-- 
GitLab


From c7453b4db1c31884f798b8aa826bb25560e9551e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 01:40:16 +0200
Subject: [PATCH 341/783] toggle visibility of detailed cruds permissions

---
 core/js/share.js                     | 5 -----
 core/js/sharedialogshareelistview.js | 8 +++++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 7c87fb88cfd..e3c4d3d91af 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -856,11 +856,6 @@ $(document).ready(function() {
 		}
 	});
 
-	$(document).on('click', '#dropdown .showCruds', function() {
-		$(this).closest('li').find('.cruds').toggle();
-		return false;
-	});
-
 	$(document).on('change', '#dropdown .permissions', function() {
 		var li = $(this).closest('li');
 		if ($(this).attr('name') == 'edit') {
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index dda2fe949ac..f078ab8a06b 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -37,7 +37,7 @@
 			'        {{/if}}' +
 			'        {{#unless isRemoteShare}}' +
 			'        <a href="#" class="showCruds"><img class="svg" alt="{{crudsLabel}}" src="{{triangleSImage}}"/></a>' +
-			'        <div class="cruds" class="hidden">' +
+			'        <div class="cruds hidden">' +
 			'            {{#if createPermissionPossible}}' +
 			'            <label><input id="canCreate-{{shareWith}}" type="checkbox" name="create" class="permissions" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>{{createPermissionLabel}}</label>' +
 			'            {{/if}}' +
@@ -214,6 +214,7 @@
 
 			var view = this;
 			this.$el.find('.unshare').click(function() { view.onUnshare(this, view); });
+			this.$el.find('.showCruds').click(this.onCrudsToggle);
 
 			return this;
 		},
@@ -244,6 +245,11 @@
 
 			view.model.removeShare(shareType, shareWith);
 
+			return false;
+		},
+
+		onCrudsToggle: function() {
+			$(this).siblings('.cruds').toggleClass('hidden');
 			return false;
 		}
 
-- 
GitLab


From a0fa7186f55b16ddccbd3780f61433e977cbefd2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 02:29:22 +0200
Subject: [PATCH 342/783] make permission/cruds checkboxes work

---
 core/js/share.js                     | 37 ----------------------------
 core/js/sharedialogshareelistview.js | 29 ++++++++++++++++++++++
 core/js/shareitemmodel.js            |  7 ++++++
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index e3c4d3d91af..c05f3602dd7 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -856,43 +856,6 @@ $(document).ready(function() {
 		}
 	});
 
-	$(document).on('change', '#dropdown .permissions', function() {
-		var li = $(this).closest('li');
-		if ($(this).attr('name') == 'edit') {
-			var checkboxes = $('.permissions', li);
-			var checked = $(this).is(':checked');
-			// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
-			$(checkboxes).filter('input[name="create"]').attr('checked', checked);
-			$(checkboxes).filter('input[name="update"]').attr('checked', checked);
-			$(checkboxes).filter('input[name="delete"]').attr('checked', checked);
-		} else {
-			var checkboxes = $('.permissions', li);
-			// Uncheck Edit if Create, Update, and Delete are not checked
-			if (!$(this).is(':checked')
-				&& !$(checkboxes).filter('input[name="create"]').is(':checked')
-				&& !$(checkboxes).filter('input[name="update"]').is(':checked')
-				&& !$(checkboxes).filter('input[name="delete"]').is(':checked'))
-			{
-				$(checkboxes).filter('input[name="edit"]').attr('checked', false);
-			// Check Edit if Create, Update, or Delete is checked
-			} else if (($(this).attr('name') == 'create'
-				|| $(this).attr('name') == 'update'
-				|| $(this).attr('name') == 'delete'))
-			{
-				$(checkboxes).filter('input[name="edit"]').attr('checked', true);
-			}
-		}
-		var permissions = OC.PERMISSION_READ;
-		$(checkboxes).filter(':not(input[name="edit"])').filter(':checked').each(function(index, checkbox) {
-			permissions |= $(checkbox).data('permissions');
-		});
-		OC.Share.setPermissions($('#dropdown').data('item-type'),
-			$('#dropdown').data('item-source'),
-			li.data('share-type'),
-			li.attr('data-share-with'),
-			permissions);
-	});
-
 	$(document).on('click', '#dropdown #expirationCheckbox', function() {
 		if (this.checked) {
 			OC.Share.showExpirationDate('');
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index f078ab8a06b..1f53a479fb5 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -214,6 +214,7 @@
 
 			var view = this;
 			this.$el.find('.unshare').click(function() { view.onUnshare(this, view); });
+			this.$el.find('.permissions').click(function() { view.onPermissionChange(this, view); });
 			this.$el.find('.showCruds').click(this.onCrudsToggle);
 
 			return this;
@@ -248,6 +249,34 @@
 			return false;
 		},
 
+		onPermissionChange: function(element, view) {
+			var $element = $(element);
+			var $li = $element.closest('li');
+			var shareType = $li.data('share-type');
+			var shareWith = $li.attr('data-share-with');
+
+			// adjust checkbox states
+			var $checkboxes = $('.permissions', $li).not('input[name="edit"]').not('input[name="share"]');
+			if ($element.attr('name') === 'edit') {
+				var checked = $element.is(':checked');
+				// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
+				$($checkboxes).attr('checked', checked);
+			} else {
+				var numberChecked = $checkboxes.filter(':checked').length;
+				var checked = numberChecked > 0;
+				$('input[name="edit"]', $li).attr('checked', checked);
+			}
+
+			var permissions = OC.PERMISSION_READ;
+			$('.permissions', $li).not('input[name="edit"]').filter(':checked').each(function(index, checkbox) {
+				permissions |= $(checkbox).data('permissions');
+			});
+
+			view.model.setPermissions(shareType, shareWith, permissions);
+
+			return false;
+		},
+
 		onCrudsToggle: function() {
 			$(this).siblings('.cruds').toggleClass('hidden');
 			return false;
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index dabcc65c0a1..eb44b735737 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -171,6 +171,13 @@
 			});
 		},
 
+		setPermissions: function(shareType, shareWith, permissions) {
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+
+			OC.Share.setPermissions(itemType, itemSource, shareType, shareWith, permissions);
+		},
+
 		removeShare: function(shareType, shareWith) {
 			var model = this;
 			var itemType = this.get('itemType');
-- 
GitLab


From c2ff2ca9825af347d0247687322d3d12eb311185 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 14 Sep 2015 02:32:34 +0200
Subject: [PATCH 343/783] cleanup

---
 core/js/share.js | 80 ------------------------------------------------
 1 file changed, 80 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index c05f3602dd7..01467b495f2 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -685,68 +685,6 @@ OC.Share = _.extend(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');
-			var type = $('tr').filterAttr('data-id', String(itemSource)).data('type');
-			if ($('#dir').val() == '/') {
-				var file = $('#dir').val() + filename;
-			} else {
-				var file = $('#dir').val() + '/' + filename;
-			}
-			file = '/'+OC.currentUser+'/files'+file;
-			// TODO: use oc webroot ?
-			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 service='';
-			if(linkSharetype === 'folder' || linkSharetype === 'file'){
-				service='files';
-			}else{
-				service=linkSharetype;
-			}
-
-			// TODO: use oc webroot ?
-			if (service !== 'files') {
-				var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service='+service+'&t='+token;
-			} else {
-				var link = parent.location.protocol+'//'+location.host+OC.generateUrl('/s/')+token;
-			}
-		}
-		$('#linkText').val(link);
-		$('#linkText').slideDown(OC.menuSpeed);
-		$('#linkText').css('display','block');
-		if (oc_appconfig.core.enforcePasswordForPublicLink === false || password === null) {
-			$('#showPassword').show();
-			$('#showPassword+label').show();
-		}
-		if (password != null) {
-			$('#linkPass').slideDown(OC.menuSpeed);
-			$('#showPassword').attr('checked', true);
-			$('#linkPassText').attr('placeholder', '**********');
-		}
-		$('#expiration').show();
-		$('#emailPrivateLink #email').show();
-		$('#emailPrivateLink #emailButton').show();
-		$('#allowPublicUploadWrapper').show();
-	},
-	hideLink:function() {
-		$('#linkText').slideUp(OC.menuSpeed);
-		$('#defaultExpireMessage').hide();
-		$('#showPassword').hide();
-		$('#showPassword+label').hide();
-		$('#linkPass').slideUp(OC.menuSpeed);
-		$('#emailPrivateLink #email').hide();
-		$('#emailPrivateLink #emailButton').hide();
-		$('#allowPublicUploadWrapper').hide();
-	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
 	},
@@ -809,24 +747,6 @@ OC.Share = _.extend(OC.Share, {
 			$('#defaultExpireMessage').slideDown(OC.menuSpeed);
 		}
 		$.datepicker.setDefaults(datePickerOptions);
-	},
-	/**
-	 * Get the default Expire date
-	 *
-	 * @return {String} The expire date
-	 */
-	getDefaultExpirationDate:function() {
-		var expireDateString = '';
-		if (oc_appconfig.core.defaultExpireDateEnabled) {
-			var date = new Date().getTime();
-			var expireAfterMs = oc_appconfig.core.defaultExpireDate * 24 * 60 * 60 * 1000;
-			var expireDate = new Date(date + expireAfterMs);
-			var month = expireDate.getMonth() + 1;
-			var year = expireDate.getFullYear();
-			var day = expireDate.getDate();
-			expireDateString = year + "-" + month + '-' + day + ' 00:00:00';
-		}
-		return expireDateString;
 	}
 });
 
-- 
GitLab


From 8194d092e71b1c44a441dddc64b7e7533adbbfb9 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 12:48:01 +0200
Subject: [PATCH 344/783] Add expiration date handling in share tab

---
 core/css/share.css                   |   8 +++
 core/js/sharedialogexpirationview.js |  49 +++++++++++--
 core/js/sharedialoglinkshareview.js  |  11 ++-
 core/js/shareitemmodel.js            | 104 ++++++++++++++++++++++-----
 4 files changed, 147 insertions(+), 25 deletions(-)

diff --git a/core/css/share.css b/core/css/share.css
index bdf34e9a863..73bad5c500d 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -126,6 +126,14 @@ a.unshare {
 	margin-right: 0;
 }
 
+.shareTabView .error {
+	color: #e9322d;
+	border-color: #e9322d;
+	-webkit-box-shadow: 0 0 6px #f8b9b7;
+	-moz-box-shadow: 0 0 6px #f8b9b7;
+	box-shadow: 0 0 6px #f8b9b7;
+}
+
 #link #showPassword img {
 	padding-left:5px;
 	width:12px;
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index f244fe56548..c5d8c829657 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -19,13 +19,13 @@
 			// in the LinkShareView to ease reusing it in future. Then,
 			// modifications (getting rid of IDs) are still necessary.
 			'{{#if isLinkShare}}' +
-			'<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" ' +
+			'<input type="checkbox" name="expirationCheckbox" class="expirationCheckbox" id="expirationCheckbox" value="1" ' +
 				'{{#if isExpirationSet}}checked="checked"{{/if}} {{#if disableCheckbox}}disabled="disabled"{{/if}} />' +
 			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
-			'    {{#if isExpirationSet}}' +
-			'<label for="expirationDate" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' +
-			'<input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{expirationValue}}" />' +
-			'    {{/if}}' +
+			'<div class="expirationDateContainer {{#unless isExpirationSet}}hidden{{/unless}}">' +
+			'    <label for="expirationDate" class="hidden-visually" value="{{expirationDate}}">{{expirationLabel}}</label>' +
+			'    <input id="expirationDate" class="datepicker" type="text" placeholder="{{expirationDatePlaceholder}}" value="{{expirationValue}}" />' +
+			'</div>' +
 			'    {{#if isExpirationEnforced}}' +
 				// originally the expire message was shown when a default date was set, however it never had text
 			'<em id="defaultExpireMessage">{{defaultExpireMessage}}</em>' +
@@ -58,6 +58,11 @@
 
 		className: 'hidden',
 
+		events: {
+			'change .expirationCheckbox': '_onToggleExpiration',
+			'change .datepicker': '_onChangeExpirationDate'
+		},
+
 		initialize: function(options) {
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
@@ -79,6 +84,38 @@
 			});
 		},
 
+		_onToggleExpiration: function(event) {
+			var $checkbox = $(event.target);
+			var state = $checkbox.prop('checked');
+			// TODO: slide animation
+			this.$el.find('.expirationDateContainer').toggleClass('hidden', !state);
+			if (!state) {
+				// discard expiration date
+				this.model.setExpirationDate('');
+				this.model.saveLinkShare();
+			}
+		},
+
+		_onChangeExpirationDate: function(event) {
+			var $target = $(event.target);
+			$target.tooltip('hide');
+			$target.removeClass('error');
+
+			this.model.setExpirationDate($target.val());
+			this.model.saveLinkShare(null, {
+				error: function(model, message) {
+					if (!message) {
+						$target.attr('title', t('core', 'Error setting expiration date'));
+					} else {
+						$target.attr('title', message);
+					}
+					$target.tooltip({gravity: 'n'});
+					$target.tooltip('show');
+					$target.addClass('error');
+				}
+			});
+		},
+
 		render: function() {
 			var defaultExpireMessage = '';
 			var defaultExpireDays = this.configModel.get('defaultExpireDate');
@@ -136,6 +173,8 @@
 
 			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
 
+			this.delegateEvents();
+
 			return this;
 		},
 
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index f49a73f291b..cadec3071d3 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -108,7 +108,8 @@
 			if($checkBox.is(':checked')) {
 				if(this.configModel.get('enforcePasswordForPublicLink') === false) {
 					$loading.removeClass('hidden');
-					this.model.addLinkShare();
+					// this will create it
+					this.model.saveLinkShare();
 				} else {
 					this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
 					// TODO drop with IE8 drop
@@ -131,7 +132,8 @@
 		onShowPasswordClick: function() {
 			this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
 			if(!this.$el.find('#showPassword').is(':checked')) {
-				this.model.addLinkShare({password: ''});
+				this.model.setPassword('');
+				this.model.saveLinkShare();
 			} else {
 				this.$el.find('#linkPassText').focus();
 			}
@@ -147,13 +149,15 @@
 				.removeClass('hidden')
 				.addClass('inlineblock');
 
-			this.model.addLinkShare({password: password});
+			this.model.setPassword(password);
+			this.model.saveLinkShare();
 		},
 
 		onAllowPublicUploadChange: function() {
 			this.$el.find('#sharingDialogAllowPublicUpload')
 					.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
 			this.model.setPublicUpload(this.$el.find('#sharingDialogAllowPublicUpload').is(':checked'));
+			this.model.saveLinkShare();
 		},
 
 		render: function() {
@@ -205,6 +209,7 @@
 				mailButtonText: t('core', 'Send')
 			}));
 
+			// TODO: move this to delegate events instead
 			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
 			this.$el.find('#sharingDialogAllowPublicUpload').change(this.onAllowPublicUploadChange);
 			this.$el.find('#linkText').click(this.onLinkTextClick);
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index eb44b735737..2a97bc8abd5 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -70,6 +70,9 @@
 	 * Represents the GUI of the share dialogue
 	 *
 	 * // FIXME: use OC Share API once #17143 is done
+	 *
+	 * // TODO: this really should be a collection of share item models instead,
+	 * where the link share is one of them
 	 */
 	var ShareItemModel = OC.Backbone.Model.extend({
 		initialize: function(attributes, options) {
@@ -90,47 +93,114 @@
 			linkShare: {}
 		},
 
-		addLinkShare: function(options) {
+		/**
+		 * Saves the current link share information.
+		 *
+		 * This will trigger an ajax call and refetch the model afterwards.
+		 *
+		 * TODO: this should be a separate model
+		 */
+		saveLinkShare: function(attributes, options) {
 			var model = this;
-			var expiration = this.configModel.getDefaultExpirationDateString();
 			var itemType = this.get('itemType');
 			var itemSource = this.get('itemSource');
 
-			var options = options || {};
-			var requiredOptions = [
+			// TODO: use backbone's default value mechanism once this is a separate model
+			var requiredAttributes = [
 				{ name: 'password',	   defaultValue: '' },
-				{ name: 'permissions', defaultValue: OC.PERMISSION_READ }
+				{ name: 'permissions', defaultValue: OC.PERMISSION_READ },
+				{ name: 'expiration', defaultValue: this.configModel.getDefaultExpirationDateString() }
 			];
-			_.each(requiredOptions, function(option) {
+
+			attributes = attributes || {};
+
+			// get attributes from the model and fill in with default values
+			_.each(requiredAttributes, function(attribute) {
 				// a provided options overrides a present value of the link
 				// share. If neither is given, the default value is used.
-				if(_.isUndefined(options[option.name])) {
-					options[option.name] = option.defaultValue;
-					var currentValue = model.get('linkShare')[option.name];
+				if(_.isUndefined(attribute[attribute.name])) {
+					attributes[attribute.name] = attribute.defaultValue;
+					var currentValue = model.get('linkShare')[attribute.name];
 					if(!_.isUndefined(currentValue)) {
-						options[option.name] = currentValue;
+						attributes[attribute.name] = currentValue;
 					}
 				}
 			});
 
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, options.password, options.permissions, this.fileInfoModel.get('name'), expiration, function(data) {
-				model.fetch();
-				//FIXME: updateIcon belongs to view
-				OC.Share.updateIcon(itemType, itemSource);
-			});
+			OC.Share.share(
+				itemType,
+				itemSource,
+				OC.Share.SHARE_TYPE_LINK,
+				attributes.password,
+				attributes.permissions,
+				this.fileInfoModel.get('name'),
+				attributes.expiration,
+				function(result) {
+					if (!result || result.status !== 'success') {
+						model.fetch({
+							success: function() {
+								if (options && _.isFunction(options.success)) {
+									options.success(model);
+								}
+							}
+						});
+					} else {
+						if (options && _.isFunction(options.error)) {
+							options.error(model);
+						}
+					}
+					//FIXME: updateIcon belongs to view
+					OC.Share.updateIcon(itemType, itemSource);
+				},
+				function(result) {
+					var msg = t('core', 'Error');
+					if (result.data && result.data.message) {
+						msg = result.data.message;
+					}
+
+					if (options && _.isFunction(options.error)) {
+						options.error(model, msg);
+					} else {
+						OC.dialogs.alert(msg, t('core', 'Error while sharing'));
+					}
+				}
+			);
 		},
 
 		removeLinkShare: function() {
 			this.removeShare(OC.Share.SHARE_TYPE_LINK, '');
 		},
 
+		/**
+		 * Sets the public upload flag
+		 *
+		 * @param {bool} allow whether public upload is allowed
+		 */
 		setPublicUpload: function(allow) {
 			var permissions = OC.PERMISSION_READ;
 			if(allow) {
-				permissions = OC.PERMISSION_UPDATE + OC.PERMISSION_CREATE + OC.PERMISSION_READ;
+				permissions = OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE | OC.PERMISSION_READ;
 			}
 
-			this.addLinkShare({permissions: permissions});
+			this.get('linkShare').permissions = permissions;
+		},
+
+		/**
+		 * Sets the expiration date of the public link
+		 *
+		 * @param {string} expiration expiration date
+		 */
+		setExpirationDate: function(expiration) {
+			this.get('linkShare').expiration = expiration;
+		},
+
+		/**
+		 * Set password of the public link share
+		 *
+		 * @param {string} password
+		 */
+		setPassword: function(password) {
+			this.get('linkShare').password = password;
 		},
 
 		addShare: function(event, selected, options) {
-- 
GitLab


From e90065881d47a64b6c376208ece208932711c765 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 17:20:51 +0200
Subject: [PATCH 345/783] Bring back the share icon and update its status

Display share icon in file list row.
Update share icon status when the sharing state changed.
---
 apps/files/js/filelist.js             | 14 ++++++
 apps/files_sharing/js/share.js        | 63 +++++++++++++++++++++++---
 apps/files_sharing/js/sharetabview.js |  7 ++-
 core/js/sharedialogshareelistview.js  |  2 +-
 core/js/shareitemmodel.js             | 65 +++++++++++++++++++--------
 5 files changed, 123 insertions(+), 28 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 194c658e3a1..699df691bbc 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -367,6 +367,20 @@
 			return model;
 		},
 
+		/**
+		 * Displays the details view for the given file and
+		 * selects the given tab
+		 *
+		 * @param {string} fileName file name for which to show details
+		 * @param {string} [tabId] optional tab id to select
+		 */
+		showDetailsView: function(fileName, tabId) {
+			this._updateDetailsView(fileName);
+			if (tabId) {
+				this._detailsView.selectTab(tabId);
+			}
+		},
+
 		/**
 		 * Update the details view to display the given file
 		 *
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index c3d567fec86..5290dfbb7d1 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -32,6 +32,7 @@
 			if (fileList.id === 'trashbin' || fileList.id === 'files.public') {
 				return;
 			}
+			var fileActions = fileList.fileActions;
 			var oldCreateRow = fileList._createRow;
 			fileList._createRow = function(fileData) {
 				var tr = oldCreateRow.apply(this, arguments);
@@ -78,7 +79,9 @@
 						$files = fileList.$fileList.find('tr');
 					}
 					_.each($files, function(file) {
-						OCA.Sharing.Util.updateFileActionIcon($(file));
+						var $tr = $(file);
+						var shareStatus = OC.Share.statuses[$tr.data('id')];
+						OCA.Sharing.Util._updateFileActionIcon($tr, !!shareStatus, shareStatus && shareStatus.link);
 					});
 				}
 
@@ -96,22 +99,66 @@
 				}
 			});
 
-			fileList.registerTabView(new OCA.Sharing.ShareTabView('shareTabView'));
+			fileActions.registerAction({
+				name: 'Share',
+				displayName: '',
+				mime: 'all',
+				permissions: OC.PERMISSION_SHARE,
+				icon: OC.imagePath('core', 'actions/share'),
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				actionHandler: function(fileName) {
+					fileList.showDetailsView(fileName, 'shareTabView');
+				}
+			});
+
+			var shareTab = new OCA.Sharing.ShareTabView('shareTabView');
+			// detect changes and change the matching list entry
+			shareTab.on('sharesChanged', function(shareModel) {
+				var fileInfoModel = shareModel.fileInfoModel;
+				var $tr = fileList.findFileEl(fileInfoModel.get('name'));
+				OCA.Sharing.Util._updateFileListDataAttributes(fileList, $tr, shareModel);
+				if (!OCA.Sharing.Util._updateFileActionIcon($tr, shareModel.hasUserShares(), shareModel.hasLinkShare())) {
+					// remove icon, if applicable
+					OC.Share.markFileAsShared($tr, false, false);
+				}
+			});
+			fileList.registerTabView(shareTab);
+		},
+
+		/**
+		 * Update file list data attributes
+		 */
+		_updateFileListDataAttributes: function(fileList, $tr, shareModel) {
+			// files app current cannot show recipients on load, so we don't update the
+			// icon when changed for consistency
+			if (fileList.id === 'files') {
+				return;
+			}
+			var recipients = _.pluck(shareModel.get('shares'), 'share_with_displayname');
+			// note: we only update the data attribute because updateIcon()
+			if (recipients.length) {
+				$tr.attr('data-share-recipients', OCA.Sharing.Util.formatRecipients(recipients));
+			}
+			else {
+				$tr.removeAttr('data-share-recipients');
+			}
 		},
 
 		/**
 		 * Update the file action share icon for the given file
 		 *
 		 * @param $tr file element of the file to update
+		 * @param {bool} hasUserShares true if a user share exists
+		 * @param {bool} hasLinkShare true if a link share exists
+		 *
+		 * @return {bool} true if the icon was set, false otherwise
 		 */
-		updateFileActionIcon: function($tr) {
+		_updateFileActionIcon: function($tr, hasUserShares, hasLinkShare) {
 			// if the statuses are loaded already, use them for the icon
 			// (needed when scrolling to the next page)
-			var shareStatus = OC.Share.statuses[$tr.data('id')];
-			if (shareStatus || $tr.attr('data-share-recipients') || $tr.attr('data-share-owner')) {
+			if (hasUserShares || hasLinkShare || $tr.attr('data-share-recipients') || $tr.attr('data-share-owner')) {
 				var permissions = $tr.data('permissions');
-				var hasLink = !!(shareStatus && shareStatus.link);
-				OC.Share.markFileAsShared($tr, true, hasLink);
+				OC.Share.markFileAsShared($tr, true, hasLinkShare);
 				if ((permissions & OC.PERMISSION_SHARE) === 0 && $tr.attr('data-share-owner')) {
 					// if no share action exists because the admin disabled sharing for this user
 					// we create a share notification action to inform the user about files
@@ -130,7 +177,9 @@
 						return $result;
 					});
 				}
+				return true;
 			}
+			return false;
 		},
 
 		/**
diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 9f6c71d1924..1ad17365957 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -38,8 +38,10 @@
 		 * Renders this details view
 		 */
 		render: function() {
+			var self = this;
 			if (this._dialog) {
 				// remove/destroy older instance
+				this._dialog.model.off();
 				this._dialog.remove();
 				this._dialog = null;
 			}
@@ -69,7 +71,10 @@
 				});
 				this.$el.find('.dialogContainer').append(this._dialog.$el);
 				this._dialog.render();
-				shareModel.fetch();
+				this._dialog.model.fetch();
+				this._dialog.model.on('change', function() {
+					self.trigger('sharesChanged', shareModel);
+				});
 			} else {
 				this.$el.empty();
 				// TODO: render placeholder text?
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 1f53a479fb5..cf8905ff982 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -175,7 +175,7 @@
 
 			this._collections = {};
 
-			if(!this.model.hasShares()) {
+			if(!this.model.hasUserShares()) {
 				return [];
 			}
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 2a97bc8abd5..949c86599bc 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -149,8 +149,6 @@
 							options.error(model);
 						}
 					}
-					//FIXME: updateIcon belongs to view
-					OC.Share.updateIcon(itemType, itemSource);
 				},
 				function(result) {
 					var msg = t('core', 'Error');
@@ -236,8 +234,6 @@
 			var itemSource = this.get('itemSource');
 			OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, fileName, options.expiration, function() {
 				model.fetch();
-				//FIXME: updateIcon belongs to view
-				OC.Share.updateIcon(itemType, itemSource);
 			});
 		},
 
@@ -255,8 +251,6 @@
 
 			OC.Share.unshare(itemType, itemSource, shareType, shareWith, function() {
 				model.fetch();
-				//FIXME: updateIcon belongs to view
-				OC.Share.updateIcon(itemType, itemSource);
 			});
 		},
 
@@ -291,12 +285,25 @@
 		},
 
 		/**
-		 * whether this item has share information
+		 * whether this item has user share information
 		 * @returns {boolean}
 		 */
-		hasShares: function() {
+		hasUserShares: function() {
 			var shares = this.get('shares');
-			return _.isArray(this.get('shares'));
+			return _.isArray(shares) && shares.length > 0;
+		},
+
+		/**
+		 * Returns whether this item has a link share
+		 *
+		 * @return {bool} true if a link share exists, false otherwise
+		 */
+		hasLinkShare: function() {
+			var linkShare = this.get('linkShare');
+			if (linkShare && linkShare.isLinkShare) {
+				return true;
+			}
+			return false;
 		},
 
 		/**
@@ -544,7 +551,27 @@
 			});
 		},
 
-		legacyFillCurrentShares: function(shares) {
+		/**
+		 * Updates OC.Share.itemShares and OC.Share.statuses.
+		 *
+		 * This is required in case the user navigates away and comes back,
+		 * the share statuses from the old arrays are still used to fill in the icons
+		 * in the file list.
+		 */
+		_legacyFillCurrentShares: function(shares) {
+			var fileId = this.fileInfoModel.get('id');
+			if (!shares || !shares.length) {
+				delete OC.Share.statuses[fileId];
+				return;
+			}
+
+			var currentShareStatus = OC.Share.statuses[fileId];
+			if (!currentShareStatus) {
+				currentShareStatus = {link: false};
+				OC.Share.statuses[fileId] = currentShareStatus;
+			}
+			currentShareStatus.link = false;
+
 			OC.Share.currentShares = {};
 			OC.Share.itemShares = [];
 			_.each(shares,
@@ -552,15 +579,15 @@
 				 * @param {OC.Share.Types.ShareInfo} share
 				 */
 				function(share) {
-					if (!OC.Share.currentShares[share.share_type]) {
-						OC.Share.currentShares[share.share_type] = [];
-					}
-					OC.Share.currentShares[share.share_type].push(share);
-
-					if (!OC.Share.itemShares[share.share_type]) {
-						OC.Share.itemShares[share.share_type] = [];
+					if (share.share_type === OC.Share.SHARE_TYPE_LINK) {
+						OC.Share.itemShares[share.share_type] = true;
+						currentShareStatus.link = true;
+					} else {
+						if (!OC.Share.itemShares[share.share_type]) {
+							OC.Share.itemShares[share.share_type] = [];
+						}
+						OC.Share.itemShares[share.share_type].push(share.share_with);
 					}
-					OC.Share.itemShares[share.share_type].push(share.share_with);
 				}
 			);
 		},
@@ -589,7 +616,7 @@
 
 			/** @type {OC.Share.Types.ShareInfo[]} **/
 			var shares = _.toArray(data.shares);
-			this.legacyFillCurrentShares(shares);
+			this._legacyFillCurrentShares(shares);
 
 			var linkShare = { isLinkShare: false };
 			// filter out the share by link
-- 
GitLab


From 06b11dd602b5073d383d14e10072708907513cb3 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 17:47:47 +0200
Subject: [PATCH 346/783] Fix shares list events

Some events need preventing default like unshare, but setting
permissions doesn't.
---
 core/js/sharedialogshareelistview.js | 34 +++++++++++++++-------------
 core/js/sharedialogview.js           | 17 ++++++--------
 core/js/shareitemmodel.js            |  9 ++++----
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index cf8905ff982..8f68231398e 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -81,6 +81,12 @@
 		/** @type {object} **/
 		_collections: {},
 
+		events: {
+			'click .unshare': 'onUnshare',
+			'click .permissions': 'onPermissionChange',
+			'click .showCruds': 'onCrudsToggle'
+		},
+
 		initialize: function(options) {
 			if(!_.isUndefined(options.configModel)) {
 				this.configModel = options.configModel;
@@ -212,10 +218,7 @@
 				});
 			}
 
-			var view = this;
-			this.$el.find('.unshare').click(function() { view.onUnshare(this, view); });
-			this.$el.find('.permissions').click(function() { view.onPermissionChange(this, view); });
-			this.$el.find('.showCruds').click(this.onCrudsToggle);
+			this.delegateEvents();
 
 			return this;
 		},
@@ -231,8 +234,8 @@
 			return this._template;
 		},
 
-		onUnshare: function(element, view) {
-			var $element = $(element);
+		onUnshare: function(event) {
+			var $element = $(event.target);
 
 			if($element.hasClass('icon-loading-small')) {
 				// in process
@@ -244,26 +247,27 @@
 			var shareType = $li.data('share-type');
 			var shareWith = $li.attr('data-share-with');
 
-			view.model.removeShare(shareType, shareWith);
+			this.model.removeShare(shareType, shareWith);
 
 			return false;
 		},
 
-		onPermissionChange: function(element, view) {
-			var $element = $(element);
+		onPermissionChange: function(event) {
+			var $element = $(event.target);
 			var $li = $element.closest('li');
 			var shareType = $li.data('share-type');
 			var shareWith = $li.attr('data-share-with');
 
 			// adjust checkbox states
 			var $checkboxes = $('.permissions', $li).not('input[name="edit"]').not('input[name="share"]');
+			var checked;
 			if ($element.attr('name') === 'edit') {
-				var checked = $element.is(':checked');
+				checked = $element.is(':checked');
 				// Check/uncheck Create, Update, and Delete checkboxes if Edit is checked/unck
 				$($checkboxes).attr('checked', checked);
 			} else {
 				var numberChecked = $checkboxes.filter(':checked').length;
-				var checked = numberChecked > 0;
+				checked = numberChecked > 0;
 				$('input[name="edit"]', $li).attr('checked', checked);
 			}
 
@@ -272,13 +276,11 @@
 				permissions |= $(checkbox).data('permissions');
 			});
 
-			view.model.setPermissions(shareType, shareWith, permissions);
-
-			return false;
+			this.model.setPermissions(shareType, shareWith, permissions);
 		},
 
-		onCrudsToggle: function() {
-			$(this).siblings('.cruds').toggleClass('hidden');
+		onCrudsToggle: function(event) {
+			this.$el.find('.cruds').toggleClass('hidden');
 			return false;
 		}
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 416fff53de4..c0020d5b031 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -102,7 +102,7 @@
 					: options[name];
 			}
 
-			_.bindAll(this, 'autocompleteHandler');
+			_.bindAll(this, 'autocompleteHandler', '_onSelectRecipient');
 		},
 
 		autocompleteHandler: function (search, response) {
@@ -151,6 +151,11 @@
 				.appendTo(ul);
 		},
 
+		_onSelectRecipient: function(e, s) {
+			e.preventDefault();
+			this.model.addShare(s.item.value);
+		},
+
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
@@ -165,15 +170,7 @@
 				minLength: 2,
 				delay: 750,
 				source: this.autocompleteHandler,
-				select: function(e, s) {
-					var expiration = '';
-					if($('#expirationCheckbox').is(':checked') === true) {
-						expiration = view.$el.find('#expirationDate').val()
-					}
-					view.model.addShare(e, s, {
-						expiration: expiration
-					});
-				}
+				select: this._onSelectRecipient
 			}).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem;
 
 			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 949c86599bc..877b3cb230d 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -201,11 +201,9 @@
 			this.get('linkShare').password = password;
 		},
 
-		addShare: function(event, selected, options) {
-			event.preventDefault();
-
-			var shareType = selected.item.value.shareType;
-			var shareWith = selected.item.value.shareWith;
+		addShare: function(attributes, options) {
+			var shareType = attributes.shareType;
+			var shareWith = attributes.shareWith;
 			var fileName = this.fileInfoModel.get('name');
 			options = options || {};
 
@@ -241,6 +239,7 @@
 			var itemType = this.get('itemType');
 			var itemSource = this.get('itemSource');
 
+			// TODO: in the future, only set the permissions on the model but don't save directly
 			OC.Share.setPermissions(itemType, itemSource, shareType, shareWith, permissions);
 		},
 
-- 
GitLab


From e0a2004f4ca647f7d20ec885045ec9e2e899ea03 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 17:49:48 +0200
Subject: [PATCH 347/783] Clear field after adding user

---
 core/js/sharedialogview.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index c0020d5b031..36e63993203 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -153,6 +153,7 @@
 
 		_onSelectRecipient: function(e, s) {
 			e.preventDefault();
+			$(e.target).val('');
 			this.model.addShare(s.item.value);
 		},
 
-- 
GitLab


From aeee19b3f24eb60252ba55b89be745027ed39faf Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 18:03:44 +0200
Subject: [PATCH 348/783] Implement "notify by email" checkbox in share dialog

---
 core/js/sharedialogshareelistview.js | 15 ++++++++++++---
 core/js/shareitemmodel.js            | 28 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 8f68231398e..463d2468bbd 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -84,7 +84,8 @@
 		events: {
 			'click .unshare': 'onUnshare',
 			'click .permissions': 'onPermissionChange',
-			'click .showCruds': 'onCrudsToggle'
+			'click .showCruds': 'onCrudsToggle',
+			'click .mailNotification': 'onSendMailNotification'
 		},
 
 		initialize: function(options) {
@@ -279,11 +280,19 @@
 			this.model.setPermissions(shareType, shareWith, permissions);
 		},
 
-		onCrudsToggle: function(event) {
+		onCrudsToggle: function() {
 			this.$el.find('.cruds').toggleClass('hidden');
 			return false;
-		}
+		},
+
+		onSendMailNotification: function(event) {
+			var $target = $(event.target);
+			var $li = $(event.target).closest('li');
+			var shareType = $li.data('share-type');
+			var shareWith = $li.attr('data-share-with');
 
+			this.model.sendNotificationForShare(shareType, shareWith, $target.is(':checked'));
+		}
 	});
 
 	OC.Share.ShareDialogShareeListView = ShareDialogShareeListView;
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 877b3cb230d..595670faaef 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -465,6 +465,34 @@
 			return share.share_mail_send === '1';
 		},
 
+		/**
+		 * Sends an email notification for the given share
+		 *
+		 * @param {int} shareType share type
+		 * @param {string} shareWith recipient
+		 * @param {bool} state whether to set the notification flag or remove it
+		 */
+		sendNotificationForShare: function(shareType, shareWith, state) {
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+
+			$.post(
+				OC.generateUrl('core/ajax/share.php'),
+				{
+					action: state ? 'informRecipients' : 'informRecipientsDisabled',
+					recipient: shareWith,
+					shareType: shareType,
+					itemSource: itemSource,
+					itemType: itemType
+				},
+				function(result) {
+					if (result.status !== 'success') {
+						OC.dialogs.alert(t('core', result.data.message), t('core', 'Warning'));
+					}
+				}
+			);
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-- 
GitLab


From 62ff78787a0f033ca27a14051affa0be3c9393b2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 18:24:58 +0200
Subject: [PATCH 349/783] Implement email share link

---
 core/js/sharedialoglinkshareview.js | 30 +++++++++++++++++++++++++++-
 core/js/shareitemmodel.js           | 31 ++++++++++++++++++++++++++++-
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index cadec3071d3..599ffd3c43f 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -36,7 +36,7 @@
 			'</div>' +
 			'    {{/if}}' +
 			'    {{#if mailPublicNotificationEnabled}}' +
-			'<form id="emailPrivateLink">' +
+			'<form id="emailPrivateLink" class="emailPrivateLinkForm">' +
 			'    <input id="email" value="" placeholder="{{mailPrivatePlaceholder}}" type="text" />' +
 			'    <input id="emailButton" type="submit" value="{{mailButtonText}}" />' +
 			'</form>' +
@@ -69,6 +69,10 @@
 		/** @type {boolean} **/
 		showLink: true,
 
+		events: {
+			'submit .emailPrivateLinkForm': '_onEmailPrivateLink'
+		},
+
 		initialize: function(options) {
 			var view = this;
 
@@ -160,6 +164,28 @@
 			this.model.saveLinkShare();
 		},
 
+		_onEmailPrivateLink: function(event) {
+			event.preventDefault();
+
+			var $emailField = this.$el.find('#email');
+			var $emailButton = this.$el.find('#emailButton');
+			var email = this.$el.find('#email').val();
+			if (email !== '') {
+				$emailField.prop('disabled', true);
+				$emailButton.prop('disabled', true);
+				$emailField.val(t('core', 'Sending ...'));
+				this.model.sendEmailPrivateLink(email).then(function() {
+					$emailField.css('font-weight', 'bold').val(t('core','Email sent'));
+					setTimeout(function() {
+						$emailField.css('font-weight', 'normal').val('');
+						$emailField.prop('disabled', false);
+						$emailButton.prop('disabled', false);
+					}, 2000);
+				});
+			}
+			return false;
+		},
+
 		render: function() {
 			var linkShareTemplate = this.template();
 
@@ -222,6 +248,8 @@
 				}
 			});
 
+			this.delegateEvents();
+
 			return this;
 		},
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 595670faaef..e0d44586613 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -476,7 +476,7 @@
 			var itemType = this.get('itemType');
 			var itemSource = this.get('itemSource');
 
-			$.post(
+			return $.post(
 				OC.generateUrl('core/ajax/share.php'),
 				{
 					action: state ? 'informRecipients' : 'informRecipientsDisabled',
@@ -487,12 +487,41 @@
 				},
 				function(result) {
 					if (result.status !== 'success') {
+						// FIXME: a model should not show dialogs
 						OC.dialogs.alert(t('core', result.data.message), t('core', 'Warning'));
 					}
 				}
 			);
 		},
 
+		/**
+		 * Send the link share information by email
+		 *
+		 * @param {string} recipientEmail recipient email address
+		 */
+		sendEmailPrivateLink: function(recipientEmail) {
+			var itemType = this.get('itemType');
+			var itemSource = this.get('itemSource');
+			var linkShare = this.get('linkShare');
+
+			return $.post(
+				OC.generateUrl('core/ajax/share.php'), {
+					action: 'email',
+					toaddress: recipientEmail,
+					link: linkShare.link,
+					itemType: itemType,
+					itemSource: itemSource,
+					file: this.fileInfoModel.get('name'),
+					expiration: linkShare.expiration || ''
+				},
+				function(result) {
+					if (!result || result.status !== 'success') {
+						// FIXME: a model should not show dialogs
+						OC.dialogs.alert(result.data.message, t('core', 'Error while sending notification'));
+					}
+			});
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
-- 
GitLab


From 1933bcfa92d35dfc6ed38569e50c13805dd84396 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 18:34:56 +0200
Subject: [PATCH 350/783] Implement email autocomplete for link share

---
 core/js/sharedialoglinkshareview.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 599ffd3c43f..1191aa401b4 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -248,6 +248,33 @@
 				}
 			});
 
+			var $emailField = this.$el.find('#email');
+			if (isLinkShare && $emailField.length !== 0) {
+				$emailField.autocomplete({
+					minLength: 1,
+					source: function (search, response) {
+						$.get(
+							OC.generateUrl('core/ajax/share.php'), {
+								fetch: 'getShareWithEmail',
+								search: search.term
+							}, function(result) {
+								if (result.status == 'success' && result.data.length > 0) {
+									response(result.data);
+								}
+							});
+						},
+					select: function( event, item ) {
+						$emailField.val(item.item.email);
+						return false;
+					}
+				})
+				.data("ui-autocomplete")._renderItem = function( ul, item ) {
+					return $('<li>')
+						.append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' )
+						.appendTo( ul );
+				};
+			}
+
 			this.delegateEvents();
 
 			return this;
-- 
GitLab


From 41f16e821a086d9529cc4eb3f26e24bbb1e04c72 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 14 Sep 2015 18:40:09 +0200
Subject: [PATCH 351/783] Remove unused/obsoleted OC.Share code

The sharing dialog has been moved to ShareDialogView
---
 core/js/share.js | 424 -----------------------------------------------
 1 file changed, 424 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 01467b495f2..0a3bba49b6c 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -405,272 +405,6 @@ OC.Share = _.extend(OC.Share, {
 			OC.Share.droppedDown = true;
 		});
 		itemModel.fetch();
-		return;
-
-
-		var data = OC.Share.loadItem(itemType, itemSource);
-		var dropDownEl;
-		var html = '<div id="dropdown" class="drop shareDropDown" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
-		if (data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined && data.reshare.uid_owner !== OC.currentUser) {
-			html += '<span class="reshare">';
-			if (oc_config.enable_avatars === true) {
-				html += '<div class="avatar"></div> ';
-			}
-
-			if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
-				html += t('core', 'Shared with you and the group {group} by {owner}', {group: data.reshare.share_with, owner: data.reshare.displayname_owner});
-			} else {
-				html += t('core', 'Shared with you by {owner}', {owner: data.reshare.displayname_owner});
-			}
-			html += '</span><br />';
-			// reduce possible permissions to what the original share allowed
-			possiblePermissions = possiblePermissions & data.reshare.permissions;
-		}
-
-		if (possiblePermissions & OC.PERMISSION_SHARE) {
-			// Determine the Allow Public Upload status.
-			// Used later on to determine if the
-			// respective checkbox should be checked or
-			// not.
-
-			var publicUploadEnabled = $('#filestable').data('allow-public-upload');
-			if (typeof publicUploadEnabled == 'undefined') {
-				publicUploadEnabled = 'no';
-			}
-			var allowPublicUploadStatus = false;
-
-			$.each(data.shares, function(key, value) {
-				if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
-					allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
-					return true;
-				}
-			});
-
-			var sharePlaceholder = t('core', 'Share with users or groups …');
-			if(oc_appconfig.core.remoteShareAllowed) {
-				sharePlaceholder = t('core', 'Share with users, groups or remote users …');
-			}
-
-			html += '<label for="shareWith" class="hidden-visually">'+t('core', 'Share')+'</label>';
-			html += '<input id="shareWith" type="text" placeholder="' + sharePlaceholder + '" />';
-			if(oc_appconfig.core.remoteShareAllowed) {
-				var federatedCloudSharingDoc = '<a target="_blank" class="icon-info svg shareWithRemoteInfo" href="{docLink}" '
-					+ 'title="' + t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud') + '"></a>';
-				html += federatedCloudSharingDoc.replace('{docLink}', oc_appconfig.core.federatedCloudShareDoc);
-			}
-			html += '<span class="shareWithLoading icon-loading-small hidden"></span>';
-			html += '<ul id="shareWithList">';
-			html += '</ul>';
-			var linksAllowed = $('#allowShareWithLink').val() === 'yes';
-			if (link && linksAllowed) {
-				html += '<div id="link" class="linkShare">';
-				html += '<span class="icon-loading-small hidden"></span>';
-				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.defaultExpireDateEnforced) {
-					defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created',  {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
-				}
-
-				html += '<label for="linkText" class="hidden-visually">'+t('core', 'Link')+'</label>';
-				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 += '<label for="linkPassText" class="hidden-visually">'+t('core', 'Password')+'</label>';
-				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Choose a password for the public link')+'" />';
-				html += '<span class="icon-loading-small hidden"></span>';
-				html += '</div>';
-
-				if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') {
-					html += '<div id="allowPublicUploadWrapper" style="display:none;">';
-					html += '<span class="icon-loading-small hidden"></span>';
-					html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
-					html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow editing') + '</label>';
-					html += '</div>';
-				}
-				html += '</div>';
-				var mailPublicNotificationEnabled = $('input:hidden[name=mailPublicNotificationEnabled]').val();
-				if (mailPublicNotificationEnabled === 'yes') {
-					html += '<form id="emailPrivateLink">';
-					html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
-					html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
-					html += '</form>';
-				}
-			}
-
-			html += '<div id="expiration">';
-			html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
-			html += '<label for="expirationDate" class="hidden-visually">'+t('core', 'Expiration')+'</label>';
-			html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />';
-			html += '<em id="defaultExpireMessage">'+defaultExpireMessage+'</em>';
-			html += '</div>';
-			dropDownEl = $(html);
-			dropDownEl = dropDownEl.appendTo(appendTo);
-
-			// trigger remote share info tooltip
-			if(oc_appconfig.core.remoteShareAllowed) {
-				$('.shareWithRemoteInfo').tipsy({gravity: 'e'});
-			}
-
-			//Get owner avatars
-			if (oc_config.enable_avatars === true && data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) {
-				dropDownEl.find(".avatar").avatar(data.reshare.uid_owner, 32);
-			}
-
-			// Reset item shares
-			OC.Share.itemShares = [];
-			OC.Share.currentShares = {};
-			if (data.shares) {
-				$.each(data.shares, function(index, share) {
-					if (share.share_type == OC.Share.SHARE_TYPE_LINK) {
-						if (itemSource === share.file_source || itemSource === share.item_source) {
-							OC.Share.showLink(share.token, share.share_with, itemSource);
-						}
-					} else {
-						if (share.collection) {
-							OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, share.collection);
-						} else {
-							if (share.share_type === OC.Share.SHARE_TYPE_REMOTE) {
-								OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE, share.mail_send, false);
-							} else {
-								OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.mail_send, false);
-							}
-						}
-					}
-					if (share.expiration != null) {
-						OC.Share.showExpirationDate(share.expiration, share.stime);
-					}
-				});
-			}
-			$('#shareWith').autocomplete({minLength: 2, delay: 750, source: function(search, response) {
-				var $loading = $('#dropdown .shareWithLoading');
-				$loading.removeClass('hidden');
-				$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term.trim(), limit: 200, itemShares: OC.Share.itemShares, itemType: itemType }, function(result) {
-					$loading.addClass('hidden');
-					if (result.status == 'success' && result.data.length > 0) {
-						$( "#shareWith" ).autocomplete( "option", "autoFocus", true );
-						response(result.data);
-					} else {
-						response();
-					}
-				}).fail(function(){
-					$('#dropdown').find('.shareWithLoading').addClass('hidden');
-					OC.Notification.show(t('core', 'An error occured. Please try again'));
-					window.setTimeout(OC.Notification.hide, 5000);
-				});
-			},
-			focus: function(event, focused) {
-				event.preventDefault();
-			},
-			select: function(event, selected) {
-				event.stopPropagation();
-				var $dropDown = $('#dropdown');
-				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);
-				// Default permissions are Edit (CRUD) and Share
-				// Check if these permissions are possible
-				var permissions = OC.PERMISSION_READ;
-				if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
-					permissions = OC.PERMISSION_CREATE | OC.PERMISSION_UPDATE | OC.PERMISSION_READ;
-				} else {
-					if (possiblePermissions & OC.PERMISSION_UPDATE) {
-						permissions = permissions | OC.PERMISSION_UPDATE;
-					}
-					if (possiblePermissions & OC.PERMISSION_CREATE) {
-						permissions = permissions | OC.PERMISSION_CREATE;
-					}
-					if (possiblePermissions & OC.PERMISSION_DELETE) {
-						permissions = permissions | OC.PERMISSION_DELETE;
-					}
-					if (oc_appconfig.core.resharingAllowed && (possiblePermissions & OC.PERMISSION_SHARE)) {
-						permissions = permissions | OC.PERMISSION_SHARE;
-					}
-				}
-
-				var $input = $(this);
-				var $loading = $dropDown.find('.shareWithLoading');
-				$loading.removeClass('hidden');
-				$input.val(t('core', 'Adding user...'));
-				$input.prop('disabled', true);
-
-				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, expirationDate, function() {
-					$input.prop('disabled', false);
-					$loading.addClass('hidden');
-					var posPermissions = possiblePermissions;
-					if (shareType === OC.Share.SHARE_TYPE_REMOTE) {
-						posPermissions = permissions;
-					}
-					OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, posPermissions);
-					$('#shareWith').val('');
-					$('#dropdown').trigger(new $.Event('sharesChanged', {shares: OC.Share.currentShares}));
-					OC.Share.updateIcon(itemType, itemSource);
-				});
-				return false;
-			}
-			})
-			// customize internal _renderItem function to display groups and users differently
-			.data("ui-autocomplete")._renderItem = function( ul, item ) {
-				var insert = $( "<a>" );
-				var text = item.label;
-				if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
-					text = text +  ' ('+t('core', 'group')+')';
-				} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
-					text = text +  ' ('+t('core', 'remote')+')';
-				}
-				insert.text( text );
-				if(item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
-					insert = insert.wrapInner('<strong></strong>');
-				}
-				return $( "<li>" )
-					.addClass((item.value.shareType === OC.Share.SHARE_TYPE_GROUP)?'group':'user')
-					.append( insert )
-					.appendTo( ul );
-			};
-			if (link && linksAllowed && $('#email').length != 0) {
-				$('#email').autocomplete({
-					minLength: 1,
-					source: function (search, response) {
-						$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWithEmail', search: search.term }, function(result) {
-							if (result.status == 'success' && result.data.length > 0) {
-								response(result.data);
-							}
-						});
-						},
-					select: function( event, item ) {
-						$('#email').val(item.item.email);
-						return false;
-					}
-				})
-				.data("ui-autocomplete")._renderItem = function( ul, item ) {
-					return $('<li>')
-						.append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' )
-						.appendTo( ul );
-				};
-			}
-
-		} else {
-			html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Resharing is not allowed')+'" style="width:90%;" disabled="disabled"/>';
-			html += '</div>';
-			dropDownEl = $(html);
-			dropDownEl.appendTo(appendTo);
-		}
-		dropDownEl.attr('data-item-source-name', filename);
-		$('#dropdown').slideDown(OC.menuSpeed, function() {
-			OC.Share.droppedDown = true;
-		});
-		if ($('html').hasClass('lte9')){
-			$('#dropdown input[placeholder]').placeholder();
-		}
-		$('#shareWith').focus();
 	},
 	hideDropDown:function(callback) {
 		OC.Share.currentShares = null;
@@ -687,66 +421,6 @@ OC.Share = _.extend(OC.Share, {
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
-	},
-	/**
-	 * Parses a string to an valid integer (unix timestamp)
-	 * @param time
-	 * @returns {*}
-	 * @internal Only used to work around a bug in the backend
-	 */
-	_parseTime: function(time) {
-		if (_.isString(time)) {
-			// skip empty strings and hex values
-			if (time === '' || (time.length > 1 && time[0] === '0' && time[1] === 'x')) {
-				return null;
-			}
-			time = parseInt(time, 10);
-			if(isNaN(time)) {
-				time = null;
-			}
-		}
-		return time;
-	},
-	/**
-	 * Displays the expiration date field
-	 *
-	 * @param {Date} date current expiration date
-	 * @param {int} [shareTime] share timestamp in seconds, defaults to now
-	 */
-	showExpirationDate:function(date, shareTime) {
-		var now = new Date();
-		// min date should always be the next day
-		var minDate = new Date();
-		minDate.setDate(minDate.getDate()+1);
-		var datePickerOptions = {
-			minDate: minDate,
-			maxDate: null
-		};
-		// TODO: hack: backend returns string instead of integer
-		shareTime = OC.Share._parseTime(shareTime);
-		if (_.isNumber(shareTime)) {
-			shareTime = new Date(shareTime * 1000);
-		}
-		if (!shareTime) {
-			shareTime = now;
-		}
-		$('#expirationCheckbox').attr('checked', true);
-		$('#expirationDate').val(date);
-		$('#expirationDate').slideDown(OC.menuSpeed);
-		$('#expirationDate').css('display','block');
-		$('#expirationDate').datepicker({
-			dateFormat : 'dd-mm-yy'
-		});
-		if (oc_appconfig.core.defaultExpireDateEnforced) {
-			$('#expirationCheckbox').attr('disabled', true);
-			shareTime = OC.Util.stripTime(shareTime).getTime();
-			// max date is share date + X days
-			datePickerOptions.maxDate = new Date(shareTime + oc_appconfig.core.defaultExpireDate * 24 * 3600 * 1000);
-		}
-		if(oc_appconfig.core.defaultExpireDateEnabled) {
-			$('#defaultExpireMessage').slideDown(OC.menuSpeed);
-		}
-		$.datepicker.setDefaults(datePickerOptions);
 	}
 });
 
@@ -776,104 +450,6 @@ $(document).ready(function() {
 		}
 	});
 
-	$(document).on('click', '#dropdown #expirationCheckbox', function() {
-		if (this.checked) {
-			OC.Share.showExpirationDate('');
-		} else {
-			var itemType = $('#dropdown').data('item-type');
-			var itemSource = $('#dropdown').data('item-source');
-			$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: '' }, function(result) {
-				if (!result || result.status !== 'success') {
-					OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error'));
-				}
-				$('#expirationDate').slideUp(OC.menuSpeed);
-				if (oc_appconfig.core.defaultExpireDateEnforced === false) {
-					$('#defaultExpireMessage').slideDown(OC.menuSpeed);
-				}
-			});
-		}
-	});
-
-	$(document).on('change', '#dropdown #expirationDate', function() {
-		var itemType = $('#dropdown').data('item-type');
-		var itemSource = $('#dropdown').data('item-source');
-
-		$(this).tipsy('hide');
-		$(this).removeClass('error');
-
-		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
-			if (!result || result.status !== 'success') {
-				var expirationDateField = $('#dropdown #expirationDate');
-				if (!result.data.message) {
-					expirationDateField.attr('original-title', t('core', 'Error setting expiration date'));
-				} else {
-					expirationDateField.attr('original-title', result.data.message);
-				}
-				expirationDateField.tipsy({gravity: 'n'});
-				expirationDateField.tipsy('show');
-				expirationDateField.addClass('error');
-			} else {
-				if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
-					$('#defaultExpireMessage').slideUp(OC.menuSpeed);
-				}
-			}
-		});
-	});
-
-
-	$(document).on('submit', '#dropdown #emailPrivateLink', function(event) {
-		event.preventDefault();
-		var link = $('#linkText').val();
-		var itemType = $('#dropdown').data('item-type');
-		var itemSource = $('#dropdown').data('item-source');
-		var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
-		var email = $('#email').val();
-		var expirationDate = '';
-		if ( $('#expirationCheckbox').is(':checked') === true ) {
-			expirationDate = $( "#expirationDate" ).val();
-		}
-		if (email != '') {
-			$('#email').prop('disabled', true);
-			$('#email').val(t('core', 'Sending ...'));
-			$('#emailButton').prop('disabled', true);
-
-			$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file, expiration: expirationDate},
-				function(result) {
-					$('#email').prop('disabled', false);
-					$('#emailButton').prop('disabled', false);
-				if (result && result.status == 'success') {
-					$('#email').css('font-weight', 'bold').val(t('core','Email sent'));
-					setTimeout(function() {
-						$('#email').css('font-weight', 'normal').val('');
-					}, 2000);
-				} else {
-					OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
-				}
-			});
-		}
-	});
-
-	$(document).on('click', '#dropdown input[name=mailNotification]', function() {
-		var $li = $(this).closest('li');
-		var itemType = $('#dropdown').data('item-type');
-		var itemSource = $('#dropdown').data('item-source');
-		var action = '';
-		if (this.checked) {
-			action = 'informRecipients';
-		} else {
-			action = 'informRecipientsDisabled';
-		}
-
-		var shareType = $li.data('share-type');
-		var shareWith = $li.attr('data-share-with');
-
-		$.post(OC.filePath('core', 'ajax', 'share.php'), {action: action, recipient: shareWith, shareType: shareType, itemSource: itemSource, itemType: itemType}, function(result) {
-			if (result.status !== 'success') {
-				OC.dialogs.alert(t('core', result.data.message), t('core', 'Warning'));
-			}
-		});
-
-});
 
 
 });
-- 
GitLab


From 886f1ed660e91edb8f370cf711ed395fdff7dc30 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 10:27:33 +0200
Subject: [PATCH 352/783] Update JS unit tests for share dialog (WIP)

---
 apps/files_sharing/js/sharetabview.js      |    1 +
 apps/files_sharing/tests/js/shareSpec.js   |  125 +--
 core/js/core.json                          |    7 +
 core/js/share.js                           |    4 +-
 core/js/shareconfigmodel.js                |    2 +
 core/js/sharedialoglinkshareview.js        |    2 +-
 core/js/tests/specs/shareSpec.js           | 1100 --------------------
 core/js/tests/specs/sharedialogviewSpec.js |  911 ++++++++++++++++
 core/js/tests/specs/shareitemmodelSpec.js  |  234 +++++
 tests/karma.config.js                      |    3 +-
 10 files changed, 1217 insertions(+), 1172 deletions(-)
 create mode 100644 core/js/tests/specs/sharedialogviewSpec.js
 create mode 100644 core/js/tests/specs/shareitemmodelSpec.js

diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 1ad17365957..68288500ae0 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -55,6 +55,7 @@
 					owner: owner
 				}));
 
+				// TODO: the model should read these directly off the passed fileInfoModel
 				var attributes = {
 					itemType: this.model.isDirectory() ? 'folder' : 'file',
 				   	itemSource: this.model.get('id'),
diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js
index b6368b901ee..96a96f1b814 100644
--- a/apps/files_sharing/tests/js/shareSpec.js
+++ b/apps/files_sharing/tests/js/shareSpec.js
@@ -97,7 +97,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder.svg');
 			expect($action.find('img').length).toEqual(1);
@@ -116,7 +115,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('Shared');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
@@ -137,7 +135,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('Shared');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('public.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-public.svg');
@@ -158,7 +155,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
@@ -178,7 +174,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
@@ -200,7 +195,6 @@ describe('OCA.Sharing.Util tests', function() {
 			$tr = fileList.$el.find('tbody tr:first');
 			expect($tr.find('.action-share').length).toEqual(0);
 			$action = $tr.find('.action-share-notification');
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
@@ -225,7 +219,7 @@ describe('OCA.Sharing.Util tests', function() {
 		});
 	});
 	describe('Share action', function() {
-		var showDropDownStub;
+		var shareTab;
 
 		function makeDummyShareItem(displayName) {
 			return {
@@ -234,12 +228,35 @@ describe('OCA.Sharing.Util tests', function() {
 		}
 
 		beforeEach(function() {
-			showDropDownStub = sinon.stub(OC.Share, 'showDropDown', function() {
-				$('#testArea').append($('<div id="dropdown"></div>'));
-			});
+			// make it look like not the "All files" list
+			fileList.id = 'test';
+			shareTab = fileList._detailsView._tabViews[0];
 		});
 		afterEach(function() {
-			showDropDownStub.restore();
+			shareTab = null;
+		});
+		it('clicking share action opens sidebar and share tab', function() {
+			var showDetailsViewStub = sinon.stub(fileList, 'showDetailsView');
+
+			fileList.setFiles([{
+				id: 1,
+				type: 'file',
+				name: 'One.txt',
+				path: '/subdir',
+				mimetype: 'text/plain',
+				size: 12,
+				permissions: OC.PERMISSION_ALL,
+				etag: 'abc'
+			}]);
+
+			var $tr = fileList.$el.find('tr:first');
+			$tr.find('.action-share').click();
+
+			expect(showDetailsViewStub.calledOnce).toEqual(true);
+			expect(showDetailsViewStub.getCall(0).args[0]).toEqual('One.txt');
+			expect(showDetailsViewStub.getCall(0).args[1]).toEqual('shareTabView');
+
+			showDetailsViewStub.restore();
 		});
 		it('adds share icon after sharing a non-shared file', function() {
 			var $action, $tr;
@@ -257,24 +274,20 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(true);
-
 			$tr.find('.action-share').click();
 
-			expect(showDropDownStub.calledOnce).toEqual(true);
-
-			// simulate what the dropdown does
-			var shares = {};
-			OC.Share.itemShares[OC.Share.SHARE_TYPE_USER] = ['user1', 'user2'];
-			OC.Share.itemShares[OC.Share.SHARE_TYPE_GROUP] = ['group1', 'group2'];
-			shares[OC.Share.SHARE_TYPE_USER] = _.map(['User One', 'User Two'], makeDummyShareItem);
-			shares[OC.Share.SHARE_TYPE_GROUP] = _.map(['Group One', 'Group Two'], makeDummyShareItem);
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: shares}));
+			// simulate updating shares
+			shareTab._dialog.model.set({
+				shares: [
+					{share_with_displayname: 'User One'},
+					{share_with_displayname: 'User Two'},
+					{share_with_displayname: 'Group One'},
+					{share_with_displayname: 'Group Two'}
+				]
+			});
 
 			expect($tr.attr('data-share-recipients')).toEqual('Group One, Group Two, User One, User Two');
 
-			OC.Share.updateIcon('file', 1);
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('Shared with Group One, Group Two, User One, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
@@ -294,23 +307,19 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(true);
-
 			$tr.find('.action-share').click();
 
-			expect(showDropDownStub.calledOnce).toEqual(true);
-
-			// simulate what the dropdown does
-			var shares = {};
-			OC.Share.itemShares[OC.Share.SHARE_TYPE_USER] = ['user1', 'user2', 'user3'];
-			shares[OC.Share.SHARE_TYPE_USER] = _.map(['User One', 'User Two', 'User Three'], makeDummyShareItem);
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: shares}));
+			// simulate updating shares
+			shareTab._dialog.model.set({
+				shares: [
+					{share_with_displayname: 'User One'},
+					{share_with_displayname: 'User Two'},
+					{share_with_displayname: 'User Three'}
+				]
+			});
 
 			expect($tr.attr('data-share-recipients')).toEqual('User One, User Three, User Two');
 
-			OC.Share.updateIcon('file', 1);
-
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Three, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
@@ -331,20 +340,14 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(true);
-
 			$tr.find('.action-share').click();
 
-			expect(showDropDownStub.calledOnce).toEqual(true);
-
-			// simulate what the dropdown does
-			OC.Share.itemShares = {};
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: {}}));
+			// simulate updating shares
+			shareTab._dialog.model.set({
+				shares: []
+			});
 
 			expect($tr.attr('data-share-recipients')).not.toBeDefined();
-
-			OC.Share.updateIcon('file', 1);
-			expect($action.hasClass('permanent')).toEqual(true);
 		});
 		it('keep share text after updating reshare', function() {
 			var $action, $tr;
@@ -363,23 +366,15 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(true);
-
 			$tr.find('.action-share').click();
 
-			expect(showDropDownStub.calledOnce).toEqual(true);
-
-			// simulate what the dropdown does
-			var shares = {};
-			OC.Share.itemShares[OC.Share.SHARE_TYPE_USER] = ['user2'];
-			shares[OC.Share.SHARE_TYPE_USER] = _.map(['User Two'], makeDummyShareItem);
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: shares}));
+			// simulate updating shares
+			shareTab._dialog.model.set({
+				shares: [{share_with_displayname: 'User Two'}]
+			});
 
 			expect($tr.attr('data-share-recipients')).toEqual('User Two');
 
-			OC.Share.updateIcon('file', 1);
-
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
@@ -401,21 +396,15 @@ describe('OCA.Sharing.Util tests', function() {
 			$action = fileList.$el.find('tbody tr:first .action-share');
 			$tr = fileList.$el.find('tr:first');
 
-			expect($action.hasClass('permanent')).toEqual(true);
-
 			$tr.find('.action-share').click();
 
-			expect(showDropDownStub.calledOnce).toEqual(true);
-
-			// simulate what the dropdown does
-			OC.Share.itemShares = {};
-			$('#dropdown').trigger(new $.Event('sharesChanged', {shares: {}}));
+			// simulate updating shares
+			shareTab._dialog.model.set({
+				shares: []
+			});
 
 			expect($tr.attr('data-share-recipients')).not.toBeDefined();
 
-			OC.Share.updateIcon('file', 1);
-
-			expect($action.hasClass('permanent')).toEqual(true);
 			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
diff --git a/core/js/core.json b/core/js/core.json
index a67491c4a35..a80636e8463 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -24,6 +24,13 @@
 		"l10n.js",
 		"apps.js",
 		"share.js",
+		"shareconfigmodel.js",
+		"shareitemmodel.js",
+		"sharedialogview.js",
+		"sharedialogexpirationview.js",
+		"sharedialoglinkshareview.js",
+		"sharedialogresharerinfoview.js",
+		"sharedialogshareelistview.js",
 		"octemplate.js",
 		"eventsource.js",
 		"config.js",
diff --git a/core/js/share.js b/core/js/share.js
index 0a3bba49b6c..a2e6e6af0fc 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -3,7 +3,7 @@
 /**
  * @namespace
  */
-OC.Share = _.extend(OC.Share, {
+OC.Share = _.extend(OC.Share || {}, {
 	SHARE_TYPE_USER:0,
 	SHARE_TYPE_GROUP:1,
 	SHARE_TYPE_LINK:3,
@@ -445,7 +445,7 @@ $(document).ready(function() {
 		var target = $(event.target);
 		var isMatched = !target.is('.drop, .ui-datepicker-next, .ui-datepicker-prev, .ui-icon')
 			&& !target.closest('#ui-datepicker-div').length && !target.closest('.ui-autocomplete').length;
-		if (OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) {
+		if (OC.Share && OC.Share.droppedDown && isMatched && $('#dropdown').has(event.target).length === 0) {
 			OC.Share.hideDropDown();
 		}
 	});
diff --git a/core/js/shareconfigmodel.js b/core/js/shareconfigmodel.js
index 16f7e2514d8..8729698d136 100644
--- a/core/js/shareconfigmodel.js
+++ b/core/js/shareconfigmodel.js
@@ -14,6 +14,8 @@
 		OC.Share.Types = {};
 	}
 
+	// FIXME: the config model should populate its own model attributes based on
+	// the old DOM-based config
 	var ShareConfigModel = OC.Backbone.Model.extend({
 		defaults: {
 			publicUploadEnabled: false,
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 1191aa401b4..2c7914b2545 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -236,7 +236,7 @@
 			}));
 
 			// TODO: move this to delegate events instead
-			this.$el.find('#linkCheckbox').change(this.onLinkCheckBoxChange);
+			this.$el.find('#linkCheckbox').click(this.onLinkCheckBoxChange);
 			this.$el.find('#sharingDialogAllowPublicUpload').change(this.onAllowPublicUploadChange);
 			this.$el.find('#linkText').click(this.onLinkTextClick);
 			this.$el.find('#showPassword').click(this.onShowPasswordClick);
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index 5a59a117d77..9e80f4fe19d 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -21,1090 +21,6 @@
 
 /* global oc_appconfig */
 describe('OC.Share tests', function() {
-	describe('dropdown', function() {
-		var $container;
-		var oldAppConfig;
-		var loadItemStub;
-		var autocompleteStub;
-		var oldEnableAvatars;
-		var avatarStub;
-		var placeholderStub;
-		var oldCurrentUser;
-
-		beforeEach(function() {
-			$('#testArea').append($('<div id="shareContainer"></div>'));
-			// horrible parameters
-			$('#testArea').append('<input id="allowShareWithLink" type="hidden" value="yes">');
-			$('#testArea').append('<input id="mailPublicNotificationEnabled" name="mailPublicNotificationEnabled" type="hidden" value="yes">');
-			$container = $('#shareContainer');
-			/* jshint camelcase:false */
-			oldAppConfig = _.extend({}, oc_appconfig.core);
-			oc_appconfig.core.enforcePasswordForPublicLink = false;
-
-			loadItemStub = sinon.stub(OC.Share, 'loadItem');
-			loadItemStub.returns({
-				reshare: [],
-				shares: []
-			});
-
-			autocompleteStub = sinon.stub($.fn, 'autocomplete', function() {
-				// dummy container with the expected attributes
-				if (!$(this).length) {
-					// simulate the real autocomplete that returns
-					// nothing at all when no element is specified
-					// (and potentially break stuff)
-					return null;
-				}
-				var $el = $('<div></div>').data('ui-autocomplete', {});
-				return $el;
-			});
-
-			oldEnableAvatars = oc_config.enable_avatars;
-			oc_config.enable_avatars = false;
-			avatarStub = sinon.stub($.fn, 'avatar');
-			placeholderStub = sinon.stub($.fn, 'imageplaceholder');
-
-			oldCurrentUser = OC.currentUser;
-			OC.currentUser = 'user0';
-		});
-		afterEach(function() {
-			OC.currentUser = oldCurrentUser;
-			/* jshint camelcase:false */
-			oc_appconfig.core = oldAppConfig;
-			loadItemStub.restore();
-
-			autocompleteStub.restore();
-			avatarStub.restore();
-			placeholderStub.restore();
-			oc_config.enable_avatars = oldEnableAvatars;
-			$('#dropdown').remove();
-		});
-		it('calls loadItem with the correct arguments', function() {
-			OC.Share.showDropDown(
-				'file',
-			   	123,
-			   	$container,
-				true,
-				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,
-				true,
-				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
-		});
-		describe('Share with link', function() {
-			// TODO: test ajax calls
-			// TODO: test password field visibility (whenever enforced or not)
-			it('update password on focus out', function() {
-				$('#allowShareWithLink').val('yes');
-
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-
-				// Toggle linkshare
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				// Enable password, enter password and focusout
-				$('#dropdown [name=showPassword]').click();
-				$('#dropdown #linkPassText').focus();
-				$('#dropdown #linkPassText').val('foo');
-				$('#dropdown #linkPassText').focusout();
-
-				expect(fakeServer.requests[1].method).toEqual('POST');
-				var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
-				expect(body['shareWith']).toEqual('foo');
-
-				// Set password response
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				expect($('#dropdown #linkPassText').val()).toEqual('');
-				expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Password protected');
-			});
-			it('update password on enter', function() {
-				$('#allowShareWithLink').val('yes');
-
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-
-				// Toggle linkshare
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				// Enable password and enter password
-				$('#dropdown [name=showPassword]').click();
-				$('#dropdown #linkPassText').focus();
-				$('#dropdown #linkPassText').val('foo');
-				$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-
-				expect(fakeServer.requests[1].method).toEqual('POST');
-				var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
-				expect(body['shareWith']).toEqual('foo');
-
-				// Set password response
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				expect($('#dropdown #linkPassText').val()).toEqual('');
-				expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Password protected');
-			});
-			it('shows share with link checkbox when allowed', function() {
-				$('#allowShareWithLink').val('yes');
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,		
-					31,
-					'shared_file_name.txt'
-				);
-				expect($('#dropdown #linkCheckbox').length).toEqual(1);
-			});
-			it('does not show share with link checkbox when not allowed', function() {
-				$('#allowShareWithLink').val('no');
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,		
-					31,
-					'shared_file_name.txt'
-				);
-				expect($('#dropdown #linkCheckbox').length).toEqual(0);
-			});
-			it('Reset link when password is enforced and link is toggled', function() { 
-				var old = oc_appconfig.core.enforcePasswordForPublicLink;
-				oc_appconfig.core.enforcePasswordForPublicLink = true;
-				$('#allowShareWithLink').val('yes');
-
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-
-				// Toggle linkshare
-				$('#dropdown [name=linkCheckbox]').click();
-				expect($('#dropdown #linkText').val()).toEqual('');
-
-				// Set password
-				$('#dropdown #linkPassText').val('foo');
-				$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				// Remove link
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-
-				/*
-				 * Try to share again
-				 * The linkText should be emptied
-				 */
-				$('#dropdown [name=linkCheckbox]').click();
-				expect($('#dropdown #linkText').val()).toEqual('');
-
-				/*
-				 * Do not set password but untoggle
-				 * Since there is no share this should not result in another request to the server
-				 */
-				$('#dropdown [name=linkCheckbox]').click();
-				expect(fakeServer.requests.length).toEqual(2);
-
-				oc_appconfig.core.enforcePasswordForPublicLink = old;
-			});
-
-			it('Reset password placeholder when password is enforced and link is toggled', function() { 
-				var old = oc_appconfig.core.enforcePasswordForPublicLink;
-				oc_appconfig.core.enforcePasswordForPublicLink = true;
-				$('#allowShareWithLink').val('yes');
-
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-
-				// Toggle linkshare
-				$('#dropdown [name=linkCheckbox]').click();
-				expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
-
-				// Set password
-				$('#dropdown #linkPassText').val('foo');
-				$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-				expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('**********');
-
-				// Remove link
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-
-				// Try to share again
-				$('#dropdown [name=linkCheckbox]').click();
-				expect($('#dropdown #linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
-
-				oc_appconfig.core.enforcePasswordForPublicLink = old;
-			});
-			it('reset password on toggle of share', function() {
-				$('#allowShareWithLink').val('yes');
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				//Password protection should be unchecked and password field not visible
-				expect($('#dropdown [name=showPassword]').prop('checked')).toEqual(false);
-				expect($('#dropdown #linkPass').is(":visible")).toEqual(false);
-
-				// Toggle and set password
-				$('#dropdown [name=showPassword]').click();
-				$('#dropdown #linkPassText').val('foo');
-				$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
-				);
-
-				// Unshare
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[2].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-
-				// Toggle share again
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[3].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
-				);
-
-
-				// Password checkbox should be unchecked
-				expect($('#dropdown [name=showPassword]').prop('checked')).toEqual(false);
-				expect($('#dropdown #linkPass').is(":visible")).toEqual(false);
-			});
-			it('reset expiration on toggle of share', function() {
-				$('#allowShareWithLink').val('yes');
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-				);
-
-				//Expiration should be unchecked and expiration field not visible
-				expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
-				expect($('#dropdown #expirationDate').is(":visible")).toEqual(false);
-
-				// Toggle and set password
-				$('#dropdown [name=expirationCheckbox]').click();
-				d = new Date();
-				d.setDate(d.getDate() + 1);
-				date=d.getDate() + '-' + (d.getMonth()+1) + '-' + d.getFullYear();
-				$('#dropdown #expirationDate').val(date);
-				$('#dropdown #expirationDate').change();
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
-				);
-
-				// Unshare
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[2].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-
-				// Toggle share again
-				$('#dropdown [name=linkCheckbox]').click();
-				fakeServer.requests[3].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
-				);
-
-				// Recheck expire visibility
-				expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
-				expect($('#dropdown #expirationDate').is(":visible")).toEqual(false);
-			});
-			it('shows populated link share when a link share exists', function() {
-				loadItemStub.returns({
-					reshare: [],
-					/* jshint camelcase: false */
-					shares: [{
-						displayname_owner: 'root',
-						expiration: null,
-						file_source: 123,
-						file_target: '/folder',
-						id: 20,
-						item_source: '123',
-						item_type: 'folder',
-						mail_send: '0',
-						parent: null,
-						path: '/folder',
-						permissions: OC.PERMISSION_READ,
-						share_type: OC.Share.SHARE_TYPE_LINK,
-						share_with: null,
-						stime: 1403884258,
-						storage: 1,
-						token: 'tehtoken',
-						uid_owner: 'root'
-					}]
-				});
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'folder'
-				);
-				expect($('#dropdown #linkCheckbox').prop('checked')).toEqual(true);
-				// this is how the OC.Share class does it...
-				var link = parent.location.protocol + '//' + location.host +
-					OC.generateUrl('/s/') + 'tehtoken';
-				expect($('#dropdown #linkText').val()).toEqual(link);
-			});
-			it('does not show populated link share when a link share exists for a different file', function() {
-				loadItemStub.returns({
-					reshare: [],
-					/* jshint camelcase: false */
-					shares: [{
-						displayname_owner: 'root',
-						expiration: null,
-						file_source: 123,
-						file_target: '/folder',
-						id: 20,
-						item_source: '123',
-						item_type: 'folder',
-						mail_send: '0',
-						parent: null,
-						path: '/folder',
-						permissions: OC.PERMISSION_READ,
-						share_type: OC.Share.SHARE_TYPE_LINK,
-						share_with: null,
-						stime: 1403884258,
-						storage: 1,
-						token: 'tehtoken',
-						uid_owner: 'root'
-					}]
-				});
-				OC.Share.showDropDown(
-					'file',
-					456, // another file
-					$container,
-					true,
-					31,
-					'folder'
-				);
-				expect($('#dropdown #linkCheckbox').prop('checked')).toEqual(false);
-			});
-			it('shows correct link share when a nest link share exists along with parent one', function() {
-				loadItemStub.returns({
-					reshare: [],
-					/* jshint camelcase: false */
-					shares: [{
-						displayname_owner: 'root',
-						expiration: null,
-						file_source: 123,
-						file_target: '/folder',
-						id: 20,
-						item_source: '123',
-						item_type: 'file',
-						mail_send: '0',
-						parent: null,
-						path: '/folder',
-						permissions: OC.PERMISSION_READ,
-						share_type: OC.Share.SHARE_TYPE_LINK,
-						share_with: null,
-						stime: 1403884258,
-						storage: 1,
-						token: 'tehtoken',
-						uid_owner: 'root'
-					}, {
-						displayname_owner: 'root',
-						expiration: null,
-						file_source: 456,
-						file_target: '/file_in_folder.txt',
-						id: 21,
-						item_source: '456',
-						item_type: 'file',
-						mail_send: '0',
-						parent: null,
-						path: '/folder/file_in_folder.txt',
-						permissions: OC.PERMISSION_READ,
-						share_type: OC.Share.SHARE_TYPE_LINK,
-						share_with: null,
-						stime: 1403884509,
-						storage: 1,
-						token: 'anothertoken',
-						uid_owner: 'root'
-					}]
-				});
-
-				// parent one
-				OC.Share.showDropDown(
-					'folder',
-					123,
-					$container,
-					true,
-					31,
-					'folder'
-				);
-				expect($('#dropdown #linkCheckbox').prop('checked')).toEqual(true);
-				// this is how the OC.Share class does it...
-				var link = parent.location.protocol + '//' + location.host +
-					OC.generateUrl('/s/') + 'tehtoken';
-				expect($('#dropdown #linkText').val()).toEqual(link);
-
-				// nested one
-				OC.Share.showDropDown(
-					'file',
-					456,
-					$container,
-					true,
-					31,
-					'file_in_folder.txt'
-				);
-				expect($('#dropdown #linkCheckbox').prop('checked')).toEqual(true);
-				// this is how the OC.Share class does it...
-				link = parent.location.protocol + '//' + location.host +
-					OC.generateUrl('/s/') + 'anothertoken';
-				expect($('#dropdown #linkText').val()).toEqual(link);
-			});
-			describe('expiration date', function() {
-				var shareData;
-				var shareItem;
-				var clock;
-				var expectedMinDate;
-
-				function showDropDown() {
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						31,
-						'folder'
-					);
-				}
-
-				beforeEach(function() {
-					// pick a fake date
-					clock = sinon.useFakeTimers(new Date(2014, 0, 20, 14, 0, 0).getTime());
-					expectedMinDate = new Date(2014, 0, 21, 14, 0, 0);
-					shareItem = {
-						displayname_owner: 'root',
-						expiration: null,
-						file_source: 123,
-						file_target: '/folder',
-						id: 20,
-						item_source: '123',
-						item_type: 'folder',
-						mail_send: '0',
-						parent: null,
-						path: '/folder',
-						permissions: OC.PERMISSION_READ,
-						share_type: OC.Share.SHARE_TYPE_LINK,
-						share_with: null,
-						stime: 1403884258,
-						storage: 1,
-						token: 'tehtoken',
-						uid_owner: 'root'
-					};
-					shareData = {
-						reshare: [],
-						shares: []
-					};
-					loadItemStub.returns(shareData);
-					oc_appconfig.core.defaultExpireDate = 7;
-					oc_appconfig.core.enforcePasswordForPublicLink = false;
-					oc_appconfig.core.defaultExpireDateEnabled = false;
-					oc_appconfig.core.defaultExpireDateEnforced = false;
-				});
-				afterEach(function() {
-					clock.restore();
-				});
-
-				it('does not check expiration date checkbox when no date was set', function() {
-					shareItem.expiration = null;
-					shareData.shares.push(shareItem);
-					showDropDown();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
-					expect($('#dropdown #expirationDate').val()).toEqual('');
-				});
-				it('does not check expiration date checkbox for new share', function() {
-					showDropDown();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
-					expect($('#dropdown #expirationDate').val()).toEqual('');
-				});
-				it('checks expiration date checkbox and populates field when expiration date was set', function() {
-					shareItem.expiration = 1234;
-					shareData.shares.push(shareItem);
-					showDropDown();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-					expect($('#dropdown #expirationDate').val()).toEqual('1234');
-				});
-				it('sets default date when default date setting is enabled', function() {
-					/* jshint camelcase:false */
-					oc_appconfig.core.defaultExpireDateEnabled = true;
-					showDropDown();
-					$('#dropdown [name=linkCheckbox]').click();
-					// enabled by default
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-					// TODO: those zeros must go...
-					expect($('#dropdown #expirationDate').val()).toEqual('2014-1-27 00:00:00');
-
-					// disabling is allowed
-					$('#dropdown [name=expirationCheckbox]').click();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(false);
-				});
-				it('enforces default date when enforced date setting is enabled', function() {
-					/* jshint camelcase:false */
-					oc_appconfig.core.defaultExpireDateEnabled = true;
-					oc_appconfig.core.defaultExpireDateEnforced = true;
-					showDropDown();
-					$('#dropdown [name=linkCheckbox]').click();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-					// TODO: those zeros must go...
-					expect($('#dropdown #expirationDate').val()).toEqual('2014-1-27 00:00:00');
-
-					// disabling is not allowed
-					expect($('#dropdown [name=expirationCheckbox]').prop('disabled')).toEqual(true);
-					$('#dropdown [name=expirationCheckbox]').click();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-				});
-				it('enforces default date when enforced date setting is enabled and password is enforced', function() {
-					/* jshint camelcase:false */
-					oc_appconfig.core.enforcePasswordForPublicLink = true;
-					oc_appconfig.core.defaultExpireDateEnabled = true;
-					oc_appconfig.core.defaultExpireDateEnforced = true;
-					showDropDown();
-					$('#dropdown [name=linkCheckbox]').click();
-
-					//Enter password
-					$('#dropdown #linkPassText').val('foo');
-					$('#dropdown #linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-					fakeServer.requests[0].respond(
-						200,
-						{ 'Content-Type': 'application/json' },
-						JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-					);
-
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-					// TODO: those zeros must go...
-					expect($('#dropdown #expirationDate').val()).toEqual('2014-1-27 00:00:00');
-
-					// disabling is not allowed
-					expect($('#dropdown [name=expirationCheckbox]').prop('disabled')).toEqual(true);
-					$('#dropdown [name=expirationCheckbox]').click();
-					expect($('#dropdown [name=expirationCheckbox]').prop('checked')).toEqual(true);
-				});
-				it('displayes email form when sending emails is enabled', function() {
-					$('input[name=mailPublicNotificationEnabled]').val('yes');
-					showDropDown();
-					expect($('#emailPrivateLink').length).toEqual(1);
-				});
-				it('not renders email form when sending emails is disabled', function() {
-					$('input[name=mailPublicNotificationEnabled]').val('no');
-					showDropDown();
-					expect($('#emailPrivateLink').length).toEqual(0);
-				});
-				it('sets picker minDate to today and no maxDate by default', function() {
-					showDropDown();
-					$('#dropdown [name=linkCheckbox]').click();
-					$('#dropdown [name=expirationCheckbox]').click();
-					expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
-					expect($.datepicker._defaults.maxDate).toEqual(null);
-				});
-				it('limits the date range to X days after share time when enforced', function() {
-					/* jshint camelcase:false */
-					oc_appconfig.core.defaultExpireDateEnabled = true;
-					oc_appconfig.core.defaultExpireDateEnforced = true;
-					showDropDown();
-					$('#dropdown [name=linkCheckbox]').click();
-					expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
-					expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
-				});
-				it('limits the date range to X days after share time when enforced, even when redisplayed the next days', function() {
-					// item exists, was created two days ago
-					shareItem.expiration = '2014-1-27';
-					// share time has time component but must be stripped later
-					shareItem.stime = new Date(2014, 0, 20, 11, 0, 25).getTime() / 1000;
-					shareData.shares.push(shareItem);
-					/* jshint camelcase:false */
-					oc_appconfig.core.defaultExpireDateEnabled = true;
-					oc_appconfig.core.defaultExpireDateEnforced = true;
-					showDropDown();
-					expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
-					expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
-				});
-			});
-		});
-		describe('check for avatar', function() {
-			beforeEach(function() {
-				loadItemStub.returns({
-					reshare: {
-						share_type: OC.Share.SHARE_TYPE_USER,
-						uid_owner: 'owner',
-						displayname_owner: 'Owner',
-						permissions: 31
-					},
-					shares: [{
-						id: 100,
-						item_source: 123,
-						permissions: 31,
-						share_type: OC.Share.SHARE_TYPE_USER,
-						share_with: 'user1',
-						share_with_displayname: 'User One'
-					},{
-						id: 101,
-						item_source: 123,
-						permissions: 31,
-						share_type: OC.Share.SHARE_TYPE_GROUP,
-						share_with: 'group',
-						share_with_displayname: 'group'
-					},{
-						id: 102,
-						item_source: 123,
-						permissions: 31,
-						share_type: OC.Share.SHARE_TYPE_REMOTE,
-						share_with: 'foo@bar.com/baz',
-						share_with_displayname: 'foo@bar.com/baz'
-
-					}]
-				});
-			});
-
-			describe('avatars enabled', function() {
-				beforeEach(function() {
-					oc_config.enable_avatars = true;
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						31,
-						'shared_file_name.txt'
-					);
-				});
-
-				afterEach(function() {
-					oc_config.enable_avatars = false;
-				});
-
-				it('test correct function calls', function() {
-					expect(avatarStub.calledTwice).toEqual(true);
-					expect(placeholderStub.calledTwice).toEqual(true);
-					expect($('#shareWithList').children().length).toEqual(3);
-					expect($('.avatar').length).toEqual(4);
-				});
-
-				it('test avatar owner', function() {
-					var args = avatarStub.getCall(0).args;
-					expect(args.length).toEqual(2);
-					expect(args[0]).toEqual('owner');
-				});
-
-				it('test avatar user', function() {
-					var args = avatarStub.getCall(1).args;
-					expect(args.length).toEqual(2);
-					expect(args[0]).toEqual('user1');
-				});
-
-				it('test avatar for groups', function() {
-					var args = placeholderStub.getCall(0).args;
-					expect(args.length).toEqual(1);
-					expect(args[0]).toEqual('group ' + OC.Share.SHARE_TYPE_GROUP);
-				});
-
-				it('test avatar for remotes', function() {
-					var args = placeholderStub.getCall(1).args;
-					expect(args.length).toEqual(1);
-					expect(args[0]).toEqual('foo@bar.com/baz ' + OC.Share.SHARE_TYPE_REMOTE);
-				});
-			});
-
-			describe('avatars disabled', function() {
-				beforeEach(function() {
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						31,
-						'shared_file_name.txt'
-					);
-				});
-
-				it('no avatar classes', function() {
-					expect($('.avatar').length).toEqual(0);
-					expect(avatarStub.callCount).toEqual(0);
-					expect(placeholderStub.callCount).toEqual(0);
-				});
-			});
-		});
-		describe('"sharesChanged" event', function() {
-			var autocompleteOptions;
-			var handler;
-			beforeEach(function() {
-				handler = sinon.stub();
-				loadItemStub.returns({
-					reshare: [],
-					shares: [{
-						id: 100,
-						item_source: 123,
-						permissions: 31,
-						share_type: OC.Share.SHARE_TYPE_USER,
-						share_with: 'user1',
-						share_with_displayname: 'User One'
-					}]
-				});
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
-				$('#dropdown').on('sharesChanged', handler);
-				autocompleteOptions = autocompleteStub.getCall(0).args[0];
-			});
-			afterEach(function() {
-				autocompleteOptions = null;
-				handler = null;
-			});
-			it('triggers "sharesChanged" event when adding shares', function() {
-				// simulate autocomplete selection
-				autocompleteOptions.select(new $.Event('select'), {
-					item: {
-						label: 'User Two',
-						value: {
-							shareType: OC.Share.SHARE_TYPE_USER,
-							shareWith: 'user2'
-						}
-					}
-				});
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-				expect(handler.calledOnce).toEqual(true);
-				var shares = handler.getCall(0).args[0].shares;
-				expect(shares).toBeDefined();
-				expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
-				expect(shares[OC.Share.SHARE_TYPE_USER][1].share_with_displayname).toEqual('User Two');
-				expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-			});
-			it('triggers "sharesChanged" event when deleting shares', function() {
-				$('#dropdown .unshare:eq(0)').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-				expect(handler.calledOnce).toEqual(true);
-				var shares = handler.getCall(0).args[0].shares;
-				expect(shares).toBeDefined();
-				expect(shares[OC.Share.SHARE_TYPE_USER]).toEqual([]);
-				expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-			});
-			it('triggers "sharesChanged" event when toggling link share', function() {
-				// simulate autocomplete selection
-				$('#dropdown #linkCheckbox').click();
-				fakeServer.requests[0].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success', data: { token: 'abc' }})
-				);
-				expect(handler.calledOnce).toEqual(true);
-				var shares = handler.getCall(0).args[0].shares;
-				expect(shares).toBeDefined();
-				expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
-				expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-
-				handler.reset();
-
-				// uncheck checkbox
-				$('#dropdown #linkCheckbox').click();
-				fakeServer.requests[1].respond(
-					200,
-					{ 'Content-Type': 'application/json' },
-					JSON.stringify({status: 'success'})
-				);
-
-				expect(handler.calledOnce).toEqual(true);
-				shares = handler.getCall(0).args[0].shares;
-				expect(shares).toBeDefined();
-				expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
-				expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-			});
-		});
-		describe('share permissions', function() {
-			beforeEach(function() {
-				oc_appconfig.core.resharingAllowed = true;
-			});
-
-			/**
-			 * Tests sharing with the given possible permissions
-			 *
-			 * @param {int} possiblePermissions
-			 * @return {int} permissions sent to the server
-			 */
-			function testWithPermissions(possiblePermissions) {
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					possiblePermissions,
-					'shared_file_name.txt'
-				);
-				var autocompleteOptions = autocompleteStub.getCall(0).args[0];
-				// simulate autocomplete selection
-				autocompleteOptions.select(new $.Event('select'), {
-					item: {
-						label: 'User Two',
-						value: {
-							shareType: OC.Share.SHARE_TYPE_USER,
-							shareWith: 'user2'
-						}
-					}
-				});
-				autocompleteStub.reset();
-				var requestBody = OC.parseQueryString(_.last(fakeServer.requests).requestBody);
-				return parseInt(requestBody.permissions, 10);
-			}
-
-			describe('regular sharing', function() {
-				it('shares with given permissions with default config', function() {
-					loadItemStub.returns({
-						reshare: [],
-						shares: []
-					});
-					expect(
-						testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
-					).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE);
-					expect(
-						testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_SHARE)
-					).toEqual(OC.PERMISSION_READ | OC.PERMISSION_SHARE);
-				});
-				it('removes share permission when not allowed', function() {
-					oc_appconfig.core.resharingAllowed = false;
-					loadItemStub.returns({
-						reshare: [],
-						shares: []
-					});
-					expect(
-						testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
-					).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE);
-				});
-				it('automatically adds READ permission even when not specified', function() {
-					oc_appconfig.core.resharingAllowed = false;
-					loadItemStub.returns({
-						reshare: [],
-						shares: []
-					});
-					expect(
-						testWithPermissions(OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
-					).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_UPDATE);
-				});
-				it('does not show sharing options when sharing not allowed', function() {
-					loadItemStub.returns({
-						reshare: [],
-						shares: []
-					});
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						OC.PERMISSION_READ,
-						'shared_file_name.txt'
-					);
-					expect($('#dropdown #shareWithList').length).toEqual(0);
-				});
-			});
-			describe('resharing', function() {
-				it('shares with given permissions when original share had all permissions', function() {
-					loadItemStub.returns({
-						reshare: {
-							permissions: OC.PERMISSION_ALL
-						},
-						shares: []
-					});
-					expect(
-						testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
-					).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE);
-				});
-				it('reduces reshare permissions to the ones from the original share', function() {
-					loadItemStub.returns({
-						reshare: {
-							permissions: OC.PERMISSION_READ,
-							uid_owner: 'user1'
-						},
-						shares: []
-					});
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						OC.PERMISSION_ALL,
-						'shared_file_name.txt'
-					);
-					// no resharing allowed
-					expect($('#dropdown #shareWithList').length).toEqual(0);
-				});
-				it('reduces reshare permissions to possible permissions', function() {
-					loadItemStub.returns({
-						reshare: {
-							permissions: OC.PERMISSION_ALL,
-							uid_owner: 'user1'
-						},
-						shares: []
-					});
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						OC.PERMISSION_READ,
-						'shared_file_name.txt'
-					);
-					// no resharing allowed
-					expect($('#dropdown #shareWithList').length).toEqual(0);
-				});
-				it('does not show sharing options when resharing not allowed', function() {
-					loadItemStub.returns({
-						reshare: {
-							permissions: OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE,
-							uid_owner: 'user1'
-						},
-						shares: []
-					});
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						OC.PERMISSION_ALL,
-						'shared_file_name.txt'
-					);
-					expect($('#dropdown #shareWithList').length).toEqual(0);
-				});
-				it('allows owner to share their own share when they are also the recipient', function() {
-					OC.currentUser = 'user1';
-					loadItemStub.returns({
-						reshare: {
-							permissions: OC.PERMISSION_READ,
-							uid_owner: 'user1'
-						},
-						shares: []
-					});
-					OC.Share.showDropDown(
-						'file',
-						123,
-						$container,
-						true,
-						OC.PERMISSION_ALL,
-						'shared_file_name.txt'
-					);
-					// sharing still allowed
-					expect($('#dropdown #shareWithList').length).toEqual(1);
-				});
-			});
-		});
-	});
 	describe('markFileAsShared', function() {
 		var $file;
 		var tipsyStub;
@@ -1316,21 +232,5 @@ describe('OC.Share tests', function() {
 			});
 		});
 	});
-	describe('OC.Share utils', function() {
-		it('parseTime should properly parse strings', function() {
-
-			_.each([
-				[ '123456', 123456],
-				[  123456 , 123456],
-				['0123456', 123456],
-				['abcdefg',   null],
-				['0x12345',   null],
-				[       '',   null],
-			], function(value) {
-				expect(OC.Share._parseTime(value[0])).toEqual(value[1]);
-			});
-
-		});
-	});
 });
 
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
new file mode 100644
index 00000000000..b50432a034f
--- /dev/null
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -0,0 +1,911 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2015 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/* global oc_appconfig */
+describe('OC.Share.ShareDialogView', function() {
+	var $container;
+	var oldAppConfig;
+	var autocompleteStub;
+	var oldEnableAvatars;
+	var avatarStub;
+	var placeholderStub;
+	var oldCurrentUser;
+
+	var fetchStub;
+
+	var configModel;
+	var shareModel;
+	var fileInfoModel;
+	var dialog;
+
+	beforeEach(function() {
+		// horrible parameters
+		$('#testArea').append('<input id="allowShareWithLink" type="hidden" value="yes">');
+		$('#testArea').append('<input id="mailPublicNotificationEnabled" name="mailPublicNotificationEnabled" type="hidden" value="yes">');
+		$container = $('#shareContainer');
+		/* jshint camelcase:false */
+		oldAppConfig = _.extend({}, oc_appconfig.core);
+		oc_appconfig.core.enforcePasswordForPublicLink = false;
+
+		fetchStub = sinon.stub(OC.Share.ShareItemModel.prototype, 'fetch');
+
+		fileInfoModel = new OCA.Files.FileInfoModel({
+			id: 123,
+			name: 'shared_file_name.txt',
+			path: '/subdir',
+			size: 100,
+			mimetype: 'text/plain',
+			permissions: 31,
+			sharePermissions: 31
+		});
+
+		var attributes = {
+			itemType: fileInfoModel.isDirectory() ? 'folder' : 'file',
+			itemSource: fileInfoModel.get('id'),
+			possiblePermissions: 31,
+			permissions: 31
+		};
+		configModel = new OC.Share.ShareConfigModel();
+		shareModel = new OC.Share.ShareItemModel(attributes, {
+			configModel: configModel,
+			fileInfoModel: fileInfoModel
+		});
+		dialog = new OC.Share.ShareDialogView({
+			configModel: configModel,
+			model: shareModel
+		});
+
+		// triggers rendering
+		shareModel.set({
+			shares: [],
+			linkShare: {isLinkShare: false}
+		});
+
+		autocompleteStub = sinon.stub($.fn, 'autocomplete', function() {
+			// dummy container with the expected attributes
+			if (!$(this).length) {
+				// simulate the real autocomplete that returns
+				// nothing at all when no element is specified
+				// (and potentially break stuff)
+				return null;
+			}
+			var $el = $('<div></div>').data('ui-autocomplete', {});
+			return $el;
+		});
+
+		oldEnableAvatars = oc_config.enable_avatars;
+		oc_config.enable_avatars = false;
+		avatarStub = sinon.stub($.fn, 'avatar');
+		placeholderStub = sinon.stub($.fn, 'imageplaceholder');
+
+		oldCurrentUser = OC.currentUser;
+		OC.currentUser = 'user0';
+	});
+	afterEach(function() {
+		OC.currentUser = oldCurrentUser;
+		/* jshint camelcase:false */
+		oc_appconfig.core = oldAppConfig;
+
+		fetchStub.restore();
+
+		autocompleteStub.restore();
+		avatarStub.restore();
+		placeholderStub.restore();
+		oc_config.enable_avatars = oldEnableAvatars;
+	});
+	describe('Share with link', function() {
+		beforeEach(function() {
+			configModel.set('enforcePasswordForPublicLink', false);
+		});
+		// TODO: test ajax calls
+		// TODO: test password field visibility (whenever enforced or not)
+		it('update password on focus out', function() {
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			// Toggle linkshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			// Enable password, enter password and focusout
+			dialog.$el.find('[name=showPassword]').click();
+			dialog.$el.find('#linkPassText').focus();
+			dialog.$el.find('#linkPassText').val('foo');
+			dialog.$el.find('#linkPassText').focusout();
+
+			expect(fakeServer.requests[1].method).toEqual('POST');
+			var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
+			expect(body['shareWith']).toEqual('foo');
+
+			// Set password response
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			expect(dialog.$el.find('#linkPassText').val()).toEqual('');
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Password protected');
+		});
+		it('update password on enter', function() {
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			// Toggle linkshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			// Enable password and enter password
+			dialog.$el.find('[name=showPassword]').click();
+			dialog.$el.find('#linkPassText').focus();
+			dialog.$el.find('#linkPassText').val('foo');
+			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+
+			expect(fakeServer.requests[1].method).toEqual('POST');
+			var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
+			expect(body['shareWith']).toEqual('foo');
+
+			// Set password response
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			expect(dialog.$el.find('#linkPassText').val()).toEqual('');
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Password protected');
+		});
+		it('shows share with link checkbox when allowed', function() {
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			expect(dialog.$el.find('#linkCheckbox').length).toEqual(1);
+		});
+		it('does not show share with link checkbox when not allowed', function() {
+			$('#allowShareWithLink').val('no');
+
+			dialog.render();
+
+			expect(dialog.$el.find('#linkCheckbox').length).toEqual(0);
+		});
+		it('Reset link when password is enforced and link is toggled', function() { 
+			var old = oc_appconfig.core.enforcePasswordForPublicLink;
+			oc_appconfig.core.enforcePasswordForPublicLink = true;
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			// Toggle linkshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			expect(dialog.$el.find('#linkText').val()).toEqual('');
+
+			// Set password
+			dialog.$el.find('#linkPassText').val('foo');
+			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			// Remove link
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			/*
+			 * Try to share again
+			 * The linkText should be emptied
+			 */
+			dialog.$el.find('[name=linkCheckbox]').click();
+			expect(dialog.$el.find('#linkText').val()).toEqual('');
+
+			/*
+			 * Do not set password but untoggle
+			 * Since there is no share this should not result in another request to the server
+			 */
+			dialog.$el.find('[name=linkCheckbox]').click();
+			expect(fakeServer.requests.length).toEqual(2);
+
+			oc_appconfig.core.enforcePasswordForPublicLink = old;
+		});
+
+		it('Reset password placeholder when password is enforced and link is toggled', function() { 
+			var old = oc_appconfig.core.enforcePasswordForPublicLink;
+			oc_appconfig.core.enforcePasswordForPublicLink = true;
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			// Toggle linkshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
+
+			// Set password
+			dialog.$el.find('#linkPassText').val('foo');
+			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('**********');
+
+			// Remove link
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			// Try to share again
+			dialog.$el.find('[name=linkCheckbox]').click();
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
+
+			oc_appconfig.core.enforcePasswordForPublicLink = old;
+		});
+		it('reset password on toggle of share', function() {
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			//Password protection should be unchecked and password field not visible
+			expect(dialog.$el.find('[name=showPassword]').prop('checked')).toEqual(false);
+			expect(dialog.$el.find('#linkPass').is(":visible")).toEqual(false);
+
+			// Toggle and set password
+			dialog.$el.find('[name=showPassword]').click();
+			dialog.$el.find('#linkPassText').val('foo');
+			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
+			);
+
+			// Unshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[2].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			// Toggle share again
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[3].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
+			);
+
+
+			// Password checkbox should be unchecked
+			expect(dialog.$el.find('[name=showPassword]').prop('checked')).toEqual(false);
+			expect(dialog.$el.find('#linkPass').is(":visible")).toEqual(false);
+		});
+		it('reset expiration on toggle of share', function() {
+			$('#allowShareWithLink').val('yes');
+
+			dialog.render();
+
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+			);
+
+			//Expiration should be unchecked and expiration field not visible
+			expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
+			expect(dialog.$el.find('#expirationDate').is(":visible")).toEqual(false);
+
+			// Toggle and set password
+			dialog.$el.find('[name=expirationCheckbox]').click();
+			d = new Date();
+			d.setDate(d.getDate() + 1);
+			date=d.getDate() + '-' + (d.getMonth()+1) + '-' + d.getFullYear();
+			dialog.$el.find('#expirationDate').val(date);
+			dialog.$el.find('#expirationDate').change();
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
+			);
+
+			// Unshare
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[2].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			// Toggle share again
+			dialog.$el.find('[name=linkCheckbox]').click();
+			fakeServer.requests[3].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
+			);
+
+			// Recheck expire visibility
+			expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
+			expect(dialog.$el.find('#expirationDate').is(":visible")).toEqual(false);
+		});
+		it('shows populated link share when a link share exists', function() {
+			shareModel.set('linkShare', {
+				isLinkShare: true,
+				token: 'tehtoken',
+				link: 'TODO',
+				expiration: '',
+				permissions: OC.PERMISSION_READ,
+				stime: 1403884258,
+			});
+
+			expect(dialog.$el.find('#linkCheckbox').prop('checked')).toEqual(true);
+			// this is how the OC.Share class does it...
+			var link = parent.location.protocol + '//' + location.host +
+				OC.generateUrl('/s/') + 'tehtoken';
+			expect(dialog.$el.find('#linkText').val()).toEqual(link);
+		});
+		describe('expiration date', function() {
+			var shareData;
+			var shareItem;
+			var clock;
+			var expectedMinDate;
+
+			beforeEach(function() {
+				// pick a fake date
+				clock = sinon.useFakeTimers(new Date(2014, 0, 20, 14, 0, 0).getTime());
+				expectedMinDate = new Date(2014, 0, 21, 14, 0, 0);
+
+				oc_appconfig.core.defaultExpireDate = 7;
+				oc_appconfig.core.enforcePasswordForPublicLink = false;
+				oc_appconfig.core.defaultExpireDateEnabled = false;
+				oc_appconfig.core.defaultExpireDateEnforced = false;
+
+				shareModel.set('linkShare', {
+					isLinkShare: true,
+					token: 'tehtoken',
+					permissions: OC.PERMISSION_READ,
+					expiration: null
+				});
+			});
+			afterEach(function() {
+				clock.restore();
+			});
+
+			it('does not check expiration date checkbox when no date was set', function() {
+				shareModel.get('linkShare').expiration = null;
+				dialog.render();
+
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('');
+			});
+			it('does not check expiration date checkbox for new share', function() {
+				dialog.render();
+
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('');
+			});
+			it('checks expiration date checkbox and populates field when expiration date was set', function() {
+				shareModel.get('linkShare').expiration = 1234;
+				dialog.render();
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('1234');
+			});
+			it('sets default date when default date setting is enabled', function() {
+				/* jshint camelcase:false */
+				oc_appconfig.core.defaultExpireDateEnabled = true;
+				dialog.render();
+				dialog.$el.find('[name=linkCheckbox]').click();
+				// enabled by default
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+				// TODO: those zeros must go...
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('2014-1-27 00:00:00');
+
+				// disabling is allowed
+				dialog.$el.find('[name=expirationCheckbox]').click();
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
+			});
+			it('enforces default date when enforced date setting is enabled', function() {
+				/* jshint camelcase:false */
+				oc_appconfig.core.defaultExpireDateEnabled = true;
+				oc_appconfig.core.defaultExpireDateEnforced = true;
+				dialog.render();
+				dialog.$el.find('[name=linkCheckbox]').click();
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+				// TODO: those zeros must go...
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('2014-1-27 00:00:00');
+
+				// disabling is not allowed
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('disabled')).toEqual(true);
+				dialog.$el.find('[name=expirationCheckbox]').click();
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+			});
+			it('enforces default date when enforced date setting is enabled and password is enforced', function() {
+				/* jshint camelcase:false */
+				oc_appconfig.core.enforcePasswordForPublicLink = true;
+				oc_appconfig.core.defaultExpireDateEnabled = true;
+				oc_appconfig.core.defaultExpireDateEnforced = true;
+				dialog.render();
+				dialog.$el.find('[name=linkCheckbox]').click();
+
+				//Enter password
+				dialog.$el.find('#linkPassText').val('foo');
+				dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
+				fakeServer.requests[0].respond(
+					200,
+					{ 'Content-Type': 'application/json' },
+					JSON.stringify({data: {token: 'xyz'}, status: 'success'})
+				);
+
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+				// TODO: those zeros must go...
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('2014-1-27 00:00:00');
+
+				// disabling is not allowed
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('disabled')).toEqual(true);
+				dialog.$el.find('[name=expirationCheckbox]').click();
+				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
+			});
+			it('displayes email form when sending emails is enabled', function() {
+				$('input[name=mailPublicNotificationEnabled]').val('yes');
+				dialog.render();
+				expect($('#emailPrivateLink').length).toEqual(1);
+			});
+			it('not renders email form when sending emails is disabled', function() {
+				$('input[name=mailPublicNotificationEnabled]').val('no');
+				dialog.render();
+				expect($('#emailPrivateLink').length).toEqual(0);
+			});
+			it('sets picker minDate to today and no maxDate by default', function() {
+				dialog.render();
+				dialog.$el.find('[name=linkCheckbox]').click();
+				dialog.$el.find('[name=expirationCheckbox]').click();
+				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
+				expect($.datepicker._defaults.maxDate).toEqual(null);
+			});
+			it('limits the date range to X days after share time when enforced', function() {
+				/* jshint camelcase:false */
+				oc_appconfig.core.defaultExpireDateEnabled = true;
+				oc_appconfig.core.defaultExpireDateEnforced = true;
+				dialog.render();
+				dialog.$el.find('[name=linkCheckbox]').click();
+				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
+				expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
+			});
+			it('limits the date range to X days after share time when enforced, even when redisplayed the next days', function() {
+				// item exists, was created two days ago
+				shareItem.expiration = '2014-1-27';
+				// share time has time component but must be stripped later
+				shareItem.stime = new Date(2014, 0, 20, 11, 0, 25).getTime() / 1000;
+				shareData.shares.push(shareItem);
+				/* jshint camelcase:false */
+				oc_appconfig.core.defaultExpireDateEnabled = true;
+				oc_appconfig.core.defaultExpireDateEnforced = true;
+				dialog.render();
+				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
+				expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
+			});
+		});
+	});
+	describe('check for avatar', function() {
+		beforeEach(function() {
+			loadItemStub.returns({
+				reshare: {
+					share_type: OC.Share.SHARE_TYPE_USER,
+					uid_owner: 'owner',
+					displayname_owner: 'Owner',
+					permissions: 31
+				},
+				shares: [{
+					id: 100,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_USER,
+					share_with: 'user1',
+					share_with_displayname: 'User One'
+				},{
+					id: 101,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_GROUP,
+					share_with: 'group',
+					share_with_displayname: 'group'
+				},{
+					id: 102,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_REMOTE,
+					share_with: 'foo@bar.com/baz',
+					share_with_displayname: 'foo@bar.com/baz'
+
+				}]
+			});
+		});
+
+		describe('avatars enabled', function() {
+			beforeEach(function() {
+				oc_config.enable_avatars = true;
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					31,
+					'shared_file_name.txt'
+				);
+			});
+
+			afterEach(function() {
+				oc_config.enable_avatars = false;
+			});
+
+			it('test correct function calls', function() {
+				expect(avatarStub.calledTwice).toEqual(true);
+				expect(placeholderStub.calledTwice).toEqual(true);
+				expect($('#shareWithList').children().length).toEqual(3);
+				expect($('.avatar').length).toEqual(4);
+			});
+
+			it('test avatar owner', function() {
+				var args = avatarStub.getCall(0).args;
+				expect(args.length).toEqual(2);
+				expect(args[0]).toEqual('owner');
+			});
+
+			it('test avatar user', function() {
+				var args = avatarStub.getCall(1).args;
+				expect(args.length).toEqual(2);
+				expect(args[0]).toEqual('user1');
+			});
+
+			it('test avatar for groups', function() {
+				var args = placeholderStub.getCall(0).args;
+				expect(args.length).toEqual(1);
+				expect(args[0]).toEqual('group ' + OC.Share.SHARE_TYPE_GROUP);
+			});
+
+			it('test avatar for remotes', function() {
+				var args = placeholderStub.getCall(1).args;
+				expect(args.length).toEqual(1);
+				expect(args[0]).toEqual('foo@bar.com/baz ' + OC.Share.SHARE_TYPE_REMOTE);
+			});
+		});
+
+		describe('avatars disabled', function() {
+			beforeEach(function() {
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					31,
+					'shared_file_name.txt'
+				);
+			});
+
+			it('no avatar classes', function() {
+				expect($('.avatar').length).toEqual(0);
+				expect(avatarStub.callCount).toEqual(0);
+				expect(placeholderStub.callCount).toEqual(0);
+			});
+		});
+	});
+	describe('"sharesChanged" event', function() {
+		var autocompleteOptions;
+		var handler;
+		beforeEach(function() {
+			handler = sinon.stub();
+			loadItemStub.returns({
+				reshare: [],
+				shares: [{
+					id: 100,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_USER,
+					share_with: 'user1',
+					share_with_displayname: 'User One'
+				}]
+			});
+			OC.Share.showDropDown(
+				'file',
+				123,
+				$container,
+				true,
+				31,
+				'shared_file_name.txt'
+			);
+			$('#dropdown').on('sharesChanged', handler);
+			autocompleteOptions = autocompleteStub.getCall(0).args[0];
+		});
+		afterEach(function() {
+			autocompleteOptions = null;
+			handler = null;
+		});
+		it('triggers "sharesChanged" event when adding shares', function() {
+			// simulate autocomplete selection
+			autocompleteOptions.select(new $.Event('select'), {
+				item: {
+					label: 'User Two',
+					value: {
+						shareType: OC.Share.SHARE_TYPE_USER,
+						shareWith: 'user2'
+					}
+				}
+			});
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+			expect(handler.calledOnce).toEqual(true);
+			var shares = handler.getCall(0).args[0].shares;
+			expect(shares).toBeDefined();
+			expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
+			expect(shares[OC.Share.SHARE_TYPE_USER][1].share_with_displayname).toEqual('User Two');
+			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
+		});
+		it('triggers "sharesChanged" event when deleting shares', function() {
+			dialog.$el.find('.unshare:eq(0)').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+			expect(handler.calledOnce).toEqual(true);
+			var shares = handler.getCall(0).args[0].shares;
+			expect(shares).toBeDefined();
+			expect(shares[OC.Share.SHARE_TYPE_USER]).toEqual([]);
+			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
+		});
+		it('triggers "sharesChanged" event when toggling link share', function() {
+			// simulate autocomplete selection
+			dialog.$el.find('#linkCheckbox').click();
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success', data: { token: 'abc' }})
+			);
+			expect(handler.calledOnce).toEqual(true);
+			var shares = handler.getCall(0).args[0].shares;
+			expect(shares).toBeDefined();
+			expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
+			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
+
+			handler.reset();
+
+			// uncheck checkbox
+			dialog.$el.find('#linkCheckbox').click();
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({status: 'success'})
+			);
+
+			expect(handler.calledOnce).toEqual(true);
+			shares = handler.getCall(0).args[0].shares;
+			expect(shares).toBeDefined();
+			expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
+			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
+		});
+	});
+	describe('share permissions', function() {
+		beforeEach(function() {
+			oc_appconfig.core.resharingAllowed = true;
+		});
+
+		/**
+		 * Tests sharing with the given possible permissions
+		 *
+		 * @param {int} possiblePermissions
+		 * @return {int} permissions sent to the server
+		 */
+		function testWithPermissions(possiblePermissions) {
+			OC.Share.showDropDown(
+				'file',
+				123,
+				$container,
+				true,
+				possiblePermissions,
+				'shared_file_name.txt'
+			);
+			var autocompleteOptions = autocompleteStub.getCall(0).args[0];
+			// simulate autocomplete selection
+			autocompleteOptions.select(new $.Event('select'), {
+				item: {
+					label: 'User Two',
+					value: {
+						shareType: OC.Share.SHARE_TYPE_USER,
+						shareWith: 'user2'
+					}
+				}
+			});
+			autocompleteStub.reset();
+			var requestBody = OC.parseQueryString(_.last(fakeServer.requests).requestBody);
+			return parseInt(requestBody.permissions, 10);
+		}
+
+		describe('regular sharing', function() {
+			it('shares with given permissions with default config', function() {
+				loadItemStub.returns({
+					reshare: [],
+					shares: []
+				});
+				expect(
+					testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
+				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE);
+				expect(
+					testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_SHARE)
+				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_SHARE);
+			});
+			it('removes share permission when not allowed', function() {
+				oc_appconfig.core.resharingAllowed = false;
+				loadItemStub.returns({
+					reshare: [],
+					shares: []
+				});
+				expect(
+					testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
+				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE);
+			});
+			it('automatically adds READ permission even when not specified', function() {
+				oc_appconfig.core.resharingAllowed = false;
+				loadItemStub.returns({
+					reshare: [],
+					shares: []
+				});
+				expect(
+					testWithPermissions(OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
+				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_UPDATE);
+			});
+			it('does not show sharing options when sharing not allowed', function() {
+				loadItemStub.returns({
+					reshare: [],
+					shares: []
+				});
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					OC.PERMISSION_READ,
+					'shared_file_name.txt'
+				);
+				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+			});
+		});
+		describe('resharing', function() {
+			it('shares with given permissions when original share had all permissions', function() {
+				loadItemStub.returns({
+					reshare: {
+						permissions: OC.PERMISSION_ALL
+					},
+					shares: []
+				});
+				expect(
+					testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
+				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE);
+			});
+			it('reduces reshare permissions to the ones from the original share', function() {
+				loadItemStub.returns({
+					reshare: {
+						permissions: OC.PERMISSION_READ,
+						uid_owner: 'user1'
+					},
+					shares: []
+				});
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					OC.PERMISSION_ALL,
+					'shared_file_name.txt'
+				);
+				// no resharing allowed
+				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+			});
+			it('reduces reshare permissions to possible permissions', function() {
+				loadItemStub.returns({
+					reshare: {
+						permissions: OC.PERMISSION_ALL,
+						uid_owner: 'user1'
+					},
+					shares: []
+				});
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					OC.PERMISSION_READ,
+					'shared_file_name.txt'
+				);
+				// no resharing allowed
+				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+			});
+			it('does not show sharing options when resharing not allowed', function() {
+				loadItemStub.returns({
+					reshare: {
+						permissions: OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE,
+						uid_owner: 'user1'
+					},
+					shares: []
+				});
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					OC.PERMISSION_ALL,
+					'shared_file_name.txt'
+				);
+				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+			});
+			it('allows owner to share their own share when they are also the recipient', function() {
+				OC.currentUser = 'user1';
+				loadItemStub.returns({
+					reshare: {
+						permissions: OC.PERMISSION_READ,
+						uid_owner: 'user1'
+					},
+					shares: []
+				});
+				OC.Share.showDropDown(
+					'file',
+					123,
+					$container,
+					true,
+					OC.PERMISSION_ALL,
+					'shared_file_name.txt'
+				);
+				// sharing still allowed
+				expect(dialog.$el.find('#shareWithList').length).toEqual(1);
+			});
+		});
+	});
+});
+
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
new file mode 100644
index 00000000000..d3c4b7d4004
--- /dev/null
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -0,0 +1,234 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2015 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/* global oc_appconfig */
+describe('OC.Share.ShareItemModel', function() {
+	var loadItemStub;
+	var fileInfoModel, configModel, model;
+
+	beforeEach(function() {
+		loadItemStub = sinon.stub(OC.Share, 'loadItem');
+		loadItemStub.returns({
+			reshare: [],
+			shares: []
+		});
+
+		fileInfoModel = new OCA.Files.FileInfoModel({
+			id: 123,
+			name: 'shared_file_name.txt',
+			path: '/subdir',
+			size: 100,
+			mimetype: 'text/plain',
+			permissions: 31,
+			sharePermissions: 31
+		});
+
+		var attributes = {
+			itemType: fileInfoModel.isDirectory() ? 'folder' : 'file',
+			itemSource: fileInfoModel.get('id'),
+			possiblePermissions: fileInfoModel.get('sharePermissions')
+		};
+		configModel = new OC.Share.ShareConfigModel();
+		model = new OC.Share.ShareItemModel(attributes, {
+			configModel: configModel,
+			fileInfoModel: fileInfoModel
+		});
+	});
+	afterEach(function() {
+		loadItemStub.restore();
+	});
+
+	describe('Fetching and parsing', function() {
+		it('fetching calls loadItem with the correct arguments', function() {
+			model.fetch();
+
+			expect(loadItemStub.calledOnce).toEqual(true);
+			expect(loadItemStub.calledWith('file', 123)).toEqual(true);
+		});
+		it('populates attributes with parsed response', function() {
+			loadItemStub.returns({
+				/* jshint camelcase: false */
+				reshare: {
+					share_type: OC.Share.SHARE_TYPE_USER,
+					uid_owner: 'owner',
+					displayname_owner: 'Owner',
+					permissions: 31
+				},
+				shares: [{
+					id: 100,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_USER,
+					share_with: 'user1',
+					share_with_displayname: 'User One'
+				}, {
+					id: 101,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_GROUP,
+					share_with: 'group',
+					share_with_displayname: 'group'
+				}, {
+					id: 102,
+					item_source: 123,
+					permissions: 31,
+					share_type: OC.Share.SHARE_TYPE_REMOTE,
+					share_with: 'foo@bar.com/baz',
+					share_with_displayname: 'foo@bar.com/baz'
+
+				}, {
+					displayname_owner: 'root',
+					expiration: null,
+					file_source: 123,
+					file_target: '/folder',
+					id: 20,
+					item_source: '123',
+					item_type: 'folder',
+					mail_send: '0',
+					parent: null,
+					path: '/folder',
+					permissions: OC.PERMISSION_READ,
+					share_type: OC.Share.SHARE_TYPE_LINK,
+					share_with: null,
+					stime: 1403884258,
+					storage: 1,
+					token: 'tehtoken',
+					uid_owner: 'root'
+				}]
+			});
+			model.fetch();
+
+			var shares = model.get('shares');
+			expect(shares.length).toEqual(3);
+			expect(shares.file_source).toEqual(123);
+
+			var linkShare = model.get('linkShare');
+			expect(linkShare.isLinkShare).toEqual(true);
+
+			// TODO: check more attributes
+		});
+		it('does not parse link share when for a different file', function() {
+			loadItemStub.returns({
+				reshare: [],
+				/* jshint camelcase: false */
+				shares: [{
+					displayname_owner: 'root',
+					expiration: null,
+					file_source: 456,
+					file_target: '/folder',
+					id: 20,
+					item_source: '456',
+					item_type: 'folder',
+					mail_send: '0',
+					parent: null,
+					path: '/folder',
+					permissions: OC.PERMISSION_READ,
+					share_type: OC.Share.SHARE_TYPE_LINK,
+					share_with: null,
+					stime: 1403884258,
+					storage: 1,
+					token: 'tehtoken',
+					uid_owner: 'root'
+				}]
+			});
+
+			model.fetch();
+
+			var shares = model.get('shares');
+			expect(shares.length).toEqual(0);
+
+			var linkShare = model.get('linkShare');
+			expect(linkShare.isLinkShare).toEqual(false);
+		});
+		it('parsess correct link share when a nested link share exists along with parent one', function() {
+			loadItemStub.returns({
+				reshare: [],
+				/* jshint camelcase: false */
+				shares: [{
+					displayname_owner: 'root',
+					expiration: 1111,
+					file_source: 123,
+					file_target: '/folder',
+					id: 20,
+					item_source: '123',
+					item_type: 'file',
+					mail_send: '0',
+					parent: null,
+					path: '/folder',
+					permissions: OC.PERMISSION_READ,
+					share_type: OC.Share.SHARE_TYPE_LINK,
+					share_with: null,
+					stime: 1403884258,
+					storage: 1,
+					token: 'tehtoken',
+					uid_owner: 'root'
+				}, {
+					displayname_owner: 'root',
+					expiration: 2222,
+					file_source: 456,
+					file_target: '/file_in_folder.txt',
+					id: 21,
+					item_source: '456',
+					item_type: 'file',
+					mail_send: '0',
+					parent: null,
+					path: '/folder/file_in_folder.txt',
+					permissions: OC.PERMISSION_READ,
+					share_type: OC.Share.SHARE_TYPE_LINK,
+					share_with: null,
+					stime: 1403884509,
+					storage: 1,
+					token: 'anothertoken',
+					uid_owner: 'root'
+				}]
+			});
+
+			model.fetch();
+
+			var shares = model.get('shares');
+			expect(shares.length).toEqual(0);
+
+			var linkShare = model.get('linkShare');
+			expect(linkShare.isLinkShare).toEqual(false);
+			expect(linkShare.token).toEqual('tehtoken');
+
+			// TODO: check child too
+		});
+	});
+
+	describe('Util', function() {
+		it('parseTime should properly parse strings', function() {
+
+			_.each([
+				[ '123456', 123456],
+				[  123456 , 123456],
+				['0123456', 123456],
+				['abcdefg',   null],
+				['0x12345',   null],
+				[       '',   null],
+			], function(value) {
+				expect(OC.Share._parseTime(value[0])).toEqual(value[1]);
+			});
+
+		});
+	});
+});
+
diff --git a/tests/karma.config.js b/tests/karma.config.js
index d3280b2939a..64a94ef230b 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -55,7 +55,8 @@ module.exports = function(config) {
 					'apps/files_sharing/js/sharedfilelist.js',
 					'apps/files_sharing/js/share.js',
 					'apps/files_sharing/js/external.js',
-					'apps/files_sharing/js/public.js'
+					'apps/files_sharing/js/public.js',
+					'apps/files_sharing/js/sharetabview.js'
 				],
 				testFiles: ['apps/files_sharing/tests/js/*.js']
 			},
-- 
GitLab


From 996639f4fbd4107851efc11ee34b24cead43e790 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 15:29:30 +0200
Subject: [PATCH 353/783] More unit tests for share dialog

---
 apps/files_sharing/js/sharetabview.js      |   9 +-
 core/js/sharedialogexpirationview.js       |  23 +-
 core/js/sharedialogresharerinfoview.js     |   4 +-
 core/js/sharedialogshareelistview.js       |  11 +-
 core/js/sharedialogview.js                 |  24 +-
 core/js/tests/specs/sharedialogviewSpec.js | 467 +++++----------------
 core/js/tests/specs/shareitemmodelSpec.js  |  73 +++-
 7 files changed, 203 insertions(+), 408 deletions(-)

diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js
index 68288500ae0..e24320604fb 100644
--- a/apps/files_sharing/js/sharetabview.js
+++ b/apps/files_sharing/js/sharetabview.js
@@ -11,7 +11,6 @@
 (function() {
 	var TEMPLATE =
 		'<div>' +
-		'<ul>{{#if owner}}<li>Owner: {{owner}}</li>{{/if}}</ul>' +
 		'<div class="dialogContainer"></div>' +
 		'</div>';
 
@@ -47,13 +46,7 @@
 			}
 
 			if (this.model) {
-				var owner = this.model.get('shareOwner');
-				if (owner === OC.currentUser) {
-					owner = null;
-				}
-				this.$el.html(this.template({
-					owner: owner
-				}));
+				this.$el.html(this.template());
 
 				// TODO: the model should read these directly off the passed fileInfoModel
 				var attributes = {
diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index c5d8c829657..3fba4b135d9 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -130,7 +130,7 @@
 				);
 			}
 
-			var isExpirationSet = !!this.model.get('linkShare').expiration;
+			var isExpirationSet = !!this.model.get('linkShare').expiration || isExpirationEnforced;
 
 			var expirationTemplate = this.template();
 			this.$el.html(expirationTemplate({
@@ -145,13 +145,13 @@
 				expirationValue: this.model.get('linkShare').expiration
 			}));
 
-			if(isExpirationSet) {
-				// what if there is another date picker on that page?
-				var minDate = new Date();
-				// min date should always be the next day
-				minDate.setDate(minDate.getDate()+1);
+			// what if there is another date picker on that page?
+			var minDate = new Date();
+			var maxDate = null;
+			// min date should always be the next day
+			minDate.setDate(minDate.getDate()+1);
 
-				var maxDate = null;
+			if(isExpirationSet) {
 				if(isExpirationEnforced) {
 					// TODO: hack: backend returns string instead of integer
 					var shareTime = this.model.get('linkShare').stime;
@@ -164,12 +164,11 @@
 					shareTime = OC.Util.stripTime(shareTime).getTime();
 					maxDate = new Date(shareTime + defaultExpireDays * 24 * 3600 * 1000);
 				}
-
-				$.datepicker.setDefaults({
-					minDate: minDate,
-					maxDate: maxDate
-				});
 			}
+			$.datepicker.setDefaults({
+				minDate: minDate,
+				maxDate: maxDate
+			});
 
 			this.$el.find('.datepicker').datepicker({dateFormat : 'dd-mm-yy'});
 
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index f6b927c08c5..600e2ecbf56 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -63,8 +63,8 @@
 		},
 
 		render: function() {
-			if (   !this.model.hasReshare()
-				|| !this.model.getReshareOwner() !== OC.currentUser)
+			if (!this.model.hasReshare()
+				|| this.model.getReshareOwner() === OC.currentUser)
 			{
 				this.$el.empty();
 				return this;
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 463d2468bbd..c1d7ba4cf66 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -211,11 +211,12 @@
 			if(this.configModel.areAvatarsEnabled()) {
 				this.$el.find('.avatar').each(function() {
 					var $this = $(this);
-					$this.avatar($this.data('username'), 32);
-				});
-				this.$el.find('.avatar.imageplaceholderseed').each(function() {
-					var $this = $(this);
-					$this.imageplaceholder($this.data('seed'));
+					if ($this.hasClass('imageplaceholderseed')) {
+						$this.css({width: 32, height: 32});
+						$this.imageplaceholder($this.data('seed'));
+					} else {
+						$this.avatar($this.data('username'), 32);
+					}
 				});
 			}
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 36e63993203..8c390ee5450 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -15,6 +15,7 @@
 
 	var TEMPLATE_BASE =
 		'<div class="resharerInfoView"></div>' +
+		'{{#if isSharingAllowed}}' +
 		'<label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
 		'<div class="oneline">' +
 		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
@@ -22,6 +23,7 @@
 		'</div>' +
 			// FIXME: find a good position for remoteShareInfo
 		'{{{remoteShareInfo}}}' +
+		'{{/if}}' +
 		'<div class="shareeListView"></div>' +
 		'<div class="linkShareView"></div>' +
 		'<div class="expirationView"></div>'
@@ -82,6 +84,9 @@
 			this.configModel.on('change:isRemoteShareAllowed', function() {
 				view.render();
 			});
+			this.model.on('change:permissions', function() {
+				view.render();
+			});
 
 			var subViewOptions = {
 				model: this.model,
@@ -163,16 +168,19 @@
 			this.$el.html(baseTemplate({
 				shareLabel: t('core', 'Share'),
 				sharePlaceholder: this._renderSharePlaceholderPart(),
-				remoteShareInfo: this._renderRemoteShareInfoPart()
+				remoteShareInfo: this._renderRemoteShareInfoPart(),
+				isSharingAllowed: this.model.sharePermissionPossible()
 			}));
 
-			var view = this;
-			this.$el.find('#shareWith').autocomplete({
-				minLength: 2,
-				delay: 750,
-				source: this.autocompleteHandler,
-				select: this._onSelectRecipient
-			}).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem;
+			var $shareField = this.$el.find('#shareWith');
+			if ($shareField.length) {
+				$shareField.autocomplete({
+					minLength: 2,
+					delay: 750,
+					source: this.autocompleteHandler,
+					select: this._onSelectRecipient
+				}).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem;
+			}
 
 			this.resharerInfoView.$el = this.$el.find('.resharerInfoView');
 			this.resharerInfoView.render();
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index b50432a034f..071c9c58c4e 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -63,7 +63,14 @@ describe('OC.Share.ShareDialogView', function() {
 			possiblePermissions: 31,
 			permissions: 31
 		};
-		configModel = new OC.Share.ShareConfigModel();
+		configModel = new OC.Share.ShareConfigModel({
+			enforcePasswordForPublicLink: false,
+			isResharingAllowed: true,
+			enforcePasswordForPublicLink: false,
+			isDefaultExpireDateEnabled: false,
+			isDefaultExpireDateEnforced: false,
+			defaultExpireDate: 7
+		});
 		shareModel = new OC.Share.ShareItemModel(attributes, {
 			configModel: configModel,
 			fileInfoModel: fileInfoModel
@@ -112,9 +119,6 @@ describe('OC.Share.ShareDialogView', function() {
 		oc_config.enable_avatars = oldEnableAvatars;
 	});
 	describe('Share with link', function() {
-		beforeEach(function() {
-			configModel.set('enforcePasswordForPublicLink', false);
-		});
 		// TODO: test ajax calls
 		// TODO: test password field visibility (whenever enforced or not)
 		it('update password on focus out', function() {
@@ -138,7 +142,9 @@ describe('OC.Share.ShareDialogView', function() {
 
 			expect(fakeServer.requests[1].method).toEqual('POST');
 			var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
-			expect(body['shareWith']).toEqual('foo');
+			expect(body.shareWith).toEqual('foo');
+
+			fetchStub.reset();
 
 			// Set password response
 			fakeServer.requests[1].respond(
@@ -147,6 +153,10 @@ describe('OC.Share.ShareDialogView', function() {
 				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
 			);
 
+			expect(fetchStub.calledOnce).toEqual(true);
+			// fetching the model will rerender the view
+			dialog.render();
+
 			expect(dialog.$el.find('#linkPassText').val()).toEqual('');
 			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Password protected');
 		});
@@ -171,7 +181,9 @@ describe('OC.Share.ShareDialogView', function() {
 
 			expect(fakeServer.requests[1].method).toEqual('POST');
 			var body = OC.parseQueryString(fakeServer.requests[1].requestBody);
-			expect(body['shareWith']).toEqual('foo');
+			expect(body.shareWith).toEqual('foo');
+
+			fetchStub.reset();
 
 			// Set password response
 			fakeServer.requests[1].respond(
@@ -180,6 +192,10 @@ describe('OC.Share.ShareDialogView', function() {
 				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
 			);
 
+			expect(fetchStub.calledOnce).toEqual(true);
+			// fetching the model will rerender the view
+			dialog.render();
+
 			expect(dialog.$el.find('#linkPassText').val()).toEqual('');
 			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Password protected');
 		});
@@ -198,8 +214,7 @@ describe('OC.Share.ShareDialogView', function() {
 			expect(dialog.$el.find('#linkCheckbox').length).toEqual(0);
 		});
 		it('Reset link when password is enforced and link is toggled', function() { 
-			var old = oc_appconfig.core.enforcePasswordForPublicLink;
-			oc_appconfig.core.enforcePasswordForPublicLink = true;
+			configModel.set('enforcePasswordForPublicLink', true);
 			$('#allowShareWithLink').val('yes');
 
 			dialog.render();
@@ -238,13 +253,9 @@ describe('OC.Share.ShareDialogView', function() {
 			 */
 			dialog.$el.find('[name=linkCheckbox]').click();
 			expect(fakeServer.requests.length).toEqual(2);
-
-			oc_appconfig.core.enforcePasswordForPublicLink = old;
 		});
 
 		it('Reset password placeholder when password is enforced and link is toggled', function() { 
-			var old = oc_appconfig.core.enforcePasswordForPublicLink;
-			oc_appconfig.core.enforcePasswordForPublicLink = true;
 			$('#allowShareWithLink').val('yes');
 
 			dialog.render();
@@ -261,6 +272,7 @@ describe('OC.Share.ShareDialogView', function() {
 				{ 'Content-Type': 'application/json' },
 				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
 			);
+			dialog.render();
 			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('**********');
 
 			// Remove link
@@ -274,119 +286,23 @@ describe('OC.Share.ShareDialogView', function() {
 			// Try to share again
 			dialog.$el.find('[name=linkCheckbox]').click();
 			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
-
-			oc_appconfig.core.enforcePasswordForPublicLink = old;
-		});
-		it('reset password on toggle of share', function() {
-			$('#allowShareWithLink').val('yes');
-
-			dialog.render();
-
-			dialog.$el.find('[name=linkCheckbox]').click();
-			fakeServer.requests[0].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-			);
-
-			//Password protection should be unchecked and password field not visible
-			expect(dialog.$el.find('[name=showPassword]').prop('checked')).toEqual(false);
-			expect(dialog.$el.find('#linkPass').is(":visible")).toEqual(false);
-
-			// Toggle and set password
-			dialog.$el.find('[name=showPassword]').click();
-			dialog.$el.find('#linkPassText').val('foo');
-			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-			fakeServer.requests[1].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
-			);
-
-			// Unshare
-			dialog.$el.find('[name=linkCheckbox]').click();
-			fakeServer.requests[2].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({status: 'success'})
-			);
-
-			// Toggle share again
-			dialog.$el.find('[name=linkCheckbox]').click();
-			fakeServer.requests[3].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
-			);
-
-
-			// Password checkbox should be unchecked
-			expect(dialog.$el.find('[name=showPassword]').prop('checked')).toEqual(false);
-			expect(dialog.$el.find('#linkPass').is(":visible")).toEqual(false);
-		});
-		it('reset expiration on toggle of share', function() {
-			$('#allowShareWithLink').val('yes');
-
-			dialog.render();
-
-			dialog.$el.find('[name=linkCheckbox]').click();
-			fakeServer.requests[0].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-			);
-
-			//Expiration should be unchecked and expiration field not visible
-			expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
-			expect(dialog.$el.find('#expirationDate').is(":visible")).toEqual(false);
-
-			// Toggle and set password
-			dialog.$el.find('[name=expirationCheckbox]').click();
-			d = new Date();
-			d.setDate(d.getDate() + 1);
-			date=d.getDate() + '-' + (d.getMonth()+1) + '-' + d.getFullYear();
-			dialog.$el.find('#expirationDate').val(date);
-			dialog.$el.find('#expirationDate').change();
-			fakeServer.requests[1].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({data: {token: 'xyz2'}, status: 'success'})
-			);
-
-			// Unshare
-			dialog.$el.find('[name=linkCheckbox]').click();
-			fakeServer.requests[2].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({status: 'success'})
-			);
-
-			// Toggle share again
-			dialog.$el.find('[name=linkCheckbox]').click();
-			fakeServer.requests[3].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({data: {token: 'xyz3'}, status: 'success'})
-			);
-
-			// Recheck expire visibility
-			expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
-			expect(dialog.$el.find('#expirationDate').is(":visible")).toEqual(false);
 		});
 		it('shows populated link share when a link share exists', function() {
+			// this is how the OC.Share class does it...
+			var link = parent.location.protocol + '//' + location.host +
+				OC.generateUrl('/s/') + 'tehtoken';
 			shareModel.set('linkShare', {
 				isLinkShare: true,
 				token: 'tehtoken',
-				link: 'TODO',
+				link: link,
 				expiration: '',
 				permissions: OC.PERMISSION_READ,
 				stime: 1403884258,
 			});
 
+			dialog.render();
+
 			expect(dialog.$el.find('#linkCheckbox').prop('checked')).toEqual(true);
-			// this is how the OC.Share class does it...
-			var link = parent.location.protocol + '//' + location.host +
-				OC.generateUrl('/s/') + 'tehtoken';
 			expect(dialog.$el.find('#linkText').val()).toEqual(link);
 		});
 		describe('expiration date', function() {
@@ -400,10 +316,12 @@ describe('OC.Share.ShareDialogView', function() {
 				clock = sinon.useFakeTimers(new Date(2014, 0, 20, 14, 0, 0).getTime());
 				expectedMinDate = new Date(2014, 0, 21, 14, 0, 0);
 
-				oc_appconfig.core.defaultExpireDate = 7;
-				oc_appconfig.core.enforcePasswordForPublicLink = false;
-				oc_appconfig.core.defaultExpireDateEnabled = false;
-				oc_appconfig.core.defaultExpireDateEnforced = false;
+				configModel.set({
+					enforcePasswordForPublicLink: false,
+					isDefaultExpireDateEnabled: false,
+					isDefaultExpireDateEnforced: false,
+					defaultExpireDate: 7
+				});
 
 				shareModel.set('linkShare', {
 					isLinkShare: true,
@@ -436,10 +354,13 @@ describe('OC.Share.ShareDialogView', function() {
 				expect(dialog.$el.find('#expirationDate').val()).toEqual('1234');
 			});
 			it('sets default date when default date setting is enabled', function() {
-				/* jshint camelcase:false */
-				oc_appconfig.core.defaultExpireDateEnabled = true;
+				configModel.set('isDefaultExpireDateEnabled', true);
 				dialog.render();
 				dialog.$el.find('[name=linkCheckbox]').click();
+				// here fetch would be called and the server returns the expiration date
+				shareModel.get('linkShare').expiration = '2014-1-27 00:00:00';
+				dialog.render();
+
 				// enabled by default
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
 				// TODO: those zeros must go...
@@ -450,11 +371,16 @@ describe('OC.Share.ShareDialogView', function() {
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(false);
 			});
 			it('enforces default date when enforced date setting is enabled', function() {
-				/* jshint camelcase:false */
-				oc_appconfig.core.defaultExpireDateEnabled = true;
-				oc_appconfig.core.defaultExpireDateEnforced = true;
+				configModel.set({
+					isDefaultExpireDateEnabled: true,
+					isDefaultExpireDateEnforced: true
+				});
 				dialog.render();
 				dialog.$el.find('[name=linkCheckbox]').click();
+				// here fetch would be called and the server returns the expiration date
+				shareModel.get('linkShare').expiration = '2014-1-27 00:00:00';
+				dialog.render();
+
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
 				// TODO: those zeros must go...
 				expect(dialog.$el.find('#expirationDate').val()).toEqual('2014-1-27 00:00:00');
@@ -465,12 +391,16 @@ describe('OC.Share.ShareDialogView', function() {
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
 			});
 			it('enforces default date when enforced date setting is enabled and password is enforced', function() {
-				/* jshint camelcase:false */
-				oc_appconfig.core.enforcePasswordForPublicLink = true;
-				oc_appconfig.core.defaultExpireDateEnabled = true;
-				oc_appconfig.core.defaultExpireDateEnforced = true;
+				configModel.set({
+					enforcePasswordForPublicLink: true,
+					isDefaultExpireDateEnabled: true,
+					isDefaultExpireDateEnforced: true
+				});
 				dialog.render();
 				dialog.$el.find('[name=linkCheckbox]').click();
+				// here fetch would be called and the server returns the expiration date
+				shareModel.get('linkShare').expiration = '2014-1-27 00:00:00';
+				dialog.render();
 
 				//Enter password
 				dialog.$el.find('#linkPassText').val('foo');
@@ -493,12 +423,12 @@ describe('OC.Share.ShareDialogView', function() {
 			it('displayes email form when sending emails is enabled', function() {
 				$('input[name=mailPublicNotificationEnabled]').val('yes');
 				dialog.render();
-				expect($('#emailPrivateLink').length).toEqual(1);
+				expect(dialog.$('#emailPrivateLink').length).toEqual(1);
 			});
 			it('not renders email form when sending emails is disabled', function() {
 				$('input[name=mailPublicNotificationEnabled]').val('no');
 				dialog.render();
-				expect($('#emailPrivateLink').length).toEqual(0);
+				expect(dialog.$('#emailPrivateLink').length).toEqual(0);
 			});
 			it('sets picker minDate to today and no maxDate by default', function() {
 				dialog.render();
@@ -508,9 +438,10 @@ describe('OC.Share.ShareDialogView', function() {
 				expect($.datepicker._defaults.maxDate).toEqual(null);
 			});
 			it('limits the date range to X days after share time when enforced', function() {
-				/* jshint camelcase:false */
-				oc_appconfig.core.defaultExpireDateEnabled = true;
-				oc_appconfig.core.defaultExpireDateEnforced = true;
+				configModel.set({
+					isDefaultExpireDateEnabled: true,
+					isDefaultExpireDateEnforced: true
+				});
 				dialog.render();
 				dialog.$el.find('[name=linkCheckbox]').click();
 				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
@@ -518,13 +449,14 @@ describe('OC.Share.ShareDialogView', function() {
 			});
 			it('limits the date range to X days after share time when enforced, even when redisplayed the next days', function() {
 				// item exists, was created two days ago
+				var shareItem = shareModel.get('linkShare');
 				shareItem.expiration = '2014-1-27';
 				// share time has time component but must be stripped later
 				shareItem.stime = new Date(2014, 0, 20, 11, 0, 25).getTime() / 1000;
-				shareData.shares.push(shareItem);
-				/* jshint camelcase:false */
-				oc_appconfig.core.defaultExpireDateEnabled = true;
-				oc_appconfig.core.defaultExpireDateEnforced = true;
+				configModel.set({
+					isDefaultExpireDateEnabled: true,
+					isDefaultExpireDateEnforced: true
+				});
 				dialog.render();
 				expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
 				expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
@@ -533,7 +465,7 @@ describe('OC.Share.ShareDialogView', function() {
 	});
 	describe('check for avatar', function() {
 		beforeEach(function() {
-			loadItemStub.returns({
+			shareModel.set({
 				reshare: {
 					share_type: OC.Share.SHARE_TYPE_USER,
 					uid_owner: 'owner',
@@ -569,14 +501,8 @@ describe('OC.Share.ShareDialogView', function() {
 		describe('avatars enabled', function() {
 			beforeEach(function() {
 				oc_config.enable_avatars = true;
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
+				avatarStub.reset();
+				dialog.render();
 			});
 
 			afterEach(function() {
@@ -586,8 +512,8 @@ describe('OC.Share.ShareDialogView', function() {
 			it('test correct function calls', function() {
 				expect(avatarStub.calledTwice).toEqual(true);
 				expect(placeholderStub.calledTwice).toEqual(true);
-				expect($('#shareWithList').children().length).toEqual(3);
-				expect($('.avatar').length).toEqual(4);
+				expect(dialog.$('#shareWithList').children().length).toEqual(3);
+				expect(dialog.$('.avatar').length).toEqual(4);
 			});
 
 			it('test avatar owner', function() {
@@ -617,14 +543,7 @@ describe('OC.Share.ShareDialogView', function() {
 
 		describe('avatars disabled', function() {
 			beforeEach(function() {
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					31,
-					'shared_file_name.txt'
-				);
+				dialog.render();
 			});
 
 			it('no avatar classes', function() {
@@ -634,104 +553,6 @@ describe('OC.Share.ShareDialogView', function() {
 			});
 		});
 	});
-	describe('"sharesChanged" event', function() {
-		var autocompleteOptions;
-		var handler;
-		beforeEach(function() {
-			handler = sinon.stub();
-			loadItemStub.returns({
-				reshare: [],
-				shares: [{
-					id: 100,
-					item_source: 123,
-					permissions: 31,
-					share_type: OC.Share.SHARE_TYPE_USER,
-					share_with: 'user1',
-					share_with_displayname: 'User One'
-				}]
-			});
-			OC.Share.showDropDown(
-				'file',
-				123,
-				$container,
-				true,
-				31,
-				'shared_file_name.txt'
-			);
-			$('#dropdown').on('sharesChanged', handler);
-			autocompleteOptions = autocompleteStub.getCall(0).args[0];
-		});
-		afterEach(function() {
-			autocompleteOptions = null;
-			handler = null;
-		});
-		it('triggers "sharesChanged" event when adding shares', function() {
-			// simulate autocomplete selection
-			autocompleteOptions.select(new $.Event('select'), {
-				item: {
-					label: 'User Two',
-					value: {
-						shareType: OC.Share.SHARE_TYPE_USER,
-						shareWith: 'user2'
-					}
-				}
-			});
-			fakeServer.requests[0].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({status: 'success'})
-			);
-			expect(handler.calledOnce).toEqual(true);
-			var shares = handler.getCall(0).args[0].shares;
-			expect(shares).toBeDefined();
-			expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
-			expect(shares[OC.Share.SHARE_TYPE_USER][1].share_with_displayname).toEqual('User Two');
-			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-		});
-		it('triggers "sharesChanged" event when deleting shares', function() {
-			dialog.$el.find('.unshare:eq(0)').click();
-			fakeServer.requests[0].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({status: 'success'})
-			);
-			expect(handler.calledOnce).toEqual(true);
-			var shares = handler.getCall(0).args[0].shares;
-			expect(shares).toBeDefined();
-			expect(shares[OC.Share.SHARE_TYPE_USER]).toEqual([]);
-			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-		});
-		it('triggers "sharesChanged" event when toggling link share', function() {
-			// simulate autocomplete selection
-			dialog.$el.find('#linkCheckbox').click();
-			fakeServer.requests[0].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({status: 'success', data: { token: 'abc' }})
-			);
-			expect(handler.calledOnce).toEqual(true);
-			var shares = handler.getCall(0).args[0].shares;
-			expect(shares).toBeDefined();
-			expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
-			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-
-			handler.reset();
-
-			// uncheck checkbox
-			dialog.$el.find('#linkCheckbox').click();
-			fakeServer.requests[1].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({status: 'success'})
-			);
-
-			expect(handler.calledOnce).toEqual(true);
-			shares = handler.getCall(0).args[0].shares;
-			expect(shares).toBeDefined();
-			expect(shares[OC.Share.SHARE_TYPE_USER][0].share_with_displayname).toEqual('User One');
-			expect(shares[OC.Share.SHARE_TYPE_GROUP]).not.toBeDefined();
-		});
-	});
 	describe('share permissions', function() {
 		beforeEach(function() {
 			oc_appconfig.core.resharingAllowed = true;
@@ -744,14 +565,11 @@ describe('OC.Share.ShareDialogView', function() {
 		 * @return {int} permissions sent to the server
 		 */
 		function testWithPermissions(possiblePermissions) {
-			OC.Share.showDropDown(
-				'file',
-				123,
-				$container,
-				true,
-				possiblePermissions,
-				'shared_file_name.txt'
-			);
+			shareModel.set({
+				permissions: possiblePermissions,
+				possiblePermissions: possiblePermissions
+			});
+			dialog.render();
 			var autocompleteOptions = autocompleteStub.getCall(0).args[0];
 			// simulate autocomplete selection
 			autocompleteOptions.select(new $.Event('select'), {
@@ -770,8 +588,8 @@ describe('OC.Share.ShareDialogView', function() {
 
 		describe('regular sharing', function() {
 			it('shares with given permissions with default config', function() {
-				loadItemStub.returns({
-					reshare: [],
+				shareModel.set({
+					reshare: {},
 					shares: []
 				});
 				expect(
@@ -782,9 +600,9 @@ describe('OC.Share.ShareDialogView', function() {
 				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_SHARE);
 			});
 			it('removes share permission when not allowed', function() {
-				oc_appconfig.core.resharingAllowed = false;
-				loadItemStub.returns({
-					reshare: [],
+				configModel.set('isResharingAllowed', false);
+				shareModel.set({
+					reshare: {},
 					shares: []
 				});
 				expect(
@@ -792,9 +610,9 @@ describe('OC.Share.ShareDialogView', function() {
 				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE);
 			});
 			it('automatically adds READ permission even when not specified', function() {
-				oc_appconfig.core.resharingAllowed = false;
-				loadItemStub.returns({
-					reshare: [],
+				configModel.set('isResharingAllowed', false);
+				shareModel.set({
+					reshare: {},
 					shares: []
 				});
 				expect(
@@ -802,108 +620,35 @@ describe('OC.Share.ShareDialogView', function() {
 				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_UPDATE);
 			});
 			it('does not show sharing options when sharing not allowed', function() {
-				loadItemStub.returns({
-					reshare: [],
-					shares: []
+				shareModel.set({
+					reshare: {},
+					shares: [],
+					permissions: OC.PERMISSION_READ
 				});
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					OC.PERMISSION_READ,
-					'shared_file_name.txt'
-				);
-				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
-			});
-		});
-		describe('resharing', function() {
-			it('shares with given permissions when original share had all permissions', function() {
-				loadItemStub.returns({
-					reshare: {
-						permissions: OC.PERMISSION_ALL
-					},
-					shares: []
-				});
-				expect(
-					testWithPermissions(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE)
-				).toEqual(OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_SHARE);
-			});
-			it('reduces reshare permissions to the ones from the original share', function() {
-				loadItemStub.returns({
-					reshare: {
-						permissions: OC.PERMISSION_READ,
-						uid_owner: 'user1'
-					},
-					shares: []
-				});
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					OC.PERMISSION_ALL,
-					'shared_file_name.txt'
-				);
-				// no resharing allowed
-				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
-			});
-			it('reduces reshare permissions to possible permissions', function() {
-				loadItemStub.returns({
-					reshare: {
-						permissions: OC.PERMISSION_ALL,
-						uid_owner: 'user1'
-					},
-					shares: []
-				});
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					OC.PERMISSION_READ,
-					'shared_file_name.txt'
-				);
-				// no resharing allowed
-				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+				dialog.render();
+				expect(dialog.$el.find('#shareWith').prop('disabled')).toEqual(true);
 			});
-			it('does not show sharing options when resharing not allowed', function() {
-				loadItemStub.returns({
+			it('shows reshare owner', function() {
+				shareModel.set({
 					reshare: {
-						permissions: OC.PERMISSION_READ | OC.PERMISSION_UPDATE | OC.PERMISSION_DELETE,
 						uid_owner: 'user1'
 					},
-					shares: []
+					shares: [],
+					permissions: OC.PERMISSION_READ
 				});
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					OC.PERMISSION_ALL,
-					'shared_file_name.txt'
-				);
-				expect(dialog.$el.find('#shareWithList').length).toEqual(0);
+				dialog.render();
+				expect(dialog.$el.find('.resharerInfoView .reshare').length).toEqual(1);
 			});
-			it('allows owner to share their own share when they are also the recipient', function() {
-				OC.currentUser = 'user1';
-				loadItemStub.returns({
+			it('does not show reshare owner if owner is current user', function() {
+				shareModel.set({
 					reshare: {
-						permissions: OC.PERMISSION_READ,
-						uid_owner: 'user1'
+						uid_owner: OC.currentUser
 					},
-					shares: []
+					shares: [],
+					permissions: OC.PERMISSION_READ
 				});
-				OC.Share.showDropDown(
-					'file',
-					123,
-					$container,
-					true,
-					OC.PERMISSION_ALL,
-					'shared_file_name.txt'
-				);
-				// sharing still allowed
-				expect(dialog.$el.find('#shareWithList').length).toEqual(1);
+				dialog.render();
+				expect(dialog.$el.find('.resharerInfoView .reshare').length).toEqual(0);
 			});
 		});
 	});
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index d3c4b7d4004..2f676a4ba1f 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -23,13 +23,12 @@
 describe('OC.Share.ShareItemModel', function() {
 	var loadItemStub;
 	var fileInfoModel, configModel, model;
+	var oldCurrentUser;
 
 	beforeEach(function() {
+		oldCurrentUser = OC.currentUser;
+
 		loadItemStub = sinon.stub(OC.Share, 'loadItem');
-		loadItemStub.returns({
-			reshare: [],
-			shares: []
-		});
 
 		fileInfoModel = new OCA.Files.FileInfoModel({
 			id: 123,
@@ -54,6 +53,7 @@ describe('OC.Share.ShareItemModel', function() {
 	});
 	afterEach(function() {
 		loadItemStub.restore();
+		OC.currentUser = oldCurrentUser;
 	});
 
 	describe('Fetching and parsing', function() {
@@ -64,7 +64,7 @@ describe('OC.Share.ShareItemModel', function() {
 			expect(loadItemStub.calledWith('file', 123)).toEqual(true);
 		});
 		it('populates attributes with parsed response', function() {
-			loadItemStub.returns({
+			loadItemStub.yields({
 				/* jshint camelcase: false */
 				reshare: {
 					share_type: OC.Share.SHARE_TYPE_USER,
@@ -118,7 +118,11 @@ describe('OC.Share.ShareItemModel', function() {
 
 			var shares = model.get('shares');
 			expect(shares.length).toEqual(3);
-			expect(shares.file_source).toEqual(123);
+			expect(shares[0].id).toEqual(100);
+			expect(shares[0].permissions).toEqual(31);
+			expect(shares[0].share_type).toEqual(OC.Share.SHARE_TYPE_USER);
+			expect(shares[0].share_with).toEqual('user1');
+			expect(shares[0].share_with_displayname).toEqual('User One');
 
 			var linkShare = model.get('linkShare');
 			expect(linkShare.isLinkShare).toEqual(true);
@@ -126,7 +130,7 @@ describe('OC.Share.ShareItemModel', function() {
 			// TODO: check more attributes
 		});
 		it('does not parse link share when for a different file', function() {
-			loadItemStub.returns({
+			loadItemStub.yields({
 				reshare: [],
 				/* jshint camelcase: false */
 				shares: [{
@@ -153,13 +157,14 @@ describe('OC.Share.ShareItemModel', function() {
 			model.fetch();
 
 			var shares = model.get('shares');
-			expect(shares.length).toEqual(0);
+			// remaining share appears in this list
+			expect(shares.length).toEqual(1);
 
 			var linkShare = model.get('linkShare');
 			expect(linkShare.isLinkShare).toEqual(false);
 		});
-		it('parsess correct link share when a nested link share exists along with parent one', function() {
-			loadItemStub.returns({
+		it('parses correct link share when a nested link share exists along with parent one', function() {
+			loadItemStub.yields({
 				reshare: [],
 				/* jshint camelcase: false */
 				shares: [{
@@ -204,14 +209,58 @@ describe('OC.Share.ShareItemModel', function() {
 			model.fetch();
 
 			var shares = model.get('shares');
-			expect(shares.length).toEqual(0);
+			// the parent share remains in the list
+			expect(shares.length).toEqual(1);
 
 			var linkShare = model.get('linkShare');
-			expect(linkShare.isLinkShare).toEqual(false);
+			expect(linkShare.isLinkShare).toEqual(true);
 			expect(linkShare.token).toEqual('tehtoken');
 
 			// TODO: check child too
 		});
+		it('reduces reshare permissions to the ones from the original share', function() {
+			loadItemStub.yields({
+				reshare: {
+					permissions: OC.PERMISSION_READ,
+					uid_owner: 'user1'
+				},
+				shares: []
+			});
+			model.fetch();
+
+			// no resharing allowed
+			expect(model.get('permissions')).toEqual(OC.PERMISSION_READ);
+		});
+		it('reduces reshare permissions to possible permissions', function() {
+			loadItemStub.yields({
+				reshare: {
+					permissions: OC.PERMISSION_ALL,
+					uid_owner: 'user1'
+				},
+				shares: []
+			});
+
+			model.set('possiblePermissions', OC.PERMISSION_READ);
+			model.fetch();
+
+			// no resharing allowed
+			expect(model.get('permissions')).toEqual(OC.PERMISSION_READ);
+		});
+		it('allows owner to share their own share when they are also the recipient', function() {
+			OC.currentUser = 'user1';
+			loadItemStub.yields({
+				reshare: {
+					permissions: OC.PERMISSION_READ,
+					uid_owner: 'user1'
+				},
+				shares: []
+			});
+
+			model.fetch();
+
+			// sharing still allowed
+			expect(model.get('permissions') & OC.PERMISSION_SHARE).toEqual(OC.PERMISSION_SHARE);
+		});
 	});
 
 	describe('Util', function() {
-- 
GitLab


From f439c07ba9e76d0baebc7ec3000ee5bc5bc3c675 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 15:47:45 +0200
Subject: [PATCH 354/783] Fix allow reshare for owner when sharing with self
 through group

---
 core/js/shareitemmodel.js                 | 22 +++++++++++++++++++++-
 core/js/tests/specs/shareitemmodelSpec.js |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index e0d44586613..ff0d3a6d800 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -656,7 +656,7 @@
 			}
 
 			var permissions = this.get('possiblePermissions');
-			if(!_.isUndefined(data.reshare) && !_.isUndefined(data.reshare.permissions)) {
+			if(!_.isUndefined(data.reshare) && !_.isUndefined(data.reshare.permissions) && data.reshare.uid_owner !== OC.currentUser) {
 				permissions = permissions & data.reshare.permissions;
 			}
 
@@ -723,6 +723,26 @@
 				permissions: permissions,
 				allowPublicUploadStatus: allowPublicUploadStatus
 			};
+		},
+
+		/**
+		 * Parses a string to an valid integer (unix timestamp)
+		 * @param time
+		 * @returns {*}
+		 * @internal Only used to work around a bug in the backend
+		 */
+		_parseTime: function(time) {
+			if (_.isString(time)) {
+				// skip empty strings and hex values
+				if (time === '' || (time.length > 1 && time[0] === '0' && time[1] === 'x')) {
+					return null;
+				}
+				time = parseInt(time, 10);
+				if(isNaN(time)) {
+					time = null;
+				}
+			}
+			return time;
 		}
 	});
 
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index 2f676a4ba1f..c1d820052e2 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -274,7 +274,7 @@ describe('OC.Share.ShareItemModel', function() {
 				['0x12345',   null],
 				[       '',   null],
 			], function(value) {
-				expect(OC.Share._parseTime(value[0])).toEqual(value[1]);
+				expect(OC.Share.ShareItemModel.prototype._parseTime(value[0])).toEqual(value[1]);
 			});
 
 		});
-- 
GitLab


From 02d68d06130345c3397976edd8f69169bbf8e980 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 15:48:11 +0200
Subject: [PATCH 355/783] Removed obsolete tests

---
 core/js/tests/specs/sharedialogviewSpec.js | 78 +---------------------
 1 file changed, 2 insertions(+), 76 deletions(-)

diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index 071c9c58c4e..de6f9944094 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -158,7 +158,7 @@ describe('OC.Share.ShareDialogView', function() {
 			dialog.render();
 
 			expect(dialog.$el.find('#linkPassText').val()).toEqual('');
-			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Password protected');
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('**********');
 		});
 		it('update password on enter', function() {
 			$('#allowShareWithLink').val('yes');
@@ -197,7 +197,7 @@ describe('OC.Share.ShareDialogView', function() {
 			dialog.render();
 
 			expect(dialog.$el.find('#linkPassText').val()).toEqual('');
-			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Password protected');
+			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('**********');
 		});
 		it('shows share with link checkbox when allowed', function() {
 			$('#allowShareWithLink').val('yes');
@@ -213,80 +213,6 @@ describe('OC.Share.ShareDialogView', function() {
 
 			expect(dialog.$el.find('#linkCheckbox').length).toEqual(0);
 		});
-		it('Reset link when password is enforced and link is toggled', function() { 
-			configModel.set('enforcePasswordForPublicLink', true);
-			$('#allowShareWithLink').val('yes');
-
-			dialog.render();
-
-			// Toggle linkshare
-			dialog.$el.find('[name=linkCheckbox]').click();
-			expect(dialog.$el.find('#linkText').val()).toEqual('');
-
-			// Set password
-			dialog.$el.find('#linkPassText').val('foo');
-			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-			fakeServer.requests[0].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-			);
-
-			// Remove link
-			dialog.$el.find('[name=linkCheckbox]').click();
-			fakeServer.requests[1].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({status: 'success'})
-			);
-
-			/*
-			 * Try to share again
-			 * The linkText should be emptied
-			 */
-			dialog.$el.find('[name=linkCheckbox]').click();
-			expect(dialog.$el.find('#linkText').val()).toEqual('');
-
-			/*
-			 * Do not set password but untoggle
-			 * Since there is no share this should not result in another request to the server
-			 */
-			dialog.$el.find('[name=linkCheckbox]').click();
-			expect(fakeServer.requests.length).toEqual(2);
-		});
-
-		it('Reset password placeholder when password is enforced and link is toggled', function() { 
-			$('#allowShareWithLink').val('yes');
-
-			dialog.render();
-
-			// Toggle linkshare
-			dialog.$el.find('[name=linkCheckbox]').click();
-			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
-
-			// Set password
-			dialog.$el.find('#linkPassText').val('foo');
-			dialog.$el.find('#linkPassText').trigger(new $.Event('keyup', {keyCode: 13}));
-			fakeServer.requests[0].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({data: {token: 'xyz'}, status: 'success'})
-			);
-			dialog.render();
-			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('**********');
-
-			// Remove link
-			dialog.$el.find('[name=linkCheckbox]').click();
-			fakeServer.requests[1].respond(
-				200,
-				{ 'Content-Type': 'application/json' },
-				JSON.stringify({status: 'success'})
-			);
-
-			// Try to share again
-			dialog.$el.find('[name=linkCheckbox]').click();
-			expect(dialog.$el.find('#linkPassText').attr('placeholder')).toEqual('Choose a password for the public link');
-		});
 		it('shows populated link share when a link share exists', function() {
 			// this is how the OC.Share class does it...
 			var link = parent.location.protocol + '//' + location.host +
-- 
GitLab


From 36e452a472c8144812eb710d44ebbe03d01884d4 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 15:51:21 +0200
Subject: [PATCH 356/783] Fix cruds button in share dialog

Only toggle the current row
---
 core/js/sharedialogshareelistview.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index c1d7ba4cf66..41be49dc241 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -281,8 +281,9 @@
 			this.model.setPermissions(shareType, shareWith, permissions);
 		},
 
-		onCrudsToggle: function() {
-			this.$el.find('.cruds').toggleClass('hidden');
+		onCrudsToggle: function(event) {
+			var $target = $(event.target);
+			$target.closest('li').find('.cruds').toggleClass('hidden');
 			return false;
 		},
 
-- 
GitLab


From 6141ea12b1fbac1de2c5bc4c1f2b756b13d8034e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 16:14:29 +0200
Subject: [PATCH 357/783] Port share.css styles to the sidebar panel

---
 core/css/share.css                  | 30 +++++++++++++++++------------
 core/js/sharedialoglinkshareview.js |  2 +-
 core/js/sharedialogview.js          |  3 +--
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/core/css/share.css b/core/css/share.css
index 73bad5c500d..6467cc0239c 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -23,29 +23,29 @@
 	}
 }
 
-#dropdown.shareDropDown .unshare.icon-loading-small {
+.shareTabView .unshare.icon-loading-small {
 	margin-top: 1px;
 }
 
-#dropdown.shareDropDown .shareWithLoading,
-#dropdown.shareDropDown .linkShare .icon-loading-small {
+.shareTabView .shareWithLoading,
+.shareTabView .linkShare .icon-loading-small {
 	display: inline-block !important;
 	padding-left: 10px;
 }
-#dropdown.shareDropDown .shareWithLoading {
+.shareTabView .shareWithLoading {
 	position: relative;
 	right: 70px;
 	top: 2px;
 }
-#dropdown.shareDropDown .icon-loading-small.hidden {
+.shareTabView .icon-loading-small.hidden {
 	display: none !important;
 }
 
-#dropdown .shareWithRemoteInfo {
+.shareTabView .shareWithRemoteInfo {
 	padding: 11px 20px;
 }
 
-#dropdown .avatar {
+.shareTabView .avatar {
 	margin-right: 8px;
 	display: inline-block;
 	overflow: hidden;
@@ -87,12 +87,12 @@
 #shareWithList li label{
 	margin-right: 8px;
 }
-#dropdown label {
+.shareTabView label {
 	font-weight:400;
 	white-space: nowrap;
 }
 
-#dropdown input[type="checkbox"] {
+.shareTabView input[type="checkbox"] {
 	margin:0 3px 0 8px;
 	vertical-align: middle;
 }
@@ -115,12 +115,18 @@ a.unshare {
 	padding-top:8px;
 }
 
-#dropdown input[type="text"],#dropdown input[type="password"] {
-	width: 86%;
+.shareTabView input[type="text"],
+.shareTabView input[type="password"],
+.shareTabView input[type="submit"] {
 	margin-left: 7px;
 }
 
-#dropdown form {
+.shareTabView input[type="text"],
+.shareTabView input[type="password"] {
+	width: 86%;
+}
+
+.shareTabView form {
 	font-size: 100%;
 	margin-left: 0;
 	margin-right: 0;
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 2c7914b2545..ab591b9c6e8 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -32,7 +32,7 @@
 			'<div id="allowPublicUploadWrapper">' +
 			'    <span class="icon-loading-small hidden"></span>' +
 			'    <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
-			'    <label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
+			'<label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
 			'</div>' +
 			'    {{/if}}' +
 			'    {{#if mailPublicNotificationEnabled}}' +
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 8c390ee5450..2b61dab3ceb 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -20,9 +20,8 @@
 		'<div class="oneline">' +
 		'    <input id="shareWith" type="text" placeholder="{{sharePlaceholder}}" />' +
 		'    <span class="shareWithLoading icon-loading-small hidden"></span>'+
-		'</div>' +
-			// FIXME: find a good position for remoteShareInfo
 		'{{{remoteShareInfo}}}' +
+		'</div>' +
 		'{{/if}}' +
 		'<div class="shareeListView"></div>' +
 		'<div class="linkShareView"></div>' +
-- 
GitLab


From e7e0cfe93d1e7050f35a4b78c9fc70dbe32ec397 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 15 Sep 2015 17:08:04 +0200
Subject: [PATCH 358/783] Properly show sidebar when clicking on share button

---
 apps/files/js/filelist.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 699df691bbc..23834fa44de 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -379,6 +379,7 @@
 			if (tabId) {
 				this._detailsView.selectTab(tabId);
 			}
+			OC.Apps.showAppSidebar();
 		},
 
 		/**
-- 
GitLab


From 99238a5a42b0745876ed3917c420f85bc5bfc5a6 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 1 Sep 2015 11:41:42 +0200
Subject: [PATCH 359/783] custom checkbox style

---
 core/img/actions/checkbox-checked.png | Bin 0 -> 265 bytes
 core/img/actions/checkbox-checked.svg |   4 ++++
 core/img/actions/checkbox-mixed.png   | Bin 0 -> 135 bytes
 core/img/actions/checkbox-mixed.svg   |   4 ++++
 core/img/actions/checkbox.png         | Bin 0 -> 130 bytes
 core/img/actions/checkbox.svg         |   4 ++++
 6 files changed, 12 insertions(+)
 create mode 100644 core/img/actions/checkbox-checked.png
 create mode 100644 core/img/actions/checkbox-checked.svg
 create mode 100644 core/img/actions/checkbox-mixed.png
 create mode 100644 core/img/actions/checkbox-mixed.svg
 create mode 100644 core/img/actions/checkbox.png
 create mode 100644 core/img/actions/checkbox.svg

diff --git a/core/img/actions/checkbox-checked.png b/core/img/actions/checkbox-checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..309069226b815130f8cd503a6b759f777c2b1ac8
GIT binary patch
literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfbE0CrZc$Q#Q0yImaB*-tA
zfr*(_xW2KuwX1u=y!i_jE?R#0$k8+R-uwTU#|cyu>gnPbQgN%d&r_&DfrsU|#*XGL
z?|=V;v{_x3?76W0<(d@_pZGK!koQWg(d4;h-IYBp$8qK3mj*`PCtW__C!sds^3rVP
pmFbFVX?r*2{I?HbIm@n9!Fci)*TaZSvQI!B@^tlcS?83{1OWY}MpFO)

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-checked.svg b/core/img/actions/checkbox-checked.svg
new file mode 100644
index 00000000000..9797244085c
--- /dev/null
+++ b/core/img/actions/checkbox-checked.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm8.924 2.0664l1.433 1.4316-6.3648 6.365-4.2422-4.2439 1.4141-1.414 2.8281 2.8301 4.9318-4.9688z"/>
+</svg>
diff --git a/core/img/actions/checkbox-mixed.png b/core/img/actions/checkbox-mixed.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bc34b43b363c85a4d694a3c5667b00fd423f1c1
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE09J8{(R4Sfqa&dAirRS
z!$*#$Jj(h8<STo+IEGX(CM&QRY(Bs!9MQnaIYFPnSZ+JR(`^QdKYET-h%)dlW&Fwd
RM}G&%I8RqUmvv4FO#oFeA0z+(

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-mixed.svg b/core/img/actions/checkbox-mixed.svg
new file mode 100644
index 00000000000..f4cb51455ae
--- /dev/null
+++ b/core/img/actions/checkbox-mixed.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm1 5h8v2h-8v-2z"/>
+</svg>
diff --git a/core/img/actions/checkbox.png b/core/img/actions/checkbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..4539c8930c5967e49ce0cbb39caeec4d3f3c537d
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE09J8{(R4Sfqa&dAirRS
z!$*#$Jj(h8<jZ-wIEGX(CM&QRY(Bs!9MQn4c-&|Q>kI+Ebd_VP8KT7)Rx(B`&H<U^
M>FVdQ&MBb@0IkX#MF0Q*

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox.svg b/core/img/actions/checkbox.svg
new file mode 100644
index 00000000000..872df995ccc
--- /dev/null
+++ b/core/img/actions/checkbox.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm0 1h10v10h-10v-10z"/>
+</svg>
-- 
GitLab


From 7be8984fd9a6c6c3292f01d4bdbf24d80e4c0079 Mon Sep 17 00:00:00 2001
From: Raghu Nayyar <hey@raghunayyar.com>
Date: Sat, 5 Sep 2015 14:41:54 +0530
Subject: [PATCH 360/783] Adds background image for checkboxes

---
 core/css/styles.css | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 9219068dc38..570e5019dc7 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -158,7 +158,24 @@ textarea:hover, textarea:focus, textarea:active {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	opacity: 1;
 }
-input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
+input[type="checkbox"] {
+	margin:0;
+	padding:0;
+	height:auto;
+	width:auto;
+	display: none;
+}
+
+input[type="checkbox"] + label {
+		background: url('../img/actions/checkbox.svg') bottom right no-repeat;
+		opacity: 0.5;
+}
+
+input[type="checkbox"]:checked + label {
+	background: url('../img/actions/checkbox-checked.svg') bottom right no-repeat;
+	opacity: 0.5;
+}
+
 input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }
 input[type="time"] {
 	width: initial;
-- 
GitLab


From a7b27433ef5d10309ee88dcd0634e6f76b980faa Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 11 Sep 2015 17:16:33 +0200
Subject: [PATCH 361/783] add white versions of custom checkboxes

---
 core/img/actions/checkbox-checked-white.png | Bin 0 -> 267 bytes
 core/img/actions/checkbox-checked-white.svg |   4 ++++
 core/img/actions/checkbox-mixed-white.png   | Bin 0 -> 135 bytes
 core/img/actions/checkbox-mixed-white.svg   |   4 ++++
 core/img/actions/checkbox-white.png         | Bin 0 -> 130 bytes
 core/img/actions/checkbox-white.svg         |   4 ++++
 6 files changed, 12 insertions(+)
 create mode 100644 core/img/actions/checkbox-checked-white.png
 create mode 100644 core/img/actions/checkbox-checked-white.svg
 create mode 100644 core/img/actions/checkbox-mixed-white.png
 create mode 100644 core/img/actions/checkbox-mixed-white.svg
 create mode 100644 core/img/actions/checkbox-white.png
 create mode 100644 core/img/actions/checkbox-white.svg

diff --git a/core/img/actions/checkbox-checked-white.png b/core/img/actions/checkbox-checked-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed8e3d3d5579d4ab5bf504002ba674e34d9b1f4a
GIT binary patch
literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfbE0F$ACD1&Rn;mGJL`jfe
zFar}at8hb8OKVs6#Ch`<E?T_&@R6fu?!A9}KQ05PCfw7-F{I*FZ{JP61_KV3@GbX(
zw#xnaKV9llL{81iJ#QVv0uCv5GPv43IaH`8^Gds`_|l!GYdZ?fC0wi~)LWZ5**D$r
sn$BhA@5EbJSN83{y${Q2Ypx20lX_hDm$ft40<B>1boFyt=akR{0FAnfU;qFB

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-checked-white.svg b/core/img/actions/checkbox-checked-white.svg
new file mode 100644
index 00000000000..388e5588a08
--- /dev/null
+++ b/core/img/actions/checkbox-checked-white.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path fill="#fff" d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm8.924 2.0664l1.433 1.4316-6.3648 6.365-4.2422-4.2439 1.4141-1.414 2.8281 2.8301 4.9318-4.9688z"/>
+</svg>
diff --git a/core/img/actions/checkbox-mixed-white.png b/core/img/actions/checkbox-mixed-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b81f998fc599b02e08aad5adbd533e047b286ea
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE0F$=1p1xsWdMa(N`m}?
z84e#gn(`>?8<4N;>Eakt!I-STX0Z7Hqi{q6E9V4#24lJH3{STiDE{a<QX$H~yOi-K
T>mU6cK;;acu6{1-oD!M<X;CX)

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-mixed-white.svg b/core/img/actions/checkbox-mixed-white.svg
new file mode 100644
index 00000000000..45e56a07290
--- /dev/null
+++ b/core/img/actions/checkbox-mixed-white.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path fill="#fff" d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm1 5h8v2h-8v-2z"/>
+</svg>
diff --git a/core/img/actions/checkbox-white.png b/core/img/actions/checkbox-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0f903c77c6fac730541d2c2dd392e79e44e93cd
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJe}GSjE0F$=1p1xsWdMa(N`m}?
z84e#gn(`>?8;~#O>Eakt!I-STX0Z7Hqi{q6tKxB^9jr41{L)p9t!9W8V_3-;u{Z~)
OlEKr}&t;ucLK6Ul$tZsS

literal 0
HcmV?d00001

diff --git a/core/img/actions/checkbox-white.svg b/core/img/actions/checkbox-white.svg
new file mode 100644
index 00000000000..3c5f6090f6e
--- /dev/null
+++ b/core/img/actions/checkbox-white.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path fill="#fff" d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm0 1h10v10h-10v-10z"/>
+</svg>
-- 
GitLab


From 7ccd02ec952193fe61505e9ceafe5b96649e26fb Mon Sep 17 00:00:00 2001
From: Raghu Nayyar <hey@raghunayyar.com>
Date: Sat, 12 Sep 2015 20:01:00 +0530
Subject: [PATCH 362/783] Fixes white and black checkboxes in core, files will
 be next.

---
 apps/files/css/files.css |  1 +
 core/css/styles.css      | 26 +++++++++++++++++++++-----
 core/templates/login.php |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 05033dc2fed..b3652c128b3 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -446,6 +446,7 @@ table td.filename .uploadtext {
 /* Use label to have bigger clickable size for checkbox */
 #fileList tr td.filename>.selectCheckBox + label,
 .select-all + label {
+	background-position: 30px 30px;
 	height: 50px;
 	position: absolute;
 	width: 50px;
diff --git a/core/css/styles.css b/core/css/styles.css
index 570e5019dc7..2d1a4517f07 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -167,13 +167,29 @@ input[type="checkbox"] {
 }
 
 input[type="checkbox"] + label {
-		background: url('../img/actions/checkbox.svg') bottom right no-repeat;
-		opacity: 0.5;
+		background: url('../img/actions/checkbox.svg') no-repeat;
+		opacity: 0.7;
+}
+
+input[type="checkbox"] + label.white {
+		background: url('../img/actions/checkbox-white.svg') no-repeat;
 }
 
 input[type="checkbox"]:checked + label {
-	background: url('../img/actions/checkbox-checked.svg') bottom right no-repeat;
-	opacity: 0.5;
+	background: url('../img/actions/checkbox-checked.svg') no-repeat;
+	opacity: 0.7;
+}
+
+input[type="checkbox"]:checked + label.white {
+	background: url('../img/actions/checkbox-checked-white.svg') no-repeat;
+}
+
+input[type="checkbox"] + label,
+input[type="checkbox"] + label.white,
+input[type="checkbox"]:checked + label,
+input[type="checkbox"]:checked + label.white {
+	background-position: left;
+	padding-left: 20px;
 }
 
 input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }
@@ -631,7 +647,6 @@ label.infield {
 	margin: 0;
 	padding: 14px;
 	padding-left: 28px;
-	margin-left: -28px;
 	vertical-align: middle;
 }
 #body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
@@ -831,6 +846,7 @@ label.infield {
 	opacity: .7;
 }
 #body-login .remember-login-container {
+	margin-top: 10px;
 	text-align: center;
 }
 
diff --git a/core/templates/login.php b/core/templates/login.php
index 513988876e1..69d0b033e95 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -67,7 +67,7 @@ script('core', [
 		<?php if ($_['rememberLoginAllowed'] === true) : ?>
 		<div class="remember-login-container">
 			<input type="checkbox" name="remember_login" value="1" id="remember_login">
-			<label for="remember_login"><?php p($l->t('remember')); ?></label>
+			<label for="remember_login" class="white"><?php p($l->t('remember')); ?></label>
 		</div>
 		<?php endif; ?>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
-- 
GitLab


From 88bc4780557124c4cef62a72688b2f972a0d8c42 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Tue, 15 Sep 2015 20:26:24 +0200
Subject: [PATCH 363/783] use label:before instead of label

---
 core/css/styles.css      | 38 +++++++++++++++++++++-----------------
 core/templates/login.php |  4 ++--
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 2d1a4517f07..2ec5129a1c5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -166,33 +166,34 @@ input[type="checkbox"] {
 	display: none;
 }
 
-input[type="checkbox"] + label {
-		background: url('../img/actions/checkbox.svg') no-repeat;
-		opacity: 0.7;
+input[type="checkbox"] + label:before {
+	content: "";
+	display: inline-block;
+
+	height: 20px;
+	width: 20px;
+	vertical-align: middle;
+
+	background: url('../img/actions/checkbox.svg') left center no-repeat;
+	opacity: 0.7;
 }
 
-input[type="checkbox"] + label.white {
-		background: url('../img/actions/checkbox-white.svg') no-repeat;
+input[type="checkbox"].white + label:before {
+	background-image: url('../img/actions/checkbox-white.svg');
 }
 
-input[type="checkbox"]:checked + label {
-	background: url('../img/actions/checkbox-checked.svg') no-repeat;
-	opacity: 0.7;
+input[type="checkbox"]:checked + label:before {
+	background-image: url('../img/actions/checkbox-checked.svg');
 }
 
-input[type="checkbox"]:checked + label.white {
-	background: url('../img/actions/checkbox-checked-white.svg') no-repeat;
+input[type="checkbox"].white:checked + label:before {
+	background-image: url('../img/actions/checkbox-checked-white.svg');
 }
 
-input[type="checkbox"] + label,
-input[type="checkbox"] + label.white,
-input[type="checkbox"]:checked + label,
-input[type="checkbox"]:checked + label.white {
-	background-position: left;
-	padding-left: 20px;
+input[type="checkbox"]:hover+label:before, input[type="checkbox"]:focus+label:before {
+	color:#111 !important;
 }
 
-input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }
 input[type="time"] {
 	width: initial;
 	height: 31px;
@@ -705,6 +706,9 @@ label.infield {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
 	opacity: .3;
 }
+#show + label:before, #dbpassword + label:before, #personal-show + label:before {
+	display: none;
+}
 #pass2, input[name="personal-password-clone"] {
 	padding: .6em 2.5em .4em .4em;
 	width: 8em;
diff --git a/core/templates/login.php b/core/templates/login.php
index 69d0b033e95..08c7768a432 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -66,8 +66,8 @@ script('core', [
 		<?php endif; ?>
 		<?php if ($_['rememberLoginAllowed'] === true) : ?>
 		<div class="remember-login-container">
-			<input type="checkbox" name="remember_login" value="1" id="remember_login">
-			<label for="remember_login" class="white"><?php p($l->t('remember')); ?></label>
+			<input type="checkbox" name="remember_login" value="1" id="remember_login" class="white">
+			<label for="remember_login"><?php p($l->t('remember')); ?></label>
 		</div>
 		<?php endif; ?>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
-- 
GitLab


From 0ce3b19e11bdf9ac71a4992f2de6169e148754fb Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Tue, 15 Sep 2015 20:26:53 +0200
Subject: [PATCH 364/783] fix filelist checkboxes

---
 apps/files/css/files.css | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index b3652c128b3..446848a7a68 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -420,25 +420,20 @@ table td.filename .uploadtext {
 }
 
 /* File checkboxes */
-#fileList tr td.filename>.selectCheckBox {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-	filter: alpha(opacity=0);
+#fileList tr td.filename>.selectCheckBox + label:before {
 	opacity: 0;
-	float: left;
-	top: 0;
-	margin: 32px 0 4px 32px; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/
+	position: absolute;
+	bottom: 4px;
+	right: 0;
+	z-index: 10;
 }
+
 /* Show checkbox when hovering, checked, or selected */
-#fileList tr:hover td.filename>.selectCheckBox,
-#fileList tr:focus td.filename>.selectCheckBox,
-#fileList tr td.filename>.selectCheckBox:checked,
-#fileList tr.selected td.filename>.selectCheckBox {
+#fileList tr:hover td.filename>.selectCheckBox + label:before,
+#fileList tr:focus td.filename>.selectCheckBox + label:before,
+#fileList tr td.filename>.selectCheckBox:checked + label:before,
+#fileList tr.selected td.filename>.selectCheckBox + label:before {
 	opacity: 1;
-}
-.lte9 #fileList tr:hover td.filename>.selectCheckBox,
-.lte9 #fileList tr:focus td.filename>.selectCheckBox,
-.lte9 #fileList tr td.filename>.selectCheckBox[checked=checked],
-.lte9 #fileList tr.selected td.filename>.selectCheckBox {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	filter: alpha(opacity=100);
 }
@@ -461,7 +456,7 @@ table td.filename .uploadtext {
 .select-all + label {
 	top: 0;
 }
-.select-all {
+.select-all + label:before {
 	position: absolute;
 	top: 18px;
 	left: 18px;
-- 
GitLab


From d2d4cbc23e98bd5a4cd2b340927aec485ba74684 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 15 Sep 2015 23:22:42 +0200
Subject: [PATCH 365/783] fix checkbox images

---
 core/img/actions/checkbox-checked-white.svg |   2 +-
 core/img/actions/checkbox-checked.png       | Bin 265 -> 254 bytes
 core/img/actions/checkbox-checked.svg       |   3 ++-
 core/img/actions/checkbox-mixed-white.svg   |   2 +-
 core/img/actions/checkbox-mixed.png         | Bin 135 -> 138 bytes
 core/img/actions/checkbox-mixed.svg         |   3 ++-
 core/img/actions/checkbox-white.svg         |   2 +-
 core/img/actions/checkbox.png               | Bin 130 -> 134 bytes
 core/img/actions/checkbox.svg               |   3 ++-
 9 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/img/actions/checkbox-checked-white.svg b/core/img/actions/checkbox-checked-white.svg
index 388e5588a08..17bfdfbe4a6 100644
--- a/core/img/actions/checkbox-checked-white.svg
+++ b/core/img/actions/checkbox-checked-white.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path fill="#fff" d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm8.924 2.0664l1.433 1.4316-6.3648 6.365-4.2422-4.2439 1.4141-1.414 2.8281 2.8301 4.9318-4.9688z"/>
+ <path d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm8.924 2.0664l1.433 1.4316-6.3648 6.365-4.2422-4.2439 1.4141-1.414 2.8281 2.8301 4.9318-4.9688z" fill="#fff"/>
 </svg>
diff --git a/core/img/actions/checkbox-checked.png b/core/img/actions/checkbox-checked.png
index 309069226b815130f8cd503a6b759f777c2b1ac8..a8a07193ab700714b87d1459717462b77da4f164 100644
GIT binary patch
delta 226
zcmV<803H8{0{#JzB!5m&OjJbx003cqqG5cYVSS-teW6=;omF$1caN@+qrH-*zLTcE
zl&8OysKAz}z@D$hqO-`Ov&g2l%BQ!>sJP6kxy<tQ_x$|*{r&#_{{H{}|J1_+_5c6?
z26R$RQvlM_)bID%%_y$`003D@L_t(|+KrA&4uBvGL=m+rs9X3!>)ijMrV>HohPRv7
zW?EH3O%eSF`j886bK!9|L3Fd^9Xy1M_P|24fz8{|Ggb$-sdT&`^C-ly&CgEe|3?x!
c<w_NB1Gwk~9tKWaYybcN07*qoM6N<$g0}{BMF0Q*

literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!cYsfbE0CrZc$Q#Q0yImaB*-tA
zfr*(_xW2KuwX1u=y!i_jE?R#0$k8+R-uwTU#|cyu>gnPbQgN%d&r_&DfrsU|#*XGL
z?|=V;v{_x3?76W0<(d@_pZGK!koQWg(d4;h-IYBp$8qK3mj*`PCtW__C!sds^3rVP
pmFbFVX?r*2{I?HbIm@n9!Fci)*TaZSvQI!B@^tlcS?83{1OWY}MpFO)

diff --git a/core/img/actions/checkbox-checked.svg b/core/img/actions/checkbox-checked.svg
index 9797244085c..c5aa3cd73bb 100644
--- a/core/img/actions/checkbox-checked.svg
+++ b/core/img/actions/checkbox-checked.svg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm8.924 2.0664l1.433 1.4316-6.3648 6.365-4.2422-4.2439 1.4141-1.414 2.8281 2.8301 4.9318-4.9688z"/>
+ <path d="m2.5 2.5h11v11h-11z" fill="#fff"/>
+ <path fill="#55739a" d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm8.924 2.0664l1.433 1.4316-6.3648 6.365-4.2422-4.2439 1.4141-1.414 2.8281 2.8301 4.9318-4.9688z"/>
 </svg>
diff --git a/core/img/actions/checkbox-mixed-white.svg b/core/img/actions/checkbox-mixed-white.svg
index 45e56a07290..faae0820c8b 100644
--- a/core/img/actions/checkbox-mixed-white.svg
+++ b/core/img/actions/checkbox-mixed-white.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path fill="#fff" d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm1 5h8v2h-8v-2z"/>
+ <path d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm1 5h8v2h-8v-2z" fill="#fff"/>
 </svg>
diff --git a/core/img/actions/checkbox-mixed.png b/core/img/actions/checkbox-mixed.png
index 8bc34b43b363c85a4d694a3c5667b00fd423f1c1..cc27ec651eaf25f0d186772adcd63e8ce3b1c399 100644
GIT binary patch
delta 89
zcmZo?>|&gtqAe8Q6XMFiz%Xy#yt#Ad0?BF9rv3l_e`e1$C7>uvNswPK!==kt#7x<*
sPV|vbKETDggH>aDE9b#<m1C<JEL531*@IFlfl3)XUHx3vIVCg!00{LUN&o-=

delta 86
zcmeBTY-gOHqQM{F6XME%3jFz=_X0&&N`m}?84e#gn(`>?+eCi}Wd>up?F>)187Thf
bIZ`3Yz`K<3C+i>m9U#q~u6{1-oD!M<ls*{D

diff --git a/core/img/actions/checkbox-mixed.svg b/core/img/actions/checkbox-mixed.svg
index f4cb51455ae..7f3642912da 100644
--- a/core/img/actions/checkbox-mixed.svg
+++ b/core/img/actions/checkbox-mixed.svg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm1 5h8v2h-8v-2z"/>
+ <path d="m2.5 2.5h11v11h-11z" fill="#fff"/>
+ <path fill="#969696" d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm1 5h8v2h-8v-2z"/>
 </svg>
diff --git a/core/img/actions/checkbox-white.svg b/core/img/actions/checkbox-white.svg
index 3c5f6090f6e..4325f9fb1e0 100644
--- a/core/img/actions/checkbox-white.svg
+++ b/core/img/actions/checkbox-white.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path fill="#fff" d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm0 1h10v10h-10v-10z"/>
+ <path d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm0 1h10v10h-10v-10z" fill="#fff"/>
 </svg>
diff --git a/core/img/actions/checkbox.png b/core/img/actions/checkbox.png
index 4539c8930c5967e49ce0cbb39caeec4d3f3c537d..770b7ef82037fcc3b3ab6a628fbdb0762846013f 100644
GIT binary patch
delta 105
zcmZo-Y-60Dk|Y%16XMFiz%Xy#yt#Ad0?BF9rv3l_e`e1$C7>uvNswPK!==kt#7x<*
z0{QZuE{-7;jL8aY2AdBs3P&`wit<IUZD$ZZ^s?tjg(ySHQKq@t_M0yQl`?p``njxg
HN@xNAAIK%H

delta 101
zcmZo;Y+{_C62~9l6XME%3jFz=_X0&&N`m}?84e#gn(`>?8;~#O>Eakt!I-STX0Z7H
pqi{q6tKxB^9jr41{L)p9t!9W8V_3-;u{Z~0mZz(q%Q~loCIG@%8lnII

diff --git a/core/img/actions/checkbox.svg b/core/img/actions/checkbox.svg
index 872df995ccc..fe8f727b899 100644
--- a/core/img/actions/checkbox.svg
+++ b/core/img/actions/checkbox.svg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm0 1h10v10h-10v-10z"/>
+ <path d="m2.5 2.5h11v11h-11z" fill="#fff"/>
+ <path fill="#969696" d="m3 2c-0.554 0-1 0.446-1 1v10c0 0.554 0.446 1 1 1h10c0.554 0 1-0.446 1-1v-10c0-0.554-0.446-1-1-1h-10zm0 1h10v10h-10v-10z"/>
 </svg>
-- 
GitLab


From e0992c129732b352338b1f7aec16d1108fc26011 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 16 Sep 2015 09:38:36 +0200
Subject: [PATCH 366/783]  Check for maintenance mode first so we send the 503
 instead of login verification

---
 lib/private/connector/sabre/serverfactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/connector/sabre/serverfactory.php b/lib/private/connector/sabre/serverfactory.php
index 86f60633541..042cc051d35 100644
--- a/lib/private/connector/sabre/serverfactory.php
+++ b/lib/private/connector/sabre/serverfactory.php
@@ -63,12 +63,12 @@ class ServerFactory {
 
 		// Load plugins
 		$defaults = new \OC_Defaults();
+		$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin($this->config));
 		$server->addPlugin(new \OC\Connector\Sabre\BlockLegacyClientPlugin($this->config));
 		$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()));
 		// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
 		$server->addPlugin(new \OC\Connector\Sabre\DummyGetResponsePlugin());
 		$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
-		$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin($this->config));
 		$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
 		$server->addPlugin(new \OC\Connector\Sabre\LockPlugin($objectTree));
 
-- 
GitLab


From 475603eeb705d0afe872c4f32f6edf9156a89035 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 15 Sep 2015 23:56:31 +0200
Subject: [PATCH 367/783] fix new menu not showing on mobile, fix #18879

---
 apps/files/css/files.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 65666826487..df23f415129 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -729,6 +729,7 @@ table.dragshadow td.size {
 	width: 140px;
 	margin-left: -56px;
 	margin-top: 25px;
+	z-index: 1001;
 }
 
 .newFileMenu .menuitem {
-- 
GitLab


From 7144832906a851f46ca8f29a39818bd41473c52d Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 15 Sep 2015 17:52:58 +0200
Subject: [PATCH 368/783] adjust navigation text opacity, fix #19016

---
 core/css/apps.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/css/apps.css b/core/css/apps.css
index 0371f2bbde7..23e0c519d00 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -72,7 +72,7 @@
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	color: #000;
-	opacity: .5;
+	opacity: .57;
 }
 #app-navigation .active,
 #app-navigation .active a,
-- 
GitLab


From 862afd80b36b64262dcce03f15886d81b88080ae Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 16 Sep 2015 10:47:46 +0100
Subject: [PATCH 369/783] Restore loadApp() autoload registration

Also changes the autoloader validRoots into a hashmap to try and reduce
duplicate entries
---
 lib/autoloader.php  | 9 ++++++---
 lib/private/app.php | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/autoloader.php b/lib/autoloader.php
index 41a040b3f54..8361f31b038 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -51,7 +51,9 @@ class Autoloader {
 	 * @param string[] $validRoots
 	 */
 	public function __construct(array $validRoots) {
-		$this->validRoots = $validRoots;
+		foreach ($validRoots as $root) {
+			$this->validRoots[$root] = true;
+		}
 	}
 
 	/**
@@ -60,7 +62,8 @@ class Autoloader {
 	 * @param string $root
 	 */
 	public function addValidRoot($root) {
-		$this->validRoots[] = stream_resolve_include_path($root);
+		$root = stream_resolve_include_path($root);
+		$this->validRoots[$root] = true;
 	}
 
 	/**
@@ -126,7 +129,7 @@ class Autoloader {
 	}
 
 	protected function isValidPath($fullPath) {
-		foreach ($this->validRoots as $root) {
+		foreach ($this->validRoots as $root => $true) {
 			if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
 				return true;
 			}
diff --git a/lib/private/app.php b/lib/private/app.php
index e42fba525e4..368b3220b49 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -131,6 +131,7 @@ class OC_App {
 	 */
 	public static function loadApp($app, $checkUpgrade = true) {
 		self::$loadedApps[] = $app;
+		\OC::$loader->addValidRoot(self::getAppPath($app)); // in case someone calls loadApp() directly
 		if (is_file(self::getAppPath($app) . '/appinfo/app.php')) {
 			\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
 			if ($checkUpgrade and self::shouldUpgrade($app)) {
-- 
GitLab


From 2356ba249415961d6de456f4e71198cd55661a11 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 16 Sep 2015 11:51:58 +0200
Subject: [PATCH 370/783] fix accessibility of New button, use alt text instead
 of tooltip

---
 apps/files/js/filelist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 23834fa44de..b746bcff43d 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -10,7 +10,7 @@
 
 (function() {
 
-	var TEMPLATE_ADDBUTTON = '<a href="#" class="button new" title="{{addText}}"><img src="{{iconUrl}}"></img></a>';
+	var TEMPLATE_ADDBUTTON = '<a href="#" class="button new"><img src="{{iconUrl}}" alt="{{addText}}"></img></a>';
 
 	/**
 	 * @class OCA.Files.FileList
-- 
GitLab


From a0094d28f19b3ee4a32b52bbe8eec596a7035a3d Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 16 Sep 2015 11:22:52 +0100
Subject: [PATCH 371/783] Explicitly cast number to integer

---
 lib/private/files/cache/storage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php
index a116e84b3f2..88ceb287fb9 100644
--- a/lib/private/files/cache/storage.php
+++ b/lib/private/files/cache/storage.php
@@ -142,7 +142,7 @@ class Storage {
 	public function getAvailability() {
 		if ($row = self::getStorageById($this->storageId)) {
 			return [
-				'available' => ($row['available'] === 1),
+				'available' => ((int)$row['available'] === 1),
 				'last_checked' => $row['last_checked']
 			];
 		} else {
-- 
GitLab


From 953b64f3f2ee919243e737d4f5f775c32954c30e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 14 Sep 2015 15:34:28 +0200
Subject: [PATCH 372/783] Add tests for downloading files over dav

---
 .../sabre/requesttest/downloadtest.php        | 52 +++++++++++++++++++
 .../lib/connector/sabre/requesttest/sapi.php  | 10 +++-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 tests/lib/connector/sabre/requesttest/downloadtest.php

diff --git a/tests/lib/connector/sabre/requesttest/downloadtest.php b/tests/lib/connector/sabre/requesttest/downloadtest.php
new file mode 100644
index 00000000000..67dd9f52308
--- /dev/null
+++ b/tests/lib/connector/sabre/requesttest/downloadtest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Connector\Sabre\RequestTest;
+
+use OCP\AppFramework\Http;
+use OCP\Lock\ILockingProvider;
+
+class DownloadTest extends RequestTest {
+	public function testDownload() {
+		$user = $this->getUniqueID();
+		$view = $this->setupUser($user, 'pass');
+
+		$view->file_put_contents('foo.txt', 'bar');
+
+		$response = $this->request($view, $user, 'pass', 'GET', '/foo.txt');
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+		$this->assertEquals(stream_get_contents($response->getBody()), 'bar');
+	}
+
+	/**
+	 * @expectedException \OC\Connector\Sabre\Exception\FileLocked
+	 */
+	public function testDownloadWriteLocked() {
+		$user = $this->getUniqueID();
+		$view = $this->setupUser($user, 'pass');
+
+		$view->file_put_contents('foo.txt', 'bar');
+
+		$view->lockFile('/foo.txt', ILockingProvider::LOCK_EXCLUSIVE);
+
+		$this->request($view, $user, 'pass', 'GET', '/foo.txt', 'asd');
+	}
+
+	public function testDownloadReadLocked() {
+		$user = $this->getUniqueID();
+		$view = $this->setupUser($user, 'pass');
+
+		$view->file_put_contents('foo.txt', 'bar');
+
+		$view->lockFile('/foo.txt', ILockingProvider::LOCK_SHARED);
+
+		$response = $this->request($view, $user, 'pass', 'GET', '/foo.txt', 'asd');
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+		$this->assertEquals(stream_get_contents($response->getBody()), 'bar');
+	}
+}
diff --git a/tests/lib/connector/sabre/requesttest/sapi.php b/tests/lib/connector/sabre/requesttest/sapi.php
index 7072b8bd286..eda5d738f6f 100644
--- a/tests/lib/connector/sabre/requesttest/sapi.php
+++ b/tests/lib/connector/sabre/requesttest/sapi.php
@@ -41,7 +41,15 @@ class Sapi {
 	 * @return void
 	 */
 	public function sendResponse(Response $response) {
-		$this->response = $response;
+		// we need to copy the body since we close the source stream
+		$copyStream = fopen('php://temp', 'r+');
+		if (is_string($response->getBody())) {
+			fwrite($copyStream, $response->getBody());
+		} else {
+			stream_copy_to_stream($response->getBody(), $copyStream);
+		}
+		rewind($copyStream);
+		$this->response = new Response($response->getStatus(), $response->getHeaders(), $copyStream);
 	}
 
 	/**
-- 
GitLab


From ca7b4a42f97728d41e143c2fc8534265ab59523d Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 14 Sep 2015 20:31:24 +0100
Subject: [PATCH 373/783] Fix external storage priority logic

---
 .../lib/config/configadapter.php              |  2 +-
 .../service/userglobalstoragesservice.php     | 57 +++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index a255a7b3d25..cb8c2f24caa 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -114,7 +114,7 @@ class ConfigAdapter implements IMountProvider {
 		$this->userStoragesService->setUser($user);
 		$this->userGlobalStoragesService->setUser($user);
 
-		foreach ($this->userGlobalStoragesService->getAllStorages() as $storage) {
+		foreach ($this->userGlobalStoragesService->getUniqueStorages() as $storage) {
 			try {
 				$this->prepareStorageConfig($storage, $user);
 				$impl = $this->constructStorage($storage);
diff --git a/apps/files_external/service/userglobalstoragesservice.php b/apps/files_external/service/userglobalstoragesservice.php
index c59652d057f..b60473f131e 100644
--- a/apps/files_external/service/userglobalstoragesservice.php
+++ b/apps/files_external/service/userglobalstoragesservice.php
@@ -26,6 +26,7 @@ use \OCA\Files_External\Service\BackendService;
 use \OCP\IUserSession;
 use \OCP\IGroupManager;
 use \OCA\Files_External\Service\UserTrait;
+use \OCA\Files_External\Lib\StorageConfig;
 
 /**
  * Service class to read global storages applicable to the user
@@ -109,4 +110,60 @@ class UserGlobalStoragesService extends GlobalStoragesService {
 		throw new \DomainException('UserGlobalStoragesService writing disallowed');
 	}
 
+	/**
+	 * Get unique storages, in case two are defined with the same mountpoint
+	 * Higher priority storages take precedence
+	 *
+	 * @return StorageConfig[]
+	 */
+	public function getUniqueStorages() {
+		$storages = $this->getAllStorages();
+
+		$storagesByMountpoint = [];
+		foreach ($storages as $storage) {
+			$storagesByMountpoint[$storage->getMountPoint()][] = $storage;
+		}
+
+		$result = [];
+		foreach ($storagesByMountpoint as $storageList) {
+			$storage = array_reduce($storageList, function($carry, $item) {
+				if (isset($carry)) {
+					$carryPriorityType = $this->getPriorityType($carry);
+					$itemPriorityType = $this->getPriorityType($item);
+					if ($carryPriorityType > $itemPriorityType) {
+						return $carry;
+					} elseif ($carryPriorityType === $itemPriorityType) {
+						if ($carry->getPriority() > $item->getPriority()) {
+							return $carry;
+						}
+					}
+				}
+				return $item;
+			});
+			$result[$storage->getID()] = $storage;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Get a priority 'type', where a bigger number means higher priority
+	 * user applicable > group applicable > 'all'
+	 *
+	 * @param StorageConfig $storage
+	 * @return int
+	 */
+	protected function getPriorityType(StorageConfig $storage) {
+		$applicableUsers = $storage->getApplicableUsers();
+		$applicableGroups = $storage->getApplicableGroups();
+
+		if ($applicableUsers && $applicableUsers[0] !== 'all') {
+			return 2;
+		}
+		if ($applicableGroups) {
+			return 1;
+		}
+		return 0;
+	}
+
 }
-- 
GitLab


From 373e2f890f19f1f71a2caeb393e1dc7056318932 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Mon, 14 Sep 2015 20:55:22 +0100
Subject: [PATCH 374/783] Unit tests for
 UserGlobalStoragesService::getUniqueStorages()

---
 .../service/userglobalstoragesservicetest.php | 80 ++++++++++++++++++-
 1 file changed, 78 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php
index b9e2c08c932..867872f3683 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php
@@ -35,6 +35,7 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 
 	const USER_ID = 'test_user';
 	const GROUP_ID = 'test_group';
+	const GROUP_ID2 = 'test_group2';
 
 	public function setUp() {
 		parent::setUp();
@@ -51,8 +52,12 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$this->groupManager = $this->getMock('\OCP\IGroupManager');
 		$this->groupManager->method('isInGroup')
 			->will($this->returnCallback(function($userId, $groupId) {
-				if ($userId === self::USER_ID && $groupId === self::GROUP_ID) {
-					return true;
+				if ($userId === self::USER_ID) {
+					switch ($groupId) {
+					case self::GROUP_ID:
+					case self::GROUP_ID2:
+						return true;
+					}
 				}
 				return false;
 			}));
@@ -167,6 +172,77 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$this->service->removeStorage(1);
 	}
 
+	public function getUniqueStoragesProvider() {
+		return [
+			// 'all' vs group
+			[100, [], [], 100, [], [self::GROUP_ID], 2],
+			[100, [], [self::GROUP_ID], 100, [], [], 1],
+
+			// 'all' vs user
+			[100, [], [], 100, [self::USER_ID], [], 2],
+			[100, [self::USER_ID], [], 100, [], [], 1],
+
+			// group vs user
+			[100, [], [self::GROUP_ID], 100, [self::USER_ID], [], 2],
+			[100, [self::USER_ID], [], 100, [], [self::GROUP_ID], 1],
+
+			// group+user vs group
+			[100, [], [self::GROUP_ID2], 100, [self::USER_ID], [self::GROUP_ID], 2],
+			[100, [self::USER_ID], [self::GROUP_ID], 100, [], [self::GROUP_ID2], 1],
+
+			// user vs 'all' (higher priority)
+			[200, [], [], 100, [self::USER_ID], [], 2],
+			[100, [self::USER_ID], [], 200, [], [], 1],
+
+			// group vs group (higher priority)
+			[100, [], [self::GROUP_ID2], 200, [], [self::GROUP_ID], 2],
+			[200, [], [self::GROUP_ID], 100, [], [self::GROUP_ID2], 1],
+		];
+	}
+
+	/**
+	 * @dataProvider getUniqueStoragesProvider
+	 */
+	public function testGetUniqueStorages(
+		$priority1, $applicableUsers1, $applicableGroups1,
+		$priority2, $applicableUsers2, $applicableGroups2,
+		$expectedPrecedence
+	) {
+		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
+		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
+
+		$storage1 = new StorageConfig();
+		$storage1->setMountPoint('mountpoint');
+		$storage1->setBackend($backend);
+		$storage1->setAuthMechanism($authMechanism);
+		$storage1->setBackendOptions(['password' => 'testPassword']);
+		$storage1->setPriority($priority1);
+		$storage1->setApplicableUsers($applicableUsers1);
+		$storage1->setApplicableGroups($applicableGroups1);
+
+		$storage1 = $this->globalStoragesService->addStorage($storage1);
+
+		$storage2 = new StorageConfig();
+		$storage2->setMountPoint('mountpoint');
+		$storage2->setBackend($backend);
+		$storage2->setAuthMechanism($authMechanism);
+		$storage2->setBackendOptions(['password' => 'testPassword']);
+		$storage2->setPriority($priority2);
+		$storage2->setApplicableUsers($applicableUsers2);
+		$storage2->setApplicableGroups($applicableGroups2);
+
+		$storage2 = $this->globalStoragesService->addStorage($storage2);
+
+		$storages = $this->service->getUniqueStorages();
+		$this->assertCount(1, $storages);
+
+		if ($expectedPrecedence === 1) {
+			$this->assertArrayHasKey($storage1->getID(), $storages);
+		} elseif ($expectedPrecedence === 2) {
+			$this->assertArrayHasKey($storage2->getID(), $storages);
+		}
+	}
+
 	public function testHooksAddStorage($a = null, $b = null, $c = null) {
 		// we don't test this here
 		$this->assertTrue(true);
-- 
GitLab


From 8aa68aa522390104dec908822b398a5acd34ab21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 16 Sep 2015 15:06:32 +0200
Subject: [PATCH 375/783] Increment timeout on Oracle startup

---
 autotest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autotest.sh b/autotest.sh
index 6a09fbfabac..8d0e20cf2a8 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -204,7 +204,7 @@ function execute_tests {
 		echo "Waiting for Oracle initialization ... "
 
 		# grep exits on the first match and then the script continues - times out after 2 minutes
-		timeout 120 docker logs -f "$DOCKER_CONTAINER_ID" 2>&1 | grep -q "Grant succeeded."
+		timeout 240 docker logs -f "$DOCKER_CONTAINER_ID" 2>&1 | grep -q "Grant succeeded."
 
 		DATABASEUSER=autotest
 		DATABASENAME='XE'
-- 
GitLab


From 3cf4fc02f9c99ba523f384f3def9f04eac21a067 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 16 Sep 2015 15:27:22 +0200
Subject: [PATCH 376/783] fix tests with empty response body

---
 tests/lib/connector/sabre/requesttest/sapi.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lib/connector/sabre/requesttest/sapi.php b/tests/lib/connector/sabre/requesttest/sapi.php
index eda5d738f6f..cda9fdb70f5 100644
--- a/tests/lib/connector/sabre/requesttest/sapi.php
+++ b/tests/lib/connector/sabre/requesttest/sapi.php
@@ -45,7 +45,7 @@ class Sapi {
 		$copyStream = fopen('php://temp', 'r+');
 		if (is_string($response->getBody())) {
 			fwrite($copyStream, $response->getBody());
-		} else {
+		} else if (is_resource($response->getBody())) {
 			stream_copy_to_stream($response->getBody(), $copyStream);
 		}
 		rewind($copyStream);
-- 
GitLab


From e3c067c2e10dc1faccf798e4c4d95e52cd85ff60 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 16 Sep 2015 17:22:17 +0300
Subject: [PATCH 377/783] Correct method title. Add docblock

---
 apps/files_versions/lib/backgroundjob/expireversions.php | 2 +-
 apps/files_versions/lib/storage.php                      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/files_versions/lib/backgroundjob/expireversions.php b/apps/files_versions/lib/backgroundjob/expireversions.php
index ec5612b5a67..afdd5eed57a 100644
--- a/apps/files_versions/lib/backgroundjob/expireversions.php
+++ b/apps/files_versions/lib/backgroundjob/expireversions.php
@@ -74,7 +74,7 @@ class ExpireVersions extends \OC\BackgroundJob\TimedJob {
 				}
 				$isFSready = true;
 			}
-			Storage::expireOlderThan($uid);
+			Storage::expireOlderThanMaxForUser($uid);
 		}
 
 		\OC_Util::tearDownFS();
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index 1f9d0fa04a1..6aa58c55e9b 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -403,7 +403,11 @@ class Storage {
 		return $versions;
 	}
 
-	public static function expireOlderThan($uid){
+	/**
+	 * Expire versions that older than max version retention time
+	 * @param string $uid
+	 */
+	public static function expireOlderThanMaxForUser($uid){
 		$expiration = self::getExpiration();
 		$threshold = $expiration->getMaxAgeAsTimestamp();
 		$versions = self::getAllVersions($uid);
-- 
GitLab


From 8ac3d5e36c7d628f1ba4d27c68d54786eed972b2 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Tue, 11 Aug 2015 22:21:32 +0300
Subject: [PATCH 378/783] Add expiration cronjob

---
 apps/files_trashbin/appinfo/app.php           |   1 +
 apps/files_trashbin/appinfo/install.php       |  23 ++++
 apps/files_trashbin/appinfo/update.php        |   3 +
 .../lib/backgroundjob/expiretrash.php         | 104 ++++++++++++++++++
 apps/files_trashbin/lib/expiration.php        |   9 ++
 apps/files_trashbin/lib/trashbin.php          |   2 +-
 .../tests/backgroundjob/expiretrash.php       |  37 +++++++
 apps/files_trashbin/tests/expiration.php      |  34 ++++++
 8 files changed, 212 insertions(+), 1 deletion(-)
 create mode 100644 apps/files_trashbin/appinfo/install.php
 create mode 100644 apps/files_trashbin/lib/backgroundjob/expiretrash.php
 create mode 100644 apps/files_trashbin/tests/backgroundjob/expiretrash.php

diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index 8f079fe6120..4805f9eeafd 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -23,6 +23,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 $l = \OC::$server->getL10N('files_trashbin');
 
 // register hooks
diff --git a/apps/files_trashbin/appinfo/install.php b/apps/files_trashbin/appinfo/install.php
new file mode 100644
index 00000000000..dc4c2847c22
--- /dev/null
+++ b/apps/files_trashbin/appinfo/install.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+ // Cron job for deleting expired trash items
+\OC::$server->getJobList()->add('OCA\Files_Trashbin\BackgroundJob\ExpireTrash');
diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
index b77210ae4c0..ae018a9da5d 100644
--- a/apps/files_trashbin/appinfo/update.php
+++ b/apps/files_trashbin/appinfo/update.php
@@ -46,3 +46,6 @@ if (version_compare($installedVersion, '0.6.4', '<')) {
 	$config->setSystemValue('trashbin_retention_obligation', $newObligation);
 	$config->deleteSystemValue('trashbin_auto_expire');
 }
+
+// Cron job for deleting expired trash items
+\OC::$server->getJobList()->add('OCA\Files_Trashbin\BackgroundJob\ExpireTrash');
diff --git a/apps/files_trashbin/lib/backgroundjob/expiretrash.php b/apps/files_trashbin/lib/backgroundjob/expiretrash.php
new file mode 100644
index 00000000000..350628444cf
--- /dev/null
+++ b/apps/files_trashbin/lib/backgroundjob/expiretrash.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_Trashbin\BackgroundJob;
+
+use OCP\IDBConnection;
+use OCP\IUserManager;
+use OCA\Files_Trashbin\AppInfo\Application;
+use OCA\Files_Trashbin\Expiration;
+use OCA\Files_Trashbin\Helper;
+use OCA\Files_Trashbin\Trashbin;
+
+class ExpireTrash extends \OC\BackgroundJob\TimedJob {
+
+	const ITEMS_PER_SESSION = 1000;
+
+	/**
+	 * @var Expiration
+	 */
+	private $expiration;
+
+	/**
+	 * @var IDBConnection
+	 */
+	private $dbConnection;
+	
+	/**
+	 * @var IUserManager
+	 */
+	private $userManager;
+
+	public function __construct(IDBConnection $dbConnection = null, IUserManager $userManager = null, Expiration $expiration = null) {
+		// Run once per 30 minutes
+		$this->setInterval(60 * 30);
+
+		if (is_null($expiration) || is_null($userManager) || is_null($dbConnection)) {
+			$this->fixDIForJobs();
+		} else {
+			$this->dbConnection = $dbConnection;
+			$this->userManager = $userManager;
+			$this->expiration = $expiration;
+		}
+	}
+
+	protected function fixDIForJobs() {
+		$application = new Application();
+		$this->dbConnection = \OC::$server->getDatabaseConnection();
+		$this->userManager = \OC::$server->getUserManager();
+		$this->expiration = $application->getContainer()->query('Expiration');
+	}
+
+	protected function run($argument) {
+		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
+		if (!$maxAge) {
+			return;
+		}
+		$users = $this->userManager->search('');
+		foreach ($users as $user) {
+			$uid = $user->getUID();
+			if (!$this->setupFS($uid)) {
+				continue;
+			}
+			$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
+			var_dump($dirContent);
+			Trashbin::deleteExpiredFiles($dirContent, $uid);
+		}
+
+		\OC_Util::tearDownFS();
+	}
+
+	/**
+	 * Act on behalf on trash item owner
+	 * @param string $user
+	 * @return boolean
+	 */
+	private function setupFS($user){
+		if (!$this->userManager->userExists($user)) {
+			return false;
+		}
+
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($user);
+
+		return true;
+	}
+}
diff --git a/apps/files_trashbin/lib/expiration.php b/apps/files_trashbin/lib/expiration.php
index 138540febf8..c8a6abb627b 100644
--- a/apps/files_trashbin/lib/expiration.php
+++ b/apps/files_trashbin/lib/expiration.php
@@ -105,6 +105,15 @@ class Expiration {
 		return $isOlderThanMax || $isMinReached;
 	}
 
+	public function getMaxAgeAsTimestamp(){
+		$maxAge = false;
+		if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
+			$time = $this->timeFactory->getTime();
+			$maxAge = $time - ($this->maxAge * 86400);
+		}
+		return $maxAge;
+	}
+
 	private function parseRetentionObligation(){
 		$splitValues = explode(',', $this->retentionObligation);
 		if (!isset($splitValues[0])) {
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 2719eece2a8..784a8e45b21 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -689,7 +689,7 @@ class Trashbin {
 	 * @param string $user
 	 * @return array size of deleted files and number of deleted files
 	 */
-	protected static function deleteExpiredFiles($files, $user) {
+	public static function deleteExpiredFiles($files, $user) {
 		$application = new Application();
 		$expiration = $application->getContainer()->query('Expiration');
 		$size = 0;
diff --git a/apps/files_trashbin/tests/backgroundjob/expiretrash.php b/apps/files_trashbin/tests/backgroundjob/expiretrash.php
new file mode 100644
index 00000000000..f9f939c40ea
--- /dev/null
+++ b/apps/files_trashbin/tests/backgroundjob/expiretrash.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+use OCA\Files_Trashbin\BackgroundJob\ExpireTrash;
+
+class ExpireTrash_Test extends \PHPUnit_Framework_TestCase {
+	public function testConstructAndRun() {
+		$backgroundJob = new OCA\Files_Trashbin\BackgroundJob\ExpireTrash(
+			$this->getMock('OCP\IDBConnection'),
+			$this->getMockBuilder('OCA\Files_Trashbin\Expiration')->disableOriginalConstructor()->getMock()
+		);
+
+		$jobList = $this->getMock('\OCP\BackgroundJob\IJobList');
+
+		/** @var \OC\BackgroundJob\JobList $jobList */
+		$backgroundJob->execute($jobList);
+		$this->assertTrue(true);
+	}
+}
diff --git a/apps/files_trashbin/tests/expiration.php b/apps/files_trashbin/tests/expiration.php
index 7bd51dccddd..b3c6fcd95af 100644
--- a/apps/files_trashbin/tests/expiration.php
+++ b/apps/files_trashbin/tests/expiration.php
@@ -24,6 +24,8 @@ use \OCA\Files_Trashbin\Expiration;
 class Expiration_Test extends \PHPUnit_Framework_TestCase {
 	const SECONDS_PER_DAY = 86400; //60*60*24
 
+	const FAKE_TIME_NOW = 1000000;
+
 	public function expirationData(){
 		$today = 100*self::SECONDS_PER_DAY;
 		$back10Days = (100-10)*self::SECONDS_PER_DAY;
@@ -142,6 +144,38 @@ class Expiration_Test extends \PHPUnit_Framework_TestCase {
 		$this->assertAttributeEquals($expectedCanPurgeToSaveSpace, 'canPurgeToSaveSpace', $expiration);
 	}
 
+
+	public function timestampTestData(){
+		return [
+			[ 'disabled', false],
+			[ 'auto', false ],
+			[ 'auto,auto', false ],
+			[ 'auto, auto', false ],
+			[ 'auto, 3',  self::FAKE_TIME_NOW - (3*self::SECONDS_PER_DAY) ],
+			[ '5, auto', false ],
+			[ '3, 5', self::FAKE_TIME_NOW - (5*self::SECONDS_PER_DAY) ],
+			[ '10, 3', self::FAKE_TIME_NOW - (10*self::SECONDS_PER_DAY) ],
+		];
+	}
+
+
+	/**
+	 * @dataProvider timestampTestData
+	 *
+	 * @param string $configValue
+	 * @param int $expectedMaxAgeTimestamp
+	 */
+	public function testGetMaxAgeAsTimestamp($configValue, $expectedMaxAgeTimestamp){
+		$mockedConfig = $this->getMockedConfig($configValue);
+		$mockedTimeFactory = $this->getMockedTimeFactory(
+				self::FAKE_TIME_NOW
+		);
+
+		$expiration = new Expiration($mockedConfig, $mockedTimeFactory);
+		$actualTimestamp = $expiration->getMaxAgeAsTimestamp();
+		$this->assertEquals($expectedMaxAgeTimestamp, $actualTimestamp);
+	}
+
 	/**
 	 *
 	 * @param int $time
-- 
GitLab


From 867ed67aa501f11f363a44a40c3b046bbaf08917 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 9 Sep 2015 23:29:52 +0300
Subject: [PATCH 379/783] Fix tests

---
 apps/files_trashbin/tests/backgroundjob/expiretrash.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/files_trashbin/tests/backgroundjob/expiretrash.php b/apps/files_trashbin/tests/backgroundjob/expiretrash.php
index f9f939c40ea..f39714f8a30 100644
--- a/apps/files_trashbin/tests/backgroundjob/expiretrash.php
+++ b/apps/files_trashbin/tests/backgroundjob/expiretrash.php
@@ -19,12 +19,15 @@
  *
  */
 
-use OCA\Files_Trashbin\BackgroundJob\ExpireTrash;
+namespace OCA\Files_Trashbin\Tests\BackgroundJob\ExpireTrash;
+ 
+use \OCA\Files_Trashbin\BackgroundJob\ExpireTrash;
 
-class ExpireTrash_Test extends \PHPUnit_Framework_TestCase {
+class ExpireTrash_Test extends \Test\TestCase {
 	public function testConstructAndRun() {
-		$backgroundJob = new OCA\Files_Trashbin\BackgroundJob\ExpireTrash(
+		$backgroundJob = new ExpireTrash(
 			$this->getMock('OCP\IDBConnection'),
+			$this->getMock('OCP\IUserManager'),
 			$this->getMockBuilder('OCA\Files_Trashbin\Expiration')->disableOriginalConstructor()->getMock()
 		);
 
-- 
GitLab


From 764726ce0128054a036f8c515cc62d3ca2e490cd Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Fri, 11 Sep 2015 00:24:19 +0300
Subject: [PATCH 380/783] Updates according to review

---
 .../lib/backgroundjob/expiretrash.php         | 32 +++++++++++++------
 .../tests/backgroundjob/expiretrash.php       |  2 +-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/apps/files_trashbin/lib/backgroundjob/expiretrash.php b/apps/files_trashbin/lib/backgroundjob/expiretrash.php
index 350628444cf..07bcce0659b 100644
--- a/apps/files_trashbin/lib/backgroundjob/expiretrash.php
+++ b/apps/files_trashbin/lib/backgroundjob/expiretrash.php
@@ -21,7 +21,7 @@
 
 namespace OCA\Files_Trashbin\BackgroundJob;
 
-use OCP\IDBConnection;
+use OCP\IConfig;
 use OCP\IUserManager;
 use OCA\Files_Trashbin\AppInfo\Application;
 use OCA\Files_Trashbin\Expiration;
@@ -38,23 +38,25 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
 	private $expiration;
 
 	/**
-	 * @var IDBConnection
+	 * @var IConfig
 	 */
-	private $dbConnection;
+	private $config;
 	
 	/**
 	 * @var IUserManager
 	 */
 	private $userManager;
+	
+	const USERS_PER_SESSION = 1000;
 
-	public function __construct(IDBConnection $dbConnection = null, IUserManager $userManager = null, Expiration $expiration = null) {
+	public function __construct(IConfig $config = null, IUserManager $userManager = null, Expiration $expiration = null) {
 		// Run once per 30 minutes
 		$this->setInterval(60 * 30);
 
-		if (is_null($expiration) || is_null($userManager) || is_null($dbConnection)) {
+		if (is_null($expiration) || is_null($userManager) || is_null($config)) {
 			$this->fixDIForJobs();
 		} else {
-			$this->dbConnection = $dbConnection;
+			$this->config = $config;
 			$this->userManager = $userManager;
 			$this->expiration = $expiration;
 		}
@@ -62,7 +64,7 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
 
 	protected function fixDIForJobs() {
 		$application = new Application();
-		$this->dbConnection = \OC::$server->getDatabaseConnection();
+		$this->config = \OC::$server->getConfig();
 		$this->userManager = \OC::$server->getUserManager();
 		$this->expiration = $application->getContainer()->query('Expiration');
 	}
@@ -72,17 +74,27 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
 		if (!$maxAge) {
 			return;
 		}
-		$users = $this->userManager->search('');
+		
+		$offset = $this->config->getAppValue('files_trashbin', 'cronjob_user_offset', 0);
+		$users = $this->userManager->search('', self::USERS_PER_SESSION, $offset);
+		if (!count($users)) {
+			// No users found, reset offset and retry
+			$offset = 0;
+			$users = $this->userManager->search('', self::USERS_PER_SESSION);
+		}
+		
+		$offset += self::USERS_PER_SESSION;
+		$this->config->setAppValue('files_trashbin', 'cronjob_user_offset', $offset);
+		
 		foreach ($users as $user) {
 			$uid = $user->getUID();
 			if (!$this->setupFS($uid)) {
 				continue;
 			}
 			$dirContent = Helper::getTrashFiles('/', $uid, 'mtime');
-			var_dump($dirContent);
 			Trashbin::deleteExpiredFiles($dirContent, $uid);
 		}
-
+		
 		\OC_Util::tearDownFS();
 	}
 
diff --git a/apps/files_trashbin/tests/backgroundjob/expiretrash.php b/apps/files_trashbin/tests/backgroundjob/expiretrash.php
index f39714f8a30..ad7b0fbca28 100644
--- a/apps/files_trashbin/tests/backgroundjob/expiretrash.php
+++ b/apps/files_trashbin/tests/backgroundjob/expiretrash.php
@@ -26,7 +26,7 @@ use \OCA\Files_Trashbin\BackgroundJob\ExpireTrash;
 class ExpireTrash_Test extends \Test\TestCase {
 	public function testConstructAndRun() {
 		$backgroundJob = new ExpireTrash(
-			$this->getMock('OCP\IDBConnection'),
+			$this->getMock('OCP\IConfig'),
 			$this->getMock('OCP\IUserManager'),
 			$this->getMockBuilder('OCA\Files_Trashbin\Expiration')->disableOriginalConstructor()->getMock()
 		);
-- 
GitLab


From 47caac10f5fd547e92b2668432f76313ee2a4f1a Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 15 Sep 2015 14:28:04 +0200
Subject: [PATCH 381/783] Add PHPDoc

---
 .../lib/backgroundjob/expiretrash.php               | 13 ++++++++++++-
 apps/files_trashbin/lib/expiration.php              |  5 ++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/files_trashbin/lib/backgroundjob/expiretrash.php b/apps/files_trashbin/lib/backgroundjob/expiretrash.php
index 07bcce0659b..a222767669a 100644
--- a/apps/files_trashbin/lib/backgroundjob/expiretrash.php
+++ b/apps/files_trashbin/lib/backgroundjob/expiretrash.php
@@ -49,7 +49,14 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
 	
 	const USERS_PER_SESSION = 1000;
 
-	public function __construct(IConfig $config = null, IUserManager $userManager = null, Expiration $expiration = null) {
+	/**
+	 * @param IConfig|null $config
+	 * @param IUserManager|null $userManager
+	 * @param Expiration|null $expiration
+	 */
+	public function __construct(IConfig $config = null,
+								IUserManager $userManager = null,
+								Expiration $expiration = null) {
 		// Run once per 30 minutes
 		$this->setInterval(60 * 30);
 
@@ -69,6 +76,10 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
 		$this->expiration = $application->getContainer()->query('Expiration');
 	}
 
+	/**
+	 * @param $argument
+	 * @throws \Exception
+	 */
 	protected function run($argument) {
 		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
 		if (!$maxAge) {
diff --git a/apps/files_trashbin/lib/expiration.php b/apps/files_trashbin/lib/expiration.php
index c8a6abb627b..5069521aab3 100644
--- a/apps/files_trashbin/lib/expiration.php
+++ b/apps/files_trashbin/lib/expiration.php
@@ -105,7 +105,10 @@ class Expiration {
 		return $isOlderThanMax || $isMinReached;
 	}
 
-	public function getMaxAgeAsTimestamp(){
+	/**
+	 * @return bool|int
+	 */
+	public function getMaxAgeAsTimestamp() {
 		$maxAge = false;
 		if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
 			$time = $this->timeFactory->getTime();
-- 
GitLab


From b75a1b40a27ce5293930e673e531ebfa1a9cc81c Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 16 Sep 2015 22:06:57 +0300
Subject: [PATCH 382/783] Log deleted files

---
 apps/files_trashbin/lib/trashbin.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 784a8e45b21..3b2d4cf5929 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -700,6 +700,10 @@ class Trashbin {
 			if ($expiration->isExpired($timestamp)) {
 				$count++;
 				$size += self::delete($filename, $user, $timestamp);
+				\OC::$server->getLogger()->info(
+					'Remove "' . $filename . '" from trashbin because it exceeds max retention obligation term.',
+					['app' => 'files_trashbin']
+				);
 			} else {
 				break;
 			}
-- 
GitLab


From b8cded675555ebfc5b175e6d2f1801a84042b5b6 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 17 Sep 2015 00:24:01 +0100
Subject: [PATCH 383/783] Correct manipulateStorageConfig parameter

---
 apps/files_external/lib/backend/smb.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_external/lib/backend/smb.php b/apps/files_external/lib/backend/smb.php
index 0613d3112ee..7865b44d689 100644
--- a/apps/files_external/lib/backend/smb.php
+++ b/apps/files_external/lib/backend/smb.php
@@ -26,6 +26,7 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 use \OCA\Files_External\Lib\Auth\Password\Password;
-- 
GitLab


From 0155bcf278e2a948b45be0496f7d58fef2215fbd Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 16 Sep 2015 04:00:17 -0400
Subject: [PATCH 384/783] [tx-robot] updated from transifex

---
 apps/files_external/l10n/it.js         |  5 +++++
 apps/files_external/l10n/it.json       |  5 +++++
 apps/files_external/l10n/nb_NO.js      | 11 +++++++++++
 apps/files_external/l10n/nb_NO.json    | 11 +++++++++++
 apps/files_external/l10n/pt_BR.js      |  8 ++++++++
 apps/files_external/l10n/pt_BR.json    |  8 ++++++++
 apps/files_sharing/l10n/cs_CZ.js       |  1 -
 apps/files_sharing/l10n/cs_CZ.json     |  1 -
 apps/files_sharing/l10n/da.js          |  1 -
 apps/files_sharing/l10n/da.json        |  1 -
 apps/files_sharing/l10n/el.js          |  1 -
 apps/files_sharing/l10n/el.json        |  1 -
 apps/files_sharing/l10n/fi_FI.js       |  1 -
 apps/files_sharing/l10n/fi_FI.json     |  1 -
 apps/files_sharing/l10n/fr.js          |  1 +
 apps/files_sharing/l10n/fr.json        |  1 +
 apps/files_sharing/l10n/hu_HU.js       |  1 +
 apps/files_sharing/l10n/hu_HU.json     |  1 +
 apps/files_sharing/l10n/id.js          |  1 -
 apps/files_sharing/l10n/id.json        |  1 -
 apps/files_sharing/l10n/it.js          |  1 -
 apps/files_sharing/l10n/it.json        |  1 -
 apps/files_sharing/l10n/ko.js          |  1 -
 apps/files_sharing/l10n/ko.json        |  1 -
 apps/files_sharing/l10n/nb_NO.js       |  1 -
 apps/files_sharing/l10n/nb_NO.json     |  1 -
 apps/files_sharing/l10n/nl.js          |  1 +
 apps/files_sharing/l10n/nl.json        |  1 +
 apps/files_sharing/l10n/pt_BR.js       |  1 -
 apps/files_sharing/l10n/pt_BR.json     |  1 -
 apps/files_sharing/l10n/sk_SK.js       |  3 +++
 apps/files_sharing/l10n/sk_SK.json     |  3 +++
 apps/files_sharing/l10n/th_TH.js       |  1 -
 apps/files_sharing/l10n/th_TH.json     |  1 -
 apps/files_versions/l10n/ar.js         |  4 ++--
 apps/files_versions/l10n/ar.json       |  4 ++--
 apps/files_versions/l10n/ast.js        |  4 ++--
 apps/files_versions/l10n/ast.json      |  4 ++--
 apps/files_versions/l10n/az.js         |  4 ++--
 apps/files_versions/l10n/az.json       |  4 ++--
 apps/files_versions/l10n/bg_BG.js      |  4 ++--
 apps/files_versions/l10n/bg_BG.json    |  4 ++--
 apps/files_versions/l10n/bn_BD.js      |  4 ++--
 apps/files_versions/l10n/bn_BD.json    |  4 ++--
 apps/files_versions/l10n/bn_IN.js      |  4 ++--
 apps/files_versions/l10n/bn_IN.json    |  4 ++--
 apps/files_versions/l10n/bs.js         |  4 ++--
 apps/files_versions/l10n/bs.json       |  4 ++--
 apps/files_versions/l10n/ca.js         |  4 ++--
 apps/files_versions/l10n/ca.json       |  4 ++--
 apps/files_versions/l10n/cs_CZ.js      |  4 ++--
 apps/files_versions/l10n/cs_CZ.json    |  4 ++--
 apps/files_versions/l10n/da.js         |  4 ++--
 apps/files_versions/l10n/da.json       |  4 ++--
 apps/files_versions/l10n/de.js         |  4 ++--
 apps/files_versions/l10n/de.json       |  4 ++--
 apps/files_versions/l10n/de_DE.js      |  4 ++--
 apps/files_versions/l10n/de_DE.json    |  4 ++--
 apps/files_versions/l10n/el.js         |  4 ++--
 apps/files_versions/l10n/el.json       |  4 ++--
 apps/files_versions/l10n/en_GB.js      |  4 ++--
 apps/files_versions/l10n/en_GB.json    |  4 ++--
 apps/files_versions/l10n/eo.js         |  4 ++--
 apps/files_versions/l10n/eo.json       |  4 ++--
 apps/files_versions/l10n/es.js         |  4 ++--
 apps/files_versions/l10n/es.json       |  4 ++--
 apps/files_versions/l10n/es_AR.js      |  4 ++--
 apps/files_versions/l10n/es_AR.json    |  4 ++--
 apps/files_versions/l10n/es_MX.js      |  4 ++--
 apps/files_versions/l10n/es_MX.json    |  4 ++--
 apps/files_versions/l10n/et_EE.js      |  4 ++--
 apps/files_versions/l10n/et_EE.json    |  4 ++--
 apps/files_versions/l10n/eu.js         |  4 ++--
 apps/files_versions/l10n/eu.json       |  4 ++--
 apps/files_versions/l10n/fa.js         |  4 ++--
 apps/files_versions/l10n/fa.json       |  4 ++--
 apps/files_versions/l10n/fi_FI.js      |  4 ++--
 apps/files_versions/l10n/fi_FI.json    |  4 ++--
 apps/files_versions/l10n/fr.js         |  4 ++--
 apps/files_versions/l10n/fr.json       |  4 ++--
 apps/files_versions/l10n/gl.js         |  4 ++--
 apps/files_versions/l10n/gl.json       |  4 ++--
 apps/files_versions/l10n/hr.js         |  4 ++--
 apps/files_versions/l10n/hr.json       |  4 ++--
 apps/files_versions/l10n/hu_HU.js      |  4 ++--
 apps/files_versions/l10n/hu_HU.json    |  4 ++--
 apps/files_versions/l10n/id.js         |  4 ++--
 apps/files_versions/l10n/id.json       |  4 ++--
 apps/files_versions/l10n/is.js         |  4 ++--
 apps/files_versions/l10n/is.json       |  4 ++--
 apps/files_versions/l10n/it.js         |  4 ++--
 apps/files_versions/l10n/it.json       |  4 ++--
 apps/files_versions/l10n/ja.js         |  4 ++--
 apps/files_versions/l10n/ja.json       |  4 ++--
 apps/files_versions/l10n/km.js         |  4 ++--
 apps/files_versions/l10n/km.json       |  4 ++--
 apps/files_versions/l10n/kn.js         |  4 ++--
 apps/files_versions/l10n/kn.json       |  4 ++--
 apps/files_versions/l10n/ko.js         |  4 ++--
 apps/files_versions/l10n/ko.json       |  4 ++--
 apps/files_versions/l10n/lb.js         |  4 ++--
 apps/files_versions/l10n/lb.json       |  4 ++--
 apps/files_versions/l10n/lt_LT.js      |  4 ++--
 apps/files_versions/l10n/lt_LT.json    |  4 ++--
 apps/files_versions/l10n/lv.js         |  4 ++--
 apps/files_versions/l10n/lv.json       |  4 ++--
 apps/files_versions/l10n/mk.js         |  4 ++--
 apps/files_versions/l10n/mk.json       |  4 ++--
 apps/files_versions/l10n/ms_MY.js      |  4 ++--
 apps/files_versions/l10n/ms_MY.json    |  4 ++--
 apps/files_versions/l10n/nb_NO.js      |  4 ++--
 apps/files_versions/l10n/nb_NO.json    |  4 ++--
 apps/files_versions/l10n/nl.js         |  4 ++--
 apps/files_versions/l10n/nl.json       |  4 ++--
 apps/files_versions/l10n/nn_NO.js      |  4 ++--
 apps/files_versions/l10n/nn_NO.json    |  4 ++--
 apps/files_versions/l10n/oc.js         |  4 ++--
 apps/files_versions/l10n/oc.json       |  4 ++--
 apps/files_versions/l10n/pl.js         |  4 ++--
 apps/files_versions/l10n/pl.json       |  4 ++--
 apps/files_versions/l10n/pt_BR.js      |  4 ++--
 apps/files_versions/l10n/pt_BR.json    |  4 ++--
 apps/files_versions/l10n/pt_PT.js      |  4 ++--
 apps/files_versions/l10n/pt_PT.json    |  4 ++--
 apps/files_versions/l10n/ro.js         |  4 ++--
 apps/files_versions/l10n/ro.json       |  4 ++--
 apps/files_versions/l10n/ru.js         |  4 ++--
 apps/files_versions/l10n/ru.json       |  4 ++--
 apps/files_versions/l10n/sk_SK.js      |  4 ++--
 apps/files_versions/l10n/sk_SK.json    |  4 ++--
 apps/files_versions/l10n/sl.js         |  4 ++--
 apps/files_versions/l10n/sl.json       |  4 ++--
 apps/files_versions/l10n/sq.js         |  4 ++--
 apps/files_versions/l10n/sq.json       |  4 ++--
 apps/files_versions/l10n/sr.js         |  4 ++--
 apps/files_versions/l10n/sr.json       |  4 ++--
 apps/files_versions/l10n/sr@latin.js   |  4 ++--
 apps/files_versions/l10n/sr@latin.json |  4 ++--
 apps/files_versions/l10n/sv.js         |  4 ++--
 apps/files_versions/l10n/sv.json       |  4 ++--
 apps/files_versions/l10n/th_TH.js      |  4 ++--
 apps/files_versions/l10n/th_TH.json    |  4 ++--
 apps/files_versions/l10n/tr.js         |  4 ++--
 apps/files_versions/l10n/tr.json       |  4 ++--
 apps/files_versions/l10n/uk.js         |  4 ++--
 apps/files_versions/l10n/uk.json       |  4 ++--
 apps/files_versions/l10n/vi.js         |  4 ++--
 apps/files_versions/l10n/vi.json       |  4 ++--
 apps/files_versions/l10n/zh_CN.js      |  4 ++--
 apps/files_versions/l10n/zh_CN.json    |  4 ++--
 apps/files_versions/l10n/zh_TW.js      |  4 ++--
 apps/files_versions/l10n/zh_TW.json    |  4 ++--
 core/l10n/ar.js                        |  1 +
 core/l10n/ar.json                      |  1 +
 core/l10n/ast.js                       |  1 +
 core/l10n/ast.json                     |  1 +
 core/l10n/az.js                        |  1 +
 core/l10n/az.json                      |  1 +
 core/l10n/bn_BD.js                     |  1 +
 core/l10n/bn_BD.json                   |  1 +
 core/l10n/bs.js                        |  1 +
 core/l10n/bs.json                      |  1 +
 core/l10n/en_GB.js                     |  1 +
 core/l10n/en_GB.json                   |  1 +
 core/l10n/es.js                        |  1 +
 core/l10n/es.json                      |  1 +
 core/l10n/es_MX.js                     |  1 +
 core/l10n/es_MX.json                   |  1 +
 core/l10n/fa.js                        |  1 +
 core/l10n/fa.json                      |  1 +
 core/l10n/ia.js                        |  1 +
 core/l10n/ia.json                      |  1 +
 core/l10n/id.js                        |  1 +
 core/l10n/id.json                      |  1 +
 core/l10n/it.js                        |  1 +
 core/l10n/it.json                      |  1 +
 core/l10n/km.js                        |  1 +
 core/l10n/km.json                      |  1 +
 core/l10n/ms_MY.js                     |  1 +
 core/l10n/ms_MY.json                   |  1 +
 core/l10n/my_MM.js                     |  1 +
 core/l10n/my_MM.json                   |  1 +
 core/l10n/nl.js                        |  1 +
 core/l10n/nl.json                      |  1 +
 core/l10n/nn_NO.js                     |  1 +
 core/l10n/nn_NO.json                   |  1 +
 core/l10n/oc.js                        |  1 +
 core/l10n/oc.json                      |  1 +
 core/l10n/ro.js                        |  1 +
 core/l10n/ro.json                      |  1 +
 core/l10n/ru.js                        |  1 +
 core/l10n/ru.json                      |  1 +
 core/l10n/sk_SK.js                     |  9 +++++++++
 core/l10n/sk_SK.json                   |  9 +++++++++
 core/l10n/sl.js                        |  1 +
 core/l10n/sl.json                      |  1 +
 core/l10n/sq.js                        |  1 +
 core/l10n/sq.json                      |  1 +
 core/l10n/sr.js                        |  1 +
 core/l10n/sr.json                      |  1 +
 core/l10n/sr@latin.js                  |  1 +
 core/l10n/sr@latin.json                |  1 +
 core/l10n/ur_PK.js                     |  1 +
 core/l10n/ur_PK.json                   |  1 +
 core/l10n/zh_TW.js                     |  1 +
 core/l10n/zh_TW.json                   |  1 +
 lib/l10n/sk_SK.js                      |  1 +
 lib/l10n/sk_SK.json                    |  1 +
 settings/l10n/sk_SK.js                 |  1 +
 settings/l10n/sk_SK.json               |  1 +
 210 files changed, 370 insertions(+), 256 deletions(-)

diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index 9c49d95fc31..cae6e428cd8 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Invalid mount point" : "Punto di mount non valido",
     "Objectstore forbidden" : "Objectstore vietato",
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
+    "Not permitted to use backend \"%s\"" : "Utilizzo del motore \"%s\" non permesso",
+    "Not permitted to use authentication mechanism \"%s\"" : "Utilizzo del meccanismo di autenticazione \"%s\" non permesso",
     "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
     "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
     "Personal" : "Personale",
@@ -72,11 +74,14 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Radice",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP con accesso a chiave segreta [DEPRECATO]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Condividi",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS utilizzando le credenziali di OC [DEPRECATO]",
     "Username as share" : "Nome utente come condivisione",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Nome servizio",
+    "Request timeout (seconds)" : "Tempo massimo della richiesta (secondi)",
     "<b>Note:</b> " : "<b>Nota:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 3f6020708d2..8be3cd2cd97 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -10,6 +10,8 @@
     "Invalid mount point" : "Punto di mount non valido",
     "Objectstore forbidden" : "Objectstore vietato",
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
+    "Not permitted to use backend \"%s\"" : "Utilizzo del motore \"%s\" non permesso",
+    "Not permitted to use authentication mechanism \"%s\"" : "Utilizzo del meccanismo di autenticazione \"%s\" non permesso",
     "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
     "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
     "Personal" : "Personale",
@@ -70,11 +72,14 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Radice",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP con accesso a chiave segreta [DEPRECATO]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Condividi",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS utilizzando le credenziali di OC [DEPRECATO]",
     "Username as share" : "Nome utente come condivisione",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Nome servizio",
+    "Request timeout (seconds)" : "Tempo massimo della richiesta (secondi)",
     "<b>Note:</b> " : "<b>Nota:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index 1401bbe7012..0089d42288d 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Invalid mount point" : "Ugyldig oppkoblingspunkt",
     "Objectstore forbidden" : "Objektlager forbudt",
     "Invalid storage backend \"%s\"" : "Ugyldig lagringsserver \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Ikke tillatt å bruke server \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Ikke tillatt å bruke autentiseringsmekanisme \"%s\"",
     "Unsatisfied backend parameters" : "Noen server-parameter mangler",
     "Unsatisfied authentication mechanism parameters" : "Noen parametre for autentiseringsmekanisme mangler",
     "Personal" : "Personlig",
@@ -41,11 +43,16 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "OpenStack" : "OpenStack",
     "Username" : "Brukernavn",
     "Password" : "Passord",
+    "Tenant name" : "Prosjektnavn",
+    "Identity endpoint URL" : "URL for identitets-endepunkt",
+    "Rackspace" : "Rackspace",
     "API key" : "API-nøkkel",
     "Username and password" : "Brukernavn og passord",
     "Session credentials" : "Påloggingsdetaljer for økt",
+    "RSA public key" : "RSA offentlig nøkkel",
     "Public key" : "Offentlig nøkkel",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -68,10 +75,14 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Rot",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP med hemmelig nøkkel for pålogging [FORELDET]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Delt ressurs",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS med OC-pålogging [FORELDET]",
     "Username as share" : "Brukernavn som share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Tjenestenavn",
+    "Request timeout (seconds)" : "Tidsavbrudd for forespørsel (sekunder)",
     "<b>Note:</b> " : "<b>Merk:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å få dette installert.",
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index cf6c2d38f9d..8ee2713f329 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -10,6 +10,8 @@
     "Invalid mount point" : "Ugyldig oppkoblingspunkt",
     "Objectstore forbidden" : "Objektlager forbudt",
     "Invalid storage backend \"%s\"" : "Ugyldig lagringsserver \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Ikke tillatt å bruke server \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Ikke tillatt å bruke autentiseringsmekanisme \"%s\"",
     "Unsatisfied backend parameters" : "Noen server-parameter mangler",
     "Unsatisfied authentication mechanism parameters" : "Noen parametre for autentiseringsmekanisme mangler",
     "Personal" : "Personlig",
@@ -39,11 +41,16 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "OpenStack" : "OpenStack",
     "Username" : "Brukernavn",
     "Password" : "Passord",
+    "Tenant name" : "Prosjektnavn",
+    "Identity endpoint URL" : "URL for identitets-endepunkt",
+    "Rackspace" : "Rackspace",
     "API key" : "API-nøkkel",
     "Username and password" : "Brukernavn og passord",
     "Session credentials" : "Påloggingsdetaljer for økt",
+    "RSA public key" : "RSA offentlig nøkkel",
     "Public key" : "Offentlig nøkkel",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -66,10 +73,14 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Rot",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP med hemmelig nøkkel for pålogging [FORELDET]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Delt ressurs",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS med OC-pålogging [FORELDET]",
     "Username as share" : "Brukernavn som share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Tjenestenavn",
+    "Request timeout (seconds)" : "Tidsavbrudd for forespørsel (sekunder)",
     "<b>Note:</b> " : "<b>Merk:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å få dette installert.",
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index fefe1e899f5..13a7aaf700b 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Invalid mount point" : "Ponto de montagem inválido",
     "Objectstore forbidden" : "Proibido armazenamento de objetos",
     "Invalid storage backend \"%s\"" : "Armazenamento backend inválido \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Não é permitido o uso de backend \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Não é permitido usar o mecanismo de autenticação \"%s\"",
     "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
     "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
     "Personal" : "Pessoal",
@@ -43,9 +45,13 @@ OC.L10N.register(
     "Client secret" : "Segredo do cliente",
     "Username" : "Nome de Usuário",
     "Password" : "Senha",
+    "Tenant name" : "Nome do inquilino",
+    "Identity endpoint URL" : "Identidade pontofinal URL",
+    "Rackspace" : "Espaço em rack",
     "API key" : "Chave API",
     "Username and password" : "Nome de Usuário e senha",
     "Session credentials" : "Credenciais de Sessão",
+    "RSA public key" : "Chave pública RSA",
     "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Cesta",
@@ -72,6 +78,8 @@ OC.L10N.register(
     "Share" : "Compartilhar",
     "Username as share" : "Nome de usuário como compartilhado",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
+    "Service name" : "Nome do serviço",
+    "Request timeout (seconds)" : "Tempo esgotado requerido (segundos)",
     "<b>Note:</b> " : "<b>Nota:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index f133b469f76..7de7be7ba3a 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -10,6 +10,8 @@
     "Invalid mount point" : "Ponto de montagem inválido",
     "Objectstore forbidden" : "Proibido armazenamento de objetos",
     "Invalid storage backend \"%s\"" : "Armazenamento backend inválido \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Não é permitido o uso de backend \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Não é permitido usar o mecanismo de autenticação \"%s\"",
     "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
     "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
     "Personal" : "Pessoal",
@@ -41,9 +43,13 @@
     "Client secret" : "Segredo do cliente",
     "Username" : "Nome de Usuário",
     "Password" : "Senha",
+    "Tenant name" : "Nome do inquilino",
+    "Identity endpoint URL" : "Identidade pontofinal URL",
+    "Rackspace" : "Espaço em rack",
     "API key" : "Chave API",
     "Username and password" : "Nome de Usuário e senha",
     "Session credentials" : "Credenciais de Sessão",
+    "RSA public key" : "Chave pública RSA",
     "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Cesta",
@@ -70,6 +76,8 @@
     "Share" : "Compartilhar",
     "Username as share" : "Nome de usuário como compartilhado",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
+    "Service name" : "Nome do serviço",
+    "Request timeout (seconds)" : "Tempo esgotado requerido (segundos)",
     "<b>Note:</b> " : "<b>Nota:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index bb8480e2a35..f6b43cf4fa3 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
     "Shares" : "Sdílení",
-    "You received %s as a remote share from %s" : "Obdrželi jste %s nově nasdílená vzdáleně od %s ",
     "Accept" : "Přijmout",
     "Decline" : "Zamítnout",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s",
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index 677e982b6b0..f5822c627ae 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -39,7 +39,6 @@
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
     "Shares" : "Sdílení",
-    "You received %s as a remote share from %s" : "Obdrželi jste %s nově nasdílená vzdáleně od %s ",
     "Accept" : "Přijmout",
     "Decline" : "Zamítnout",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s",
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index 87595f6cc56..5ce7c1b826a 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
-    "You received %s as a remote share from %s" : "Du modtog %s som et ekstern deling fra %s",
     "Accept" : "Acceptér",
     "Decline" : "Afvis",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index c9ac959da2e..8932ede98c6 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -39,7 +39,6 @@
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
-    "You received %s as a remote share from %s" : "Du modtog %s som et ekstern deling fra %s",
     "Accept" : "Acceptér",
     "Decline" : "Afvis",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index ef688424777..18ba9bd0d31 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
-    "You received %s as a remote share from %s" : "Λάβατε το %s ως απομακρυσμένο διαμοιρασμό από %s",
     "Accept" : "Αποδοχή",
     "Decline" : "Απόρριψη",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index 829ff61ceaa..f8e42195d0d 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -39,7 +39,6 @@
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
-    "You received %s as a remote share from %s" : "Λάβατε το %s ως απομακρυσμένο διαμοιρασμό από %s",
     "Accept" : "Αποδοχή",
     "Decline" : "Απόρριψη",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index 396c4785537..bf136274241 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
-    "You received %s as a remote share from %s" : "Sait etäjaon %s käyttäjältä %s",
     "Accept" : "Hyväksy",
     "Decline" : "Kieltäydy",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index 56d64c0e841..890336b43f6 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -39,7 +39,6 @@
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
-    "You received %s as a remote share from %s" : "Sait etäjaon %s käyttäjältä %s",
     "Accept" : "Hyväksy",
     "Decline" : "Kieltäydy",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index a59409e008a..3942d18de03 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -42,6 +42,7 @@ OC.L10N.register(
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Shares" : "Partages",
     "Accept" : "Accepter",
+    "Decline" : "Refuser",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud",
     "This share is password-protected" : "Ce partage est protégé par un mot de passe",
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 0bb6f2b1b9e..75b645ef259 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -40,6 +40,7 @@
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Shares" : "Partages",
     "Accept" : "Accepter",
+    "Decline" : "Refuser",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud",
     "This share is password-protected" : "Ce partage est protégé par un mot de passe",
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index c78bdce652d..3895a028be8 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -42,6 +42,7 @@ OC.L10N.register(
     "You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
     "Shares" : "Megosztások",
     "Accept" : "Elfogadás",
+    "Decline" : "Elutasítás",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ",
     "This share is password-protected" : "Ez egy jelszóval védett megosztás",
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index 22cc1422eb7..e9037d232b0 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -40,6 +40,7 @@
     "You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
     "Shares" : "Megosztások",
     "Accept" : "Elfogadás",
+    "Decline" : "Elutasítás",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ",
     "This share is password-protected" : "Ez egy jelszóval védett megosztás",
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index f0d9fc2aecb..d39d9e763f1 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
     "Shares" : "Dibagikan",
-    "You received %s as a remote share from %s" : "Anda menerima %s sebagai berbagi remote dari %s",
     "Accept" : "Terima",
     "Decline" : "Tolak",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index b14f4c43789..35b22b53346 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -39,7 +39,6 @@
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
     "Shares" : "Dibagikan",
-    "You received %s as a remote share from %s" : "Anda menerima %s sebagai berbagi remote dari %s",
     "Accept" : "Terima",
     "Decline" : "Tolak",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 9ddf9b5f385..4f89c2b594b 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
-    "You received %s as a remote share from %s" : "Hai ricevuto %s come condivisione remota da %s",
     "Accept" : "Accetta",
     "Decline" : "Rifiuta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index 2ff7f2d13b5..2604caebb61 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -39,7 +39,6 @@
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
-    "You received %s as a remote share from %s" : "Hai ricevuto %s come condivisione remota da %s",
     "Accept" : "Accetta",
     "Decline" : "Rifiuta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js
index d750f827797..e4b86b528f3 100644
--- a/apps/files_sharing/l10n/ko.js
+++ b/apps/files_sharing/l10n/ko.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
     "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
     "Shares" : "공유",
-    "You received %s as a remote share from %s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다",
     "Accept" : "수락",
     "Decline" : "거절",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s",
diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json
index e9a169be4f7..383e5038f3c 100644
--- a/apps/files_sharing/l10n/ko.json
+++ b/apps/files_sharing/l10n/ko.json
@@ -39,7 +39,6 @@
     "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
     "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
     "Shares" : "공유",
-    "You received %s as a remote share from %s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다",
     "Accept" : "수락",
     "Decline" : "거절",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s",
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index a83ce84d26d..b8b6c634959 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "You shared %1$s via link" : "Du delte %1$s via lenke",
     "Shares" : "Delinger",
-    "You received %s as a remote share from %s" : "Du mottok %s som en ekstern deling fra %s",
     "Accept" : "Aksepter",
     "Decline" : "Avslå",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index 6eedd895f4f..9382119e5c4 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -39,7 +39,6 @@
     "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "You shared %1$s via link" : "Du delte %1$s via lenke",
     "Shares" : "Delinger",
-    "You received %s as a remote share from %s" : "Du mottok %s som en ekstern deling fra %s",
     "Accept" : "Aksepter",
     "Decline" : "Avslå",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index 7468819fda7..f83ecee1f64 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -42,6 +42,7 @@ OC.L10N.register(
     "You shared %1$s via link" : "U deelde %1$s via link",
     "Shares" : "Gedeeld",
     "Accept" : "Accepteren",
+    "Decline" : "Afwijzen",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID",
     "This share is password-protected" : "Deze share is met een wachtwoord beveiligd",
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index 57df2d5c155..9309a7b5555 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -40,6 +40,7 @@
     "You shared %1$s via link" : "U deelde %1$s via link",
     "Shares" : "Gedeeld",
     "Accept" : "Accepteren",
+    "Decline" : "Afwijzen",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID",
     "This share is password-protected" : "Deze share is met een wachtwoord beveiligd",
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 35c9f970000..111954dffda 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
-    "You received %s as a remote share from %s" : "Você recebeu %s como um compartilhamento remoto de %s",
     "Accept" : "Aceitar",
     "Decline" : "Rejeitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s",
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index ebb2a5a4cce..5b56d24eb5b 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -39,7 +39,6 @@
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
-    "You received %s as a remote share from %s" : "Você recebeu %s como um compartilhamento remoto de %s",
     "Accept" : "Aceitar",
     "Decline" : "Rejeitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s",
diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js
index 677b4f24e21..4d596987963 100644
--- a/apps/files_sharing/l10n/sk_SK.js
+++ b/apps/files_sharing/l10n/sk_SK.js
@@ -42,6 +42,7 @@ OC.L10N.register(
     "You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu",
     "Shares" : "Zdieľanie",
     "Accept" : "Schváliť",
+    "Decline" : "Odmietnuť",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Toto zdieľanie je chránené heslom",
@@ -64,8 +65,10 @@ OC.L10N.register(
     "Open documentation" : "Otvoriť dokumentáciu",
     "Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery",
     "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov",
+    "Federated Cloud" : "Združený Cloud",
     "Your Federated Cloud ID:" : "Vaše združené Cloud ID",
     "Share it:" : "Zdieľať:",
+    "Add to your website" : "Pridať na svoju webstránku",
     "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud",
     "HTML Code:" : "HTML kód:"
 },
diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json
index f4f6cc3798b..e8468d1500e 100644
--- a/apps/files_sharing/l10n/sk_SK.json
+++ b/apps/files_sharing/l10n/sk_SK.json
@@ -40,6 +40,7 @@
     "You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu",
     "Shares" : "Zdieľanie",
     "Accept" : "Schváliť",
+    "Decline" : "Odmietnuť",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Toto zdieľanie je chránené heslom",
@@ -62,8 +63,10 @@
     "Open documentation" : "Otvoriť dokumentáciu",
     "Allow users on this server to send shares to other servers" : "Povoliť používateľom z tohoto servera posielať zdieľania na iné servery",
     "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov",
+    "Federated Cloud" : "Združený Cloud",
     "Your Federated Cloud ID:" : "Vaše združené Cloud ID",
     "Share it:" : "Zdieľať:",
+    "Add to your website" : "Pridať na svoju webstránku",
     "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud",
     "HTML Code:" : "HTML kód:"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
index 9db7c600102..2a80f3a22c6 100644
--- a/apps/files_sharing/l10n/th_TH.js
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
-    "You received %s as a remote share from %s" : "คุณได้รับ %s โดยรีโมทแชร์จาก %s",
     "Accept" : "ยอมรับ",
     "Decline" : "ลดลง",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s",
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
index f630c062643..b225efb1b1b 100644
--- a/apps/files_sharing/l10n/th_TH.json
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -39,7 +39,6 @@
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
-    "You received %s as a remote share from %s" : "คุณได้รับ %s โดยรีโมทแชร์จาก %s",
     "Accept" : "ยอมรับ",
     "Decline" : "ลดลง",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s",
diff --git a/apps/files_versions/l10n/ar.js b/apps/files_versions/l10n/ar.js
index 81390bc50a9..40afe40221c 100644
--- a/apps/files_versions/l10n/ar.js
+++ b/apps/files_versions/l10n/ar.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "غير قادر على الاستعادة : %s",
     "Versions" : "الإصدارات",
     "Failed to revert {file} to revision {timestamp}." : "فشل في استعادة {ملف} لنتقيح {الطابع الزمني}",
-    "More versions..." : "المزيد من الإصدارات",
+    "Restore" : "استعادة ",
     "No other versions available" : "لا توجد إصدارات أخرى متاحة",
-    "Restore" : "استعادة "
+    "More versions..." : "المزيد من الإصدارات"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/files_versions/l10n/ar.json b/apps/files_versions/l10n/ar.json
index 683df8a7c0e..03c743f039b 100644
--- a/apps/files_versions/l10n/ar.json
+++ b/apps/files_versions/l10n/ar.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "غير قادر على الاستعادة : %s",
     "Versions" : "الإصدارات",
     "Failed to revert {file} to revision {timestamp}." : "فشل في استعادة {ملف} لنتقيح {الطابع الزمني}",
-    "More versions..." : "المزيد من الإصدارات",
+    "Restore" : "استعادة ",
     "No other versions available" : "لا توجد إصدارات أخرى متاحة",
-    "Restore" : "استعادة "
+    "More versions..." : "المزيد من الإصدارات"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ast.js b/apps/files_versions/l10n/ast.js
index 39f7ea7d58f..39c5fd98d42 100644
--- a/apps/files_versions/l10n/ast.js
+++ b/apps/files_versions/l10n/ast.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Nun pudo revertise: %s",
     "Versions" : "Versiones",
     "Failed to revert {file} to revision {timestamp}." : "Fallu al revertir {file} a la revisión {timestamp}.",
-    "More versions..." : "Más versiones...",
+    "Restore" : "Restaurar",
     "No other versions available" : "Nun hai otres versiones disponibles",
-    "Restore" : "Restaurar"
+    "More versions..." : "Más versiones..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/ast.json b/apps/files_versions/l10n/ast.json
index 720f02e6f63..6a545ffb94b 100644
--- a/apps/files_versions/l10n/ast.json
+++ b/apps/files_versions/l10n/ast.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Nun pudo revertise: %s",
     "Versions" : "Versiones",
     "Failed to revert {file} to revision {timestamp}." : "Fallu al revertir {file} a la revisión {timestamp}.",
-    "More versions..." : "Más versiones...",
+    "Restore" : "Restaurar",
     "No other versions available" : "Nun hai otres versiones disponibles",
-    "Restore" : "Restaurar"
+    "More versions..." : "Más versiones..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/az.js b/apps/files_versions/l10n/az.js
index ee6e86ef111..171cb31ab1a 100644
--- a/apps/files_versions/l10n/az.js
+++ b/apps/files_versions/l10n/az.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Geri qaytarmaq olmur: %s",
     "Versions" : "Versiyaları",
     "Failed to revert {file} to revision {timestamp}." : "{timestamp} yenidən baxılması üçün {file} geri qaytarmaq mümkün olmadı.",
-    "More versions..." : "Əlavə versiyalar",
+    "Restore" : "Geri qaytar",
     "No other versions available" : "Başqa versiyalar mövcud deyil",
-    "Restore" : "Geri qaytar"
+    "More versions..." : "Əlavə versiyalar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/az.json b/apps/files_versions/l10n/az.json
index 9b38c19fdba..3f4e0275dd5 100644
--- a/apps/files_versions/l10n/az.json
+++ b/apps/files_versions/l10n/az.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Geri qaytarmaq olmur: %s",
     "Versions" : "Versiyaları",
     "Failed to revert {file} to revision {timestamp}." : "{timestamp} yenidən baxılması üçün {file} geri qaytarmaq mümkün olmadı.",
-    "More versions..." : "Əlavə versiyalar",
+    "Restore" : "Geri qaytar",
     "No other versions available" : "Başqa versiyalar mövcud deyil",
-    "Restore" : "Geri qaytar"
+    "More versions..." : "Əlavə versiyalar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/bg_BG.js b/apps/files_versions/l10n/bg_BG.js
index 6ea5387eec2..cea297b6974 100644
--- a/apps/files_versions/l10n/bg_BG.js
+++ b/apps/files_versions/l10n/bg_BG.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Грешка при връщане: %s",
     "Versions" : "Версии",
     "Failed to revert {file} to revision {timestamp}." : "Грешка при връщане на {file} към версия {timestamp}.",
-    "More versions..." : "Още версии...",
+    "Restore" : "Възтановяви",
     "No other versions available" : "Няма други налични версии",
-    "Restore" : "Възтановяви"
+    "More versions..." : "Още версии..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/bg_BG.json b/apps/files_versions/l10n/bg_BG.json
index 3d8060a22f1..826c7136d1a 100644
--- a/apps/files_versions/l10n/bg_BG.json
+++ b/apps/files_versions/l10n/bg_BG.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Грешка при връщане: %s",
     "Versions" : "Версии",
     "Failed to revert {file} to revision {timestamp}." : "Грешка при връщане на {file} към версия {timestamp}.",
-    "More versions..." : "Още версии...",
+    "Restore" : "Възтановяви",
     "No other versions available" : "Няма други налични версии",
-    "Restore" : "Възтановяви"
+    "More versions..." : "Още версии..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/bn_BD.js b/apps/files_versions/l10n/bn_BD.js
index 4e3f8be76bb..e92e84268c1 100644
--- a/apps/files_versions/l10n/bn_BD.js
+++ b/apps/files_versions/l10n/bn_BD.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "ফিরে যাওয়া গেলনা: %s",
     "Versions" : "সংষ্করন",
     "Failed to revert {file} to revision {timestamp}." : " {file} সংশোধিত  {timestamp} এ ফিরে যেতে ব্যার্থ হলো।",
-    "More versions..." : "আরো সংষ্করণ....",
+    "Restore" : "ফিরিয়ে দাও",
     "No other versions available" : "আর কোন সংষ্করণ প্রাপ্তব্য নয়",
-    "Restore" : "ফিরিয়ে দাও"
+    "More versions..." : "আরো সংষ্করণ...."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/bn_BD.json b/apps/files_versions/l10n/bn_BD.json
index 4ab5756e011..ec8aa74e18b 100644
--- a/apps/files_versions/l10n/bn_BD.json
+++ b/apps/files_versions/l10n/bn_BD.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "ফিরে যাওয়া গেলনা: %s",
     "Versions" : "সংষ্করন",
     "Failed to revert {file} to revision {timestamp}." : " {file} সংশোধিত  {timestamp} এ ফিরে যেতে ব্যার্থ হলো।",
-    "More versions..." : "আরো সংষ্করণ....",
+    "Restore" : "ফিরিয়ে দাও",
     "No other versions available" : "আর কোন সংষ্করণ প্রাপ্তব্য নয়",
-    "Restore" : "ফিরিয়ে দাও"
+    "More versions..." : "আরো সংষ্করণ...."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/bn_IN.js b/apps/files_versions/l10n/bn_IN.js
index f2985aa4afb..34fce5d5662 100644
--- a/apps/files_versions/l10n/bn_IN.js
+++ b/apps/files_versions/l10n/bn_IN.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "প্রত্যাবর্তন করা যায়নি: %s",
     "Versions" : "সংস্করণ",
     "Failed to revert {file} to revision {timestamp}." : "{ফাইল} প্রত্যাবর্তন থেকে পুনর্বিবেচনা {টাইমস্ট্যাম্প} করতে ব্যর্থ।",
-    "More versions..." : "আরো সংস্করণ...",
+    "Restore" : "পুনরুদ্ধার",
     "No other versions available" : "আর কোন সংস্করণ পাওয়া যাচ্ছে না",
-    "Restore" : "পুনরুদ্ধার"
+    "More versions..." : "আরো সংস্করণ..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/bn_IN.json b/apps/files_versions/l10n/bn_IN.json
index e973e1f074e..34deb365a1e 100644
--- a/apps/files_versions/l10n/bn_IN.json
+++ b/apps/files_versions/l10n/bn_IN.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "প্রত্যাবর্তন করা যায়নি: %s",
     "Versions" : "সংস্করণ",
     "Failed to revert {file} to revision {timestamp}." : "{ফাইল} প্রত্যাবর্তন থেকে পুনর্বিবেচনা {টাইমস্ট্যাম্প} করতে ব্যর্থ।",
-    "More versions..." : "আরো সংস্করণ...",
+    "Restore" : "পুনরুদ্ধার",
     "No other versions available" : "আর কোন সংস্করণ পাওয়া যাচ্ছে না",
-    "Restore" : "পুনরুদ্ধার"
+    "More versions..." : "আরো সংস্করণ..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/bs.js b/apps/files_versions/l10n/bs.js
index 21e9851b64c..fc207e1517c 100644
--- a/apps/files_versions/l10n/bs.js
+++ b/apps/files_versions/l10n/bs.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Nije moguće vratiti: %s",
     "Versions" : "Verzije",
     "Failed to revert {file} to revision {timestamp}." : "Nije uspelo vraćanje {file} na reviziju {timestamp}.",
-    "More versions..." : "Više verzija...",
+    "Restore" : "Obnovi",
     "No other versions available" : "Druge verzije su nedostupne",
-    "Restore" : "Obnovi"
+    "More versions..." : "Više verzija..."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_versions/l10n/bs.json b/apps/files_versions/l10n/bs.json
index 1bc885614ed..50d72404f2f 100644
--- a/apps/files_versions/l10n/bs.json
+++ b/apps/files_versions/l10n/bs.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Nije moguće vratiti: %s",
     "Versions" : "Verzije",
     "Failed to revert {file} to revision {timestamp}." : "Nije uspelo vraćanje {file} na reviziju {timestamp}.",
-    "More versions..." : "Više verzija...",
+    "Restore" : "Obnovi",
     "No other versions available" : "Druge verzije su nedostupne",
-    "Restore" : "Obnovi"
+    "More versions..." : "Više verzija..."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ca.js b/apps/files_versions/l10n/ca.js
index da6bd06b98e..660db0d6f29 100644
--- a/apps/files_versions/l10n/ca.js
+++ b/apps/files_versions/l10n/ca.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "No s'ha pogut revertir: %s",
     "Versions" : "Versions",
     "Failed to revert {file} to revision {timestamp}." : "Ha fallat en retornar {file} a la revisió {timestamp}",
-    "More versions..." : "Més versions...",
+    "Restore" : "Recupera",
     "No other versions available" : "No hi ha altres versions disponibles",
-    "Restore" : "Recupera"
+    "More versions..." : "Més versions..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/ca.json b/apps/files_versions/l10n/ca.json
index 3638e7b6462..7cd2ddbcf51 100644
--- a/apps/files_versions/l10n/ca.json
+++ b/apps/files_versions/l10n/ca.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "No s'ha pogut revertir: %s",
     "Versions" : "Versions",
     "Failed to revert {file} to revision {timestamp}." : "Ha fallat en retornar {file} a la revisió {timestamp}",
-    "More versions..." : "Més versions...",
+    "Restore" : "Recupera",
     "No other versions available" : "No hi ha altres versions disponibles",
-    "Restore" : "Recupera"
+    "More versions..." : "Més versions..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/cs_CZ.js b/apps/files_versions/l10n/cs_CZ.js
index 0ba87af547f..bd7488fc543 100644
--- a/apps/files_versions/l10n/cs_CZ.js
+++ b/apps/files_versions/l10n/cs_CZ.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Nelze vrátit: %s",
     "Versions" : "Verze",
     "Failed to revert {file} to revision {timestamp}." : "Selhalo vrácení souboru {file} na verzi {timestamp}.",
-    "More versions..." : "Více verzí...",
+    "Restore" : "Obnovit",
     "No other versions available" : "Žádné další verze nejsou dostupné",
-    "Restore" : "Obnovit"
+    "More versions..." : "Více verzí..."
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_versions/l10n/cs_CZ.json b/apps/files_versions/l10n/cs_CZ.json
index dc47f0b4cc8..6af93e2bd5e 100644
--- a/apps/files_versions/l10n/cs_CZ.json
+++ b/apps/files_versions/l10n/cs_CZ.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Nelze vrátit: %s",
     "Versions" : "Verze",
     "Failed to revert {file} to revision {timestamp}." : "Selhalo vrácení souboru {file} na verzi {timestamp}.",
-    "More versions..." : "Více verzí...",
+    "Restore" : "Obnovit",
     "No other versions available" : "Žádné další verze nejsou dostupné",
-    "Restore" : "Obnovit"
+    "More versions..." : "Více verzí..."
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/da.js b/apps/files_versions/l10n/da.js
index 22f7f66b45d..9d6748f5bdc 100644
--- a/apps/files_versions/l10n/da.js
+++ b/apps/files_versions/l10n/da.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Kunne ikke genskabe: %s",
     "Versions" : "Versioner",
     "Failed to revert {file} to revision {timestamp}." : "Kunne ikke tilbagerulle {file} til den tidligere udgave: {timestamp}.",
-    "More versions..." : "Flere versioner...",
+    "Restore" : "Gendan",
     "No other versions available" : "Ingen andre versioner tilgængelig",
-    "Restore" : "Gendan"
+    "More versions..." : "Flere versioner..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/da.json b/apps/files_versions/l10n/da.json
index 4dfa5dbeafa..5630e3aba82 100644
--- a/apps/files_versions/l10n/da.json
+++ b/apps/files_versions/l10n/da.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Kunne ikke genskabe: %s",
     "Versions" : "Versioner",
     "Failed to revert {file} to revision {timestamp}." : "Kunne ikke tilbagerulle {file} til den tidligere udgave: {timestamp}.",
-    "More versions..." : "Flere versioner...",
+    "Restore" : "Gendan",
     "No other versions available" : "Ingen andre versioner tilgængelig",
-    "Restore" : "Gendan"
+    "More versions..." : "Flere versioner..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/de.js b/apps/files_versions/l10n/de.js
index 012167a7329..285e42517b3 100644
--- a/apps/files_versions/l10n/de.js
+++ b/apps/files_versions/l10n/de.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Konnte %s nicht zurücksetzen",
     "Versions" : "Versionen",
     "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.",
-    "More versions..." : "Weitere Versionen…",
+    "Restore" : "Wiederherstellen",
     "No other versions available" : "Keine anderen Versionen verfügbar",
-    "Restore" : "Wiederherstellen"
+    "More versions..." : "Weitere Versionen…"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/de.json b/apps/files_versions/l10n/de.json
index 74d7f066df8..a1f3c12649f 100644
--- a/apps/files_versions/l10n/de.json
+++ b/apps/files_versions/l10n/de.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Konnte %s nicht zurücksetzen",
     "Versions" : "Versionen",
     "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.",
-    "More versions..." : "Weitere Versionen…",
+    "Restore" : "Wiederherstellen",
     "No other versions available" : "Keine anderen Versionen verfügbar",
-    "Restore" : "Wiederherstellen"
+    "More versions..." : "Weitere Versionen…"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/de_DE.js b/apps/files_versions/l10n/de_DE.js
index 012167a7329..285e42517b3 100644
--- a/apps/files_versions/l10n/de_DE.js
+++ b/apps/files_versions/l10n/de_DE.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Konnte %s nicht zurücksetzen",
     "Versions" : "Versionen",
     "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.",
-    "More versions..." : "Weitere Versionen…",
+    "Restore" : "Wiederherstellen",
     "No other versions available" : "Keine anderen Versionen verfügbar",
-    "Restore" : "Wiederherstellen"
+    "More versions..." : "Weitere Versionen…"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/de_DE.json b/apps/files_versions/l10n/de_DE.json
index 74d7f066df8..a1f3c12649f 100644
--- a/apps/files_versions/l10n/de_DE.json
+++ b/apps/files_versions/l10n/de_DE.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Konnte %s nicht zurücksetzen",
     "Versions" : "Versionen",
     "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgängig machen.",
-    "More versions..." : "Weitere Versionen…",
+    "Restore" : "Wiederherstellen",
     "No other versions available" : "Keine anderen Versionen verfügbar",
-    "Restore" : "Wiederherstellen"
+    "More versions..." : "Weitere Versionen…"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/el.js b/apps/files_versions/l10n/el.js
index a54655bcba0..ecfc322628e 100644
--- a/apps/files_versions/l10n/el.js
+++ b/apps/files_versions/l10n/el.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Αδυναμία επαναφοράς: %s",
     "Versions" : "Εκδόσεις",
     "Failed to revert {file} to revision {timestamp}." : "Αποτυχία επαναφοράς του {file} στην αναθεώρηση {timestamp}.",
-    "More versions..." : "Περισσότερες εκδόσεις...",
+    "Restore" : "Επαναφορά",
     "No other versions available" : "Δεν υπάρχουν άλλες εκδόσεις διαθέσιμες",
-    "Restore" : "Επαναφορά"
+    "More versions..." : "Περισσότερες εκδόσεις..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/el.json b/apps/files_versions/l10n/el.json
index 836fdce5535..88b2fc1b3f0 100644
--- a/apps/files_versions/l10n/el.json
+++ b/apps/files_versions/l10n/el.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Αδυναμία επαναφοράς: %s",
     "Versions" : "Εκδόσεις",
     "Failed to revert {file} to revision {timestamp}." : "Αποτυχία επαναφοράς του {file} στην αναθεώρηση {timestamp}.",
-    "More versions..." : "Περισσότερες εκδόσεις...",
+    "Restore" : "Επαναφορά",
     "No other versions available" : "Δεν υπάρχουν άλλες εκδόσεις διαθέσιμες",
-    "Restore" : "Επαναφορά"
+    "More versions..." : "Περισσότερες εκδόσεις..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/en_GB.js b/apps/files_versions/l10n/en_GB.js
index a8ca3729752..837b745b5fb 100644
--- a/apps/files_versions/l10n/en_GB.js
+++ b/apps/files_versions/l10n/en_GB.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Could not revert: %s",
     "Versions" : "Versions",
     "Failed to revert {file} to revision {timestamp}." : "Failed to revert {file} to revision {timestamp}.",
-    "More versions..." : "More versions...",
+    "Restore" : "Restore",
     "No other versions available" : "No other versions available",
-    "Restore" : "Restore"
+    "More versions..." : "More versions..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/en_GB.json b/apps/files_versions/l10n/en_GB.json
index 8ae47df9fcb..84e55063f67 100644
--- a/apps/files_versions/l10n/en_GB.json
+++ b/apps/files_versions/l10n/en_GB.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Could not revert: %s",
     "Versions" : "Versions",
     "Failed to revert {file} to revision {timestamp}." : "Failed to revert {file} to revision {timestamp}.",
-    "More versions..." : "More versions...",
+    "Restore" : "Restore",
     "No other versions available" : "No other versions available",
-    "Restore" : "Restore"
+    "More versions..." : "More versions..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/eo.js b/apps/files_versions/l10n/eo.js
index 1695a84dbad..665f69bbbda 100644
--- a/apps/files_versions/l10n/eo.js
+++ b/apps/files_versions/l10n/eo.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Ne eblas malfari: %s",
     "Versions" : "Versioj",
     "Failed to revert {file} to revision {timestamp}." : "Malsukcesis returnigo de {file} al la revizio {timestamp}.",
-    "More versions..." : "Pli da versioj...",
+    "Restore" : "Restaŭri",
     "No other versions available" : "Ne disponeblas aliaj versioj",
-    "Restore" : "Restaŭri"
+    "More versions..." : "Pli da versioj..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/eo.json b/apps/files_versions/l10n/eo.json
index 099bbf19365..db72c173bfc 100644
--- a/apps/files_versions/l10n/eo.json
+++ b/apps/files_versions/l10n/eo.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Ne eblas malfari: %s",
     "Versions" : "Versioj",
     "Failed to revert {file} to revision {timestamp}." : "Malsukcesis returnigo de {file} al la revizio {timestamp}.",
-    "More versions..." : "Pli da versioj...",
+    "Restore" : "Restaŭri",
     "No other versions available" : "Ne disponeblas aliaj versioj",
-    "Restore" : "Restaŭri"
+    "More versions..." : "Pli da versioj..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/es.js b/apps/files_versions/l10n/es.js
index f3d980489b0..54662b493da 100644
--- a/apps/files_versions/l10n/es.js
+++ b/apps/files_versions/l10n/es.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "No se puede revertir: %s",
     "Versions" : "Revisiones",
     "Failed to revert {file} to revision {timestamp}." : "No se ha podido revertir {archivo} a revisión {timestamp}.",
-    "More versions..." : "Más versiones...",
+    "Restore" : "Recuperar",
     "No other versions available" : "No hay otras versiones disponibles",
-    "Restore" : "Recuperar"
+    "More versions..." : "Más versiones..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/es.json b/apps/files_versions/l10n/es.json
index 7c395cbbb2e..692f890a880 100644
--- a/apps/files_versions/l10n/es.json
+++ b/apps/files_versions/l10n/es.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "No se puede revertir: %s",
     "Versions" : "Revisiones",
     "Failed to revert {file} to revision {timestamp}." : "No se ha podido revertir {archivo} a revisión {timestamp}.",
-    "More versions..." : "Más versiones...",
+    "Restore" : "Recuperar",
     "No other versions available" : "No hay otras versiones disponibles",
-    "Restore" : "Recuperar"
+    "More versions..." : "Más versiones..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_AR.js b/apps/files_versions/l10n/es_AR.js
index b471c76e1cc..49febb3dc6c 100644
--- a/apps/files_versions/l10n/es_AR.js
+++ b/apps/files_versions/l10n/es_AR.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "No se pudo revertir: %s ",
     "Versions" : "Versiones",
     "Failed to revert {file} to revision {timestamp}." : "Falló al revertir {file} a la revisión {timestamp}.",
-    "More versions..." : "Más versiones...",
+    "Restore" : "Recuperar",
     "No other versions available" : "No hay más versiones disponibles",
-    "Restore" : "Recuperar"
+    "More versions..." : "Más versiones..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/es_AR.json b/apps/files_versions/l10n/es_AR.json
index 806ecb2aa30..2177de87cb5 100644
--- a/apps/files_versions/l10n/es_AR.json
+++ b/apps/files_versions/l10n/es_AR.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "No se pudo revertir: %s ",
     "Versions" : "Versiones",
     "Failed to revert {file} to revision {timestamp}." : "Falló al revertir {file} a la revisión {timestamp}.",
-    "More versions..." : "Más versiones...",
+    "Restore" : "Recuperar",
     "No other versions available" : "No hay más versiones disponibles",
-    "Restore" : "Recuperar"
+    "More versions..." : "Más versiones..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_MX.js b/apps/files_versions/l10n/es_MX.js
index f3d980489b0..54662b493da 100644
--- a/apps/files_versions/l10n/es_MX.js
+++ b/apps/files_versions/l10n/es_MX.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "No se puede revertir: %s",
     "Versions" : "Revisiones",
     "Failed to revert {file} to revision {timestamp}." : "No se ha podido revertir {archivo} a revisión {timestamp}.",
-    "More versions..." : "Más versiones...",
+    "Restore" : "Recuperar",
     "No other versions available" : "No hay otras versiones disponibles",
-    "Restore" : "Recuperar"
+    "More versions..." : "Más versiones..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/es_MX.json b/apps/files_versions/l10n/es_MX.json
index 7c395cbbb2e..692f890a880 100644
--- a/apps/files_versions/l10n/es_MX.json
+++ b/apps/files_versions/l10n/es_MX.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "No se puede revertir: %s",
     "Versions" : "Revisiones",
     "Failed to revert {file} to revision {timestamp}." : "No se ha podido revertir {archivo} a revisión {timestamp}.",
-    "More versions..." : "Más versiones...",
+    "Restore" : "Recuperar",
     "No other versions available" : "No hay otras versiones disponibles",
-    "Restore" : "Recuperar"
+    "More versions..." : "Más versiones..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/et_EE.js b/apps/files_versions/l10n/et_EE.js
index 14a0dc1a095..fe0616deeec 100644
--- a/apps/files_versions/l10n/et_EE.js
+++ b/apps/files_versions/l10n/et_EE.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Ei suuda taastada faili: %s",
     "Versions" : "Versioonid",
     "Failed to revert {file} to revision {timestamp}." : "Ebaõnnestus faili {file} taastamine revisjonile {timestamp}",
-    "More versions..." : "Rohkem versioone...",
+    "Restore" : "Taasta",
     "No other versions available" : "Muid versioone pole saadaval",
-    "Restore" : "Taasta"
+    "More versions..." : "Rohkem versioone..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/et_EE.json b/apps/files_versions/l10n/et_EE.json
index a1762b7e15f..25f0b73c579 100644
--- a/apps/files_versions/l10n/et_EE.json
+++ b/apps/files_versions/l10n/et_EE.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Ei suuda taastada faili: %s",
     "Versions" : "Versioonid",
     "Failed to revert {file} to revision {timestamp}." : "Ebaõnnestus faili {file} taastamine revisjonile {timestamp}",
-    "More versions..." : "Rohkem versioone...",
+    "Restore" : "Taasta",
     "No other versions available" : "Muid versioone pole saadaval",
-    "Restore" : "Taasta"
+    "More versions..." : "Rohkem versioone..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/eu.js b/apps/files_versions/l10n/eu.js
index 0c92f18594c..35d1861de2c 100644
--- a/apps/files_versions/l10n/eu.js
+++ b/apps/files_versions/l10n/eu.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Ezin izan da leheneratu: %s",
     "Versions" : "Bertsioak",
     "Failed to revert {file} to revision {timestamp}." : "Errore bat izan da {fitxategia} {timestamp} bertsiora leheneratzean.",
-    "More versions..." : "Bertsio gehiago...",
+    "Restore" : "Berrezarri",
     "No other versions available" : "Ez dago bertsio gehiago eskuragarri",
-    "Restore" : "Berrezarri"
+    "More versions..." : "Bertsio gehiago..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/eu.json b/apps/files_versions/l10n/eu.json
index acb9e78e7f7..3bd3c0dc7b7 100644
--- a/apps/files_versions/l10n/eu.json
+++ b/apps/files_versions/l10n/eu.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Ezin izan da leheneratu: %s",
     "Versions" : "Bertsioak",
     "Failed to revert {file} to revision {timestamp}." : "Errore bat izan da {fitxategia} {timestamp} bertsiora leheneratzean.",
-    "More versions..." : "Bertsio gehiago...",
+    "Restore" : "Berrezarri",
     "No other versions available" : "Ez dago bertsio gehiago eskuragarri",
-    "Restore" : "Berrezarri"
+    "More versions..." : "Bertsio gehiago..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/fa.js b/apps/files_versions/l10n/fa.js
index fda05b61e5d..33ef48a870a 100644
--- a/apps/files_versions/l10n/fa.js
+++ b/apps/files_versions/l10n/fa.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "بازگردانی امکان ناپذیر است: %s",
     "Versions" : "نسخه ها",
     "Failed to revert {file} to revision {timestamp}." : "برگرداندن {file} به نسخه {timestamp} با شکست روبرو شد",
-    "More versions..." : "نسخه های بیشتر",
+    "Restore" : "بازیابی",
     "No other versions available" : "نسخه ی دیگری در دسترس نیست",
-    "Restore" : "بازیابی"
+    "More versions..." : "نسخه های بیشتر"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/fa.json b/apps/files_versions/l10n/fa.json
index 56e04f8f5c7..3dbbde955a3 100644
--- a/apps/files_versions/l10n/fa.json
+++ b/apps/files_versions/l10n/fa.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "بازگردانی امکان ناپذیر است: %s",
     "Versions" : "نسخه ها",
     "Failed to revert {file} to revision {timestamp}." : "برگرداندن {file} به نسخه {timestamp} با شکست روبرو شد",
-    "More versions..." : "نسخه های بیشتر",
+    "Restore" : "بازیابی",
     "No other versions available" : "نسخه ی دیگری در دسترس نیست",
-    "Restore" : "بازیابی"
+    "More versions..." : "نسخه های بیشتر"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/fi_FI.js b/apps/files_versions/l10n/fi_FI.js
index 32e3e28f0cc..e8e3f210500 100644
--- a/apps/files_versions/l10n/fi_FI.js
+++ b/apps/files_versions/l10n/fi_FI.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Palautus epäonnistui: %s",
     "Versions" : "Versiot",
     "Failed to revert {file} to revision {timestamp}." : "Tiedoston {file} palautus versioon {timestamp} epäonnistui.",
-    "More versions..." : "Lisää versioita...",
+    "Restore" : "Palauta",
     "No other versions available" : "Ei muita versioita saatavilla",
-    "Restore" : "Palauta"
+    "More versions..." : "Lisää versioita..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/fi_FI.json b/apps/files_versions/l10n/fi_FI.json
index 57d552b196b..910a7606374 100644
--- a/apps/files_versions/l10n/fi_FI.json
+++ b/apps/files_versions/l10n/fi_FI.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Palautus epäonnistui: %s",
     "Versions" : "Versiot",
     "Failed to revert {file} to revision {timestamp}." : "Tiedoston {file} palautus versioon {timestamp} epäonnistui.",
-    "More versions..." : "Lisää versioita...",
+    "Restore" : "Palauta",
     "No other versions available" : "Ei muita versioita saatavilla",
-    "Restore" : "Palauta"
+    "More versions..." : "Lisää versioita..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/fr.js b/apps/files_versions/l10n/fr.js
index be23bf846df..65a02256d79 100644
--- a/apps/files_versions/l10n/fr.js
+++ b/apps/files_versions/l10n/fr.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Impossible de restaurer %s",
     "Versions" : "Versions",
     "Failed to revert {file} to revision {timestamp}." : "Échec du retour du fichier {file} à la révision {timestamp}.",
-    "More versions..." : "Plus de versions...",
+    "Restore" : "Restaurer",
     "No other versions available" : "Aucune autre version n'est disponible",
-    "Restore" : "Restaurer"
+    "More versions..." : "Plus de versions..."
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_versions/l10n/fr.json b/apps/files_versions/l10n/fr.json
index 22d39d84f5f..2c2664d01a0 100644
--- a/apps/files_versions/l10n/fr.json
+++ b/apps/files_versions/l10n/fr.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Impossible de restaurer %s",
     "Versions" : "Versions",
     "Failed to revert {file} to revision {timestamp}." : "Échec du retour du fichier {file} à la révision {timestamp}.",
-    "More versions..." : "Plus de versions...",
+    "Restore" : "Restaurer",
     "No other versions available" : "Aucune autre version n'est disponible",
-    "Restore" : "Restaurer"
+    "More versions..." : "Plus de versions..."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/gl.js b/apps/files_versions/l10n/gl.js
index e947351bd9d..673d3a91f14 100644
--- a/apps/files_versions/l10n/gl.js
+++ b/apps/files_versions/l10n/gl.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Non foi posíbel reverter: %s",
     "Versions" : "Versións",
     "Failed to revert {file} to revision {timestamp}." : "Non foi posíbel reverter {file} á revisión {timestamp}.",
-    "More versions..." : "Máis versións...",
+    "Restore" : "Restabelecer",
     "No other versions available" : "Non hai outras versións dispoñíbeis",
-    "Restore" : "Restabelecer"
+    "More versions..." : "Máis versións..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/gl.json b/apps/files_versions/l10n/gl.json
index 240c78d5fed..aaa6e528756 100644
--- a/apps/files_versions/l10n/gl.json
+++ b/apps/files_versions/l10n/gl.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Non foi posíbel reverter: %s",
     "Versions" : "Versións",
     "Failed to revert {file} to revision {timestamp}." : "Non foi posíbel reverter {file} á revisión {timestamp}.",
-    "More versions..." : "Máis versións...",
+    "Restore" : "Restabelecer",
     "No other versions available" : "Non hai outras versións dispoñíbeis",
-    "Restore" : "Restabelecer"
+    "More versions..." : "Máis versións..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/hr.js b/apps/files_versions/l10n/hr.js
index 15851fc3b12..5e3bd4d90d9 100644
--- a/apps/files_versions/l10n/hr.js
+++ b/apps/files_versions/l10n/hr.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Nije moguće vratiti: %s",
     "Versions" : "Verzije",
     "Failed to revert {file} to revision {timestamp}." : "Nije uspelo vraćanje {file} na reviziju {timestamp}.",
-    "More versions..." : "Više verzija...",
+    "Restore" : "Obnovite",
     "No other versions available" : "Nikakve druge verzije nisu dostupne",
-    "Restore" : "Obnovite"
+    "More versions..." : "Više verzija..."
 },
 "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/apps/files_versions/l10n/hr.json b/apps/files_versions/l10n/hr.json
index 8197420150f..ada27dc792a 100644
--- a/apps/files_versions/l10n/hr.json
+++ b/apps/files_versions/l10n/hr.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Nije moguće vratiti: %s",
     "Versions" : "Verzije",
     "Failed to revert {file} to revision {timestamp}." : "Nije uspelo vraćanje {file} na reviziju {timestamp}.",
-    "More versions..." : "Više verzija...",
+    "Restore" : "Obnovite",
     "No other versions available" : "Nikakve druge verzije nisu dostupne",
-    "Restore" : "Obnovite"
+    "More versions..." : "Više verzija..."
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/hu_HU.js b/apps/files_versions/l10n/hu_HU.js
index 342e65d5faf..9eb8619375e 100644
--- a/apps/files_versions/l10n/hu_HU.js
+++ b/apps/files_versions/l10n/hu_HU.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Nem sikerült átállni a változatra: %s",
     "Versions" : "Az állományok korábbi változatai",
     "Failed to revert {file} to revision {timestamp}." : "Nem sikerült a(z) {file} állományt erre visszaállítani: {timestamp}.",
-    "More versions..." : "További változatok...",
+    "Restore" : "Visszaállítás",
     "No other versions available" : "Az állománynak nincs több változata",
-    "Restore" : "Visszaállítás"
+    "More versions..." : "További változatok..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/hu_HU.json b/apps/files_versions/l10n/hu_HU.json
index 2b2be0f444e..3fb9deecf42 100644
--- a/apps/files_versions/l10n/hu_HU.json
+++ b/apps/files_versions/l10n/hu_HU.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Nem sikerült átállni a változatra: %s",
     "Versions" : "Az állományok korábbi változatai",
     "Failed to revert {file} to revision {timestamp}." : "Nem sikerült a(z) {file} állományt erre visszaállítani: {timestamp}.",
-    "More versions..." : "További változatok...",
+    "Restore" : "Visszaállítás",
     "No other versions available" : "Az állománynak nincs több változata",
-    "Restore" : "Visszaállítás"
+    "More versions..." : "További változatok..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/id.js b/apps/files_versions/l10n/id.js
index 0e1111cf890..5d3579c3e62 100644
--- a/apps/files_versions/l10n/id.js
+++ b/apps/files_versions/l10n/id.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Tidak dapat mengembalikan: %s",
     "Versions" : "Versi",
     "Failed to revert {file} to revision {timestamp}." : "Gagal mengembalikan {file} ke revisi {timestamp}.",
-    "More versions..." : "Versi lebih...",
+    "Restore" : "Pulihkan",
     "No other versions available" : "Tidak ada versi lain yang tersedia",
-    "Restore" : "Pulihkan"
+    "More versions..." : "Versi lebih..."
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/id.json b/apps/files_versions/l10n/id.json
index e0b7e17bcc5..7ab5a1638f2 100644
--- a/apps/files_versions/l10n/id.json
+++ b/apps/files_versions/l10n/id.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Tidak dapat mengembalikan: %s",
     "Versions" : "Versi",
     "Failed to revert {file} to revision {timestamp}." : "Gagal mengembalikan {file} ke revisi {timestamp}.",
-    "More versions..." : "Versi lebih...",
+    "Restore" : "Pulihkan",
     "No other versions available" : "Tidak ada versi lain yang tersedia",
-    "Restore" : "Pulihkan"
+    "More versions..." : "Versi lebih..."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/is.js b/apps/files_versions/l10n/is.js
index 69ce27ca3e2..ddd94c96c65 100644
--- a/apps/files_versions/l10n/is.js
+++ b/apps/files_versions/l10n/is.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Gat ekki endurheimt: %s",
     "Versions" : "Útgáfur",
     "Failed to revert {file} to revision {timestamp}." : "Mistókst að endurheimta {file} útgáfu {timestamp}.",
-    "More versions..." : "Fleiri útgáfur ...",
+    "Restore" : "Endurheimta",
     "No other versions available" : "Engar aðrar útgáfur í boði",
-    "Restore" : "Endurheimta"
+    "More versions..." : "Fleiri útgáfur ..."
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/files_versions/l10n/is.json b/apps/files_versions/l10n/is.json
index 3059c07e1f8..bf83a2db4fe 100644
--- a/apps/files_versions/l10n/is.json
+++ b/apps/files_versions/l10n/is.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Gat ekki endurheimt: %s",
     "Versions" : "Útgáfur",
     "Failed to revert {file} to revision {timestamp}." : "Mistókst að endurheimta {file} útgáfu {timestamp}.",
-    "More versions..." : "Fleiri útgáfur ...",
+    "Restore" : "Endurheimta",
     "No other versions available" : "Engar aðrar útgáfur í boði",
-    "Restore" : "Endurheimta"
+    "More versions..." : "Fleiri útgáfur ..."
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/it.js b/apps/files_versions/l10n/it.js
index 45256577289..cb6248c3f42 100644
--- a/apps/files_versions/l10n/it.js
+++ b/apps/files_versions/l10n/it.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Impossibile ripristinare: %s",
     "Versions" : "Versioni",
     "Failed to revert {file} to revision {timestamp}." : "Ripristino di {file} alla revisione {timestamp} non riuscito.",
-    "More versions..." : "Altre versioni...",
+    "Restore" : "Ripristina",
     "No other versions available" : "Non sono disponibili altre versioni",
-    "Restore" : "Ripristina"
+    "More versions..." : "Altre versioni..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/it.json b/apps/files_versions/l10n/it.json
index af5d7bbcaba..f1479e7c114 100644
--- a/apps/files_versions/l10n/it.json
+++ b/apps/files_versions/l10n/it.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Impossibile ripristinare: %s",
     "Versions" : "Versioni",
     "Failed to revert {file} to revision {timestamp}." : "Ripristino di {file} alla revisione {timestamp} non riuscito.",
-    "More versions..." : "Altre versioni...",
+    "Restore" : "Ripristina",
     "No other versions available" : "Non sono disponibili altre versioni",
-    "Restore" : "Ripristina"
+    "More versions..." : "Altre versioni..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ja.js b/apps/files_versions/l10n/ja.js
index 1e4f26edc39..01fe310df71 100644
--- a/apps/files_versions/l10n/ja.js
+++ b/apps/files_versions/l10n/ja.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "元に戻せませんでした: %s",
     "Versions" : "バージョン",
     "Failed to revert {file} to revision {timestamp}." : "{file} を {timestamp} のリビジョンに戻すことができません。",
-    "More versions..." : "他のバージョン...",
+    "Restore" : "復元",
     "No other versions available" : "利用可能なバージョンはありません",
-    "Restore" : "復元"
+    "More versions..." : "他のバージョン..."
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/ja.json b/apps/files_versions/l10n/ja.json
index 7ee6b4d2c0e..aa634ca6bea 100644
--- a/apps/files_versions/l10n/ja.json
+++ b/apps/files_versions/l10n/ja.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "元に戻せませんでした: %s",
     "Versions" : "バージョン",
     "Failed to revert {file} to revision {timestamp}." : "{file} を {timestamp} のリビジョンに戻すことができません。",
-    "More versions..." : "他のバージョン...",
+    "Restore" : "復元",
     "No other versions available" : "利用可能なバージョンはありません",
-    "Restore" : "復元"
+    "More versions..." : "他のバージョン..."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/km.js b/apps/files_versions/l10n/km.js
index b1edbcbb3cc..6b4f21e25ad 100644
--- a/apps/files_versions/l10n/km.js
+++ b/apps/files_versions/l10n/km.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "មិន​អាច​ត្រឡប់៖ %s",
     "Versions" : "កំណែ",
     "Failed to revert {file} to revision {timestamp}." : "មិន​អាច​ត្រឡប់ {file} ទៅ​កំណែ​សម្រួល {timestamp} បាន​ទេ។",
-    "More versions..." : "កំណែ​ច្រើន​ទៀត...",
+    "Restore" : "ស្ដារ​មក​វិញ",
     "No other versions available" : "មិន​មាន​កំណែ​ផ្សេង​ទៀត​ទេ",
-    "Restore" : "ស្ដារ​មក​វិញ"
+    "More versions..." : "កំណែ​ច្រើន​ទៀត..."
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/km.json b/apps/files_versions/l10n/km.json
index 830170a2234..020b9e81ce5 100644
--- a/apps/files_versions/l10n/km.json
+++ b/apps/files_versions/l10n/km.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "មិន​អាច​ត្រឡប់៖ %s",
     "Versions" : "កំណែ",
     "Failed to revert {file} to revision {timestamp}." : "មិន​អាច​ត្រឡប់ {file} ទៅ​កំណែ​សម្រួល {timestamp} បាន​ទេ។",
-    "More versions..." : "កំណែ​ច្រើន​ទៀត...",
+    "Restore" : "ស្ដារ​មក​វិញ",
     "No other versions available" : "មិន​មាន​កំណែ​ផ្សេង​ទៀត​ទេ",
-    "Restore" : "ស្ដារ​មក​វិញ"
+    "More versions..." : "កំណែ​ច្រើន​ទៀត..."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/kn.js b/apps/files_versions/l10n/kn.js
index b394094989a..c7c255f5480 100644
--- a/apps/files_versions/l10n/kn.js
+++ b/apps/files_versions/l10n/kn.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "ಹಿಂತಿರುಗಲಾಗಲಿಲ್ಲ: %s",
     "Versions" : "ಆವೃತ್ತಿಗಳು",
     "Failed to revert {file} to revision {timestamp}." : "{timestamp} ದ ಪರಿಷ್ಕರಣೆ ಇಂದ  {file}  ಕಡತವನ್ನು ಹಿಂದಿರುಗಿಸಲು ವಿಫಲವಾಗಿದೆ.",
-    "More versions..." : "ಇನ್ನಷ್ಟು ಆವೃತ್ತಿಗಳು ...",
+    "Restore" : "ಮರುಸ್ಥಾಪಿಸು",
     "No other versions available" : "ಇನ್ನಿತರೆ ಯಾವುದೇ ಆವೃತ್ತಿಗಳು ಲಭ್ಯವಿಲ್ಲ",
-    "Restore" : "ಮರುಸ್ಥಾಪಿಸು"
+    "More versions..." : "ಇನ್ನಷ್ಟು ಆವೃತ್ತಿಗಳು ..."
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/kn.json b/apps/files_versions/l10n/kn.json
index 17b61dd6bac..37f1d57c6bd 100644
--- a/apps/files_versions/l10n/kn.json
+++ b/apps/files_versions/l10n/kn.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "ಹಿಂತಿರುಗಲಾಗಲಿಲ್ಲ: %s",
     "Versions" : "ಆವೃತ್ತಿಗಳು",
     "Failed to revert {file} to revision {timestamp}." : "{timestamp} ದ ಪರಿಷ್ಕರಣೆ ಇಂದ  {file}  ಕಡತವನ್ನು ಹಿಂದಿರುಗಿಸಲು ವಿಫಲವಾಗಿದೆ.",
-    "More versions..." : "ಇನ್ನಷ್ಟು ಆವೃತ್ತಿಗಳು ...",
+    "Restore" : "ಮರುಸ್ಥಾಪಿಸು",
     "No other versions available" : "ಇನ್ನಿತರೆ ಯಾವುದೇ ಆವೃತ್ತಿಗಳು ಲಭ್ಯವಿಲ್ಲ",
-    "Restore" : "ಮರುಸ್ಥಾಪಿಸು"
+    "More versions..." : "ಇನ್ನಷ್ಟು ಆವೃತ್ತಿಗಳು ..."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ko.js b/apps/files_versions/l10n/ko.js
index 9e125ec6bbf..dca7683d2da 100644
--- a/apps/files_versions/l10n/ko.js
+++ b/apps/files_versions/l10n/ko.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "되돌릴 수 없습니다: %s",
     "Versions" : "버전",
     "Failed to revert {file} to revision {timestamp}." : "{file}을(를) 리비전 {timestamp}으(로) 되돌리는 데 실패하였습니다.",
-    "More versions..." : "더 많은 버전...",
+    "Restore" : "복원",
     "No other versions available" : "다른 버전을 사용할 수 없습니다",
-    "Restore" : "복원"
+    "More versions..." : "더 많은 버전..."
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/ko.json b/apps/files_versions/l10n/ko.json
index 80ebb43912a..1665579ded1 100644
--- a/apps/files_versions/l10n/ko.json
+++ b/apps/files_versions/l10n/ko.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "되돌릴 수 없습니다: %s",
     "Versions" : "버전",
     "Failed to revert {file} to revision {timestamp}." : "{file}을(를) 리비전 {timestamp}으(로) 되돌리는 데 실패하였습니다.",
-    "More versions..." : "더 많은 버전...",
+    "Restore" : "복원",
     "No other versions available" : "다른 버전을 사용할 수 없습니다",
-    "Restore" : "복원"
+    "More versions..." : "더 많은 버전..."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/lb.js b/apps/files_versions/l10n/lb.js
index 1678cad569d..e2ef61b370f 100644
--- a/apps/files_versions/l10n/lb.js
+++ b/apps/files_versions/l10n/lb.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Konnt net zrécksetzen: %s",
     "Versions" : "Versiounen",
     "Failed to revert {file} to revision {timestamp}." : "Konnt {file} net op d'Versioun {timestamp} zrécksetzen.",
-    "More versions..." : "Méi Versiounen...",
+    "Restore" : "Zrécksetzen",
     "No other versions available" : "Keng aner Versiounen disponibel",
-    "Restore" : "Zrécksetzen"
+    "More versions..." : "Méi Versiounen..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/lb.json b/apps/files_versions/l10n/lb.json
index e5fbb6c220c..8265a6bb552 100644
--- a/apps/files_versions/l10n/lb.json
+++ b/apps/files_versions/l10n/lb.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Konnt net zrécksetzen: %s",
     "Versions" : "Versiounen",
     "Failed to revert {file} to revision {timestamp}." : "Konnt {file} net op d'Versioun {timestamp} zrécksetzen.",
-    "More versions..." : "Méi Versiounen...",
+    "Restore" : "Zrécksetzen",
     "No other versions available" : "Keng aner Versiounen disponibel",
-    "Restore" : "Zrécksetzen"
+    "More versions..." : "Méi Versiounen..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/lt_LT.js b/apps/files_versions/l10n/lt_LT.js
index 987b914412a..25494614a96 100644
--- a/apps/files_versions/l10n/lt_LT.js
+++ b/apps/files_versions/l10n/lt_LT.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Nepavyko atstatyti: %s",
     "Versions" : "Versijos",
     "Failed to revert {file} to revision {timestamp}." : "Nepavyko atstatyti {file} į būseną {timestamp}.",
-    "More versions..." : "Daugiau versijų...",
+    "Restore" : "Atstatyti",
     "No other versions available" : "Nėra daugiau versijų",
-    "Restore" : "Atstatyti"
+    "More versions..." : "Daugiau versijų..."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_versions/l10n/lt_LT.json b/apps/files_versions/l10n/lt_LT.json
index 5e30612dd33..3b3a6feb0f5 100644
--- a/apps/files_versions/l10n/lt_LT.json
+++ b/apps/files_versions/l10n/lt_LT.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Nepavyko atstatyti: %s",
     "Versions" : "Versijos",
     "Failed to revert {file} to revision {timestamp}." : "Nepavyko atstatyti {file} į būseną {timestamp}.",
-    "More versions..." : "Daugiau versijų...",
+    "Restore" : "Atstatyti",
     "No other versions available" : "Nėra daugiau versijų",
-    "Restore" : "Atstatyti"
+    "More versions..." : "Daugiau versijų..."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/lv.js b/apps/files_versions/l10n/lv.js
index 5ac3fa1ad87..9db45fe7b4a 100644
--- a/apps/files_versions/l10n/lv.js
+++ b/apps/files_versions/l10n/lv.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Nevarēja atgriezt — %s",
     "Versions" : "Versijas",
     "Failed to revert {file} to revision {timestamp}." : "Neizdevās atjaunot {file} no rediģējuma {timestamp} ",
-    "More versions..." : "Vairāk versiju...",
+    "Restore" : "Atjaunot",
     "No other versions available" : "Citas versijas nav pieejamas",
-    "Restore" : "Atjaunot"
+    "More versions..." : "Vairāk versiju..."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files_versions/l10n/lv.json b/apps/files_versions/l10n/lv.json
index f0912544887..f2d4c2fc316 100644
--- a/apps/files_versions/l10n/lv.json
+++ b/apps/files_versions/l10n/lv.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Nevarēja atgriezt — %s",
     "Versions" : "Versijas",
     "Failed to revert {file} to revision {timestamp}." : "Neizdevās atjaunot {file} no rediģējuma {timestamp} ",
-    "More versions..." : "Vairāk versiju...",
+    "Restore" : "Atjaunot",
     "No other versions available" : "Citas versijas nav pieejamas",
-    "Restore" : "Atjaunot"
+    "More versions..." : "Vairāk versiju..."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/mk.js b/apps/files_versions/l10n/mk.js
index fa295501320..32bd8ea5140 100644
--- a/apps/files_versions/l10n/mk.js
+++ b/apps/files_versions/l10n/mk.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Не можев да го вратам: %s",
     "Versions" : "Верзии",
     "Failed to revert {file} to revision {timestamp}." : "Не успеав да го вратам {file} на ревизијата {timestamp}.",
-    "More versions..." : "Повеќе верзии...",
+    "Restore" : "Врати",
     "No other versions available" : "Не постојат други верзии",
-    "Restore" : "Врати"
+    "More versions..." : "Повеќе верзии..."
 },
 "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/files_versions/l10n/mk.json b/apps/files_versions/l10n/mk.json
index cdef37ecde3..2c7b148e89a 100644
--- a/apps/files_versions/l10n/mk.json
+++ b/apps/files_versions/l10n/mk.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Не можев да го вратам: %s",
     "Versions" : "Верзии",
     "Failed to revert {file} to revision {timestamp}." : "Не успеав да го вратам {file} на ревизијата {timestamp}.",
-    "More versions..." : "Повеќе верзии...",
+    "Restore" : "Врати",
     "No other versions available" : "Не постојат други верзии",
-    "Restore" : "Врати"
+    "More versions..." : "Повеќе верзии..."
 },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ms_MY.js b/apps/files_versions/l10n/ms_MY.js
index f645a255caf..3edb05dd0ab 100644
--- a/apps/files_versions/l10n/ms_MY.js
+++ b/apps/files_versions/l10n/ms_MY.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Tidak dapat kembalikan: %s",
     "Versions" : "Versi",
     "Failed to revert {file} to revision {timestamp}." : "Gagal kembalikan {file} ke semakan {timestamp}.",
-    "More versions..." : "Lagi versi...",
+    "Restore" : "Pulihkan",
     "No other versions available" : "Tiada lagi versi lain",
-    "Restore" : "Pulihkan"
+    "More versions..." : "Lagi versi..."
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/ms_MY.json b/apps/files_versions/l10n/ms_MY.json
index 6ed0cd34131..3cd889353a9 100644
--- a/apps/files_versions/l10n/ms_MY.json
+++ b/apps/files_versions/l10n/ms_MY.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Tidak dapat kembalikan: %s",
     "Versions" : "Versi",
     "Failed to revert {file} to revision {timestamp}." : "Gagal kembalikan {file} ke semakan {timestamp}.",
-    "More versions..." : "Lagi versi...",
+    "Restore" : "Pulihkan",
     "No other versions available" : "Tiada lagi versi lain",
-    "Restore" : "Pulihkan"
+    "More versions..." : "Lagi versi..."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/nb_NO.js b/apps/files_versions/l10n/nb_NO.js
index e3279e61bf8..8fd1fbc8409 100644
--- a/apps/files_versions/l10n/nb_NO.js
+++ b/apps/files_versions/l10n/nb_NO.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Klarte ikke å tilbakeføre: %s",
     "Versions" : "Versjoner",
     "Failed to revert {file} to revision {timestamp}." : "Klarte ikke å tilbakeføre {file} til revisjon {timestamp}.",
-    "More versions..." : "Flere versjoner",
+    "Restore" : "Gjenopprett",
     "No other versions available" : "Det finnes ingen andre versjoner",
-    "Restore" : "Gjenopprett"
+    "More versions..." : "Flere versjoner"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/nb_NO.json b/apps/files_versions/l10n/nb_NO.json
index 18c520014d1..c68a10c8728 100644
--- a/apps/files_versions/l10n/nb_NO.json
+++ b/apps/files_versions/l10n/nb_NO.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Klarte ikke å tilbakeføre: %s",
     "Versions" : "Versjoner",
     "Failed to revert {file} to revision {timestamp}." : "Klarte ikke å tilbakeføre {file} til revisjon {timestamp}.",
-    "More versions..." : "Flere versjoner",
+    "Restore" : "Gjenopprett",
     "No other versions available" : "Det finnes ingen andre versjoner",
-    "Restore" : "Gjenopprett"
+    "More versions..." : "Flere versjoner"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/nl.js b/apps/files_versions/l10n/nl.js
index 53de2706f35..14f7f06852a 100644
--- a/apps/files_versions/l10n/nl.js
+++ b/apps/files_versions/l10n/nl.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Kon niet terugdraaien: %s",
     "Versions" : "Versies",
     "Failed to revert {file} to revision {timestamp}." : "Kon {file} niet terugdraaien naar revisie {timestamp}.",
-    "More versions..." : "Meer versies...",
+    "Restore" : "Herstellen",
     "No other versions available" : "Geen andere versies beschikbaar",
-    "Restore" : "Herstellen"
+    "More versions..." : "Meer versies..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/nl.json b/apps/files_versions/l10n/nl.json
index b564b5e54b3..400b9d46730 100644
--- a/apps/files_versions/l10n/nl.json
+++ b/apps/files_versions/l10n/nl.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Kon niet terugdraaien: %s",
     "Versions" : "Versies",
     "Failed to revert {file} to revision {timestamp}." : "Kon {file} niet terugdraaien naar revisie {timestamp}.",
-    "More versions..." : "Meer versies...",
+    "Restore" : "Herstellen",
     "No other versions available" : "Geen andere versies beschikbaar",
-    "Restore" : "Herstellen"
+    "More versions..." : "Meer versies..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/nn_NO.js b/apps/files_versions/l10n/nn_NO.js
index feedf5a9449..f83901dfb6b 100644
--- a/apps/files_versions/l10n/nn_NO.js
+++ b/apps/files_versions/l10n/nn_NO.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Klarte ikkje å tilbakestilla: %s",
     "Versions" : "Utgåver",
     "Failed to revert {file} to revision {timestamp}." : "Klarte ikkje å tilbakestilla {file} til utgåva {timestamp}.",
-    "More versions..." : "Fleire utgåver …",
+    "Restore" : "Gjenopprett",
     "No other versions available" : "Ingen andre utgåver tilgjengeleg",
-    "Restore" : "Gjenopprett"
+    "More versions..." : "Fleire utgåver …"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/nn_NO.json b/apps/files_versions/l10n/nn_NO.json
index 96d410cfa04..7fb0b12986e 100644
--- a/apps/files_versions/l10n/nn_NO.json
+++ b/apps/files_versions/l10n/nn_NO.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Klarte ikkje å tilbakestilla: %s",
     "Versions" : "Utgåver",
     "Failed to revert {file} to revision {timestamp}." : "Klarte ikkje å tilbakestilla {file} til utgåva {timestamp}.",
-    "More versions..." : "Fleire utgåver …",
+    "Restore" : "Gjenopprett",
     "No other versions available" : "Ingen andre utgåver tilgjengeleg",
-    "Restore" : "Gjenopprett"
+    "More versions..." : "Fleire utgåver …"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/oc.js b/apps/files_versions/l10n/oc.js
index dbb8fa894cb..7dbb7a243fd 100644
--- a/apps/files_versions/l10n/oc.js
+++ b/apps/files_versions/l10n/oc.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Impossible de restablir %s",
     "Versions" : "Versions",
     "Failed to revert {file} to revision {timestamp}." : "Fracàs del retorn del fichièr {file} a la revision {timestamp}.",
-    "More versions..." : "Mai de versions...",
+    "Restore" : "Restablir",
     "No other versions available" : "Cap d'autra version es pas disponibla",
-    "Restore" : "Restablir"
+    "More versions..." : "Mai de versions..."
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_versions/l10n/oc.json b/apps/files_versions/l10n/oc.json
index cf3ddd95d33..a85d32b650a 100644
--- a/apps/files_versions/l10n/oc.json
+++ b/apps/files_versions/l10n/oc.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Impossible de restablir %s",
     "Versions" : "Versions",
     "Failed to revert {file} to revision {timestamp}." : "Fracàs del retorn del fichièr {file} a la revision {timestamp}.",
-    "More versions..." : "Mai de versions...",
+    "Restore" : "Restablir",
     "No other versions available" : "Cap d'autra version es pas disponibla",
-    "Restore" : "Restablir"
+    "More versions..." : "Mai de versions..."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/pl.js b/apps/files_versions/l10n/pl.js
index dce5f500ef6..f93cfc4845e 100644
--- a/apps/files_versions/l10n/pl.js
+++ b/apps/files_versions/l10n/pl.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Nie można było przywrócić: %s",
     "Versions" : "Wersje",
     "Failed to revert {file} to revision {timestamp}." : "Nie udało się przywrócić {file} do wersji z {timestamp}.",
-    "More versions..." : "Więcej wersji...",
+    "Restore" : "Przywróć",
     "No other versions available" : "Nie są dostępne żadne inne wersje",
-    "Restore" : "Przywróć"
+    "More versions..." : "Więcej wersji..."
 },
 "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_versions/l10n/pl.json b/apps/files_versions/l10n/pl.json
index 68860dd115a..974ba809b0a 100644
--- a/apps/files_versions/l10n/pl.json
+++ b/apps/files_versions/l10n/pl.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Nie można było przywrócić: %s",
     "Versions" : "Wersje",
     "Failed to revert {file} to revision {timestamp}." : "Nie udało się przywrócić {file} do wersji z {timestamp}.",
-    "More versions..." : "Więcej wersji...",
+    "Restore" : "Przywróć",
     "No other versions available" : "Nie są dostępne żadne inne wersje",
-    "Restore" : "Przywróć"
+    "More versions..." : "Więcej wersji..."
 },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/pt_BR.js b/apps/files_versions/l10n/pt_BR.js
index 229d935be22..9c3bce45e9b 100644
--- a/apps/files_versions/l10n/pt_BR.js
+++ b/apps/files_versions/l10n/pt_BR.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Impossível reverter: %s",
     "Versions" : "Versões",
     "Failed to revert {file} to revision {timestamp}." : "Falha ao reverter {file} para a revisão {timestamp}.",
-    "More versions..." : "Mais versões...",
+    "Restore" : "Restaurar",
     "No other versions available" : "Nenhuma outra versão disponível",
-    "Restore" : "Restaurar"
+    "More versions..." : "Mais versões..."
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_versions/l10n/pt_BR.json b/apps/files_versions/l10n/pt_BR.json
index 11225a32b9f..b54c27c6b46 100644
--- a/apps/files_versions/l10n/pt_BR.json
+++ b/apps/files_versions/l10n/pt_BR.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Impossível reverter: %s",
     "Versions" : "Versões",
     "Failed to revert {file} to revision {timestamp}." : "Falha ao reverter {file} para a revisão {timestamp}.",
-    "More versions..." : "Mais versões...",
+    "Restore" : "Restaurar",
     "No other versions available" : "Nenhuma outra versão disponível",
-    "Restore" : "Restaurar"
+    "More versions..." : "Mais versões..."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/pt_PT.js b/apps/files_versions/l10n/pt_PT.js
index 29ae6e3eef9..cb058c8b02e 100644
--- a/apps/files_versions/l10n/pt_PT.js
+++ b/apps/files_versions/l10n/pt_PT.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Não foi possível reverter: %s",
     "Versions" : "Versões",
     "Failed to revert {file} to revision {timestamp}." : "Falhou a recuperação do ficheiro {file} para a revisão {timestamp}.",
-    "More versions..." : "Mais versões...",
+    "Restore" : "Restaurar",
     "No other versions available" : "Não existem versões mais antigas",
-    "Restore" : "Restaurar"
+    "More versions..." : "Mais versões..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/pt_PT.json b/apps/files_versions/l10n/pt_PT.json
index 4ce27f4c748..7dc6828a72f 100644
--- a/apps/files_versions/l10n/pt_PT.json
+++ b/apps/files_versions/l10n/pt_PT.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Não foi possível reverter: %s",
     "Versions" : "Versões",
     "Failed to revert {file} to revision {timestamp}." : "Falhou a recuperação do ficheiro {file} para a revisão {timestamp}.",
-    "More versions..." : "Mais versões...",
+    "Restore" : "Restaurar",
     "No other versions available" : "Não existem versões mais antigas",
-    "Restore" : "Restaurar"
+    "More versions..." : "Mais versões..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ro.js b/apps/files_versions/l10n/ro.js
index 1c8d6382d9f..815c04e6519 100644
--- a/apps/files_versions/l10n/ro.js
+++ b/apps/files_versions/l10n/ro.js
@@ -3,8 +3,8 @@ OC.L10N.register(
     {
     "Could not revert: %s" : "Nu a putut reveni: %s",
     "Versions" : "Versiuni",
-    "More versions..." : "Mai multe versiuni...",
+    "Restore" : "Restabilire",
     "No other versions available" : "Nu există alte versiuni disponibile",
-    "Restore" : "Restabilire"
+    "More versions..." : "Mai multe versiuni..."
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/files_versions/l10n/ro.json b/apps/files_versions/l10n/ro.json
index 3b2d0c795ab..78a4ecc4e7c 100644
--- a/apps/files_versions/l10n/ro.json
+++ b/apps/files_versions/l10n/ro.json
@@ -1,8 +1,8 @@
 { "translations": {
     "Could not revert: %s" : "Nu a putut reveni: %s",
     "Versions" : "Versiuni",
-    "More versions..." : "Mai multe versiuni...",
+    "Restore" : "Restabilire",
     "No other versions available" : "Nu există alte versiuni disponibile",
-    "Restore" : "Restabilire"
+    "More versions..." : "Mai multe versiuni..."
 },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ru.js b/apps/files_versions/l10n/ru.js
index 25248b9de5f..7809e4f1190 100644
--- a/apps/files_versions/l10n/ru.js
+++ b/apps/files_versions/l10n/ru.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Невозможно откатить: %s",
     "Versions" : "Версии",
     "Failed to revert {file} to revision {timestamp}." : "Не удалось откатить {file} к ревизии {timestamp}.",
-    "More versions..." : "Ещё версии...",
+    "Restore" : "Откатить",
     "No other versions available" : "Других версий не доступно",
-    "Restore" : "Откатить"
+    "More versions..." : "Ещё версии..."
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/apps/files_versions/l10n/ru.json b/apps/files_versions/l10n/ru.json
index 738bb332d23..595d2504319 100644
--- a/apps/files_versions/l10n/ru.json
+++ b/apps/files_versions/l10n/ru.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Невозможно откатить: %s",
     "Versions" : "Версии",
     "Failed to revert {file} to revision {timestamp}." : "Не удалось откатить {file} к ревизии {timestamp}.",
-    "More versions..." : "Ещё версии...",
+    "Restore" : "Откатить",
     "No other versions available" : "Других версий не доступно",
-    "Restore" : "Откатить"
+    "More versions..." : "Ещё версии..."
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/sk_SK.js b/apps/files_versions/l10n/sk_SK.js
index 1433f42f2b5..c4857784928 100644
--- a/apps/files_versions/l10n/sk_SK.js
+++ b/apps/files_versions/l10n/sk_SK.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Nemožno obnoviť: %s",
     "Versions" : "Verzie",
     "Failed to revert {file} to revision {timestamp}." : "Zlyhalo obnovenie súboru {file} na verziu {timestamp}.",
-    "More versions..." : "Viac verzií...",
+    "Restore" : "Obnoviť",
     "No other versions available" : "Žiadne ďalšie verzie nie sú dostupné",
-    "Restore" : "Obnoviť"
+    "More versions..." : "Viac verzií..."
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_versions/l10n/sk_SK.json b/apps/files_versions/l10n/sk_SK.json
index da8a7b02ca9..5ac48397699 100644
--- a/apps/files_versions/l10n/sk_SK.json
+++ b/apps/files_versions/l10n/sk_SK.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Nemožno obnoviť: %s",
     "Versions" : "Verzie",
     "Failed to revert {file} to revision {timestamp}." : "Zlyhalo obnovenie súboru {file} na verziu {timestamp}.",
-    "More versions..." : "Viac verzií...",
+    "Restore" : "Obnoviť",
     "No other versions available" : "Žiadne ďalšie verzie nie sú dostupné",
-    "Restore" : "Obnoviť"
+    "More versions..." : "Viac verzií..."
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/sl.js b/apps/files_versions/l10n/sl.js
index abbf4a803d8..e04e39a3c62 100644
--- a/apps/files_versions/l10n/sl.js
+++ b/apps/files_versions/l10n/sl.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Ni mogoče povrniti: %s",
     "Versions" : "Različice",
     "Failed to revert {file} to revision {timestamp}." : "Povrnitev datoteke {file} na objavo {timestamp} je spodletelo.",
-    "More versions..." : "Več različic",
+    "Restore" : "Obnovi",
     "No other versions available" : "Ni drugih različic",
-    "Restore" : "Obnovi"
+    "More versions..." : "Več različic"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/files_versions/l10n/sl.json b/apps/files_versions/l10n/sl.json
index 581c9aab594..a66e94e425d 100644
--- a/apps/files_versions/l10n/sl.json
+++ b/apps/files_versions/l10n/sl.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Ni mogoče povrniti: %s",
     "Versions" : "Različice",
     "Failed to revert {file} to revision {timestamp}." : "Povrnitev datoteke {file} na objavo {timestamp} je spodletelo.",
-    "More versions..." : "Več različic",
+    "Restore" : "Obnovi",
     "No other versions available" : "Ni drugih različic",
-    "Restore" : "Obnovi"
+    "More versions..." : "Več različic"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/sq.js b/apps/files_versions/l10n/sq.js
index 5330b36aad5..4c9f9487f28 100644
--- a/apps/files_versions/l10n/sq.js
+++ b/apps/files_versions/l10n/sq.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Nuk mund të ktheje: %s",
     "Versions" : "Versioni",
     "Failed to revert {file} to revision {timestamp}." : "Dështoi në ktheje {skedar} të rishikimit {kohëstampe}.",
-    "More versions..." : "Versione m'shumë...",
+    "Restore" : "Rivendos",
     "No other versions available" : "Nuk ka versione të tjera në dispozicion",
-    "Restore" : "Rivendos"
+    "More versions..." : "Versione m'shumë..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/sq.json b/apps/files_versions/l10n/sq.json
index 994772c8e3e..4e1c813d9bf 100644
--- a/apps/files_versions/l10n/sq.json
+++ b/apps/files_versions/l10n/sq.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Nuk mund të ktheje: %s",
     "Versions" : "Versioni",
     "Failed to revert {file} to revision {timestamp}." : "Dështoi në ktheje {skedar} të rishikimit {kohëstampe}.",
-    "More versions..." : "Versione m'shumë...",
+    "Restore" : "Rivendos",
     "No other versions available" : "Nuk ka versione të tjera në dispozicion",
-    "Restore" : "Rivendos"
+    "More versions..." : "Versione m'shumë..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/sr.js b/apps/files_versions/l10n/sr.js
index 09b047a563a..9b8c97592cc 100644
--- a/apps/files_versions/l10n/sr.js
+++ b/apps/files_versions/l10n/sr.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Не могу да вратим: %s",
     "Versions" : "Верзије",
     "Failed to revert {file} to revision {timestamp}." : "Не могу да вратим {file} на ревизију {timestamp}.",
-    "More versions..." : "Још верзија...",
+    "Restore" : "Врати",
     "No other versions available" : "Нема других верзија",
-    "Restore" : "Врати"
+    "More versions..." : "Још верзија..."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_versions/l10n/sr.json b/apps/files_versions/l10n/sr.json
index 8dfb6c37748..73484b6f3d5 100644
--- a/apps/files_versions/l10n/sr.json
+++ b/apps/files_versions/l10n/sr.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Не могу да вратим: %s",
     "Versions" : "Верзије",
     "Failed to revert {file} to revision {timestamp}." : "Не могу да вратим {file} на ревизију {timestamp}.",
-    "More versions..." : "Још верзија...",
+    "Restore" : "Врати",
     "No other versions available" : "Нема других верзија",
-    "Restore" : "Врати"
+    "More versions..." : "Још верзија..."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/sr@latin.js b/apps/files_versions/l10n/sr@latin.js
index 7b6f750d1a6..627d70eb51b 100644
--- a/apps/files_versions/l10n/sr@latin.js
+++ b/apps/files_versions/l10n/sr@latin.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Ne mogu da vratim: %s",
     "Versions" : "Verzije",
     "Failed to revert {file} to revision {timestamp}." : "Ne mogu da vratim {file} na reviziju {timestamp}.",
-    "More versions..." : "Još verzija...",
+    "Restore" : "Vrati",
     "No other versions available" : "Nema drugih verzija",
-    "Restore" : "Vrati"
+    "More versions..." : "Još verzija..."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_versions/l10n/sr@latin.json b/apps/files_versions/l10n/sr@latin.json
index b7a0eb3b398..63fe55cf50e 100644
--- a/apps/files_versions/l10n/sr@latin.json
+++ b/apps/files_versions/l10n/sr@latin.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Ne mogu da vratim: %s",
     "Versions" : "Verzije",
     "Failed to revert {file} to revision {timestamp}." : "Ne mogu da vratim {file} na reviziju {timestamp}.",
-    "More versions..." : "Još verzija...",
+    "Restore" : "Vrati",
     "No other versions available" : "Nema drugih verzija",
-    "Restore" : "Vrati"
+    "More versions..." : "Još verzija..."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/sv.js b/apps/files_versions/l10n/sv.js
index 6ff23cc5635..1b5d05f51ec 100644
--- a/apps/files_versions/l10n/sv.js
+++ b/apps/files_versions/l10n/sv.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Kunde inte återställa: %s",
     "Versions" : "Versioner",
     "Failed to revert {file} to revision {timestamp}." : "Kunde inte återställa {file} till revision {timestamp}.",
-    "More versions..." : "Fler versioner...",
+    "Restore" : "Återskapa",
     "No other versions available" : "Inga andra versioner tillgängliga",
-    "Restore" : "Återskapa"
+    "More versions..." : "Fler versioner..."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/sv.json b/apps/files_versions/l10n/sv.json
index ccf056f6f0f..30589a25bb5 100644
--- a/apps/files_versions/l10n/sv.json
+++ b/apps/files_versions/l10n/sv.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Kunde inte återställa: %s",
     "Versions" : "Versioner",
     "Failed to revert {file} to revision {timestamp}." : "Kunde inte återställa {file} till revision {timestamp}.",
-    "More versions..." : "Fler versioner...",
+    "Restore" : "Återskapa",
     "No other versions available" : "Inga andra versioner tillgängliga",
-    "Restore" : "Återskapa"
+    "More versions..." : "Fler versioner..."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/th_TH.js b/apps/files_versions/l10n/th_TH.js
index 81559c9cea3..97d0539ca55 100644
--- a/apps/files_versions/l10n/th_TH.js
+++ b/apps/files_versions/l10n/th_TH.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "ไม่สามารถย้อนกลับ: %s",
     "Versions" : "รุ่น",
     "Failed to revert {file} to revision {timestamp}." : "{file} ล้มเหลวที่จะย้อนกลับ มีการแก้ไขเมื่อ {timestamp}",
-    "More versions..." : "รุ่นอื่นๆ ...",
+    "Restore" : "คืนค่า",
     "No other versions available" : "ไม่มีรุ่นอื่นๆ",
-    "Restore" : "คืนค่า"
+    "More versions..." : "รุ่นอื่นๆ ..."
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/th_TH.json b/apps/files_versions/l10n/th_TH.json
index bd07d72a582..a67fa3e17e0 100644
--- a/apps/files_versions/l10n/th_TH.json
+++ b/apps/files_versions/l10n/th_TH.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "ไม่สามารถย้อนกลับ: %s",
     "Versions" : "รุ่น",
     "Failed to revert {file} to revision {timestamp}." : "{file} ล้มเหลวที่จะย้อนกลับ มีการแก้ไขเมื่อ {timestamp}",
-    "More versions..." : "รุ่นอื่นๆ ...",
+    "Restore" : "คืนค่า",
     "No other versions available" : "ไม่มีรุ่นอื่นๆ",
-    "Restore" : "คืนค่า"
+    "More versions..." : "รุ่นอื่นๆ ..."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/tr.js b/apps/files_versions/l10n/tr.js
index ad248adc1dd..00d5cbe15d4 100644
--- a/apps/files_versions/l10n/tr.js
+++ b/apps/files_versions/l10n/tr.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Geri alınamayan: %s",
     "Versions" : "Sürümler",
     "Failed to revert {file} to revision {timestamp}." : "{file} dosyası {timestamp} gözden geçirmesine geri alınamadı.",
-    "More versions..." : "Daha fazla sürüm...",
+    "Restore" : "Geri yükle",
     "No other versions available" : "Başka sürüm mevcut değil",
-    "Restore" : "Geri yükle"
+    "More versions..." : "Daha fazla sürüm..."
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_versions/l10n/tr.json b/apps/files_versions/l10n/tr.json
index 49731d545c6..73aab761203 100644
--- a/apps/files_versions/l10n/tr.json
+++ b/apps/files_versions/l10n/tr.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Geri alınamayan: %s",
     "Versions" : "Sürümler",
     "Failed to revert {file} to revision {timestamp}." : "{file} dosyası {timestamp} gözden geçirmesine geri alınamadı.",
-    "More versions..." : "Daha fazla sürüm...",
+    "Restore" : "Geri yükle",
     "No other versions available" : "Başka sürüm mevcut değil",
-    "Restore" : "Geri yükle"
+    "More versions..." : "Daha fazla sürüm..."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/uk.js b/apps/files_versions/l10n/uk.js
index 02947793545..75335f25e55 100644
--- a/apps/files_versions/l10n/uk.js
+++ b/apps/files_versions/l10n/uk.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Не вдалося відновити: %s",
     "Versions" : "Версії",
     "Failed to revert {file} to revision {timestamp}." : "Не вдалося повернути {file} до ревізії {timestamp}.",
-    "More versions..." : "Більше версій ...",
+    "Restore" : "Відновити",
     "No other versions available" : "Інші версії недоступні",
-    "Restore" : "Відновити"
+    "More versions..." : "Більше версій ..."
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_versions/l10n/uk.json b/apps/files_versions/l10n/uk.json
index 6571b1fe2b5..54a0d7a816f 100644
--- a/apps/files_versions/l10n/uk.json
+++ b/apps/files_versions/l10n/uk.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Не вдалося відновити: %s",
     "Versions" : "Версії",
     "Failed to revert {file} to revision {timestamp}." : "Не вдалося повернути {file} до ревізії {timestamp}.",
-    "More versions..." : "Більше версій ...",
+    "Restore" : "Відновити",
     "No other versions available" : "Інші версії недоступні",
-    "Restore" : "Відновити"
+    "More versions..." : "Більше версій ..."
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/vi.js b/apps/files_versions/l10n/vi.js
index 08f6c9bb25e..2d06f12d8c1 100644
--- a/apps/files_versions/l10n/vi.js
+++ b/apps/files_versions/l10n/vi.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "Không thể khôi phục: %s",
     "Versions" : "Phiên bản",
     "Failed to revert {file} to revision {timestamp}." : "Thất bại khi trở lại {file} khi sử đổi {timestamp}.",
-    "More versions..." : "Nhiều phiên bản ...",
+    "Restore" : "Khôi phục",
     "No other versions available" : "Không có các phiên bản khác có sẵn",
-    "Restore" : "Khôi phục"
+    "More versions..." : "Nhiều phiên bản ..."
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/vi.json b/apps/files_versions/l10n/vi.json
index 21b8a964fe0..e126e6e2d53 100644
--- a/apps/files_versions/l10n/vi.json
+++ b/apps/files_versions/l10n/vi.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "Không thể khôi phục: %s",
     "Versions" : "Phiên bản",
     "Failed to revert {file} to revision {timestamp}." : "Thất bại khi trở lại {file} khi sử đổi {timestamp}.",
-    "More versions..." : "Nhiều phiên bản ...",
+    "Restore" : "Khôi phục",
     "No other versions available" : "Không có các phiên bản khác có sẵn",
-    "Restore" : "Khôi phục"
+    "More versions..." : "Nhiều phiên bản ..."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/zh_CN.js b/apps/files_versions/l10n/zh_CN.js
index 8c1ca7ad3ee..b94ec419d23 100644
--- a/apps/files_versions/l10n/zh_CN.js
+++ b/apps/files_versions/l10n/zh_CN.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "无法恢复: %s",
     "Versions" : "版本",
     "Failed to revert {file} to revision {timestamp}." : "无法恢复 {file} 到 {timestamp} 的版本。",
-    "More versions..." : "更多版本...",
+    "Restore" : "恢复",
     "No other versions available" : "无其他版本可用",
-    "Restore" : "恢复"
+    "More versions..." : "更多版本..."
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/zh_CN.json b/apps/files_versions/l10n/zh_CN.json
index 4ffb09503b0..80f8624f9dd 100644
--- a/apps/files_versions/l10n/zh_CN.json
+++ b/apps/files_versions/l10n/zh_CN.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "无法恢复: %s",
     "Versions" : "版本",
     "Failed to revert {file} to revision {timestamp}." : "无法恢复 {file} 到 {timestamp} 的版本。",
-    "More versions..." : "更多版本...",
+    "Restore" : "恢复",
     "No other versions available" : "无其他版本可用",
-    "Restore" : "恢复"
+    "More versions..." : "更多版本..."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/zh_TW.js b/apps/files_versions/l10n/zh_TW.js
index 8094658394e..72f086ff446 100644
--- a/apps/files_versions/l10n/zh_TW.js
+++ b/apps/files_versions/l10n/zh_TW.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Could not revert: %s" : "無法還原：%s",
     "Versions" : "版本",
     "Failed to revert {file} to revision {timestamp}." : "無法還原檔案 {file} 至版本 {timestamp}",
-    "More versions..." : "更多版本…",
+    "Restore" : "復原",
     "No other versions available" : "沒有其他版本了",
-    "Restore" : "復原"
+    "More versions..." : "更多版本…"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/zh_TW.json b/apps/files_versions/l10n/zh_TW.json
index 0766f66976f..37506095c20 100644
--- a/apps/files_versions/l10n/zh_TW.json
+++ b/apps/files_versions/l10n/zh_TW.json
@@ -2,8 +2,8 @@
     "Could not revert: %s" : "無法還原：%s",
     "Versions" : "版本",
     "Failed to revert {file} to revision {timestamp}." : "無法還原檔案 {file} 至版本 {timestamp}",
-    "More versions..." : "更多版本…",
+    "Restore" : "復原",
     "No other versions available" : "沒有其他版本了",
-    "Restore" : "復原"
+    "More versions..." : "更多版本…"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index e4bde6b47ed..259862db32c 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -130,6 +130,7 @@ OC.L10N.register(
     "Finish setup" : "انهاء التعديلات",
     "Log out" : "الخروج",
     "Search" : "البحث",
+    "Log in" : "أدخل",
     "remember" : "تذكر",
     "Alternative Logins" : "اسماء دخول بديلة"
 },
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index 90168479a9b..3b07b0c4253 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -128,6 +128,7 @@
     "Finish setup" : "انهاء التعديلات",
     "Log out" : "الخروج",
     "Search" : "البحث",
+    "Log in" : "أدخل",
     "remember" : "تذكر",
     "Alternative Logins" : "اسماء دخول بديلة"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index 675b3bd00a1..31040d38b7b 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -168,6 +168,7 @@ OC.L10N.register(
     "Search" : "Guetar",
     "Server side authentication failed!" : "Falló l'autenticación nel sirvidor!",
     "Please contact your administrator." : "Por favor, contauta col to alministrador",
+    "Log in" : "Aniciar sesión",
     "remember" : "recordar",
     "Alternative Logins" : "Anicios de sesión alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index 5479fb6a524..0d2abbfef0b 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -166,6 +166,7 @@
     "Search" : "Guetar",
     "Server side authentication failed!" : "Falló l'autenticación nel sirvidor!",
     "Please contact your administrator." : "Por favor, contauta col to alministrador",
+    "Log in" : "Aniciar sesión",
     "remember" : "recordar",
     "Alternative Logins" : "Anicios de sesión alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
diff --git a/core/l10n/az.js b/core/l10n/az.js
index 29e643c665a..e94203c372c 100644
--- a/core/l10n/az.js
+++ b/core/l10n/az.js
@@ -83,6 +83,7 @@ OC.L10N.register(
     "Username" : "İstifadəçi adı",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Xüsusilə fayl sinxronizasiyası üçün desktop client-dən istifadə edilərsə, SQLite məsləhət görülmür.",
     "Search" : "Axtarış",
+    "Log in" : "Giriş",
     "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
 },
diff --git a/core/l10n/az.json b/core/l10n/az.json
index 6827838c944..8dc93029ed1 100644
--- a/core/l10n/az.json
+++ b/core/l10n/az.json
@@ -81,6 +81,7 @@
     "Username" : "İstifadəçi adı",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Xüsusilə fayl sinxronizasiyası üçün desktop client-dən istifadə edilərsə, SQLite məsləhət görülmür.",
     "Search" : "Axtarış",
+    "Log in" : "Giriş",
     "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
index d9bce487f45..9d799938cb1 100644
--- a/core/l10n/bn_BD.js
+++ b/core/l10n/bn_BD.js
@@ -125,6 +125,7 @@ OC.L10N.register(
     "Finishing …" : "সম্পন্ন হচ্ছে....",
     "Log out" : "প্রস্থান",
     "Search" : "অনুসন্ধান",
+    "Log in" : "প্রবেশ",
     "remember" : "মনে রাখ",
     "Alternative Logins" : "বিকল্প লগইন"
 },
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
index 8474fa61f1c..784c6333526 100644
--- a/core/l10n/bn_BD.json
+++ b/core/l10n/bn_BD.json
@@ -123,6 +123,7 @@
     "Finishing …" : "সম্পন্ন হচ্ছে....",
     "Log out" : "প্রস্থান",
     "Search" : "অনুসন্ধান",
+    "Log in" : "প্রবেশ",
     "remember" : "মনে রাখ",
     "Alternative Logins" : "বিকল্প লগইন"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
index f237de9d8ce..a9f438f769e 100644
--- a/core/l10n/bs.js
+++ b/core/l10n/bs.js
@@ -189,6 +189,7 @@ OC.L10N.register(
     "Search" : "Potraži",
     "Server side authentication failed!" : "Autentikacija na strani servera nije uspjela!",
     "Please contact your administrator." : "Molim kontaktirajte svog administratora.",
+    "Log in" : "Prijava",
     "remember" : "zapamti",
     "Alternative Logins" : "Alternativne Prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> upravo vam javljam da je %s s vama podijelio <strong>%s</strong>.<br><a href=\"%s\">Pogledajte!</a><br><br>",
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
index c4f7962b14e..74a3aaadafe 100644
--- a/core/l10n/bs.json
+++ b/core/l10n/bs.json
@@ -187,6 +187,7 @@
     "Search" : "Potraži",
     "Server side authentication failed!" : "Autentikacija na strani servera nije uspjela!",
     "Please contact your administrator." : "Molim kontaktirajte svog administratora.",
+    "Log in" : "Prijava",
     "remember" : "zapamti",
     "Alternative Logins" : "Alternativne Prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> upravo vam javljam da je %s s vama podijelio <strong>%s</strong>.<br><a href=\"%s\">Pogledajte!</a><br><br>",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index e3760b6f2bc..7cf53922fbc 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -230,6 +230,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Please contact your administrator.",
     "An internal error occured." : "An internal error occured.",
     "Please try again or contact your administrator." : "Please try again or contact your administrator.",
+    "Log in" : "Log in",
     "remember" : "remember",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index 4c76d47111e..518e0adb80c 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -228,6 +228,7 @@
     "Please contact your administrator." : "Please contact your administrator.",
     "An internal error occured." : "An internal error occured.",
     "Please try again or contact your administrator." : "Please try again or contact your administrator.",
+    "Log in" : "Log in",
     "remember" : "remember",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index d525319995a..867877ed14d 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Por favor, contacte con el administrador.",
     "An internal error occured." : "Un error interno ocurrió.",
     "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.",
+    "Log in" : "Ingresar",
     "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?",
     "remember" : "recordar",
     "Alternative Logins" : "Inicios de sesión alternativos",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 6deffb731fb..df9e7e4b740 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "Por favor, contacte con el administrador.",
     "An internal error occured." : "Un error interno ocurrió.",
     "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.",
+    "Log in" : "Ingresar",
     "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?",
     "remember" : "recordar",
     "Alternative Logins" : "Inicios de sesión alternativos",
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index 7c4ca4a2d61..6e875058445 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -143,6 +143,7 @@ OC.L10N.register(
     "Search" : "Buscar",
     "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
     "Please contact your administrator." : "Por favor, contacte con el administrador.",
+    "Log in" : "Entrar",
     "remember" : "recordar",
     "Alternative Logins" : "Accesos Alternativos",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index 45b55e8f283..b6eeb9b4597 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -141,6 +141,7 @@
     "Search" : "Buscar",
     "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
     "Please contact your administrator." : "Por favor, contacte con el administrador.",
+    "Log in" : "Entrar",
     "remember" : "recordar",
     "Alternative Logins" : "Accesos Alternativos",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index 12bdd37eaba..822db699b4a 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -145,6 +145,7 @@ OC.L10N.register(
     "Finishing …" : "در حال اتمام ...",
     "Log out" : "خروج",
     "Search" : "جست‌و‌جو",
+    "Log in" : "ورود",
     "remember" : "بیاد آوری",
     "Alternative Logins" : "ورود متناوب",
     "Thank you for your patience." : "از صبر شما متشکریم",
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index 22a8e2eb0f5..b6edce93342 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -143,6 +143,7 @@
     "Finishing …" : "در حال اتمام ...",
     "Log out" : "خروج",
     "Search" : "جست‌و‌جو",
+    "Log in" : "ورود",
     "remember" : "بیاد آوری",
     "Alternative Logins" : "ورود متناوب",
     "Thank you for your patience." : "از صبر شما متشکریم",
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
index 15842447aa8..e16902115b9 100644
--- a/core/l10n/ia.js
+++ b/core/l10n/ia.js
@@ -156,6 +156,7 @@ OC.L10N.register(
     "Search" : "Cercar",
     "Server side authentication failed!" : "Il falleva authentication de latere servitor!",
     "Please contact your administrator." : "Pro favor continge tu administrator.",
+    "Log in" : "Aperir session",
     "remember" : "memora",
     "Alternative Logins" : "Accessos de autorisation alternative",
     "Thank you for your patience." : "Gratias pro tu patientia.",
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
index 649e667bdcb..e23ea15eeec 100644
--- a/core/l10n/ia.json
+++ b/core/l10n/ia.json
@@ -154,6 +154,7 @@
     "Search" : "Cercar",
     "Server side authentication failed!" : "Il falleva authentication de latere servitor!",
     "Please contact your administrator." : "Pro favor continge tu administrator.",
+    "Log in" : "Aperir session",
     "remember" : "memora",
     "Alternative Logins" : "Accessos de autorisation alternative",
     "Thank you for your patience." : "Gratias pro tu patientia.",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index 0540b9ae0bd..26e4f0ac022 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Silahkan hubungi administrator anda.",
     "An internal error occured." : "Terjadi kesalahan internal.",
     "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.",
+    "Log in" : "Masuk",
     "Wrong password. Reset it?" : "Sandi salah. Atur ulang?",
     "remember" : "selalu masuk",
     "Alternative Logins" : "Cara Alternatif untuk Masuk",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index d03ae4ae4ec..a82e6f8acdb 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "Silahkan hubungi administrator anda.",
     "An internal error occured." : "Terjadi kesalahan internal.",
     "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.",
+    "Log in" : "Masuk",
     "Wrong password. Reset it?" : "Sandi salah. Atur ulang?",
     "remember" : "selalu masuk",
     "Alternative Logins" : "Cara Alternatif untuk Masuk",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 3b540014655..044241ba79c 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Contatta il tuo amministratore di sistema.",
     "An internal error occured." : "Si è verificato un errore interno.",
     "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.",
+    "Log in" : "Accedi",
     "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?",
     "remember" : "ricorda",
     "Alternative Logins" : "Accessi alternativi",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 30543ce8a6e..edf715dce15 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "Contatta il tuo amministratore di sistema.",
     "An internal error occured." : "Si è verificato un errore interno.",
     "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.",
+    "Log in" : "Accedi",
     "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?",
     "remember" : "ricorda",
     "Alternative Logins" : "Accessi alternativi",
diff --git a/core/l10n/km.js b/core/l10n/km.js
index b2d3fa069e8..6aacc58a3a6 100644
--- a/core/l10n/km.js
+++ b/core/l10n/km.js
@@ -109,6 +109,7 @@ OC.L10N.register(
     "Finishing …" : "កំពុង​បញ្ចប់ ...",
     "Log out" : "ចាក​ចេញ",
     "Search" : "ស្វែង​រក",
+    "Log in" : "ចូល",
     "remember" : "ចងចាំ",
     "Alternative Logins" : "ការ​ចូល​ជំនួស"
 },
diff --git a/core/l10n/km.json b/core/l10n/km.json
index b8307fb08de..ddaed62bc33 100644
--- a/core/l10n/km.json
+++ b/core/l10n/km.json
@@ -107,6 +107,7 @@
     "Finishing …" : "កំពុង​បញ្ចប់ ...",
     "Log out" : "ចាក​ចេញ",
     "Search" : "ស្វែង​រក",
+    "Log in" : "ចូល",
     "remember" : "ចងចាំ",
     "Alternative Logins" : "ការ​ចូល​ជំនួស"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js
index cd2c54abf4a..bfa4b8cc4ba 100644
--- a/core/l10n/ms_MY.js
+++ b/core/l10n/ms_MY.js
@@ -75,6 +75,7 @@ OC.L10N.register(
     "Finish setup" : "Setup selesai",
     "Log out" : "Log keluar",
     "Search" : "Cari",
+    "Log in" : "Log masuk",
     "remember" : "ingat"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
index 7e8fa3e0856..934d2333d84 100644
--- a/core/l10n/ms_MY.json
+++ b/core/l10n/ms_MY.json
@@ -73,6 +73,7 @@
     "Finish setup" : "Setup selesai",
     "Log out" : "Log keluar",
     "Search" : "Cari",
+    "Log in" : "Log masuk",
     "remember" : "ingat"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
index a885e55a228..60bd68f5c05 100644
--- a/core/l10n/my_MM.js
+++ b/core/l10n/my_MM.js
@@ -39,6 +39,7 @@ OC.L10N.register(
     "Database password" : "Database စကားဝှက်",
     "Database name" : "Database အမည်",
     "Finish setup" : "တပ်ဆင်ခြင်းပြီးပါပြီ။",
+    "Log in" : "ဝင်ရောက်ရန်",
     "remember" : "မှတ်မိစေသည်"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
index a505042f7e1..4c74a6e18ac 100644
--- a/core/l10n/my_MM.json
+++ b/core/l10n/my_MM.json
@@ -37,6 +37,7 @@
     "Database password" : "Database စကားဝှက်",
     "Database name" : "Database အမည်",
     "Finish setup" : "တပ်ဆင်ခြင်းပြီးပါပြီ။",
+    "Log in" : "ဝင်ရောက်ရန်",
     "remember" : "မှတ်မိစေသည်"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index b7606ec84cb..0d1fd0cad10 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -248,6 +248,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Neem contact op met uw systeembeheerder.",
     "An internal error occured." : "Er heeft zich een interne fout voorgedaan.",
     "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.",
+    "Log in" : "Meld u aan",
     "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?",
     "remember" : "onthoud gegevens",
     "Alternative Logins" : "Alternatieve inlogs",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index 1a3b8a40ad6..f80b79aa37e 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -246,6 +246,7 @@
     "Please contact your administrator." : "Neem contact op met uw systeembeheerder.",
     "An internal error occured." : "Er heeft zich een interne fout voorgedaan.",
     "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.",
+    "Log in" : "Meld u aan",
     "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?",
     "remember" : "onthoud gegevens",
     "Alternative Logins" : "Alternatieve inlogs",
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
index 7466a7d9a96..8949d530fde 100644
--- a/core/l10n/nn_NO.js
+++ b/core/l10n/nn_NO.js
@@ -127,6 +127,7 @@ OC.L10N.register(
     "Finish setup" : "Fullfør oppsettet",
     "Log out" : "Logg ut",
     "Search" : "Søk",
+    "Log in" : "Logg inn",
     "remember" : "hugs",
     "Alternative Logins" : "Alternative innloggingar"
 },
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
index ae90139ddca..8555b9abc20 100644
--- a/core/l10n/nn_NO.json
+++ b/core/l10n/nn_NO.json
@@ -125,6 +125,7 @@
     "Finish setup" : "Fullfør oppsettet",
     "Log out" : "Logg ut",
     "Search" : "Søk",
+    "Log in" : "Logg inn",
     "remember" : "hugs",
     "Alternative Logins" : "Alternative innloggingar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index 910f5a2265e..fed3df7667d 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -229,6 +229,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Contactatz vòstre administrator.",
     "An internal error occured." : "Una error intèrna s'es produsida.",
     "Please try again or contact your administrator." : "Reensajatz o contactatz vòstre administrator.",
+    "Log in" : "Connexion",
     "remember" : "se remembrar de ieu",
     "Alternative Logins" : "Identificants alternatius",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjorn,<br><br>Vos informam que %s a partejat <strong>%s</strong> amb vos.<br><a href=\"%s\">Clicatz aicí per i accedir !</a><br><br>",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index 6c859cd0c7a..6cda4b3c05a 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -227,6 +227,7 @@
     "Please contact your administrator." : "Contactatz vòstre administrator.",
     "An internal error occured." : "Una error intèrna s'es produsida.",
     "Please try again or contact your administrator." : "Reensajatz o contactatz vòstre administrator.",
+    "Log in" : "Connexion",
     "remember" : "se remembrar de ieu",
     "Alternative Logins" : "Identificants alternatius",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjorn,<br><br>Vos informam que %s a partejat <strong>%s</strong> amb vos.<br><a href=\"%s\">Clicatz aicí per i accedir !</a><br><br>",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index 054c5fcb187..f552a6bbacf 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -148,6 +148,7 @@ OC.L10N.register(
     "Finish setup" : "Finalizează instalarea",
     "Log out" : "Ieșire",
     "Search" : "Căutare",
+    "Log in" : "Autentificare",
     "remember" : "amintește",
     "Alternative Logins" : "Conectări alternative",
     "Thank you for your patience." : "Îți mulțumim pentru răbrade.",
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index 41f9e9ab0f1..8625c161ff5 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -146,6 +146,7 @@
     "Finish setup" : "Finalizează instalarea",
     "Log out" : "Ieșire",
     "Search" : "Căutare",
+    "Log in" : "Autentificare",
     "remember" : "amintește",
     "Alternative Logins" : "Conectări alternative",
     "Thank you for your patience." : "Îți mulțumim pentru răbrade.",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 5b114a933fc..0e732d81b6e 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -238,6 +238,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Пожалуйста, свяжитесь с вашим администратором.",
     "An internal error occured." : "Произошла внутренняя ошибка",
     "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором",
+    "Log in" : "Войти",
     "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?",
     "remember" : "запомнить",
     "Alternative Logins" : "Альтернативные имена пользователя",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index b9b2bc4e1ce..7a19ab2c55b 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -236,6 +236,7 @@
     "Please contact your administrator." : "Пожалуйста, свяжитесь с вашим администратором.",
     "An internal error occured." : "Произошла внутренняя ошибка",
     "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором",
+    "Log in" : "Войти",
     "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?",
     "remember" : "запомнить",
     "Alternative Logins" : "Альтернативные имена пользователя",
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 2953bc7e0c6..6cea84df377 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -34,6 +34,13 @@ OC.L10N.register(
     "Thu." : "Štv.",
     "Fri." : "Pia.",
     "Sat." : "Sob.",
+    "Su" : "Ne",
+    "Mo" : "Po",
+    "Tu" : "Ut",
+    "We" : "St",
+    "Th" : "Št",
+    "Fr" : "Pi",
+    "Sa" : "So",
     "January" : "Január",
     "February" : "Február",
     "March" : "Marec",
@@ -228,6 +235,7 @@ OC.L10N.register(
     "An internal error occured." : "Vyskytla sa vnútorná chyba.",
     "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.",
     "Log in" : "Prihlásiť sa",
+    "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?",
     "remember" : "zapamätať",
     "Alternative Logins" : "Alternatívne prihlásenie",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
@@ -239,6 +247,7 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte správcu. Ak ste správcom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na konfigurácii, vám môže byť ako správcovi umožnené použitie tlačidla nižšie pre označenie tejto domény ako dôveryhodnej.",
     "Add \"%s\" as trusted domain" : "Pridať \"%s\" ako dôveryhodnú doménu",
+    "%s will be updated to version %s" : "%s bude zaktualizovaný na verziu %s.",
     "The theme %s has been disabled." : "Téma %s bola zakázaná.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
     "Start update" : "Spustiť aktualizáciu",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index f39e14ed02a..d2a37da8346 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -32,6 +32,13 @@
     "Thu." : "Štv.",
     "Fri." : "Pia.",
     "Sat." : "Sob.",
+    "Su" : "Ne",
+    "Mo" : "Po",
+    "Tu" : "Ut",
+    "We" : "St",
+    "Th" : "Št",
+    "Fr" : "Pi",
+    "Sa" : "So",
     "January" : "Január",
     "February" : "Február",
     "March" : "Marec",
@@ -226,6 +233,7 @@
     "An internal error occured." : "Vyskytla sa vnútorná chyba.",
     "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.",
     "Log in" : "Prihlásiť sa",
+    "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?",
     "remember" : "zapamätať",
     "Alternative Logins" : "Alternatívne prihlásenie",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
@@ -237,6 +245,7 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte správcu. Ak ste správcom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na konfigurácii, vám môže byť ako správcovi umožnené použitie tlačidla nižšie pre označenie tejto domény ako dôveryhodnej.",
     "Add \"%s\" as trusted domain" : "Pridať \"%s\" ako dôveryhodnú doménu",
+    "%s will be updated to version %s" : "%s bude zaktualizovaný na verziu %s.",
     "The theme %s has been disabled." : "Téma %s bola zakázaná.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
     "Start update" : "Spustiť aktualizáciu",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index cc7633c0623..71ed237f407 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -200,6 +200,7 @@ OC.L10N.register(
     "Search" : "Poišči",
     "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
     "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
+    "Log in" : "Prijava",
     "remember" : "zapomni si",
     "Alternative Logins" : "Druge prijavne možnosti",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index 96945519caa..95e4bf32769 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -198,6 +198,7 @@
     "Search" : "Poišči",
     "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
     "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
+    "Log in" : "Prijava",
     "remember" : "zapomni si",
     "Alternative Logins" : "Druge prijavne možnosti",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index 8e5eda15f06..cc7979d9c49 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -190,6 +190,7 @@ OC.L10N.register(
     "Search" : "Kërko",
     "Server side authentication failed!" : "Verifikimi në krahun e serverit dështoi!",
     "Please contact your administrator." : "Ju lutem kontaktoni administratorin.",
+    "Log in" : "Hyrje",
     "remember" : "kujto",
     "Alternative Logins" : "Hyrje alternative",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Tungjatjeta,<br><br>dëshirojmë t'ju njoftojmë se %s ka ndarë <strong>%s</strong> me ju.<br><a href=\"%s\">Klikoni këtu për ta shikuar!</a><br>",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index 24d73ab8228..ad73a58c172 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -188,6 +188,7 @@
     "Search" : "Kërko",
     "Server side authentication failed!" : "Verifikimi në krahun e serverit dështoi!",
     "Please contact your administrator." : "Ju lutem kontaktoni administratorin.",
+    "Log in" : "Hyrje",
     "remember" : "kujto",
     "Alternative Logins" : "Hyrje alternative",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Tungjatjeta,<br><br>dëshirojmë t'ju njoftojmë se %s ka ndarë <strong>%s</strong> me ju.<br><a href=\"%s\">Klikoni këtu për ta shikuar!</a><br>",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index ac11270c8bf..979da988710 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -233,6 +233,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Контактирајте вашег администратора.",
     "An internal error occured." : "Дошло је до интерне грешке.",
     "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.",
+    "Log in" : "Пријава",
     "remember" : "упамти",
     "Alternative Logins" : "Алтернативне пријаве",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да %s дели <strong>%s</strong> са вама.<br><a href=\"%s\">Погледајте!</a><br><br>",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index ceee884de1b..65dcf74f046 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -231,6 +231,7 @@
     "Please contact your administrator." : "Контактирајте вашег администратора.",
     "An internal error occured." : "Дошло је до интерне грешке.",
     "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.",
+    "Log in" : "Пријава",
     "remember" : "упамти",
     "Alternative Logins" : "Алтернативне пријаве",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да %s дели <strong>%s</strong> са вама.<br><a href=\"%s\">Погледајте!</a><br><br>",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index 5108f16d996..ccaaa7b5214 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -196,6 +196,7 @@ OC.L10N.register(
     "Search" : "Traži",
     "Server side authentication failed!" : "Provera identiteta na stani servera nije uspela!",
     "Please contact your administrator." : "Molimo Vas da kontaktirate Vašeg administratora.",
+    "Log in" : "Prijavi se",
     "remember" : "upamti",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej,<br><br>samo ti javljamo da je %s delio <strong>%s</strong> sa tobom.<br><a href=\"%s\">Pogledaj!</a><br><br>",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index 5bc49c7e58a..9af5f8b6c8a 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -194,6 +194,7 @@
     "Search" : "Traži",
     "Server side authentication failed!" : "Provera identiteta na stani servera nije uspela!",
     "Please contact your administrator." : "Molimo Vas da kontaktirate Vašeg administratora.",
+    "Log in" : "Prijavi se",
     "remember" : "upamti",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej,<br><br>samo ti javljamo da je %s delio <strong>%s</strong> sa tobom.<br><a href=\"%s\">Pogledaj!</a><br><br>",
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
index bae6b156867..7d6eda93467 100644
--- a/core/l10n/ur_PK.js
+++ b/core/l10n/ur_PK.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "Finishing …" : "تکمیل ...",
     "Log out" : "لاگ آؤٹ",
     "Search" : "تلاش",
+    "Log in" : "لاگ ان",
     "remember" : "یاد رکھیں",
     "Alternative Logins" : "متبادل لاگ ان ",
     "Thank you for your patience." : "آپ کے صبر کا شکریہ"
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
index b2166dfa3b1..c1d43ec31e2 100644
--- a/core/l10n/ur_PK.json
+++ b/core/l10n/ur_PK.json
@@ -108,6 +108,7 @@
     "Finishing …" : "تکمیل ...",
     "Log out" : "لاگ آؤٹ",
     "Search" : "تلاش",
+    "Log in" : "لاگ ان",
     "remember" : "یاد رکھیں",
     "Alternative Logins" : "متبادل لاگ ان ",
     "Thank you for your patience." : "آپ کے صبر کا شکریہ"
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index beab7ca0e17..1d2672c9cd9 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -214,6 +214,7 @@ OC.L10N.register(
     "Please contact your administrator." : "請聯絡系統管理員。",
     "An internal error occured." : "發生內部錯誤",
     "Please try again or contact your administrator." : "請重試或聯絡系統管理員",
+    "Log in" : "登入",
     "Wrong password. Reset it?" : "密碼錯誤，重設密碼？",
     "remember" : "記住",
     "Alternative Logins" : "其他登入方法",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index 81af556d8f3..a4e175e1ed2 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -212,6 +212,7 @@
     "Please contact your administrator." : "請聯絡系統管理員。",
     "An internal error occured." : "發生內部錯誤",
     "Please try again or contact your administrator." : "請重試或聯絡系統管理員",
+    "Log in" : "登入",
     "Wrong password. Reset it?" : "密碼錯誤，重設密碼？",
     "remember" : "記住",
     "Alternative Logins" : "其他登入方法",
diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk_SK.js
index ca0beaf334a..49fabed436f 100644
--- a/lib/l10n/sk_SK.js
+++ b/lib/l10n/sk_SK.js
@@ -72,6 +72,7 @@ OC.L10N.register(
     "Set an admin username." : "Zadajte používateľské meno administrátora.",
     "Set an admin password." : "Zadajte heslo administrátora.",
     "Can't create or write into the data directory %s" : "Nemožno vytvoriť alebo zapisovať do priečinka dát %s",
+    "Invalid Federated Cloud ID" : "Neplatné združené Cloud ID",
     "%s shared »%s« with you" : "%s s vami zdieľa »%s«",
     "%s via %s" : "%s cez %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Zdieľanie %s zlyhalo, pretože backend nepodporuje typ zdieľania %i",
diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk_SK.json
index 65334f58988..4eea36cda2f 100644
--- a/lib/l10n/sk_SK.json
+++ b/lib/l10n/sk_SK.json
@@ -70,6 +70,7 @@
     "Set an admin username." : "Zadajte používateľské meno administrátora.",
     "Set an admin password." : "Zadajte heslo administrátora.",
     "Can't create or write into the data directory %s" : "Nemožno vytvoriť alebo zapisovať do priečinka dát %s",
+    "Invalid Federated Cloud ID" : "Neplatné združené Cloud ID",
     "%s shared »%s« with you" : "%s s vami zdieľa »%s«",
     "%s via %s" : "%s cez %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Zdieľanie %s zlyhalo, pretože backend nepodporuje typ zdieľania %i",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index e9dc5c50621..766677af109 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -180,6 +180,7 @@ OC.L10N.register(
     "licensed" : "licencované",
     "Documentation:" : "Dokumentácia:",
     "User documentation" : "Príručka používateľa",
+    "Admin documentation" : "Príručka administrátora",
     "Show description …" : "Zobraziť popis …",
     "Hide description …" : "Skryť popis …",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Túto aplikáciu nemožno nainštalovať, pretože nie sú splnené nasledovné závislosti:",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index c29355482a1..2169885795c 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -178,6 +178,7 @@
     "licensed" : "licencované",
     "Documentation:" : "Dokumentácia:",
     "User documentation" : "Príručka používateľa",
+    "Admin documentation" : "Príručka administrátora",
     "Show description …" : "Zobraziť popis …",
     "Hide description …" : "Skryť popis …",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Túto aplikáciu nemožno nainštalovať, pretože nie sú splnené nasledovné závislosti:",
-- 
GitLab


From 91365a896966cc6571e669f267731c5ca96ca8f0 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 17 Sep 2015 01:57:20 -0400
Subject: [PATCH 385/783] [tx-robot] updated from transifex

---
 apps/files/l10n/da.js               |  2 +-
 apps/files/l10n/da.json             |  2 +-
 apps/files/l10n/pt_PT.js            |  9 +++++++
 apps/files/l10n/pt_PT.json          |  9 +++++++
 apps/files_external/l10n/da.js      | 11 ++++++++
 apps/files_external/l10n/da.json    | 11 ++++++++
 apps/files_external/l10n/nl.js      | 11 ++++++++
 apps/files_external/l10n/nl.json    | 11 ++++++++
 apps/files_external/l10n/pt_BR.js   |  3 +++
 apps/files_external/l10n/pt_BR.json |  3 +++
 apps/files_sharing/l10n/da.js       |  1 +
 apps/files_sharing/l10n/da.json     |  1 +
 apps/files_sharing/l10n/fi_FI.js    |  1 +
 apps/files_sharing/l10n/fi_FI.json  |  1 +
 apps/files_sharing/l10n/it.js       |  1 +
 apps/files_sharing/l10n/it.json     |  1 +
 apps/files_sharing/l10n/nl.js       |  1 +
 apps/files_sharing/l10n/nl.json     |  1 +
 apps/files_sharing/l10n/pt_BR.js    |  1 +
 apps/files_sharing/l10n/pt_BR.json  |  1 +
 apps/files_sharing/l10n/th_TH.js    |  1 +
 apps/files_sharing/l10n/th_TH.json  |  1 +
 apps/user_ldap/l10n/da.js           | 12 ++++-----
 apps/user_ldap/l10n/da.json         | 12 ++++-----
 core/l10n/af_ZA.js                  | 24 ++++++++---------
 core/l10n/af_ZA.json                | 24 ++++++++---------
 core/l10n/ar.js                     | 29 +++++++++-----------
 core/l10n/ar.json                   | 29 +++++++++-----------
 core/l10n/ast.js                    | 30 ++++++++++-----------
 core/l10n/ast.json                  | 30 ++++++++++-----------
 core/l10n/az.js                     |  6 ++---
 core/l10n/az.json                   |  6 ++---
 core/l10n/bg_BG.js                  | 31 ++++++++++------------
 core/l10n/bg_BG.json                | 31 ++++++++++------------
 core/l10n/bn_BD.js                  | 24 ++++++++---------
 core/l10n/bn_BD.json                | 24 ++++++++---------
 core/l10n/bs.js                     | 31 ++++++++++------------
 core/l10n/bs.json                   | 31 ++++++++++------------
 core/l10n/ca.js                     | 39 +++++++++++++--------------
 core/l10n/ca.json                   | 39 +++++++++++++--------------
 core/l10n/cs_CZ.js                  | 39 +++++++++++++--------------
 core/l10n/cs_CZ.json                | 39 +++++++++++++--------------
 core/l10n/cy_GB.js                  | 24 ++++++++---------
 core/l10n/cy_GB.json                | 24 ++++++++---------
 core/l10n/da.js                     | 39 +++++++++++++--------------
 core/l10n/da.json                   | 39 +++++++++++++--------------
 core/l10n/de.js                     | 39 +++++++++++++--------------
 core/l10n/de.json                   | 39 +++++++++++++--------------
 core/l10n/de_AT.js                  |  2 +-
 core/l10n/de_AT.json                |  2 +-
 core/l10n/de_DE.js                  | 39 +++++++++++++--------------
 core/l10n/de_DE.json                | 39 +++++++++++++--------------
 core/l10n/el.js                     | 39 +++++++++++++--------------
 core/l10n/el.json                   | 39 +++++++++++++--------------
 core/l10n/en_GB.js                  | 39 +++++++++++++--------------
 core/l10n/en_GB.json                | 39 +++++++++++++--------------
 core/l10n/eo.js                     | 28 +++++++++-----------
 core/l10n/eo.json                   | 28 +++++++++-----------
 core/l10n/es.js                     | 39 +++++++++++++--------------
 core/l10n/es.json                   | 39 +++++++++++++--------------
 core/l10n/es_AR.js                  | 28 +++++++++-----------
 core/l10n/es_AR.json                | 28 +++++++++-----------
 core/l10n/es_CL.js                  |  2 +-
 core/l10n/es_CL.json                |  2 +-
 core/l10n/es_MX.js                  | 28 +++++++++-----------
 core/l10n/es_MX.json                | 28 +++++++++-----------
 core/l10n/et_EE.js                  | 37 ++++++++++++--------------
 core/l10n/et_EE.json                | 37 ++++++++++++--------------
 core/l10n/eu.js                     | 31 ++++++++++------------
 core/l10n/eu.json                   | 31 ++++++++++------------
 core/l10n/fa.js                     | 28 +++++++++-----------
 core/l10n/fa.json                   | 28 +++++++++-----------
 core/l10n/fi_FI.js                  | 39 +++++++++++++--------------
 core/l10n/fi_FI.json                | 39 +++++++++++++--------------
 core/l10n/fr.js                     | 39 +++++++++++++--------------
 core/l10n/fr.json                   | 39 +++++++++++++--------------
 core/l10n/gl.js                     | 39 +++++++++++++--------------
 core/l10n/gl.json                   | 39 +++++++++++++--------------
 core/l10n/he.js                     | 24 ++++++++---------
 core/l10n/he.json                   | 24 ++++++++---------
 core/l10n/hi.js                     |  6 ++---
 core/l10n/hi.json                   |  6 ++---
 core/l10n/hr.js                     | 31 ++++++++++------------
 core/l10n/hr.json                   | 31 ++++++++++------------
 core/l10n/hu_HU.js                  | 39 +++++++++++++--------------
 core/l10n/hu_HU.json                | 39 +++++++++++++--------------
 core/l10n/ia.js                     | 27 +++++++++----------
 core/l10n/ia.json                   | 27 +++++++++----------
 core/l10n/id.js                     | 39 +++++++++++++--------------
 core/l10n/id.json                   | 39 +++++++++++++--------------
 core/l10n/is.js                     | 39 +++++++++++++--------------
 core/l10n/is.json                   | 39 +++++++++++++--------------
 core/l10n/it.js                     | 39 +++++++++++++--------------
 core/l10n/it.json                   | 39 +++++++++++++--------------
 core/l10n/ja.js                     | 39 +++++++++++++--------------
 core/l10n/ja.json                   | 39 +++++++++++++--------------
 core/l10n/ka_GE.js                  | 26 +++++++++---------
 core/l10n/ka_GE.json                | 26 +++++++++---------
 core/l10n/km.js                     | 21 +++++++--------
 core/l10n/km.json                   | 21 +++++++--------
 core/l10n/kn.js                     | 31 ++++++++++------------
 core/l10n/kn.json                   | 31 ++++++++++------------
 core/l10n/ko.js                     | 39 +++++++++++++--------------
 core/l10n/ko.json                   | 39 +++++++++++++--------------
 core/l10n/ku_IQ.js                  |  2 +-
 core/l10n/ku_IQ.json                |  2 +-
 core/l10n/lb.js                     | 26 +++++++++---------
 core/l10n/lb.json                   | 26 +++++++++---------
 core/l10n/lt_LT.js                  | 28 +++++++++-----------
 core/l10n/lt_LT.json                | 28 +++++++++-----------
 core/l10n/lv.js                     | 24 ++++++++---------
 core/l10n/lv.json                   | 24 ++++++++---------
 core/l10n/mk.js                     | 32 +++++++++++-----------
 core/l10n/mk.json                   | 32 +++++++++++-----------
 core/l10n/mn.js                     |  2 +-
 core/l10n/mn.json                   |  2 +-
 core/l10n/ms_MY.js                  |  2 +-
 core/l10n/ms_MY.json                |  2 +-
 core/l10n/my_MM.js                  |  3 +--
 core/l10n/my_MM.json                |  3 +--
 core/l10n/nb_NO.js                  | 39 +++++++++++++--------------
 core/l10n/nb_NO.json                | 39 +++++++++++++--------------
 core/l10n/nl.js                     | 39 +++++++++++++--------------
 core/l10n/nl.json                   | 39 +++++++++++++--------------
 core/l10n/nn_NO.js                  | 24 ++++++++---------
 core/l10n/nn_NO.json                | 24 ++++++++---------
 core/l10n/oc.js                     | 39 +++++++++++++--------------
 core/l10n/oc.json                   | 39 +++++++++++++--------------
 core/l10n/pa.js                     |  2 +-
 core/l10n/pa.json                   |  2 +-
 core/l10n/pl.js                     | 33 +++++++++++------------
 core/l10n/pl.json                   | 33 +++++++++++------------
 core/l10n/pt_BR.js                  | 39 +++++++++++++--------------
 core/l10n/pt_BR.json                | 39 +++++++++++++--------------
 core/l10n/pt_PT.js                  | 41 +++++++++++++++--------------
 core/l10n/pt_PT.json                | 41 +++++++++++++++--------------
 core/l10n/ro.js                     | 30 ++++++++++-----------
 core/l10n/ro.json                   | 30 ++++++++++-----------
 core/l10n/ru.js                     | 39 +++++++++++++--------------
 core/l10n/ru.json                   | 39 +++++++++++++--------------
 core/l10n/si_LK.js                  | 12 ++++-----
 core/l10n/si_LK.json                | 12 ++++-----
 core/l10n/sk_SK.js                  | 37 ++++++++++++--------------
 core/l10n/sk_SK.json                | 37 ++++++++++++--------------
 core/l10n/sl.js                     | 31 ++++++++++------------
 core/l10n/sl.json                   | 31 ++++++++++------------
 core/l10n/sq.js                     | 31 ++++++++++------------
 core/l10n/sq.json                   | 31 ++++++++++------------
 core/l10n/sr.js                     | 39 +++++++++++++--------------
 core/l10n/sr.json                   | 39 +++++++++++++--------------
 core/l10n/sr@latin.js               | 31 ++++++++++------------
 core/l10n/sr@latin.json             | 31 ++++++++++------------
 core/l10n/sv.js                     | 31 ++++++++++------------
 core/l10n/sv.json                   | 31 ++++++++++------------
 core/l10n/ta_LK.js                  | 18 ++++++-------
 core/l10n/ta_LK.json                | 18 ++++++-------
 core/l10n/te.js                     |  2 +-
 core/l10n/te.json                   |  2 +-
 core/l10n/th_TH.js                  | 39 +++++++++++++--------------
 core/l10n/th_TH.json                | 39 +++++++++++++--------------
 core/l10n/tr.js                     | 39 +++++++++++++--------------
 core/l10n/tr.json                   | 39 +++++++++++++--------------
 core/l10n/ug.js                     |  2 +-
 core/l10n/ug.json                   |  2 +-
 core/l10n/uk.js                     | 39 +++++++++++++--------------
 core/l10n/uk.json                   | 39 +++++++++++++--------------
 core/l10n/ur_PK.js                  | 26 +++++++++---------
 core/l10n/ur_PK.json                | 26 +++++++++---------
 core/l10n/vi.js                     | 26 +++++++++---------
 core/l10n/vi.json                   | 26 +++++++++---------
 core/l10n/zh_CN.js                  | 39 +++++++++++++--------------
 core/l10n/zh_CN.json                | 39 +++++++++++++--------------
 core/l10n/zh_HK.js                  | 15 +++++------
 core/l10n/zh_HK.json                | 15 +++++------
 core/l10n/zh_TW.js                  | 33 +++++++++++------------
 core/l10n/zh_TW.json                | 33 +++++++++++------------
 lib/l10n/tr.js                      |  1 +
 lib/l10n/tr.json                    |  1 +
 settings/l10n/da.js                 |  3 +++
 settings/l10n/da.json               |  3 +++
 settings/l10n/nl.js                 |  2 ++
 settings/l10n/nl.json               |  2 ++
 182 files changed, 2084 insertions(+), 2328 deletions(-)

diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index 7235176c166..cc7aac18351 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -99,7 +99,7 @@ OC.L10N.register(
     "File handling" : "Filhåndtering",
     "Maximum upload size" : "Maksimal upload-størrelse",
     "max. possible: " : "max. mulige: ",
-    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Med PHP-FPM kan denne værdi, kan der gå op til 5 minutter før virkningen indtræffer, efter at der gemmes.",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Med denne PHP-FPM værdi, kan der gå op til 5 minutter før virkningen indtræffer, efter at der gemmes.",
     "Save" : "Gem",
     "Can not be edited from here due to insufficient permissions." : "Kan ikke redigeres herfra på grund af utilstrækkelige rettigheder.",
     "Settings" : "Indstillinger",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index adead6621a2..b77937420f4 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -97,7 +97,7 @@
     "File handling" : "Filhåndtering",
     "Maximum upload size" : "Maksimal upload-størrelse",
     "max. possible: " : "max. mulige: ",
-    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Med PHP-FPM kan denne værdi, kan der gå op til 5 minutter før virkningen indtræffer, efter at der gemmes.",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Med denne PHP-FPM værdi, kan der gå op til 5 minutter før virkningen indtræffer, efter at der gemmes.",
     "Save" : "Gem",
     "Can not be edited from here due to insufficient permissions." : "Kan ikke redigeres herfra på grund af utilstrækkelige rettigheder.",
     "Settings" : "Indstillinger",
diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js
index 32f7dee7d43..92ce9bd6d10 100644
--- a/apps/files/l10n/pt_PT.js
+++ b/apps/files/l10n/pt_PT.js
@@ -41,6 +41,8 @@ OC.L10N.register(
     "Select" : "Selecionar",
     "Pending" : "Pendente",
     "Unable to determine date" : "Impossível determinar a data",
+    "This operation is forbidden" : "Esta operação é proibida",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Esta diretoria está indisponível, por favor, verifique os registos ou contacte o administrador",
     "Error moving file." : "Erro a mover o ficheiro.",
     "Error moving file" : "Erro ao mover o ficheiro",
     "Error" : "Erro",
@@ -61,13 +63,19 @@ OC.L10N.register(
     "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de ficheiro inválido.",
     "File name cannot be empty." : "O nome do ficheiro não pode estar em branco.",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "O armazenamento de {owner} está cheiro. Os ficheiros já não podem ser atualizados ou sincronizados!",
     "Your storage is full, files can not be updated or synced anymore!" : "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "O armazenamento de {owner} está quase cheio ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "O seu armazenamento está quase cheiro ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
+    "Path" : "Caminho",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Assinalado como Favorito",
     "Favorite" : "Favorito",
+    "{newname} already exists" : "{newname} já existe",
     "Upload" : "Enviar",
     "Text file" : "Ficheiro de Texto",
+    "New text file.txt" : "Novo texto ficheiro.txt",
     "Folder" : "Pasta",
     "New folder" : "Nova Pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as tags",
@@ -91,6 +99,7 @@ OC.L10N.register(
     "File handling" : "Manuseamento do ficheiro",
     "Maximum upload size" : "Tamanho máximo de envio",
     "max. possible: " : "Máx. possível: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Com PHP-FPM este valor poderá demorar até 5 minutos para ser aplicado depois de guardar.",
     "Save" : "Guardar",
     "Can not be edited from here due to insufficient permissions." : "Não pode ser editado a partir daqui devido a permissões insuficientes.",
     "Settings" : "Definições",
diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json
index 5c6a8aececa..99718047020 100644
--- a/apps/files/l10n/pt_PT.json
+++ b/apps/files/l10n/pt_PT.json
@@ -39,6 +39,8 @@
     "Select" : "Selecionar",
     "Pending" : "Pendente",
     "Unable to determine date" : "Impossível determinar a data",
+    "This operation is forbidden" : "Esta operação é proibida",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Esta diretoria está indisponível, por favor, verifique os registos ou contacte o administrador",
     "Error moving file." : "Erro a mover o ficheiro.",
     "Error moving file" : "Erro ao mover o ficheiro",
     "Error" : "Erro",
@@ -59,13 +61,19 @@
     "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de ficheiro inválido.",
     "File name cannot be empty." : "O nome do ficheiro não pode estar em branco.",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "O armazenamento de {owner} está cheiro. Os ficheiros já não podem ser atualizados ou sincronizados!",
     "Your storage is full, files can not be updated or synced anymore!" : "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "O armazenamento de {owner} está quase cheio ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "O seu armazenamento está quase cheiro ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
+    "Path" : "Caminho",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Assinalado como Favorito",
     "Favorite" : "Favorito",
+    "{newname} already exists" : "{newname} já existe",
     "Upload" : "Enviar",
     "Text file" : "Ficheiro de Texto",
+    "New text file.txt" : "Novo texto ficheiro.txt",
     "Folder" : "Pasta",
     "New folder" : "Nova Pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as tags",
@@ -89,6 +97,7 @@
     "File handling" : "Manuseamento do ficheiro",
     "Maximum upload size" : "Tamanho máximo de envio",
     "max. possible: " : "Máx. possível: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Com PHP-FPM este valor poderá demorar até 5 minutos para ser aplicado depois de guardar.",
     "Save" : "Guardar",
     "Can not be edited from here due to insufficient permissions." : "Não pode ser editado a partir daqui devido a permissões insuficientes.",
     "Settings" : "Definições",
diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js
index b1f058efbb3..98f020785c9 100644
--- a/apps/files_external/l10n/da.js
+++ b/apps/files_external/l10n/da.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Invalid mount point" : "Fokert monteringspunkt",
     "Objectstore forbidden" : "Objectstore er forbudt",
     "Invalid storage backend \"%s\"" : "Forkert lager til backend \"%s\"en",
+    "Not permitted to use backend \"%s\"" : "Ikke tilladt at bruge backend \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Ikke tilladt at bruge autorisation mekanismen \"%s\"",
     "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre",
     "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme",
     "Personal" : "Personligt",
@@ -41,11 +43,16 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Klient-ID",
     "Client secret" : "Klient hemmelighed",
+    "OpenStack" : "OpenStack",
     "Username" : "Brugernavn",
     "Password" : "Kodeord",
+    "Tenant name" : "Lejernavn",
+    "Identity endpoint URL" : "Identificer afslutnings URL",
+    "Rackspace" : "Hyldeplads",
     "API key" : "API nøgle",
     "Username and password" : "Brugernavn og kodeord",
     "Session credentials" : "Brugeroplysninger for session",
+    "RSA public key" : "RSA offentlig nøgle",
     "Public key" : "Offentlig nøgle",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -68,10 +75,14 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP med det hemmelige nøgle login [DEPRECATED]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Del",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS der bruger OC login [DEPRECATED]",
     "Username as share" : "Brugernavn som deling",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Tjenestenavn",
+    "Request timeout (seconds)" : "Anmodning timeout (sekunder)",
     "<b>Note:</b> " : "<b>Note:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json
index 811de509421..5c7bda17a40 100644
--- a/apps/files_external/l10n/da.json
+++ b/apps/files_external/l10n/da.json
@@ -10,6 +10,8 @@
     "Invalid mount point" : "Fokert monteringspunkt",
     "Objectstore forbidden" : "Objectstore er forbudt",
     "Invalid storage backend \"%s\"" : "Forkert lager til backend \"%s\"en",
+    "Not permitted to use backend \"%s\"" : "Ikke tilladt at bruge backend \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Ikke tilladt at bruge autorisation mekanismen \"%s\"",
     "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre",
     "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme",
     "Personal" : "Personligt",
@@ -39,11 +41,16 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Klient-ID",
     "Client secret" : "Klient hemmelighed",
+    "OpenStack" : "OpenStack",
     "Username" : "Brugernavn",
     "Password" : "Kodeord",
+    "Tenant name" : "Lejernavn",
+    "Identity endpoint URL" : "Identificer afslutnings URL",
+    "Rackspace" : "Hyldeplads",
     "API key" : "API nøgle",
     "Username and password" : "Brugernavn og kodeord",
     "Session credentials" : "Brugeroplysninger for session",
+    "RSA public key" : "RSA offentlig nøgle",
     "Public key" : "Offentlig nøgle",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -66,10 +73,14 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP med det hemmelige nøgle login [DEPRECATED]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Del",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS der bruger OC login [DEPRECATED]",
     "Username as share" : "Brugernavn som deling",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Tjenestenavn",
+    "Request timeout (seconds)" : "Anmodning timeout (sekunder)",
     "<b>Note:</b> " : "<b>Note:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index 1f0c219c51e..8367c64c394 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Invalid mount point" : "Ongeldig aankoppelpunt",
     "Objectstore forbidden" : "Objectopslag verboden",
     "Invalid storage backend \"%s\"" : "Ongeldig opslagsysteem \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Niet toegestaan om \"%s\" te gebruiken",
+    "Not permitted to use authentication mechanism \"%s\"" : "Niet toegestaan om authenticatiemechanisme \"%s\" te gebruiken",
     "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
     "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
     "Personal" : "Persoonlijk",
@@ -41,11 +43,16 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "OpenStack" : "OpenStack",
     "Username" : "Gebruikersnaam",
     "Password" : "Wachtwoord",
+    "Tenant name" : "Naam tenant",
+    "Identity endpoint URL" : "Identiteiten endpoint URL",
+    "Rackspace" : "Rackspace",
     "API key" : "API sleutel",
     "Username and password" : "Gebruikersnaam en wachtwoord",
     "Session credentials" : "Sessie inloggegevens",
+    "RSA public key" : "RSA publieke sleutel",
     "Public key" : "Publieke sleutel",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -68,10 +75,14 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP inlog met geheime sleutel [VEROUDERD]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Share",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS login met OC [VEROUDERD]",
     "Username as share" : "Gebruikersnaam als share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Servicenaam",
+    "Request timeout (seconds)" : "Aanvraag time-out (seconds)",
     "<b>Note:</b> " : "<b>Let op:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index 948845cfa82..0414e7b08c5 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -10,6 +10,8 @@
     "Invalid mount point" : "Ongeldig aankoppelpunt",
     "Objectstore forbidden" : "Objectopslag verboden",
     "Invalid storage backend \"%s\"" : "Ongeldig opslagsysteem \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Niet toegestaan om \"%s\" te gebruiken",
+    "Not permitted to use authentication mechanism \"%s\"" : "Niet toegestaan om authenticatiemechanisme \"%s\" te gebruiken",
     "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
     "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
     "Personal" : "Persoonlijk",
@@ -39,11 +41,16 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Client secret",
+    "OpenStack" : "OpenStack",
     "Username" : "Gebruikersnaam",
     "Password" : "Wachtwoord",
+    "Tenant name" : "Naam tenant",
+    "Identity endpoint URL" : "Identiteiten endpoint URL",
+    "Rackspace" : "Rackspace",
     "API key" : "API sleutel",
     "Username and password" : "Gebruikersnaam en wachtwoord",
     "Session credentials" : "Sessie inloggegevens",
+    "RSA public key" : "RSA publieke sleutel",
     "Public key" : "Publieke sleutel",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -66,10 +73,14 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP inlog met geheime sleutel [VEROUDERD]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Share",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS login met OC [VEROUDERD]",
     "Username as share" : "Gebruikersnaam als share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Servicenaam",
+    "Request timeout (seconds)" : "Aanvraag time-out (seconds)",
     "<b>Note:</b> " : "<b>Let op:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index 13a7aaf700b..9b9d1c49a49 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -43,6 +43,7 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID do Cliente",
     "Client secret" : "Segredo do cliente",
+    "OpenStack" : "OpenStack",
     "Username" : "Nome de Usuário",
     "Password" : "Senha",
     "Tenant name" : "Nome do inquilino",
@@ -74,8 +75,10 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Raiz",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP com chave secreta de login [DEPRECATED]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS usando OC de login [DEPRECATED]",
     "Username as share" : "Nome de usuário como compartilhado",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "Service name" : "Nome do serviço",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index 7de7be7ba3a..a863e6abffb 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -41,6 +41,7 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID do Cliente",
     "Client secret" : "Segredo do cliente",
+    "OpenStack" : "OpenStack",
     "Username" : "Nome de Usuário",
     "Password" : "Senha",
     "Tenant name" : "Nome do inquilino",
@@ -72,8 +73,10 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Raiz",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP com chave secreta de login [DEPRECATED]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS usando OC de login [DEPRECATED]",
     "Username as share" : "Nome de usuário como compartilhado",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "Service name" : "Nome do serviço",
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index 5ce7c1b826a..7b54b361d8d 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
+    "You received %2$s as a remote share from %1$s" : "Du modtog %2$s som en ekstern deling fra %1$s",
     "Accept" : "Acceptér",
     "Decline" : "Afvis",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index 8932ede98c6..f430935e8bc 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
+    "You received %2$s as a remote share from %1$s" : "Du modtog %2$s som en ekstern deling fra %1$s",
     "Accept" : "Acceptér",
     "Decline" : "Afvis",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index bf136274241..060efce51dd 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
+    "You received %2$s as a remote share from %1$s" : "Sait kohteen %2$s etäjakona käyttäjältä %1$s",
     "Accept" : "Hyväksy",
     "Decline" : "Kieltäydy",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index 890336b43f6..091f7aec81f 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
+    "You received %2$s as a remote share from %1$s" : "Sait kohteen %2$s etäjakona käyttäjältä %1$s",
     "Accept" : "Hyväksy",
     "Decline" : "Kieltäydy",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 4f89c2b594b..0167ef4625d 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
+    "You received %2$s as a remote share from %1$s" : "Hai ricevuto %2$s come condivisione remota da %1$s",
     "Accept" : "Accetta",
     "Decline" : "Rifiuta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index 2604caebb61..ae26579572a 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
+    "You received %2$s as a remote share from %1$s" : "Hai ricevuto %2$s come condivisione remota da %1$s",
     "Accept" : "Accetta",
     "Decline" : "Rifiuta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index f83ecee1f64..2ccddb5d9a7 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "You shared %1$s via link" : "U deelde %1$s via link",
     "Shares" : "Gedeeld",
+    "You received %2$s as a remote share from %1$s" : "U ontving %2$s als een externe share van %1$s",
     "Accept" : "Accepteren",
     "Decline" : "Afwijzen",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s",
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index 9309a7b5555..53cd8954898 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "You shared %1$s via link" : "U deelde %1$s via link",
     "Shares" : "Gedeeld",
+    "You received %2$s as a remote share from %1$s" : "U ontving %2$s als een externe share van %1$s",
     "Accept" : "Accepteren",
     "Decline" : "Afwijzen",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s",
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 111954dffda..bb455487186 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
+    "You received %2$s as a remote share from %1$s" : "Você recebeu %2$s como um compartilhamento remoto de %1$s",
     "Accept" : "Aceitar",
     "Decline" : "Rejeitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s",
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 5b56d24eb5b..7db2b1f0494 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
+    "You received %2$s as a remote share from %1$s" : "Você recebeu %2$s como um compartilhamento remoto de %1$s",
     "Accept" : "Aceitar",
     "Decline" : "Rejeitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s",
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
index 2a80f3a22c6..07aa56dfe18 100644
--- a/apps/files_sharing/l10n/th_TH.js
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
+    "You received %2$s as a remote share from %1$s" : "คุณได้รับรีโมทแชร์ %2$s จาก %1$s",
     "Accept" : "ยอมรับ",
     "Decline" : "ลดลง",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s",
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
index b225efb1b1b..3edd0d18ab1 100644
--- a/apps/files_sharing/l10n/th_TH.json
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
+    "You received %2$s as a remote share from %1$s" : "คุณได้รับรีโมทแชร์ %2$s จาก %1$s",
     "Accept" : "ยอมรับ",
     "Decline" : "ลดลง",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s",
diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js
index 2f664ee6c21..7b9222d3abd 100644
--- a/apps/user_ldap/l10n/da.js
+++ b/apps/user_ldap/l10n/da.js
@@ -29,8 +29,8 @@ OC.L10N.register(
     "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Der opstod en fejl. Tjek venligst Base DN, såvel som forbindelsesindstillingerne og brugeroplysningerne.",
     "Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?",
     "Confirm Deletion" : "Bekræft sletning",
-    "Mappings cleared successfully!" : "Kortlægningerne blev ryddet af vejen!",
-    "Error while clearing the mappings." : "Fejl under rydning af kortlægninger.",
+    "Mappings cleared successfully!" : "Tilknytningerne blev ryddet af vejen!",
+    "Error while clearing the mappings." : "Fejl under rydning af tilknytninger.",
     "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonyme bindinger tillades ikke. Angiv venligst et User DN og adgangskode.",
     "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP-driftsfejl. Anonyme bindinger tillades muligvis ikke.",
     "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Lagringen mislykkedes. Sørg venligst for at databasen er i drift. Genindlæs for der fortsættes.",
@@ -39,7 +39,7 @@ OC.L10N.register(
     "Select attributes" : "Vælg attributter",
     "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Bruger blev ikke fundet. Tjek venligst dine login-attributter og brugernavnet. Gældende filter (til kopiér-og-indsæt for validering via kommandolinje): <br/>",
     "User found and settings verified." : "Bruger blev fundetog indstillingerne bekræftet.",
-    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Indstillingerne blev verificieret, men én bruger blev fundet. Det er blot den første, der vil kunne logge ind. Overvej et mere begrænset filter.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Indstillingerne blev verificieret, men én bruger blev fundet. Kun den første, vil kunne logge ind. Overvej et mere begrænset filter.",
     "An unspecified error occurred. Please check the settings and the log." : "Der opstod en uspecificeret fejl. Tjek venligst indstillingerne og loggen.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Søgefilteret er ugyldigt - sandsynligvis på grund af problemer med syntaksen, såsom et ulige antal åbne og lukkede parenteser. Gennemse venligst. ",
     "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Der opstod en forbindelsesfejl til LDAP/AD - tjek venligst vært, port og brugeroplysninger.",
@@ -75,11 +75,11 @@ OC.L10N.register(
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer dét filter der anvendes, når der er forsøg på at logge ind. %%uuid erstattter brugernavnet i login-handlingen. Eksempel: \"uid=%%uuid\"",
     "Test Loginname" : "Test loginnavn",
-    "Verify settings" : "Verificér indstillinger",
+    "Verify settings" : "Kontrollér indstillinger",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
     "Add a new and blank configuration" : "Tilføj en ny og tom konfiguration",
-    "Copy current configuration into new directory binding" : "Kopiér nuværende konfiguration ind i en ny mappetildeling",
+    "Copy current configuration into new directory binding" : "Kopiér nuværende konfiguration ind i en ny mappetilknytning",
     "Delete the current configuration" : "Slet den aktuelle konfiguration",
     "Host" : "Vært",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
@@ -98,7 +98,7 @@ OC.L10N.register(
     "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
     "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "De fleste gængse objektklasser for brugere er organizationalPerson, person, user og inetOrgPerson. Hvis du ikker er sikker på hvilken objektklasse, der skal vælges, så tal med administratoren af dit katalog.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.",
-    "Verify settings and count users" : "Verificér indstillinger og optalte brugere",
+    "Verify settings and count users" : "Kontrollér indstillinger og optalte brugere",
     "Saving" : "Gemmer",
     "Back" : "Tilbage",
     "Continue" : "Videre",
diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json
index 5de47b4abcb..5c0c3ad1d0c 100644
--- a/apps/user_ldap/l10n/da.json
+++ b/apps/user_ldap/l10n/da.json
@@ -27,8 +27,8 @@
     "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Der opstod en fejl. Tjek venligst Base DN, såvel som forbindelsesindstillingerne og brugeroplysningerne.",
     "Do you really want to delete the current Server Configuration?" : "Ønsker du virkelig at slette den nuværende Server Konfiguration?",
     "Confirm Deletion" : "Bekræft sletning",
-    "Mappings cleared successfully!" : "Kortlægningerne blev ryddet af vejen!",
-    "Error while clearing the mappings." : "Fejl under rydning af kortlægninger.",
+    "Mappings cleared successfully!" : "Tilknytningerne blev ryddet af vejen!",
+    "Error while clearing the mappings." : "Fejl under rydning af tilknytninger.",
     "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonyme bindinger tillades ikke. Angiv venligst et User DN og adgangskode.",
     "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP-driftsfejl. Anonyme bindinger tillades muligvis ikke.",
     "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Lagringen mislykkedes. Sørg venligst for at databasen er i drift. Genindlæs for der fortsættes.",
@@ -37,7 +37,7 @@
     "Select attributes" : "Vælg attributter",
     "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Bruger blev ikke fundet. Tjek venligst dine login-attributter og brugernavnet. Gældende filter (til kopiér-og-indsæt for validering via kommandolinje): <br/>",
     "User found and settings verified." : "Bruger blev fundetog indstillingerne bekræftet.",
-    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Indstillingerne blev verificieret, men én bruger blev fundet. Det er blot den første, der vil kunne logge ind. Overvej et mere begrænset filter.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Indstillingerne blev verificieret, men én bruger blev fundet. Kun den første, vil kunne logge ind. Overvej et mere begrænset filter.",
     "An unspecified error occurred. Please check the settings and the log." : "Der opstod en uspecificeret fejl. Tjek venligst indstillingerne og loggen.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Søgefilteret er ugyldigt - sandsynligvis på grund af problemer med syntaksen, såsom et ulige antal åbne og lukkede parenteser. Gennemse venligst. ",
     "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Der opstod en forbindelsesfejl til LDAP/AD - tjek venligst vært, port og brugeroplysninger.",
@@ -73,11 +73,11 @@
     "Other Attributes:" : "Andre attributter:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definerer dét filter der anvendes, når der er forsøg på at logge ind. %%uuid erstattter brugernavnet i login-handlingen. Eksempel: \"uid=%%uuid\"",
     "Test Loginname" : "Test loginnavn",
-    "Verify settings" : "Verificér indstillinger",
+    "Verify settings" : "Kontrollér indstillinger",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
     "Add a new and blank configuration" : "Tilføj en ny og tom konfiguration",
-    "Copy current configuration into new directory binding" : "Kopiér nuværende konfiguration ind i en ny mappetildeling",
+    "Copy current configuration into new directory binding" : "Kopiér nuværende konfiguration ind i en ny mappetilknytning",
     "Delete the current configuration" : "Slet den aktuelle konfiguration",
     "Host" : "Vært",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://",
@@ -96,7 +96,7 @@
     "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
     "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "De fleste gængse objektklasser for brugere er organizationalPerson, person, user og inetOrgPerson. Hvis du ikker er sikker på hvilken objektklasse, der skal vælges, så tal med administratoren af dit katalog.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.",
-    "Verify settings and count users" : "Verificér indstillinger og optalte brugere",
+    "Verify settings and count users" : "Kontrollér indstillinger og optalte brugere",
     "Saving" : "Gemmer",
     "Back" : "Tilbage",
     "Continue" : "Videre",
diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
index a6f0448d1a5..6bc1ed26add 100644
--- a/core/l10n/af_ZA.js
+++ b/core/l10n/af_ZA.js
@@ -60,28 +60,26 @@ OC.L10N.register(
     "Error while sharing" : "Deel veroorsaak fout",
     "Error while unsharing" : "Deel terugneem veroorsaak fout",
     "Error while changing permissions" : "Fout met verandering van regte",
-    "Shared with you and the group {group} by {owner}" : "Met jou en die groep {group} gedeel deur {owner}",
-    "Shared with you by {owner}" : "Met jou gedeel deur {owner}",
-    "Share" : "Deel",
+    "Error setting expiration date" : "Fout met opstel van verval datum",
+    "Set expiration date" : "Stel verval datum",
+    "Expiration date" : "Verval datum",
+    "Sending ..." : "Stuur ...",
+    "Email sent" : "E-pos gestuur",
+    "Resharing is not allowed" : "Herdeling is nie toegelaat nie ",
     "Password protect" : "Beskerm met Wagwoord",
     "Password" : "Wagwoord",
     "Email link to person" : "E-pos aan persoon",
     "Send" : "Stuur",
-    "Set expiration date" : "Stel verval datum",
-    "Expiration date" : "Verval datum",
-    "group" : "groep",
-    "Resharing is not allowed" : "Herdeling is nie toegelaat nie ",
+    "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}",
     "Shared in {item} with {user}" : "Gedeel in {item} met {user}",
+    "group" : "groep",
     "Unshare" : "Deel terug neem",
     "can edit" : "kan wysig",
-    "access control" : "toegang beheer",
     "create" : "skep",
     "delete" : "uitvee",
-    "Password protected" : "Beskerm met wagwoord",
-    "Error unsetting expiration date" : "Fout met skrapping van verval datum",
-    "Error setting expiration date" : "Fout met opstel van verval datum",
-    "Sending ..." : "Stuur ...",
-    "Email sent" : "E-pos gestuur",
+    "access control" : "toegang beheer",
+    "Share" : "Deel",
     "Warning" : "Waarskuwing",
     "The object type is not specified." : "Hierdie objek tipe is nie gespesifiseer nie.",
     "Add" : "Voeg by",
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
index d5b747b5a32..b8e7eb39b43 100644
--- a/core/l10n/af_ZA.json
+++ b/core/l10n/af_ZA.json
@@ -58,28 +58,26 @@
     "Error while sharing" : "Deel veroorsaak fout",
     "Error while unsharing" : "Deel terugneem veroorsaak fout",
     "Error while changing permissions" : "Fout met verandering van regte",
-    "Shared with you and the group {group} by {owner}" : "Met jou en die groep {group} gedeel deur {owner}",
-    "Shared with you by {owner}" : "Met jou gedeel deur {owner}",
-    "Share" : "Deel",
+    "Error setting expiration date" : "Fout met opstel van verval datum",
+    "Set expiration date" : "Stel verval datum",
+    "Expiration date" : "Verval datum",
+    "Sending ..." : "Stuur ...",
+    "Email sent" : "E-pos gestuur",
+    "Resharing is not allowed" : "Herdeling is nie toegelaat nie ",
     "Password protect" : "Beskerm met Wagwoord",
     "Password" : "Wagwoord",
     "Email link to person" : "E-pos aan persoon",
     "Send" : "Stuur",
-    "Set expiration date" : "Stel verval datum",
-    "Expiration date" : "Verval datum",
-    "group" : "groep",
-    "Resharing is not allowed" : "Herdeling is nie toegelaat nie ",
+    "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}",
     "Shared in {item} with {user}" : "Gedeel in {item} met {user}",
+    "group" : "groep",
     "Unshare" : "Deel terug neem",
     "can edit" : "kan wysig",
-    "access control" : "toegang beheer",
     "create" : "skep",
     "delete" : "uitvee",
-    "Password protected" : "Beskerm met wagwoord",
-    "Error unsetting expiration date" : "Fout met skrapping van verval datum",
-    "Error setting expiration date" : "Fout met opstel van verval datum",
-    "Sending ..." : "Stuur ...",
-    "Email sent" : "E-pos gestuur",
+    "access control" : "toegang beheer",
+    "Share" : "Deel",
     "Warning" : "Waarskuwing",
     "The object type is not specified." : "Hierdie objek tipe is nie gespesifiseer nie.",
     "Add" : "Voeg by",
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index 259862db32c..a0ef7db8521 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -68,9 +68,13 @@ OC.L10N.register(
     "Error while sharing" : "حصل خطأ عند عملية المشاركة",
     "Error while unsharing" : "حصل خطأ عند عملية إزالة المشاركة",
     "Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
-    "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
-    "Shared with you by {owner}" : "شورك معك من قبل {owner}",
-    "Share" : "شارك",
+    "Error setting expiration date" : "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
+    "Set expiration date" : "تعيين تاريخ إنتهاء الصلاحية",
+    "Expiration" : "إنتهاء",
+    "Expiration date" : "تاريخ إنتهاء الصلاحية",
+    "Sending ..." : "جاري الارسال ...",
+    "Email sent" : "تم ارسال البريد الالكتروني",
+    "Resharing is not allowed" : "لا يسمح بعملية إعادة المشاركة",
     "Share link" : "شارك الرابط",
     "Link" : "الرابط",
     "Password protect" : "حماية كلمة السر",
@@ -79,27 +83,20 @@ OC.L10N.register(
     "Allow editing" : "السماح بالتعديلات",
     "Email link to person" : "ارسل الرابط بالبريد الى صديق",
     "Send" : "أرسل",
-    "Set expiration date" : "تعيين تاريخ إنتهاء الصلاحية",
-    "Expiration" : "إنتهاء",
-    "Expiration date" : "تاريخ إنتهاء الصلاحية",
-    "Adding user..." : "إضافة مستخدم",
+    "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
+    "Shared with you by {owner}" : "شورك معك من قبل {owner}",
+    "Shared in {item} with {user}" : "شورك في {item} مع {user}",
     "group" : "مجموعة",
     "remote" : "عن بعد",
-    "Resharing is not allowed" : "لا يسمح بعملية إعادة المشاركة",
-    "Shared in {item} with {user}" : "شورك في {item} مع {user}",
-    "Unshare" : "إلغاء مشاركة",
     "notify by email" : "الإشعار عن طريق البريد",
+    "Unshare" : "إلغاء مشاركة",
     "can share" : "يمكن المشاركة",
     "can edit" : "التحرير مسموح",
-    "access control" : "ضبط الوصول",
     "create" : "إنشاء",
     "change" : "تغيير",
     "delete" : "حذف",
-    "Password protected" : "محمي بكلمة السر",
-    "Error unsetting expiration date" : "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
-    "Error setting expiration date" : "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
-    "Sending ..." : "جاري الارسال ...",
-    "Email sent" : "تم ارسال البريد الالكتروني",
+    "access control" : "ضبط الوصول",
+    "Share" : "شارك",
     "Warning" : "تحذير",
     "The object type is not specified." : "نوع العنصر غير محدد.",
     "Enter new" : "إدخال جديد",
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index 3b07b0c4253..5ac8003fb4c 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -66,9 +66,13 @@
     "Error while sharing" : "حصل خطأ عند عملية المشاركة",
     "Error while unsharing" : "حصل خطأ عند عملية إزالة المشاركة",
     "Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
-    "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
-    "Shared with you by {owner}" : "شورك معك من قبل {owner}",
-    "Share" : "شارك",
+    "Error setting expiration date" : "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
+    "Set expiration date" : "تعيين تاريخ إنتهاء الصلاحية",
+    "Expiration" : "إنتهاء",
+    "Expiration date" : "تاريخ إنتهاء الصلاحية",
+    "Sending ..." : "جاري الارسال ...",
+    "Email sent" : "تم ارسال البريد الالكتروني",
+    "Resharing is not allowed" : "لا يسمح بعملية إعادة المشاركة",
     "Share link" : "شارك الرابط",
     "Link" : "الرابط",
     "Password protect" : "حماية كلمة السر",
@@ -77,27 +81,20 @@
     "Allow editing" : "السماح بالتعديلات",
     "Email link to person" : "ارسل الرابط بالبريد الى صديق",
     "Send" : "أرسل",
-    "Set expiration date" : "تعيين تاريخ إنتهاء الصلاحية",
-    "Expiration" : "إنتهاء",
-    "Expiration date" : "تاريخ إنتهاء الصلاحية",
-    "Adding user..." : "إضافة مستخدم",
+    "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
+    "Shared with you by {owner}" : "شورك معك من قبل {owner}",
+    "Shared in {item} with {user}" : "شورك في {item} مع {user}",
     "group" : "مجموعة",
     "remote" : "عن بعد",
-    "Resharing is not allowed" : "لا يسمح بعملية إعادة المشاركة",
-    "Shared in {item} with {user}" : "شورك في {item} مع {user}",
-    "Unshare" : "إلغاء مشاركة",
     "notify by email" : "الإشعار عن طريق البريد",
+    "Unshare" : "إلغاء مشاركة",
     "can share" : "يمكن المشاركة",
     "can edit" : "التحرير مسموح",
-    "access control" : "ضبط الوصول",
     "create" : "إنشاء",
     "change" : "تغيير",
     "delete" : "حذف",
-    "Password protected" : "محمي بكلمة السر",
-    "Error unsetting expiration date" : "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
-    "Error setting expiration date" : "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
-    "Sending ..." : "جاري الارسال ...",
-    "Email sent" : "تم ارسال البريد الالكتروني",
+    "access control" : "ضبط الوصول",
+    "Share" : "شارك",
     "Warning" : "تحذير",
     "The object type is not specified." : "نوع العنصر غير محدد.",
     "Enter new" : "إدخال جديد",
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index 31040d38b7b..1e02a7ca37c 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -86,34 +86,32 @@ OC.L10N.register(
     "Error while sharing" : "Fallu mientres la compartición",
     "Error while unsharing" : "Fallu mientres se dexaba de compartir",
     "Error while changing permissions" : "Fallu mientres camudaben los permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
-    "Shared with you by {owner}" : "Compartíu contigo por {owner}",
-    "Share" : "Compartir",
-    "Share link" : "Compartir enllaz",
+    "Error setting expiration date" : "Fallu afitando la fecha de caducidá",
     "The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
+    "Set expiration date" : "Afitar la data de caducidá",
+    "Expiration" : "Caducidá",
+    "Expiration date" : "Data de caducidá",
+    "Sending ..." : "Unviando ...",
+    "Email sent" : "Corréu unviáu",
+    "Resharing is not allowed" : "Recompartir nun ta permitíu",
+    "Share link" : "Compartir enllaz",
     "Password protect" : "Protexer con contraseña",
     "Password" : "Contraseña",
     "Choose a password for the public link" : "Escueyi una contraseña pal enllaz públicu",
     "Email link to person" : "Enllaz de corréu-e a la persona",
     "Send" : "Unviar",
-    "Set expiration date" : "Afitar la data de caducidá",
-    "Expiration" : "Caducidá",
-    "Expiration date" : "Data de caducidá",
-    "group" : "grupu",
-    "Resharing is not allowed" : "Recompartir nun ta permitíu",
+    "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}",
     "Shared in {item} with {user}" : "Compartíu en {item} con {user}",
-    "Unshare" : "Dexar de compartir",
+    "group" : "grupu",
     "notify by email" : "notificar per corréu",
+    "Unshare" : "Dexar de compartir",
     "can share" : "pue compartir",
     "can edit" : "pue editar",
-    "access control" : "control d'accesu",
     "create" : "crear",
     "delete" : "desaniciar",
-    "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",
+    "access control" : "control d'accesu",
+    "Share" : "Compartir",
     "Warning" : "Avisu",
     "The object type is not specified." : "El tipu d'oxetu nun ta especificáu.",
     "Enter new" : "Introducir nueva",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index 0d2abbfef0b..636960d6496 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -84,34 +84,32 @@
     "Error while sharing" : "Fallu mientres la compartición",
     "Error while unsharing" : "Fallu mientres se dexaba de compartir",
     "Error while changing permissions" : "Fallu mientres camudaben los permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
-    "Shared with you by {owner}" : "Compartíu contigo por {owner}",
-    "Share" : "Compartir",
-    "Share link" : "Compartir enllaz",
+    "Error setting expiration date" : "Fallu afitando la fecha de caducidá",
     "The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
+    "Set expiration date" : "Afitar la data de caducidá",
+    "Expiration" : "Caducidá",
+    "Expiration date" : "Data de caducidá",
+    "Sending ..." : "Unviando ...",
+    "Email sent" : "Corréu unviáu",
+    "Resharing is not allowed" : "Recompartir nun ta permitíu",
+    "Share link" : "Compartir enllaz",
     "Password protect" : "Protexer con contraseña",
     "Password" : "Contraseña",
     "Choose a password for the public link" : "Escueyi una contraseña pal enllaz públicu",
     "Email link to person" : "Enllaz de corréu-e a la persona",
     "Send" : "Unviar",
-    "Set expiration date" : "Afitar la data de caducidá",
-    "Expiration" : "Caducidá",
-    "Expiration date" : "Data de caducidá",
-    "group" : "grupu",
-    "Resharing is not allowed" : "Recompartir nun ta permitíu",
+    "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}",
     "Shared in {item} with {user}" : "Compartíu en {item} con {user}",
-    "Unshare" : "Dexar de compartir",
+    "group" : "grupu",
     "notify by email" : "notificar per corréu",
+    "Unshare" : "Dexar de compartir",
     "can share" : "pue compartir",
     "can edit" : "pue editar",
-    "access control" : "control d'accesu",
     "create" : "crear",
     "delete" : "desaniciar",
-    "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",
+    "access control" : "control d'accesu",
+    "Share" : "Compartir",
     "Warning" : "Avisu",
     "The object type is not specified." : "El tipu d'oxetu nun ta especificáu.",
     "Enter new" : "Introducir nueva",
diff --git a/core/l10n/az.js b/core/l10n/az.js
index e94203c372c..647c1f3c273 100644
--- a/core/l10n/az.js
+++ b/core/l10n/az.js
@@ -60,17 +60,17 @@ OC.L10N.register(
     "Good password" : "Yaxşı şifrə",
     "Strong password" : "Çətin şifrə",
     "Error" : "Səhv",
-    "Share" : "Yayımla",
+    "Expiration" : "Vaxtın bitməsi",
+    "Email sent" : "Məktub göndərildi",
     "Share link" : "Linki yayımla",
     "Password" : "Şifrə",
     "Send" : "Göndər",
-    "Expiration" : "Vaxtın bitməsi",
     "group" : "qrup",
     "Unshare" : "Paylaşımı durdur",
     "can share" : "yayımlaya bilərsiniz",
     "can edit" : "dəyişmək olar",
     "delete" : "sil",
-    "Email sent" : "Məktub göndərildi",
+    "Share" : "Yayımla",
     "Warning" : "Xəbərdarlıq",
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
diff --git a/core/l10n/az.json b/core/l10n/az.json
index 8dc93029ed1..a49a9528230 100644
--- a/core/l10n/az.json
+++ b/core/l10n/az.json
@@ -58,17 +58,17 @@
     "Good password" : "Yaxşı şifrə",
     "Strong password" : "Çətin şifrə",
     "Error" : "Səhv",
-    "Share" : "Yayımla",
+    "Expiration" : "Vaxtın bitməsi",
+    "Email sent" : "Məktub göndərildi",
     "Share link" : "Linki yayımla",
     "Password" : "Şifrə",
     "Send" : "Göndər",
-    "Expiration" : "Vaxtın bitməsi",
     "group" : "qrup",
     "Unshare" : "Paylaşımı durdur",
     "can share" : "yayımlaya bilərsiniz",
     "can edit" : "dəyişmək olar",
     "delete" : "sil",
-    "Email sent" : "Məktub göndərildi",
+    "Share" : "Yayımla",
     "Warning" : "Xəbərdarlıq",
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
index e7914ca5714..dd8610428f2 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -95,11 +95,15 @@ OC.L10N.register(
     "Error while sharing" : "Грешка при споделяне",
     "Error while unsharing" : "Грешка при премахване на споделянето",
     "Error while changing permissions" : "Грешка при промяна на привилегиите",
-    "Shared with you and the group {group} by {owner}" : "Споделено от {owner} с Вас и групата {group} .",
-    "Shared with you by {owner}" : "Споделено с Вас от {owner}.",
-    "Share" : "Споделяне",
-    "Share link" : "Връзка за споделяне",
+    "Error setting expiration date" : "Грешка при настройване на датата за изтичане",
     "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дни след създаването ѝ.",
+    "Set expiration date" : "Задаване на дата на изтичане",
+    "Expiration" : "Изтичане",
+    "Expiration date" : "Дата на изтичане",
+    "Sending ..." : "Изпращане ...",
+    "Email sent" : "Електронната поща е изпратена",
+    "Resharing is not allowed" : "Повторно споделяне не е разрешено.",
+    "Share link" : "Връзка за споделяне",
     "Link" : "Връзка",
     "Password protect" : "Защитено с парола",
     "Password" : "Парола",
@@ -107,27 +111,20 @@ OC.L10N.register(
     "Allow editing" : "Позволяване на редактиране",
     "Email link to person" : "Имейл връзка към човек",
     "Send" : "Изпращане",
-    "Set expiration date" : "Задаване на дата на изтичане",
-    "Expiration" : "Изтичане",
-    "Expiration date" : "Дата на изтичане",
-    "Adding user..." : "Добавяне на потребител...",
+    "Shared with you and the group {group} by {owner}" : "Споделено от {owner} с Вас и групата {group} .",
+    "Shared with you by {owner}" : "Споделено с Вас от {owner}.",
+    "Shared in {item} with {user}" : "Споделено в {item} с {user}.",
     "group" : "група",
     "remote" : "отдалечен",
-    "Resharing is not allowed" : "Повторно споделяне не е разрешено.",
-    "Shared in {item} with {user}" : "Споделено в {item} с {user}.",
-    "Unshare" : "Премахване на споделяне",
     "notify by email" : "уведомяване по електронна поща",
+    "Unshare" : "Премахване на споделяне",
     "can share" : "може да споделя",
     "can edit" : "може да променя",
-    "access control" : "контрол на достъпа",
     "create" : "създаване",
     "change" : "промяна",
     "delete" : "изтриване",
-    "Password protected" : "Защитено с парола",
-    "Error unsetting expiration date" : "Грешка при премахване на дата на изтичане",
-    "Error setting expiration date" : "Грешка при настройване на датата за изтичане",
-    "Sending ..." : "Изпращане ...",
-    "Email sent" : "Електронната поща е изпратена",
+    "access control" : "контрол на достъпа",
+    "Share" : "Споделяне",
     "Warning" : "Предупреждение",
     "The object type is not specified." : "Видът на обекта не е избран.",
     "Enter new" : "Въвеждане на нов",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index 271cb44435b..91a9704f7ef 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -93,11 +93,15 @@
     "Error while sharing" : "Грешка при споделяне",
     "Error while unsharing" : "Грешка при премахване на споделянето",
     "Error while changing permissions" : "Грешка при промяна на привилегиите",
-    "Shared with you and the group {group} by {owner}" : "Споделено от {owner} с Вас и групата {group} .",
-    "Shared with you by {owner}" : "Споделено с Вас от {owner}.",
-    "Share" : "Споделяне",
-    "Share link" : "Връзка за споделяне",
+    "Error setting expiration date" : "Грешка при настройване на датата за изтичане",
     "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дни след създаването ѝ.",
+    "Set expiration date" : "Задаване на дата на изтичане",
+    "Expiration" : "Изтичане",
+    "Expiration date" : "Дата на изтичане",
+    "Sending ..." : "Изпращане ...",
+    "Email sent" : "Електронната поща е изпратена",
+    "Resharing is not allowed" : "Повторно споделяне не е разрешено.",
+    "Share link" : "Връзка за споделяне",
     "Link" : "Връзка",
     "Password protect" : "Защитено с парола",
     "Password" : "Парола",
@@ -105,27 +109,20 @@
     "Allow editing" : "Позволяване на редактиране",
     "Email link to person" : "Имейл връзка към човек",
     "Send" : "Изпращане",
-    "Set expiration date" : "Задаване на дата на изтичане",
-    "Expiration" : "Изтичане",
-    "Expiration date" : "Дата на изтичане",
-    "Adding user..." : "Добавяне на потребител...",
+    "Shared with you and the group {group} by {owner}" : "Споделено от {owner} с Вас и групата {group} .",
+    "Shared with you by {owner}" : "Споделено с Вас от {owner}.",
+    "Shared in {item} with {user}" : "Споделено в {item} с {user}.",
     "group" : "група",
     "remote" : "отдалечен",
-    "Resharing is not allowed" : "Повторно споделяне не е разрешено.",
-    "Shared in {item} with {user}" : "Споделено в {item} с {user}.",
-    "Unshare" : "Премахване на споделяне",
     "notify by email" : "уведомяване по електронна поща",
+    "Unshare" : "Премахване на споделяне",
     "can share" : "може да споделя",
     "can edit" : "може да променя",
-    "access control" : "контрол на достъпа",
     "create" : "създаване",
     "change" : "промяна",
     "delete" : "изтриване",
-    "Password protected" : "Защитено с парола",
-    "Error unsetting expiration date" : "Грешка при премахване на дата на изтичане",
-    "Error setting expiration date" : "Грешка при настройване на датата за изтичане",
-    "Sending ..." : "Изпращане ...",
-    "Email sent" : "Електронната поща е изпратена",
+    "access control" : "контрол на достъпа",
+    "Share" : "Споделяне",
     "Warning" : "Предупреждение",
     "The object type is not specified." : "Видът на обекта не е избран.",
     "Enter new" : "Въвеждане на нов",
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
index 9d799938cb1..98eb0da6414 100644
--- a/core/l10n/bn_BD.js
+++ b/core/l10n/bn_BD.js
@@ -65,30 +65,28 @@ OC.L10N.register(
     "Error while sharing" : "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
     "Error while unsharing" : "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
     "Error while changing permissions" : "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
-    "Shared with you and the group {group} by {owner}" : "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
-    "Shared with you by {owner}" : "{owner} আপনার সাথে ভাগাভাগি করেছেন",
-    "Share" : "ভাগাভাগি কর",
+    "Error setting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
+    "Set expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
+    "Expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
+    "Sending ..." : "পাঠানো হচ্ছে......",
+    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "Resharing is not allowed" : "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
     "Share link" : "লিংক ভাগাভাগি করেন",
     "Password protect" : "কূটশব্দ সুরক্ষিত",
     "Password" : "কূটশব্দ",
     "Email link to person" : "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
     "Send" : "পাঠাও",
-    "Set expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
-    "Expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
-    "group" : "দল",
-    "Resharing is not allowed" : "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
+    "Shared with you and the group {group} by {owner}" : "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
+    "Shared with you by {owner}" : "{owner} আপনার সাথে ভাগাভাগি করেছেন",
     "Shared in {item} with {user}" : "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
+    "group" : "দল",
     "Unshare" : "ভাগাভাগি বাতিল ",
     "can share" : "ভাগাভাগি করেত পারেন",
     "can edit" : "সম্পাদনা করতে পারবেন",
-    "access control" : "অধিগম্যতা নিয়ন্ত্রণ",
     "create" : "তৈরী করুন",
     "delete" : "মুছে ফেল",
-    "Password protected" : "কূটশব্দদ্বারা সুরক্ষিত",
-    "Error unsetting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে",
-    "Error setting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
-    "Sending ..." : "পাঠানো হচ্ছে......",
-    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "access control" : "অধিগম্যতা নিয়ন্ত্রণ",
+    "Share" : "ভাগাভাগি কর",
     "Warning" : "সতর্কবাণী",
     "The object type is not specified." : "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
     "Enter new" : "নতুন লিখুন",
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
index 784c6333526..f1f2cf05ca3 100644
--- a/core/l10n/bn_BD.json
+++ b/core/l10n/bn_BD.json
@@ -63,30 +63,28 @@
     "Error while sharing" : "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
     "Error while unsharing" : "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
     "Error while changing permissions" : "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
-    "Shared with you and the group {group} by {owner}" : "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
-    "Shared with you by {owner}" : "{owner} আপনার সাথে ভাগাভাগি করেছেন",
-    "Share" : "ভাগাভাগি কর",
+    "Error setting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
+    "Set expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
+    "Expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
+    "Sending ..." : "পাঠানো হচ্ছে......",
+    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "Resharing is not allowed" : "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
     "Share link" : "লিংক ভাগাভাগি করেন",
     "Password protect" : "কূটশব্দ সুরক্ষিত",
     "Password" : "কূটশব্দ",
     "Email link to person" : "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
     "Send" : "পাঠাও",
-    "Set expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
-    "Expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
-    "group" : "দল",
-    "Resharing is not allowed" : "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
+    "Shared with you and the group {group} by {owner}" : "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
+    "Shared with you by {owner}" : "{owner} আপনার সাথে ভাগাভাগি করেছেন",
     "Shared in {item} with {user}" : "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
+    "group" : "দল",
     "Unshare" : "ভাগাভাগি বাতিল ",
     "can share" : "ভাগাভাগি করেত পারেন",
     "can edit" : "সম্পাদনা করতে পারবেন",
-    "access control" : "অধিগম্যতা নিয়ন্ত্রণ",
     "create" : "তৈরী করুন",
     "delete" : "মুছে ফেল",
-    "Password protected" : "কূটশব্দদ্বারা সুরক্ষিত",
-    "Error unsetting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে",
-    "Error setting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
-    "Sending ..." : "পাঠানো হচ্ছে......",
-    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "access control" : "অধিগম্যতা নিয়ন্ত্রণ",
+    "Share" : "ভাগাভাগি কর",
     "Warning" : "সতর্কবাণী",
     "The object type is not specified." : "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
     "Enter new" : "নতুন লিখুন",
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
index a9f438f769e..8948dba8ccf 100644
--- a/core/l10n/bs.js
+++ b/core/l10n/bs.js
@@ -86,11 +86,15 @@ OC.L10N.register(
     "Error while sharing" : "Greška pri dijeljenju",
     "Error while unsharing" : "Ggreška pri prestanku dijeljenja",
     "Error while changing permissions" : "Greška pri mijenjanju dozvola",
-    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
-    "Shared with you by {owner}" : "Podijeljeno sa vama od {owner}",
-    "Share" : "Podijeli",
-    "Share link" : "Podijelite vezu",
+    "Error setting expiration date" : "Pogrešno postavljanje datuma isteka",
     "The public link will expire no later than {days} days after it is created" : "Javna veza ističe najkasnije {days} dana nakon što je kreirana",
+    "Set expiration date" : "Postavite datum isteka",
+    "Expiration" : "Istek",
+    "Expiration date" : "Datum isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "E-pošta poslana",
+    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
+    "Share link" : "Podijelite vezu",
     "Link" : "Veza",
     "Password protect" : "Zaštitita lozinkom",
     "Password" : "Lozinka",
@@ -98,27 +102,20 @@ OC.L10N.register(
     "Allow editing" : "Dozvolite izmjenu",
     "Email link to person" : "Pošaljite osobi vezu e-poštom",
     "Send" : "Pošalji",
-    "Set expiration date" : "Postavite datum isteka",
-    "Expiration" : "Istek",
-    "Expiration date" : "Datum isteka",
-    "Adding user..." : "Dodavanje korisnika...",
+    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
+    "Shared with you by {owner}" : "Podijeljeno sa vama od {owner}",
+    "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
     "group" : "grupa",
     "remote" : "daljinski",
-    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
-    "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
-    "Unshare" : "Prestani dijeliti",
     "notify by email" : "Obavijesti e-poštom",
+    "Unshare" : "Prestani dijeliti",
     "can share" : "može dijeliti",
     "can edit" : "moće mijenjati",
-    "access control" : "Kontrola pristupa",
     "create" : "kreiraj",
     "change" : "izmjeni",
     "delete" : "izbriši",
-    "Password protected" : "Zaštićeno lozinkom",
-    "Error unsetting expiration date" : "Pogrešno uklanjanje postavke datuma isteka",
-    "Error setting expiration date" : "Pogrešno postavljanje datuma isteka",
-    "Sending ..." : "Slanje...",
-    "Email sent" : "E-pošta poslana",
+    "access control" : "Kontrola pristupa",
+    "Share" : "Podijeli",
     "Warning" : "Upozorenje",
     "The object type is not specified." : "Vrsta objekta nije određena.",
     "Enter new" : "Unesi novi",
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
index 74a3aaadafe..ffe9bab69da 100644
--- a/core/l10n/bs.json
+++ b/core/l10n/bs.json
@@ -84,11 +84,15 @@
     "Error while sharing" : "Greška pri dijeljenju",
     "Error while unsharing" : "Ggreška pri prestanku dijeljenja",
     "Error while changing permissions" : "Greška pri mijenjanju dozvola",
-    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
-    "Shared with you by {owner}" : "Podijeljeno sa vama od {owner}",
-    "Share" : "Podijeli",
-    "Share link" : "Podijelite vezu",
+    "Error setting expiration date" : "Pogrešno postavljanje datuma isteka",
     "The public link will expire no later than {days} days after it is created" : "Javna veza ističe najkasnije {days} dana nakon što je kreirana",
+    "Set expiration date" : "Postavite datum isteka",
+    "Expiration" : "Istek",
+    "Expiration date" : "Datum isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "E-pošta poslana",
+    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
+    "Share link" : "Podijelite vezu",
     "Link" : "Veza",
     "Password protect" : "Zaštitita lozinkom",
     "Password" : "Lozinka",
@@ -96,27 +100,20 @@
     "Allow editing" : "Dozvolite izmjenu",
     "Email link to person" : "Pošaljite osobi vezu e-poštom",
     "Send" : "Pošalji",
-    "Set expiration date" : "Postavite datum isteka",
-    "Expiration" : "Istek",
-    "Expiration date" : "Datum isteka",
-    "Adding user..." : "Dodavanje korisnika...",
+    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
+    "Shared with you by {owner}" : "Podijeljeno sa vama od {owner}",
+    "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
     "group" : "grupa",
     "remote" : "daljinski",
-    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
-    "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
-    "Unshare" : "Prestani dijeliti",
     "notify by email" : "Obavijesti e-poštom",
+    "Unshare" : "Prestani dijeliti",
     "can share" : "može dijeliti",
     "can edit" : "moće mijenjati",
-    "access control" : "Kontrola pristupa",
     "create" : "kreiraj",
     "change" : "izmjeni",
     "delete" : "izbriši",
-    "Password protected" : "Zaštićeno lozinkom",
-    "Error unsetting expiration date" : "Pogrešno uklanjanje postavke datuma isteka",
-    "Error setting expiration date" : "Pogrešno postavljanje datuma isteka",
-    "Sending ..." : "Slanje...",
-    "Email sent" : "E-pošta poslana",
+    "access control" : "Kontrola pristupa",
+    "Share" : "Podijeli",
     "Warning" : "Upozorenje",
     "The object type is not specified." : "Vrsta objekta nije određena.",
     "Enter new" : "Unesi novi",
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index 1fa4f12a3e3..4fdce762dc5 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -113,14 +113,15 @@ OC.L10N.register(
     "Error while sharing" : "Error en compartir",
     "Error while unsharing" : "Error en deixar de compartir",
     "Error while changing permissions" : "Error en canviar els permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartit amb vos i amb el grup {group} per {owner}",
-    "Shared with you by {owner}" : "Compartit amb vos per {owner}",
-    "Share with users or groups …" : "Comparteix amb usuaris o grups ...",
-    "Share with users, groups or remote users …" : "Comparteix amb usuaris, grups o usuaris remots ...",
-    "Share" : "Comparteix",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir amb la gent en altres ownClouds utilitzant la sintaxi username@example.com/owncloud",
-    "Share link" : "Enllaç de compartició",
+    "Error setting expiration date" : "Error en establir la data de venciment",
     "The public link will expire no later than {days} days after it is created" : "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
+    "Set expiration date" : "Estableix la data de venciment",
+    "Expiration" : "Expiració",
+    "Expiration date" : "Data de venciment",
+    "Sending ..." : "Enviant...",
+    "Email sent" : "El correu electrónic s'ha enviat",
+    "Resharing is not allowed" : "No es permet compartir de nou",
+    "Share link" : "Enllaç de compartició",
     "Link" : "Enllaç",
     "Password protect" : "Protegir amb contrasenya",
     "Password" : "Contrasenya",
@@ -128,28 +129,24 @@ OC.L10N.register(
     "Allow editing" : "Permetre edició",
     "Email link to person" : "Enllaç per correu electrónic amb la persona",
     "Send" : "Envia",
-    "Set expiration date" : "Estableix la data de venciment",
-    "Expiration" : "Expiració",
-    "Expiration date" : "Data de venciment",
-    "An error occured. Please try again" : "Va ocórrer un error. Per favor, intenta-ho de nou",
-    "Adding user..." : "Afegint usuari...",
+    "Shared with you and the group {group} by {owner}" : "Compartit amb vos i amb el grup {group} per {owner}",
+    "Shared with you by {owner}" : "Compartit amb vos per {owner}",
+    "Shared in {item} with {user}" : "Compartit en {item} amb {user}",
     "group" : "grup",
     "remote" : "remot",
-    "Resharing is not allowed" : "No es permet compartir de nou",
-    "Shared in {item} with {user}" : "Compartit en {item} amb {user}",
-    "Unshare" : "Deixa de compartir",
     "notify by email" : "notifica per correu electrònic",
+    "Unshare" : "Deixa de compartir",
     "can share" : "pot compartir",
     "can edit" : "pot editar",
-    "access control" : "control d'accés",
     "create" : "crea",
     "change" : "cambi",
     "delete" : "elimina",
-    "Password protected" : "Protegeix amb contrasenya",
-    "Error unsetting expiration date" : "Error en eliminar la data de venciment",
-    "Error setting expiration date" : "Error en establir la data de venciment",
-    "Sending ..." : "Enviant...",
-    "Email sent" : "El correu electrónic s'ha enviat",
+    "access control" : "control d'accés",
+    "An error occured. Please try again" : "Va ocórrer un error. Per favor, intenta-ho de nou",
+    "Share" : "Comparteix",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir amb la gent en altres ownClouds utilitzant la sintaxi username@example.com/owncloud",
+    "Share with users or groups …" : "Comparteix amb usuaris o grups ...",
+    "Share with users, groups or remote users …" : "Comparteix amb usuaris, grups o usuaris remots ...",
     "Warning" : "Avís",
     "The object type is not specified." : "No s'ha especificat el tipus d'objecte.",
     "Enter new" : "Escriu nou",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index 55962a25362..4d147db52f4 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -111,14 +111,15 @@
     "Error while sharing" : "Error en compartir",
     "Error while unsharing" : "Error en deixar de compartir",
     "Error while changing permissions" : "Error en canviar els permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartit amb vos i amb el grup {group} per {owner}",
-    "Shared with you by {owner}" : "Compartit amb vos per {owner}",
-    "Share with users or groups …" : "Comparteix amb usuaris o grups ...",
-    "Share with users, groups or remote users …" : "Comparteix amb usuaris, grups o usuaris remots ...",
-    "Share" : "Comparteix",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir amb la gent en altres ownClouds utilitzant la sintaxi username@example.com/owncloud",
-    "Share link" : "Enllaç de compartició",
+    "Error setting expiration date" : "Error en establir la data de venciment",
     "The public link will expire no later than {days} days after it is created" : "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
+    "Set expiration date" : "Estableix la data de venciment",
+    "Expiration" : "Expiració",
+    "Expiration date" : "Data de venciment",
+    "Sending ..." : "Enviant...",
+    "Email sent" : "El correu electrónic s'ha enviat",
+    "Resharing is not allowed" : "No es permet compartir de nou",
+    "Share link" : "Enllaç de compartició",
     "Link" : "Enllaç",
     "Password protect" : "Protegir amb contrasenya",
     "Password" : "Contrasenya",
@@ -126,28 +127,24 @@
     "Allow editing" : "Permetre edició",
     "Email link to person" : "Enllaç per correu electrónic amb la persona",
     "Send" : "Envia",
-    "Set expiration date" : "Estableix la data de venciment",
-    "Expiration" : "Expiració",
-    "Expiration date" : "Data de venciment",
-    "An error occured. Please try again" : "Va ocórrer un error. Per favor, intenta-ho de nou",
-    "Adding user..." : "Afegint usuari...",
+    "Shared with you and the group {group} by {owner}" : "Compartit amb vos i amb el grup {group} per {owner}",
+    "Shared with you by {owner}" : "Compartit amb vos per {owner}",
+    "Shared in {item} with {user}" : "Compartit en {item} amb {user}",
     "group" : "grup",
     "remote" : "remot",
-    "Resharing is not allowed" : "No es permet compartir de nou",
-    "Shared in {item} with {user}" : "Compartit en {item} amb {user}",
-    "Unshare" : "Deixa de compartir",
     "notify by email" : "notifica per correu electrònic",
+    "Unshare" : "Deixa de compartir",
     "can share" : "pot compartir",
     "can edit" : "pot editar",
-    "access control" : "control d'accés",
     "create" : "crea",
     "change" : "cambi",
     "delete" : "elimina",
-    "Password protected" : "Protegeix amb contrasenya",
-    "Error unsetting expiration date" : "Error en eliminar la data de venciment",
-    "Error setting expiration date" : "Error en establir la data de venciment",
-    "Sending ..." : "Enviant...",
-    "Email sent" : "El correu electrónic s'ha enviat",
+    "access control" : "control d'accés",
+    "An error occured. Please try again" : "Va ocórrer un error. Per favor, intenta-ho de nou",
+    "Share" : "Comparteix",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir amb la gent en altres ownClouds utilitzant la sintaxi username@example.com/owncloud",
+    "Share with users or groups …" : "Comparteix amb usuaris o grups ...",
+    "Share with users, groups or remote users …" : "Comparteix amb usuaris, grups o usuaris remots ...",
     "Warning" : "Avís",
     "The object type is not specified." : "No s'ha especificat el tipus d'objecte.",
     "Enter new" : "Escriu nou",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 0ee3a06e45f..ac1d9631c53 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -115,14 +115,15 @@ OC.L10N.register(
     "Error while sharing" : "Chyba při sdílení",
     "Error while unsharing" : "Chyba při rušení sdílení",
     "Error while changing permissions" : "Chyba při změně oprávnění",
-    "Shared with you and the group {group} by {owner}" : "S Vámi a skupinou {group} sdílí {owner}",
-    "Shared with you by {owner}" : "S Vámi sdílí {owner}",
-    "Share with users or groups …" : "Sdílet s uživateli nebo skupinami",
-    "Share with users, groups or remote users …" : "Sdílet s uživateli, skupinami nebo vzdálenými uživateli",
-    "Share" : "Sdílet",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Sdílejte s lidmi na ownClouds použitím syntaxe username@example.com/owncloud",
-    "Share link" : "Sdílet odkaz",
+    "Error setting expiration date" : "Chyba při nastavení data vypršení platnosti",
     "The public link will expire no later than {days} days after it is created" : "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
+    "Set expiration date" : "Nastavit datum vypršení platnosti",
+    "Expiration" : "Konec platnosti",
+    "Expiration date" : "Datum vypršení platnosti",
+    "Sending ..." : "Odesílám ...",
+    "Email sent" : "Email odeslán",
+    "Resharing is not allowed" : "Sdílení již sdílené položky není povoleno",
+    "Share link" : "Sdílet odkaz",
     "Link" : "Odkaz",
     "Password protect" : "Chránit heslem",
     "Password" : "Heslo",
@@ -130,28 +131,24 @@ OC.L10N.register(
     "Allow editing" : "Povolit úpravy",
     "Email link to person" : "Odeslat osobě odkaz emailem",
     "Send" : "Odeslat",
-    "Set expiration date" : "Nastavit datum vypršení platnosti",
-    "Expiration" : "Konec platnosti",
-    "Expiration date" : "Datum vypršení platnosti",
-    "An error occured. Please try again" : "Nastala chyba. Prosím zkuste to znovu",
-    "Adding user..." : "Přidávám uživatele...",
+    "Shared with you and the group {group} by {owner}" : "S Vámi a skupinou {group} sdílí {owner}",
+    "Shared with you by {owner}" : "S Vámi sdílí {owner}",
+    "Shared in {item} with {user}" : "Sdíleno v {item} s {user}",
     "group" : "skupina",
     "remote" : "vzdálený",
-    "Resharing is not allowed" : "Sdílení již sdílené položky není povoleno",
-    "Shared in {item} with {user}" : "Sdíleno v {item} s {user}",
-    "Unshare" : "Zrušit sdílení",
     "notify by email" : "upozornit emailem",
+    "Unshare" : "Zrušit sdílení",
     "can share" : "může sdílet",
     "can edit" : "lze upravovat",
-    "access control" : "řízení přístupu",
     "create" : "vytvořit",
     "change" : "změnit",
     "delete" : "smazat",
-    "Password protected" : "Chráněno heslem",
-    "Error unsetting expiration date" : "Chyba při odstraňování data vypršení platnosti",
-    "Error setting expiration date" : "Chyba při nastavení data vypršení platnosti",
-    "Sending ..." : "Odesílám ...",
-    "Email sent" : "Email odeslán",
+    "access control" : "řízení přístupu",
+    "An error occured. Please try again" : "Nastala chyba. Prosím zkuste to znovu",
+    "Share" : "Sdílet",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Sdílejte s lidmi na ownClouds použitím syntaxe username@example.com/owncloud",
+    "Share with users or groups …" : "Sdílet s uživateli nebo skupinami",
+    "Share with users, groups or remote users …" : "Sdílet s uživateli, skupinami nebo vzdálenými uživateli",
     "Warning" : "Varování",
     "The object type is not specified." : "Není určen typ objektu.",
     "Enter new" : "Zadat nový",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 1c38e7cc152..78c0e61d0b8 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -113,14 +113,15 @@
     "Error while sharing" : "Chyba při sdílení",
     "Error while unsharing" : "Chyba při rušení sdílení",
     "Error while changing permissions" : "Chyba při změně oprávnění",
-    "Shared with you and the group {group} by {owner}" : "S Vámi a skupinou {group} sdílí {owner}",
-    "Shared with you by {owner}" : "S Vámi sdílí {owner}",
-    "Share with users or groups …" : "Sdílet s uživateli nebo skupinami",
-    "Share with users, groups or remote users …" : "Sdílet s uživateli, skupinami nebo vzdálenými uživateli",
-    "Share" : "Sdílet",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Sdílejte s lidmi na ownClouds použitím syntaxe username@example.com/owncloud",
-    "Share link" : "Sdílet odkaz",
+    "Error setting expiration date" : "Chyba při nastavení data vypršení platnosti",
     "The public link will expire no later than {days} days after it is created" : "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
+    "Set expiration date" : "Nastavit datum vypršení platnosti",
+    "Expiration" : "Konec platnosti",
+    "Expiration date" : "Datum vypršení platnosti",
+    "Sending ..." : "Odesílám ...",
+    "Email sent" : "Email odeslán",
+    "Resharing is not allowed" : "Sdílení již sdílené položky není povoleno",
+    "Share link" : "Sdílet odkaz",
     "Link" : "Odkaz",
     "Password protect" : "Chránit heslem",
     "Password" : "Heslo",
@@ -128,28 +129,24 @@
     "Allow editing" : "Povolit úpravy",
     "Email link to person" : "Odeslat osobě odkaz emailem",
     "Send" : "Odeslat",
-    "Set expiration date" : "Nastavit datum vypršení platnosti",
-    "Expiration" : "Konec platnosti",
-    "Expiration date" : "Datum vypršení platnosti",
-    "An error occured. Please try again" : "Nastala chyba. Prosím zkuste to znovu",
-    "Adding user..." : "Přidávám uživatele...",
+    "Shared with you and the group {group} by {owner}" : "S Vámi a skupinou {group} sdílí {owner}",
+    "Shared with you by {owner}" : "S Vámi sdílí {owner}",
+    "Shared in {item} with {user}" : "Sdíleno v {item} s {user}",
     "group" : "skupina",
     "remote" : "vzdálený",
-    "Resharing is not allowed" : "Sdílení již sdílené položky není povoleno",
-    "Shared in {item} with {user}" : "Sdíleno v {item} s {user}",
-    "Unshare" : "Zrušit sdílení",
     "notify by email" : "upozornit emailem",
+    "Unshare" : "Zrušit sdílení",
     "can share" : "může sdílet",
     "can edit" : "lze upravovat",
-    "access control" : "řízení přístupu",
     "create" : "vytvořit",
     "change" : "změnit",
     "delete" : "smazat",
-    "Password protected" : "Chráněno heslem",
-    "Error unsetting expiration date" : "Chyba při odstraňování data vypršení platnosti",
-    "Error setting expiration date" : "Chyba při nastavení data vypršení platnosti",
-    "Sending ..." : "Odesílám ...",
-    "Email sent" : "Email odeslán",
+    "access control" : "řízení přístupu",
+    "An error occured. Please try again" : "Nastala chyba. Prosím zkuste to znovu",
+    "Share" : "Sdílet",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Sdílejte s lidmi na ownClouds použitím syntaxe username@example.com/owncloud",
+    "Share with users or groups …" : "Sdílet s uživateli nebo skupinami",
+    "Share with users, groups or remote users …" : "Sdílet s uživateli, skupinami nebo vzdálenými uživateli",
     "Warning" : "Varování",
     "The object type is not specified." : "Není určen typ objektu.",
     "Enter new" : "Zadat nový",
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
index 27df5177fff..ffea08840c1 100644
--- a/core/l10n/cy_GB.js
+++ b/core/l10n/cy_GB.js
@@ -51,28 +51,26 @@ OC.L10N.register(
     "Error while sharing" : "Gwall wrth rannu",
     "Error while unsharing" : "Gwall wrth ddad-rannu",
     "Error while changing permissions" : "Gwall wrth newid caniatâd",
-    "Shared with you and the group {group} by {owner}" : "Rhannwyd â chi a'r grŵp {group} gan {owner}",
-    "Shared with you by {owner}" : "Rhannwyd â chi gan {owner}",
-    "Share" : "Rhannu",
+    "Error setting expiration date" : "Gwall wrth osod dyddiad dod i ben",
+    "Set expiration date" : "Gosod dyddiad dod i ben",
+    "Expiration date" : "Dyddiad dod i ben",
+    "Sending ..." : "Yn anfon ...",
+    "Email sent" : "Anfonwyd yr e-bost",
+    "Resharing is not allowed" : "Does dim hawl ail-rannu",
     "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",
-    "Expiration date" : "Dyddiad dod i ben",
-    "group" : "grŵp",
-    "Resharing is not allowed" : "Does dim hawl ail-rannu",
+    "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}",
     "Shared in {item} with {user}" : "Rhannwyd yn {item} â {user}",
+    "group" : "grŵp",
     "Unshare" : "Dad-rannu",
     "can edit" : "yn gallu golygu",
-    "access control" : "rheolaeth mynediad",
     "create" : "creu",
     "delete" : "dileu",
-    "Password protected" : "Diogelwyd â chyfrinair",
-    "Error unsetting expiration date" : "Gwall wrth ddad-osod dyddiad dod i ben",
-    "Error setting expiration date" : "Gwall wrth osod dyddiad dod i ben",
-    "Sending ..." : "Yn anfon ...",
-    "Email sent" : "Anfonwyd yr e-bost",
+    "access control" : "rheolaeth mynediad",
+    "Share" : "Rhannu",
     "Warning" : "Rhybudd",
     "The object type is not specified." : "Nid yw'r math o wrthrych wedi cael ei nodi.",
     "Delete" : "Dileu",
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
index 37f1aefb527..e5f4dae203d 100644
--- a/core/l10n/cy_GB.json
+++ b/core/l10n/cy_GB.json
@@ -49,28 +49,26 @@
     "Error while sharing" : "Gwall wrth rannu",
     "Error while unsharing" : "Gwall wrth ddad-rannu",
     "Error while changing permissions" : "Gwall wrth newid caniatâd",
-    "Shared with you and the group {group} by {owner}" : "Rhannwyd â chi a'r grŵp {group} gan {owner}",
-    "Shared with you by {owner}" : "Rhannwyd â chi gan {owner}",
-    "Share" : "Rhannu",
+    "Error setting expiration date" : "Gwall wrth osod dyddiad dod i ben",
+    "Set expiration date" : "Gosod dyddiad dod i ben",
+    "Expiration date" : "Dyddiad dod i ben",
+    "Sending ..." : "Yn anfon ...",
+    "Email sent" : "Anfonwyd yr e-bost",
+    "Resharing is not allowed" : "Does dim hawl ail-rannu",
     "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",
-    "Expiration date" : "Dyddiad dod i ben",
-    "group" : "grŵp",
-    "Resharing is not allowed" : "Does dim hawl ail-rannu",
+    "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}",
     "Shared in {item} with {user}" : "Rhannwyd yn {item} â {user}",
+    "group" : "grŵp",
     "Unshare" : "Dad-rannu",
     "can edit" : "yn gallu golygu",
-    "access control" : "rheolaeth mynediad",
     "create" : "creu",
     "delete" : "dileu",
-    "Password protected" : "Diogelwyd â chyfrinair",
-    "Error unsetting expiration date" : "Gwall wrth ddad-osod dyddiad dod i ben",
-    "Error setting expiration date" : "Gwall wrth osod dyddiad dod i ben",
-    "Sending ..." : "Yn anfon ...",
-    "Email sent" : "Anfonwyd yr e-bost",
+    "access control" : "rheolaeth mynediad",
+    "Share" : "Rhannu",
     "Warning" : "Rhybudd",
     "The object type is not specified." : "Nid yw'r math o wrthrych wedi cael ei nodi.",
     "Delete" : "Dileu",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index c8684b3483c..40407d2980d 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Fejl under deling",
     "Error while unsharing" : "Fejl under annullering af deling",
     "Error while changing permissions" : "Fejl under justering af rettigheder",
-    "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
-    "Shared with you by {owner}" : "Delt med dig af {owner}",
-    "Share with users or groups …" : "Del med brugere eller grupper",
-    "Share with users, groups or remote users …" : "Del med brugere, grupper eller eksterne brugere...",
-    "Share" : "Del",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
-    "Share link" : "Del link",
+    "Error setting expiration date" : "Fejl under sætning af udløbsdato",
     "The public link will expire no later than {days} days after it is created" : "Det offentlige link udløber senest {days} dage efter det blev oprettet",
+    "Set expiration date" : "Vælg udløbsdato",
+    "Expiration" : "Udløb",
+    "Expiration date" : "Udløbsdato",
+    "Sending ..." : "Sender ...",
+    "Email sent" : "E-mail afsendt",
+    "Resharing is not allowed" : "Videredeling ikke tilladt",
+    "Share link" : "Del link",
     "Link" : "Link",
     "Password protect" : "Beskyt med adgangskode",
     "Password" : "Adgangskode",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Tillad redigering",
     "Email link to person" : "E-mail link til person",
     "Send" : "Send",
-    "Set expiration date" : "Vælg udløbsdato",
-    "Expiration" : "Udløb",
-    "Expiration date" : "Udløbsdato",
-    "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen",
-    "Adding user..." : "Tilføjer bruger...",
+    "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
+    "Shared with you by {owner}" : "Delt med dig af {owner}",
+    "Shared in {item} with {user}" : "Delt i {item} med {user}",
     "group" : "gruppe",
     "remote" : "ekstern",
-    "Resharing is not allowed" : "Videredeling ikke tilladt",
-    "Shared in {item} with {user}" : "Delt i {item} med {user}",
-    "Unshare" : "Fjern deling",
     "notify by email" : "Giv besked med mail",
+    "Unshare" : "Fjern deling",
     "can share" : "kan dele",
     "can edit" : "kan redigere",
-    "access control" : "Adgangskontrol",
     "create" : "opret",
     "change" : "tilpas",
     "delete" : "slet",
-    "Password protected" : "Beskyttet med adgangskode",
-    "Error unsetting expiration date" : "Fejl ved fjernelse af udløbsdato",
-    "Error setting expiration date" : "Fejl under sætning af udløbsdato",
-    "Sending ..." : "Sender ...",
-    "Email sent" : "E-mail afsendt",
+    "access control" : "Adgangskontrol",
+    "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen",
+    "Share" : "Del",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
+    "Share with users or groups …" : "Del med brugere eller grupper",
+    "Share with users, groups or remote users …" : "Del med brugere, grupper eller eksterne brugere...",
     "Warning" : "Advarsel",
     "The object type is not specified." : "Objekttypen er ikke angivet.",
     "Enter new" : "Indtast nyt",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 067d5e6914d..b8714521bbe 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Fejl under deling",
     "Error while unsharing" : "Fejl under annullering af deling",
     "Error while changing permissions" : "Fejl under justering af rettigheder",
-    "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
-    "Shared with you by {owner}" : "Delt med dig af {owner}",
-    "Share with users or groups …" : "Del med brugere eller grupper",
-    "Share with users, groups or remote users …" : "Del med brugere, grupper eller eksterne brugere...",
-    "Share" : "Del",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
-    "Share link" : "Del link",
+    "Error setting expiration date" : "Fejl under sætning af udløbsdato",
     "The public link will expire no later than {days} days after it is created" : "Det offentlige link udløber senest {days} dage efter det blev oprettet",
+    "Set expiration date" : "Vælg udløbsdato",
+    "Expiration" : "Udløb",
+    "Expiration date" : "Udløbsdato",
+    "Sending ..." : "Sender ...",
+    "Email sent" : "E-mail afsendt",
+    "Resharing is not allowed" : "Videredeling ikke tilladt",
+    "Share link" : "Del link",
     "Link" : "Link",
     "Password protect" : "Beskyt med adgangskode",
     "Password" : "Adgangskode",
@@ -129,28 +130,24 @@
     "Allow editing" : "Tillad redigering",
     "Email link to person" : "E-mail link til person",
     "Send" : "Send",
-    "Set expiration date" : "Vælg udløbsdato",
-    "Expiration" : "Udløb",
-    "Expiration date" : "Udløbsdato",
-    "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen",
-    "Adding user..." : "Tilføjer bruger...",
+    "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
+    "Shared with you by {owner}" : "Delt med dig af {owner}",
+    "Shared in {item} with {user}" : "Delt i {item} med {user}",
     "group" : "gruppe",
     "remote" : "ekstern",
-    "Resharing is not allowed" : "Videredeling ikke tilladt",
-    "Shared in {item} with {user}" : "Delt i {item} med {user}",
-    "Unshare" : "Fjern deling",
     "notify by email" : "Giv besked med mail",
+    "Unshare" : "Fjern deling",
     "can share" : "kan dele",
     "can edit" : "kan redigere",
-    "access control" : "Adgangskontrol",
     "create" : "opret",
     "change" : "tilpas",
     "delete" : "slet",
-    "Password protected" : "Beskyttet med adgangskode",
-    "Error unsetting expiration date" : "Fejl ved fjernelse af udløbsdato",
-    "Error setting expiration date" : "Fejl under sætning af udløbsdato",
-    "Sending ..." : "Sender ...",
-    "Email sent" : "E-mail afsendt",
+    "access control" : "Adgangskontrol",
+    "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen",
+    "Share" : "Del",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
+    "Share with users or groups …" : "Del med brugere eller grupper",
+    "Share with users, groups or remote users …" : "Del med brugere, grupper eller eksterne brugere...",
     "Warning" : "Advarsel",
     "The object type is not specified." : "Objekttypen er ikke angivet.",
     "Enter new" : "Indtast nyt",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 495ea72c710..3b307547244 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -106,14 +106,15 @@ OC.L10N.register(
     "Error while sharing" : "Fehler beim Teilen",
     "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
     "Error while changing permissions" : "Fehler beim Ändern der Rechte",
-    "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
-    "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
-    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
-    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
-    "Share" : "Teilen",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
-    "Share link" : "Link teilen",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
+    "Set expiration date" : "Setze ein Ablaufdatum",
+    "Expiration" : "Ablaufdatum",
+    "Expiration date" : "Ablaufdatum",
+    "Sending ..." : "Senden…",
+    "Email sent" : "E-Mail wurde verschickt",
+    "Resharing is not allowed" : "Weiterverteilen ist nicht erlaubt",
+    "Share link" : "Link teilen",
     "Link" : "Link",
     "Password protect" : "Passwortschutz",
     "Password" : "Passwort",
@@ -121,28 +122,24 @@ OC.L10N.register(
     "Allow editing" : "Bearbeitung erlauben",
     "Email link to person" : "Link per E-Mail verschicken",
     "Send" : "Senden",
-    "Set expiration date" : "Setze ein Ablaufdatum",
-    "Expiration" : "Ablaufdatum",
-    "Expiration date" : "Ablaufdatum",
-    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
-    "Adding user..." : "Benutzer wird hinzugefügt…",
+    "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
+    "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
+    "Shared in {item} with {user}" : "Für {user} in {item} freigegeben",
     "group" : "Gruppe",
     "remote" : "Entfernte Freigabe",
-    "Resharing is not allowed" : "Weiterverteilen ist nicht erlaubt",
-    "Shared in {item} with {user}" : "Für {user} in {item} freigegeben",
-    "Unshare" : "Freigabe aufheben",
     "notify by email" : "per E-Mail benachrichtigen",
+    "Unshare" : "Freigabe aufheben",
     "can share" : "kann teilen",
     "can edit" : "kann bearbeiten",
-    "access control" : "Zugriffskontrolle",
     "create" : "erstellen",
     "change" : "Ändern",
     "delete" : "löschen",
-    "Password protected" : "Durch ein Passwort geschützt",
-    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
-    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
-    "Sending ..." : "Senden…",
-    "Email sent" : "E-Mail wurde verschickt",
+    "access control" : "Zugriffskontrolle",
+    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
+    "Share" : "Teilen",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
+    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
+    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
     "Warning" : "Warnung",
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Enter new" : "Neuen eingeben",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index fc826c7fde2..4784f7f1979 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -104,14 +104,15 @@
     "Error while sharing" : "Fehler beim Teilen",
     "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
     "Error while changing permissions" : "Fehler beim Ändern der Rechte",
-    "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
-    "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
-    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
-    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
-    "Share" : "Teilen",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
-    "Share link" : "Link teilen",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
+    "Set expiration date" : "Setze ein Ablaufdatum",
+    "Expiration" : "Ablaufdatum",
+    "Expiration date" : "Ablaufdatum",
+    "Sending ..." : "Senden…",
+    "Email sent" : "E-Mail wurde verschickt",
+    "Resharing is not allowed" : "Weiterverteilen ist nicht erlaubt",
+    "Share link" : "Link teilen",
     "Link" : "Link",
     "Password protect" : "Passwortschutz",
     "Password" : "Passwort",
@@ -119,28 +120,24 @@
     "Allow editing" : "Bearbeitung erlauben",
     "Email link to person" : "Link per E-Mail verschicken",
     "Send" : "Senden",
-    "Set expiration date" : "Setze ein Ablaufdatum",
-    "Expiration" : "Ablaufdatum",
-    "Expiration date" : "Ablaufdatum",
-    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
-    "Adding user..." : "Benutzer wird hinzugefügt…",
+    "Shared with you and the group {group} by {owner}" : "{owner} hat dies mit Dir und der Gruppe {group} geteilt",
+    "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
+    "Shared in {item} with {user}" : "Für {user} in {item} freigegeben",
     "group" : "Gruppe",
     "remote" : "Entfernte Freigabe",
-    "Resharing is not allowed" : "Weiterverteilen ist nicht erlaubt",
-    "Shared in {item} with {user}" : "Für {user} in {item} freigegeben",
-    "Unshare" : "Freigabe aufheben",
     "notify by email" : "per E-Mail benachrichtigen",
+    "Unshare" : "Freigabe aufheben",
     "can share" : "kann teilen",
     "can edit" : "kann bearbeiten",
-    "access control" : "Zugriffskontrolle",
     "create" : "erstellen",
     "change" : "Ändern",
     "delete" : "löschen",
-    "Password protected" : "Durch ein Passwort geschützt",
-    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
-    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
-    "Sending ..." : "Senden…",
-    "Email sent" : "E-Mail wurde verschickt",
+    "access control" : "Zugriffskontrolle",
+    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
+    "Share" : "Teilen",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
+    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
+    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
     "Warning" : "Warnung",
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Enter new" : "Neuen eingeben",
diff --git a/core/l10n/de_AT.js b/core/l10n/de_AT.js
index 716851f53b6..b41c1547953 100644
--- a/core/l10n/de_AT.js
+++ b/core/l10n/de_AT.js
@@ -45,7 +45,6 @@ OC.L10N.register(
     "Cancel" : "Abbrechen",
     "Continue" : "Weiter",
     "Error" : "Fehler",
-    "Share" : "Freigeben",
     "Share link" : "Link teilen",
     "Password" : "Passwort",
     "Send" : "Senden",
@@ -53,6 +52,7 @@ OC.L10N.register(
     "Unshare" : "Teilung zurücknehmen",
     "can share" : "Kann teilen",
     "can edit" : "kann bearbeiten",
+    "Share" : "Freigeben",
     "Delete" : "Löschen",
     "Add" : "Hinzufügen",
     "Personal" : "Persönlich",
diff --git a/core/l10n/de_AT.json b/core/l10n/de_AT.json
index a0798f9a826..4e3b9669c16 100644
--- a/core/l10n/de_AT.json
+++ b/core/l10n/de_AT.json
@@ -43,7 +43,6 @@
     "Cancel" : "Abbrechen",
     "Continue" : "Weiter",
     "Error" : "Fehler",
-    "Share" : "Freigeben",
     "Share link" : "Link teilen",
     "Password" : "Passwort",
     "Send" : "Senden",
@@ -51,6 +50,7 @@
     "Unshare" : "Teilung zurücknehmen",
     "can share" : "Kann teilen",
     "can edit" : "kann bearbeiten",
+    "Share" : "Freigeben",
     "Delete" : "Löschen",
     "Add" : "Hinzufügen",
     "Personal" : "Persönlich",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 0a4689261a6..369936d0c92 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -114,14 +114,15 @@ OC.L10N.register(
     "Error while sharing" : "Fehler beim Teilen",
     "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
     "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
-    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
-    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
-    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
-    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
-    "Share" : "Teilen",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
-    "Share link" : "Link teilen",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
+    "Set expiration date" : "Ein Ablaufdatum setzen",
+    "Expiration" : "Ablaufdatum",
+    "Expiration date" : "Ablaufdatum",
+    "Sending ..." : "Senden…",
+    "Email sent" : "E-Mail gesendet",
+    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
+    "Share link" : "Link teilen",
     "Link" : "Link",
     "Password protect" : "Passwortschutz",
     "Password" : "Passwort",
@@ -129,28 +130,24 @@ OC.L10N.register(
     "Allow editing" : "Bearbeitung erlauben",
     "Email link to person" : "Link per E-Mail verschicken",
     "Send" : "Senden",
-    "Set expiration date" : "Ein Ablaufdatum setzen",
-    "Expiration" : "Ablaufdatum",
-    "Expiration date" : "Ablaufdatum",
-    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal",
-    "Adding user..." : "Benutzer wird hinzugefügt…",
+    "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.",
+    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
     "group" : "Gruppe",
     "remote" : "Entfernte Freigabe",
-    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
-    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
-    "Unshare" : "Freigabe aufheben",
     "notify by email" : "per E-Mail benachrichtigen",
+    "Unshare" : "Freigabe aufheben",
     "can share" : "kann teilen",
     "can edit" : "kann bearbeiten",
-    "access control" : "Zugriffskontrolle",
     "create" : "erstellen",
     "change" : "Ändern",
     "delete" : "löschen",
-    "Password protected" : "Passwortgeschützt",
-    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
-    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
-    "Sending ..." : "Senden…",
-    "Email sent" : "E-Mail gesendet",
+    "access control" : "Zugriffskontrolle",
+    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal",
+    "Share" : "Teilen",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
+    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
+    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
     "Warning" : "Warnung",
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Enter new" : "Neuen eingeben",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index a5f2d5857e3..8f0d3fa8465 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -112,14 +112,15 @@
     "Error while sharing" : "Fehler beim Teilen",
     "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
     "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
-    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
-    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
-    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
-    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
-    "Share" : "Teilen",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
-    "Share link" : "Link teilen",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
+    "Set expiration date" : "Ein Ablaufdatum setzen",
+    "Expiration" : "Ablaufdatum",
+    "Expiration date" : "Ablaufdatum",
+    "Sending ..." : "Senden…",
+    "Email sent" : "E-Mail gesendet",
+    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
+    "Share link" : "Link teilen",
     "Link" : "Link",
     "Password protect" : "Passwortschutz",
     "Password" : "Passwort",
@@ -127,28 +128,24 @@
     "Allow editing" : "Bearbeitung erlauben",
     "Email link to person" : "Link per E-Mail verschicken",
     "Send" : "Senden",
-    "Set expiration date" : "Ein Ablaufdatum setzen",
-    "Expiration" : "Ablaufdatum",
-    "Expiration date" : "Ablaufdatum",
-    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal",
-    "Adding user..." : "Benutzer wird hinzugefügt…",
+    "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.",
+    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
     "group" : "Gruppe",
     "remote" : "Entfernte Freigabe",
-    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
-    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
-    "Unshare" : "Freigabe aufheben",
     "notify by email" : "per E-Mail benachrichtigen",
+    "Unshare" : "Freigabe aufheben",
     "can share" : "kann teilen",
     "can edit" : "kann bearbeiten",
-    "access control" : "Zugriffskontrolle",
     "create" : "erstellen",
     "change" : "Ändern",
     "delete" : "löschen",
-    "Password protected" : "Passwortgeschützt",
-    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
-    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
-    "Sending ..." : "Senden…",
-    "Email sent" : "E-Mail gesendet",
+    "access control" : "Zugriffskontrolle",
+    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal",
+    "Share" : "Teilen",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
+    "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
+    "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
     "Warning" : "Warnung",
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Enter new" : "Neuen eingeben",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 28e9763e13c..3b739d06b52 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Σφάλμα κατά τον διαμοιρασμό",
     "Error while unsharing" : "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
     "Error while changing permissions" : "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
-    "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
-    "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
-    "Share with users or groups …" : "Διαμοιρασμός με χρήστες ή ομάδες ...",
-    "Share with users, groups or remote users …" : "Διαμοιρασμός με χρήστες, ομάδες ή απομακρυσμένους χρήστες ...",
-    "Share" : "Διαμοιρασμός",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud",
-    "Share link" : "Διαμοιρασμός συνδέσμου",
+    "Error setting expiration date" : "Σφάλμα κατά τον ορισμό ημ. λήξης",
     "The public link will expire no later than {days} days after it is created" : "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
+    "Set expiration date" : "Ορισμός ημ. λήξης",
+    "Expiration" : "Λήξη",
+    "Expiration date" : "Ημερομηνία λήξης",
+    "Sending ..." : "Αποστολή...",
+    "Email sent" : "Το Email απεστάλη ",
+    "Resharing is not allowed" : "Ξαναμοιρασμός δεν επιτρέπεται",
+    "Share link" : "Διαμοιρασμός συνδέσμου",
     "Link" : "Σύνδεσμος",
     "Password protect" : "Προστασία συνθηματικού",
     "Password" : "Συνθηματικό",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Επιτρέπεται η επεξεργασία",
     "Email link to person" : "Αποστολή συνδέσμου με email ",
     "Send" : "Αποστολή",
-    "Set expiration date" : "Ορισμός ημ. λήξης",
-    "Expiration" : "Λήξη",
-    "Expiration date" : "Ημερομηνία λήξης",
-    "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά",
-    "Adding user..." : "Προσθήκη χρήστη ...",
+    "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
+    "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
+    "Shared in {item} with {user}" : "Διαμοιρασμός του {item} με τον {user}",
     "group" : "ομάδα",
     "remote" : "απομακρυσμένα",
-    "Resharing is not allowed" : "Ξαναμοιρασμός δεν επιτρέπεται",
-    "Shared in {item} with {user}" : "Διαμοιρασμός του {item} με τον {user}",
-    "Unshare" : "Διακοπή διαμοιρασμού",
     "notify by email" : "ειδοποίηση με email",
+    "Unshare" : "Διακοπή διαμοιρασμού",
     "can share" : "δυνατότητα διαμοιρασμού",
     "can edit" : "δυνατότητα αλλαγής",
-    "access control" : "έλεγχος πρόσβασης",
     "create" : "δημιουργία",
     "change" : "αλλαγή",
     "delete" : "διαγραφή",
-    "Password protected" : "Προστασία με συνθηματικό",
-    "Error unsetting expiration date" : "Σφάλμα κατά την διαγραφή της ημ. λήξης",
-    "Error setting expiration date" : "Σφάλμα κατά τον ορισμό ημ. λήξης",
-    "Sending ..." : "Αποστολή...",
-    "Email sent" : "Το Email απεστάλη ",
+    "access control" : "έλεγχος πρόσβασης",
+    "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά",
+    "Share" : "Διαμοιρασμός",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud",
+    "Share with users or groups …" : "Διαμοιρασμός με χρήστες ή ομάδες ...",
+    "Share with users, groups or remote users …" : "Διαμοιρασμός με χρήστες, ομάδες ή απομακρυσμένους χρήστες ...",
     "Warning" : "Προειδοποίηση",
     "The object type is not specified." : "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
     "Enter new" : "Εισαγωγή νέου",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 6c68066738a..9900d8f568c 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Σφάλμα κατά τον διαμοιρασμό",
     "Error while unsharing" : "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
     "Error while changing permissions" : "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
-    "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
-    "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
-    "Share with users or groups …" : "Διαμοιρασμός με χρήστες ή ομάδες ...",
-    "Share with users, groups or remote users …" : "Διαμοιρασμός με χρήστες, ομάδες ή απομακρυσμένους χρήστες ...",
-    "Share" : "Διαμοιρασμός",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud",
-    "Share link" : "Διαμοιρασμός συνδέσμου",
+    "Error setting expiration date" : "Σφάλμα κατά τον ορισμό ημ. λήξης",
     "The public link will expire no later than {days} days after it is created" : "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
+    "Set expiration date" : "Ορισμός ημ. λήξης",
+    "Expiration" : "Λήξη",
+    "Expiration date" : "Ημερομηνία λήξης",
+    "Sending ..." : "Αποστολή...",
+    "Email sent" : "Το Email απεστάλη ",
+    "Resharing is not allowed" : "Ξαναμοιρασμός δεν επιτρέπεται",
+    "Share link" : "Διαμοιρασμός συνδέσμου",
     "Link" : "Σύνδεσμος",
     "Password protect" : "Προστασία συνθηματικού",
     "Password" : "Συνθηματικό",
@@ -129,28 +130,24 @@
     "Allow editing" : "Επιτρέπεται η επεξεργασία",
     "Email link to person" : "Αποστολή συνδέσμου με email ",
     "Send" : "Αποστολή",
-    "Set expiration date" : "Ορισμός ημ. λήξης",
-    "Expiration" : "Λήξη",
-    "Expiration date" : "Ημερομηνία λήξης",
-    "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά",
-    "Adding user..." : "Προσθήκη χρήστη ...",
+    "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
+    "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
+    "Shared in {item} with {user}" : "Διαμοιρασμός του {item} με τον {user}",
     "group" : "ομάδα",
     "remote" : "απομακρυσμένα",
-    "Resharing is not allowed" : "Ξαναμοιρασμός δεν επιτρέπεται",
-    "Shared in {item} with {user}" : "Διαμοιρασμός του {item} με τον {user}",
-    "Unshare" : "Διακοπή διαμοιρασμού",
     "notify by email" : "ειδοποίηση με email",
+    "Unshare" : "Διακοπή διαμοιρασμού",
     "can share" : "δυνατότητα διαμοιρασμού",
     "can edit" : "δυνατότητα αλλαγής",
-    "access control" : "έλεγχος πρόσβασης",
     "create" : "δημιουργία",
     "change" : "αλλαγή",
     "delete" : "διαγραφή",
-    "Password protected" : "Προστασία με συνθηματικό",
-    "Error unsetting expiration date" : "Σφάλμα κατά την διαγραφή της ημ. λήξης",
-    "Error setting expiration date" : "Σφάλμα κατά τον ορισμό ημ. λήξης",
-    "Sending ..." : "Αποστολή...",
-    "Email sent" : "Το Email απεστάλη ",
+    "access control" : "έλεγχος πρόσβασης",
+    "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά",
+    "Share" : "Διαμοιρασμός",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud",
+    "Share with users or groups …" : "Διαμοιρασμός με χρήστες ή ομάδες ...",
+    "Share with users, groups or remote users …" : "Διαμοιρασμός με χρήστες, ομάδες ή απομακρυσμένους χρήστες ...",
     "Warning" : "Προειδοποίηση",
     "The object type is not specified." : "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
     "Enter new" : "Εισαγωγή νέου",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index 7cf53922fbc..ced4272c1d8 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -100,14 +100,15 @@ OC.L10N.register(
     "Error while sharing" : "Error whilst sharing",
     "Error while unsharing" : "Error whilst unsharing",
     "Error while changing permissions" : "Error whilst changing permissions",
-    "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
-    "Shared with you by {owner}" : "Shared with you by {owner}",
-    "Share with users or groups …" : "Share with users or groups …",
-    "Share with users, groups or remote users …" : "Share with users, groups or remote users …",
-    "Share" : "Share",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Share with people on other ownClouds using the syntax username@example.com/owncloud",
-    "Share link" : "Share link",
+    "Error setting expiration date" : "Error setting expiration date",
     "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",
+    "Set expiration date" : "Set expiration date",
+    "Expiration" : "Expiration",
+    "Expiration date" : "Expiration date",
+    "Sending ..." : "Sending ...",
+    "Email sent" : "Email sent",
+    "Resharing is not allowed" : "Resharing is not allowed",
+    "Share link" : "Share link",
     "Link" : "Link",
     "Password protect" : "Password protect",
     "Password" : "Password",
@@ -115,28 +116,24 @@ OC.L10N.register(
     "Allow editing" : "Allow editing",
     "Email link to person" : "Email link to person",
     "Send" : "Send",
-    "Set expiration date" : "Set expiration date",
-    "Expiration" : "Expiration",
-    "Expiration date" : "Expiration date",
-    "An error occured. Please try again" : "An error occured. Please try again",
-    "Adding user..." : "Adding user...",
+    "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
+    "Shared with you by {owner}" : "Shared with you by {owner}",
+    "Shared in {item} with {user}" : "Shared in {item} with {user}",
     "group" : "group",
     "remote" : "remote",
-    "Resharing is not allowed" : "Resharing is not allowed",
-    "Shared in {item} with {user}" : "Shared in {item} with {user}",
-    "Unshare" : "Unshare",
     "notify by email" : "notify by email",
+    "Unshare" : "Unshare",
     "can share" : "can share",
     "can edit" : "can edit",
-    "access control" : "access control",
     "create" : "create",
     "change" : "change",
     "delete" : "delete",
-    "Password protected" : "Password protected",
-    "Error unsetting expiration date" : "Error unsetting expiration date",
-    "Error setting expiration date" : "Error setting expiration date",
-    "Sending ..." : "Sending ...",
-    "Email sent" : "Email sent",
+    "access control" : "access control",
+    "An error occured. Please try again" : "An error occured. Please try again",
+    "Share" : "Share",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Share with people on other ownClouds using the syntax username@example.com/owncloud",
+    "Share with users or groups …" : "Share with users or groups …",
+    "Share with users, groups or remote users …" : "Share with users, groups or remote users …",
     "Warning" : "Warning",
     "The object type is not specified." : "The object type is not specified.",
     "Enter new" : "Enter new",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index 518e0adb80c..7bea74e4359 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -98,14 +98,15 @@
     "Error while sharing" : "Error whilst sharing",
     "Error while unsharing" : "Error whilst unsharing",
     "Error while changing permissions" : "Error whilst changing permissions",
-    "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
-    "Shared with you by {owner}" : "Shared with you by {owner}",
-    "Share with users or groups …" : "Share with users or groups …",
-    "Share with users, groups or remote users …" : "Share with users, groups or remote users …",
-    "Share" : "Share",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Share with people on other ownClouds using the syntax username@example.com/owncloud",
-    "Share link" : "Share link",
+    "Error setting expiration date" : "Error setting expiration date",
     "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",
+    "Set expiration date" : "Set expiration date",
+    "Expiration" : "Expiration",
+    "Expiration date" : "Expiration date",
+    "Sending ..." : "Sending ...",
+    "Email sent" : "Email sent",
+    "Resharing is not allowed" : "Resharing is not allowed",
+    "Share link" : "Share link",
     "Link" : "Link",
     "Password protect" : "Password protect",
     "Password" : "Password",
@@ -113,28 +114,24 @@
     "Allow editing" : "Allow editing",
     "Email link to person" : "Email link to person",
     "Send" : "Send",
-    "Set expiration date" : "Set expiration date",
-    "Expiration" : "Expiration",
-    "Expiration date" : "Expiration date",
-    "An error occured. Please try again" : "An error occured. Please try again",
-    "Adding user..." : "Adding user...",
+    "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
+    "Shared with you by {owner}" : "Shared with you by {owner}",
+    "Shared in {item} with {user}" : "Shared in {item} with {user}",
     "group" : "group",
     "remote" : "remote",
-    "Resharing is not allowed" : "Resharing is not allowed",
-    "Shared in {item} with {user}" : "Shared in {item} with {user}",
-    "Unshare" : "Unshare",
     "notify by email" : "notify by email",
+    "Unshare" : "Unshare",
     "can share" : "can share",
     "can edit" : "can edit",
-    "access control" : "access control",
     "create" : "create",
     "change" : "change",
     "delete" : "delete",
-    "Password protected" : "Password protected",
-    "Error unsetting expiration date" : "Error unsetting expiration date",
-    "Error setting expiration date" : "Error setting expiration date",
-    "Sending ..." : "Sending ...",
-    "Email sent" : "Email sent",
+    "access control" : "access control",
+    "An error occured. Please try again" : "An error occured. Please try again",
+    "Share" : "Share",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Share with people on other ownClouds using the syntax username@example.com/owncloud",
+    "Share with users or groups …" : "Share with users or groups …",
+    "Share with users, groups or remote users …" : "Share with users, groups or remote users …",
     "Warning" : "Warning",
     "The object type is not specified." : "The object type is not specified.",
     "Enter new" : "Enter new",
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
index eee2a354958..8ecd740bc7e 100644
--- a/core/l10n/eo.js
+++ b/core/l10n/eo.js
@@ -66,32 +66,30 @@ OC.L10N.register(
     "Error while sharing" : "Eraro dum kunhavigo",
     "Error while unsharing" : "Eraro dum malkunhavigo",
     "Error while changing permissions" : "Eraro dum ŝanĝo de permesoj",
-    "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
-    "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
-    "Share" : "Kunhavigi",
+    "Error setting expiration date" : "Eraro dum agordado de limdato",
+    "Set expiration date" : "Agordi limdaton",
+    "Expiration" : "Eksvalidiĝo",
+    "Expiration date" : "Limdato",
+    "Sending ..." : "Sendante...",
+    "Email sent" : "La retpoŝtaĵo sendiĝis",
+    "Resharing is not allowed" : "Rekunhavigo ne permesatas",
     "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",
-    "Expiration" : "Eksvalidiĝo",
-    "Expiration date" : "Limdato",
-    "group" : "grupo",
-    "Resharing is not allowed" : "Rekunhavigo ne permesatas",
+    "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
+    "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
     "Shared in {item} with {user}" : "Kunhavigita en {item} kun {user}",
-    "Unshare" : "Malkunhavigi",
+    "group" : "grupo",
     "notify by email" : "avizi per retpoŝto",
+    "Unshare" : "Malkunhavigi",
     "can share" : "kunhavebla",
     "can edit" : "povas redakti",
-    "access control" : "alirkontrolo",
     "create" : "krei",
     "delete" : "forigi",
-    "Password protected" : "Protektita per pasvorto",
-    "Error unsetting expiration date" : "Eraro dum malagordado de limdato",
-    "Error setting expiration date" : "Eraro dum agordado de limdato",
-    "Sending ..." : "Sendante...",
-    "Email sent" : "La retpoŝtaĵo sendiĝis",
+    "access control" : "alirkontrolo",
+    "Share" : "Kunhavigi",
     "Warning" : "Averto",
     "The object type is not specified." : "Ne indikiĝis tipo de la objekto.",
     "Enter new" : "Enigu novan",
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
index fb1ad500032..ddce56a528d 100644
--- a/core/l10n/eo.json
+++ b/core/l10n/eo.json
@@ -64,32 +64,30 @@
     "Error while sharing" : "Eraro dum kunhavigo",
     "Error while unsharing" : "Eraro dum malkunhavigo",
     "Error while changing permissions" : "Eraro dum ŝanĝo de permesoj",
-    "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
-    "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
-    "Share" : "Kunhavigi",
+    "Error setting expiration date" : "Eraro dum agordado de limdato",
+    "Set expiration date" : "Agordi limdaton",
+    "Expiration" : "Eksvalidiĝo",
+    "Expiration date" : "Limdato",
+    "Sending ..." : "Sendante...",
+    "Email sent" : "La retpoŝtaĵo sendiĝis",
+    "Resharing is not allowed" : "Rekunhavigo ne permesatas",
     "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",
-    "Expiration" : "Eksvalidiĝo",
-    "Expiration date" : "Limdato",
-    "group" : "grupo",
-    "Resharing is not allowed" : "Rekunhavigo ne permesatas",
+    "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
+    "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
     "Shared in {item} with {user}" : "Kunhavigita en {item} kun {user}",
-    "Unshare" : "Malkunhavigi",
+    "group" : "grupo",
     "notify by email" : "avizi per retpoŝto",
+    "Unshare" : "Malkunhavigi",
     "can share" : "kunhavebla",
     "can edit" : "povas redakti",
-    "access control" : "alirkontrolo",
     "create" : "krei",
     "delete" : "forigi",
-    "Password protected" : "Protektita per pasvorto",
-    "Error unsetting expiration date" : "Eraro dum malagordado de limdato",
-    "Error setting expiration date" : "Eraro dum agordado de limdato",
-    "Sending ..." : "Sendante...",
-    "Email sent" : "La retpoŝtaĵo sendiĝis",
+    "access control" : "alirkontrolo",
+    "Share" : "Kunhavigi",
     "Warning" : "Averto",
     "The object type is not specified." : "Ne indikiĝis tipo de la objekto.",
     "Enter new" : "Enigu novan",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 867877ed14d..ea606905e7d 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error al dejar de compartir",
     "Error while changing permissions" : "Error al cambiar permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Compartido contigo por {owner}",
-    "Share with users or groups …" : "Compartir con usuarios o grupos ...",
-    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos...",
-    "Share" : "Compartir",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
-    "Share link" : "Enlace compartido",
+    "Error setting expiration date" : "Error estableciendo fecha de caducidad",
     "The public link will expire no later than {days} days after it is created" : "El vínculo público no expirará antes de {days} desde que se creó",
+    "Set expiration date" : "Establecer fecha de caducidad",
+    "Expiration" : "Expira en:",
+    "Expiration date" : "Fecha de caducidad",
+    "Sending ..." : "Enviando...",
+    "Email sent" : "Correo electrónico enviado",
+    "Resharing is not allowed" : "No se permite compartir de nuevo",
+    "Share link" : "Enlace compartido",
     "Link" : "Enlace",
     "Password protect" : "Protección con contraseña",
     "Password" : "Contraseña",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Permitir edición",
     "Email link to person" : "Enviar enlace por correo electrónico a una persona",
     "Send" : "Enviar",
-    "Set expiration date" : "Establecer fecha de caducidad",
-    "Expiration" : "Expira en:",
-    "Expiration date" : "Fecha de caducidad",
-    "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.",
-    "Adding user..." : "Añadiendo usuario...",
+    "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido contigo por {owner}",
+    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
     "group" : "grupo",
     "remote" : "remoto",
-    "Resharing is not allowed" : "No se permite compartir de nuevo",
-    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
-    "Unshare" : "Dejar de compartir",
     "notify by email" : "notificar por correo electrónico",
+    "Unshare" : "Dejar de compartir",
     "can share" : "puede compartir",
     "can edit" : "puede editar",
-    "access control" : "control de acceso",
     "create" : "crear",
     "change" : "cambio",
     "delete" : "eliminar",
-    "Password protected" : "Protegido con contraseña",
-    "Error unsetting expiration date" : "Error eliminando fecha de caducidad",
-    "Error setting expiration date" : "Error estableciendo fecha de caducidad",
-    "Sending ..." : "Enviando...",
-    "Email sent" : "Correo electrónico enviado",
+    "access control" : "control de acceso",
+    "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.",
+    "Share" : "Compartir",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
+    "Share with users or groups …" : "Compartir con usuarios o grupos ...",
+    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos...",
     "Warning" : "Precaución",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Enter new" : "Ingresar nueva",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index df9e7e4b740..ec5b80a3e82 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error al dejar de compartir",
     "Error while changing permissions" : "Error al cambiar permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Compartido contigo por {owner}",
-    "Share with users or groups …" : "Compartir con usuarios o grupos ...",
-    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos...",
-    "Share" : "Compartir",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
-    "Share link" : "Enlace compartido",
+    "Error setting expiration date" : "Error estableciendo fecha de caducidad",
     "The public link will expire no later than {days} days after it is created" : "El vínculo público no expirará antes de {days} desde que se creó",
+    "Set expiration date" : "Establecer fecha de caducidad",
+    "Expiration" : "Expira en:",
+    "Expiration date" : "Fecha de caducidad",
+    "Sending ..." : "Enviando...",
+    "Email sent" : "Correo electrónico enviado",
+    "Resharing is not allowed" : "No se permite compartir de nuevo",
+    "Share link" : "Enlace compartido",
     "Link" : "Enlace",
     "Password protect" : "Protección con contraseña",
     "Password" : "Contraseña",
@@ -129,28 +130,24 @@
     "Allow editing" : "Permitir edición",
     "Email link to person" : "Enviar enlace por correo electrónico a una persona",
     "Send" : "Enviar",
-    "Set expiration date" : "Establecer fecha de caducidad",
-    "Expiration" : "Expira en:",
-    "Expiration date" : "Fecha de caducidad",
-    "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.",
-    "Adding user..." : "Añadiendo usuario...",
+    "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido contigo por {owner}",
+    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
     "group" : "grupo",
     "remote" : "remoto",
-    "Resharing is not allowed" : "No se permite compartir de nuevo",
-    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
-    "Unshare" : "Dejar de compartir",
     "notify by email" : "notificar por correo electrónico",
+    "Unshare" : "Dejar de compartir",
     "can share" : "puede compartir",
     "can edit" : "puede editar",
-    "access control" : "control de acceso",
     "create" : "crear",
     "change" : "cambio",
     "delete" : "eliminar",
-    "Password protected" : "Protegido con contraseña",
-    "Error unsetting expiration date" : "Error eliminando fecha de caducidad",
-    "Error setting expiration date" : "Error estableciendo fecha de caducidad",
-    "Sending ..." : "Enviando...",
-    "Email sent" : "Correo electrónico enviado",
+    "access control" : "control de acceso",
+    "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.",
+    "Share" : "Compartir",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
+    "Share with users or groups …" : "Compartir con usuarios o grupos ...",
+    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos...",
     "Warning" : "Precaución",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Enter new" : "Ingresar nueva",
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
index bddadc44c1a..0a82908e2ee 100644
--- a/core/l10n/es_AR.js
+++ b/core/l10n/es_AR.js
@@ -76,32 +76,30 @@ OC.L10N.register(
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error en al dejar de compartir",
     "Error while changing permissions" : "Error al cambiar permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Compartido con vos por {owner}",
-    "Share" : "Compartir",
+    "Error setting expiration date" : "Error al asignar fecha de vencimiento",
+    "Set expiration date" : "Asignar fecha de vencimiento",
+    "Expiration" : "Vencimiento",
+    "Expiration date" : "Fecha de vencimiento",
+    "Sending ..." : "Mandando...",
+    "Email sent" : "e-mail mandado",
+    "Resharing is not allowed" : "No se permite volver a compartir",
     "Share link" : "Compartir vínculo",
     "Password protect" : "Proteger con contraseña ",
     "Password" : "Contraseña",
     "Email link to person" : "Enviar el enlace por e-mail.",
     "Send" : "Mandar",
-    "Set expiration date" : "Asignar fecha de vencimiento",
-    "Expiration" : "Vencimiento",
-    "Expiration date" : "Fecha de vencimiento",
-    "group" : "grupo",
-    "Resharing is not allowed" : "No se permite volver a compartir",
+    "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido con vos por {owner}",
     "Shared in {item} with {user}" : "Compartido en {item} con {user}",
-    "Unshare" : "Dejar de compartir",
+    "group" : "grupo",
     "notify by email" : "notificar por correo",
+    "Unshare" : "Dejar de compartir",
     "can share" : "puede compartir",
     "can edit" : "podés editar",
-    "access control" : "control de acceso",
     "create" : "crear",
     "delete" : "borrar",
-    "Password protected" : "Protegido por contraseña",
-    "Error unsetting expiration date" : "Error al remover la fecha de vencimiento",
-    "Error setting expiration date" : "Error al asignar fecha de vencimiento",
-    "Sending ..." : "Mandando...",
-    "Email sent" : "e-mail mandado",
+    "access control" : "control de acceso",
+    "Share" : "Compartir",
     "Warning" : "Atención",
     "The object type is not specified." : "El tipo de objeto no está especificado. ",
     "Enter new" : "Entrar nuevo",
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
index 93a5b815740..804167f4af4 100644
--- a/core/l10n/es_AR.json
+++ b/core/l10n/es_AR.json
@@ -74,32 +74,30 @@
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error en al dejar de compartir",
     "Error while changing permissions" : "Error al cambiar permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Compartido con vos por {owner}",
-    "Share" : "Compartir",
+    "Error setting expiration date" : "Error al asignar fecha de vencimiento",
+    "Set expiration date" : "Asignar fecha de vencimiento",
+    "Expiration" : "Vencimiento",
+    "Expiration date" : "Fecha de vencimiento",
+    "Sending ..." : "Mandando...",
+    "Email sent" : "e-mail mandado",
+    "Resharing is not allowed" : "No se permite volver a compartir",
     "Share link" : "Compartir vínculo",
     "Password protect" : "Proteger con contraseña ",
     "Password" : "Contraseña",
     "Email link to person" : "Enviar el enlace por e-mail.",
     "Send" : "Mandar",
-    "Set expiration date" : "Asignar fecha de vencimiento",
-    "Expiration" : "Vencimiento",
-    "Expiration date" : "Fecha de vencimiento",
-    "group" : "grupo",
-    "Resharing is not allowed" : "No se permite volver a compartir",
+    "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido con vos por {owner}",
     "Shared in {item} with {user}" : "Compartido en {item} con {user}",
-    "Unshare" : "Dejar de compartir",
+    "group" : "grupo",
     "notify by email" : "notificar por correo",
+    "Unshare" : "Dejar de compartir",
     "can share" : "puede compartir",
     "can edit" : "podés editar",
-    "access control" : "control de acceso",
     "create" : "crear",
     "delete" : "borrar",
-    "Password protected" : "Protegido por contraseña",
-    "Error unsetting expiration date" : "Error al remover la fecha de vencimiento",
-    "Error setting expiration date" : "Error al asignar fecha de vencimiento",
-    "Sending ..." : "Mandando...",
-    "Email sent" : "e-mail mandado",
+    "access control" : "control de acceso",
+    "Share" : "Compartir",
     "Warning" : "Atención",
     "The object type is not specified." : "El tipo de objeto no está especificado. ",
     "Enter new" : "Entrar nuevo",
diff --git a/core/l10n/es_CL.js b/core/l10n/es_CL.js
index 3558448c964..23e151199a7 100644
--- a/core/l10n/es_CL.js
+++ b/core/l10n/es_CL.js
@@ -33,8 +33,8 @@ OC.L10N.register(
     "Error while sharing" : "Ocurrió un error mientras compartía",
     "Error while unsharing" : "Ocurrió un error mientras dejaba de compartir",
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
-    "Share" : "Compartir",
     "Password" : "Clave",
+    "Share" : "Compartir",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Personal" : "Personal",
     "Users" : "Usuarios",
diff --git a/core/l10n/es_CL.json b/core/l10n/es_CL.json
index d1fc84c7e34..dd7bb617e64 100644
--- a/core/l10n/es_CL.json
+++ b/core/l10n/es_CL.json
@@ -31,8 +31,8 @@
     "Error while sharing" : "Ocurrió un error mientras compartía",
     "Error while unsharing" : "Ocurrió un error mientras dejaba de compartir",
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
-    "Share" : "Compartir",
     "Password" : "Clave",
+    "Share" : "Compartir",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Personal" : "Personal",
     "Users" : "Usuarios",
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index 6e875058445..81113221e66 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -70,32 +70,30 @@ OC.L10N.register(
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error al dejar de compartir",
     "Error while changing permissions" : "Error al cambiar permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Compartido contigo por {owner}",
-    "Share" : "Compartir",
+    "Error setting expiration date" : "Error estableciendo fecha de caducidad",
+    "Set expiration date" : "Establecer fecha de caducidad",
+    "Expiration" : "Caducidad",
+    "Expiration date" : "Fecha de caducidad",
+    "Sending ..." : "Enviando...",
+    "Email sent" : "Correo electrónico enviado",
+    "Resharing is not allowed" : "No se permite compartir de nuevo",
     "Share link" : "Enlace compartido",
     "Password protect" : "Protección con contraseña",
     "Password" : "Contraseña",
     "Email link to person" : "Enviar enlace por correo electrónico a una persona",
     "Send" : "Enviar",
-    "Set expiration date" : "Establecer fecha de caducidad",
-    "Expiration" : "Caducidad",
-    "Expiration date" : "Fecha de caducidad",
-    "group" : "grupo",
-    "Resharing is not allowed" : "No se permite compartir de nuevo",
+    "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido contigo por {owner}",
     "Shared in {item} with {user}" : "Compartido en {item} con {user}",
-    "Unshare" : "Dejar de compartir",
+    "group" : "grupo",
     "notify by email" : "notificar al usuario por correo electrónico",
+    "Unshare" : "Dejar de compartir",
     "can share" : "puede compartir",
     "can edit" : "puede editar",
-    "access control" : "control de acceso",
     "create" : "crear",
     "delete" : "eliminar",
-    "Password protected" : "Protegido con contraseña",
-    "Error unsetting expiration date" : "Error eliminando fecha de caducidad",
-    "Error setting expiration date" : "Error estableciendo fecha de caducidad",
-    "Sending ..." : "Enviando...",
-    "Email sent" : "Correo electrónico enviado",
+    "access control" : "control de acceso",
+    "Share" : "Compartir",
     "Warning" : "Precaución",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Enter new" : "Ingresar nueva",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index b6eeb9b4597..978274222fe 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -68,32 +68,30 @@
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error al dejar de compartir",
     "Error while changing permissions" : "Error al cambiar permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Compartido contigo por {owner}",
-    "Share" : "Compartir",
+    "Error setting expiration date" : "Error estableciendo fecha de caducidad",
+    "Set expiration date" : "Establecer fecha de caducidad",
+    "Expiration" : "Caducidad",
+    "Expiration date" : "Fecha de caducidad",
+    "Sending ..." : "Enviando...",
+    "Email sent" : "Correo electrónico enviado",
+    "Resharing is not allowed" : "No se permite compartir de nuevo",
     "Share link" : "Enlace compartido",
     "Password protect" : "Protección con contraseña",
     "Password" : "Contraseña",
     "Email link to person" : "Enviar enlace por correo electrónico a una persona",
     "Send" : "Enviar",
-    "Set expiration date" : "Establecer fecha de caducidad",
-    "Expiration" : "Caducidad",
-    "Expiration date" : "Fecha de caducidad",
-    "group" : "grupo",
-    "Resharing is not allowed" : "No se permite compartir de nuevo",
+    "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido contigo por {owner}",
     "Shared in {item} with {user}" : "Compartido en {item} con {user}",
-    "Unshare" : "Dejar de compartir",
+    "group" : "grupo",
     "notify by email" : "notificar al usuario por correo electrónico",
+    "Unshare" : "Dejar de compartir",
     "can share" : "puede compartir",
     "can edit" : "puede editar",
-    "access control" : "control de acceso",
     "create" : "crear",
     "delete" : "eliminar",
-    "Password protected" : "Protegido con contraseña",
-    "Error unsetting expiration date" : "Error eliminando fecha de caducidad",
-    "Error setting expiration date" : "Error estableciendo fecha de caducidad",
-    "Sending ..." : "Enviando...",
-    "Email sent" : "Correo electrónico enviado",
+    "access control" : "control de acceso",
+    "Share" : "Compartir",
     "Warning" : "Precaución",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Enter new" : "Ingresar nueva",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 7395970563e..1c49deff6ca 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -105,13 +105,15 @@ OC.L10N.register(
     "Error while sharing" : "Viga jagamisel",
     "Error while unsharing" : "Viga jagamise lõpetamisel",
     "Error while changing permissions" : "Viga õiguste muutmisel",
-    "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt",
-    "Shared with you by {owner}" : "Sinuga jagas {owner}",
-    "Share with users or groups …" : "Jaga kasutajate või gruppidega ...",
-    "Share with users, groups or remote users …" : "Jaga kasutajate, gruppide või eemal olevate kasutajatega ...",
-    "Share" : "Jaga",
-    "Share link" : "Jaga linki",
+    "Error setting expiration date" : "Viga aegumise kuupäeva määramisel",
     "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
+    "Set expiration date" : "Määra aegumise kuupäev",
+    "Expiration" : "Aegumine",
+    "Expiration date" : "Aegumise kuupäev",
+    "Sending ..." : "Saatmine ...",
+    "Email sent" : "E-kiri on saadetud",
+    "Resharing is not allowed" : "Edasijagamine pole lubatud",
+    "Share link" : "Jaga linki",
     "Link" : "Link",
     "Password protect" : "Parooliga kaitstud",
     "Password" : "Parool",
@@ -119,27 +121,22 @@ OC.L10N.register(
     "Allow editing" : "Luba muutmine",
     "Email link to person" : "Saada link isikule e-postiga",
     "Send" : "Saada",
-    "Set expiration date" : "Määra aegumise kuupäev",
-    "Expiration" : "Aegumine",
-    "Expiration date" : "Aegumise kuupäev",
-    "An error occured. Please try again" : "Tekkis tõrge. Palun proovi uuesti",
-    "Adding user..." : "Kasutaja lisamine...",
-    "group" : "grupp",
-    "Resharing is not allowed" : "Edasijagamine pole lubatud",
+    "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt",
+    "Shared with you by {owner}" : "Sinuga jagas {owner}",
     "Shared in {item} with {user}" : "Jagatud {item} kasutajaga {user}",
-    "Unshare" : "Lõpeta jagamine",
+    "group" : "grupp",
     "notify by email" : "teavita e-postiga",
+    "Unshare" : "Lõpeta jagamine",
     "can share" : "saab jagada",
     "can edit" : "saab muuta",
-    "access control" : "ligipääsukontroll",
     "create" : "loo",
     "change" : "muuda",
     "delete" : "kustuta",
-    "Password protected" : "Parooliga kaitstud",
-    "Error unsetting expiration date" : "Viga aegumise kuupäeva eemaldamisel",
-    "Error setting expiration date" : "Viga aegumise kuupäeva määramisel",
-    "Sending ..." : "Saatmine ...",
-    "Email sent" : "E-kiri on saadetud",
+    "access control" : "ligipääsukontroll",
+    "An error occured. Please try again" : "Tekkis tõrge. Palun proovi uuesti",
+    "Share" : "Jaga",
+    "Share with users or groups …" : "Jaga kasutajate või gruppidega ...",
+    "Share with users, groups or remote users …" : "Jaga kasutajate, gruppide või eemal olevate kasutajatega ...",
     "Warning" : "Hoiatus",
     "The object type is not specified." : "Objekti tüüp pole määratletud.",
     "Enter new" : "Sisesta uus",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 43a04a5ddce..9e11b84d86e 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -103,13 +103,15 @@
     "Error while sharing" : "Viga jagamisel",
     "Error while unsharing" : "Viga jagamise lõpetamisel",
     "Error while changing permissions" : "Viga õiguste muutmisel",
-    "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt",
-    "Shared with you by {owner}" : "Sinuga jagas {owner}",
-    "Share with users or groups …" : "Jaga kasutajate või gruppidega ...",
-    "Share with users, groups or remote users …" : "Jaga kasutajate, gruppide või eemal olevate kasutajatega ...",
-    "Share" : "Jaga",
-    "Share link" : "Jaga linki",
+    "Error setting expiration date" : "Viga aegumise kuupäeva määramisel",
     "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
+    "Set expiration date" : "Määra aegumise kuupäev",
+    "Expiration" : "Aegumine",
+    "Expiration date" : "Aegumise kuupäev",
+    "Sending ..." : "Saatmine ...",
+    "Email sent" : "E-kiri on saadetud",
+    "Resharing is not allowed" : "Edasijagamine pole lubatud",
+    "Share link" : "Jaga linki",
     "Link" : "Link",
     "Password protect" : "Parooliga kaitstud",
     "Password" : "Parool",
@@ -117,27 +119,22 @@
     "Allow editing" : "Luba muutmine",
     "Email link to person" : "Saada link isikule e-postiga",
     "Send" : "Saada",
-    "Set expiration date" : "Määra aegumise kuupäev",
-    "Expiration" : "Aegumine",
-    "Expiration date" : "Aegumise kuupäev",
-    "An error occured. Please try again" : "Tekkis tõrge. Palun proovi uuesti",
-    "Adding user..." : "Kasutaja lisamine...",
-    "group" : "grupp",
-    "Resharing is not allowed" : "Edasijagamine pole lubatud",
+    "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt",
+    "Shared with you by {owner}" : "Sinuga jagas {owner}",
     "Shared in {item} with {user}" : "Jagatud {item} kasutajaga {user}",
-    "Unshare" : "Lõpeta jagamine",
+    "group" : "grupp",
     "notify by email" : "teavita e-postiga",
+    "Unshare" : "Lõpeta jagamine",
     "can share" : "saab jagada",
     "can edit" : "saab muuta",
-    "access control" : "ligipääsukontroll",
     "create" : "loo",
     "change" : "muuda",
     "delete" : "kustuta",
-    "Password protected" : "Parooliga kaitstud",
-    "Error unsetting expiration date" : "Viga aegumise kuupäeva eemaldamisel",
-    "Error setting expiration date" : "Viga aegumise kuupäeva määramisel",
-    "Sending ..." : "Saatmine ...",
-    "Email sent" : "E-kiri on saadetud",
+    "access control" : "ligipääsukontroll",
+    "An error occured. Please try again" : "Tekkis tõrge. Palun proovi uuesti",
+    "Share" : "Jaga",
+    "Share with users or groups …" : "Jaga kasutajate või gruppidega ...",
+    "Share with users, groups or remote users …" : "Jaga kasutajate, gruppide või eemal olevate kasutajatega ...",
     "Warning" : "Hoiatus",
     "The object type is not specified." : "Objekti tüüp pole määratletud.",
     "Enter new" : "Sisesta uus",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index 88b75072356..a0d4650a4ae 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -88,11 +88,15 @@ OC.L10N.register(
     "Error while sharing" : "Errore bat egon da elkarbanatzean",
     "Error while unsharing" : "Errore bat egon da elkarbanaketa desegitean",
     "Error while changing permissions" : "Errore bat egon da baimenak aldatzean",
-    "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
-    "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
-    "Share" : "Elkarbanatu",
-    "Share link" : "Elkarbanatu lotura",
+    "Error setting expiration date" : "Errore bat egon da muga data ezartzean",
     "The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
+    "Set expiration date" : "Ezarri muga data",
+    "Expiration" : "Iraungitzea",
+    "Expiration date" : "Muga data",
+    "Sending ..." : "Bidaltzen ...",
+    "Email sent" : "Eposta bidalia",
+    "Resharing is not allowed" : "Berriz elkarbanatzea ez dago baimendua",
+    "Share link" : "Elkarbanatu lotura",
     "Link" : "Esteka",
     "Password protect" : "Babestu pasahitzarekin",
     "Password" : "Pasahitza",
@@ -100,27 +104,20 @@ OC.L10N.register(
     "Allow editing" : "Baimendu editatzea",
     "Email link to person" : "Postaz bidali lotura ",
     "Send" : "Bidali",
-    "Set expiration date" : "Ezarri muga data",
-    "Expiration" : "Iraungitzea",
-    "Expiration date" : "Muga data",
-    "Adding user..." : "Erabiltzailea gehitzen...",
+    "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
+    "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
+    "Shared in {item} with {user}" : "{user}ekin {item}-n elkarbanatuta",
     "group" : "taldea",
     "remote" : "urrunekoa",
-    "Resharing is not allowed" : "Berriz elkarbanatzea ez dago baimendua",
-    "Shared in {item} with {user}" : "{user}ekin {item}-n elkarbanatuta",
-    "Unshare" : "Ez elkarbanatu",
     "notify by email" : "jakinarazi eposta bidez",
+    "Unshare" : "Ez elkarbanatu",
     "can share" : "elkarbana dezake",
     "can edit" : "editatu dezake",
-    "access control" : "sarrera kontrola",
     "create" : "sortu",
     "change" : "aldatu",
     "delete" : "ezabatu",
-    "Password protected" : "Pasahitzarekin babestuta",
-    "Error unsetting expiration date" : "Errorea izan da muga data kentzean",
-    "Error setting expiration date" : "Errore bat egon da muga data ezartzean",
-    "Sending ..." : "Bidaltzen ...",
-    "Email sent" : "Eposta bidalia",
+    "access control" : "sarrera kontrola",
+    "Share" : "Elkarbanatu",
     "Warning" : "Abisua",
     "The object type is not specified." : "Objetu mota ez dago zehaztuta.",
     "Enter new" : "Sartu berria",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index 51143f24767..e4ccdd8584c 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -86,11 +86,15 @@
     "Error while sharing" : "Errore bat egon da elkarbanatzean",
     "Error while unsharing" : "Errore bat egon da elkarbanaketa desegitean",
     "Error while changing permissions" : "Errore bat egon da baimenak aldatzean",
-    "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
-    "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
-    "Share" : "Elkarbanatu",
-    "Share link" : "Elkarbanatu lotura",
+    "Error setting expiration date" : "Errore bat egon da muga data ezartzean",
     "The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
+    "Set expiration date" : "Ezarri muga data",
+    "Expiration" : "Iraungitzea",
+    "Expiration date" : "Muga data",
+    "Sending ..." : "Bidaltzen ...",
+    "Email sent" : "Eposta bidalia",
+    "Resharing is not allowed" : "Berriz elkarbanatzea ez dago baimendua",
+    "Share link" : "Elkarbanatu lotura",
     "Link" : "Esteka",
     "Password protect" : "Babestu pasahitzarekin",
     "Password" : "Pasahitza",
@@ -98,27 +102,20 @@
     "Allow editing" : "Baimendu editatzea",
     "Email link to person" : "Postaz bidali lotura ",
     "Send" : "Bidali",
-    "Set expiration date" : "Ezarri muga data",
-    "Expiration" : "Iraungitzea",
-    "Expiration date" : "Muga data",
-    "Adding user..." : "Erabiltzailea gehitzen...",
+    "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
+    "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
+    "Shared in {item} with {user}" : "{user}ekin {item}-n elkarbanatuta",
     "group" : "taldea",
     "remote" : "urrunekoa",
-    "Resharing is not allowed" : "Berriz elkarbanatzea ez dago baimendua",
-    "Shared in {item} with {user}" : "{user}ekin {item}-n elkarbanatuta",
-    "Unshare" : "Ez elkarbanatu",
     "notify by email" : "jakinarazi eposta bidez",
+    "Unshare" : "Ez elkarbanatu",
     "can share" : "elkarbana dezake",
     "can edit" : "editatu dezake",
-    "access control" : "sarrera kontrola",
     "create" : "sortu",
     "change" : "aldatu",
     "delete" : "ezabatu",
-    "Password protected" : "Pasahitzarekin babestuta",
-    "Error unsetting expiration date" : "Errorea izan da muga data kentzean",
-    "Error setting expiration date" : "Errore bat egon da muga data ezartzean",
-    "Sending ..." : "Bidaltzen ...",
-    "Email sent" : "Eposta bidalia",
+    "access control" : "sarrera kontrola",
+    "Share" : "Elkarbanatu",
     "Warning" : "Abisua",
     "The object type is not specified." : "Objetu mota ez dago zehaztuta.",
     "Enter new" : "Sartu berria",
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index 822db699b4a..b7312046777 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -79,32 +79,30 @@ OC.L10N.register(
     "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" : "اشتراک‌گذاری",
+    "Error setting expiration date" : "خطا در تنظیم تاریخ انقضا",
+    "Set expiration date" : "تنظیم تاریخ انقضا",
+    "Expiration" : "تاریخ انقضا",
+    "Expiration date" : "تاریخ انقضا",
+    "Sending ..." : "درحال ارسال ...",
+    "Email sent" : "ایمیل ارسال شد",
+    "Resharing is not allowed" : "اشتراک گذاری مجدد مجاز نمی باشد",
     "Share link" : "اشتراک گذاشتن لینک",
     "Password protect" : "نگهداری کردن رمز عبور",
     "Password" : "گذرواژه",
     "Email link to person" : "پیوند ایمیل برای شخص.",
     "Send" : "ارسال",
-    "Set expiration date" : "تنظیم تاریخ انقضا",
-    "Expiration" : "تاریخ انقضا",
-    "Expiration date" : "تاریخ انقضا",
-    "group" : "گروه",
-    "Resharing is not allowed" : "اشتراک گذاری مجدد مجاز نمی باشد",
+    "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
+    "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
     "Shared in {item} with {user}" : "به اشتراک گذاشته شده در {بخش} با {کاربر}",
-    "Unshare" : "لغو اشتراک",
+    "group" : "گروه",
     "notify by email" : "دریافت هشدار از طریق ایمیل",
+    "Unshare" : "لغو اشتراک",
     "can share" : "قابل به اشتراک گذاری",
     "can edit" : "می توان ویرایش کرد",
-    "access control" : "کنترل دسترسی",
     "create" : "ایجاد",
     "delete" : "پاک کردن",
-    "Password protected" : "نگهداری از رمز عبور",
-    "Error unsetting expiration date" : "خطا در تنظیم نکردن تاریخ انقضا ",
-    "Error setting expiration date" : "خطا در تنظیم تاریخ انقضا",
-    "Sending ..." : "درحال ارسال ...",
-    "Email sent" : "ایمیل ارسال شد",
+    "access control" : "کنترل دسترسی",
+    "Share" : "اشتراک‌گذاری",
     "Warning" : "اخطار",
     "The object type is not specified." : "نوع شی تعیین نشده است.",
     "Enter new" : "مورد جدید را وارد کنید",
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index b6edce93342..5ec3ad5ee0e 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -77,32 +77,30 @@
     "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" : "اشتراک‌گذاری",
+    "Error setting expiration date" : "خطا در تنظیم تاریخ انقضا",
+    "Set expiration date" : "تنظیم تاریخ انقضا",
+    "Expiration" : "تاریخ انقضا",
+    "Expiration date" : "تاریخ انقضا",
+    "Sending ..." : "درحال ارسال ...",
+    "Email sent" : "ایمیل ارسال شد",
+    "Resharing is not allowed" : "اشتراک گذاری مجدد مجاز نمی باشد",
     "Share link" : "اشتراک گذاشتن لینک",
     "Password protect" : "نگهداری کردن رمز عبور",
     "Password" : "گذرواژه",
     "Email link to person" : "پیوند ایمیل برای شخص.",
     "Send" : "ارسال",
-    "Set expiration date" : "تنظیم تاریخ انقضا",
-    "Expiration" : "تاریخ انقضا",
-    "Expiration date" : "تاریخ انقضا",
-    "group" : "گروه",
-    "Resharing is not allowed" : "اشتراک گذاری مجدد مجاز نمی باشد",
+    "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
+    "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
     "Shared in {item} with {user}" : "به اشتراک گذاشته شده در {بخش} با {کاربر}",
-    "Unshare" : "لغو اشتراک",
+    "group" : "گروه",
     "notify by email" : "دریافت هشدار از طریق ایمیل",
+    "Unshare" : "لغو اشتراک",
     "can share" : "قابل به اشتراک گذاری",
     "can edit" : "می توان ویرایش کرد",
-    "access control" : "کنترل دسترسی",
     "create" : "ایجاد",
     "delete" : "پاک کردن",
-    "Password protected" : "نگهداری از رمز عبور",
-    "Error unsetting expiration date" : "خطا در تنظیم نکردن تاریخ انقضا ",
-    "Error setting expiration date" : "خطا در تنظیم تاریخ انقضا",
-    "Sending ..." : "درحال ارسال ...",
-    "Email sent" : "ایمیل ارسال شد",
+    "access control" : "کنترل دسترسی",
+    "Share" : "اشتراک‌گذاری",
     "Warning" : "اخطار",
     "The object type is not specified." : "نوع شی تعیین نشده است.",
     "Enter new" : "مورد جدید را وارد کنید",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 2c3c3c49617..15c63679f21 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Virhe jaettaessa",
     "Error while unsharing" : "Virhe jakoa peruttaessa",
     "Error while changing permissions" : "Virhe oikeuksia muuttaessa",
-    "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
-    "Shared with you by {owner}" : "Jaettu kanssasi käyttäjän {owner} toimesta",
-    "Share with users or groups …" : "Jaa käyttäjien tai ryhmien kanssa…",
-    "Share with users, groups or remote users …" : "Jaa käyttäjien, ryhmien tai etäkäyttäjien kanssa…",
-    "Share" : "Jaa",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Jaa toisia ownCloud-järjestelmiä käyttävien kesken käyttäen syntaksia käyttäjätunnus@esimerkki.fi/owncloud",
-    "Share link" : "Jaa linkki",
+    "Error setting expiration date" : "Virhe päättymispäivää asettaessa",
     "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",
+    "Set expiration date" : "Aseta päättymispäivä",
+    "Expiration" : "Erääntyminen",
+    "Expiration date" : "Päättymispäivä",
+    "Sending ..." : "Lähetetään...",
+    "Email sent" : "Sähköposti lähetetty",
+    "Resharing is not allowed" : "Jakaminen uudelleen ei ole salittu",
+    "Share link" : "Jaa linkki",
     "Link" : "Linkki",
     "Password protect" : "Suojaa salasanalla",
     "Password" : "Salasana",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Salli muokkaus",
     "Email link to person" : "Lähetä linkki sähköpostitse",
     "Send" : "Lähetä",
-    "Set expiration date" : "Aseta päättymispäivä",
-    "Expiration" : "Erääntyminen",
-    "Expiration date" : "Päättymispäivä",
-    "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan",
-    "Adding user..." : "Lisätään käyttäjä...",
+    "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
+    "Shared with you by {owner}" : "Jaettu kanssasi käyttäjän {owner} toimesta",
+    "Shared in {item} with {user}" : "{item} on jaettu {user} kanssa",
     "group" : "ryhmä",
     "remote" : "etä",
-    "Resharing is not allowed" : "Jakaminen uudelleen ei ole salittu",
-    "Shared in {item} with {user}" : "{item} on jaettu {user} kanssa",
-    "Unshare" : "Peru jakaminen",
     "notify by email" : "ilmoita sähköpostitse",
+    "Unshare" : "Peru jakaminen",
     "can share" : "jaa",
     "can edit" : "voi muokata",
-    "access control" : "Pääsyn hallinta",
     "create" : "luo",
     "change" : "muuta",
     "delete" : "poista",
-    "Password protected" : "Salasanasuojattu",
-    "Error unsetting expiration date" : "Virhe purettaessa eräpäivää",
-    "Error setting expiration date" : "Virhe päättymispäivää asettaessa",
-    "Sending ..." : "Lähetetään...",
-    "Email sent" : "Sähköposti lähetetty",
+    "access control" : "Pääsyn hallinta",
+    "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan",
+    "Share" : "Jaa",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Jaa toisia ownCloud-järjestelmiä käyttävien kesken käyttäen syntaksia käyttäjätunnus@esimerkki.fi/owncloud",
+    "Share with users or groups …" : "Jaa käyttäjien tai ryhmien kanssa…",
+    "Share with users, groups or remote users …" : "Jaa käyttäjien, ryhmien tai etäkäyttäjien kanssa…",
     "Warning" : "Varoitus",
     "The object type is not specified." : "The object type is not specified.",
     "Enter new" : "Kirjoita uusi",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index e0ac2410747..69045e7783f 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Virhe jaettaessa",
     "Error while unsharing" : "Virhe jakoa peruttaessa",
     "Error while changing permissions" : "Virhe oikeuksia muuttaessa",
-    "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
-    "Shared with you by {owner}" : "Jaettu kanssasi käyttäjän {owner} toimesta",
-    "Share with users or groups …" : "Jaa käyttäjien tai ryhmien kanssa…",
-    "Share with users, groups or remote users …" : "Jaa käyttäjien, ryhmien tai etäkäyttäjien kanssa…",
-    "Share" : "Jaa",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Jaa toisia ownCloud-järjestelmiä käyttävien kesken käyttäen syntaksia käyttäjätunnus@esimerkki.fi/owncloud",
-    "Share link" : "Jaa linkki",
+    "Error setting expiration date" : "Virhe päättymispäivää asettaessa",
     "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",
+    "Set expiration date" : "Aseta päättymispäivä",
+    "Expiration" : "Erääntyminen",
+    "Expiration date" : "Päättymispäivä",
+    "Sending ..." : "Lähetetään...",
+    "Email sent" : "Sähköposti lähetetty",
+    "Resharing is not allowed" : "Jakaminen uudelleen ei ole salittu",
+    "Share link" : "Jaa linkki",
     "Link" : "Linkki",
     "Password protect" : "Suojaa salasanalla",
     "Password" : "Salasana",
@@ -129,28 +130,24 @@
     "Allow editing" : "Salli muokkaus",
     "Email link to person" : "Lähetä linkki sähköpostitse",
     "Send" : "Lähetä",
-    "Set expiration date" : "Aseta päättymispäivä",
-    "Expiration" : "Erääntyminen",
-    "Expiration date" : "Päättymispäivä",
-    "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan",
-    "Adding user..." : "Lisätään käyttäjä...",
+    "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
+    "Shared with you by {owner}" : "Jaettu kanssasi käyttäjän {owner} toimesta",
+    "Shared in {item} with {user}" : "{item} on jaettu {user} kanssa",
     "group" : "ryhmä",
     "remote" : "etä",
-    "Resharing is not allowed" : "Jakaminen uudelleen ei ole salittu",
-    "Shared in {item} with {user}" : "{item} on jaettu {user} kanssa",
-    "Unshare" : "Peru jakaminen",
     "notify by email" : "ilmoita sähköpostitse",
+    "Unshare" : "Peru jakaminen",
     "can share" : "jaa",
     "can edit" : "voi muokata",
-    "access control" : "Pääsyn hallinta",
     "create" : "luo",
     "change" : "muuta",
     "delete" : "poista",
-    "Password protected" : "Salasanasuojattu",
-    "Error unsetting expiration date" : "Virhe purettaessa eräpäivää",
-    "Error setting expiration date" : "Virhe päättymispäivää asettaessa",
-    "Sending ..." : "Lähetetään...",
-    "Email sent" : "Sähköposti lähetetty",
+    "access control" : "Pääsyn hallinta",
+    "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan",
+    "Share" : "Jaa",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Jaa toisia ownCloud-järjestelmiä käyttävien kesken käyttäen syntaksia käyttäjätunnus@esimerkki.fi/owncloud",
+    "Share with users or groups …" : "Jaa käyttäjien tai ryhmien kanssa…",
+    "Share with users, groups or remote users …" : "Jaa käyttäjien, ryhmien tai etäkäyttäjien kanssa…",
     "Warning" : "Varoitus",
     "The object type is not specified." : "The object type is not specified.",
     "Enter new" : "Kirjoita uusi",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 27bea200a63..3335924e5e1 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Erreur lors de la mise en partage",
     "Error while unsharing" : "Erreur lors de l'annulation du partage",
     "Error while changing permissions" : "Erreur lors du changement des permissions",
-    "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
-    "Shared with you by {owner}" : "Partagé avec vous par {owner}",
-    "Share with users or groups …" : "Partager avec des utilisateurs ou groupes...",
-    "Share with users, groups or remote users …" : "Partager avec des utilisateurs, groupes, ou utilisateurs distants",
-    "Share" : "Partager",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partagez avec des personnes sur d'autres ownClouds en utilisant la syntaxe utilisateur@exemple.com/owncloud",
-    "Share link" : "Partager par lien public",
+    "Error setting expiration date" : "Erreur lors de la spécification de la date d'expiration",
     "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera au plus tard {days} jours après sa création.",
+    "Set expiration date" : "Spécifier une date d'expiration",
+    "Expiration" : "Expiration",
+    "Expiration date" : "Date d'expiration",
+    "Sending ..." : "Envoi…",
+    "Email sent" : "Courriel envoyé",
+    "Resharing is not allowed" : "Le repartage n'est pas autorisé",
+    "Share link" : "Partager par lien public",
     "Link" : "Lien",
     "Password protect" : "Protéger par un mot de passe",
     "Password" : "Mot de passe",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Permettre la modification",
     "Email link to person" : "Envoyer le lien par courriel",
     "Send" : "Envoyer",
-    "Set expiration date" : "Spécifier une date d'expiration",
-    "Expiration" : "Expiration",
-    "Expiration date" : "Date d'expiration",
-    "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer",
-    "Adding user..." : "Ajout de l'utilisateur...",
+    "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
+    "Shared with you by {owner}" : "Partagé avec vous par {owner}",
+    "Shared in {item} with {user}" : "Partagé dans {item} avec {user}",
     "group" : "groupe",
     "remote" : "distant",
-    "Resharing is not allowed" : "Le repartage n'est pas autorisé",
-    "Shared in {item} with {user}" : "Partagé dans {item} avec {user}",
-    "Unshare" : "Ne plus partager",
     "notify by email" : "notifier par courriel",
+    "Unshare" : "Ne plus partager",
     "can share" : "peut partager",
     "can edit" : "peut modifier",
-    "access control" : "contrôle d'accès",
     "create" : "créer",
     "change" : "modification",
     "delete" : "supprimer",
-    "Password protected" : "Protégé par mot de passe",
-    "Error unsetting expiration date" : "Erreur lors de la suppression de la date d'expiration",
-    "Error setting expiration date" : "Erreur lors de la spécification de la date d'expiration",
-    "Sending ..." : "Envoi…",
-    "Email sent" : "Courriel envoyé",
+    "access control" : "contrôle d'accès",
+    "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer",
+    "Share" : "Partager",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partagez avec des personnes sur d'autres ownClouds en utilisant la syntaxe utilisateur@exemple.com/owncloud",
+    "Share with users or groups …" : "Partager avec des utilisateurs ou groupes...",
+    "Share with users, groups or remote users …" : "Partager avec des utilisateurs, groupes, ou utilisateurs distants",
     "Warning" : "Attention",
     "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
     "Enter new" : "Saisir un nouveau",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index ac12a4673d5..225146cfb73 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Erreur lors de la mise en partage",
     "Error while unsharing" : "Erreur lors de l'annulation du partage",
     "Error while changing permissions" : "Erreur lors du changement des permissions",
-    "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
-    "Shared with you by {owner}" : "Partagé avec vous par {owner}",
-    "Share with users or groups …" : "Partager avec des utilisateurs ou groupes...",
-    "Share with users, groups or remote users …" : "Partager avec des utilisateurs, groupes, ou utilisateurs distants",
-    "Share" : "Partager",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partagez avec des personnes sur d'autres ownClouds en utilisant la syntaxe utilisateur@exemple.com/owncloud",
-    "Share link" : "Partager par lien public",
+    "Error setting expiration date" : "Erreur lors de la spécification de la date d'expiration",
     "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera au plus tard {days} jours après sa création.",
+    "Set expiration date" : "Spécifier une date d'expiration",
+    "Expiration" : "Expiration",
+    "Expiration date" : "Date d'expiration",
+    "Sending ..." : "Envoi…",
+    "Email sent" : "Courriel envoyé",
+    "Resharing is not allowed" : "Le repartage n'est pas autorisé",
+    "Share link" : "Partager par lien public",
     "Link" : "Lien",
     "Password protect" : "Protéger par un mot de passe",
     "Password" : "Mot de passe",
@@ -129,28 +130,24 @@
     "Allow editing" : "Permettre la modification",
     "Email link to person" : "Envoyer le lien par courriel",
     "Send" : "Envoyer",
-    "Set expiration date" : "Spécifier une date d'expiration",
-    "Expiration" : "Expiration",
-    "Expiration date" : "Date d'expiration",
-    "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer",
-    "Adding user..." : "Ajout de l'utilisateur...",
+    "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
+    "Shared with you by {owner}" : "Partagé avec vous par {owner}",
+    "Shared in {item} with {user}" : "Partagé dans {item} avec {user}",
     "group" : "groupe",
     "remote" : "distant",
-    "Resharing is not allowed" : "Le repartage n'est pas autorisé",
-    "Shared in {item} with {user}" : "Partagé dans {item} avec {user}",
-    "Unshare" : "Ne plus partager",
     "notify by email" : "notifier par courriel",
+    "Unshare" : "Ne plus partager",
     "can share" : "peut partager",
     "can edit" : "peut modifier",
-    "access control" : "contrôle d'accès",
     "create" : "créer",
     "change" : "modification",
     "delete" : "supprimer",
-    "Password protected" : "Protégé par mot de passe",
-    "Error unsetting expiration date" : "Erreur lors de la suppression de la date d'expiration",
-    "Error setting expiration date" : "Erreur lors de la spécification de la date d'expiration",
-    "Sending ..." : "Envoi…",
-    "Email sent" : "Courriel envoyé",
+    "access control" : "contrôle d'accès",
+    "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer",
+    "Share" : "Partager",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partagez avec des personnes sur d'autres ownClouds en utilisant la syntaxe utilisateur@exemple.com/owncloud",
+    "Share with users or groups …" : "Partager avec des utilisateurs ou groupes...",
+    "Share with users, groups or remote users …" : "Partager avec des utilisateurs, groupes, ou utilisateurs distants",
     "Warning" : "Attention",
     "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
     "Enter new" : "Saisir un nouveau",
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index 583931d5068..8cff0f073d6 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -112,14 +112,15 @@ OC.L10N.register(
     "Error while sharing" : "Produciuse un erro ao compartir",
     "Error while unsharing" : "Produciuse un erro ao deixar de compartir",
     "Error while changing permissions" : "Produciuse un erro ao cambiar os permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartido con vostede e co grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Compartido con vostede por {owner}",
-    "Share with users or groups …" : "Compartir con usuarios ou grupos ...",
-    "Share with users, groups or remote users …" : "Compartir con usuarios, grupos ou usuarios remotos ...",
-    "Share" : "Compartir",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»",
-    "Share link" : "Ligazón para compartir",
+    "Error setting expiration date" : "Produciuse un erro ao definir a data de caducidade",
     "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",
+    "Set expiration date" : "Definir a data de caducidade",
+    "Expiration" : "Caducidade",
+    "Expiration date" : "Data de caducidade",
+    "Sending ..." : "Enviando...",
+    "Email sent" : "Correo enviado",
+    "Resharing is not allowed" : "Non se permite volver compartir",
+    "Share link" : "Ligazón para compartir",
     "Link" : "Ligazón",
     "Password protect" : "Protexido con contrasinal",
     "Password" : "Contrasinal",
@@ -127,28 +128,24 @@ OC.L10N.register(
     "Allow editing" : "Permitir a edición",
     "Email link to person" : "Enviar ligazón por correo",
     "Send" : "Enviar",
-    "Set expiration date" : "Definir a data de caducidade",
-    "Expiration" : "Caducidade",
-    "Expiration date" : "Data de caducidade",
-    "An error occured. Please try again" : "Produciuse un erro, ténteo de novo",
-    "Adding user..." : "Engadindo usuario...",
+    "Shared with you and the group {group} by {owner}" : "Compartido con vostede e co grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido con vostede por {owner}",
+    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
     "group" : "grupo",
     "remote" : "remoto",
-    "Resharing is not allowed" : "Non se permite volver compartir",
-    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
-    "Unshare" : "Deixar de compartir",
     "notify by email" : "notificar por correo",
+    "Unshare" : "Deixar de compartir",
     "can share" : "pode compartir",
     "can edit" : "pode editar",
-    "access control" : "control de acceso",
     "create" : "crear",
     "change" : "cambio",
     "delete" : "eliminar",
-    "Password protected" : "Protexido con contrasinal",
-    "Error unsetting expiration date" : "Produciuse un erro ao retirar a data de caducidade",
-    "Error setting expiration date" : "Produciuse un erro ao definir a data de caducidade",
-    "Sending ..." : "Enviando...",
-    "Email sent" : "Correo enviado",
+    "access control" : "control de acceso",
+    "An error occured. Please try again" : "Produciuse un erro, ténteo de novo",
+    "Share" : "Compartir",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»",
+    "Share with users or groups …" : "Compartir con usuarios ou grupos ...",
+    "Share with users, groups or remote users …" : "Compartir con usuarios, grupos ou usuarios remotos ...",
     "Warning" : "Aviso",
     "The object type is not specified." : "Non se especificou o tipo de obxecto.",
     "Enter new" : "Introduza o novo",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index 7d33ed6cc76..9ce7bf5c34b 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -110,14 +110,15 @@
     "Error while sharing" : "Produciuse un erro ao compartir",
     "Error while unsharing" : "Produciuse un erro ao deixar de compartir",
     "Error while changing permissions" : "Produciuse un erro ao cambiar os permisos",
-    "Shared with you and the group {group} by {owner}" : "Compartido con vostede e co grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Compartido con vostede por {owner}",
-    "Share with users or groups …" : "Compartir con usuarios ou grupos ...",
-    "Share with users, groups or remote users …" : "Compartir con usuarios, grupos ou usuarios remotos ...",
-    "Share" : "Compartir",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»",
-    "Share link" : "Ligazón para compartir",
+    "Error setting expiration date" : "Produciuse un erro ao definir a data de caducidade",
     "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",
+    "Set expiration date" : "Definir a data de caducidade",
+    "Expiration" : "Caducidade",
+    "Expiration date" : "Data de caducidade",
+    "Sending ..." : "Enviando...",
+    "Email sent" : "Correo enviado",
+    "Resharing is not allowed" : "Non se permite volver compartir",
+    "Share link" : "Ligazón para compartir",
     "Link" : "Ligazón",
     "Password protect" : "Protexido con contrasinal",
     "Password" : "Contrasinal",
@@ -125,28 +126,24 @@
     "Allow editing" : "Permitir a edición",
     "Email link to person" : "Enviar ligazón por correo",
     "Send" : "Enviar",
-    "Set expiration date" : "Definir a data de caducidade",
-    "Expiration" : "Caducidade",
-    "Expiration date" : "Data de caducidade",
-    "An error occured. Please try again" : "Produciuse un erro, ténteo de novo",
-    "Adding user..." : "Engadindo usuario...",
+    "Shared with you and the group {group} by {owner}" : "Compartido con vostede e co grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido con vostede por {owner}",
+    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
     "group" : "grupo",
     "remote" : "remoto",
-    "Resharing is not allowed" : "Non se permite volver compartir",
-    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
-    "Unshare" : "Deixar de compartir",
     "notify by email" : "notificar por correo",
+    "Unshare" : "Deixar de compartir",
     "can share" : "pode compartir",
     "can edit" : "pode editar",
-    "access control" : "control de acceso",
     "create" : "crear",
     "change" : "cambio",
     "delete" : "eliminar",
-    "Password protected" : "Protexido con contrasinal",
-    "Error unsetting expiration date" : "Produciuse un erro ao retirar a data de caducidade",
-    "Error setting expiration date" : "Produciuse un erro ao definir a data de caducidade",
-    "Sending ..." : "Enviando...",
-    "Email sent" : "Correo enviado",
+    "access control" : "control de acceso",
+    "An error occured. Please try again" : "Produciuse un erro, ténteo de novo",
+    "Share" : "Compartir",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»",
+    "Share with users or groups …" : "Compartir con usuarios ou grupos ...",
+    "Share with users, groups or remote users …" : "Compartir con usuarios, grupos ou usuarios remotos ...",
     "Warning" : "Aviso",
     "The object type is not specified." : "Non se especificou o tipo de obxecto.",
     "Enter new" : "Introduza o novo",
diff --git a/core/l10n/he.js b/core/l10n/he.js
index 3285a569d34..c590e0c530e 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -52,30 +52,28 @@ OC.L10N.register(
     "Error while sharing" : "שגיאה במהלך השיתוף",
     "Error while unsharing" : "שגיאה במהלך ביטול השיתוף",
     "Error while changing permissions" : "שגיאה במהלך שינוי ההגדרות",
-    "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
-    "Shared with you by {owner}" : "שותף אתך על ידי {owner}",
-    "Share" : "שתף",
+    "Error setting expiration date" : "אירעה שגיאה בעת הגדרת תאריך התפוגה",
+    "Set expiration date" : "הגדרת תאריך תפוגה",
+    "Expiration date" : "תאריך התפוגה",
+    "Sending ..." : "מתבצעת שליחה ...",
+    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "Resharing is not allowed" : "אסור לעשות שיתוף מחדש",
     "Share link" : "קישור לשיתוף",
     "Password protect" : "הגנה בססמה",
     "Password" : "סיסמא",
     "Email link to person" : "שליחת קישור בדוא״ל למשתמש",
     "Send" : "שליחה",
-    "Set expiration date" : "הגדרת תאריך תפוגה",
-    "Expiration date" : "תאריך התפוגה",
-    "group" : "קבוצה",
-    "Resharing is not allowed" : "אסור לעשות שיתוף מחדש",
+    "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
+    "Shared with you by {owner}" : "שותף אתך על ידי {owner}",
     "Shared in {item} with {user}" : "שותף תחת {item} עם {user}",
+    "group" : "קבוצה",
     "Unshare" : "הסר שיתוף",
     "can share" : "ניתן לשתף",
     "can edit" : "ניתן לערוך",
-    "access control" : "בקרת גישה",
     "create" : "יצירה",
     "delete" : "מחיקה",
-    "Password protected" : "מוגן בססמה",
-    "Error unsetting expiration date" : "אירעה שגיאה בביטול תאריך התפוגה",
-    "Error setting expiration date" : "אירעה שגיאה בעת הגדרת תאריך התפוגה",
-    "Sending ..." : "מתבצעת שליחה ...",
-    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "access control" : "בקרת גישה",
+    "Share" : "שתף",
     "Warning" : "אזהרה",
     "The object type is not specified." : "סוג הפריט לא צוין.",
     "Delete" : "מחיקה",
diff --git a/core/l10n/he.json b/core/l10n/he.json
index 5db9f156d09..38cf01d285d 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -50,30 +50,28 @@
     "Error while sharing" : "שגיאה במהלך השיתוף",
     "Error while unsharing" : "שגיאה במהלך ביטול השיתוף",
     "Error while changing permissions" : "שגיאה במהלך שינוי ההגדרות",
-    "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
-    "Shared with you by {owner}" : "שותף אתך על ידי {owner}",
-    "Share" : "שתף",
+    "Error setting expiration date" : "אירעה שגיאה בעת הגדרת תאריך התפוגה",
+    "Set expiration date" : "הגדרת תאריך תפוגה",
+    "Expiration date" : "תאריך התפוגה",
+    "Sending ..." : "מתבצעת שליחה ...",
+    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "Resharing is not allowed" : "אסור לעשות שיתוף מחדש",
     "Share link" : "קישור לשיתוף",
     "Password protect" : "הגנה בססמה",
     "Password" : "סיסמא",
     "Email link to person" : "שליחת קישור בדוא״ל למשתמש",
     "Send" : "שליחה",
-    "Set expiration date" : "הגדרת תאריך תפוגה",
-    "Expiration date" : "תאריך התפוגה",
-    "group" : "קבוצה",
-    "Resharing is not allowed" : "אסור לעשות שיתוף מחדש",
+    "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
+    "Shared with you by {owner}" : "שותף אתך על ידי {owner}",
     "Shared in {item} with {user}" : "שותף תחת {item} עם {user}",
+    "group" : "קבוצה",
     "Unshare" : "הסר שיתוף",
     "can share" : "ניתן לשתף",
     "can edit" : "ניתן לערוך",
-    "access control" : "בקרת גישה",
     "create" : "יצירה",
     "delete" : "מחיקה",
-    "Password protected" : "מוגן בססמה",
-    "Error unsetting expiration date" : "אירעה שגיאה בביטול תאריך התפוגה",
-    "Error setting expiration date" : "אירעה שגיאה בעת הגדרת תאריך התפוגה",
-    "Sending ..." : "מתבצעת שליחה ...",
-    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "access control" : "בקרת גישה",
+    "Share" : "שתף",
     "Warning" : "אזהרה",
     "The object type is not specified." : "סוג הפריט לא צוין.",
     "Delete" : "מחיקה",
diff --git a/core/l10n/hi.js b/core/l10n/hi.js
index 48b726945a2..263af6c2806 100644
--- a/core/l10n/hi.js
+++ b/core/l10n/hi.js
@@ -24,11 +24,11 @@ OC.L10N.register(
     "Saving..." : "सहेज रहे हैं...",
     "Cancel" : "रद्द करें ",
     "Error" : "त्रुटि",
-    "Share" : "साझा करें",
-    "Password" : "पासवर्ड",
-    "Send" : "भेजें",
     "Sending ..." : "भेजा जा रहा है",
     "Email sent" : "ईमेल भेज दिया गया है ",
+    "Password" : "पासवर्ड",
+    "Send" : "भेजें",
+    "Share" : "साझा करें",
     "Warning" : "चेतावनी ",
     "Add" : "डाले",
     "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
diff --git a/core/l10n/hi.json b/core/l10n/hi.json
index 68a5ec96d2b..c9b53efee16 100644
--- a/core/l10n/hi.json
+++ b/core/l10n/hi.json
@@ -22,11 +22,11 @@
     "Saving..." : "सहेज रहे हैं...",
     "Cancel" : "रद्द करें ",
     "Error" : "त्रुटि",
-    "Share" : "साझा करें",
-    "Password" : "पासवर्ड",
-    "Send" : "भेजें",
     "Sending ..." : "भेजा जा रहा है",
     "Email sent" : "ईमेल भेज दिया गया है ",
+    "Password" : "पासवर्ड",
+    "Send" : "भेजें",
+    "Share" : "साझा करें",
     "Warning" : "चेतावनी ",
     "Add" : "डाले",
     "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index 44d9fab7740..f891532b283 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -88,11 +88,15 @@ OC.L10N.register(
     "Error while sharing" : "Pogreška pri dijeljenju",
     "Error while unsharing" : "Pogreška pri prestanku dijeljenja",
     "Error while changing permissions" : "POgreška pri mijenjanju dozvola",
-    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
-    "Shared with you by {owner}" : "S vama podijelio {owner}",
-    "Share" : "Podijelite",
-    "Share link" : "Podijelite vezu",
+    "Error setting expiration date" : "Pogrešno učitavanje postavke datuma isteka",
     "The public link will expire no later than {days} days after it is created" : " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
+    "Set expiration date" : "Odredite datum isteka",
+    "Expiration" : "Istjeće",
+    "Expiration date" : "Datum isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "E-pošta poslana",
+    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
+    "Share link" : "Podijelite vezu",
     "Link" : "Poveznica",
     "Password protect" : "Zaštititi lozinkom",
     "Password" : "Lozinka",
@@ -100,27 +104,20 @@ OC.L10N.register(
     "Allow editing" : "Omogući uređivanje",
     "Email link to person" : "Pošaljite osobi vezu e-poštom",
     "Send" : "Pošaljite",
-    "Set expiration date" : "Odredite datum isteka",
-    "Expiration" : "Istjeće",
-    "Expiration date" : "Datum isteka",
-    "Adding user..." : "Dodavanje korisnika...",
+    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
+    "Shared with you by {owner}" : "S vama podijelio {owner}",
+    "Shared in {item} with {user}" : "Podijeljeno u {item} sa {user}",
     "group" : "Grupa",
     "remote" : "na daljinu",
-    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
-    "Shared in {item} with {user}" : "Podijeljeno u {item} sa {user}",
-    "Unshare" : "Prestanite dijeliti",
     "notify by email" : "Obavijestite e-poštom",
+    "Unshare" : "Prestanite dijeliti",
     "can share" : "Dijeljenje moguće",
     "can edit" : "Uređivanje moguće",
-    "access control" : "Kontrola pristupa",
     "create" : "Kreirajte",
     "change" : "promijeni",
     "delete" : "Izbrišite",
-    "Password protected" : "Lozinka zaštićena",
-    "Error unsetting expiration date" : "Pogrešno uklanjanje postavke datuma isteka",
-    "Error setting expiration date" : "Pogrešno učitavanje postavke datuma isteka",
-    "Sending ..." : "Slanje...",
-    "Email sent" : "E-pošta poslana",
+    "access control" : "Kontrola pristupa",
+    "Share" : "Podijelite",
     "Warning" : "Upozorenje",
     "The object type is not specified." : "Vrsta objekta nije specificirana.",
     "Enter new" : "Unesite novi",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index 7a6ce98346f..3b4404dacb5 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -86,11 +86,15 @@
     "Error while sharing" : "Pogreška pri dijeljenju",
     "Error while unsharing" : "Pogreška pri prestanku dijeljenja",
     "Error while changing permissions" : "POgreška pri mijenjanju dozvola",
-    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
-    "Shared with you by {owner}" : "S vama podijelio {owner}",
-    "Share" : "Podijelite",
-    "Share link" : "Podijelite vezu",
+    "Error setting expiration date" : "Pogrešno učitavanje postavke datuma isteka",
     "The public link will expire no later than {days} days after it is created" : " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
+    "Set expiration date" : "Odredite datum isteka",
+    "Expiration" : "Istjeće",
+    "Expiration date" : "Datum isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "E-pošta poslana",
+    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
+    "Share link" : "Podijelite vezu",
     "Link" : "Poveznica",
     "Password protect" : "Zaštititi lozinkom",
     "Password" : "Lozinka",
@@ -98,27 +102,20 @@
     "Allow editing" : "Omogući uređivanje",
     "Email link to person" : "Pošaljite osobi vezu e-poštom",
     "Send" : "Pošaljite",
-    "Set expiration date" : "Odredite datum isteka",
-    "Expiration" : "Istjeće",
-    "Expiration date" : "Datum isteka",
-    "Adding user..." : "Dodavanje korisnika...",
+    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
+    "Shared with you by {owner}" : "S vama podijelio {owner}",
+    "Shared in {item} with {user}" : "Podijeljeno u {item} sa {user}",
     "group" : "Grupa",
     "remote" : "na daljinu",
-    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
-    "Shared in {item} with {user}" : "Podijeljeno u {item} sa {user}",
-    "Unshare" : "Prestanite dijeliti",
     "notify by email" : "Obavijestite e-poštom",
+    "Unshare" : "Prestanite dijeliti",
     "can share" : "Dijeljenje moguće",
     "can edit" : "Uređivanje moguće",
-    "access control" : "Kontrola pristupa",
     "create" : "Kreirajte",
     "change" : "promijeni",
     "delete" : "Izbrišite",
-    "Password protected" : "Lozinka zaštićena",
-    "Error unsetting expiration date" : "Pogrešno uklanjanje postavke datuma isteka",
-    "Error setting expiration date" : "Pogrešno učitavanje postavke datuma isteka",
-    "Sending ..." : "Slanje...",
-    "Email sent" : "E-pošta poslana",
+    "access control" : "Kontrola pristupa",
+    "Share" : "Podijelite",
     "Warning" : "Upozorenje",
     "The object type is not specified." : "Vrsta objekta nije specificirana.",
     "Enter new" : "Unesite novi",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 7be9e243e88..3f2a73d0c99 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -115,14 +115,15 @@ OC.L10N.register(
     "Error while sharing" : "Nem sikerült létrehozni a megosztást",
     "Error while unsharing" : "Nem sikerült visszavonni a megosztást",
     "Error while changing permissions" : "Nem sikerült módosítani a jogosultságokat",
-    "Shared with you and the group {group} by {owner}" : "Megosztotta Önnel és a(z) {group} csoporttal: {owner}",
-    "Shared with you by {owner}" : "Megosztotta Önnel: {owner}",
-    "Share with users or groups …" : "Megosztás felhasználókkal vagy csoportokkal ...",
-    "Share with users, groups or remote users …" : "Megosztás felhasználókkal, csoportokkal vagy távoli felhasználókkal ...",
-    "Share" : "Megosztás",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Megosztás más ownCloud szerverekkel, a következő formátum használatával felhasznalo@példa.com/owncloud",
-    "Share link" : "Megosztás hivatkozással",
+    "Error setting expiration date" : "Nem sikerült a lejárati időt beállítani",
     "The public link will expire no later than {days} days after it is created" : "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
+    "Set expiration date" : "Legyen lejárati idő",
+    "Expiration" : "Lejárat",
+    "Expiration date" : "A lejárati idő",
+    "Sending ..." : "Küldés ...",
+    "Email sent" : "Az e-mailt elküldtük",
+    "Resharing is not allowed" : "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal",
+    "Share link" : "Megosztás hivatkozással",
     "Link" : "Link",
     "Password protect" : "Jelszóval is védem",
     "Password" : "Jelszó",
@@ -130,28 +131,24 @@ OC.L10N.register(
     "Allow editing" : "Szerkesztés engedélyezése",
     "Email link to person" : "Email címre küldjük el",
     "Send" : "Küldjük el",
-    "Set expiration date" : "Legyen lejárati idő",
-    "Expiration" : "Lejárat",
-    "Expiration date" : "A lejárati idő",
-    "An error occured. Please try again" : "Hiba történt. Kérjük, próbáld újra!",
-    "Adding user..." : "Felhasználó hozzáadása...",
+    "Shared with you and the group {group} by {owner}" : "Megosztotta Önnel és a(z) {group} csoporttal: {owner}",
+    "Shared with you by {owner}" : "Megosztotta Önnel: {owner}",
+    "Shared in {item} with {user}" : "Megosztva {item}-ben {user}-rel",
     "group" : "csoport",
     "remote" : "távoli",
-    "Resharing is not allowed" : "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal",
-    "Shared in {item} with {user}" : "Megosztva {item}-ben {user}-rel",
-    "Unshare" : "A megosztás visszavonása",
     "notify by email" : "e-mail értesítés",
+    "Unshare" : "A megosztás visszavonása",
     "can share" : "megosztható",
     "can edit" : "módosíthat",
-    "access control" : "jogosultság",
     "create" : "létrehoz",
     "change" : "változtatás",
     "delete" : "töröl",
-    "Password protected" : "Jelszóval van védve",
-    "Error unsetting expiration date" : "Nem sikerült a lejárati időt törölni",
-    "Error setting expiration date" : "Nem sikerült a lejárati időt beállítani",
-    "Sending ..." : "Küldés ...",
-    "Email sent" : "Az e-mailt elküldtük",
+    "access control" : "jogosultság",
+    "An error occured. Please try again" : "Hiba történt. Kérjük, próbáld újra!",
+    "Share" : "Megosztás",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Megosztás más ownCloud szerverekkel, a következő formátum használatával felhasznalo@példa.com/owncloud",
+    "Share with users or groups …" : "Megosztás felhasználókkal vagy csoportokkal ...",
+    "Share with users, groups or remote users …" : "Megosztás felhasználókkal, csoportokkal vagy távoli felhasználókkal ...",
     "Warning" : "Figyelmeztetés",
     "The object type is not specified." : "Az objektum típusa nincs megadva.",
     "Enter new" : "Új beírása",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 63447a4038a..0f5376c947a 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -113,14 +113,15 @@
     "Error while sharing" : "Nem sikerült létrehozni a megosztást",
     "Error while unsharing" : "Nem sikerült visszavonni a megosztást",
     "Error while changing permissions" : "Nem sikerült módosítani a jogosultságokat",
-    "Shared with you and the group {group} by {owner}" : "Megosztotta Önnel és a(z) {group} csoporttal: {owner}",
-    "Shared with you by {owner}" : "Megosztotta Önnel: {owner}",
-    "Share with users or groups …" : "Megosztás felhasználókkal vagy csoportokkal ...",
-    "Share with users, groups or remote users …" : "Megosztás felhasználókkal, csoportokkal vagy távoli felhasználókkal ...",
-    "Share" : "Megosztás",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Megosztás más ownCloud szerverekkel, a következő formátum használatával felhasznalo@példa.com/owncloud",
-    "Share link" : "Megosztás hivatkozással",
+    "Error setting expiration date" : "Nem sikerült a lejárati időt beállítani",
     "The public link will expire no later than {days} days after it is created" : "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
+    "Set expiration date" : "Legyen lejárati idő",
+    "Expiration" : "Lejárat",
+    "Expiration date" : "A lejárati idő",
+    "Sending ..." : "Küldés ...",
+    "Email sent" : "Az e-mailt elküldtük",
+    "Resharing is not allowed" : "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal",
+    "Share link" : "Megosztás hivatkozással",
     "Link" : "Link",
     "Password protect" : "Jelszóval is védem",
     "Password" : "Jelszó",
@@ -128,28 +129,24 @@
     "Allow editing" : "Szerkesztés engedélyezése",
     "Email link to person" : "Email címre küldjük el",
     "Send" : "Küldjük el",
-    "Set expiration date" : "Legyen lejárati idő",
-    "Expiration" : "Lejárat",
-    "Expiration date" : "A lejárati idő",
-    "An error occured. Please try again" : "Hiba történt. Kérjük, próbáld újra!",
-    "Adding user..." : "Felhasználó hozzáadása...",
+    "Shared with you and the group {group} by {owner}" : "Megosztotta Önnel és a(z) {group} csoporttal: {owner}",
+    "Shared with you by {owner}" : "Megosztotta Önnel: {owner}",
+    "Shared in {item} with {user}" : "Megosztva {item}-ben {user}-rel",
     "group" : "csoport",
     "remote" : "távoli",
-    "Resharing is not allowed" : "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal",
-    "Shared in {item} with {user}" : "Megosztva {item}-ben {user}-rel",
-    "Unshare" : "A megosztás visszavonása",
     "notify by email" : "e-mail értesítés",
+    "Unshare" : "A megosztás visszavonása",
     "can share" : "megosztható",
     "can edit" : "módosíthat",
-    "access control" : "jogosultság",
     "create" : "létrehoz",
     "change" : "változtatás",
     "delete" : "töröl",
-    "Password protected" : "Jelszóval van védve",
-    "Error unsetting expiration date" : "Nem sikerült a lejárati időt törölni",
-    "Error setting expiration date" : "Nem sikerült a lejárati időt beállítani",
-    "Sending ..." : "Küldés ...",
-    "Email sent" : "Az e-mailt elküldtük",
+    "access control" : "jogosultság",
+    "An error occured. Please try again" : "Hiba történt. Kérjük, próbáld újra!",
+    "Share" : "Megosztás",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Megosztás más ownCloud szerverekkel, a következő formátum használatával felhasznalo@példa.com/owncloud",
+    "Share with users or groups …" : "Megosztás felhasználókkal vagy csoportokkal ...",
+    "Share with users, groups or remote users …" : "Megosztás felhasználókkal, csoportokkal vagy távoli felhasználókkal ...",
     "Warning" : "Figyelmeztetés",
     "The object type is not specified." : "Az objektum típusa nincs megadva.",
     "Enter new" : "Új beírása",
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
index e16902115b9..536affe6060 100644
--- a/core/l10n/ia.js
+++ b/core/l10n/ia.js
@@ -79,33 +79,30 @@ OC.L10N.register(
     "Error while sharing" : "Error quando on compartiva",
     "Error while unsharing" : "Error quando on levava le compartir",
     "Error while changing permissions" : "Error quando on modificava permissiones",
-    "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
-    "Shared with you by {owner}" : "Compartite con te per {owner} ",
-    "Share" : "Compartir",
+    "Error setting expiration date" : "Error quando on fixava le data de expiration",
+    "Set expiration date" : "Fixa data de expiration",
+    "Expiration date" : "Data de expiration",
+    "Sending ..." : "Inviante ...",
+    "Email sent" : "Message de e-posta inviate",
+    "Resharing is not allowed" : "Il non es permittite compartir plus que un vice",
     "Share link" : "Compartir ligamine",
     "Password protect" : "Protegite per contrasigno",
     "Password" : "Contrasigno",
     "Choose a password for the public link" : "Selige un contrasigno pro le ligamine public",
     "Email link to person" : "Ligamine de e-posta a persona",
     "Send" : "Invia",
-    "Set expiration date" : "Fixa data de expiration",
-    "Expiration date" : "Data de expiration",
-    "Adding user..." : "Addente usator...",
-    "group" : "gruppo",
-    "Resharing is not allowed" : "Il non es permittite compartir plus que un vice",
+    "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
+    "Shared with you by {owner}" : "Compartite con te per {owner} ",
     "Shared in {item} with {user}" : "Compartite in  {item} con {user}",
-    "Unshare" : "Leva compartir",
+    "group" : "gruppo",
     "notify by email" : "notificar per message de e-posta",
+    "Unshare" : "Leva compartir",
     "can share" : "pote compartir",
     "can edit" : "pote modificar",
-    "access control" : "controlo de accesso",
     "create" : "crear",
     "delete" : "deler",
-    "Password protected" : "Proteger con contrasigno",
-    "Error unsetting expiration date" : "Error quando on levava le data de expiration",
-    "Error setting expiration date" : "Error quando on fixava le data de expiration",
-    "Sending ..." : "Inviante ...",
-    "Email sent" : "Message de e-posta inviate",
+    "access control" : "controlo de accesso",
+    "Share" : "Compartir",
     "Warning" : "Aviso",
     "The object type is not specified." : "Le typo de objecto non es specificate",
     "Enter new" : "Inserta nove",
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
index e23ea15eeec..165d62ba61a 100644
--- a/core/l10n/ia.json
+++ b/core/l10n/ia.json
@@ -77,33 +77,30 @@
     "Error while sharing" : "Error quando on compartiva",
     "Error while unsharing" : "Error quando on levava le compartir",
     "Error while changing permissions" : "Error quando on modificava permissiones",
-    "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
-    "Shared with you by {owner}" : "Compartite con te per {owner} ",
-    "Share" : "Compartir",
+    "Error setting expiration date" : "Error quando on fixava le data de expiration",
+    "Set expiration date" : "Fixa data de expiration",
+    "Expiration date" : "Data de expiration",
+    "Sending ..." : "Inviante ...",
+    "Email sent" : "Message de e-posta inviate",
+    "Resharing is not allowed" : "Il non es permittite compartir plus que un vice",
     "Share link" : "Compartir ligamine",
     "Password protect" : "Protegite per contrasigno",
     "Password" : "Contrasigno",
     "Choose a password for the public link" : "Selige un contrasigno pro le ligamine public",
     "Email link to person" : "Ligamine de e-posta a persona",
     "Send" : "Invia",
-    "Set expiration date" : "Fixa data de expiration",
-    "Expiration date" : "Data de expiration",
-    "Adding user..." : "Addente usator...",
-    "group" : "gruppo",
-    "Resharing is not allowed" : "Il non es permittite compartir plus que un vice",
+    "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
+    "Shared with you by {owner}" : "Compartite con te per {owner} ",
     "Shared in {item} with {user}" : "Compartite in  {item} con {user}",
-    "Unshare" : "Leva compartir",
+    "group" : "gruppo",
     "notify by email" : "notificar per message de e-posta",
+    "Unshare" : "Leva compartir",
     "can share" : "pote compartir",
     "can edit" : "pote modificar",
-    "access control" : "controlo de accesso",
     "create" : "crear",
     "delete" : "deler",
-    "Password protected" : "Proteger con contrasigno",
-    "Error unsetting expiration date" : "Error quando on levava le data de expiration",
-    "Error setting expiration date" : "Error quando on fixava le data de expiration",
-    "Sending ..." : "Inviante ...",
-    "Email sent" : "Message de e-posta inviate",
+    "access control" : "controlo de accesso",
+    "Share" : "Compartir",
     "Warning" : "Aviso",
     "The object type is not specified." : "Le typo de objecto non es specificate",
     "Enter new" : "Inserta nove",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index 26e4f0ac022..c722b4a7b7e 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Kesalahan saat membagikan",
     "Error while unsharing" : "Kesalahan saat membatalkan pembagian",
     "Error while changing permissions" : "Kesalahan saat mengubah izin",
-    "Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
-    "Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
-    "Share with users or groups …" : "Bagikan dengan pengguna atau grup ...",
-    "Share with users, groups or remote users …" : "Bagikan dengan pengguna, grup atau pengguna remote ...",
-    "Share" : "Bagikan",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud",
-    "Share link" : "Bagikan tautan",
+    "Error setting expiration date" : "Kesalahan saat mengatur tanggal kedaluwarsa",
     "The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
+    "Set expiration date" : "Atur tanggal kedaluwarsa",
+    "Expiration" : "Kedaluwarsa",
+    "Expiration date" : "Tanggal kedaluwarsa",
+    "Sending ..." : "Mengirim ...",
+    "Email sent" : "Email terkirim",
+    "Resharing is not allowed" : "Berbagi ulang tidak diizinkan",
+    "Share link" : "Bagikan tautan",
     "Link" : "Tautan",
     "Password protect" : "Lindungi dengan sandi",
     "Password" : "Sandi",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Izinkan penyuntingan",
     "Email link to person" : "Emailkan tautan ini ke orang",
     "Send" : "Kirim",
-    "Set expiration date" : "Atur tanggal kedaluwarsa",
-    "Expiration" : "Kedaluwarsa",
-    "Expiration date" : "Tanggal kedaluwarsa",
-    "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali",
-    "Adding user..." : "Menambahkan pengguna...",
+    "Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
+    "Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
+    "Shared in {item} with {user}" : "Dibagikan dalam {item} dengan {user}",
     "group" : "grup",
     "remote" : "remote",
-    "Resharing is not allowed" : "Berbagi ulang tidak diizinkan",
-    "Shared in {item} with {user}" : "Dibagikan dalam {item} dengan {user}",
-    "Unshare" : "Batalkan berbagi",
     "notify by email" : "notifikasi via email",
+    "Unshare" : "Batalkan berbagi",
     "can share" : "dapat berbagi",
     "can edit" : "dapat sunting",
-    "access control" : "kontrol akses",
     "create" : "buat",
     "change" : "ubah",
     "delete" : "hapus",
-    "Password protected" : "Sandi dilindungi",
-    "Error unsetting expiration date" : "Kesalahan saat menghapus tanggal kedaluwarsa",
-    "Error setting expiration date" : "Kesalahan saat mengatur tanggal kedaluwarsa",
-    "Sending ..." : "Mengirim ...",
-    "Email sent" : "Email terkirim",
+    "access control" : "kontrol akses",
+    "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali",
+    "Share" : "Bagikan",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud",
+    "Share with users or groups …" : "Bagikan dengan pengguna atau grup ...",
+    "Share with users, groups or remote users …" : "Bagikan dengan pengguna, grup atau pengguna remote ...",
     "Warning" : "Peringatan",
     "The object type is not specified." : "Tipe objek tidak ditentukan.",
     "Enter new" : "Masukkan baru",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index a82e6f8acdb..ecc2c2b0f6e 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Kesalahan saat membagikan",
     "Error while unsharing" : "Kesalahan saat membatalkan pembagian",
     "Error while changing permissions" : "Kesalahan saat mengubah izin",
-    "Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
-    "Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
-    "Share with users or groups …" : "Bagikan dengan pengguna atau grup ...",
-    "Share with users, groups or remote users …" : "Bagikan dengan pengguna, grup atau pengguna remote ...",
-    "Share" : "Bagikan",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud",
-    "Share link" : "Bagikan tautan",
+    "Error setting expiration date" : "Kesalahan saat mengatur tanggal kedaluwarsa",
     "The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
+    "Set expiration date" : "Atur tanggal kedaluwarsa",
+    "Expiration" : "Kedaluwarsa",
+    "Expiration date" : "Tanggal kedaluwarsa",
+    "Sending ..." : "Mengirim ...",
+    "Email sent" : "Email terkirim",
+    "Resharing is not allowed" : "Berbagi ulang tidak diizinkan",
+    "Share link" : "Bagikan tautan",
     "Link" : "Tautan",
     "Password protect" : "Lindungi dengan sandi",
     "Password" : "Sandi",
@@ -129,28 +130,24 @@
     "Allow editing" : "Izinkan penyuntingan",
     "Email link to person" : "Emailkan tautan ini ke orang",
     "Send" : "Kirim",
-    "Set expiration date" : "Atur tanggal kedaluwarsa",
-    "Expiration" : "Kedaluwarsa",
-    "Expiration date" : "Tanggal kedaluwarsa",
-    "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali",
-    "Adding user..." : "Menambahkan pengguna...",
+    "Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
+    "Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
+    "Shared in {item} with {user}" : "Dibagikan dalam {item} dengan {user}",
     "group" : "grup",
     "remote" : "remote",
-    "Resharing is not allowed" : "Berbagi ulang tidak diizinkan",
-    "Shared in {item} with {user}" : "Dibagikan dalam {item} dengan {user}",
-    "Unshare" : "Batalkan berbagi",
     "notify by email" : "notifikasi via email",
+    "Unshare" : "Batalkan berbagi",
     "can share" : "dapat berbagi",
     "can edit" : "dapat sunting",
-    "access control" : "kontrol akses",
     "create" : "buat",
     "change" : "ubah",
     "delete" : "hapus",
-    "Password protected" : "Sandi dilindungi",
-    "Error unsetting expiration date" : "Kesalahan saat menghapus tanggal kedaluwarsa",
-    "Error setting expiration date" : "Kesalahan saat mengatur tanggal kedaluwarsa",
-    "Sending ..." : "Mengirim ...",
-    "Email sent" : "Email terkirim",
+    "access control" : "kontrol akses",
+    "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali",
+    "Share" : "Bagikan",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud",
+    "Share with users or groups …" : "Bagikan dengan pengguna atau grup ...",
+    "Share with users, groups or remote users …" : "Bagikan dengan pengguna, grup atau pengguna remote ...",
     "Warning" : "Peringatan",
     "The object type is not specified." : "Tipe objek tidak ditentukan.",
     "Enter new" : "Masukkan baru",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 64cc78ea048..5dcb543b1e4 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Villa við deilingu",
     "Error while unsharing" : "Villa við að hætta deilingu",
     "Error while changing permissions" : "Villa við að breyta aðgangsheimildum",
-    "Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
-    "Shared with you by {owner}" : "Deilt með þér af {owner}",
-    "Share with users or groups …" : "Deila með notendum eða hópum ...",
-    "Share with users, groups or remote users …" : "Deila með notendum, hópa eða ytri notendum ...",
-    "Share" : "Deila",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Deila með fólk í öðrum ownClouds með skipuninni username@example.com/owncloud",
-    "Share link" : "Deila hlekk",
+    "Error setting expiration date" : "Villa við að setja gildistíma",
     "The public link will expire no later than {days} days after it is created" : "Almennings hlekkur rennur út eigi síðar en {days} daga eftir að hann er búinn til",
+    "Set expiration date" : "Setja gildistíma",
+    "Expiration" : "Rennurút",
+    "Expiration date" : "Gildir til",
+    "Sending ..." : "Sendi ...",
+    "Email sent" : "Tölvupóstur sendur",
+    "Resharing is not allowed" : "Endurdeiling er ekki leyfð",
+    "Share link" : "Deila hlekk",
     "Link" : "Hlekkur",
     "Password protect" : "Verja með lykilorði",
     "Password" : "Lykilorð",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Leyfa breytingar",
     "Email link to person" : "Senda vefhlekk í tölvupóstu til notenda",
     "Send" : "Senda",
-    "Set expiration date" : "Setja gildistíma",
-    "Expiration" : "Rennurút",
-    "Expiration date" : "Gildir til",
-    "An error occured. Please try again" : "Villa kom upp. Vinsamlegast reyndu aftur",
-    "Adding user..." : "Bæta við notanda...",
+    "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}",
+    "Shared in {item} with {user}" : "Deilt með {item} ásamt {user}",
     "group" : "hópur",
     "remote" : "fjarlægur",
-    "Resharing is not allowed" : "Endurdeiling er ekki leyfð",
-    "Shared in {item} with {user}" : "Deilt með {item} ásamt {user}",
-    "Unshare" : "Hætta deilingu",
     "notify by email" : "tilkynna með tölvupósti",
+    "Unshare" : "Hætta deilingu",
     "can share" : "getur deilt",
     "can edit" : "getur breytt",
-    "access control" : "aðgangsstýring",
     "create" : "mynda",
     "change" : "breyta",
     "delete" : "eyða",
-    "Password protected" : "Verja með lykilorði",
-    "Error unsetting expiration date" : "Villa við að aftengja gildistíma",
-    "Error setting expiration date" : "Villa við að setja gildistíma",
-    "Sending ..." : "Sendi ...",
-    "Email sent" : "Tölvupóstur sendur",
+    "access control" : "aðgangsstýring",
+    "An error occured. Please try again" : "Villa kom upp. Vinsamlegast reyndu aftur",
+    "Share" : "Deila",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Deila með fólk í öðrum ownClouds með skipuninni username@example.com/owncloud",
+    "Share with users or groups …" : "Deila með notendum eða hópum ...",
+    "Share with users, groups or remote users …" : "Deila með notendum, hópa eða ytri notendum ...",
     "Warning" : "Aðvörun",
     "The object type is not specified." : "Tegund ekki tilgreind",
     "Enter new" : "Sláðu inn nýtt",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index b6255b1764e..f1238959ebf 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Villa við deilingu",
     "Error while unsharing" : "Villa við að hætta deilingu",
     "Error while changing permissions" : "Villa við að breyta aðgangsheimildum",
-    "Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
-    "Shared with you by {owner}" : "Deilt með þér af {owner}",
-    "Share with users or groups …" : "Deila með notendum eða hópum ...",
-    "Share with users, groups or remote users …" : "Deila með notendum, hópa eða ytri notendum ...",
-    "Share" : "Deila",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Deila með fólk í öðrum ownClouds með skipuninni username@example.com/owncloud",
-    "Share link" : "Deila hlekk",
+    "Error setting expiration date" : "Villa við að setja gildistíma",
     "The public link will expire no later than {days} days after it is created" : "Almennings hlekkur rennur út eigi síðar en {days} daga eftir að hann er búinn til",
+    "Set expiration date" : "Setja gildistíma",
+    "Expiration" : "Rennurút",
+    "Expiration date" : "Gildir til",
+    "Sending ..." : "Sendi ...",
+    "Email sent" : "Tölvupóstur sendur",
+    "Resharing is not allowed" : "Endurdeiling er ekki leyfð",
+    "Share link" : "Deila hlekk",
     "Link" : "Hlekkur",
     "Password protect" : "Verja með lykilorði",
     "Password" : "Lykilorð",
@@ -129,28 +130,24 @@
     "Allow editing" : "Leyfa breytingar",
     "Email link to person" : "Senda vefhlekk í tölvupóstu til notenda",
     "Send" : "Senda",
-    "Set expiration date" : "Setja gildistíma",
-    "Expiration" : "Rennurút",
-    "Expiration date" : "Gildir til",
-    "An error occured. Please try again" : "Villa kom upp. Vinsamlegast reyndu aftur",
-    "Adding user..." : "Bæta við notanda...",
+    "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}",
+    "Shared in {item} with {user}" : "Deilt með {item} ásamt {user}",
     "group" : "hópur",
     "remote" : "fjarlægur",
-    "Resharing is not allowed" : "Endurdeiling er ekki leyfð",
-    "Shared in {item} with {user}" : "Deilt með {item} ásamt {user}",
-    "Unshare" : "Hætta deilingu",
     "notify by email" : "tilkynna með tölvupósti",
+    "Unshare" : "Hætta deilingu",
     "can share" : "getur deilt",
     "can edit" : "getur breytt",
-    "access control" : "aðgangsstýring",
     "create" : "mynda",
     "change" : "breyta",
     "delete" : "eyða",
-    "Password protected" : "Verja með lykilorði",
-    "Error unsetting expiration date" : "Villa við að aftengja gildistíma",
-    "Error setting expiration date" : "Villa við að setja gildistíma",
-    "Sending ..." : "Sendi ...",
-    "Email sent" : "Tölvupóstur sendur",
+    "access control" : "aðgangsstýring",
+    "An error occured. Please try again" : "Villa kom upp. Vinsamlegast reyndu aftur",
+    "Share" : "Deila",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Deila með fólk í öðrum ownClouds með skipuninni username@example.com/owncloud",
+    "Share with users or groups …" : "Deila með notendum eða hópum ...",
+    "Share with users, groups or remote users …" : "Deila með notendum, hópa eða ytri notendum ...",
     "Warning" : "Aðvörun",
     "The object type is not specified." : "Tegund ekki tilgreind",
     "Enter new" : "Sláðu inn nýtt",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 044241ba79c..cd3fc097c64 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Errore durante la condivisione",
     "Error while unsharing" : "Errore durante la rimozione della condivisione",
     "Error while changing permissions" : "Errore durante la modifica dei permessi",
-    "Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
-    "Shared with you by {owner}" : "Condiviso con te da {owner}",
-    "Share with users or groups …" : "Condividi con utenti o gruppi...",
-    "Share with users, groups or remote users …" : "Condividi con utenti, gruppi o utenti remoti...",
-    "Share" : "Condividi",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone su altri ownCloud utilizzando la sintassi nomeutente@esempio.com/owncloud",
-    "Share link" : "Condividi collegamento",
+    "Error setting expiration date" : "Errore durante l'impostazione della data di scadenza",
     "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",
+    "Set expiration date" : "Imposta data di scadenza",
+    "Expiration" : "Scadenza",
+    "Expiration date" : "Data di scadenza",
+    "Sending ..." : "Invio in corso...",
+    "Email sent" : "Messaggio inviato",
+    "Resharing is not allowed" : "La ri-condivisione non è consentita",
+    "Share link" : "Condividi collegamento",
     "Link" : "Collegamento",
     "Password protect" : "Proteggi con password",
     "Password" : "Password",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Consenti la modifica",
     "Email link to person" : "Invia collegamento via email",
     "Send" : "Invia",
-    "Set expiration date" : "Imposta data di scadenza",
-    "Expiration" : "Scadenza",
-    "Expiration date" : "Data di scadenza",
-    "An error occured. Please try again" : "Si è verificato un errore. Prova ancora",
-    "Adding user..." : "Aggiunta utente in corso...",
+    "Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
+    "Shared with you by {owner}" : "Condiviso con te da {owner}",
+    "Shared in {item} with {user}" : "Condiviso in {item} con {user}",
     "group" : "gruppo",
     "remote" : "remota",
-    "Resharing is not allowed" : "La ri-condivisione non è consentita",
-    "Shared in {item} with {user}" : "Condiviso in {item} con {user}",
-    "Unshare" : "Rimuovi condivisione",
     "notify by email" : "notifica tramite email",
+    "Unshare" : "Rimuovi condivisione",
     "can share" : "può condividere",
     "can edit" : "può modificare",
-    "access control" : "controllo d'accesso",
     "create" : "creare",
     "change" : "cambia",
     "delete" : "elimina",
-    "Password protected" : "Protetta da password",
-    "Error unsetting expiration date" : "Errore durante la rimozione della data di scadenza",
-    "Error setting expiration date" : "Errore durante l'impostazione della data di scadenza",
-    "Sending ..." : "Invio in corso...",
-    "Email sent" : "Messaggio inviato",
+    "access control" : "controllo d'accesso",
+    "An error occured. Please try again" : "Si è verificato un errore. Prova ancora",
+    "Share" : "Condividi",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone su altri ownCloud utilizzando la sintassi nomeutente@esempio.com/owncloud",
+    "Share with users or groups …" : "Condividi con utenti o gruppi...",
+    "Share with users, groups or remote users …" : "Condividi con utenti, gruppi o utenti remoti...",
     "Warning" : "Avviso",
     "The object type is not specified." : "Il tipo di oggetto non è specificato.",
     "Enter new" : "Inserisci nuovo",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index edf715dce15..10049baf3ca 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Errore durante la condivisione",
     "Error while unsharing" : "Errore durante la rimozione della condivisione",
     "Error while changing permissions" : "Errore durante la modifica dei permessi",
-    "Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
-    "Shared with you by {owner}" : "Condiviso con te da {owner}",
-    "Share with users or groups …" : "Condividi con utenti o gruppi...",
-    "Share with users, groups or remote users …" : "Condividi con utenti, gruppi o utenti remoti...",
-    "Share" : "Condividi",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone su altri ownCloud utilizzando la sintassi nomeutente@esempio.com/owncloud",
-    "Share link" : "Condividi collegamento",
+    "Error setting expiration date" : "Errore durante l'impostazione della data di scadenza",
     "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",
+    "Set expiration date" : "Imposta data di scadenza",
+    "Expiration" : "Scadenza",
+    "Expiration date" : "Data di scadenza",
+    "Sending ..." : "Invio in corso...",
+    "Email sent" : "Messaggio inviato",
+    "Resharing is not allowed" : "La ri-condivisione non è consentita",
+    "Share link" : "Condividi collegamento",
     "Link" : "Collegamento",
     "Password protect" : "Proteggi con password",
     "Password" : "Password",
@@ -129,28 +130,24 @@
     "Allow editing" : "Consenti la modifica",
     "Email link to person" : "Invia collegamento via email",
     "Send" : "Invia",
-    "Set expiration date" : "Imposta data di scadenza",
-    "Expiration" : "Scadenza",
-    "Expiration date" : "Data di scadenza",
-    "An error occured. Please try again" : "Si è verificato un errore. Prova ancora",
-    "Adding user..." : "Aggiunta utente in corso...",
+    "Shared with you and the group {group} by {owner}" : "Condiviso con te e con il gruppo {group} da {owner}",
+    "Shared with you by {owner}" : "Condiviso con te da {owner}",
+    "Shared in {item} with {user}" : "Condiviso in {item} con {user}",
     "group" : "gruppo",
     "remote" : "remota",
-    "Resharing is not allowed" : "La ri-condivisione non è consentita",
-    "Shared in {item} with {user}" : "Condiviso in {item} con {user}",
-    "Unshare" : "Rimuovi condivisione",
     "notify by email" : "notifica tramite email",
+    "Unshare" : "Rimuovi condivisione",
     "can share" : "può condividere",
     "can edit" : "può modificare",
-    "access control" : "controllo d'accesso",
     "create" : "creare",
     "change" : "cambia",
     "delete" : "elimina",
-    "Password protected" : "Protetta da password",
-    "Error unsetting expiration date" : "Errore durante la rimozione della data di scadenza",
-    "Error setting expiration date" : "Errore durante l'impostazione della data di scadenza",
-    "Sending ..." : "Invio in corso...",
-    "Email sent" : "Messaggio inviato",
+    "access control" : "controllo d'accesso",
+    "An error occured. Please try again" : "Si è verificato un errore. Prova ancora",
+    "Share" : "Condividi",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone su altri ownCloud utilizzando la sintassi nomeutente@esempio.com/owncloud",
+    "Share with users or groups …" : "Condividi con utenti o gruppi...",
+    "Share with users, groups or remote users …" : "Condividi con utenti, gruppi o utenti remoti...",
     "Warning" : "Avviso",
     "The object type is not specified." : "Il tipo di oggetto non è specificato.",
     "Enter new" : "Inserisci nuovo",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 9c8d681f379..53bfc2ebc65 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -114,14 +114,15 @@ OC.L10N.register(
     "Error while sharing" : "共有でエラー発生",
     "Error while unsharing" : "共有解除でエラー発生",
     "Error while changing permissions" : "権限変更でエラー発生",
-    "Shared with you and the group {group} by {owner}" : "あなたと {owner} のグループ {group} で共有中",
-    "Shared with you by {owner}" : "{owner} と共有中",
-    "Share with users or groups …" : "ユーザーもしくはグループと共有 ...",
-    "Share with users, groups or remote users …" : "ユーザー、グループもしくはリモートユーザーと共有 ...",
-    "Share" : "共有",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "次の形式で指定して他のownCloudのユーザーと、共有",
-    "Share link" : "URLで共有",
+    "Error setting expiration date" : "有効期限の設定でエラー発生",
     "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
+    "Set expiration date" : "有効期限を設定",
+    "Expiration" : "期限切れ",
+    "Expiration date" : "有効期限",
+    "Sending ..." : "送信中...",
+    "Email sent" : "メールを送信しました",
+    "Resharing is not allowed" : "再共有は許可されていません",
+    "Share link" : "URLで共有",
     "Link" : "リンク",
     "Password protect" : "パスワード保護を有効化",
     "Password" : "パスワード",
@@ -129,28 +130,24 @@ OC.L10N.register(
     "Allow editing" : "編集許可",
     "Email link to person" : "メールリンク",
     "Send" : "送信",
-    "Set expiration date" : "有効期限を設定",
-    "Expiration" : "期限切れ",
-    "Expiration date" : "有効期限",
-    "An error occured. Please try again" : "エラーが発生しました。もう一度トライしてください。",
-    "Adding user..." : "ユーザーを追加しています...",
+    "Shared with you and the group {group} by {owner}" : "あなたと {owner} のグループ {group} で共有中",
+    "Shared with you by {owner}" : "{owner} と共有中",
+    "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
     "group" : "グループ",
     "remote" : "リモート",
-    "Resharing is not allowed" : "再共有は許可されていません",
-    "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
-    "Unshare" : "共有解除",
     "notify by email" : "メールで通知",
+    "Unshare" : "共有解除",
     "can share" : "共有可",
     "can edit" : "編集を許可",
-    "access control" : "アクセス権限",
     "create" : "作成",
     "change" : "更新",
     "delete" : "削除",
-    "Password protected" : "パスワード保護",
-    "Error unsetting expiration date" : "有効期限の未設定エラー",
-    "Error setting expiration date" : "有効期限の設定でエラー発生",
-    "Sending ..." : "送信中...",
-    "Email sent" : "メールを送信しました",
+    "access control" : "アクセス権限",
+    "An error occured. Please try again" : "エラーが発生しました。もう一度トライしてください。",
+    "Share" : "共有",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "次の形式で指定して他のownCloudのユーザーと、共有",
+    "Share with users or groups …" : "ユーザーもしくはグループと共有 ...",
+    "Share with users, groups or remote users …" : "ユーザー、グループもしくはリモートユーザーと共有 ...",
     "Warning" : "警告",
     "The object type is not specified." : "オブジェクトタイプが指定されていません。",
     "Enter new" : "新規に入力",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index ad18b1f98ed..a0591f119f9 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -112,14 +112,15 @@
     "Error while sharing" : "共有でエラー発生",
     "Error while unsharing" : "共有解除でエラー発生",
     "Error while changing permissions" : "権限変更でエラー発生",
-    "Shared with you and the group {group} by {owner}" : "あなたと {owner} のグループ {group} で共有中",
-    "Shared with you by {owner}" : "{owner} と共有中",
-    "Share with users or groups …" : "ユーザーもしくはグループと共有 ...",
-    "Share with users, groups or remote users …" : "ユーザー、グループもしくはリモートユーザーと共有 ...",
-    "Share" : "共有",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "次の形式で指定して他のownCloudのユーザーと、共有",
-    "Share link" : "URLで共有",
+    "Error setting expiration date" : "有効期限の設定でエラー発生",
     "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
+    "Set expiration date" : "有効期限を設定",
+    "Expiration" : "期限切れ",
+    "Expiration date" : "有効期限",
+    "Sending ..." : "送信中...",
+    "Email sent" : "メールを送信しました",
+    "Resharing is not allowed" : "再共有は許可されていません",
+    "Share link" : "URLで共有",
     "Link" : "リンク",
     "Password protect" : "パスワード保護を有効化",
     "Password" : "パスワード",
@@ -127,28 +128,24 @@
     "Allow editing" : "編集許可",
     "Email link to person" : "メールリンク",
     "Send" : "送信",
-    "Set expiration date" : "有効期限を設定",
-    "Expiration" : "期限切れ",
-    "Expiration date" : "有効期限",
-    "An error occured. Please try again" : "エラーが発生しました。もう一度トライしてください。",
-    "Adding user..." : "ユーザーを追加しています...",
+    "Shared with you and the group {group} by {owner}" : "あなたと {owner} のグループ {group} で共有中",
+    "Shared with you by {owner}" : "{owner} と共有中",
+    "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
     "group" : "グループ",
     "remote" : "リモート",
-    "Resharing is not allowed" : "再共有は許可されていません",
-    "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
-    "Unshare" : "共有解除",
     "notify by email" : "メールで通知",
+    "Unshare" : "共有解除",
     "can share" : "共有可",
     "can edit" : "編集を許可",
-    "access control" : "アクセス権限",
     "create" : "作成",
     "change" : "更新",
     "delete" : "削除",
-    "Password protected" : "パスワード保護",
-    "Error unsetting expiration date" : "有効期限の未設定エラー",
-    "Error setting expiration date" : "有効期限の設定でエラー発生",
-    "Sending ..." : "送信中...",
-    "Email sent" : "メールを送信しました",
+    "access control" : "アクセス権限",
+    "An error occured. Please try again" : "エラーが発生しました。もう一度トライしてください。",
+    "Share" : "共有",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "次の形式で指定して他のownCloudのユーザーと、共有",
+    "Share with users or groups …" : "ユーザーもしくはグループと共有 ...",
+    "Share with users, groups or remote users …" : "ユーザー、グループもしくはリモートユーザーと共有 ...",
     "Warning" : "警告",
     "The object type is not specified." : "オブジェクトタイプが指定されていません。",
     "Enter new" : "新規に入力",
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
index d6ae525c861..6fda99450a0 100644
--- a/core/l10n/ka_GE.js
+++ b/core/l10n/ka_GE.js
@@ -52,29 +52,27 @@ OC.L10N.register(
     "Error while sharing" : "შეცდომა გაზიარების დროს",
     "Error while unsharing" : "შეცდომა გაზიარების გაუქმების დროს",
     "Error while changing permissions" : "შეცდომა დაშვების ცვლილების დროს",
-    "Shared with you and the group {group} by {owner}" : "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
-    "Shared with you by {owner}" : "გაზიარდა თქვენთვის {owner}–ის მიერ",
-    "Share" : "გაზიარება",
-    "Password protect" : "პაროლით დაცვა",
-    "Password" : "პაროლი",
-    "Email link to person" : "ლინკის პიროვნების იმეილზე გაგზავნა",
-    "Send" : "გაგზავნა",
+    "Error setting expiration date" : "შეცდომა ვადის გასვლის მითითების დროს",
     "Set expiration date" : "მიუთითე ვადის გასვლის დრო",
     "Expiration" : "ვადის გასვლის დრო",
     "Expiration date" : "ვადის გასვლის დრო",
-    "group" : "ჯგუფი",
+    "Sending ..." : "გაგზავნა ....",
+    "Email sent" : "იმეილი გაიგზავნა",
     "Resharing is not allowed" : "მეორეჯერ გაზიარება არ არის დაშვებული",
+    "Password protect" : "პაროლით დაცვა",
+    "Password" : "პაროლი",
+    "Email link to person" : "ლინკის პიროვნების იმეილზე გაგზავნა",
+    "Send" : "გაგზავნა",
+    "Shared with you and the group {group} by {owner}" : "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
+    "Shared with you by {owner}" : "გაზიარდა თქვენთვის {owner}–ის მიერ",
     "Shared in {item} with {user}" : "გაზიარდა {item}–ში  {user}–ის მიერ",
+    "group" : "ჯგუფი",
     "Unshare" : "გაუზიარებადი",
     "can edit" : "შეგიძლია შეცვლა",
-    "access control" : "დაშვების კონტროლი",
     "create" : "შექმნა",
     "delete" : "წაშლა",
-    "Password protected" : "პაროლით დაცული",
-    "Error unsetting expiration date" : "შეცდომა ვადის გასვლის მოხსნის დროს",
-    "Error setting expiration date" : "შეცდომა ვადის გასვლის მითითების დროს",
-    "Sending ..." : "გაგზავნა ....",
-    "Email sent" : "იმეილი გაიგზავნა",
+    "access control" : "დაშვების კონტროლი",
+    "Share" : "გაზიარება",
     "Warning" : "გაფრთხილება",
     "The object type is not specified." : "ობიექტის ტიპი არ არის მითითებული.",
     "Delete" : "წაშლა",
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
index 85fecffe0c0..f7cb23adc60 100644
--- a/core/l10n/ka_GE.json
+++ b/core/l10n/ka_GE.json
@@ -50,29 +50,27 @@
     "Error while sharing" : "შეცდომა გაზიარების დროს",
     "Error while unsharing" : "შეცდომა გაზიარების გაუქმების დროს",
     "Error while changing permissions" : "შეცდომა დაშვების ცვლილების დროს",
-    "Shared with you and the group {group} by {owner}" : "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
-    "Shared with you by {owner}" : "გაზიარდა თქვენთვის {owner}–ის მიერ",
-    "Share" : "გაზიარება",
-    "Password protect" : "პაროლით დაცვა",
-    "Password" : "პაროლი",
-    "Email link to person" : "ლინკის პიროვნების იმეილზე გაგზავნა",
-    "Send" : "გაგზავნა",
+    "Error setting expiration date" : "შეცდომა ვადის გასვლის მითითების დროს",
     "Set expiration date" : "მიუთითე ვადის გასვლის დრო",
     "Expiration" : "ვადის გასვლის დრო",
     "Expiration date" : "ვადის გასვლის დრო",
-    "group" : "ჯგუფი",
+    "Sending ..." : "გაგზავნა ....",
+    "Email sent" : "იმეილი გაიგზავნა",
     "Resharing is not allowed" : "მეორეჯერ გაზიარება არ არის დაშვებული",
+    "Password protect" : "პაროლით დაცვა",
+    "Password" : "პაროლი",
+    "Email link to person" : "ლინკის პიროვნების იმეილზე გაგზავნა",
+    "Send" : "გაგზავნა",
+    "Shared with you and the group {group} by {owner}" : "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
+    "Shared with you by {owner}" : "გაზიარდა თქვენთვის {owner}–ის მიერ",
     "Shared in {item} with {user}" : "გაზიარდა {item}–ში  {user}–ის მიერ",
+    "group" : "ჯგუფი",
     "Unshare" : "გაუზიარებადი",
     "can edit" : "შეგიძლია შეცვლა",
-    "access control" : "დაშვების კონტროლი",
     "create" : "შექმნა",
     "delete" : "წაშლა",
-    "Password protected" : "პაროლით დაცული",
-    "Error unsetting expiration date" : "შეცდომა ვადის გასვლის მოხსნის დროს",
-    "Error setting expiration date" : "შეცდომა ვადის გასვლის მითითების დროს",
-    "Sending ..." : "გაგზავნა ....",
-    "Email sent" : "იმეილი გაიგზავნა",
+    "access control" : "დაშვების კონტროლი",
+    "Share" : "გაზიარება",
     "Warning" : "გაფრთხილება",
     "The object type is not specified." : "ობიექტის ტიპი არ არის მითითებული.",
     "Delete" : "წაშლა",
diff --git a/core/l10n/km.js b/core/l10n/km.js
index 6aacc58a3a6..b9a676b12ce 100644
--- a/core/l10n/km.js
+++ b/core/l10n/km.js
@@ -63,26 +63,25 @@ OC.L10N.register(
     "Error while sharing" : "កំហុស​ពេល​ចែក​រំលែក",
     "Error while unsharing" : "កំពុង​ពេល​លែង​ចែក​រំលែក",
     "Error while changing permissions" : "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
-    "Shared with you and the group {group} by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
-    "Shared with you by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
-    "Share" : "ចែក​រំលែក",
-    "Password protect" : "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
-    "Password" : "ពាក្យសម្ងាត់",
-    "Send" : "ផ្ញើ",
     "Set expiration date" : "កំណត់​ពេល​ផុត​កំណត់",
     "Expiration date" : "ពេល​ផុត​កំណត់",
-    "group" : "ក្រុម",
+    "Sending ..." : "កំពុង​ផ្ញើ ...",
+    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
     "Resharing is not allowed" : "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ",
+    "Password protect" : "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Send" : "ផ្ញើ",
+    "Shared with you and the group {group} by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
+    "Shared with you by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
     "Shared in {item} with {user}" : "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}",
+    "group" : "ក្រុម",
     "Unshare" : "លែង​ចែក​រំលែក",
     "can share" : "អាច​ចែក​រំលែក",
     "can edit" : "អាច​កែប្រែ",
-    "access control" : "សិទ្ធិ​បញ្ជា",
     "create" : "បង្កើត",
     "delete" : "លុប",
-    "Password protected" : "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
-    "Sending ..." : "កំពុង​ផ្ញើ ...",
-    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
+    "access control" : "សិទ្ធិ​បញ្ជា",
+    "Share" : "ចែក​រំលែក",
     "Warning" : "បម្រាម",
     "The object type is not specified." : "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
     "Delete" : "លុប",
diff --git a/core/l10n/km.json b/core/l10n/km.json
index ddaed62bc33..5815f6cd91d 100644
--- a/core/l10n/km.json
+++ b/core/l10n/km.json
@@ -61,26 +61,25 @@
     "Error while sharing" : "កំហុស​ពេល​ចែក​រំលែក",
     "Error while unsharing" : "កំពុង​ពេល​លែង​ចែក​រំលែក",
     "Error while changing permissions" : "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
-    "Shared with you and the group {group} by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
-    "Shared with you by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
-    "Share" : "ចែក​រំលែក",
-    "Password protect" : "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
-    "Password" : "ពាក្យសម្ងាត់",
-    "Send" : "ផ្ញើ",
     "Set expiration date" : "កំណត់​ពេល​ផុត​កំណត់",
     "Expiration date" : "ពេល​ផុត​កំណត់",
-    "group" : "ក្រុម",
+    "Sending ..." : "កំពុង​ផ្ញើ ...",
+    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
     "Resharing is not allowed" : "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ",
+    "Password protect" : "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Send" : "ផ្ញើ",
+    "Shared with you and the group {group} by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
+    "Shared with you by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
     "Shared in {item} with {user}" : "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}",
+    "group" : "ក្រុម",
     "Unshare" : "លែង​ចែក​រំលែក",
     "can share" : "អាច​ចែក​រំលែក",
     "can edit" : "អាច​កែប្រែ",
-    "access control" : "សិទ្ធិ​បញ្ជា",
     "create" : "បង្កើត",
     "delete" : "លុប",
-    "Password protected" : "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
-    "Sending ..." : "កំពុង​ផ្ញើ ...",
-    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
+    "access control" : "សិទ្ធិ​បញ្ជា",
+    "Share" : "ចែក​រំលែក",
     "Warning" : "បម្រាម",
     "The object type is not specified." : "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
     "Delete" : "លុប",
diff --git a/core/l10n/kn.js b/core/l10n/kn.js
index d4743271ae8..eedf9576b5f 100644
--- a/core/l10n/kn.js
+++ b/core/l10n/kn.js
@@ -65,11 +65,15 @@ OC.L10N.register(
     "Error while sharing" : "ಹಂಚುವಾಗ ಏನೊ ಲೋಪವಾಗಿದೆ",
     "Error while unsharing" : " ಹಂಚಿಕೆಯನ್ನು ಹಿಂದೆರುಗಿಸು ಸಂದರ್ಭದಲ್ಲಿ ಲೋಪವಾಗಿದೆ",
     "Error while changing permissions" : "ಅನುಮತಿಗಳನ್ನು ಬದಲಾವಣೆ ಮಾಡುವಾಗ ದೋಷವಾಗಿದೆ",
-    "Shared with you and the group {group} by {owner}" : "ನಿಮಗೆ ಮತ್ತು {group} ಗುಂಪಿನೂಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
-    "Shared with you by {owner}" : "ನಿಮ್ಮೊಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
-    "Share link" : "ಸಂಪರ್ಕ ಕೊಂಡಿಯನ್ನು  ಹಂಚಿಕೊಳ್ಳಬಹುದು",
+    "Error setting expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ನಿರ್ದರಿಸುವಲ್ಲಿ ದೋಷ",
     "The public link will expire no later than {days} days after it is created" : "ರಚನೆಯಾದ {days} ದಿನಗಳ ನಂತರ ಈ ಸಾರ್ವಜನಿಕ ಸಂಪರ್ಕ ಕೊಂಡಿ ಅಂತ್ಯಗೊಳ್ಳಲಿದೆ",
+    "Set expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ನಿರ್ದರಿಸಿ",
+    "Expiration" : "ಮುಕ್ತಾಯ",
+    "Expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕ",
+    "Sending ..." : "ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ ...",
+    "Email sent" : "ಇ-ಅಂಚೆ ಕಳುಹಿಸಲಾಗಿದೆ",
+    "Resharing is not allowed" : "ಮರುಹಂಚಿಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ",
+    "Share link" : "ಸಂಪರ್ಕ ಕೊಂಡಿಯನ್ನು  ಹಂಚಿಕೊಳ್ಳಬಹುದು",
     "Link" : "ಸಂಪರ್ಕ ಕೊಂಡಿ",
     "Password protect" : "ಗುಪ್ತಪದ ರಕ್ಷಿಸಿಕೂಳ್ಲಿ",
     "Password" : "ಗುಪ್ತಪದ",
@@ -77,27 +81,20 @@ OC.L10N.register(
     "Allow editing" : "ಸಂಪಾದನೆಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡಿ",
     "Email link to person" : "ಬಳಕೆದಾರನ ಇ-ಅಂಚೆಯ ಸಂಪರ್ಕಕೊಂಡಿ",
     "Send" : "ಕಳುಹಿಸಿ",
-    "Set expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ನಿರ್ದರಿಸಿ",
-    "Expiration" : "ಮುಕ್ತಾಯ",
-    "Expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕ",
-    "Adding user..." : "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗುತ್ತಿದೆ ...",
+    "Shared with you and the group {group} by {owner}" : "ನಿಮಗೆ ಮತ್ತು {group} ಗುಂಪಿನೂಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
+    "Shared with you by {owner}" : "ನಿಮ್ಮೊಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
+    "Shared in {item} with {user}" : "{user} ಜೊತೆ {item} ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ",
     "group" : "ಗುಂಪು",
     "remote" : "ಆಚೆಯ",
-    "Resharing is not allowed" : "ಮರುಹಂಚಿಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ",
-    "Shared in {item} with {user}" : "{user} ಜೊತೆ {item} ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ",
-    "Unshare" : "ಹಂಚಿಕೆಯನ್ನು ಹಿಂತೆಗೆ",
     "notify by email" : "ಇ-ಅಂಚೆ ಮೂಲಕ ತಿಳಿಸಲು",
+    "Unshare" : "ಹಂಚಿಕೆಯನ್ನು ಹಿಂತೆಗೆ",
     "can share" : "ಹಂಚಿಕೊಳ್ಳಬಹುದು",
     "can edit" : "ಸಂಪಾದಿಸಬಹುದು",
-    "access control" : "ಪ್ರವೇಶ ನಿಯಂತ್ರಣ",
     "create" : "ಸೃಷ್ಟಿಸು",
     "change" : "ಬದಲಾವಣೆ",
     "delete" : "ಅಳಿಸಿ",
-    "Password protected" : "ಗುಪ್ತಪದದಿಂದ ರಕ್ಷಿಸಲಾಗಿದೆ",
-    "Error unsetting expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ಹಿಂಪಡೆಯುವಲಿ್ಲ ದೋಷ",
-    "Error setting expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ನಿರ್ದರಿಸುವಲ್ಲಿ ದೋಷ",
-    "Sending ..." : "ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ ...",
-    "Email sent" : "ಇ-ಅಂಚೆ ಕಳುಹಿಸಲಾಗಿದೆ",
+    "access control" : "ಪ್ರವೇಶ ನಿಯಂತ್ರಣ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Warning" : "ಎಚ್ಚರಿಕೆ",
     "The object type is not specified." : "ವಸ್ತು ಮಾದರಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ.",
     "Enter new" : "ಹೊಸ ನಮೂದನೆ",
diff --git a/core/l10n/kn.json b/core/l10n/kn.json
index 0522fbd957c..8529456f28b 100644
--- a/core/l10n/kn.json
+++ b/core/l10n/kn.json
@@ -63,11 +63,15 @@
     "Error while sharing" : "ಹಂಚುವಾಗ ಏನೊ ಲೋಪವಾಗಿದೆ",
     "Error while unsharing" : " ಹಂಚಿಕೆಯನ್ನು ಹಿಂದೆರುಗಿಸು ಸಂದರ್ಭದಲ್ಲಿ ಲೋಪವಾಗಿದೆ",
     "Error while changing permissions" : "ಅನುಮತಿಗಳನ್ನು ಬದಲಾವಣೆ ಮಾಡುವಾಗ ದೋಷವಾಗಿದೆ",
-    "Shared with you and the group {group} by {owner}" : "ನಿಮಗೆ ಮತ್ತು {group} ಗುಂಪಿನೂಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
-    "Shared with you by {owner}" : "ನಿಮ್ಮೊಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
-    "Share link" : "ಸಂಪರ್ಕ ಕೊಂಡಿಯನ್ನು  ಹಂಚಿಕೊಳ್ಳಬಹುದು",
+    "Error setting expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ನಿರ್ದರಿಸುವಲ್ಲಿ ದೋಷ",
     "The public link will expire no later than {days} days after it is created" : "ರಚನೆಯಾದ {days} ದಿನಗಳ ನಂತರ ಈ ಸಾರ್ವಜನಿಕ ಸಂಪರ್ಕ ಕೊಂಡಿ ಅಂತ್ಯಗೊಳ್ಳಲಿದೆ",
+    "Set expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ನಿರ್ದರಿಸಿ",
+    "Expiration" : "ಮುಕ್ತಾಯ",
+    "Expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕ",
+    "Sending ..." : "ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ ...",
+    "Email sent" : "ಇ-ಅಂಚೆ ಕಳುಹಿಸಲಾಗಿದೆ",
+    "Resharing is not allowed" : "ಮರುಹಂಚಿಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ",
+    "Share link" : "ಸಂಪರ್ಕ ಕೊಂಡಿಯನ್ನು  ಹಂಚಿಕೊಳ್ಳಬಹುದು",
     "Link" : "ಸಂಪರ್ಕ ಕೊಂಡಿ",
     "Password protect" : "ಗುಪ್ತಪದ ರಕ್ಷಿಸಿಕೂಳ್ಲಿ",
     "Password" : "ಗುಪ್ತಪದ",
@@ -75,27 +79,20 @@
     "Allow editing" : "ಸಂಪಾದನೆಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡಿ",
     "Email link to person" : "ಬಳಕೆದಾರನ ಇ-ಅಂಚೆಯ ಸಂಪರ್ಕಕೊಂಡಿ",
     "Send" : "ಕಳುಹಿಸಿ",
-    "Set expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ನಿರ್ದರಿಸಿ",
-    "Expiration" : "ಮುಕ್ತಾಯ",
-    "Expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕ",
-    "Adding user..." : "ಬಳಕೆದಾರನನ್ನು ಸೇರಿಸಲಾಗುತ್ತಿದೆ ...",
+    "Shared with you and the group {group} by {owner}" : "ನಿಮಗೆ ಮತ್ತು {group} ಗುಂಪಿನೂಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
+    "Shared with you by {owner}" : "ನಿಮ್ಮೊಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
+    "Shared in {item} with {user}" : "{user} ಜೊತೆ {item} ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ",
     "group" : "ಗುಂಪು",
     "remote" : "ಆಚೆಯ",
-    "Resharing is not allowed" : "ಮರುಹಂಚಿಕೆ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ",
-    "Shared in {item} with {user}" : "{user} ಜೊತೆ {item} ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ",
-    "Unshare" : "ಹಂಚಿಕೆಯನ್ನು ಹಿಂತೆಗೆ",
     "notify by email" : "ಇ-ಅಂಚೆ ಮೂಲಕ ತಿಳಿಸಲು",
+    "Unshare" : "ಹಂಚಿಕೆಯನ್ನು ಹಿಂತೆಗೆ",
     "can share" : "ಹಂಚಿಕೊಳ್ಳಬಹುದು",
     "can edit" : "ಸಂಪಾದಿಸಬಹುದು",
-    "access control" : "ಪ್ರವೇಶ ನಿಯಂತ್ರಣ",
     "create" : "ಸೃಷ್ಟಿಸು",
     "change" : "ಬದಲಾವಣೆ",
     "delete" : "ಅಳಿಸಿ",
-    "Password protected" : "ಗುಪ್ತಪದದಿಂದ ರಕ್ಷಿಸಲಾಗಿದೆ",
-    "Error unsetting expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ಹಿಂಪಡೆಯುವಲಿ್ಲ ದೋಷ",
-    "Error setting expiration date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕವನ್ನು ನಿರ್ದರಿಸುವಲ್ಲಿ ದೋಷ",
-    "Sending ..." : "ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ ...",
-    "Email sent" : "ಇ-ಅಂಚೆ ಕಳುಹಿಸಲಾಗಿದೆ",
+    "access control" : "ಪ್ರವೇಶ ನಿಯಂತ್ರಣ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Warning" : "ಎಚ್ಚರಿಕೆ",
     "The object type is not specified." : "ವಸ್ತು ಮಾದರಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ.",
     "Enter new" : "ಹೊಸ ನಮೂದನೆ",
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index 56fe67b553b..c6ebf5e502f 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "공유하는 중 오류 발생",
     "Error while unsharing" : "공유 해제하는 중 오류 발생",
     "Error while changing permissions" : "권한 변경하는 중 오류 발생",
-    "Shared with you and the group {group} by {owner}" : "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
-    "Shared with you by {owner}" : "{owner} 님이 공유 중",
-    "Share with users or groups …" : "사용자 및 그룹과 공유...",
-    "Share with users, groups or remote users …" : "사용자, 그룹 및 원격 사용자와 공유...",
-    "Share" : "공유",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/owncloud 형식으로 다른 ownCloud 사용자와 공유할 수 있습니다",
-    "Share link" : "링크 공유",
+    "Error setting expiration date" : "만료 날짜 설정 오류",
     "The public link will expire no later than {days} days after it is created" : "공개 링크를 만든 후 최대 {days}일까지 유지됩니다",
+    "Set expiration date" : "만료 날짜 설정",
+    "Expiration" : "만료",
+    "Expiration date" : "만료 날짜",
+    "Sending ..." : "전송 중...",
+    "Email sent" : "이메일 발송됨",
+    "Resharing is not allowed" : "다시 공유할 수 없습니다",
+    "Share link" : "링크 공유",
     "Link" : "링크",
     "Password protect" : "암호 보호",
     "Password" : "암호",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "편집 허용",
     "Email link to person" : "이메일 주소",
     "Send" : "전송",
-    "Set expiration date" : "만료 날짜 설정",
-    "Expiration" : "만료",
-    "Expiration date" : "만료 날짜",
-    "An error occured. Please try again" : "오류가 발생하였습니다. 다시 시도하십시오.",
-    "Adding user..." : "사용자 추가 중...",
+    "Shared with you and the group {group} by {owner}" : "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
+    "Shared with you by {owner}" : "{owner} 님이 공유 중",
+    "Shared in {item} with {user}" : "{user} 님과 {item}에서 공유 중",
     "group" : "그룹",
     "remote" : "원격",
-    "Resharing is not allowed" : "다시 공유할 수 없습니다",
-    "Shared in {item} with {user}" : "{user} 님과 {item}에서 공유 중",
-    "Unshare" : "공유 해제",
     "notify by email" : "이메일로 알림",
+    "Unshare" : "공유 해제",
     "can share" : "공유 가능",
     "can edit" : "편집 가능",
-    "access control" : "접근 제어",
     "create" : "생성",
     "change" : "변경",
     "delete" : "삭제",
-    "Password protected" : "암호로 보호됨",
-    "Error unsetting expiration date" : "만료 날짜 해제 오류",
-    "Error setting expiration date" : "만료 날짜 설정 오류",
-    "Sending ..." : "전송 중...",
-    "Email sent" : "이메일 발송됨",
+    "access control" : "접근 제어",
+    "An error occured. Please try again" : "오류가 발생하였습니다. 다시 시도하십시오.",
+    "Share" : "공유",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/owncloud 형식으로 다른 ownCloud 사용자와 공유할 수 있습니다",
+    "Share with users or groups …" : "사용자 및 그룹과 공유...",
+    "Share with users, groups or remote users …" : "사용자, 그룹 및 원격 사용자와 공유...",
     "Warning" : "경고",
     "The object type is not specified." : "객체 유형이 지정되지 않았습니다.",
     "Enter new" : "새로운 값 입력",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index 1e1f427ecb4..5bbb99e89dd 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "공유하는 중 오류 발생",
     "Error while unsharing" : "공유 해제하는 중 오류 발생",
     "Error while changing permissions" : "권한 변경하는 중 오류 발생",
-    "Shared with you and the group {group} by {owner}" : "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
-    "Shared with you by {owner}" : "{owner} 님이 공유 중",
-    "Share with users or groups …" : "사용자 및 그룹과 공유...",
-    "Share with users, groups or remote users …" : "사용자, 그룹 및 원격 사용자와 공유...",
-    "Share" : "공유",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/owncloud 형식으로 다른 ownCloud 사용자와 공유할 수 있습니다",
-    "Share link" : "링크 공유",
+    "Error setting expiration date" : "만료 날짜 설정 오류",
     "The public link will expire no later than {days} days after it is created" : "공개 링크를 만든 후 최대 {days}일까지 유지됩니다",
+    "Set expiration date" : "만료 날짜 설정",
+    "Expiration" : "만료",
+    "Expiration date" : "만료 날짜",
+    "Sending ..." : "전송 중...",
+    "Email sent" : "이메일 발송됨",
+    "Resharing is not allowed" : "다시 공유할 수 없습니다",
+    "Share link" : "링크 공유",
     "Link" : "링크",
     "Password protect" : "암호 보호",
     "Password" : "암호",
@@ -129,28 +130,24 @@
     "Allow editing" : "편집 허용",
     "Email link to person" : "이메일 주소",
     "Send" : "전송",
-    "Set expiration date" : "만료 날짜 설정",
-    "Expiration" : "만료",
-    "Expiration date" : "만료 날짜",
-    "An error occured. Please try again" : "오류가 발생하였습니다. 다시 시도하십시오.",
-    "Adding user..." : "사용자 추가 중...",
+    "Shared with you and the group {group} by {owner}" : "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
+    "Shared with you by {owner}" : "{owner} 님이 공유 중",
+    "Shared in {item} with {user}" : "{user} 님과 {item}에서 공유 중",
     "group" : "그룹",
     "remote" : "원격",
-    "Resharing is not allowed" : "다시 공유할 수 없습니다",
-    "Shared in {item} with {user}" : "{user} 님과 {item}에서 공유 중",
-    "Unshare" : "공유 해제",
     "notify by email" : "이메일로 알림",
+    "Unshare" : "공유 해제",
     "can share" : "공유 가능",
     "can edit" : "편집 가능",
-    "access control" : "접근 제어",
     "create" : "생성",
     "change" : "변경",
     "delete" : "삭제",
-    "Password protected" : "암호로 보호됨",
-    "Error unsetting expiration date" : "만료 날짜 해제 오류",
-    "Error setting expiration date" : "만료 날짜 설정 오류",
-    "Sending ..." : "전송 중...",
-    "Email sent" : "이메일 발송됨",
+    "access control" : "접근 제어",
+    "An error occured. Please try again" : "오류가 발생하였습니다. 다시 시도하십시오.",
+    "Share" : "공유",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/owncloud 형식으로 다른 ownCloud 사용자와 공유할 수 있습니다",
+    "Share with users or groups …" : "사용자 및 그룹과 공유...",
+    "Share with users, groups or remote users …" : "사용자, 그룹 및 원격 사용자와 공유...",
     "Warning" : "경고",
     "The object type is not specified." : "객체 유형이 지정되지 않았습니다.",
     "Enter new" : "새로운 값 입력",
diff --git a/core/l10n/ku_IQ.js b/core/l10n/ku_IQ.js
index 033c0952f00..066e7c365bc 100644
--- a/core/l10n/ku_IQ.js
+++ b/core/l10n/ku_IQ.js
@@ -8,8 +8,8 @@ OC.L10N.register(
     "Ok" : "باشە",
     "Cancel" : "لابردن",
     "Error" : "هه‌ڵه",
-    "Share" : "هاوبەشی کردن",
     "Password" : "وشەی تێپەربو",
+    "Share" : "هاوبەشی کردن",
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
     "New password" : "وشەی نهێنی نوێ",
diff --git a/core/l10n/ku_IQ.json b/core/l10n/ku_IQ.json
index 3acb06de048..601ad30d303 100644
--- a/core/l10n/ku_IQ.json
+++ b/core/l10n/ku_IQ.json
@@ -6,8 +6,8 @@
     "Ok" : "باشە",
     "Cancel" : "لابردن",
     "Error" : "هه‌ڵه",
-    "Share" : "هاوبەشی کردن",
     "Password" : "وشەی تێپەربو",
+    "Share" : "هاوبەشی کردن",
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
     "New password" : "وشەی نهێنی نوێ",
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index 4fa998c42f7..bcb7299962a 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -61,31 +61,29 @@ OC.L10N.register(
     "Error while sharing" : "Feeler beim Deelen",
     "Error while unsharing" : "Feeler beim Annuléiere vum Deelen",
     "Error while changing permissions" : "Feeler beim Ännere vun de Rechter",
-    "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
-    "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
-    "Share" : "Deelen",
+    "Error setting expiration date" : "Feeler beim Setze vum Verfallsdatum",
+    "Set expiration date" : "Verfallsdatum setzen",
+    "Expiration date" : "Verfallsdatum",
+    "Sending ..." : "Gëtt geschéckt...",
+    "Email sent" : "Email geschéckt",
+    "Resharing is not allowed" : "Weiderdeelen ass net erlaabt",
     "Share link" : "Link deelen",
     "Password protect" : "Passwuertgeschützt",
     "Password" : "Passwuert",
     "Email link to person" : "Link enger Persoun mailen",
     "Send" : "Schécken",
-    "Set expiration date" : "Verfallsdatum setzen",
-    "Expiration date" : "Verfallsdatum",
-    "group" : "Grupp",
-    "Resharing is not allowed" : "Weiderdeelen ass net erlaabt",
+    "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
+    "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
     "Shared in {item} with {user}" : "Gedeelt an {item} mat {user}",
-    "Unshare" : "Net méi deelen",
+    "group" : "Grupp",
     "notify by email" : "via e-mail Bescheed ginn",
+    "Unshare" : "Net méi deelen",
     "can share" : "kann deelen",
     "can edit" : "kann änneren",
-    "access control" : "Zougrëffskontroll",
     "create" : "erstellen",
     "delete" : "läschen",
-    "Password protected" : "Passwuertgeschützt",
-    "Error unsetting expiration date" : "Feeler beim Läsche vum Verfallsdatum",
-    "Error setting expiration date" : "Feeler beim Setze vum Verfallsdatum",
-    "Sending ..." : "Gëtt geschéckt...",
-    "Email sent" : "Email geschéckt",
+    "access control" : "Zougrëffskontroll",
+    "Share" : "Deelen",
     "Warning" : "Warnung",
     "The object type is not specified." : "Den Typ vum Object ass net uginn.",
     "Enter new" : "Gëff nei an",
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index 0a201c98f1c..1a20e751fd8 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -59,31 +59,29 @@
     "Error while sharing" : "Feeler beim Deelen",
     "Error while unsharing" : "Feeler beim Annuléiere vum Deelen",
     "Error while changing permissions" : "Feeler beim Ännere vun de Rechter",
-    "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
-    "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
-    "Share" : "Deelen",
+    "Error setting expiration date" : "Feeler beim Setze vum Verfallsdatum",
+    "Set expiration date" : "Verfallsdatum setzen",
+    "Expiration date" : "Verfallsdatum",
+    "Sending ..." : "Gëtt geschéckt...",
+    "Email sent" : "Email geschéckt",
+    "Resharing is not allowed" : "Weiderdeelen ass net erlaabt",
     "Share link" : "Link deelen",
     "Password protect" : "Passwuertgeschützt",
     "Password" : "Passwuert",
     "Email link to person" : "Link enger Persoun mailen",
     "Send" : "Schécken",
-    "Set expiration date" : "Verfallsdatum setzen",
-    "Expiration date" : "Verfallsdatum",
-    "group" : "Grupp",
-    "Resharing is not allowed" : "Weiderdeelen ass net erlaabt",
+    "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
+    "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
     "Shared in {item} with {user}" : "Gedeelt an {item} mat {user}",
-    "Unshare" : "Net méi deelen",
+    "group" : "Grupp",
     "notify by email" : "via e-mail Bescheed ginn",
+    "Unshare" : "Net méi deelen",
     "can share" : "kann deelen",
     "can edit" : "kann änneren",
-    "access control" : "Zougrëffskontroll",
     "create" : "erstellen",
     "delete" : "läschen",
-    "Password protected" : "Passwuertgeschützt",
-    "Error unsetting expiration date" : "Feeler beim Läsche vum Verfallsdatum",
-    "Error setting expiration date" : "Feeler beim Setze vum Verfallsdatum",
-    "Sending ..." : "Gëtt geschéckt...",
-    "Email sent" : "Email geschéckt",
+    "access control" : "Zougrëffskontroll",
+    "Share" : "Deelen",
     "Warning" : "Warnung",
     "The object type is not specified." : "Den Typ vum Object ass net uginn.",
     "Enter new" : "Gëff nei an",
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index f36b66dcf52..d0a464b1a54 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -72,35 +72,33 @@ OC.L10N.register(
     "Error while sharing" : "Klaida, dalijimosi metu",
     "Error while unsharing" : "Klaida, kai atšaukiamas dalijimasis",
     "Error while changing permissions" : "Klaida, keičiant privilegijas",
-    "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
-    "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
-    "Share" : "Dalintis",
+    "Error setting expiration date" : "Klaida nustatant galiojimo laiką",
+    "Set expiration date" : "Nustatykite galiojimo laiką",
+    "Expiration" : "Galiojimo laikas",
+    "Expiration date" : "Galiojimo laikas",
+    "Sending ..." : "Siunčiama...",
+    "Email sent" : "Laiškas išsiųstas",
+    "Resharing is not allowed" : "Dalijinasis išnaujo negalimas",
     "Share link" : "Dalintis nuoroda",
     "Link" : "Nuoroda",
     "Password protect" : "Apsaugotas slaptažodžiu",
     "Password" : "Slaptažodis",
     "Email link to person" : "Nusiųsti nuorodą paštu",
     "Send" : "Siųsti",
-    "Set expiration date" : "Nustatykite galiojimo laiką",
-    "Expiration" : "Galiojimo laikas",
-    "Expiration date" : "Galiojimo laikas",
+    "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
+    "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
+    "Shared in {item} with {user}" : "Pasidalino {item} su {user}",
     "group" : "grupė",
     "remote" : "nutolęs",
-    "Resharing is not allowed" : "Dalijinasis išnaujo negalimas",
-    "Shared in {item} with {user}" : "Pasidalino {item} su {user}",
-    "Unshare" : "Nebesidalinti",
     "notify by email" : "pranešti el. paštu",
+    "Unshare" : "Nebesidalinti",
     "can share" : "gali dalintis",
     "can edit" : "gali redaguoti",
-    "access control" : "priėjimo kontrolė",
     "create" : "sukurti",
     "change" : "keisti",
     "delete" : "ištrinti",
-    "Password protected" : "Apsaugota slaptažodžiu",
-    "Error unsetting expiration date" : "Klaida nuimant galiojimo laiką",
-    "Error setting expiration date" : "Klaida nustatant galiojimo laiką",
-    "Sending ..." : "Siunčiama...",
-    "Email sent" : "Laiškas išsiųstas",
+    "access control" : "priėjimo kontrolė",
+    "Share" : "Dalintis",
     "Warning" : "Įspėjimas",
     "The object type is not specified." : "Objekto tipas nenurodytas.",
     "Enter new" : "Įveskite naują",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index 5261b7ee070..dbedb34be2d 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -70,35 +70,33 @@
     "Error while sharing" : "Klaida, dalijimosi metu",
     "Error while unsharing" : "Klaida, kai atšaukiamas dalijimasis",
     "Error while changing permissions" : "Klaida, keičiant privilegijas",
-    "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
-    "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
-    "Share" : "Dalintis",
+    "Error setting expiration date" : "Klaida nustatant galiojimo laiką",
+    "Set expiration date" : "Nustatykite galiojimo laiką",
+    "Expiration" : "Galiojimo laikas",
+    "Expiration date" : "Galiojimo laikas",
+    "Sending ..." : "Siunčiama...",
+    "Email sent" : "Laiškas išsiųstas",
+    "Resharing is not allowed" : "Dalijinasis išnaujo negalimas",
     "Share link" : "Dalintis nuoroda",
     "Link" : "Nuoroda",
     "Password protect" : "Apsaugotas slaptažodžiu",
     "Password" : "Slaptažodis",
     "Email link to person" : "Nusiųsti nuorodą paštu",
     "Send" : "Siųsti",
-    "Set expiration date" : "Nustatykite galiojimo laiką",
-    "Expiration" : "Galiojimo laikas",
-    "Expiration date" : "Galiojimo laikas",
+    "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
+    "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
+    "Shared in {item} with {user}" : "Pasidalino {item} su {user}",
     "group" : "grupė",
     "remote" : "nutolęs",
-    "Resharing is not allowed" : "Dalijinasis išnaujo negalimas",
-    "Shared in {item} with {user}" : "Pasidalino {item} su {user}",
-    "Unshare" : "Nebesidalinti",
     "notify by email" : "pranešti el. paštu",
+    "Unshare" : "Nebesidalinti",
     "can share" : "gali dalintis",
     "can edit" : "gali redaguoti",
-    "access control" : "priėjimo kontrolė",
     "create" : "sukurti",
     "change" : "keisti",
     "delete" : "ištrinti",
-    "Password protected" : "Apsaugota slaptažodžiu",
-    "Error unsetting expiration date" : "Klaida nuimant galiojimo laiką",
-    "Error setting expiration date" : "Klaida nustatant galiojimo laiką",
-    "Sending ..." : "Siunčiama...",
-    "Email sent" : "Laiškas išsiųstas",
+    "access control" : "priėjimo kontrolė",
+    "Share" : "Dalintis",
     "Warning" : "Įspėjimas",
     "The object type is not specified." : "Objekto tipas nenurodytas.",
     "Enter new" : "Įveskite naują",
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index d7905ef30a7..54beb6a107b 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -67,29 +67,27 @@ OC.L10N.register(
     "Error while sharing" : "Kļūda, daloties",
     "Error while unsharing" : "Kļūda, beidzot dalīties",
     "Error while changing permissions" : "Kļūda, mainot atļaujas",
-    "Shared with you and the group {group} by {owner}" : "{owner} dalījās ar jums un grupu {group}",
-    "Shared with you by {owner}" : "{owner} dalījās ar jums",
-    "Share" : "Dalīties",
+    "Error setting expiration date" : "Kļūda, iestatot termiņa datumu",
+    "Set expiration date" : "Iestaties termiņa datumu",
+    "Expiration date" : "Termiņa datums",
+    "Sending ..." : "Sūta...",
+    "Email sent" : "Vēstule nosūtīta",
+    "Resharing is not allowed" : "Atkārtota dalīšanās nav atļauta",
     "Password protect" : "Aizsargāt ar paroli",
     "Password" : "Parole",
     "Email link to person" : "Sūtīt saiti personai pa e-pastu",
     "Send" : "Sūtīt",
-    "Set expiration date" : "Iestaties termiņa datumu",
-    "Expiration date" : "Termiņa datums",
-    "group" : "grupa",
-    "Resharing is not allowed" : "Atkārtota dalīšanās nav atļauta",
+    "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",
     "Shared in {item} with {user}" : "Dalījās ar {item} ar {user}",
+    "group" : "grupa",
     "Unshare" : "Pārtraukt dalīšanos",
     "can share" : "Var dalīties",
     "can edit" : "var rediģēt",
-    "access control" : "piekļuves vadība",
     "create" : "izveidot",
     "delete" : "dzēst",
-    "Password protected" : "Aizsargāts ar paroli",
-    "Error unsetting expiration date" : "Kļūda, noņemot termiņa datumu",
-    "Error setting expiration date" : "Kļūda, iestatot termiņa datumu",
-    "Sending ..." : "Sūta...",
-    "Email sent" : "Vēstule nosūtīta",
+    "access control" : "piekļuves vadība",
+    "Share" : "Dalīties",
     "Warning" : "Brīdinājums",
     "The object type is not specified." : "Nav norādīts objekta tips.",
     "Delete" : "Dzēst",
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index 49188f77e89..b874c1f4008 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -65,29 +65,27 @@
     "Error while sharing" : "Kļūda, daloties",
     "Error while unsharing" : "Kļūda, beidzot dalīties",
     "Error while changing permissions" : "Kļūda, mainot atļaujas",
-    "Shared with you and the group {group} by {owner}" : "{owner} dalījās ar jums un grupu {group}",
-    "Shared with you by {owner}" : "{owner} dalījās ar jums",
-    "Share" : "Dalīties",
+    "Error setting expiration date" : "Kļūda, iestatot termiņa datumu",
+    "Set expiration date" : "Iestaties termiņa datumu",
+    "Expiration date" : "Termiņa datums",
+    "Sending ..." : "Sūta...",
+    "Email sent" : "Vēstule nosūtīta",
+    "Resharing is not allowed" : "Atkārtota dalīšanās nav atļauta",
     "Password protect" : "Aizsargāt ar paroli",
     "Password" : "Parole",
     "Email link to person" : "Sūtīt saiti personai pa e-pastu",
     "Send" : "Sūtīt",
-    "Set expiration date" : "Iestaties termiņa datumu",
-    "Expiration date" : "Termiņa datums",
-    "group" : "grupa",
-    "Resharing is not allowed" : "Atkārtota dalīšanās nav atļauta",
+    "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",
     "Shared in {item} with {user}" : "Dalījās ar {item} ar {user}",
+    "group" : "grupa",
     "Unshare" : "Pārtraukt dalīšanos",
     "can share" : "Var dalīties",
     "can edit" : "var rediģēt",
-    "access control" : "piekļuves vadība",
     "create" : "izveidot",
     "delete" : "dzēst",
-    "Password protected" : "Aizsargāts ar paroli",
-    "Error unsetting expiration date" : "Kļūda, noņemot termiņa datumu",
-    "Error setting expiration date" : "Kļūda, iestatot termiņa datumu",
-    "Sending ..." : "Sūta...",
-    "Email sent" : "Vēstule nosūtīta",
+    "access control" : "piekļuves vadība",
+    "Share" : "Dalīties",
     "Warning" : "Brīdinājums",
     "The object type is not specified." : "Nav norādīts objekta tips.",
     "Delete" : "Dzēst",
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
index e960bb4b7f6..26d0f8f2152 100644
--- a/core/l10n/mk.js
+++ b/core/l10n/mk.js
@@ -98,34 +98,32 @@ OC.L10N.register(
     "Error while sharing" : "Грешка при споделување",
     "Error while unsharing" : "Грешка при прекин на споделување",
     "Error while changing permissions" : "Грешка при промена на привилегии",
-    "Shared with you and the group {group} by {owner}" : "Споделено со Вас и групата {group} од {owner}",
-    "Shared with you by {owner}" : "Споделено со Вас од {owner}",
-    "Share with users or groups …" : "Сподели со корисници или групи ...",
-    "Share with users, groups or remote users …" : "Споделено со корисници, групи или оддалечени корисници ...",
-    "Share" : "Сподели",
+    "Error setting expiration date" : "Грешка при поставување на рок на траење",
+    "Set expiration date" : "Постави рок на траење",
+    "Expiration" : "Истекување",
+    "Expiration date" : "Рок на траење",
+    "Sending ..." : "Праќање...",
+    "Email sent" : "Е-порака пратена",
+    "Resharing is not allowed" : "Повторно споделување не е дозволено",
     "Share link" : "Сподели ја врската",
     "Password protect" : "Заштити со лозинка",
     "Password" : "Лозинка",
     "Email link to person" : "Прати врска по е-пошта на личност",
     "Send" : "Прати",
-    "Set expiration date" : "Постави рок на траење",
-    "Expiration" : "Истекување",
-    "Expiration date" : "Рок на траење",
-    "group" : "група",
-    "Resharing is not allowed" : "Повторно споделување не е дозволено",
+    "Shared with you and the group {group} by {owner}" : "Споделено со Вас и групата {group} од {owner}",
+    "Shared with you by {owner}" : "Споделено со Вас од {owner}",
     "Shared in {item} with {user}" : "Споделено во {item} со {user}",
-    "Unshare" : "Не споделувај",
+    "group" : "група",
     "notify by email" : "извести преку електронска пошта",
+    "Unshare" : "Не споделувај",
     "can share" : "може да споделува",
     "can edit" : "може да се измени",
-    "access control" : "контрола на пристап",
     "create" : "креирај",
     "delete" : "избриши",
-    "Password protected" : "Заштитено со лозинка",
-    "Error unsetting expiration date" : "Грешка при тргање на рокот на траење",
-    "Error setting expiration date" : "Грешка при поставување на рок на траење",
-    "Sending ..." : "Праќање...",
-    "Email sent" : "Е-порака пратена",
+    "access control" : "контрола на пристап",
+    "Share" : "Сподели",
+    "Share with users or groups …" : "Сподели со корисници или групи ...",
+    "Share with users, groups or remote users …" : "Споделено со корисници, групи или оддалечени корисници ...",
     "Warning" : "Предупредување",
     "The object type is not specified." : "Не е специфициран типот на објект.",
     "Enter new" : "Внеси нов",
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
index 722af208b2c..60dfe4305c7 100644
--- a/core/l10n/mk.json
+++ b/core/l10n/mk.json
@@ -96,34 +96,32 @@
     "Error while sharing" : "Грешка при споделување",
     "Error while unsharing" : "Грешка при прекин на споделување",
     "Error while changing permissions" : "Грешка при промена на привилегии",
-    "Shared with you and the group {group} by {owner}" : "Споделено со Вас и групата {group} од {owner}",
-    "Shared with you by {owner}" : "Споделено со Вас од {owner}",
-    "Share with users or groups …" : "Сподели со корисници или групи ...",
-    "Share with users, groups or remote users …" : "Споделено со корисници, групи или оддалечени корисници ...",
-    "Share" : "Сподели",
+    "Error setting expiration date" : "Грешка при поставување на рок на траење",
+    "Set expiration date" : "Постави рок на траење",
+    "Expiration" : "Истекување",
+    "Expiration date" : "Рок на траење",
+    "Sending ..." : "Праќање...",
+    "Email sent" : "Е-порака пратена",
+    "Resharing is not allowed" : "Повторно споделување не е дозволено",
     "Share link" : "Сподели ја врската",
     "Password protect" : "Заштити со лозинка",
     "Password" : "Лозинка",
     "Email link to person" : "Прати врска по е-пошта на личност",
     "Send" : "Прати",
-    "Set expiration date" : "Постави рок на траење",
-    "Expiration" : "Истекување",
-    "Expiration date" : "Рок на траење",
-    "group" : "група",
-    "Resharing is not allowed" : "Повторно споделување не е дозволено",
+    "Shared with you and the group {group} by {owner}" : "Споделено со Вас и групата {group} од {owner}",
+    "Shared with you by {owner}" : "Споделено со Вас од {owner}",
     "Shared in {item} with {user}" : "Споделено во {item} со {user}",
-    "Unshare" : "Не споделувај",
+    "group" : "група",
     "notify by email" : "извести преку електронска пошта",
+    "Unshare" : "Не споделувај",
     "can share" : "може да споделува",
     "can edit" : "може да се измени",
-    "access control" : "контрола на пристап",
     "create" : "креирај",
     "delete" : "избриши",
-    "Password protected" : "Заштитено со лозинка",
-    "Error unsetting expiration date" : "Грешка при тргање на рокот на траење",
-    "Error setting expiration date" : "Грешка при поставување на рок на траење",
-    "Sending ..." : "Праќање...",
-    "Email sent" : "Е-порака пратена",
+    "access control" : "контрола на пристап",
+    "Share" : "Сподели",
+    "Share with users or groups …" : "Сподели со корисници или групи ...",
+    "Share with users, groups or remote users …" : "Споделено со корисници, групи или оддалечени корисници ...",
     "Warning" : "Предупредување",
     "The object type is not specified." : "Не е специфициран типот на објект.",
     "Enter new" : "Внеси нов",
diff --git a/core/l10n/mn.js b/core/l10n/mn.js
index bc1ffe9f8bd..50455e72e6f 100644
--- a/core/l10n/mn.js
+++ b/core/l10n/mn.js
@@ -9,8 +9,8 @@ OC.L10N.register(
     "Friday" : "Баасан",
     "Saturday" : "Бямба",
     "Settings" : "Тохиргоо",
-    "Share" : "Түгээх",
     "Password" : "Нууц үг",
+    "Share" : "Түгээх",
     "Username" : "Хэрэглэгчийн нэр"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/mn.json b/core/l10n/mn.json
index 02a523dc003..ebf73090f9a 100644
--- a/core/l10n/mn.json
+++ b/core/l10n/mn.json
@@ -7,8 +7,8 @@
     "Friday" : "Баасан",
     "Saturday" : "Бямба",
     "Settings" : "Тохиргоо",
-    "Share" : "Түгээх",
     "Password" : "Нууц үг",
+    "Share" : "Түгээх",
     "Username" : "Хэрэглэгчийн нэр"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js
index bfa4b8cc4ba..e3149592767 100644
--- a/core/l10n/ms_MY.js
+++ b/core/l10n/ms_MY.js
@@ -46,12 +46,12 @@ OC.L10N.register(
     "Ok" : "Ok",
     "Cancel" : "Batal",
     "Error" : "Ralat",
-    "Share" : "Kongsi",
     "Password" : "Kata laluan",
     "Send" : "Hantar",
     "group" : "kumpulan",
     "can share" : "boleh berkongsi",
     "can edit" : "boleh mengubah",
+    "Share" : "Kongsi",
     "Warning" : "Amaran",
     "Delete" : "Padam",
     "Add" : "Tambah",
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
index 934d2333d84..8ac3b4eebe2 100644
--- a/core/l10n/ms_MY.json
+++ b/core/l10n/ms_MY.json
@@ -44,12 +44,12 @@
     "Ok" : "Ok",
     "Cancel" : "Batal",
     "Error" : "Ralat",
-    "Share" : "Kongsi",
     "Password" : "Kata laluan",
     "Send" : "Hantar",
     "group" : "kumpulan",
     "can share" : "boleh berkongsi",
     "can edit" : "boleh mengubah",
+    "Share" : "Kongsi",
     "Warning" : "Amaran",
     "Delete" : "Padam",
     "Add" : "Tambah",
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
index 60bd68f5c05..564eaebeeec 100644
--- a/core/l10n/my_MM.js
+++ b/core/l10n/my_MM.js
@@ -18,14 +18,13 @@ OC.L10N.register(
     "Choose" : "ရွေးချယ်",
     "Ok" : "အိုကေ",
     "Cancel" : "ပယ်ဖျက်မည်",
-    "Password" : "စကားဝှက်",
     "Set expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
     "Expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်",
     "Resharing is not allowed" : "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
+    "Password" : "စကားဝှက်",
     "can edit" : "ပြင်ဆင်နိုင်",
     "create" : "ဖန်တီးမည်",
     "delete" : "ဖျက်မည်",
-    "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
     "Add" : "ပေါင်းထည့်",
     "New password" : "စကားဝှက်အသစ်",
     "Users" : "သုံးစွဲသူ",
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
index 4c74a6e18ac..6840d924488 100644
--- a/core/l10n/my_MM.json
+++ b/core/l10n/my_MM.json
@@ -16,14 +16,13 @@
     "Choose" : "ရွေးချယ်",
     "Ok" : "အိုကေ",
     "Cancel" : "ပယ်ဖျက်မည်",
-    "Password" : "စကားဝှက်",
     "Set expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
     "Expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်",
     "Resharing is not allowed" : "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
+    "Password" : "စကားဝှက်",
     "can edit" : "ပြင်ဆင်နိုင်",
     "create" : "ဖန်တီးမည်",
     "delete" : "ဖျက်မည်",
-    "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
     "Add" : "ပေါင်းထည့်",
     "New password" : "စကားဝှက်အသစ်",
     "Users" : "သုံးစွဲသူ",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index 2dc995b2a98..d95186a94db 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Feil under deling",
     "Error while unsharing" : "Feil ved oppheving av deling",
     "Error while changing permissions" : "Feil ved endring av tillatelser",
-    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
-    "Shared with you by {owner}" : "Delt med deg av {owner}",
-    "Share with users or groups …" : "Del med brukere eller grupper ...",
-    "Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...",
-    "Share" : "Del",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud",
-    "Share link" : "Del lenke",
+    "Error setting expiration date" : "Kan ikke sette utløpsdato",
     "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
+    "Set expiration date" : "Sett utløpsdato",
+    "Expiration" : "Utløpsdato",
+    "Expiration date" : "Utløpsdato",
+    "Sending ..." : "Sender...",
+    "Email sent" : "E-post sendt",
+    "Resharing is not allowed" : "Videre deling er ikke tillatt",
+    "Share link" : "Del lenke",
     "Link" : "Lenke",
     "Password protect" : "Passordbeskyttet",
     "Password" : "Passord",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Tillat redigering",
     "Email link to person" : "Email lenke til person",
     "Send" : "Send",
-    "Set expiration date" : "Sett utløpsdato",
-    "Expiration" : "Utløpsdato",
-    "Expiration date" : "Utløpsdato",
-    "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen",
-    "Adding user..." : "Legger til bruker...",
+    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
+    "Shared with you by {owner}" : "Delt med deg av {owner}",
+    "Shared in {item} with {user}" : "Delt i {item} med {user}",
     "group" : "gruppe",
     "remote" : "ekstern",
-    "Resharing is not allowed" : "Videre deling er ikke tillatt",
-    "Shared in {item} with {user}" : "Delt i {item} med {user}",
-    "Unshare" : "Avslutt deling",
     "notify by email" : "Varsle på email",
+    "Unshare" : "Avslutt deling",
     "can share" : "kan dele",
     "can edit" : "kan endre",
-    "access control" : "tilgangskontroll",
     "create" : "opprette",
     "change" : "endre",
     "delete" : "slette",
-    "Password protected" : "Passordbeskyttet",
-    "Error unsetting expiration date" : "Feil ved nullstilling av utløpsdato",
-    "Error setting expiration date" : "Kan ikke sette utløpsdato",
-    "Sending ..." : "Sender...",
-    "Email sent" : "E-post sendt",
+    "access control" : "tilgangskontroll",
+    "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen",
+    "Share" : "Del",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud",
+    "Share with users or groups …" : "Del med brukere eller grupper ...",
+    "Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...",
     "Warning" : "Advarsel",
     "The object type is not specified." : "Objekttypen er ikke spesifisert.",
     "Enter new" : "Oppgi ny",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index 528913e424a..0bde814c095 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Feil under deling",
     "Error while unsharing" : "Feil ved oppheving av deling",
     "Error while changing permissions" : "Feil ved endring av tillatelser",
-    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
-    "Shared with you by {owner}" : "Delt med deg av {owner}",
-    "Share with users or groups …" : "Del med brukere eller grupper ...",
-    "Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...",
-    "Share" : "Del",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud",
-    "Share link" : "Del lenke",
+    "Error setting expiration date" : "Kan ikke sette utløpsdato",
     "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
+    "Set expiration date" : "Sett utløpsdato",
+    "Expiration" : "Utløpsdato",
+    "Expiration date" : "Utløpsdato",
+    "Sending ..." : "Sender...",
+    "Email sent" : "E-post sendt",
+    "Resharing is not allowed" : "Videre deling er ikke tillatt",
+    "Share link" : "Del lenke",
     "Link" : "Lenke",
     "Password protect" : "Passordbeskyttet",
     "Password" : "Passord",
@@ -129,28 +130,24 @@
     "Allow editing" : "Tillat redigering",
     "Email link to person" : "Email lenke til person",
     "Send" : "Send",
-    "Set expiration date" : "Sett utløpsdato",
-    "Expiration" : "Utløpsdato",
-    "Expiration date" : "Utløpsdato",
-    "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen",
-    "Adding user..." : "Legger til bruker...",
+    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
+    "Shared with you by {owner}" : "Delt med deg av {owner}",
+    "Shared in {item} with {user}" : "Delt i {item} med {user}",
     "group" : "gruppe",
     "remote" : "ekstern",
-    "Resharing is not allowed" : "Videre deling er ikke tillatt",
-    "Shared in {item} with {user}" : "Delt i {item} med {user}",
-    "Unshare" : "Avslutt deling",
     "notify by email" : "Varsle på email",
+    "Unshare" : "Avslutt deling",
     "can share" : "kan dele",
     "can edit" : "kan endre",
-    "access control" : "tilgangskontroll",
     "create" : "opprette",
     "change" : "endre",
     "delete" : "slette",
-    "Password protected" : "Passordbeskyttet",
-    "Error unsetting expiration date" : "Feil ved nullstilling av utløpsdato",
-    "Error setting expiration date" : "Kan ikke sette utløpsdato",
-    "Sending ..." : "Sender...",
-    "Email sent" : "E-post sendt",
+    "access control" : "tilgangskontroll",
+    "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen",
+    "Share" : "Del",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud",
+    "Share with users or groups …" : "Del med brukere eller grupper ...",
+    "Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...",
     "Warning" : "Advarsel",
     "The object type is not specified." : "Objekttypen er ikke spesifisert.",
     "Enter new" : "Oppgi ny",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 0d1fd0cad10..3734c3e0c40 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Fout tijdens het delen",
     "Error while unsharing" : "Fout tijdens het stoppen met delen",
     "Error while changing permissions" : "Fout tijdens het veranderen van permissies",
-    "Shared with you and the group {group} by {owner}" : "Gedeeld met u en de groep {group} door {owner}",
-    "Shared with you by {owner}" : "Gedeeld met u door {owner}",
-    "Share with users or groups …" : "Delen met gebruikers of groepen ...",
-    "Share with users, groups or remote users …" : "Delen met gebruikers, groepen of externe gebruikers ...",
-    "Share" : "Delen",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Delen met mensen op andere ownClouds via de syntax gebruikersnaam@voorbeeld.org/owncloud",
-    "Share link" : "Deel link",
+    "Error setting expiration date" : "Fout tijdens het instellen van de vervaldatum",
     "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",
+    "Set expiration date" : "Stel vervaldatum in",
+    "Expiration" : "Vervaltermijn",
+    "Expiration date" : "Vervaldatum",
+    "Sending ..." : "Versturen ...",
+    "Email sent" : "E-mail verzonden",
+    "Resharing is not allowed" : "Verder delen is niet toegestaan",
+    "Share link" : "Deel link",
     "Link" : "Link",
     "Password protect" : "Wachtwoord beveiligd",
     "Password" : "Wachtwoord",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Toestaan bewerken",
     "Email link to person" : "E-mail link naar persoon",
     "Send" : "Versturen",
-    "Set expiration date" : "Stel vervaldatum in",
-    "Expiration" : "Vervaltermijn",
-    "Expiration date" : "Vervaldatum",
-    "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw",
-    "Adding user..." : "Toevoegen gebruiker...",
+    "Shared with you and the group {group} by {owner}" : "Gedeeld met u en de groep {group} door {owner}",
+    "Shared with you by {owner}" : "Gedeeld met u door {owner}",
+    "Shared in {item} with {user}" : "Gedeeld in {item} met {user}",
     "group" : "groep",
     "remote" : "extern",
-    "Resharing is not allowed" : "Verder delen is niet toegestaan",
-    "Shared in {item} with {user}" : "Gedeeld in {item} met {user}",
-    "Unshare" : "Stop met delen",
     "notify by email" : "melden per e-mail",
+    "Unshare" : "Stop met delen",
     "can share" : "kan delen",
     "can edit" : "kan wijzigen",
-    "access control" : "toegangscontrole",
     "create" : "creëer",
     "change" : "wijzig",
     "delete" : "verwijderen",
-    "Password protected" : "Wachtwoord beveiligd",
-    "Error unsetting expiration date" : "Fout tijdens het verwijderen van de vervaldatum",
-    "Error setting expiration date" : "Fout tijdens het instellen van de vervaldatum",
-    "Sending ..." : "Versturen ...",
-    "Email sent" : "E-mail verzonden",
+    "access control" : "toegangscontrole",
+    "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw",
+    "Share" : "Delen",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Delen met mensen op andere ownClouds via de syntax gebruikersnaam@voorbeeld.org/owncloud",
+    "Share with users or groups …" : "Delen met gebruikers of groepen ...",
+    "Share with users, groups or remote users …" : "Delen met gebruikers, groepen of externe gebruikers ...",
     "Warning" : "Waarschuwing",
     "The object type is not specified." : "Het object type is niet gespecificeerd.",
     "Enter new" : "Opgeven nieuw",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index f80b79aa37e..1495ccfd5ac 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Fout tijdens het delen",
     "Error while unsharing" : "Fout tijdens het stoppen met delen",
     "Error while changing permissions" : "Fout tijdens het veranderen van permissies",
-    "Shared with you and the group {group} by {owner}" : "Gedeeld met u en de groep {group} door {owner}",
-    "Shared with you by {owner}" : "Gedeeld met u door {owner}",
-    "Share with users or groups …" : "Delen met gebruikers of groepen ...",
-    "Share with users, groups or remote users …" : "Delen met gebruikers, groepen of externe gebruikers ...",
-    "Share" : "Delen",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Delen met mensen op andere ownClouds via de syntax gebruikersnaam@voorbeeld.org/owncloud",
-    "Share link" : "Deel link",
+    "Error setting expiration date" : "Fout tijdens het instellen van de vervaldatum",
     "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",
+    "Set expiration date" : "Stel vervaldatum in",
+    "Expiration" : "Vervaltermijn",
+    "Expiration date" : "Vervaldatum",
+    "Sending ..." : "Versturen ...",
+    "Email sent" : "E-mail verzonden",
+    "Resharing is not allowed" : "Verder delen is niet toegestaan",
+    "Share link" : "Deel link",
     "Link" : "Link",
     "Password protect" : "Wachtwoord beveiligd",
     "Password" : "Wachtwoord",
@@ -129,28 +130,24 @@
     "Allow editing" : "Toestaan bewerken",
     "Email link to person" : "E-mail link naar persoon",
     "Send" : "Versturen",
-    "Set expiration date" : "Stel vervaldatum in",
-    "Expiration" : "Vervaltermijn",
-    "Expiration date" : "Vervaldatum",
-    "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw",
-    "Adding user..." : "Toevoegen gebruiker...",
+    "Shared with you and the group {group} by {owner}" : "Gedeeld met u en de groep {group} door {owner}",
+    "Shared with you by {owner}" : "Gedeeld met u door {owner}",
+    "Shared in {item} with {user}" : "Gedeeld in {item} met {user}",
     "group" : "groep",
     "remote" : "extern",
-    "Resharing is not allowed" : "Verder delen is niet toegestaan",
-    "Shared in {item} with {user}" : "Gedeeld in {item} met {user}",
-    "Unshare" : "Stop met delen",
     "notify by email" : "melden per e-mail",
+    "Unshare" : "Stop met delen",
     "can share" : "kan delen",
     "can edit" : "kan wijzigen",
-    "access control" : "toegangscontrole",
     "create" : "creëer",
     "change" : "wijzig",
     "delete" : "verwijderen",
-    "Password protected" : "Wachtwoord beveiligd",
-    "Error unsetting expiration date" : "Fout tijdens het verwijderen van de vervaldatum",
-    "Error setting expiration date" : "Fout tijdens het instellen van de vervaldatum",
-    "Sending ..." : "Versturen ...",
-    "Email sent" : "E-mail verzonden",
+    "access control" : "toegangscontrole",
+    "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw",
+    "Share" : "Delen",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Delen met mensen op andere ownClouds via de syntax gebruikersnaam@voorbeeld.org/owncloud",
+    "Share with users or groups …" : "Delen met gebruikers of groepen ...",
+    "Share with users, groups or remote users …" : "Delen met gebruikers, groepen of externe gebruikers ...",
     "Warning" : "Waarschuwing",
     "The object type is not specified." : "Het object type is niet gespecificeerd.",
     "Enter new" : "Opgeven nieuw",
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
index 8949d530fde..dce6076578d 100644
--- a/core/l10n/nn_NO.js
+++ b/core/l10n/nn_NO.js
@@ -73,31 +73,29 @@ OC.L10N.register(
     "Error while sharing" : "Feil ved deling",
     "Error while unsharing" : "Feil ved udeling",
     "Error while changing permissions" : "Feil ved endring av tillatingar",
-    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppa {group} av {owner}",
-    "Shared with you by {owner}" : "Delt med deg av {owner}",
-    "Share" : "Del",
+    "Error setting expiration date" : "Klarte ikkje setja utløpsdato",
+    "Set expiration date" : "Set utløpsdato",
+    "Expiration date" : "Utløpsdato",
+    "Sending ..." : "Sender …",
+    "Email sent" : "E-post sendt",
+    "Resharing is not allowed" : "Vidaredeling er ikkje tillate",
     "Share link" : "Del lenkje",
     "Password protect" : "Passordvern",
     "Password" : "Passord",
     "Choose a password for the public link" : "Vel eit passord for den offentlege lenkja",
     "Email link to person" : "Send lenkja over e-post",
     "Send" : "Send",
-    "Set expiration date" : "Set utløpsdato",
-    "Expiration date" : "Utløpsdato",
-    "group" : "gruppe",
-    "Resharing is not allowed" : "Vidaredeling er ikkje tillate",
+    "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}",
     "Shared in {item} with {user}" : "Delt i {item} med {brukar}",
+    "group" : "gruppe",
     "Unshare" : "Udel",
     "can share" : "kan dela",
     "can edit" : "kan endra",
-    "access control" : "tilgangskontroll",
     "create" : "lag",
     "delete" : "slett",
-    "Password protected" : "Passordverna",
-    "Error unsetting expiration date" : "Klarte ikkje fjerna utløpsdato",
-    "Error setting expiration date" : "Klarte ikkje setja utløpsdato",
-    "Sending ..." : "Sender …",
-    "Email sent" : "E-post sendt",
+    "access control" : "tilgangskontroll",
+    "Share" : "Del",
     "Warning" : "Åtvaring",
     "The object type is not specified." : "Objekttypen er ikkje spesifisert.",
     "Delete" : "Slett",
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
index 8555b9abc20..1f6883b3361 100644
--- a/core/l10n/nn_NO.json
+++ b/core/l10n/nn_NO.json
@@ -71,31 +71,29 @@
     "Error while sharing" : "Feil ved deling",
     "Error while unsharing" : "Feil ved udeling",
     "Error while changing permissions" : "Feil ved endring av tillatingar",
-    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppa {group} av {owner}",
-    "Shared with you by {owner}" : "Delt med deg av {owner}",
-    "Share" : "Del",
+    "Error setting expiration date" : "Klarte ikkje setja utløpsdato",
+    "Set expiration date" : "Set utløpsdato",
+    "Expiration date" : "Utløpsdato",
+    "Sending ..." : "Sender …",
+    "Email sent" : "E-post sendt",
+    "Resharing is not allowed" : "Vidaredeling er ikkje tillate",
     "Share link" : "Del lenkje",
     "Password protect" : "Passordvern",
     "Password" : "Passord",
     "Choose a password for the public link" : "Vel eit passord for den offentlege lenkja",
     "Email link to person" : "Send lenkja over e-post",
     "Send" : "Send",
-    "Set expiration date" : "Set utløpsdato",
-    "Expiration date" : "Utløpsdato",
-    "group" : "gruppe",
-    "Resharing is not allowed" : "Vidaredeling er ikkje tillate",
+    "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}",
     "Shared in {item} with {user}" : "Delt i {item} med {brukar}",
+    "group" : "gruppe",
     "Unshare" : "Udel",
     "can share" : "kan dela",
     "can edit" : "kan endra",
-    "access control" : "tilgangskontroll",
     "create" : "lag",
     "delete" : "slett",
-    "Password protected" : "Passordverna",
-    "Error unsetting expiration date" : "Klarte ikkje fjerna utløpsdato",
-    "Error setting expiration date" : "Klarte ikkje setja utløpsdato",
-    "Sending ..." : "Sender …",
-    "Email sent" : "E-post sendt",
+    "access control" : "tilgangskontroll",
+    "Share" : "Del",
     "Warning" : "Åtvaring",
     "The object type is not specified." : "Objekttypen er ikkje spesifisert.",
     "Delete" : "Slett",
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index fed3df7667d..07cd7897afd 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -100,14 +100,15 @@ OC.L10N.register(
     "Error while sharing" : "Error al moment de la mesa en partiment",
     "Error while unsharing" : "Error al moment de l'anullacion del partiment",
     "Error while changing permissions" : "Error al moment del cambiament de las permissions",
-    "Shared with you and the group {group} by {owner}" : "Partejat amb vos e lo grop {group} per {owner}",
-    "Shared with you by {owner}" : "Partejat amb vos per {owner}",
-    "Share with users or groups …" : "Partejar amb d'utilizaires o gropes...",
-    "Share with users, groups or remote users …" : "Partejar amb d'utilizaires, gropes, o utilizaires distants",
-    "Share" : "Partejar",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partejatz amb de personas sus d'autres ownClouds en utilizant la sintaxi utilizaire@exemple.com/owncloud",
-    "Share link" : "Partejar per ligam public",
+    "Error setting expiration date" : "Error al moment de l'especificacion de la data d'expiracion",
     "The public link will expire no later than {days} days after it is created" : "Aqueste ligam public expirarà al mai tard {days} jorns aprèp sa creacion.",
+    "Set expiration date" : "Especificar una data d'expiracion",
+    "Expiration" : "Expiracion",
+    "Expiration date" : "Data d'expiracion",
+    "Sending ..." : "Mandadís…",
+    "Email sent" : "Corrièl mandat",
+    "Resharing is not allowed" : "Lo repartiment es pas autorizat",
+    "Share link" : "Partejar per ligam public",
     "Link" : "Ligam",
     "Password protect" : "Protegir per un senhal",
     "Password" : "Senhal",
@@ -115,28 +116,24 @@ OC.L10N.register(
     "Allow editing" : "Permetre la modificacion",
     "Email link to person" : "Mandar lo ligam per corrièl",
     "Send" : "Mandar",
-    "Set expiration date" : "Especificar una data d'expiracion",
-    "Expiration" : "Expiracion",
-    "Expiration date" : "Data d'expiracion",
-    "An error occured. Please try again" : "Una error s'es produsida. Mercé d'ensajar tornamai",
-    "Adding user..." : "Apondon de l'utilizaire...",
+    "Shared with you and the group {group} by {owner}" : "Partejat amb vos e lo grop {group} per {owner}",
+    "Shared with you by {owner}" : "Partejat amb vos per {owner}",
+    "Shared in {item} with {user}" : "Partejat dins {item} amb {user}",
     "group" : "grop",
     "remote" : "distant",
-    "Resharing is not allowed" : "Lo repartiment es pas autorizat",
-    "Shared in {item} with {user}" : "Partejat dins {item} amb {user}",
-    "Unshare" : "Partejar pas mai",
     "notify by email" : "notificar per corrièl",
+    "Unshare" : "Partejar pas mai",
     "can share" : "pòt partejar",
     "can edit" : "pòt modificar",
-    "access control" : "contraròtle d'accès",
     "create" : "crear",
     "change" : "modificacion",
     "delete" : "suprimir",
-    "Password protected" : "Protegit per senhal",
-    "Error unsetting expiration date" : "Error al moment de la supression de la data d'expiracion",
-    "Error setting expiration date" : "Error al moment de l'especificacion de la data d'expiracion",
-    "Sending ..." : "Mandadís…",
-    "Email sent" : "Corrièl mandat",
+    "access control" : "contraròtle d'accès",
+    "An error occured. Please try again" : "Una error s'es produsida. Mercé d'ensajar tornamai",
+    "Share" : "Partejar",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partejatz amb de personas sus d'autres ownClouds en utilizant la sintaxi utilizaire@exemple.com/owncloud",
+    "Share with users or groups …" : "Partejar amb d'utilizaires o gropes...",
+    "Share with users, groups or remote users …" : "Partejar amb d'utilizaires, gropes, o utilizaires distants",
     "Warning" : "Atencion",
     "The object type is not specified." : "Lo tipe d'objècte es pas especificat.",
     "Enter new" : "Picar un novèl",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index 6cda4b3c05a..a67f4970175 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -98,14 +98,15 @@
     "Error while sharing" : "Error al moment de la mesa en partiment",
     "Error while unsharing" : "Error al moment de l'anullacion del partiment",
     "Error while changing permissions" : "Error al moment del cambiament de las permissions",
-    "Shared with you and the group {group} by {owner}" : "Partejat amb vos e lo grop {group} per {owner}",
-    "Shared with you by {owner}" : "Partejat amb vos per {owner}",
-    "Share with users or groups …" : "Partejar amb d'utilizaires o gropes...",
-    "Share with users, groups or remote users …" : "Partejar amb d'utilizaires, gropes, o utilizaires distants",
-    "Share" : "Partejar",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partejatz amb de personas sus d'autres ownClouds en utilizant la sintaxi utilizaire@exemple.com/owncloud",
-    "Share link" : "Partejar per ligam public",
+    "Error setting expiration date" : "Error al moment de l'especificacion de la data d'expiracion",
     "The public link will expire no later than {days} days after it is created" : "Aqueste ligam public expirarà al mai tard {days} jorns aprèp sa creacion.",
+    "Set expiration date" : "Especificar una data d'expiracion",
+    "Expiration" : "Expiracion",
+    "Expiration date" : "Data d'expiracion",
+    "Sending ..." : "Mandadís…",
+    "Email sent" : "Corrièl mandat",
+    "Resharing is not allowed" : "Lo repartiment es pas autorizat",
+    "Share link" : "Partejar per ligam public",
     "Link" : "Ligam",
     "Password protect" : "Protegir per un senhal",
     "Password" : "Senhal",
@@ -113,28 +114,24 @@
     "Allow editing" : "Permetre la modificacion",
     "Email link to person" : "Mandar lo ligam per corrièl",
     "Send" : "Mandar",
-    "Set expiration date" : "Especificar una data d'expiracion",
-    "Expiration" : "Expiracion",
-    "Expiration date" : "Data d'expiracion",
-    "An error occured. Please try again" : "Una error s'es produsida. Mercé d'ensajar tornamai",
-    "Adding user..." : "Apondon de l'utilizaire...",
+    "Shared with you and the group {group} by {owner}" : "Partejat amb vos e lo grop {group} per {owner}",
+    "Shared with you by {owner}" : "Partejat amb vos per {owner}",
+    "Shared in {item} with {user}" : "Partejat dins {item} amb {user}",
     "group" : "grop",
     "remote" : "distant",
-    "Resharing is not allowed" : "Lo repartiment es pas autorizat",
-    "Shared in {item} with {user}" : "Partejat dins {item} amb {user}",
-    "Unshare" : "Partejar pas mai",
     "notify by email" : "notificar per corrièl",
+    "Unshare" : "Partejar pas mai",
     "can share" : "pòt partejar",
     "can edit" : "pòt modificar",
-    "access control" : "contraròtle d'accès",
     "create" : "crear",
     "change" : "modificacion",
     "delete" : "suprimir",
-    "Password protected" : "Protegit per senhal",
-    "Error unsetting expiration date" : "Error al moment de la supression de la data d'expiracion",
-    "Error setting expiration date" : "Error al moment de l'especificacion de la data d'expiracion",
-    "Sending ..." : "Mandadís…",
-    "Email sent" : "Corrièl mandat",
+    "access control" : "contraròtle d'accès",
+    "An error occured. Please try again" : "Una error s'es produsida. Mercé d'ensajar tornamai",
+    "Share" : "Partejar",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partejatz amb de personas sus d'autres ownClouds en utilizant la sintaxi utilizaire@exemple.com/owncloud",
+    "Share with users or groups …" : "Partejar amb d'utilizaires o gropes...",
+    "Share with users, groups or remote users …" : "Partejar amb d'utilizaires, gropes, o utilizaires distants",
     "Warning" : "Atencion",
     "The object type is not specified." : "Lo tipe d'objècte es pas especificat.",
     "Enter new" : "Picar un novèl",
diff --git a/core/l10n/pa.js b/core/l10n/pa.js
index 2fbfabce1b5..ec3e48920f5 100644
--- a/core/l10n/pa.js
+++ b/core/l10n/pa.js
@@ -28,9 +28,9 @@ OC.L10N.register(
     "Ok" : "ਠੀਕ ਹੈ",
     "Cancel" : "ਰੱਦ ਕਰੋ",
     "Error" : "ਗਲ",
-    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Password" : "ਪਾਸਵਰ",
     "Send" : "ਭੇਜੋ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
diff --git a/core/l10n/pa.json b/core/l10n/pa.json
index 037c1d94822..853b3a5d86f 100644
--- a/core/l10n/pa.json
+++ b/core/l10n/pa.json
@@ -26,9 +26,9 @@
     "Ok" : "ਠੀਕ ਹੈ",
     "Cancel" : "ਰੱਦ ਕਰੋ",
     "Error" : "ਗਲ",
-    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Password" : "ਪਾਸਵਰ",
     "Send" : "ਭੇਜੋ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index 3eda4c2ed9d..75190fcdb36 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -92,12 +92,15 @@ OC.L10N.register(
     "Error while sharing" : "Błąd podczas współdzielenia",
     "Error while unsharing" : "Błąd podczas zatrzymywania współdzielenia",
     "Error while changing permissions" : "Błąd przy zmianie uprawnień",
-    "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
-    "Shared with you by {owner}" : "Udostępnione tobie przez {owner}",
-    "Share with users or groups …" : "Współdziel z użytkownikami lub grupami",
-    "Share" : "Udostępnij",
-    "Share link" : "Udostępnij link",
+    "Error setting expiration date" : "Błąd podczas ustawiania daty wygaśnięcia",
     "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
+    "Set expiration date" : "Ustaw datę wygaśnięcia",
+    "Expiration" : "Wygaśnięcie",
+    "Expiration date" : "Data wygaśnięcia",
+    "Sending ..." : "Wysyłanie...",
+    "Email sent" : "E-mail wysłany",
+    "Resharing is not allowed" : "Współdzielenie nie jest możliwe",
+    "Share link" : "Udostępnij link",
     "Link" : "Odnośnik",
     "Password protect" : "Zabezpiecz hasłem",
     "Password" : "Hasło",
@@ -105,27 +108,21 @@ OC.L10N.register(
     "Allow editing" : "Pozwól na edycję",
     "Email link to person" : "Wyślij osobie odnośnik poprzez e-mail",
     "Send" : "Wyślij",
-    "Set expiration date" : "Ustaw datę wygaśnięcia",
-    "Expiration" : "Wygaśnięcie",
-    "Expiration date" : "Data wygaśnięcia",
-    "Adding user..." : "Dodawanie użytkownika...",
+    "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
+    "Shared with you by {owner}" : "Udostępnione tobie przez {owner}",
+    "Shared in {item} with {user}" : "Współdzielone w {item} z {user}",
     "group" : "grupa",
     "remote" : "zdalny",
-    "Resharing is not allowed" : "Współdzielenie nie jest możliwe",
-    "Shared in {item} with {user}" : "Współdzielone w {item} z {user}",
-    "Unshare" : "Zatrzymaj współdzielenie",
     "notify by email" : "powiadom przez emaila",
+    "Unshare" : "Zatrzymaj współdzielenie",
     "can share" : "może współdzielić",
     "can edit" : "może edytować",
-    "access control" : "kontrola dostępu",
     "create" : "utwórz",
     "change" : "zmiany",
     "delete" : "usuń",
-    "Password protected" : "Zabezpieczone hasłem",
-    "Error unsetting expiration date" : "Błąd podczas usuwania daty wygaśnięcia",
-    "Error setting expiration date" : "Błąd podczas ustawiania daty wygaśnięcia",
-    "Sending ..." : "Wysyłanie...",
-    "Email sent" : "E-mail wysłany",
+    "access control" : "kontrola dostępu",
+    "Share" : "Udostępnij",
+    "Share with users or groups …" : "Współdziel z użytkownikami lub grupami",
     "Warning" : "Ostrzeżenie",
     "The object type is not specified." : "Nie określono typu obiektu.",
     "Enter new" : "Wpisz nowy",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index 94001147b74..69a036f69a0 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -90,12 +90,15 @@
     "Error while sharing" : "Błąd podczas współdzielenia",
     "Error while unsharing" : "Błąd podczas zatrzymywania współdzielenia",
     "Error while changing permissions" : "Błąd przy zmianie uprawnień",
-    "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
-    "Shared with you by {owner}" : "Udostępnione tobie przez {owner}",
-    "Share with users or groups …" : "Współdziel z użytkownikami lub grupami",
-    "Share" : "Udostępnij",
-    "Share link" : "Udostępnij link",
+    "Error setting expiration date" : "Błąd podczas ustawiania daty wygaśnięcia",
     "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
+    "Set expiration date" : "Ustaw datę wygaśnięcia",
+    "Expiration" : "Wygaśnięcie",
+    "Expiration date" : "Data wygaśnięcia",
+    "Sending ..." : "Wysyłanie...",
+    "Email sent" : "E-mail wysłany",
+    "Resharing is not allowed" : "Współdzielenie nie jest możliwe",
+    "Share link" : "Udostępnij link",
     "Link" : "Odnośnik",
     "Password protect" : "Zabezpiecz hasłem",
     "Password" : "Hasło",
@@ -103,27 +106,21 @@
     "Allow editing" : "Pozwól na edycję",
     "Email link to person" : "Wyślij osobie odnośnik poprzez e-mail",
     "Send" : "Wyślij",
-    "Set expiration date" : "Ustaw datę wygaśnięcia",
-    "Expiration" : "Wygaśnięcie",
-    "Expiration date" : "Data wygaśnięcia",
-    "Adding user..." : "Dodawanie użytkownika...",
+    "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
+    "Shared with you by {owner}" : "Udostępnione tobie przez {owner}",
+    "Shared in {item} with {user}" : "Współdzielone w {item} z {user}",
     "group" : "grupa",
     "remote" : "zdalny",
-    "Resharing is not allowed" : "Współdzielenie nie jest możliwe",
-    "Shared in {item} with {user}" : "Współdzielone w {item} z {user}",
-    "Unshare" : "Zatrzymaj współdzielenie",
     "notify by email" : "powiadom przez emaila",
+    "Unshare" : "Zatrzymaj współdzielenie",
     "can share" : "może współdzielić",
     "can edit" : "może edytować",
-    "access control" : "kontrola dostępu",
     "create" : "utwórz",
     "change" : "zmiany",
     "delete" : "usuń",
-    "Password protected" : "Zabezpieczone hasłem",
-    "Error unsetting expiration date" : "Błąd podczas usuwania daty wygaśnięcia",
-    "Error setting expiration date" : "Błąd podczas ustawiania daty wygaśnięcia",
-    "Sending ..." : "Wysyłanie...",
-    "Email sent" : "E-mail wysłany",
+    "access control" : "kontrola dostępu",
+    "Share" : "Udostępnij",
+    "Share with users or groups …" : "Współdziel z użytkownikami lub grupami",
     "Warning" : "Ostrzeżenie",
     "The object type is not specified." : "Nie określono typu obiektu.",
     "Enter new" : "Wpisz nowy",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 8f1a2878aaa..2cf6224b9a9 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Erro ao compartilhar",
     "Error while unsharing" : "Erro ao descompartilhar",
     "Error while changing permissions" : "Erro ao mudar permissões",
-    "Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Compartilhado com você por {owner}",
-    "Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
-    "Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
-    "Share" : "Compartilhar",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
-    "Share link" : "Compartilhar link",
+    "Error setting expiration date" : "Erro ao definir data de expiração",
     "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",
+    "Set expiration date" : "Definir data de expiração",
+    "Expiration" : "Expiração",
+    "Expiration date" : "Data de expiração",
+    "Sending ..." : "Enviando ...",
+    "Email sent" : "E-mail enviado",
+    "Resharing is not allowed" : "Não é permitido re-compartilhar",
+    "Share link" : "Compartilhar link",
     "Link" : "Link",
     "Password protect" : "Proteger com senha",
     "Password" : "Senha",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Permitir edição",
     "Email link to person" : "Enviar link por e-mail",
     "Send" : "Enviar",
-    "Set expiration date" : "Definir data de expiração",
-    "Expiration" : "Expiração",
-    "Expiration date" : "Data de expiração",
-    "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente",
-    "Adding user..." : "Adicionando usuário...",
+    "Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartilhado com você por {owner}",
+    "Shared in {item} with {user}" : "Compartilhado em {item} com {user}",
     "group" : "grupo",
     "remote" : "remoto",
-    "Resharing is not allowed" : "Não é permitido re-compartilhar",
-    "Shared in {item} with {user}" : "Compartilhado em {item} com {user}",
-    "Unshare" : "Descompartilhar",
     "notify by email" : "notificar por e-mail",
+    "Unshare" : "Descompartilhar",
     "can share" : "pode compartilhar",
     "can edit" : "pode editar",
-    "access control" : "controle de acesso",
     "create" : "criar",
     "change" : "mudança",
     "delete" : "remover",
-    "Password protected" : "Protegido com senha",
-    "Error unsetting expiration date" : "Erro ao remover data de expiração",
-    "Error setting expiration date" : "Erro ao definir data de expiração",
-    "Sending ..." : "Enviando ...",
-    "Email sent" : "E-mail enviado",
+    "access control" : "controle de acesso",
+    "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente",
+    "Share" : "Compartilhar",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
+    "Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
+    "Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
     "Warning" : "Aviso",
     "The object type is not specified." : "O tipo de objeto não foi especificado.",
     "Enter new" : "Entrar uma nova",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index d07686e7bdd..5e3b723c3c4 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Erro ao compartilhar",
     "Error while unsharing" : "Erro ao descompartilhar",
     "Error while changing permissions" : "Erro ao mudar permissões",
-    "Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Compartilhado com você por {owner}",
-    "Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
-    "Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
-    "Share" : "Compartilhar",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
-    "Share link" : "Compartilhar link",
+    "Error setting expiration date" : "Erro ao definir data de expiração",
     "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",
+    "Set expiration date" : "Definir data de expiração",
+    "Expiration" : "Expiração",
+    "Expiration date" : "Data de expiração",
+    "Sending ..." : "Enviando ...",
+    "Email sent" : "E-mail enviado",
+    "Resharing is not allowed" : "Não é permitido re-compartilhar",
+    "Share link" : "Compartilhar link",
     "Link" : "Link",
     "Password protect" : "Proteger com senha",
     "Password" : "Senha",
@@ -129,28 +130,24 @@
     "Allow editing" : "Permitir edição",
     "Email link to person" : "Enviar link por e-mail",
     "Send" : "Enviar",
-    "Set expiration date" : "Definir data de expiração",
-    "Expiration" : "Expiração",
-    "Expiration date" : "Data de expiração",
-    "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente",
-    "Adding user..." : "Adicionando usuário...",
+    "Shared with you and the group {group} by {owner}" : "Compartilhado com você e com o grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartilhado com você por {owner}",
+    "Shared in {item} with {user}" : "Compartilhado em {item} com {user}",
     "group" : "grupo",
     "remote" : "remoto",
-    "Resharing is not allowed" : "Não é permitido re-compartilhar",
-    "Shared in {item} with {user}" : "Compartilhado em {item} com {user}",
-    "Unshare" : "Descompartilhar",
     "notify by email" : "notificar por e-mail",
+    "Unshare" : "Descompartilhar",
     "can share" : "pode compartilhar",
     "can edit" : "pode editar",
-    "access control" : "controle de acesso",
     "create" : "criar",
     "change" : "mudança",
     "delete" : "remover",
-    "Password protected" : "Protegido com senha",
-    "Error unsetting expiration date" : "Erro ao remover data de expiração",
-    "Error setting expiration date" : "Erro ao definir data de expiração",
-    "Sending ..." : "Enviando ...",
-    "Email sent" : "E-mail enviado",
+    "access control" : "controle de acesso",
+    "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente",
+    "Share" : "Compartilhar",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
+    "Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
+    "Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
     "Warning" : "Aviso",
     "The object type is not specified." : "O tipo de objeto não foi especificado.",
     "Enter new" : "Entrar uma nova",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index a5c899a5986..0db31437384 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -103,21 +103,26 @@ OC.L10N.register(
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor ownCloud não tem uma ligação de Internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos, notificações sobre actualizações, ou a instalação de aplicações de terceiros não irá funcionar. Aceder aos ficheiros remotamente e enviar notificações de email poderão não funcionar também. Sugerimos que active uma ligação à Internet se pretende obter todas as funcionalidades do ownCloud.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nenhuma memória de cache foi configurada. Se possível configure-a de forma a optimizar o desempenho. Mais informações podem ser encontradas na <a href=\"{docLink}\">documentação</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom não é legível pelo PHP, o que é altamente desanimador por motivos de segurança. Pode ser encontrada mais informação na <a href=\"{docLink}\">documentação</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A sua versão ({version}) do PHP já não é <a href=\"{phpLink}\">suportada pelo PHP</a>. Nós encorajamos-lo a atualizar a sua versão do PHP para aproveitar o desempenho e as atualizações de segurança fornecidas pelo PHP.´«",
     "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O cabeçalho HTTP \"{header}\" não está configurado para igualar \"{expected}\". Isto é um potencial risco de segurança ou privacidade e recomendamos que o corrija.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está a aceder a este site via HTTP. Nós recomendamos vivamente que configure o seu servidor para requerer a utilização de HTTPS,  em vez do que está descrito nas nossas <a href=\"{docUrl}\">dicas de segurança</a>.",
     "Shared" : "Partilhado",
     "Shared with {recipients}" : "Partilhado com {recipients}",
     "Error" : "Erro",
     "Error while sharing" : "Erro ao partilhar",
     "Error while unsharing" : "Erro ao remover a partilha",
     "Error while changing permissions" : "Erro ao mudar permissões",
-    "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Partilhado consigo por {owner}",
-    "Share with users or groups …" : "Partilhar com utilizadores ou grupos...",
-    "Share with users, groups or remote users …" : "Partilhar com utilizadores, grupos ou utilizadores remotos...",
-    "Share" : "Compartilhar",
-    "Share link" : "Compartilhar hiperligação",
+    "Error setting expiration date" : "Erro ao aplicar a data de expiração",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
+    "Set expiration date" : "Definir a data de expiração",
+    "Expiration" : "Data de expiração",
+    "Expiration date" : "Data de expiração",
+    "Sending ..." : "A Enviar...",
+    "Email sent" : "Mensagem enviada",
+    "Resharing is not allowed" : "Não é permitido partilhar de novo",
+    "Share link" : "Compartilhar hiperligação",
     "Link" : "Hiperligação",
     "Password protect" : "Proteger com Palavra-passe",
     "Password" : "Palavra-passe",
@@ -125,28 +130,24 @@ OC.L10N.register(
     "Allow editing" : "Permitir edição",
     "Email link to person" : "Enviar a hiperligação para a pessoa",
     "Send" : "Enviar",
-    "Set expiration date" : "Definir a data de expiração",
-    "Expiration" : "Data de expiração",
-    "Expiration date" : "Data de expiração",
-    "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo",
-    "Adding user..." : "A adicionar o utilizador ...",
+    "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Partilhado consigo por {owner}",
+    "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
     "group" : "grupo",
     "remote" : "remoto",
-    "Resharing is not allowed" : "Não é permitido partilhar de novo",
-    "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
-    "Unshare" : "Cancelar partilha",
     "notify by email" : "Notificar por correio eletrónico",
+    "Unshare" : "Cancelar partilha",
     "can share" : "pode partilhar",
     "can edit" : "pode editar",
-    "access control" : "controlo de acesso",
     "create" : "criar",
     "change" : "alterar",
     "delete" : "apagar",
-    "Password protected" : "Protegido com Palavra-passe",
-    "Error unsetting expiration date" : "Erro ao retirar a data de expiração",
-    "Error setting expiration date" : "Erro ao aplicar a data de expiração",
-    "Sending ..." : "A Enviar...",
-    "Email sent" : "Mensagem enviada",
+    "access control" : "controlo de acesso",
+    "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo",
+    "Share" : "Compartilhar",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhe com as pessoas nas outras ownClouds utilizando a sintaxe username@example.com/owncloud",
+    "Share with users or groups …" : "Partilhar com utilizadores ou grupos...",
+    "Share with users, groups or remote users …" : "Partilhar com utilizadores, grupos ou utilizadores remotos...",
     "Warning" : "Aviso",
     "The object type is not specified." : "O tipo de objeto não está especificado.",
     "Enter new" : "Introduza novo",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 736490eb273..64b67ce8856 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -101,21 +101,26 @@
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor ownCloud não tem uma ligação de Internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos, notificações sobre actualizações, ou a instalação de aplicações de terceiros não irá funcionar. Aceder aos ficheiros remotamente e enviar notificações de email poderão não funcionar também. Sugerimos que active uma ligação à Internet se pretende obter todas as funcionalidades do ownCloud.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nenhuma memória de cache foi configurada. Se possível configure-a de forma a optimizar o desempenho. Mais informações podem ser encontradas na <a href=\"{docLink}\">documentação</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom não é legível pelo PHP, o que é altamente desanimador por motivos de segurança. Pode ser encontrada mais informação na <a href=\"{docLink}\">documentação</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A sua versão ({version}) do PHP já não é <a href=\"{phpLink}\">suportada pelo PHP</a>. Nós encorajamos-lo a atualizar a sua versão do PHP para aproveitar o desempenho e as atualizações de segurança fornecidas pelo PHP.´«",
     "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O cabeçalho HTTP \"{header}\" não está configurado para igualar \"{expected}\". Isto é um potencial risco de segurança ou privacidade e recomendamos que o corrija.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está a aceder a este site via HTTP. Nós recomendamos vivamente que configure o seu servidor para requerer a utilização de HTTPS,  em vez do que está descrito nas nossas <a href=\"{docUrl}\">dicas de segurança</a>.",
     "Shared" : "Partilhado",
     "Shared with {recipients}" : "Partilhado com {recipients}",
     "Error" : "Erro",
     "Error while sharing" : "Erro ao partilhar",
     "Error while unsharing" : "Erro ao remover a partilha",
     "Error while changing permissions" : "Erro ao mudar permissões",
-    "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
-    "Shared with you by {owner}" : "Partilhado consigo por {owner}",
-    "Share with users or groups …" : "Partilhar com utilizadores ou grupos...",
-    "Share with users, groups or remote users …" : "Partilhar com utilizadores, grupos ou utilizadores remotos...",
-    "Share" : "Compartilhar",
-    "Share link" : "Compartilhar hiperligação",
+    "Error setting expiration date" : "Erro ao aplicar a data de expiração",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
+    "Set expiration date" : "Definir a data de expiração",
+    "Expiration" : "Data de expiração",
+    "Expiration date" : "Data de expiração",
+    "Sending ..." : "A Enviar...",
+    "Email sent" : "Mensagem enviada",
+    "Resharing is not allowed" : "Não é permitido partilhar de novo",
+    "Share link" : "Compartilhar hiperligação",
     "Link" : "Hiperligação",
     "Password protect" : "Proteger com Palavra-passe",
     "Password" : "Palavra-passe",
@@ -123,28 +128,24 @@
     "Allow editing" : "Permitir edição",
     "Email link to person" : "Enviar a hiperligação para a pessoa",
     "Send" : "Enviar",
-    "Set expiration date" : "Definir a data de expiração",
-    "Expiration" : "Data de expiração",
-    "Expiration date" : "Data de expiração",
-    "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo",
-    "Adding user..." : "A adicionar o utilizador ...",
+    "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Partilhado consigo por {owner}",
+    "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
     "group" : "grupo",
     "remote" : "remoto",
-    "Resharing is not allowed" : "Não é permitido partilhar de novo",
-    "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
-    "Unshare" : "Cancelar partilha",
     "notify by email" : "Notificar por correio eletrónico",
+    "Unshare" : "Cancelar partilha",
     "can share" : "pode partilhar",
     "can edit" : "pode editar",
-    "access control" : "controlo de acesso",
     "create" : "criar",
     "change" : "alterar",
     "delete" : "apagar",
-    "Password protected" : "Protegido com Palavra-passe",
-    "Error unsetting expiration date" : "Erro ao retirar a data de expiração",
-    "Error setting expiration date" : "Erro ao aplicar a data de expiração",
-    "Sending ..." : "A Enviar...",
-    "Email sent" : "Mensagem enviada",
+    "access control" : "controlo de acesso",
+    "An error occured. Please try again" : "Ocorreu um erro. Por favor, tente de novo",
+    "Share" : "Compartilhar",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhe com as pessoas nas outras ownClouds utilizando a sintaxe username@example.com/owncloud",
+    "Share with users or groups …" : "Partilhar com utilizadores ou grupos...",
+    "Share with users, groups or remote users …" : "Partilhar com utilizadores, grupos ou utilizadores remotos...",
     "Warning" : "Aviso",
     "The object type is not specified." : "O tipo de objeto não está especificado.",
     "Enter new" : "Introduza novo",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index f552a6bbacf..051f85db9b8 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -81,36 +81,34 @@ OC.L10N.register(
     "Error while sharing" : "Eroare la partajare",
     "Error while unsharing" : "Eroare la anularea partajării",
     "Error while changing permissions" : "Eroare la modificarea permisiunilor",
-    "Shared with you and the group {group} by {owner}" : "Distribuie cu tine si grupul {group} de {owner}",
-    "Shared with you by {owner}" : "Distribuie cu tine de {owner}",
-    "Share" : "Partajează",
-    "Share link" : "Share link",
+    "Error setting expiration date" : "Eroare la specificarea datei de expirare",
     "The public link will expire no later than {days} days after it is created" : "Legătura publică va expira nu mai târziu de {days} zile de la ziua creării",
+    "Set expiration date" : "Specifică data expirării",
+    "Expiration" : "Expira",
+    "Expiration date" : "Data expirării",
+    "Sending ..." : "Se expediază...",
+    "Email sent" : "Mesajul a fost expediat",
+    "Resharing is not allowed" : "Repartajarea nu este permisă",
+    "Share link" : "Share link",
     "Link" : "Legătură",
     "Password protect" : "Protejare cu parolă",
     "Password" : "Parolă",
     "Allow editing" : "Permite editarea",
     "Email link to person" : "Expediază legătura prin poșta electronică",
     "Send" : "Expediază",
-    "Set expiration date" : "Specifică data expirării",
-    "Expiration" : "Expira",
-    "Expiration date" : "Data expirării",
-    "group" : "grup",
-    "Resharing is not allowed" : "Repartajarea nu este permisă",
+    "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}",
     "Shared in {item} with {user}" : "Distribuie in {item} si {user}",
-    "Unshare" : "Anulare partajare",
+    "group" : "grup",
     "notify by email" : "notifică prin email",
+    "Unshare" : "Anulare partajare",
     "can share" : "se poate partaja",
     "can edit" : "poate edita",
-    "access control" : "control acces",
     "create" : "creare",
     "change" : "modifică",
     "delete" : "ștergere",
-    "Password protected" : "Protejare cu parolă",
-    "Error unsetting expiration date" : "Eroare la anularea datei de expirare",
-    "Error setting expiration date" : "Eroare la specificarea datei de expirare",
-    "Sending ..." : "Se expediază...",
-    "Email sent" : "Mesajul a fost expediat",
+    "access control" : "control acces",
+    "Share" : "Partajează",
     "Warning" : "Atenție",
     "The object type is not specified." : "Tipul obiectului nu este specificat.",
     "Enter new" : "Introducere nou",
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index 8625c161ff5..db2280b78f1 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -79,36 +79,34 @@
     "Error while sharing" : "Eroare la partajare",
     "Error while unsharing" : "Eroare la anularea partajării",
     "Error while changing permissions" : "Eroare la modificarea permisiunilor",
-    "Shared with you and the group {group} by {owner}" : "Distribuie cu tine si grupul {group} de {owner}",
-    "Shared with you by {owner}" : "Distribuie cu tine de {owner}",
-    "Share" : "Partajează",
-    "Share link" : "Share link",
+    "Error setting expiration date" : "Eroare la specificarea datei de expirare",
     "The public link will expire no later than {days} days after it is created" : "Legătura publică va expira nu mai târziu de {days} zile de la ziua creării",
+    "Set expiration date" : "Specifică data expirării",
+    "Expiration" : "Expira",
+    "Expiration date" : "Data expirării",
+    "Sending ..." : "Se expediază...",
+    "Email sent" : "Mesajul a fost expediat",
+    "Resharing is not allowed" : "Repartajarea nu este permisă",
+    "Share link" : "Share link",
     "Link" : "Legătură",
     "Password protect" : "Protejare cu parolă",
     "Password" : "Parolă",
     "Allow editing" : "Permite editarea",
     "Email link to person" : "Expediază legătura prin poșta electronică",
     "Send" : "Expediază",
-    "Set expiration date" : "Specifică data expirării",
-    "Expiration" : "Expira",
-    "Expiration date" : "Data expirării",
-    "group" : "grup",
-    "Resharing is not allowed" : "Repartajarea nu este permisă",
+    "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}",
     "Shared in {item} with {user}" : "Distribuie in {item} si {user}",
-    "Unshare" : "Anulare partajare",
+    "group" : "grup",
     "notify by email" : "notifică prin email",
+    "Unshare" : "Anulare partajare",
     "can share" : "se poate partaja",
     "can edit" : "poate edita",
-    "access control" : "control acces",
     "create" : "creare",
     "change" : "modifică",
     "delete" : "ștergere",
-    "Password protected" : "Protejare cu parolă",
-    "Error unsetting expiration date" : "Eroare la anularea datei de expirare",
-    "Error setting expiration date" : "Eroare la specificarea datei de expirare",
-    "Sending ..." : "Se expediază...",
-    "Email sent" : "Mesajul a fost expediat",
+    "access control" : "control acces",
+    "Share" : "Partajează",
     "Warning" : "Atenție",
     "The object type is not specified." : "Tipul obiectului nu este specificat.",
     "Enter new" : "Introducere nou",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 0e732d81b6e..40019986dcc 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -107,14 +107,15 @@ OC.L10N.register(
     "Error while sharing" : "При попытке поделиться произошла ошибка",
     "Error while unsharing" : "При закрытии доступа произошла ошибка",
     "Error while changing permissions" : "При изменении прав доступа произошла ошибка",
-    "Shared with you and the group {group} by {owner}" : "{owner} поделился с вами и группой {group} ",
-    "Shared with you by {owner}" : "С вами поделился {owner} ",
-    "Share with users or groups …" : "Поделиться с пользователями или группами ...",
-    "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...",
-    "Share" : "Поделиться",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud",
-    "Share link" : "Поделиться ссылкой",
+    "Error setting expiration date" : "Ошибка при установке срока доступа",
     "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней после её создания",
+    "Set expiration date" : "Установить срок действия",
+    "Expiration" : "Срок действия",
+    "Expiration date" : "Дата окончания",
+    "Sending ..." : "Отправляется ...",
+    "Email sent" : "Письмо отправлено",
+    "Resharing is not allowed" : "Повторное открытие доступа запрещено",
+    "Share link" : "Поделиться ссылкой",
     "Link" : "Ссылка",
     "Password protect" : "Защитить паролем",
     "Password" : "Пароль",
@@ -122,28 +123,24 @@ OC.L10N.register(
     "Allow editing" : "Разрешить редактирование",
     "Email link to person" : "Отправить ссылку по электронной почте",
     "Send" : "Отправить",
-    "Set expiration date" : "Установить срок действия",
-    "Expiration" : "Срок действия",
-    "Expiration date" : "Дата окончания",
-    "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
-    "Adding user..." : "Добавляем пользователя...",
+    "Shared with you and the group {group} by {owner}" : "{owner} поделился с вами и группой {group} ",
+    "Shared with you by {owner}" : "С вами поделился {owner} ",
+    "Shared in {item} with {user}" : "Общий доступ в {item} для {user}",
     "group" : "группа",
     "remote" : "удаленный",
-    "Resharing is not allowed" : "Повторное открытие доступа запрещено",
-    "Shared in {item} with {user}" : "Общий доступ в {item} для {user}",
-    "Unshare" : "Закрыть доступ",
     "notify by email" : "уведомить по почте",
+    "Unshare" : "Закрыть доступ",
     "can share" : "может делиться с другими",
     "can edit" : "может редактировать",
-    "access control" : "контроль доступа",
     "create" : "создать",
     "change" : "изменить",
     "delete" : "удалить",
-    "Password protected" : "Защищено паролем",
-    "Error unsetting expiration date" : "Ошибка при отмене срока доступа",
-    "Error setting expiration date" : "Ошибка при установке срока доступа",
-    "Sending ..." : "Отправляется ...",
-    "Email sent" : "Письмо отправлено",
+    "access control" : "контроль доступа",
+    "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
+    "Share" : "Поделиться",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud",
+    "Share with users or groups …" : "Поделиться с пользователями или группами ...",
+    "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...",
     "Warning" : "Предупреждение",
     "The object type is not specified." : "Тип объекта не указан",
     "Enter new" : "Ввести новое",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 7a19ab2c55b..25c4313bd17 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -105,14 +105,15 @@
     "Error while sharing" : "При попытке поделиться произошла ошибка",
     "Error while unsharing" : "При закрытии доступа произошла ошибка",
     "Error while changing permissions" : "При изменении прав доступа произошла ошибка",
-    "Shared with you and the group {group} by {owner}" : "{owner} поделился с вами и группой {group} ",
-    "Shared with you by {owner}" : "С вами поделился {owner} ",
-    "Share with users or groups …" : "Поделиться с пользователями или группами ...",
-    "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...",
-    "Share" : "Поделиться",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud",
-    "Share link" : "Поделиться ссылкой",
+    "Error setting expiration date" : "Ошибка при установке срока доступа",
     "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней после её создания",
+    "Set expiration date" : "Установить срок действия",
+    "Expiration" : "Срок действия",
+    "Expiration date" : "Дата окончания",
+    "Sending ..." : "Отправляется ...",
+    "Email sent" : "Письмо отправлено",
+    "Resharing is not allowed" : "Повторное открытие доступа запрещено",
+    "Share link" : "Поделиться ссылкой",
     "Link" : "Ссылка",
     "Password protect" : "Защитить паролем",
     "Password" : "Пароль",
@@ -120,28 +121,24 @@
     "Allow editing" : "Разрешить редактирование",
     "Email link to person" : "Отправить ссылку по электронной почте",
     "Send" : "Отправить",
-    "Set expiration date" : "Установить срок действия",
-    "Expiration" : "Срок действия",
-    "Expiration date" : "Дата окончания",
-    "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
-    "Adding user..." : "Добавляем пользователя...",
+    "Shared with you and the group {group} by {owner}" : "{owner} поделился с вами и группой {group} ",
+    "Shared with you by {owner}" : "С вами поделился {owner} ",
+    "Shared in {item} with {user}" : "Общий доступ в {item} для {user}",
     "group" : "группа",
     "remote" : "удаленный",
-    "Resharing is not allowed" : "Повторное открытие доступа запрещено",
-    "Shared in {item} with {user}" : "Общий доступ в {item} для {user}",
-    "Unshare" : "Закрыть доступ",
     "notify by email" : "уведомить по почте",
+    "Unshare" : "Закрыть доступ",
     "can share" : "может делиться с другими",
     "can edit" : "может редактировать",
-    "access control" : "контроль доступа",
     "create" : "создать",
     "change" : "изменить",
     "delete" : "удалить",
-    "Password protected" : "Защищено паролем",
-    "Error unsetting expiration date" : "Ошибка при отмене срока доступа",
-    "Error setting expiration date" : "Ошибка при установке срока доступа",
-    "Sending ..." : "Отправляется ...",
-    "Email sent" : "Письмо отправлено",
+    "access control" : "контроль доступа",
+    "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
+    "Share" : "Поделиться",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud",
+    "Share with users or groups …" : "Поделиться с пользователями или группами ...",
+    "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...",
     "Warning" : "Предупреждение",
     "The object type is not specified." : "Тип объекта не указан",
     "Enter new" : "Ввести новое",
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
index 9be2cb088a6..dfdc037fb5a 100644
--- a/core/l10n/si_LK.js
+++ b/core/l10n/si_LK.js
@@ -47,20 +47,18 @@ OC.L10N.register(
     "Ok" : "හරි",
     "Cancel" : "එපා",
     "Error" : "දෝෂයක්",
-    "Share" : "බෙදා හදා ගන්න",
-    "Password protect" : "මුර පදයකින් ආරක්ශාකරන්න",
-    "Password" : "මුර පදය",
+    "Error setting expiration date" : "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
     "Set expiration date" : "කල් ඉකුත් විමේ දිනය දමන්න",
     "Expiration date" : "කල් ඉකුත් විමේ දිනය",
+    "Password protect" : "මුර පදයකින් ආරක්ශාකරන්න",
+    "Password" : "මුර පදය",
     "group" : "කණ්ඩායම",
     "Unshare" : "නොබෙදු",
     "can edit" : "සංස්කරණය කළ හැක",
-    "access control" : "ප්‍රවේශ පාලනය",
     "create" : "සදන්න",
     "delete" : "මකන්න",
-    "Password protected" : "මුර පදයකින් ආරක්ශාකර ඇත",
-    "Error unsetting expiration date" : "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
-    "Error setting expiration date" : "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
+    "access control" : "ප්‍රවේශ පාලනය",
+    "Share" : "බෙදා හදා ගන්න",
     "Warning" : "අවවාදය",
     "Delete" : "මකා දමන්න",
     "Add" : "එකතු කරන්න",
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
index 7626f55acb1..62387a67e3f 100644
--- a/core/l10n/si_LK.json
+++ b/core/l10n/si_LK.json
@@ -45,20 +45,18 @@
     "Ok" : "හරි",
     "Cancel" : "එපා",
     "Error" : "දෝෂයක්",
-    "Share" : "බෙදා හදා ගන්න",
-    "Password protect" : "මුර පදයකින් ආරක්ශාකරන්න",
-    "Password" : "මුර පදය",
+    "Error setting expiration date" : "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
     "Set expiration date" : "කල් ඉකුත් විමේ දිනය දමන්න",
     "Expiration date" : "කල් ඉකුත් විමේ දිනය",
+    "Password protect" : "මුර පදයකින් ආරක්ශාකරන්න",
+    "Password" : "මුර පදය",
     "group" : "කණ්ඩායම",
     "Unshare" : "නොබෙදු",
     "can edit" : "සංස්කරණය කළ හැක",
-    "access control" : "ප්‍රවේශ පාලනය",
     "create" : "සදන්න",
     "delete" : "මකන්න",
-    "Password protected" : "මුර පදයකින් ආරක්ශාකර ඇත",
-    "Error unsetting expiration date" : "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
-    "Error setting expiration date" : "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
+    "access control" : "ප්‍රවේශ පාලනය",
+    "Share" : "බෙදා හදා ගන්න",
     "Warning" : "අවවාදය",
     "Delete" : "මකා දමන්න",
     "Add" : "එකතු කරන්න",
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 6cea84df377..075694831e2 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -105,13 +105,15 @@ OC.L10N.register(
     "Error while sharing" : "Chyba počas zdieľania",
     "Error while unsharing" : "Chyba počas ukončenia zdieľania",
     "Error while changing permissions" : "Chyba počas zmeny oprávnení",
-    "Shared with you and the group {group} by {owner}" : "Zdieľané s vami a so skupinou {group} používateľom {owner}",
-    "Shared with you by {owner}" : "Zdieľané s vami používateľom {owner}",
-    "Share with users or groups …" : "Zdieľať s používateľmi alebo skupinami ...",
-    "Share with users, groups or remote users …" : "Zdieľať s používateľmi, skupinami alebo vzdialenými používateľmi ...",
-    "Share" : "Zdieľať",
-    "Share link" : "Zdieľať linku",
+    "Error setting expiration date" : "Chyba pri nastavení dátumu expirácie",
     "The public link will expire no later than {days} days after it is created" : "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
+    "Set expiration date" : "Nastaviť dátum expirácie",
+    "Expiration" : "Koniec platnosti",
+    "Expiration date" : "Dátum expirácie",
+    "Sending ..." : "Odosielam ...",
+    "Email sent" : "Email odoslaný",
+    "Resharing is not allowed" : "Zdieľanie už zdieľanej položky nie je povolené",
+    "Share link" : "Zdieľať linku",
     "Link" : "Odkaz",
     "Password protect" : "Chrániť heslom",
     "Password" : "Heslo",
@@ -119,28 +121,23 @@ OC.L10N.register(
     "Allow editing" : "Povoliť úpravy",
     "Email link to person" : "Odoslať odkaz emailom",
     "Send" : "Odoslať",
-    "Set expiration date" : "Nastaviť dátum expirácie",
-    "Expiration" : "Koniec platnosti",
-    "Expiration date" : "Dátum expirácie",
-    "An error occured. Please try again" : "Nastala chyba. Skúste to znovu",
-    "Adding user..." : "Pridávam používateľa...",
+    "Shared with you and the group {group} by {owner}" : "Zdieľané s vami a so skupinou {group} používateľom {owner}",
+    "Shared with you by {owner}" : "Zdieľané s vami používateľom {owner}",
+    "Shared in {item} with {user}" : "Zdieľané v {item} s {user}",
     "group" : "skupina",
     "remote" : "vzdialený",
-    "Resharing is not allowed" : "Zdieľanie už zdieľanej položky nie je povolené",
-    "Shared in {item} with {user}" : "Zdieľané v {item} s {user}",
-    "Unshare" : "Zrušiť zdieľanie",
     "notify by email" : "informovať emailom",
+    "Unshare" : "Zrušiť zdieľanie",
     "can share" : "môže zdieľať",
     "can edit" : "môže upraviť",
-    "access control" : "prístupové práva",
     "create" : "vytvoriť",
     "change" : "zmeniť",
     "delete" : "vymazať",
-    "Password protected" : "Chránené heslom",
-    "Error unsetting expiration date" : "Chyba pri odstraňovaní dátumu expirácie",
-    "Error setting expiration date" : "Chyba pri nastavení dátumu expirácie",
-    "Sending ..." : "Odosielam ...",
-    "Email sent" : "Email odoslaný",
+    "access control" : "prístupové práva",
+    "An error occured. Please try again" : "Nastala chyba. Skúste to znovu",
+    "Share" : "Zdieľať",
+    "Share with users or groups …" : "Zdieľať s používateľmi alebo skupinami ...",
+    "Share with users, groups or remote users …" : "Zdieľať s používateľmi, skupinami alebo vzdialenými používateľmi ...",
     "Warning" : "Varovanie",
     "The object type is not specified." : "Nešpecifikovaný typ objektu.",
     "Enter new" : "Zadať nový",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index d2a37da8346..c9ab6cfacc3 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -103,13 +103,15 @@
     "Error while sharing" : "Chyba počas zdieľania",
     "Error while unsharing" : "Chyba počas ukončenia zdieľania",
     "Error while changing permissions" : "Chyba počas zmeny oprávnení",
-    "Shared with you and the group {group} by {owner}" : "Zdieľané s vami a so skupinou {group} používateľom {owner}",
-    "Shared with you by {owner}" : "Zdieľané s vami používateľom {owner}",
-    "Share with users or groups …" : "Zdieľať s používateľmi alebo skupinami ...",
-    "Share with users, groups or remote users …" : "Zdieľať s používateľmi, skupinami alebo vzdialenými používateľmi ...",
-    "Share" : "Zdieľať",
-    "Share link" : "Zdieľať linku",
+    "Error setting expiration date" : "Chyba pri nastavení dátumu expirácie",
     "The public link will expire no later than {days} days after it is created" : "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
+    "Set expiration date" : "Nastaviť dátum expirácie",
+    "Expiration" : "Koniec platnosti",
+    "Expiration date" : "Dátum expirácie",
+    "Sending ..." : "Odosielam ...",
+    "Email sent" : "Email odoslaný",
+    "Resharing is not allowed" : "Zdieľanie už zdieľanej položky nie je povolené",
+    "Share link" : "Zdieľať linku",
     "Link" : "Odkaz",
     "Password protect" : "Chrániť heslom",
     "Password" : "Heslo",
@@ -117,28 +119,23 @@
     "Allow editing" : "Povoliť úpravy",
     "Email link to person" : "Odoslať odkaz emailom",
     "Send" : "Odoslať",
-    "Set expiration date" : "Nastaviť dátum expirácie",
-    "Expiration" : "Koniec platnosti",
-    "Expiration date" : "Dátum expirácie",
-    "An error occured. Please try again" : "Nastala chyba. Skúste to znovu",
-    "Adding user..." : "Pridávam používateľa...",
+    "Shared with you and the group {group} by {owner}" : "Zdieľané s vami a so skupinou {group} používateľom {owner}",
+    "Shared with you by {owner}" : "Zdieľané s vami používateľom {owner}",
+    "Shared in {item} with {user}" : "Zdieľané v {item} s {user}",
     "group" : "skupina",
     "remote" : "vzdialený",
-    "Resharing is not allowed" : "Zdieľanie už zdieľanej položky nie je povolené",
-    "Shared in {item} with {user}" : "Zdieľané v {item} s {user}",
-    "Unshare" : "Zrušiť zdieľanie",
     "notify by email" : "informovať emailom",
+    "Unshare" : "Zrušiť zdieľanie",
     "can share" : "môže zdieľať",
     "can edit" : "môže upraviť",
-    "access control" : "prístupové práva",
     "create" : "vytvoriť",
     "change" : "zmeniť",
     "delete" : "vymazať",
-    "Password protected" : "Chránené heslom",
-    "Error unsetting expiration date" : "Chyba pri odstraňovaní dátumu expirácie",
-    "Error setting expiration date" : "Chyba pri nastavení dátumu expirácie",
-    "Sending ..." : "Odosielam ...",
-    "Email sent" : "Email odoslaný",
+    "access control" : "prístupové práva",
+    "An error occured. Please try again" : "Nastala chyba. Skúste to znovu",
+    "Share" : "Zdieľať",
+    "Share with users or groups …" : "Zdieľať s používateľmi alebo skupinami ...",
+    "Share with users, groups or remote users …" : "Zdieľať s používateľmi, skupinami alebo vzdialenými používateľmi ...",
     "Warning" : "Varovanie",
     "The object type is not specified." : "Nešpecifikovaný typ objektu.",
     "Enter new" : "Zadať nový",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index 71ed237f407..b0edc70f232 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -89,11 +89,15 @@ OC.L10N.register(
     "Error while sharing" : "Napaka med souporabo",
     "Error while unsharing" : "Napaka med odstranjevanjem souporabe",
     "Error while changing permissions" : "Napaka med spreminjanjem dovoljenj",
-    "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
-    "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
-    "Share" : "Souporaba",
-    "Share link" : "Povezava za prejem",
+    "Error setting expiration date" : "Napaka nastavljanja datuma preteka",
     "The public link will expire no later than {days} days after it is created" : "Javna povezava bo potekla {days} dni po ustvarjanju.",
+    "Set expiration date" : "Nastavi datum preteka",
+    "Expiration" : "Datum preteka",
+    "Expiration date" : "Datum preteka",
+    "Sending ..." : "Pošiljanje ...",
+    "Email sent" : "Elektronska pošta je poslana",
+    "Resharing is not allowed" : "Nadaljnja souporaba ni dovoljena",
+    "Share link" : "Povezava za prejem",
     "Link" : "Povezava",
     "Password protect" : "Zaščiti z geslom",
     "Password" : "Geslo",
@@ -101,27 +105,20 @@ OC.L10N.register(
     "Allow editing" : "Dovoli urejanje",
     "Email link to person" : "Posreduj povezavo po elektronski pošti",
     "Send" : "Pošlji",
-    "Set expiration date" : "Nastavi datum preteka",
-    "Expiration" : "Datum preteka",
-    "Expiration date" : "Datum preteka",
-    "Adding user..." : "Dodajanje uporabnika ...",
+    "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
+    "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
+    "Shared in {item} with {user}" : "V souporabi v {item} z uporabnikom {user}",
     "group" : "skupina",
     "remote" : "oddaljeno",
-    "Resharing is not allowed" : "Nadaljnja souporaba ni dovoljena",
-    "Shared in {item} with {user}" : "V souporabi v {item} z uporabnikom {user}",
-    "Unshare" : "Prekliči souporabo",
     "notify by email" : "obvesti po elektronski pošti",
+    "Unshare" : "Prekliči souporabo",
     "can share" : "lahko omogoči souporabo",
     "can edit" : "lahko ureja",
-    "access control" : "nadzor dostopa",
     "create" : "ustvari",
     "change" : "sprememba",
     "delete" : "izbriše",
-    "Password protected" : "Zaščiteno z geslom",
-    "Error unsetting expiration date" : "Napaka brisanja datuma preteka",
-    "Error setting expiration date" : "Napaka nastavljanja datuma preteka",
-    "Sending ..." : "Pošiljanje ...",
-    "Email sent" : "Elektronska pošta je poslana",
+    "access control" : "nadzor dostopa",
+    "Share" : "Souporaba",
     "Warning" : "Opozorilo",
     "The object type is not specified." : "Vrsta predmeta ni podana.",
     "Enter new" : "Vnesite novo",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index 95e4bf32769..5e720949dd1 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -87,11 +87,15 @@
     "Error while sharing" : "Napaka med souporabo",
     "Error while unsharing" : "Napaka med odstranjevanjem souporabe",
     "Error while changing permissions" : "Napaka med spreminjanjem dovoljenj",
-    "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
-    "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
-    "Share" : "Souporaba",
-    "Share link" : "Povezava za prejem",
+    "Error setting expiration date" : "Napaka nastavljanja datuma preteka",
     "The public link will expire no later than {days} days after it is created" : "Javna povezava bo potekla {days} dni po ustvarjanju.",
+    "Set expiration date" : "Nastavi datum preteka",
+    "Expiration" : "Datum preteka",
+    "Expiration date" : "Datum preteka",
+    "Sending ..." : "Pošiljanje ...",
+    "Email sent" : "Elektronska pošta je poslana",
+    "Resharing is not allowed" : "Nadaljnja souporaba ni dovoljena",
+    "Share link" : "Povezava za prejem",
     "Link" : "Povezava",
     "Password protect" : "Zaščiti z geslom",
     "Password" : "Geslo",
@@ -99,27 +103,20 @@
     "Allow editing" : "Dovoli urejanje",
     "Email link to person" : "Posreduj povezavo po elektronski pošti",
     "Send" : "Pošlji",
-    "Set expiration date" : "Nastavi datum preteka",
-    "Expiration" : "Datum preteka",
-    "Expiration date" : "Datum preteka",
-    "Adding user..." : "Dodajanje uporabnika ...",
+    "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
+    "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
+    "Shared in {item} with {user}" : "V souporabi v {item} z uporabnikom {user}",
     "group" : "skupina",
     "remote" : "oddaljeno",
-    "Resharing is not allowed" : "Nadaljnja souporaba ni dovoljena",
-    "Shared in {item} with {user}" : "V souporabi v {item} z uporabnikom {user}",
-    "Unshare" : "Prekliči souporabo",
     "notify by email" : "obvesti po elektronski pošti",
+    "Unshare" : "Prekliči souporabo",
     "can share" : "lahko omogoči souporabo",
     "can edit" : "lahko ureja",
-    "access control" : "nadzor dostopa",
     "create" : "ustvari",
     "change" : "sprememba",
     "delete" : "izbriše",
-    "Password protected" : "Zaščiteno z geslom",
-    "Error unsetting expiration date" : "Napaka brisanja datuma preteka",
-    "Error setting expiration date" : "Napaka nastavljanja datuma preteka",
-    "Sending ..." : "Pošiljanje ...",
-    "Email sent" : "Elektronska pošta je poslana",
+    "access control" : "nadzor dostopa",
+    "Share" : "Souporaba",
     "Warning" : "Opozorilo",
     "The object type is not specified." : "Vrsta predmeta ni podana.",
     "Enter new" : "Vnesite novo",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index cc7979d9c49..70633586661 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -87,35 +87,32 @@ OC.L10N.register(
     "Error while sharing" : "Veprim i gabuar gjatë ndarjes",
     "Error while unsharing" : "Veprim i gabuar gjatë heqjes së ndarjes",
     "Error while changing permissions" : "Veprim i gabuar gjatë ndryshimit të lejeve",
-    "Shared with you and the group {group} by {owner}" : "Ndarë me ju dhe me grupin {group} nga {owner}",
-    "Shared with you by {owner}" : "Ndarë me ju nga {owner}",
-    "Share" : "Nda",
-    "Share link" : "Ndaje lidhjen",
+    "Error setting expiration date" : "Veprim i gabuar gjatë caktimit të datës së përfundimit",
     "The public link will expire no later than {days} days after it is created" : "Lidhja publike do të skadojë jo më vonë se {days} ditë pas krijimit",
+    "Set expiration date" : "Cakto datën e përfundimit",
+    "Expiration" : "Data e skadimit",
+    "Expiration date" : "Data e përfundimit",
+    "Sending ..." : "Duke dërguar...",
+    "Email sent" : "Email-i u dërgua",
+    "Resharing is not allowed" : "Rindarja nuk lejohet",
+    "Share link" : "Ndaje lidhjen",
     "Password protect" : "Mbro me kod",
     "Password" : "Kodi",
     "Choose a password for the public link" : "Zgjidhni një fjalëkalim për lidhjen publike",
     "Email link to person" : "Dërgo email me lidhjen",
     "Send" : "Dërgo",
-    "Set expiration date" : "Cakto datën e përfundimit",
-    "Expiration" : "Data e skadimit",
-    "Expiration date" : "Data e përfundimit",
-    "Adding user..." : "Duke shtuar përdoruesin ...",
-    "group" : "grupi",
-    "Resharing is not allowed" : "Rindarja nuk lejohet",
+    "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}",
     "Shared in {item} with {user}" : "Ndarë në {item} me {user}",
-    "Unshare" : "Hiq ndarjen",
+    "group" : "grupi",
     "notify by email" : "njofto me email",
+    "Unshare" : "Hiq ndarjen",
     "can share" : "mund të ndajnë",
     "can edit" : "mund të ndryshosh",
-    "access control" : "kontrollimi i hyrjeve",
     "create" : "krijo",
     "delete" : "elimino",
-    "Password protected" : "Mbrojtur me kod",
-    "Error unsetting expiration date" : "Veprim i gabuar gjatë heqjes së datës së përfundimit",
-    "Error setting expiration date" : "Veprim i gabuar gjatë caktimit të datës së përfundimit",
-    "Sending ..." : "Duke dërguar...",
-    "Email sent" : "Email-i u dërgua",
+    "access control" : "kontrollimi i hyrjeve",
+    "Share" : "Nda",
     "Warning" : "Kujdes",
     "The object type is not specified." : "Nuk është specifikuar tipi i objektit.",
     "Enter new" : "Jep të re",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index ad73a58c172..70351a75482 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -85,35 +85,32 @@
     "Error while sharing" : "Veprim i gabuar gjatë ndarjes",
     "Error while unsharing" : "Veprim i gabuar gjatë heqjes së ndarjes",
     "Error while changing permissions" : "Veprim i gabuar gjatë ndryshimit të lejeve",
-    "Shared with you and the group {group} by {owner}" : "Ndarë me ju dhe me grupin {group} nga {owner}",
-    "Shared with you by {owner}" : "Ndarë me ju nga {owner}",
-    "Share" : "Nda",
-    "Share link" : "Ndaje lidhjen",
+    "Error setting expiration date" : "Veprim i gabuar gjatë caktimit të datës së përfundimit",
     "The public link will expire no later than {days} days after it is created" : "Lidhja publike do të skadojë jo më vonë se {days} ditë pas krijimit",
+    "Set expiration date" : "Cakto datën e përfundimit",
+    "Expiration" : "Data e skadimit",
+    "Expiration date" : "Data e përfundimit",
+    "Sending ..." : "Duke dërguar...",
+    "Email sent" : "Email-i u dërgua",
+    "Resharing is not allowed" : "Rindarja nuk lejohet",
+    "Share link" : "Ndaje lidhjen",
     "Password protect" : "Mbro me kod",
     "Password" : "Kodi",
     "Choose a password for the public link" : "Zgjidhni një fjalëkalim për lidhjen publike",
     "Email link to person" : "Dërgo email me lidhjen",
     "Send" : "Dërgo",
-    "Set expiration date" : "Cakto datën e përfundimit",
-    "Expiration" : "Data e skadimit",
-    "Expiration date" : "Data e përfundimit",
-    "Adding user..." : "Duke shtuar përdoruesin ...",
-    "group" : "grupi",
-    "Resharing is not allowed" : "Rindarja nuk lejohet",
+    "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}",
     "Shared in {item} with {user}" : "Ndarë në {item} me {user}",
-    "Unshare" : "Hiq ndarjen",
+    "group" : "grupi",
     "notify by email" : "njofto me email",
+    "Unshare" : "Hiq ndarjen",
     "can share" : "mund të ndajnë",
     "can edit" : "mund të ndryshosh",
-    "access control" : "kontrollimi i hyrjeve",
     "create" : "krijo",
     "delete" : "elimino",
-    "Password protected" : "Mbrojtur me kod",
-    "Error unsetting expiration date" : "Veprim i gabuar gjatë heqjes së datës së përfundimit",
-    "Error setting expiration date" : "Veprim i gabuar gjatë caktimit të datës së përfundimit",
-    "Sending ..." : "Duke dërguar...",
-    "Email sent" : "Email-i u dërgua",
+    "access control" : "kontrollimi i hyrjeve",
+    "Share" : "Nda",
     "Warning" : "Kujdes",
     "The object type is not specified." : "Nuk është specifikuar tipi i objektit.",
     "Enter new" : "Jep të re",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index 979da988710..820b32ad61e 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -102,14 +102,15 @@ OC.L10N.register(
     "Error while sharing" : "Грешка при дељењу",
     "Error while unsharing" : "Грешка при укидању дељења",
     "Error while changing permissions" : "Грешка при измени дозвола",
-    "Shared with you and the group {group} by {owner}" : "{owner} дели са вама и са групом {group}.",
-    "Shared with you by {owner}" : "{owner} дели са вама",
-    "Share with users or groups …" : "Дели са корисницима или групама...",
-    "Share with users, groups or remote users …" : "Дели са корисницима, групама или удаљеним корисницима...",
-    "Share" : "Дели",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделите са људима у другим облацима користећи синтаксу корисничкоиме@сервер.com/owncloud",
-    "Share link" : "Веза дељења",
+    "Error setting expiration date" : "Грешка при постављању датума истека",
     "The public link will expire no later than {days} days after it is created" : "Јавна веза ће престати да важи {days} дана након стварања",
+    "Set expiration date" : "Постави датум истека",
+    "Expiration" : "Истиче",
+    "Expiration date" : "Датум истека",
+    "Sending ..." : "Шаљем...",
+    "Email sent" : "Порука је послата",
+    "Resharing is not allowed" : "Поновно дељење није дозвољено",
+    "Share link" : "Веза дељења",
     "Link" : "Веза",
     "Password protect" : "Заштићено лозинком",
     "Password" : "Лозинка",
@@ -117,28 +118,24 @@ OC.L10N.register(
     "Allow editing" : "Дозволи уређивање",
     "Email link to person" : "Пошаљи е-поштом",
     "Send" : "Пошаљи",
-    "Set expiration date" : "Постави датум истека",
-    "Expiration" : "Истиче",
-    "Expiration date" : "Датум истека",
-    "An error occured. Please try again" : "Дошло је до грешке. Покушајте поново",
-    "Adding user..." : "Додајем корисника...",
+    "Shared with you and the group {group} by {owner}" : "{owner} дели са вама и са групом {group}.",
+    "Shared with you by {owner}" : "{owner} дели са вама",
+    "Shared in {item} with {user}" : "Подељено унутар {item} са корисником {user}",
     "group" : "група",
     "remote" : "удаљени",
-    "Resharing is not allowed" : "Поновно дељење није дозвољено",
-    "Shared in {item} with {user}" : "Подељено унутар {item} са корисником {user}",
-    "Unshare" : "Укини дељење",
     "notify by email" : "обавести е-поштом",
+    "Unshare" : "Укини дељење",
     "can share" : "може да дели",
     "can edit" : "може да мења",
-    "access control" : "права приступа",
     "create" : "направи",
     "change" : "измени",
     "delete" : "обриши",
-    "Password protected" : "Заштићено лозинком",
-    "Error unsetting expiration date" : "Грешка при поништавању датума истека",
-    "Error setting expiration date" : "Грешка при постављању датума истека",
-    "Sending ..." : "Шаљем...",
-    "Email sent" : "Порука је послата",
+    "access control" : "права приступа",
+    "An error occured. Please try again" : "Дошло је до грешке. Покушајте поново",
+    "Share" : "Дели",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделите са људима у другим облацима користећи синтаксу корисничкоиме@сервер.com/owncloud",
+    "Share with users or groups …" : "Дели са корисницима или групама...",
+    "Share with users, groups or remote users …" : "Дели са корисницима, групама или удаљеним корисницима...",
     "Warning" : "Упозорење",
     "The object type is not specified." : "Тип објекта није наведен.",
     "Enter new" : "Унесите  нови",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index 65dcf74f046..2607a8ba79b 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -100,14 +100,15 @@
     "Error while sharing" : "Грешка при дељењу",
     "Error while unsharing" : "Грешка при укидању дељења",
     "Error while changing permissions" : "Грешка при измени дозвола",
-    "Shared with you and the group {group} by {owner}" : "{owner} дели са вама и са групом {group}.",
-    "Shared with you by {owner}" : "{owner} дели са вама",
-    "Share with users or groups …" : "Дели са корисницима или групама...",
-    "Share with users, groups or remote users …" : "Дели са корисницима, групама или удаљеним корисницима...",
-    "Share" : "Дели",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделите са људима у другим облацима користећи синтаксу корисничкоиме@сервер.com/owncloud",
-    "Share link" : "Веза дељења",
+    "Error setting expiration date" : "Грешка при постављању датума истека",
     "The public link will expire no later than {days} days after it is created" : "Јавна веза ће престати да важи {days} дана након стварања",
+    "Set expiration date" : "Постави датум истека",
+    "Expiration" : "Истиче",
+    "Expiration date" : "Датум истека",
+    "Sending ..." : "Шаљем...",
+    "Email sent" : "Порука је послата",
+    "Resharing is not allowed" : "Поновно дељење није дозвољено",
+    "Share link" : "Веза дељења",
     "Link" : "Веза",
     "Password protect" : "Заштићено лозинком",
     "Password" : "Лозинка",
@@ -115,28 +116,24 @@
     "Allow editing" : "Дозволи уређивање",
     "Email link to person" : "Пошаљи е-поштом",
     "Send" : "Пошаљи",
-    "Set expiration date" : "Постави датум истека",
-    "Expiration" : "Истиче",
-    "Expiration date" : "Датум истека",
-    "An error occured. Please try again" : "Дошло је до грешке. Покушајте поново",
-    "Adding user..." : "Додајем корисника...",
+    "Shared with you and the group {group} by {owner}" : "{owner} дели са вама и са групом {group}.",
+    "Shared with you by {owner}" : "{owner} дели са вама",
+    "Shared in {item} with {user}" : "Подељено унутар {item} са корисником {user}",
     "group" : "група",
     "remote" : "удаљени",
-    "Resharing is not allowed" : "Поновно дељење није дозвољено",
-    "Shared in {item} with {user}" : "Подељено унутар {item} са корисником {user}",
-    "Unshare" : "Укини дељење",
     "notify by email" : "обавести е-поштом",
+    "Unshare" : "Укини дељење",
     "can share" : "може да дели",
     "can edit" : "може да мења",
-    "access control" : "права приступа",
     "create" : "направи",
     "change" : "измени",
     "delete" : "обриши",
-    "Password protected" : "Заштићено лозинком",
-    "Error unsetting expiration date" : "Грешка при поништавању датума истека",
-    "Error setting expiration date" : "Грешка при постављању датума истека",
-    "Sending ..." : "Шаљем...",
-    "Email sent" : "Порука је послата",
+    "access control" : "права приступа",
+    "An error occured. Please try again" : "Дошло је до грешке. Покушајте поново",
+    "Share" : "Дели",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделите са људима у другим облацима користећи синтаксу корисничкоиме@сервер.com/owncloud",
+    "Share with users or groups …" : "Дели са корисницима или групама...",
+    "Share with users, groups or remote users …" : "Дели са корисницима, групама или удаљеним корисницима...",
     "Warning" : "Упозорење",
     "The object type is not specified." : "Тип објекта није наведен.",
     "Enter new" : "Унесите  нови",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index ccaaa7b5214..276252e324f 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -88,11 +88,15 @@ OC.L10N.register(
     "Error while sharing" : "Greška pri deljenju",
     "Error while unsharing" : "Greška u uklanjanju deljenja",
     "Error while changing permissions" : "Greška u promeni dozvola",
-    "Shared with you and the group {group} by {owner}" : "{owner} podelio sa Vama i grupom {group} ",
-    "Shared with you by {owner}" : "Sa vama podelio {owner}",
-    "Share" : "Podeli",
-    "Share link" : "Podeli prečicu",
+    "Error setting expiration date" : "Greška u postavljanju datuma isteka",
     "The public link will expire no later than {days} days after it is created" : "Javna prečica će isteći ne kasnije od {days} dana pošto je kreirana",
+    "Set expiration date" : "Datum isteka",
+    "Expiration" : "Isticanje",
+    "Expiration date" : "Datum isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "Email poslat",
+    "Resharing is not allowed" : "Dalje deljenje nije dozvoljeno",
+    "Share link" : "Podeli prečicu",
     "Link" : "Prečica",
     "Password protect" : "Zaštita lozinkom",
     "Password" : "Lozinka",
@@ -100,27 +104,20 @@ OC.L10N.register(
     "Allow editing" : "Dozvoli uređivanje",
     "Email link to person" : "Pošalji link e-mailom",
     "Send" : "Pošalji",
-    "Set expiration date" : "Datum isteka",
-    "Expiration" : "Isticanje",
-    "Expiration date" : "Datum isteka",
-    "Adding user..." : "Dodavanje korisnika...",
+    "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}",
+    "Shared in {item} with {user}" : "Deljeno u {item} sa {user}",
     "group" : "grupa",
     "remote" : "udaljeni",
-    "Resharing is not allowed" : "Dalje deljenje nije dozvoljeno",
-    "Shared in {item} with {user}" : "Deljeno u {item} sa {user}",
-    "Unshare" : "Ukljoni deljenje",
     "notify by email" : "obavesti Email-om",
+    "Unshare" : "Ukljoni deljenje",
     "can share" : "dozvoljeno deljenje",
     "can edit" : "dozvoljene izmene",
-    "access control" : "kontrola pristupa",
     "create" : "napravi",
     "change" : "izmeni",
     "delete" : "brisanje",
-    "Password protected" : "Zaštćeno lozinkom",
-    "Error unsetting expiration date" : "Greška u uklanjanju datuma isteka",
-    "Error setting expiration date" : "Greška u postavljanju datuma isteka",
-    "Sending ..." : "Slanje...",
-    "Email sent" : "Email poslat",
+    "access control" : "kontrola pristupa",
+    "Share" : "Podeli",
     "Warning" : "Upozorenje",
     "The object type is not specified." : "Tip objekta nije zadan.",
     "Enter new" : "Unesite novi",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index 9af5f8b6c8a..03766ee0948 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -86,11 +86,15 @@
     "Error while sharing" : "Greška pri deljenju",
     "Error while unsharing" : "Greška u uklanjanju deljenja",
     "Error while changing permissions" : "Greška u promeni dozvola",
-    "Shared with you and the group {group} by {owner}" : "{owner} podelio sa Vama i grupom {group} ",
-    "Shared with you by {owner}" : "Sa vama podelio {owner}",
-    "Share" : "Podeli",
-    "Share link" : "Podeli prečicu",
+    "Error setting expiration date" : "Greška u postavljanju datuma isteka",
     "The public link will expire no later than {days} days after it is created" : "Javna prečica će isteći ne kasnije od {days} dana pošto je kreirana",
+    "Set expiration date" : "Datum isteka",
+    "Expiration" : "Isticanje",
+    "Expiration date" : "Datum isteka",
+    "Sending ..." : "Slanje...",
+    "Email sent" : "Email poslat",
+    "Resharing is not allowed" : "Dalje deljenje nije dozvoljeno",
+    "Share link" : "Podeli prečicu",
     "Link" : "Prečica",
     "Password protect" : "Zaštita lozinkom",
     "Password" : "Lozinka",
@@ -98,27 +102,20 @@
     "Allow editing" : "Dozvoli uređivanje",
     "Email link to person" : "Pošalji link e-mailom",
     "Send" : "Pošalji",
-    "Set expiration date" : "Datum isteka",
-    "Expiration" : "Isticanje",
-    "Expiration date" : "Datum isteka",
-    "Adding user..." : "Dodavanje korisnika...",
+    "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}",
+    "Shared in {item} with {user}" : "Deljeno u {item} sa {user}",
     "group" : "grupa",
     "remote" : "udaljeni",
-    "Resharing is not allowed" : "Dalje deljenje nije dozvoljeno",
-    "Shared in {item} with {user}" : "Deljeno u {item} sa {user}",
-    "Unshare" : "Ukljoni deljenje",
     "notify by email" : "obavesti Email-om",
+    "Unshare" : "Ukljoni deljenje",
     "can share" : "dozvoljeno deljenje",
     "can edit" : "dozvoljene izmene",
-    "access control" : "kontrola pristupa",
     "create" : "napravi",
     "change" : "izmeni",
     "delete" : "brisanje",
-    "Password protected" : "Zaštćeno lozinkom",
-    "Error unsetting expiration date" : "Greška u uklanjanju datuma isteka",
-    "Error setting expiration date" : "Greška u postavljanju datuma isteka",
-    "Sending ..." : "Slanje...",
-    "Email sent" : "Email poslat",
+    "access control" : "kontrola pristupa",
+    "Share" : "Podeli",
     "Warning" : "Upozorenje",
     "The object type is not specified." : "Tip objekta nije zadan.",
     "Enter new" : "Unesite novi",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index 27c1255f65b..e2d5edf3f5d 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -88,11 +88,15 @@ OC.L10N.register(
     "Error while sharing" : "Fel vid delning",
     "Error while unsharing" : "Fel när delning skulle avslutas",
     "Error while changing permissions" : "Fel vid ändring av rättigheter",
-    "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
-    "Shared with you by {owner}" : "Delad med dig av {owner}",
-    "Share" : "Dela",
-    "Share link" : "Dela länk",
+    "Error setting expiration date" : "Fel vid sättning av utgångsdatum",
     "The public link will expire no later than {days} days after it is created" : "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+    "Set expiration date" : "Sätt utgångsdatum",
+    "Expiration" : "Upphör",
+    "Expiration date" : "Utgångsdatum",
+    "Sending ..." : "Skickar ...",
+    "Email sent" : "E-post skickat",
+    "Resharing is not allowed" : "Dela vidare är inte tillåtet",
+    "Share link" : "Dela länk",
     "Link" : "Länk",
     "Password protect" : "Lösenordsskydda",
     "Password" : "Lösenord",
@@ -100,27 +104,20 @@ OC.L10N.register(
     "Allow editing" : "Tillåt redigering",
     "Email link to person" : "E-posta länk till person",
     "Send" : "Skicka",
-    "Set expiration date" : "Sätt utgångsdatum",
-    "Expiration" : "Upphör",
-    "Expiration date" : "Utgångsdatum",
-    "Adding user..." : "Lägger till användare...",
+    "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
+    "Shared with you by {owner}" : "Delad med dig av {owner}",
+    "Shared in {item} with {user}" : "Delad i {item} med {user}",
     "group" : "Grupp",
     "remote" : "fjärr",
-    "Resharing is not allowed" : "Dela vidare är inte tillåtet",
-    "Shared in {item} with {user}" : "Delad i {item} med {user}",
-    "Unshare" : "Sluta dela",
     "notify by email" : "informera via e-post",
+    "Unshare" : "Sluta dela",
     "can share" : "får dela",
     "can edit" : "kan redigera",
-    "access control" : "åtkomstkontroll",
     "create" : "skapa",
     "change" : "ändra",
     "delete" : "radera",
-    "Password protected" : "Lösenordsskyddad",
-    "Error unsetting expiration date" : "Fel vid borttagning av utgångsdatum",
-    "Error setting expiration date" : "Fel vid sättning av utgångsdatum",
-    "Sending ..." : "Skickar ...",
-    "Email sent" : "E-post skickat",
+    "access control" : "åtkomstkontroll",
+    "Share" : "Dela",
     "Warning" : "Varning",
     "The object type is not specified." : "Objekttypen är inte specificerad.",
     "Enter new" : "Skriv nytt",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index befc73dfc44..c25a4afc5e7 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -86,11 +86,15 @@
     "Error while sharing" : "Fel vid delning",
     "Error while unsharing" : "Fel när delning skulle avslutas",
     "Error while changing permissions" : "Fel vid ändring av rättigheter",
-    "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
-    "Shared with you by {owner}" : "Delad med dig av {owner}",
-    "Share" : "Dela",
-    "Share link" : "Dela länk",
+    "Error setting expiration date" : "Fel vid sättning av utgångsdatum",
     "The public link will expire no later than {days} days after it is created" : "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+    "Set expiration date" : "Sätt utgångsdatum",
+    "Expiration" : "Upphör",
+    "Expiration date" : "Utgångsdatum",
+    "Sending ..." : "Skickar ...",
+    "Email sent" : "E-post skickat",
+    "Resharing is not allowed" : "Dela vidare är inte tillåtet",
+    "Share link" : "Dela länk",
     "Link" : "Länk",
     "Password protect" : "Lösenordsskydda",
     "Password" : "Lösenord",
@@ -98,27 +102,20 @@
     "Allow editing" : "Tillåt redigering",
     "Email link to person" : "E-posta länk till person",
     "Send" : "Skicka",
-    "Set expiration date" : "Sätt utgångsdatum",
-    "Expiration" : "Upphör",
-    "Expiration date" : "Utgångsdatum",
-    "Adding user..." : "Lägger till användare...",
+    "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
+    "Shared with you by {owner}" : "Delad med dig av {owner}",
+    "Shared in {item} with {user}" : "Delad i {item} med {user}",
     "group" : "Grupp",
     "remote" : "fjärr",
-    "Resharing is not allowed" : "Dela vidare är inte tillåtet",
-    "Shared in {item} with {user}" : "Delad i {item} med {user}",
-    "Unshare" : "Sluta dela",
     "notify by email" : "informera via e-post",
+    "Unshare" : "Sluta dela",
     "can share" : "får dela",
     "can edit" : "kan redigera",
-    "access control" : "åtkomstkontroll",
     "create" : "skapa",
     "change" : "ändra",
     "delete" : "radera",
-    "Password protected" : "Lösenordsskyddad",
-    "Error unsetting expiration date" : "Fel vid borttagning av utgångsdatum",
-    "Error setting expiration date" : "Fel vid sättning av utgångsdatum",
-    "Sending ..." : "Skickar ...",
-    "Email sent" : "E-post skickat",
+    "access control" : "åtkomstkontroll",
+    "Share" : "Dela",
     "Warning" : "Varning",
     "The object type is not specified." : "Objekttypen är inte specificerad.",
     "Enter new" : "Skriv nytt",
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
index c58dea8366e..d10cea1833f 100644
--- a/core/l10n/ta_LK.js
+++ b/core/l10n/ta_LK.js
@@ -50,24 +50,22 @@ OC.L10N.register(
     "Error while sharing" : "பகிரும் போதான வழு",
     "Error while unsharing" : "பகிராமல் உள்ளப்போதான வழு",
     "Error while changing permissions" : "அனுமதிகள் மாறும்போதான வழு",
-    "Shared with you and the group {group} by {owner}" : "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
-    "Shared with you by {owner}" : "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
-    "Share" : "பகிர்வு",
-    "Password protect" : "கடவுச்சொல்லை பாதுகாத்தல்",
-    "Password" : "கடவுச்சொல்",
+    "Error setting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
     "Set expiration date" : "காலாவதி தேதியை குறிப்பிடுக",
     "Expiration date" : "காலவதியாகும் திகதி",
-    "group" : "குழு",
     "Resharing is not allowed" : "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
+    "Password protect" : "கடவுச்சொல்லை பாதுகாத்தல்",
+    "Password" : "கடவுச்சொல்",
+    "Shared with you and the group {group} by {owner}" : "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Shared with you by {owner}" : "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
     "Shared in {item} with {user}" : "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
+    "group" : "குழு",
     "Unshare" : "பகிரப்படாதது",
     "can edit" : "தொகுக்க முடியும்",
-    "access control" : "கட்டுப்பாடான அணுகல்",
     "create" : "உருவவாக்கல்",
     "delete" : "நீக்குக",
-    "Password protected" : "கடவுச்சொல் பாதுகாக்கப்பட்டது",
-    "Error unsetting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
-    "Error setting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
+    "access control" : "கட்டுப்பாடான அணுகல்",
+    "Share" : "பகிர்வு",
     "Warning" : "எச்சரிக்கை",
     "The object type is not specified." : "பொருள் வகை குறிப்பிடப்படவில்லை.",
     "Delete" : "நீக்குக",
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
index 60ff565dbf2..1d19146d104 100644
--- a/core/l10n/ta_LK.json
+++ b/core/l10n/ta_LK.json
@@ -48,24 +48,22 @@
     "Error while sharing" : "பகிரும் போதான வழு",
     "Error while unsharing" : "பகிராமல் உள்ளப்போதான வழு",
     "Error while changing permissions" : "அனுமதிகள் மாறும்போதான வழு",
-    "Shared with you and the group {group} by {owner}" : "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
-    "Shared with you by {owner}" : "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
-    "Share" : "பகிர்வு",
-    "Password protect" : "கடவுச்சொல்லை பாதுகாத்தல்",
-    "Password" : "கடவுச்சொல்",
+    "Error setting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
     "Set expiration date" : "காலாவதி தேதியை குறிப்பிடுக",
     "Expiration date" : "காலவதியாகும் திகதி",
-    "group" : "குழு",
     "Resharing is not allowed" : "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
+    "Password protect" : "கடவுச்சொல்லை பாதுகாத்தல்",
+    "Password" : "கடவுச்சொல்",
+    "Shared with you and the group {group} by {owner}" : "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Shared with you by {owner}" : "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
     "Shared in {item} with {user}" : "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
+    "group" : "குழு",
     "Unshare" : "பகிரப்படாதது",
     "can edit" : "தொகுக்க முடியும்",
-    "access control" : "கட்டுப்பாடான அணுகல்",
     "create" : "உருவவாக்கல்",
     "delete" : "நீக்குக",
-    "Password protected" : "கடவுச்சொல் பாதுகாக்கப்பட்டது",
-    "Error unsetting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
-    "Error setting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
+    "access control" : "கட்டுப்பாடான அணுகல்",
+    "Share" : "பகிர்வு",
     "Warning" : "எச்சரிக்கை",
     "The object type is not specified." : "பொருள் வகை குறிப்பிடப்படவில்லை.",
     "Delete" : "நீக்குக",
diff --git a/core/l10n/te.js b/core/l10n/te.js
index 423fb764b72..6169beff101 100644
--- a/core/l10n/te.js
+++ b/core/l10n/te.js
@@ -27,9 +27,9 @@ OC.L10N.register(
     "Cancel" : "రద్దుచేయి",
     "Continue" : "కొనసాగించు",
     "Error" : "పొరపాటు",
+    "Expiration date" : "కాలం చెల్లు తేదీ",
     "Password" : "సంకేతపదం",
     "Send" : "పంపించు",
-    "Expiration date" : "కాలం చెల్లు తేదీ",
     "delete" : "తొలగించు",
     "Warning" : "హెచ్చరిక",
     "Delete" : "తొలగించు",
diff --git a/core/l10n/te.json b/core/l10n/te.json
index cd7b0d9a93f..b09f286afbc 100644
--- a/core/l10n/te.json
+++ b/core/l10n/te.json
@@ -25,9 +25,9 @@
     "Cancel" : "రద్దుచేయి",
     "Continue" : "కొనసాగించు",
     "Error" : "పొరపాటు",
+    "Expiration date" : "కాలం చెల్లు తేదీ",
     "Password" : "సంకేతపదం",
     "Send" : "పంపించు",
-    "Expiration date" : "కాలం చెల్లు తేదీ",
     "delete" : "తొలగించు",
     "Warning" : "హెచ్చరిక",
     "Delete" : "తొలగించు",
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index f72fa3ee38b..a183ccae7f7 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "เกิดข้อผิดพลาดขณะกำลังแชร์ข้อมูล",
     "Error while unsharing" : "เกิดข้อผิดพลาดขณะกำลังยกเลิกการแชร์ข้อมูล",
     "Error while changing permissions" : "เกิดข้อผิดพลาดขณะกำลังเปลี่ยนสิทธิ์การเข้าใช้งาน",
-    "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
-    "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
-    "Share with users or groups …" : "แชร์กับผู้ใช้หรือกลุ่ม ...",
-    "Share with users, groups or remote users …" : "แชร์กับผู้ใช้กลุ่มหรือผู้ใช้ระยะไกล ...",
-    "Share" : "แชร์",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ",
-    "Share link" : "แชร์ลิงค์",
+    "Error setting expiration date" : "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
     "The public link will expire no later than {days} days after it is created" : "ลิงค์สาธารณะจะหมดอายุภายใน {days} วัน หลังจากที่มันถูกสร้างขึ้น",
+    "Set expiration date" : "กำหนดวันที่หมดอายุ",
+    "Expiration" : "การหมดอายุ",
+    "Expiration date" : "วันที่หมดอายุ",
+    "Sending ..." : "กำลังส่ง...",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "Resharing is not allowed" : "ไม่อนุญาตให้แชร์ข้อมูลที่ซ้ำกัน",
+    "Share link" : "แชร์ลิงค์",
     "Link" : "ลิงค์",
     "Password protect" : "รหัสผ่านป้องกัน",
     "Password" : "รหัสผ่าน",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "อนุญาตให้แก้ไข",
     "Email link to person" : "ส่งลิงก์ให้ทางอีเมล",
     "Send" : "ส่ง",
-    "Set expiration date" : "กำหนดวันที่หมดอายุ",
-    "Expiration" : "การหมดอายุ",
-    "Expiration date" : "วันที่หมดอายุ",
-    "An error occured. Please try again" : "เกิดข้อผิดพลาด กรุณาลองอีกครั้ง",
-    "Adding user..." : "กำลังเพิ่มผู้ใช้ ...",
+    "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
+    "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
+    "Shared in {item} with {user}" : "ได้แชร์ {item} ให้กับ {user}",
     "group" : "กลุ่มผู้ใช้งาน",
     "remote" : "ระยะไกล",
-    "Resharing is not allowed" : "ไม่อนุญาตให้แชร์ข้อมูลที่ซ้ำกัน",
-    "Shared in {item} with {user}" : "ได้แชร์ {item} ให้กับ {user}",
-    "Unshare" : "ยกเลิกการแชร์",
     "notify by email" : "แจ้งเตือนทางอีเมล",
+    "Unshare" : "ยกเลิกการแชร์",
     "can share" : "สามารถแชร์ได้",
     "can edit" : "สามารถแก้ไข",
-    "access control" : "ควบคุมการเข้าถึง",
     "create" : "สร้าง",
     "change" : "เปลี่ยนแปลง",
     "delete" : "ลบ",
-    "Password protected" : "ใส่รหัสผ่านไว้",
-    "Error unsetting expiration date" : "เกิดข้อผิดพลาดขณะยกเลิกการตั้งค่าวันที่หมดอายุ",
-    "Error setting expiration date" : "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
-    "Sending ..." : "กำลังส่ง...",
-    "Email sent" : "ส่งอีเมล์แล้ว",
+    "access control" : "ควบคุมการเข้าถึง",
+    "An error occured. Please try again" : "เกิดข้อผิดพลาด กรุณาลองอีกครั้ง",
+    "Share" : "แชร์",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ",
+    "Share with users or groups …" : "แชร์กับผู้ใช้หรือกลุ่ม ...",
+    "Share with users, groups or remote users …" : "แชร์กับผู้ใช้กลุ่มหรือผู้ใช้ระยะไกล ...",
     "Warning" : "คำเตือน",
     "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
     "Enter new" : "ใส่ข้อมูลใหม่",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index d808685898d..ccdfd94c649 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "เกิดข้อผิดพลาดขณะกำลังแชร์ข้อมูล",
     "Error while unsharing" : "เกิดข้อผิดพลาดขณะกำลังยกเลิกการแชร์ข้อมูล",
     "Error while changing permissions" : "เกิดข้อผิดพลาดขณะกำลังเปลี่ยนสิทธิ์การเข้าใช้งาน",
-    "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
-    "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
-    "Share with users or groups …" : "แชร์กับผู้ใช้หรือกลุ่ม ...",
-    "Share with users, groups or remote users …" : "แชร์กับผู้ใช้กลุ่มหรือผู้ใช้ระยะไกล ...",
-    "Share" : "แชร์",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ",
-    "Share link" : "แชร์ลิงค์",
+    "Error setting expiration date" : "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
     "The public link will expire no later than {days} days after it is created" : "ลิงค์สาธารณะจะหมดอายุภายใน {days} วัน หลังจากที่มันถูกสร้างขึ้น",
+    "Set expiration date" : "กำหนดวันที่หมดอายุ",
+    "Expiration" : "การหมดอายุ",
+    "Expiration date" : "วันที่หมดอายุ",
+    "Sending ..." : "กำลังส่ง...",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "Resharing is not allowed" : "ไม่อนุญาตให้แชร์ข้อมูลที่ซ้ำกัน",
+    "Share link" : "แชร์ลิงค์",
     "Link" : "ลิงค์",
     "Password protect" : "รหัสผ่านป้องกัน",
     "Password" : "รหัสผ่าน",
@@ -129,28 +130,24 @@
     "Allow editing" : "อนุญาตให้แก้ไข",
     "Email link to person" : "ส่งลิงก์ให้ทางอีเมล",
     "Send" : "ส่ง",
-    "Set expiration date" : "กำหนดวันที่หมดอายุ",
-    "Expiration" : "การหมดอายุ",
-    "Expiration date" : "วันที่หมดอายุ",
-    "An error occured. Please try again" : "เกิดข้อผิดพลาด กรุณาลองอีกครั้ง",
-    "Adding user..." : "กำลังเพิ่มผู้ใช้ ...",
+    "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
+    "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
+    "Shared in {item} with {user}" : "ได้แชร์ {item} ให้กับ {user}",
     "group" : "กลุ่มผู้ใช้งาน",
     "remote" : "ระยะไกล",
-    "Resharing is not allowed" : "ไม่อนุญาตให้แชร์ข้อมูลที่ซ้ำกัน",
-    "Shared in {item} with {user}" : "ได้แชร์ {item} ให้กับ {user}",
-    "Unshare" : "ยกเลิกการแชร์",
     "notify by email" : "แจ้งเตือนทางอีเมล",
+    "Unshare" : "ยกเลิกการแชร์",
     "can share" : "สามารถแชร์ได้",
     "can edit" : "สามารถแก้ไข",
-    "access control" : "ควบคุมการเข้าถึง",
     "create" : "สร้าง",
     "change" : "เปลี่ยนแปลง",
     "delete" : "ลบ",
-    "Password protected" : "ใส่รหัสผ่านไว้",
-    "Error unsetting expiration date" : "เกิดข้อผิดพลาดขณะยกเลิกการตั้งค่าวันที่หมดอายุ",
-    "Error setting expiration date" : "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
-    "Sending ..." : "กำลังส่ง...",
-    "Email sent" : "ส่งอีเมล์แล้ว",
+    "access control" : "ควบคุมการเข้าถึง",
+    "An error occured. Please try again" : "เกิดข้อผิดพลาด กรุณาลองอีกครั้ง",
+    "Share" : "แชร์",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ",
+    "Share with users or groups …" : "แชร์กับผู้ใช้หรือกลุ่ม ...",
+    "Share with users, groups or remote users …" : "แชร์กับผู้ใช้กลุ่มหรือผู้ใช้ระยะไกล ...",
     "Warning" : "คำเตือน",
     "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
     "Enter new" : "ใส่ข้อมูลใหม่",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index c250f919892..075c7470f4e 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "Paylaşım sırasında hata",
     "Error while unsharing" : "Paylaşım iptal edilirken hata",
     "Error while changing permissions" : "İzinleri değiştirirken hata",
-    "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
-    "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşıldı",
-    "Share with users or groups …" : "Kullanıcı ve gruplarla paylaş...",
-    "Share with users, groups or remote users …" : "Kullanıcılar, gruplar veya uzak kullanıcılarla paylaş ...",
-    "Share" : "Paylaş",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş",
-    "Share link" : "Paylaşma bağlantısı",
+    "Error setting expiration date" : "Son kullanma tarihi ayarlama hatası",
     "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",
+    "Set expiration date" : "Son kullanma tarihini ayarla",
+    "Expiration" : "Bitiş",
+    "Expiration date" : "Son kullanım tarihi",
+    "Sending ..." : "Gönderiliyor...",
+    "Email sent" : "E-posta gönderildi",
+    "Resharing is not allowed" : "Tekrar paylaşmaya izin verilmiyor",
+    "Share link" : "Paylaşma bağlantısı",
     "Link" : "Bağlantı",
     "Password protect" : "Parola koruması",
     "Password" : "Parola",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "Düzenlemeye izin ver",
     "Email link to person" : "Bağlantıyı e-posta ile gönder",
     "Send" : "Gönder",
-    "Set expiration date" : "Son kullanma tarihini ayarla",
-    "Expiration" : "Bitiş",
-    "Expiration date" : "Son kullanım tarihi",
-    "An error occured. Please try again" : "Bir hata oluştu. Lütfen yeniden deneyin",
-    "Adding user..." : "Kullanıcı ekleniyor...",
+    "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
+    "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşıldı",
+    "Shared in {item} with {user}" : "{item} içinde {user} ile paylaşılanlar",
     "group" : "grup",
     "remote" : "uzak",
-    "Resharing is not allowed" : "Tekrar paylaşmaya izin verilmiyor",
-    "Shared in {item} with {user}" : "{item} içinde {user} ile paylaşılanlar",
-    "Unshare" : "Paylaşmayı Kaldır",
     "notify by email" : "e-posta ile bildir",
+    "Unshare" : "Paylaşmayı Kaldır",
     "can share" : "paylaşabilir",
     "can edit" : "düzenleyebilir",
-    "access control" : "erişim kontrolü",
     "create" : "oluştur",
     "change" : "değiştir",
     "delete" : "sil",
-    "Password protected" : "Parola korumalı",
-    "Error unsetting expiration date" : "Son kullanma tarihi kaldırma hatası",
-    "Error setting expiration date" : "Son kullanma tarihi ayarlama hatası",
-    "Sending ..." : "Gönderiliyor...",
-    "Email sent" : "E-posta gönderildi",
+    "access control" : "erişim kontrolü",
+    "An error occured. Please try again" : "Bir hata oluştu. Lütfen yeniden deneyin",
+    "Share" : "Paylaş",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş",
+    "Share with users or groups …" : "Kullanıcı ve gruplarla paylaş...",
+    "Share with users, groups or remote users …" : "Kullanıcılar, gruplar veya uzak kullanıcılarla paylaş ...",
     "Warning" : "Uyarı",
     "The object type is not specified." : "Nesne türü belirtilmemiş.",
     "Enter new" : "Yeni girin",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index 6fa7aa63c1e..9aa0942c957 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "Paylaşım sırasında hata",
     "Error while unsharing" : "Paylaşım iptal edilirken hata",
     "Error while changing permissions" : "İzinleri değiştirirken hata",
-    "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
-    "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşıldı",
-    "Share with users or groups …" : "Kullanıcı ve gruplarla paylaş...",
-    "Share with users, groups or remote users …" : "Kullanıcılar, gruplar veya uzak kullanıcılarla paylaş ...",
-    "Share" : "Paylaş",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş",
-    "Share link" : "Paylaşma bağlantısı",
+    "Error setting expiration date" : "Son kullanma tarihi ayarlama hatası",
     "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",
+    "Set expiration date" : "Son kullanma tarihini ayarla",
+    "Expiration" : "Bitiş",
+    "Expiration date" : "Son kullanım tarihi",
+    "Sending ..." : "Gönderiliyor...",
+    "Email sent" : "E-posta gönderildi",
+    "Resharing is not allowed" : "Tekrar paylaşmaya izin verilmiyor",
+    "Share link" : "Paylaşma bağlantısı",
     "Link" : "Bağlantı",
     "Password protect" : "Parola koruması",
     "Password" : "Parola",
@@ -129,28 +130,24 @@
     "Allow editing" : "Düzenlemeye izin ver",
     "Email link to person" : "Bağlantıyı e-posta ile gönder",
     "Send" : "Gönder",
-    "Set expiration date" : "Son kullanma tarihini ayarla",
-    "Expiration" : "Bitiş",
-    "Expiration date" : "Son kullanım tarihi",
-    "An error occured. Please try again" : "Bir hata oluştu. Lütfen yeniden deneyin",
-    "Adding user..." : "Kullanıcı ekleniyor...",
+    "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
+    "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşıldı",
+    "Shared in {item} with {user}" : "{item} içinde {user} ile paylaşılanlar",
     "group" : "grup",
     "remote" : "uzak",
-    "Resharing is not allowed" : "Tekrar paylaşmaya izin verilmiyor",
-    "Shared in {item} with {user}" : "{item} içinde {user} ile paylaşılanlar",
-    "Unshare" : "Paylaşmayı Kaldır",
     "notify by email" : "e-posta ile bildir",
+    "Unshare" : "Paylaşmayı Kaldır",
     "can share" : "paylaşabilir",
     "can edit" : "düzenleyebilir",
-    "access control" : "erişim kontrolü",
     "create" : "oluştur",
     "change" : "değiştir",
     "delete" : "sil",
-    "Password protected" : "Parola korumalı",
-    "Error unsetting expiration date" : "Son kullanma tarihi kaldırma hatası",
-    "Error setting expiration date" : "Son kullanma tarihi ayarlama hatası",
-    "Sending ..." : "Gönderiliyor...",
-    "Email sent" : "E-posta gönderildi",
+    "access control" : "erişim kontrolü",
+    "An error occured. Please try again" : "Bir hata oluştu. Lütfen yeniden deneyin",
+    "Share" : "Paylaş",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş",
+    "Share with users or groups …" : "Kullanıcı ve gruplarla paylaş...",
+    "Share with users, groups or remote users …" : "Kullanıcılar, gruplar veya uzak kullanıcılarla paylaş ...",
     "Warning" : "Uyarı",
     "The object type is not specified." : "Nesne türü belirtilmemiş.",
     "Enter new" : "Yeni girin",
diff --git a/core/l10n/ug.js b/core/l10n/ug.js
index 092a1a4c181..ae8b001ef37 100644
--- a/core/l10n/ug.js
+++ b/core/l10n/ug.js
@@ -46,12 +46,12 @@ OC.L10N.register(
     "Ok" : "جەزملە",
     "Cancel" : "ۋاز كەچ",
     "Error" : "خاتالىق",
-    "Share" : "ھەمبەھىر",
     "Password" : "ئىم",
     "Send" : "يوللا",
     "group" : "گۇرۇپپا",
     "Unshare" : "ھەمبەھىرلىمە",
     "delete" : "ئۆچۈر",
+    "Share" : "ھەمبەھىر",
     "Warning" : "ئاگاھلاندۇرۇش",
     "Delete" : "ئۆچۈر",
     "Add" : "قوش",
diff --git a/core/l10n/ug.json b/core/l10n/ug.json
index dff656d766c..f61d52d0d5a 100644
--- a/core/l10n/ug.json
+++ b/core/l10n/ug.json
@@ -44,12 +44,12 @@
     "Ok" : "جەزملە",
     "Cancel" : "ۋاز كەچ",
     "Error" : "خاتالىق",
-    "Share" : "ھەمبەھىر",
     "Password" : "ئىم",
     "Send" : "يوللا",
     "group" : "گۇرۇپپا",
     "Unshare" : "ھەمبەھىرلىمە",
     "delete" : "ئۆچۈر",
+    "Share" : "ھەمبەھىر",
     "Warning" : "ئاگاھلاندۇرۇش",
     "Delete" : "ئۆچۈر",
     "Add" : "قوش",
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index e73f854f5e1..f5c6ad86d9e 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -100,14 +100,15 @@ OC.L10N.register(
     "Error while sharing" : "Помилка під час публікації",
     "Error while unsharing" : "Помилка під час відміни публікації",
     "Error while changing permissions" : "Помилка при зміні повноважень",
-    "Shared with you and the group {group} by {owner}" : " {owner} опублікував для Вас та для групи {group}",
-    "Shared with you by {owner}" : "{owner} опублікував для Вас",
-    "Share with users or groups …" : "Поширити серед користувачів або груп ...",
-    "Share with users, groups or remote users …" : "Поширити серед локальних чи віддалених користувачів або груп ...",
-    "Share" : "Поділитися",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud",
-    "Share link" : "Поділитись посиланням",
+    "Error setting expiration date" : "Помилка при встановленні терміну дії",
     "The public link will expire no later than {days} days after it is created" : "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
+    "Set expiration date" : "Встановити термін дії",
+    "Expiration" : "Закінчення",
+    "Expiration date" : "Термін дії",
+    "Sending ..." : "Надсилання...",
+    "Email sent" : "Лист надіслано",
+    "Resharing is not allowed" : "Пере-публікація не дозволяється",
+    "Share link" : "Поділитись посиланням",
     "Link" : "Посилання",
     "Password protect" : "Захистити паролем",
     "Password" : "Пароль",
@@ -115,28 +116,24 @@ OC.L10N.register(
     "Allow editing" : "Дозволити редагування",
     "Email link to person" : "Надіслати посилання електронною поштою",
     "Send" : "Надіслати",
-    "Set expiration date" : "Встановити термін дії",
-    "Expiration" : "Закінчення",
-    "Expiration date" : "Термін дії",
-    "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз",
-    "Adding user..." : "Додавання користувача...",
+    "Shared with you and the group {group} by {owner}" : " {owner} опублікував для Вас та для групи {group}",
+    "Shared with you by {owner}" : "{owner} опублікував для Вас",
+    "Shared in {item} with {user}" : "Опубліковано {item} для {user}",
     "group" : "група",
     "remote" : "Віддалений",
-    "Resharing is not allowed" : "Пере-публікація не дозволяється",
-    "Shared in {item} with {user}" : "Опубліковано {item} для {user}",
-    "Unshare" : "Закрити доступ",
     "notify by email" : "повідомити по Email",
+    "Unshare" : "Закрити доступ",
     "can share" : "може ділитися з іншими",
     "can edit" : "може редагувати",
-    "access control" : "контроль доступу",
     "create" : "створити",
     "change" : "змінити",
     "delete" : "видалити",
-    "Password protected" : "Захищено паролем",
-    "Error unsetting expiration date" : "Помилка при відміні терміну дії",
-    "Error setting expiration date" : "Помилка при встановленні терміну дії",
-    "Sending ..." : "Надсилання...",
-    "Email sent" : "Лист надіслано",
+    "access control" : "контроль доступу",
+    "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз",
+    "Share" : "Поділитися",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud",
+    "Share with users or groups …" : "Поширити серед користувачів або груп ...",
+    "Share with users, groups or remote users …" : "Поширити серед локальних чи віддалених користувачів або груп ...",
     "Warning" : "Попередження",
     "The object type is not specified." : "Не визначено тип об'єкту.",
     "Enter new" : "Введіть новий",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index 09326dcf44e..1c12acf311e 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -98,14 +98,15 @@
     "Error while sharing" : "Помилка під час публікації",
     "Error while unsharing" : "Помилка під час відміни публікації",
     "Error while changing permissions" : "Помилка при зміні повноважень",
-    "Shared with you and the group {group} by {owner}" : " {owner} опублікував для Вас та для групи {group}",
-    "Shared with you by {owner}" : "{owner} опублікував для Вас",
-    "Share with users or groups …" : "Поширити серед користувачів або груп ...",
-    "Share with users, groups or remote users …" : "Поширити серед локальних чи віддалених користувачів або груп ...",
-    "Share" : "Поділитися",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud",
-    "Share link" : "Поділитись посиланням",
+    "Error setting expiration date" : "Помилка при встановленні терміну дії",
     "The public link will expire no later than {days} days after it is created" : "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
+    "Set expiration date" : "Встановити термін дії",
+    "Expiration" : "Закінчення",
+    "Expiration date" : "Термін дії",
+    "Sending ..." : "Надсилання...",
+    "Email sent" : "Лист надіслано",
+    "Resharing is not allowed" : "Пере-публікація не дозволяється",
+    "Share link" : "Поділитись посиланням",
     "Link" : "Посилання",
     "Password protect" : "Захистити паролем",
     "Password" : "Пароль",
@@ -113,28 +114,24 @@
     "Allow editing" : "Дозволити редагування",
     "Email link to person" : "Надіслати посилання електронною поштою",
     "Send" : "Надіслати",
-    "Set expiration date" : "Встановити термін дії",
-    "Expiration" : "Закінчення",
-    "Expiration date" : "Термін дії",
-    "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз",
-    "Adding user..." : "Додавання користувача...",
+    "Shared with you and the group {group} by {owner}" : " {owner} опублікував для Вас та для групи {group}",
+    "Shared with you by {owner}" : "{owner} опублікував для Вас",
+    "Shared in {item} with {user}" : "Опубліковано {item} для {user}",
     "group" : "група",
     "remote" : "Віддалений",
-    "Resharing is not allowed" : "Пере-публікація не дозволяється",
-    "Shared in {item} with {user}" : "Опубліковано {item} для {user}",
-    "Unshare" : "Закрити доступ",
     "notify by email" : "повідомити по Email",
+    "Unshare" : "Закрити доступ",
     "can share" : "може ділитися з іншими",
     "can edit" : "може редагувати",
-    "access control" : "контроль доступу",
     "create" : "створити",
     "change" : "змінити",
     "delete" : "видалити",
-    "Password protected" : "Захищено паролем",
-    "Error unsetting expiration date" : "Помилка при відміні терміну дії",
-    "Error setting expiration date" : "Помилка при встановленні терміну дії",
-    "Sending ..." : "Надсилання...",
-    "Email sent" : "Лист надіслано",
+    "access control" : "контроль доступу",
+    "An error occured. Please try again" : "Виникла помилка. Будь ласка, спробуйте ще раз",
+    "Share" : "Поділитися",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud",
+    "Share with users or groups …" : "Поширити серед користувачів або груп ...",
+    "Share with users, groups or remote users …" : "Поширити серед локальних чи віддалених користувачів або груп ...",
     "Warning" : "Попередження",
     "The object type is not specified." : "Не визначено тип об'єкту.",
     "Enter new" : "Введіть новий",
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
index 7d6eda93467..58bc1695810 100644
--- a/core/l10n/ur_PK.js
+++ b/core/l10n/ur_PK.js
@@ -52,31 +52,29 @@ OC.L10N.register(
     "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" : "اشتراک",
+    "Error setting expiration date" : "خرابی  تصحیح تاریخ معیاد",
+    "Set expiration date" : "تاریخ معیاد سیٹ کریں",
+    "Expiration date" : "تاریخ معیاد",
+    "Sending ..." : "ارسال ہو رہا ھے",
+    "Email sent" : "ارسال شدہ ای میل ",
+    "Resharing is not allowed" : "دوبارہ اشتراک کی اجازت نہیں",
     "Share link" : "اشتراک لنک",
     "Password protect" : "محفوظ پاسورڈ",
     "Password" : "پاسورڈ",
     "Choose a password for the public link" : "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
     "Email link to person" : "شحص کے لیے ای میل لنک",
     "Send" : "بھجیں",
-    "Set expiration date" : "تاریخ معیاد سیٹ کریں",
-    "Expiration date" : "تاریخ معیاد",
-    "group" : "مجموعہ",
-    "Resharing is not allowed" : "دوبارہ اشتراک کی اجازت نہیں",
+    "Shared with you and the group {group} by {owner}" : "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
+    "Shared with you by {owner}" : "اشتراک شدہ آپ سے{مالک}",
     "Shared in {item} with {user}" : "شراکت میں {آئٹم}اور {مستخدم}",
-    "Unshare" : "شئیرنگ ختم کریں",
+    "group" : "مجموعہ",
     "notify by email" : "ای میل کے ذریعے مطلع کریں",
+    "Unshare" : "شئیرنگ ختم کریں",
     "can edit" : "تبدیل کر سکے ھیں",
-    "access control" : "اسیس کنٹرول",
     "create" : "نیا بنائیں",
     "delete" : "ختم کریں",
-    "Password protected" : "پاسورڈ سے محفوظ کیا گیا ہے",
-    "Error unsetting expiration date" : "خرابی غیر تصحیح تاریخ معیاد",
-    "Error setting expiration date" : "خرابی  تصحیح تاریخ معیاد",
-    "Sending ..." : "ارسال ہو رہا ھے",
-    "Email sent" : "ارسال شدہ ای میل ",
+    "access control" : "اسیس کنٹرول",
+    "Share" : "اشتراک",
     "Warning" : "انتباہ",
     "The object type is not specified." : "اس چیز کی قسم کی وضاحت نہیں",
     "Enter new" : "جدید درج کریں",
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
index c1d43ec31e2..037c35e29b0 100644
--- a/core/l10n/ur_PK.json
+++ b/core/l10n/ur_PK.json
@@ -50,31 +50,29 @@
     "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" : "اشتراک",
+    "Error setting expiration date" : "خرابی  تصحیح تاریخ معیاد",
+    "Set expiration date" : "تاریخ معیاد سیٹ کریں",
+    "Expiration date" : "تاریخ معیاد",
+    "Sending ..." : "ارسال ہو رہا ھے",
+    "Email sent" : "ارسال شدہ ای میل ",
+    "Resharing is not allowed" : "دوبارہ اشتراک کی اجازت نہیں",
     "Share link" : "اشتراک لنک",
     "Password protect" : "محفوظ پاسورڈ",
     "Password" : "پاسورڈ",
     "Choose a password for the public link" : "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
     "Email link to person" : "شحص کے لیے ای میل لنک",
     "Send" : "بھجیں",
-    "Set expiration date" : "تاریخ معیاد سیٹ کریں",
-    "Expiration date" : "تاریخ معیاد",
-    "group" : "مجموعہ",
-    "Resharing is not allowed" : "دوبارہ اشتراک کی اجازت نہیں",
+    "Shared with you and the group {group} by {owner}" : "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
+    "Shared with you by {owner}" : "اشتراک شدہ آپ سے{مالک}",
     "Shared in {item} with {user}" : "شراکت میں {آئٹم}اور {مستخدم}",
-    "Unshare" : "شئیرنگ ختم کریں",
+    "group" : "مجموعہ",
     "notify by email" : "ای میل کے ذریعے مطلع کریں",
+    "Unshare" : "شئیرنگ ختم کریں",
     "can edit" : "تبدیل کر سکے ھیں",
-    "access control" : "اسیس کنٹرول",
     "create" : "نیا بنائیں",
     "delete" : "ختم کریں",
-    "Password protected" : "پاسورڈ سے محفوظ کیا گیا ہے",
-    "Error unsetting expiration date" : "خرابی غیر تصحیح تاریخ معیاد",
-    "Error setting expiration date" : "خرابی  تصحیح تاریخ معیاد",
-    "Sending ..." : "ارسال ہو رہا ھے",
-    "Email sent" : "ارسال شدہ ای میل ",
+    "access control" : "اسیس کنٹرول",
+    "Share" : "اشتراک",
     "Warning" : "انتباہ",
     "The object type is not specified." : "اس چیز کی قسم کی وضاحت نہیں",
     "Enter new" : "جدید درج کریں",
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index 229a99b2c29..e22aaa2b4a7 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -71,31 +71,29 @@ OC.L10N.register(
     "Error while sharing" : "Lỗi trong quá trình chia sẻ",
     "Error while unsharing" : "Lỗi trong quá trình gỡ chia sẻ",
     "Error while changing permissions" : "Lỗi trong quá trình phân quyền",
-    "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
-    "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
-    "Share" : "Chia sẻ",
+    "Error setting expiration date" : "Lỗi cấu hình ngày kết thúc",
+    "Set expiration date" : "Đặt ngày kết thúc",
+    "Expiration date" : "Ngày kết thúc",
+    "Sending ..." : "Đang gởi ...",
+    "Email sent" : "Email đã được gửi",
+    "Resharing is not allowed" : "Chia sẻ lại không được cho phép",
     "Share link" : "Chia sẻ liên kết",
     "Password protect" : "Mật khẩu bảo vệ",
     "Password" : "Mật khẩu",
     "Email link to person" : "Liên kết email tới cá nhân",
     "Send" : "Gởi",
-    "Set expiration date" : "Đặt ngày kết thúc",
-    "Expiration date" : "Ngày kết thúc",
-    "group" : "nhóm",
-    "Resharing is not allowed" : "Chia sẻ lại không được cho phép",
+    "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
+    "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
     "Shared in {item} with {user}" : "Đã được chia sẽ trong {item} với {user}",
-    "Unshare" : "Bỏ chia sẻ",
+    "group" : "nhóm",
     "notify by email" : "Thông báo qua email",
+    "Unshare" : "Bỏ chia sẻ",
     "can share" : "có thể chia sẽ",
     "can edit" : "có thể chỉnh sửa",
-    "access control" : "quản lý truy cập",
     "create" : "tạo",
     "delete" : "xóa",
-    "Password protected" : "Mật khẩu bảo vệ",
-    "Error unsetting expiration date" : "Lỗi không thiết lập ngày kết thúc",
-    "Error setting expiration date" : "Lỗi cấu hình ngày kết thúc",
-    "Sending ..." : "Đang gởi ...",
-    "Email sent" : "Email đã được gửi",
+    "access control" : "quản lý truy cập",
+    "Share" : "Chia sẻ",
     "Warning" : "Cảnh báo",
     "The object type is not specified." : "Loại đối tượng không được chỉ định.",
     "Enter new" : "Nhập mới",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index e2f6e5a7ecc..acf5e2de9ab 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -69,31 +69,29 @@
     "Error while sharing" : "Lỗi trong quá trình chia sẻ",
     "Error while unsharing" : "Lỗi trong quá trình gỡ chia sẻ",
     "Error while changing permissions" : "Lỗi trong quá trình phân quyền",
-    "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
-    "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
-    "Share" : "Chia sẻ",
+    "Error setting expiration date" : "Lỗi cấu hình ngày kết thúc",
+    "Set expiration date" : "Đặt ngày kết thúc",
+    "Expiration date" : "Ngày kết thúc",
+    "Sending ..." : "Đang gởi ...",
+    "Email sent" : "Email đã được gửi",
+    "Resharing is not allowed" : "Chia sẻ lại không được cho phép",
     "Share link" : "Chia sẻ liên kết",
     "Password protect" : "Mật khẩu bảo vệ",
     "Password" : "Mật khẩu",
     "Email link to person" : "Liên kết email tới cá nhân",
     "Send" : "Gởi",
-    "Set expiration date" : "Đặt ngày kết thúc",
-    "Expiration date" : "Ngày kết thúc",
-    "group" : "nhóm",
-    "Resharing is not allowed" : "Chia sẻ lại không được cho phép",
+    "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
+    "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
     "Shared in {item} with {user}" : "Đã được chia sẽ trong {item} với {user}",
-    "Unshare" : "Bỏ chia sẻ",
+    "group" : "nhóm",
     "notify by email" : "Thông báo qua email",
+    "Unshare" : "Bỏ chia sẻ",
     "can share" : "có thể chia sẽ",
     "can edit" : "có thể chỉnh sửa",
-    "access control" : "quản lý truy cập",
     "create" : "tạo",
     "delete" : "xóa",
-    "Password protected" : "Mật khẩu bảo vệ",
-    "Error unsetting expiration date" : "Lỗi không thiết lập ngày kết thúc",
-    "Error setting expiration date" : "Lỗi cấu hình ngày kết thúc",
-    "Sending ..." : "Đang gởi ...",
-    "Email sent" : "Email đã được gửi",
+    "access control" : "quản lý truy cập",
+    "Share" : "Chia sẻ",
     "Warning" : "Cảnh báo",
     "The object type is not specified." : "Loại đối tượng không được chỉ định.",
     "Enter new" : "Nhập mới",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index e8f87ff5900..8b4a199c02c 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -116,14 +116,15 @@ OC.L10N.register(
     "Error while sharing" : "共享时出错",
     "Error while unsharing" : "取消共享时出错",
     "Error while changing permissions" : "修改权限时出错",
-    "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组",
-    "Shared with you by {owner}" : "{owner} 与您共享",
-    "Share with users or groups …" : "分享给其他用户或组 ...",
-    "Share with users, groups or remote users …" : "分享给其他用户、组或远程用户 ...",
-    "Share" : "分享",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "使用语法 username@example.com/owncloud 分享给其他 ownCloud 上的用户",
-    "Share link" : "分享链接",
+    "Error setting expiration date" : "设置过期日期时出错",
     "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
+    "Set expiration date" : "设置过期日期",
+    "Expiration" : "过期",
+    "Expiration date" : "过期日期",
+    "Sending ..." : "正在发送...",
+    "Email sent" : "邮件已发送",
+    "Resharing is not allowed" : "不允许二次共享",
+    "Share link" : "分享链接",
     "Link" : "链接",
     "Password protect" : "密码保护",
     "Password" : "密码",
@@ -131,28 +132,24 @@ OC.L10N.register(
     "Allow editing" : "允许编辑",
     "Email link to person" : "发送链接到个人",
     "Send" : "发送",
-    "Set expiration date" : "设置过期日期",
-    "Expiration" : "过期",
-    "Expiration date" : "过期日期",
-    "An error occured. Please try again" : "发生了一个错误请重新尝试",
-    "Adding user..." : "添加用户中...",
+    "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组",
+    "Shared with you by {owner}" : "{owner} 与您共享",
+    "Shared in {item} with {user}" : "在 {item} 与 {user} 共享。",
     "group" : "群组",
     "remote" : "远程",
-    "Resharing is not allowed" : "不允许二次共享",
-    "Shared in {item} with {user}" : "在 {item} 与 {user} 共享。",
-    "Unshare" : "取消共享",
     "notify by email" : "以邮件通知",
+    "Unshare" : "取消共享",
     "can share" : "可共享",
     "can edit" : "可以修改",
-    "access control" : "访问控制",
     "create" : "创建",
     "change" : "更改",
     "delete" : "删除",
-    "Password protected" : "密码已受保护",
-    "Error unsetting expiration date" : "取消设置过期日期时出错",
-    "Error setting expiration date" : "设置过期日期时出错",
-    "Sending ..." : "正在发送...",
-    "Email sent" : "邮件已发送",
+    "access control" : "访问控制",
+    "An error occured. Please try again" : "发生了一个错误请重新尝试",
+    "Share" : "分享",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "使用语法 username@example.com/owncloud 分享给其他 ownCloud 上的用户",
+    "Share with users or groups …" : "分享给其他用户或组 ...",
+    "Share with users, groups or remote users …" : "分享给其他用户、组或远程用户 ...",
     "Warning" : "警告",
     "The object type is not specified." : "未指定对象类型。",
     "Enter new" : "输入新...",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 7bed1beaa9c..23d3fc19366 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -114,14 +114,15 @@
     "Error while sharing" : "共享时出错",
     "Error while unsharing" : "取消共享时出错",
     "Error while changing permissions" : "修改权限时出错",
-    "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组",
-    "Shared with you by {owner}" : "{owner} 与您共享",
-    "Share with users or groups …" : "分享给其他用户或组 ...",
-    "Share with users, groups or remote users …" : "分享给其他用户、组或远程用户 ...",
-    "Share" : "分享",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "使用语法 username@example.com/owncloud 分享给其他 ownCloud 上的用户",
-    "Share link" : "分享链接",
+    "Error setting expiration date" : "设置过期日期时出错",
     "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
+    "Set expiration date" : "设置过期日期",
+    "Expiration" : "过期",
+    "Expiration date" : "过期日期",
+    "Sending ..." : "正在发送...",
+    "Email sent" : "邮件已发送",
+    "Resharing is not allowed" : "不允许二次共享",
+    "Share link" : "分享链接",
     "Link" : "链接",
     "Password protect" : "密码保护",
     "Password" : "密码",
@@ -129,28 +130,24 @@
     "Allow editing" : "允许编辑",
     "Email link to person" : "发送链接到个人",
     "Send" : "发送",
-    "Set expiration date" : "设置过期日期",
-    "Expiration" : "过期",
-    "Expiration date" : "过期日期",
-    "An error occured. Please try again" : "发生了一个错误请重新尝试",
-    "Adding user..." : "添加用户中...",
+    "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组",
+    "Shared with you by {owner}" : "{owner} 与您共享",
+    "Shared in {item} with {user}" : "在 {item} 与 {user} 共享。",
     "group" : "群组",
     "remote" : "远程",
-    "Resharing is not allowed" : "不允许二次共享",
-    "Shared in {item} with {user}" : "在 {item} 与 {user} 共享。",
-    "Unshare" : "取消共享",
     "notify by email" : "以邮件通知",
+    "Unshare" : "取消共享",
     "can share" : "可共享",
     "can edit" : "可以修改",
-    "access control" : "访问控制",
     "create" : "创建",
     "change" : "更改",
     "delete" : "删除",
-    "Password protected" : "密码已受保护",
-    "Error unsetting expiration date" : "取消设置过期日期时出错",
-    "Error setting expiration date" : "设置过期日期时出错",
-    "Sending ..." : "正在发送...",
-    "Email sent" : "邮件已发送",
+    "access control" : "访问控制",
+    "An error occured. Please try again" : "发生了一个错误请重新尝试",
+    "Share" : "分享",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "使用语法 username@example.com/owncloud 分享给其他 ownCloud 上的用户",
+    "Share with users or groups …" : "分享给其他用户或组 ...",
+    "Share with users, groups or remote users …" : "分享给其他用户、组或远程用户 ...",
     "Warning" : "警告",
     "The object type is not specified." : "未指定对象类型。",
     "Enter new" : "输入新...",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index 2766bd30007..571ab585cd5 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -32,21 +32,20 @@ OC.L10N.register(
     "Error while sharing" : "分享時發生錯誤",
     "Error while unsharing" : "取消分享時發生錯誤",
     "Error while changing permissions" : "更改權限時發生錯誤",
-    "Shared with you and the group {group} by {owner}" : "{owner}與你及群組的分享",
-    "Shared with you by {owner}" : "{owner}與你的分享",
-    "Share" : "分享",
+    "Set expiration date" : "設定分享期限",
+    "Expiration date" : "分享期限",
+    "Sending ..." : "發送中...",
+    "Email sent" : "郵件已傳",
     "Share link" : "分享連結",
     "Password protect" : "密碼保護",
     "Password" : "密碼",
     "Send" : "傳送",
-    "Set expiration date" : "設定分享期限",
-    "Expiration date" : "分享期限",
+    "Shared with you and the group {group} by {owner}" : "{owner}與你及群組的分享",
+    "Shared with you by {owner}" : "{owner}與你的分享",
     "Unshare" : "取消分享",
     "create" : "新增",
     "delete" : "刪除",
-    "Password protected" : "密碼保護",
-    "Sending ..." : "發送中...",
-    "Email sent" : "郵件已傳",
+    "Share" : "分享",
     "Warning" : "警告",
     "Delete" : "刪除",
     "Add" : "加入",
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index 0029a47794e..d7aa79c78a7 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -30,21 +30,20 @@
     "Error while sharing" : "分享時發生錯誤",
     "Error while unsharing" : "取消分享時發生錯誤",
     "Error while changing permissions" : "更改權限時發生錯誤",
-    "Shared with you and the group {group} by {owner}" : "{owner}與你及群組的分享",
-    "Shared with you by {owner}" : "{owner}與你的分享",
-    "Share" : "分享",
+    "Set expiration date" : "設定分享期限",
+    "Expiration date" : "分享期限",
+    "Sending ..." : "發送中...",
+    "Email sent" : "郵件已傳",
     "Share link" : "分享連結",
     "Password protect" : "密碼保護",
     "Password" : "密碼",
     "Send" : "傳送",
-    "Set expiration date" : "設定分享期限",
-    "Expiration date" : "分享期限",
+    "Shared with you and the group {group} by {owner}" : "{owner}與你及群組的分享",
+    "Shared with you by {owner}" : "{owner}與你的分享",
     "Unshare" : "取消分享",
     "create" : "新增",
     "delete" : "刪除",
-    "Password protected" : "密碼保護",
-    "Sending ..." : "發送中...",
-    "Email sent" : "郵件已傳",
+    "Share" : "分享",
     "Warning" : "警告",
     "Delete" : "刪除",
     "Add" : "加入",
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index 1d2672c9cd9..900c210d6b4 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -108,38 +108,35 @@ OC.L10N.register(
     "Error while sharing" : "分享時發生錯誤",
     "Error while unsharing" : "取消分享時發生錯誤",
     "Error while changing permissions" : "修改權限時發生錯誤",
-    "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
-    "Shared with you by {owner}" : "{owner} 已經和您分享",
-    "Share" : "分享",
-    "Share link" : "分享連結",
+    "Error setting expiration date" : "設定到期日發生錯誤",
     "The public link will expire no later than {days} days after it is created" : "這個公開連結會在 {days} 天內失效",
+    "Set expiration date" : "指定到期日",
+    "Expiration" : "過期",
+    "Expiration date" : "到期日",
+    "Sending ..." : "正在傳送…",
+    "Email sent" : "Email 已寄出",
+    "Resharing is not allowed" : "不允許重新分享",
+    "Share link" : "分享連結",
     "Password protect" : "密碼保護",
     "Password" : "密碼",
     "Choose a password for the public link" : "為公開連結選一個密碼",
     "Email link to person" : "將連結 email 給別人",
     "Send" : "寄出",
-    "Set expiration date" : "指定到期日",
-    "Expiration" : "過期",
-    "Expiration date" : "到期日",
-    "An error occured. Please try again" : "發生錯誤，請重試",
-    "Adding user..." : "新增使用者……",
+    "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
+    "Shared with you by {owner}" : "{owner} 已經和您分享",
+    "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
     "group" : "群組",
     "remote" : "遠端",
-    "Resharing is not allowed" : "不允許重新分享",
-    "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
-    "Unshare" : "取消分享",
     "notify by email" : "以 email 通知",
+    "Unshare" : "取消分享",
     "can share" : "可分享",
     "can edit" : "可編輯",
-    "access control" : "存取控制",
     "create" : "建立",
     "change" : "更動",
     "delete" : "刪除",
-    "Password protected" : "受密碼保護",
-    "Error unsetting expiration date" : "取消到期日設定失敗",
-    "Error setting expiration date" : "設定到期日發生錯誤",
-    "Sending ..." : "正在傳送…",
-    "Email sent" : "Email 已寄出",
+    "access control" : "存取控制",
+    "An error occured. Please try again" : "發生錯誤，請重試",
+    "Share" : "分享",
     "Warning" : "警告",
     "The object type is not specified." : "未指定物件類型",
     "Enter new" : "輸入新的",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index a4e175e1ed2..2e94ebb294b 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -106,38 +106,35 @@
     "Error while sharing" : "分享時發生錯誤",
     "Error while unsharing" : "取消分享時發生錯誤",
     "Error while changing permissions" : "修改權限時發生錯誤",
-    "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
-    "Shared with you by {owner}" : "{owner} 已經和您分享",
-    "Share" : "分享",
-    "Share link" : "分享連結",
+    "Error setting expiration date" : "設定到期日發生錯誤",
     "The public link will expire no later than {days} days after it is created" : "這個公開連結會在 {days} 天內失效",
+    "Set expiration date" : "指定到期日",
+    "Expiration" : "過期",
+    "Expiration date" : "到期日",
+    "Sending ..." : "正在傳送…",
+    "Email sent" : "Email 已寄出",
+    "Resharing is not allowed" : "不允許重新分享",
+    "Share link" : "分享連結",
     "Password protect" : "密碼保護",
     "Password" : "密碼",
     "Choose a password for the public link" : "為公開連結選一個密碼",
     "Email link to person" : "將連結 email 給別人",
     "Send" : "寄出",
-    "Set expiration date" : "指定到期日",
-    "Expiration" : "過期",
-    "Expiration date" : "到期日",
-    "An error occured. Please try again" : "發生錯誤，請重試",
-    "Adding user..." : "新增使用者……",
+    "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
+    "Shared with you by {owner}" : "{owner} 已經和您分享",
+    "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
     "group" : "群組",
     "remote" : "遠端",
-    "Resharing is not allowed" : "不允許重新分享",
-    "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
-    "Unshare" : "取消分享",
     "notify by email" : "以 email 通知",
+    "Unshare" : "取消分享",
     "can share" : "可分享",
     "can edit" : "可編輯",
-    "access control" : "存取控制",
     "create" : "建立",
     "change" : "更動",
     "delete" : "刪除",
-    "Password protected" : "受密碼保護",
-    "Error unsetting expiration date" : "取消到期日設定失敗",
-    "Error setting expiration date" : "設定到期日發生錯誤",
-    "Sending ..." : "正在傳送…",
-    "Email sent" : "Email 已寄出",
+    "access control" : "存取控制",
+    "An error occured. Please try again" : "發生錯誤，請重試",
+    "Share" : "分享",
     "Warning" : "警告",
     "The object type is not specified." : "未指定物件類型",
     "Enter new" : "輸入新的",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index 828b5a85569..93f2908a69f 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -91,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "%s paylaşımı, %s kullanıcısı mevcut olmadığından başarısız oldu",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s paylaşımı, %s kullanıcısının %s üyeliklerinden birine sahip olmadığından başarısız oldu",
     "Sharing %s failed, because this item is already shared with %s" : "%s paylaşımı, %s ile zaten paylaşıldığından dolayı başarısız oldu",
+    "Sharing %s failed, because this item is already shared with user %s" : "%s paylaşımı başarısız oldu çünkü bu öge zaten %s kullanıcısı ile paylaşılıyor",
     "Sharing %s failed, because the group %s does not exist" : "%s paylaşımı, %s grubu mevcut olmadığından başarısız oldu",
     "Sharing %s failed, because %s is not a member of the group %s" : "%s paylaşımı, %s kullanıcısı %s grup üyesi olmadığından başarısız oldu",
     "You need to provide a password to create a public link, only protected links are allowed" : "Herkese açık bir bağlantı oluşturmak için bir parola belirtmeniz gerekiyor. Sadece korunmuş bağlantılara izin verilmektedir",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index 13b63ee6f7d..bb3cd291e64 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -89,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "%s paylaşımı, %s kullanıcısı mevcut olmadığından başarısız oldu",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s paylaşımı, %s kullanıcısının %s üyeliklerinden birine sahip olmadığından başarısız oldu",
     "Sharing %s failed, because this item is already shared with %s" : "%s paylaşımı, %s ile zaten paylaşıldığından dolayı başarısız oldu",
+    "Sharing %s failed, because this item is already shared with user %s" : "%s paylaşımı başarısız oldu çünkü bu öge zaten %s kullanıcısı ile paylaşılıyor",
     "Sharing %s failed, because the group %s does not exist" : "%s paylaşımı, %s grubu mevcut olmadığından başarısız oldu",
     "Sharing %s failed, because %s is not a member of the group %s" : "%s paylaşımı, %s kullanıcısı %s grup üyesi olmadığından başarısız oldu",
     "You need to provide a password to create a public link, only protected links are allowed" : "Herkese açık bir bağlantı oluşturmak için bir parola belirtmeniz gerekiyor. Sadece korunmuş bağlantılara izin verilmektedir",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 9a2adf5c2a2..1b328cc7e3f 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -118,17 +118,20 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lader ikke til at være korrekt opsat til at forespørge miljøvariablerne i systemet. Testen med getenv(\"PATH\") returnerer blot et tomt svar.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Venligst undersøg <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php konfiguration noter og php konfiguration af din server, specielt når der bruges php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfiguration er blevet slået til. Dette forhindrer indstillinger af nogle konfigurationer via webgrænsefladen. I tillæg skal filen gøres skrivbar manuelt for hver opdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Din server kører på Microsoft Windows. Vi anbefaler stærkt at anvende Linux for en optimal brugeroplevelse.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Der er installeret %1$s med lavere end version %2$s - af hensyn til stabiliteten og ydelsen, så anbefaler vi at opdatere til en nyere %1$s-version.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktions låsning af filer er deaktiveret, dette kan føre til problemer med race betingelser. Aktiver 'filelocking.enabled \"i config.php for at undgå disse problemer. Se <a target=\"_blank\" href=\"%s\">documentation ↗</a> for mere information.",
     "System locale can not be set to a one which supports UTF-8." : "Systemets lokalitet kan ikke sættes til et der bruger UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Det betyder at der kan være problemer med visse tegn i filnavne.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Vi anbefaler kraftigt, at du installerer den krævede pakke på dit system, for at understøtte følgende lokaliteter: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis din installation ikke er installeret i roden af domænet, og bruger systemets cron, så kan der være problemer med URL-oprettelsen. For at undgå disse problemer, så angiv tilvalget \"overwrite.cli.url\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke muligt at udføre cronjobbet via kommandolinjefladen CLI. Følgende tekniske fejl fremkom:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktions låsning af filer bliver brugt af databasen som lås til backend, for den bedste ydelse tilrådes det at konfigurere memcache. Se <a target=\"_blank\" href=\"%s\">documentation ↗</a> for mere information",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Dobbelttjek venligst  <a target=\"_blank\" href=\"%s\">, og tjek om der er fejl eller advarsler i <a href=\"#log-section\">loggen</a>.",
     "All checks passed." : "Alle tjek blev gennemført.",
     "Open documentation" : "Åben dokumentation",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 3ae0aeb173f..8d2aac4bb1e 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -116,17 +116,20 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lader ikke til at være korrekt opsat til at forespørge miljøvariablerne i systemet. Testen med getenv(\"PATH\") returnerer blot et tomt svar.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Venligst undersøg <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php konfiguration noter og php konfiguration af din server, specielt når der bruges php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfiguration er blevet slået til. Dette forhindrer indstillinger af nogle konfigurationer via webgrænsefladen. I tillæg skal filen gøres skrivbar manuelt for hver opdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Din server kører på Microsoft Windows. Vi anbefaler stærkt at anvende Linux for en optimal brugeroplevelse.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Der er installeret %1$s med lavere end version %2$s - af hensyn til stabiliteten og ydelsen, så anbefaler vi at opdatere til en nyere %1$s-version.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktions låsning af filer er deaktiveret, dette kan føre til problemer med race betingelser. Aktiver 'filelocking.enabled \"i config.php for at undgå disse problemer. Se <a target=\"_blank\" href=\"%s\">documentation ↗</a> for mere information.",
     "System locale can not be set to a one which supports UTF-8." : "Systemets lokalitet kan ikke sættes til et der bruger UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Det betyder at der kan være problemer med visse tegn i filnavne.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Vi anbefaler kraftigt, at du installerer den krævede pakke på dit system, for at understøtte følgende lokaliteter: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis din installation ikke er installeret i roden af domænet, og bruger systemets cron, så kan der være problemer med URL-oprettelsen. For at undgå disse problemer, så angiv tilvalget \"overwrite.cli.url\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke muligt at udføre cronjobbet via kommandolinjefladen CLI. Følgende tekniske fejl fremkom:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktions låsning af filer bliver brugt af databasen som lås til backend, for den bedste ydelse tilrådes det at konfigurere memcache. Se <a target=\"_blank\" href=\"%s\">documentation ↗</a> for mere information",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Dobbelttjek venligst  <a target=\"_blank\" href=\"%s\">, og tjek om der er fejl eller advarsler i <a href=\"#log-section\">loggen</a>.",
     "All checks passed." : "Alle tjek blev gennemført.",
     "Open documentation" : "Åben dokumentation",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 45b214299e3..d2026810359 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -125,11 +125,13 @@ OC.L10N.register(
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s lager dan versie %2$s geïnstalleerd, voor betere stabiliteit en prestaties adviseren we bij te werken naar een nieuwere %1$s versie.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transactionele bestandlocking is gedeactiveerd, dat zou kunnen leiden tot versiebeheerproblemen. Schakel 'filelocking enabled' in config.php in om deze problemen te voorkomen. Zie de <a target=\"_blank\" href=\"%s\">documentatie ↗</a> voor meer informatie.",
     "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.",
     "This means that there might be problems with certain characters in file names." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "We adviseren met klem om de noodzakelijke pakketten op uw systeem te installeren om een van de volgende talen te ondersteunen: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transactionele bestandslocking gebruikt de database als blokkeermechanisme. Voor de beste prestaties wordt geadviseerd om een  memcache voor locking te configureren. Zie de <a target=\"_blank\" href=\"%s\">documentatie ↗</a> voor meer informatie.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de <a href='%s'>installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.",
     "All checks passed." : "Alle checks geslaagd",
     "Open documentation" : "Open documentatie",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 04d4555116b..42c1dacf922 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -123,11 +123,13 @@
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Uw server draait op Microsoft Windows. We adviseren om een linux server te gebruiken voor een optimale gebruikerservaring.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s lager dan versie %2$s geïnstalleerd, voor betere stabiliteit en prestaties adviseren we bij te werken naar een nieuwere %1$s versie.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transactionele bestandlocking is gedeactiveerd, dat zou kunnen leiden tot versiebeheerproblemen. Schakel 'filelocking enabled' in config.php in om deze problemen te voorkomen. Zie de <a target=\"_blank\" href=\"%s\">documentatie ↗</a> voor meer informatie.",
     "System locale can not be set to a one which supports UTF-8." : "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.",
     "This means that there might be problems with certain characters in file names." : "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "We adviseren met klem om de noodzakelijke pakketten op uw systeem te installeren om een van de volgende talen te ondersteunen: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transactionele bestandslocking gebruikt de database als blokkeermechanisme. Voor de beste prestaties wordt geadviseerd om een  memcache voor locking te configureren. Zie de <a target=\"_blank\" href=\"%s\">documentatie ↗</a> voor meer informatie.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de <a href='%s'>installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.",
     "All checks passed." : "Alle checks geslaagd",
     "Open documentation" : "Open documentatie",
-- 
GitLab


From 82eb3f8027ba95dd859cde75241921222d970ce1 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 17 Sep 2015 08:48:25 +0200
Subject: [PATCH 386/783] Fix the singleuser config casing in new encryption
 code

---
 core/command/encryption/decryptall.php           | 6 +++---
 core/command/encryption/encryptall.php           | 6 +++---
 tests/core/command/encryption/decryptalltest.php | 6 +++---
 tests/core/command/encryption/encryptalltest.php | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php
index 374f635725f..696570b7ae6 100644
--- a/core/command/encryption/decryptall.php
+++ b/core/command/encryption/decryptall.php
@@ -77,13 +77,13 @@ class DecryptAll extends Command {
 		$this->questionHelper = $questionHelper;
 
 		$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
-		$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleUser', false);
-		$this->config->setSystemValue('singleUser', true);
+		$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleuser', false);
+		$this->config->setSystemValue('singleuser', true);
 		$this->appManager->disableApp('files_trashbin');
 	}
 
 	public function __destruct() {
-		$this->config->setSystemValue('singleUser', $this->wasSingleUserModeEnabled);
+		$this->config->setSystemValue('singleuser', $this->wasSingleUserModeEnabled);
 		if ($this->wasTrashbinEnabled) {
 			$this->appManager->enableApp('files_trashbin');
 		}
diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 7f33e18ecbb..950ce5166d8 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -68,13 +68,13 @@ class EncryptAll extends Command {
 		$this->config = $config;
 		$this->questionHelper = $questionHelper;
 		$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
-		$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleUser', false);
-		$this->config->setSystemValue('singleUser', true);
+		$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleuser', false);
+		$this->config->setSystemValue('singleuser', true);
 		$this->appManager->disableApp('files_trashbin');
 	}
 
 	public function __destruct() {
-		$this->config->setSystemValue('singleUser', $this->wasSingleUserModeEnabled);
+		$this->config->setSystemValue('singleuser', $this->wasSingleUserModeEnabled);
 		if ($this->wasTrashbinEnabled) {
 			$this->appManager->enableApp('files_trashbin');
 		}
diff --git a/tests/core/command/encryption/decryptalltest.php b/tests/core/command/encryption/decryptalltest.php
index b7fd630e9b0..ef36d6d2827 100644
--- a/tests/core/command/encryption/decryptalltest.php
+++ b/tests/core/command/encryption/decryptalltest.php
@@ -71,7 +71,7 @@ class DecryptAllTest extends TestCase {
 
 		$this->config->expects($this->any())
 			->method('getSystemValue')
-			->with('singleUser', false)
+			->with('singleuser', false)
 			->willReturn(false);
 		$this->appManager->expects($this->any())
 			->method('isEnabledForUser')
@@ -83,7 +83,7 @@ class DecryptAllTest extends TestCase {
 		// on construct we enable single-user-mode and disable the trash bin
 		$this->config->expects($this->at(1))
 			->method('setSystemValue')
-			->with('singleUser', true);
+			->with('singleuser', true);
 		$this->appManager->expects($this->once())
 			->method('disableApp')
 			->with('files_trashbin');
@@ -91,7 +91,7 @@ class DecryptAllTest extends TestCase {
 		// on destruct wi disable single-user-mode again and enable the trash bin
 		$this->config->expects($this->at(2))
 			->method('setSystemValue')
-			->with('singleUser', false);
+			->with('singleuser', false);
 		$this->appManager->expects($this->once())
 			->method('enableApp')
 			->with('files_trashbin');
diff --git a/tests/core/command/encryption/encryptalltest.php b/tests/core/command/encryption/encryptalltest.php
index 41edee6987c..9f7f7375044 100644
--- a/tests/core/command/encryption/encryptalltest.php
+++ b/tests/core/command/encryption/encryptalltest.php
@@ -81,9 +81,9 @@ class EncryptAllTest extends TestCase {
 		$this->appManager->expects($this->once())->method('disableApp')->with('files_trashbin');
 		// enable single user mode to avoid that other user login during encryption
 		// destructor should disable the single user mode again
-		$this->config->expects($this->once())->method('getSystemValue')->with('singleUser', false)->willReturn(false);
-		$this->config->expects($this->at(1))->method('setSystemValue')->with('singleUser', true);
-		$this->config->expects($this->at(2))->method('setSystemValue')->with('singleUser', false);
+		$this->config->expects($this->once())->method('getSystemValue')->with('singleuser', false)->willReturn(false);
+		$this->config->expects($this->at(1))->method('setSystemValue')->with('singleuser', true);
+		$this->config->expects($this->at(2))->method('setSystemValue')->with('singleuser', false);
 
 		new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
 	}
-- 
GitLab


From bc89bca8039aa09716ebd525fd0d50789430324f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 16 Sep 2015 15:52:12 +0200
Subject: [PATCH 387/783] Make sure Maintenance is checked before auth and
 others

---
 lib/private/connector/sabre/maintenanceplugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php
index 5b48abbc517..f886332418a 100644
--- a/lib/private/connector/sabre/maintenanceplugin.php
+++ b/lib/private/connector/sabre/maintenanceplugin.php
@@ -65,7 +65,7 @@ class MaintenancePlugin extends ServerPlugin {
 	 */
 	public function initialize(\Sabre\DAV\Server $server) {
 		$this->server = $server;
-		$this->server->on('beforeMethod', array($this, 'checkMaintenanceMode'), 10);
+		$this->server->on('beforeMethod', array($this, 'checkMaintenanceMode'), 1);
 	}
 
 	/**
-- 
GitLab


From 7c66328381dd0e2ce5e7ab1e4477593bc79ed3ad Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 16 Sep 2015 17:29:34 +0200
Subject: [PATCH 388/783] Remove the need for the transaction in the database
 locking backend

---
 lib/private/lock/dblockingprovider.php | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php
index f3e684d0b4d..6f14b7806ea 100644
--- a/lib/private/lock/dblockingprovider.php
+++ b/lib/private/lock/dblockingprovider.php
@@ -76,11 +76,10 @@ class DBLockingProvider extends AbstractLockingProvider {
 	 * @throws \OCP\Lock\LockedException
 	 */
 	public function acquireLock($path, $type) {
-		if ($this->connection->inTransaction()){
+		if ($this->connection->inTransaction()) {
 			$this->logger->warning("Trying to acquire a lock for '$path' while inside a transition");
 		}
 
-		$this->connection->beginTransaction();
 		$this->initLockField($path);
 		if ($type === self::LOCK_SHARED) {
 			$result = $this->connection->executeUpdate(
@@ -93,7 +92,6 @@ class DBLockingProvider extends AbstractLockingProvider {
 				[$path]
 			);
 		}
-		$this->connection->commit();
 		if ($result !== 1) {
 			throw new LockedException($path);
 		}
@@ -146,17 +144,4 @@ class DBLockingProvider extends AbstractLockingProvider {
 		}
 		$this->markChange($path, $targetType);
 	}
-
-	/**
-	 * cleanup empty locks
-	 */
-	public function cleanEmptyLocks() {
-		$this->connection->executeUpdate(
-			'DELETE FROM `*PREFIX*file_locks` WHERE `lock` = 0'
-		);
-	}
-
-	public function __destruct() {
-		$this->cleanEmptyLocks();
-	}
 }
-- 
GitLab


From c3420fface77c584ae83bf20f36ec192399e5e09 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 16 Sep 2015 14:48:07 +0200
Subject: [PATCH 389/783] Allow checking whether there are notifiers registered

---
 lib/private/notification/imanager.php | 6 ++++++
 lib/private/notification/manager.php  | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/lib/private/notification/imanager.php b/lib/private/notification/imanager.php
index 0cd92b33251..f4a5fb14e31 100644
--- a/lib/private/notification/imanager.php
+++ b/lib/private/notification/imanager.php
@@ -53,4 +53,10 @@ interface IManager extends IApp, INotifier {
 	 * @since 8.2.0
 	 */
 	public function createNotification();
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function hasNotifiers();
 }
diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
index 9635925e38e..0d5bb9be514 100644
--- a/lib/private/notification/manager.php
+++ b/lib/private/notification/manager.php
@@ -112,6 +112,14 @@ class Manager implements IManager {
 		return new Notification();
 	}
 
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function hasNotifiers() {
+		return !empty($this->notifiersClosures);
+	}
+
 	/**
 	 * @param INotification $notification
 	 * @return null
-- 
GitLab


From 9e1cd6d8735010e8b462258668a101abc2ea184b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 16 Sep 2015 12:05:06 +0200
Subject: [PATCH 390/783] Change the order of the buttons

---
 apps/files_sharing/api/server2server.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php
index 6ecaea20535..b3d54b5d0c8 100644
--- a/apps/files_sharing/api/server2server.php
+++ b/apps/files_sharing/api/server2server.php
@@ -93,15 +93,15 @@ class Server2Server {
 					->setObject('remote_share', $remoteId)
 					->setSubject('remote_share', [$user, trim($name, '/')]);
 
-				$acceptAction = $notification->createAction();
-				$acceptAction->setLabel('accept')
-					->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/' . $remoteId), 'POST');
 				$declineAction = $notification->createAction();
 				$declineAction->setLabel('decline')
 					->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/' . $remoteId), 'DELETE');
+				$notification->addAction($declineAction);
 
-				$notification->addAction($acceptAction)
-					->addAction($declineAction);
+				$acceptAction = $notification->createAction();
+				$acceptAction->setLabel('accept')
+					->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/' . $remoteId), 'POST');
+				$notification->addAction($acceptAction);
 
 				$notificationManager->notify($notification);
 
-- 
GitLab


From 6bc93c740194d245bb9a7d1f230ed33461f842a7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 16 Sep 2015 12:08:21 +0200
Subject: [PATCH 391/783] Disable the remote sharing notifications until they
 work properly

---
 apps/files_sharing/api/server2server.php    | 3 +++
 apps/files_sharing/appinfo/app.php          | 3 +++
 apps/files_sharing/lib/external/manager.php | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php
index b3d54b5d0c8..7d8860ad6ff 100644
--- a/apps/files_sharing/api/server2server.php
+++ b/apps/files_sharing/api/server2server.php
@@ -83,6 +83,8 @@ class Server2Server {
 					Activity::FILES_SHARING_APP, Activity::SUBJECT_REMOTE_SHARE_RECEIVED, array($user, trim($name, '/')), '', array(),
 					'', '', $shareWith, Activity::TYPE_REMOTE_SHARE, Activity::PRIORITY_LOW);
 
+				/**
+				 * FIXME
 				$urlGenerator = \OC::$server->getURLGenerator();
 
 				$notificationManager = \OC::$server->getNotificationManager();
@@ -104,6 +106,7 @@ class Server2Server {
 				$notification->addAction($acceptAction);
 
 				$notificationManager->notify($notification);
+				 */
 
 				return new \OC_OCS_Result();
 			} catch (\Exception $e) {
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 8d919d1466f..15c0b864b08 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -113,9 +113,12 @@ if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') {
 	}
 }
 
+/**
+ * FIXME
 $manager = \OC::$server->getNotificationManager();
 $manager->registerNotifier(function() {
 	return new \OCA\Files_Sharing\Notifier(
 		\OC::$server->getL10NFactory()
 	);
 });
+ */
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 17142e95099..8552b2fbd34 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -214,7 +214,7 @@ class Manager {
 			$acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid));
 			$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
 
-			$this->scrapNotification($share['remote_id']);
+			//FIXME $this->scrapNotification($share['remote_id']);
 			return true;
 		}
 
@@ -237,7 +237,7 @@ class Manager {
 			$removeShare->execute(array($id, $this->uid));
 			$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
 
-			$this->scrapNotification($share['remote_id']);
+			//FIXME $this->scrapNotification($share['remote_id']);
 			return true;
 		}
 
-- 
GitLab


From 773941dfb021f7a29adb6076071155b3294a3465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 16 Sep 2015 11:07:13 +0200
Subject: [PATCH 392/783] prevent 0 byte downloads when storage returns false

---
 lib/private/connector/sabre/file.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 17659c96b07..f4acc8290bc 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -261,10 +261,13 @@ class File extends Node implements IFile {
 	 * @throws ServiceUnavailable
 	 */
 	public function get() {
-
 		//throw exception if encryption is disabled but files are still encrypted
 		try {
-			return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
+			$res = $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
+			if ($res === false) {
+				throw new ServiceUnavailable("Could not open file");
+			}
+			return $res;
 		} catch (GenericEncryptionException $e) {
 			// returning 503 will allow retry of the operation at a later point in time
 			throw new ServiceUnavailable("Encryption not ready: " . $e->getMessage());
-- 
GitLab


From 2839ef34395599adf060a485a263a69ce27305e1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 16 Sep 2015 13:40:12 +0200
Subject: [PATCH 393/783] add unit test

---
 tests/lib/connector/sabre/file.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index e5605dd7cc5..fe4c5ec7c29 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -809,4 +809,21 @@ class File extends \Test\TestCase {
 		return $files;
 	}
 
+	/**
+	 * @expectedException \Sabre\DAV\Exception\ServiceUnavailable
+	 */
+	public function testGetFopenFails() {
+		$view = $this->getMock('\OC\Files\View', ['fopen'], array());
+		$view->expects($this->atLeastOnce())
+			->method('fopen')
+			->will($this->returnValue(false));
+
+		$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
+			'permissions' => \OCP\Constants::PERMISSION_ALL
+		), null);
+
+		$file = new \OC\Connector\Sabre\File($view, $info);
+
+		$file->get();
+	}
 }
-- 
GitLab


From de1bc0b65332dfad907c3cad602833b839cd43b8 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 17 Sep 2015 13:15:45 +0200
Subject: [PATCH 394/783] fix sidebar Versions layout

---
 apps/files_versions/css/versions.css      | 15 +++++----------
 apps/files_versions/js/versionstabview.js |  3 +--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css
index ec0f0cc9896..b159de82ea3 100644
--- a/apps/files_versions/css/versions.css
+++ b/apps/files_versions/css/versions.css
@@ -13,9 +13,7 @@
 }
 
 .versionsTabView li > * {
-	padding: 7px;
-	float: left;
-	vertical-align: top;
+	vertical-align: middle;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
 	filter: alpha(opacity=50);
 	opacity: .5;
@@ -23,7 +21,7 @@
 
 .versionsTabView li > a,
 .versionsTabView li > span {
-	padding: 17px 7px;
+	padding: 15px 10px 11px;
 }
 
 .versionsTabView li > *:hover,
@@ -43,16 +41,13 @@
 	opacity: 1;
 }
 
-.versionsTabView .versionDate {
+.versionsTabView .versiondate {
 	min-width: 100px;
-	vertical-align: text-bottom;
+	vertical-align: super;
 }
 
 .versionsTabView .revertVersion {
 	cursor: pointer;
 	float: right;
-	max-width: 130px;
-	text-overflow: ellipsis;
-	overflow: hidden;
+	margin-right: -10px;
 }
-
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js
index 1f84428e616..f6a6f037988 100644
--- a/apps/files_versions/js/versionstabview.js
+++ b/apps/files_versions/js/versionstabview.js
@@ -15,7 +15,7 @@
 		'<a href="{{downloadUrl}}" class="downloadVersion"><img src="{{downloadIconUrl}}" />' +
 		'<span class="versiondate has-tooltip" title="{{formattedTimestamp}}">{{relativeTimestamp}}</span>' +
 		'</a>' +
-		'<a href="#" class="revertVersion"><img src="{{revertIconUrl}}" />{{revertLabel}}</a>' +
+		'<a href="#" class="revertVersion" title="{{revertLabel}}"><img src="{{revertIconUrl}}" /></a>' +
 		'</li>';
 
 	var TEMPLATE =
@@ -195,4 +195,3 @@
 
 	OCA.Versions.VersionsTabView = VersionsTabView;
 })();
-
-- 
GitLab


From 3eeea852b393ea7a248acfaa0cc1133d58e9010a Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 17 Sep 2015 13:17:56 +0200
Subject: [PATCH 395/783] fix sidebar Sharing layout a bit

---
 apps/files_sharing/css/sharetabview.css | 24 +++++++++++++-----------
 core/css/share.css                      | 16 +++-------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 0cc812e917c..fe7a1947502 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -12,22 +12,25 @@
 }
 
 .shareTabView .shareWithRemoteInfo {
-	padding: 11px 0 11px 10px
+	padding: 11px 20px;
 }
 
 .shareTabView label {
-	font-weight:400;
 	white-space: nowrap;
 }
 
 .shareTabView input[type="checkbox"] {
-	margin:0 3px 0 8px;
+	margin: 0 3px 0 8px;
 	vertical-align: middle;
 }
 
-.shareTabView input[type="text"], .shareTabView input[type="password"] {
-	width: 91%;
-	margin-left: 7px;
+.shareTabView input[type="text"],
+.shareTabView input[type="password"] {
+	width: 94%;
+	margin-left: 0;
+}
+.shareTabView #shareWith {
+	width: 80%;
 }
 
 .shareTabView form {
@@ -37,15 +40,14 @@
 }
 
 #shareWithList {
-	list-style-type:none;
-	padding:8px;
+	list-style-type: none;
+	padding: 0 0 16px;
 }
 
 #shareWithList li {
-	padding-top: 10px;
-	padding-bottom: 10px;
+	padding-top: 5px;
+	padding-bottom: 5px;
 	font-weight: bold;
-	line-height: 21px;
 	white-space: normal;
 }
 
diff --git a/core/css/share.css b/core/css/share.css
index 6467cc0239c..15f8061b068 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -41,10 +41,6 @@
 	display: none !important;
 }
 
-.shareTabView .shareWithRemoteInfo {
-	padding: 11px 20px;
-}
-
 .shareTabView .avatar {
 	margin-right: 8px;
 	display: inline-block;
@@ -106,8 +102,9 @@ a.unshare {
 	display:inline;
 	float:right;
 	opacity:.5;
-	padding:5px 0 0 5px !important;
-	margin-top:-5px;
+	padding: 10px;
+	margin-top: -5px;
+	margin-right: -10px;
 }
 
 #link {
@@ -115,17 +112,10 @@ a.unshare {
 	padding-top:8px;
 }
 
-.shareTabView input[type="text"],
-.shareTabView input[type="password"],
 .shareTabView input[type="submit"] {
 	margin-left: 7px;
 }
 
-.shareTabView input[type="text"],
-.shareTabView input[type="password"] {
-	width: 86%;
-}
-
 .shareTabView form {
 	font-size: 100%;
 	margin-left: 0;
-- 
GitLab


From 1911472b88898868969bfbefa16e0e2e3168c146 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 17 Sep 2015 13:34:15 +0200
Subject: [PATCH 396/783] Discard expiration date from result for non-link
 shares

---
 lib/private/share/share.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 802b146cfb6..07c7f31a853 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -2441,6 +2441,11 @@ class Share extends Constants {
 		if (isset($row['stime'])) {
 			$row['stime'] = (int) $row['stime'];
 		}
+		if (isset($row['expiration']) && $row['share_type'] !== self::SHARE_TYPE_LINK) {
+			// discard expiration date for non-link shares, which might have been
+			// set by ancient bugs
+			$row['expiration'] = null;
+		}
 	}
 
 	/**
-- 
GitLab


From 05fddec022488493c3f346797684231519f6746c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 17 Sep 2015 13:55:04 +0200
Subject: [PATCH 397/783] expire old lock rows

---
 lib/private/lock/dblockingprovider.php | 56 +++++++++++++++++++++-----
 lib/private/server.php                 |  2 +-
 tests/lib/lock/dblockingprovider.php   | 56 +++++++++++++++++++++++++-
 3 files changed, 101 insertions(+), 13 deletions(-)

diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php
index 6f14b7806ea..ce2960bbf60 100644
--- a/lib/private/lock/dblockingprovider.php
+++ b/lib/private/lock/dblockingprovider.php
@@ -21,6 +21,7 @@
 
 namespace OC\Lock;
 
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IDBConnection;
 use OCP\ILogger;
 use OCP\Lock\LockedException;
@@ -39,17 +40,34 @@ class DBLockingProvider extends AbstractLockingProvider {
 	 */
 	private $logger;
 
+	/**
+	 * @var \OCP\AppFramework\Utility\ITimeFactory
+	 */
+	private $timeFactory;
+
+	const TTL = 3600; // how long until we clear stray locks
+
 	/**
 	 * @param \OCP\IDBConnection $connection
 	 * @param \OCP\ILogger $logger
+	 * @param \OCP\AppFramework\Utility\ITimeFactory $timeFactory
 	 */
-	public function __construct(IDBConnection $connection, ILogger $logger) {
+	public function __construct(IDBConnection $connection, ILogger $logger, ITimeFactory $timeFactory) {
 		$this->connection = $connection;
 		$this->logger = $logger;
+		$this->timeFactory = $timeFactory;
 	}
 
 	protected function initLockField($path) {
-		$this->connection->insertIfNotExist('*PREFIX*file_locks', ['key' => $path, 'lock' => 0, 'ttl' => 0], ['key']);
+		$expire = $this->getExpireTime();
+		$this->connection->insertIfNotExist('*PREFIX*file_locks', ['key' => $path, 'lock' => 0, 'ttl' => $expire], ['key']);
+	}
+
+	/**
+	 * @return int
+	 */
+	protected function getExpireTime() {
+		return $this->timeFactory->getTime() + self::TTL;
 	}
 
 	/**
@@ -81,15 +99,16 @@ class DBLockingProvider extends AbstractLockingProvider {
 		}
 
 		$this->initLockField($path);
+		$expire = $this->getExpireTime();
 		if ($type === self::LOCK_SHARED) {
 			$result = $this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` + 1 WHERE `key` = ? AND `lock` >= 0',
-				[$path]
+				'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` + 1, `ttl` = ? WHERE `key` = ? AND `lock` >= 0',
+				[$expire, $path]
 			);
 		} else {
 			$result = $this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = -1 WHERE `key` = ? AND `lock` = 0',
-				[$path]
+				'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = 0',
+				[$expire, $path]
 			);
 		}
 		if ($result !== 1) {
@@ -127,16 +146,16 @@ class DBLockingProvider extends AbstractLockingProvider {
 	 * @throws \OCP\Lock\LockedException
 	 */
 	public function changeLock($path, $targetType) {
-		$this->initLockField($path);
+		$expire = $this->getExpireTime();
 		if ($targetType === self::LOCK_SHARED) {
 			$result = $this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = 1 WHERE `key` = ? AND `lock` = -1',
-				[$path]
+				'UPDATE `*PREFIX*file_locks` SET `lock` = 1, `ttl` = ? WHERE `key` = ? AND `lock` = -1',
+				[$expire, $path]
 			);
 		} else {
 			$result = $this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = -1 WHERE `key` = ? AND `lock` = 1',
-				[$path]
+				'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = 1',
+				[$expire, $path]
 			);
 		}
 		if ($result !== 1) {
@@ -144,4 +163,19 @@ class DBLockingProvider extends AbstractLockingProvider {
 		}
 		$this->markChange($path, $targetType);
 	}
+
+	/**
+	 * cleanup empty locks
+	 */
+	public function cleanEmptyLocks() {
+		$expire = $this->timeFactory->getTime();
+		$this->connection->executeUpdate(
+			'DELETE FROM `*PREFIX*file_locks` WHERE `lock` = 0 AND `ttl` < ?',
+			[$expire]
+		);
+	}
+
+	public function __destruct() {
+		$this->cleanEmptyLocks();
+	}
 }
diff --git a/lib/private/server.php b/lib/private/server.php
index 9657afbdaec..d5f4f532c1c 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -460,7 +460,7 @@ class Server extends SimpleContainer implements IServerContainer {
 				if (!($memcache instanceof \OC\Memcache\NullCache)) {
 					return new MemcacheLockingProvider($memcache);
 				}
-				return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger());
+				return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory());
 			}
 			return new NoopLockingProvider();
 		});
diff --git a/tests/lib/lock/dblockingprovider.php b/tests/lib/lock/dblockingprovider.php
index fd6550d9c47..2360052b4a0 100644
--- a/tests/lib/lock/dblockingprovider.php
+++ b/tests/lib/lock/dblockingprovider.php
@@ -21,23 +21,77 @@
 
 namespace Test\Lock;
 
+use OCP\Lock\ILockingProvider;
+
 class DBLockingProvider extends LockingProvider {
+	/**
+	 * @var \OC\Lock\DBLockingProvider
+	 */
+	protected $instance;
 
 	/**
 	 * @var \OCP\IDBConnection
 	 */
 	private $connection;
 
+	/**
+	 * @var \OCP\AppFramework\Utility\ITimeFactory
+	 */
+	private $timeFactory;
+
+	private $currentTime;
+
+	public function setUp() {
+		$this->currentTime = time();
+		$this->timeFactory = $this->getMock('\OCP\AppFramework\Utility\ITimeFactory');
+		$this->timeFactory->expects($this->any())
+			->method('getTime')
+			->will($this->returnCallback(function () {
+				return $this->currentTime;
+			}));
+		parent::setUp();
+	}
+
 	/**
 	 * @return \OCP\Lock\ILockingProvider
 	 */
 	protected function getInstance() {
 		$this->connection = \OC::$server->getDatabaseConnection();
-		return new \OC\Lock\DBLockingProvider($this->connection, \OC::$server->getLogger());
+		return new \OC\Lock\DBLockingProvider($this->connection, \OC::$server->getLogger(), $this->timeFactory);
 	}
 
 	public function tearDown() {
 		$this->connection->executeQuery('DELETE FROM `*PREFIX*file_locks`');
 		parent::tearDown();
 	}
+
+	public function testCleanEmptyLocks() {
+		$this->currentTime = 100;
+		$this->instance->acquireLock('foo', ILockingProvider::LOCK_EXCLUSIVE);
+		$this->instance->acquireLock('asd', ILockingProvider::LOCK_EXCLUSIVE);
+
+		$this->currentTime = 200;
+		$this->instance->acquireLock('bar', ILockingProvider::LOCK_EXCLUSIVE);
+		$this->instance->changeLock('asd', ILockingProvider::LOCK_SHARED);
+
+		$this->currentTime = 150 + \OC\Lock\DBLockingProvider::TTL;
+
+		$this->assertEquals(3, $this->getLockEntryCount());
+
+		$this->instance->cleanEmptyLocks();
+
+		$this->assertEquals(3, $this->getLockEntryCount());
+
+		$this->instance->releaseAll();
+
+		$this->instance->cleanEmptyLocks();
+
+		$this->assertEquals(2, $this->getLockEntryCount());
+	}
+
+	private function getLockEntryCount() {
+		$query = $this->connection->prepare('SELECT count(*) FROM `*PREFIX*file_locks`');
+		$query->execute();
+		return $query->fetchColumn();
+	}
 }
-- 
GitLab


From 5eddde64860a77b2355aaf31044ab6692ed36265 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 17 Sep 2015 13:47:58 +0200
Subject: [PATCH 398/783] Add a Sabre plugin that emits an event for apps

---
 apps/files/appinfo/remote.php                 |  3 +-
 apps/files_sharing/publicwebdav.php           |  3 +-
 .../connector/sabre/listenerplugin.php        | 59 +++++++++++++++++++
 lib/private/connector/sabre/serverfactory.php |  6 +-
 .../sabre/requesttest/requesttest.php         |  3 +-
 5 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 lib/private/connector/sabre/listenerplugin.php

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 36479ae13d0..4d0d8b3e2ec 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -39,7 +39,8 @@ $serverFactory = new \OC\Connector\Sabre\ServerFactory(
 	\OC::$server->getDatabaseConnection(),
 	\OC::$server->getUserSession(),
 	\OC::$server->getMountManager(),
-	\OC::$server->getTagManager()
+	\OC::$server->getTagManager(),
+	\OC::$server->getEventDispatcher()
 );
 
 // Backends
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
index eec158dd4b6..773a15c888e 100644
--- a/apps/files_sharing/publicwebdav.php
+++ b/apps/files_sharing/publicwebdav.php
@@ -39,7 +39,8 @@ $serverFactory = new \OC\Connector\Sabre\ServerFactory(
 	\OC::$server->getDatabaseConnection(),
 	\OC::$server->getUserSession(),
 	\OC::$server->getMountManager(),
-	\OC::$server->getTagManager()
+	\OC::$server->getTagManager(),
+	\OC::$server->getEventDispatcher()
 );
 
 $requestUri = \OC::$server->getRequest()->getRequestUri();
diff --git a/lib/private/connector/sabre/listenerplugin.php b/lib/private/connector/sabre/listenerplugin.php
new file mode 100644
index 00000000000..86cb8ebe568
--- /dev/null
+++ b/lib/private/connector/sabre/listenerplugin.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Connector\Sabre;
+
+use Sabre\DAV\Server;
+use Sabre\DAV\ServerPlugin;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+class ListenerPlugin extends ServerPlugin {
+	/** @var EventDispatcherInterface */
+	protected $dispatcher;
+
+	/**
+	 * @param EventDispatcherInterface $dispatcher
+	 */
+	public function __construct(EventDispatcherInterface $dispatcher) {
+		$this->dispatcher = $dispatcher;
+	}
+
+	/**
+	 * This initialize the plugin
+	 *
+	 * @param Server $server
+	 */
+	public function initialize(Server $server) {
+		$server->on('beforeMethod', array($this, 'emitListener'), 15);
+	}
+
+	/**
+	 * This method is called before any HTTP method and returns http status code 503
+	 * in case the system is in maintenance mode.
+	 *
+	 * @return bool
+	 */
+	public function emitListener() {
+		$this->dispatcher->dispatch('OC\Connector\Sabre::beforeMethod');
+
+		return true;
+	}
+}
diff --git a/lib/private/connector/sabre/serverfactory.php b/lib/private/connector/sabre/serverfactory.php
index 042cc051d35..54470b0b8aa 100644
--- a/lib/private/connector/sabre/serverfactory.php
+++ b/lib/private/connector/sabre/serverfactory.php
@@ -28,6 +28,7 @@ use OCP\ILogger;
 use OCP\ITagManager;
 use OCP\IUserSession;
 use Sabre\DAV\Auth\Backend\BackendInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class ServerFactory {
 	public function __construct(
@@ -36,7 +37,8 @@ class ServerFactory {
 		IDBConnection $databaseConnection,
 		IUserSession $userSession,
 		IMountManager $mountManager,
-		ITagManager $tagManager
+		ITagManager $tagManager,
+		EventDispatcherInterface $dispatcher
 	) {
 		$this->config = $config;
 		$this->logger = $logger;
@@ -44,6 +46,7 @@ class ServerFactory {
 		$this->userSession = $userSession;
 		$this->mountManager = $mountManager;
 		$this->tagManager = $tagManager;
+		$this->dispatcher = $dispatcher;
 	}
 
 	/**
@@ -71,6 +74,7 @@ class ServerFactory {
 		$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
 		$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
 		$server->addPlugin(new \OC\Connector\Sabre\LockPlugin($objectTree));
+		$server->addPlugin(new \OC\Connector\Sabre\ListenerPlugin($this->dispatcher));
 
 		// wait with registering these until auth is handled and the filesystem is setup
 		$server->on('beforeMethod', function () use ($server, $objectTree, $viewCallBack) {
diff --git a/tests/lib/connector/sabre/requesttest/requesttest.php b/tests/lib/connector/sabre/requesttest/requesttest.php
index 7f33dcf817b..7afe2645037 100644
--- a/tests/lib/connector/sabre/requesttest/requesttest.php
+++ b/tests/lib/connector/sabre/requesttest/requesttest.php
@@ -45,7 +45,8 @@ abstract class RequestTest extends TestCase {
 			\OC::$server->getDatabaseConnection(),
 			\OC::$server->getUserSession(),
 			\OC::$server->getMountManager(),
-			\OC::$server->getTagManager()
+			\OC::$server->getTagManager(),
+			\OC::$server->getEventDispatcher()
 		);
 	}
 
-- 
GitLab


From e9b1aa603715fcbefdef8cb96b042fa2f0348bf1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 17 Sep 2015 14:09:28 +0200
Subject: [PATCH 399/783] improve doc

---
 lib/private/lock/dblockingprovider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php
index ce2960bbf60..bfa86a6920e 100644
--- a/lib/private/lock/dblockingprovider.php
+++ b/lib/private/lock/dblockingprovider.php
@@ -45,7 +45,7 @@ class DBLockingProvider extends AbstractLockingProvider {
 	 */
 	private $timeFactory;
 
-	const TTL = 3600; // how long until we clear stray locks
+	const TTL = 3600; // how long until we clear stray locks in seconds
 
 	/**
 	 * @param \OCP\IDBConnection $connection
-- 
GitLab


From 44e6c4f39843b1c00ef04bded80bdf2a887f7382 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 17 Sep 2015 15:11:05 +0200
Subject: [PATCH 400/783] Do not "use" Server

---
 lib/private/connector/sabre/listenerplugin.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/private/connector/sabre/listenerplugin.php b/lib/private/connector/sabre/listenerplugin.php
index 86cb8ebe568..d0d40f4dc86 100644
--- a/lib/private/connector/sabre/listenerplugin.php
+++ b/lib/private/connector/sabre/listenerplugin.php
@@ -21,7 +21,6 @@
 
 namespace OC\Connector\Sabre;
 
-use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
@@ -39,9 +38,9 @@ class ListenerPlugin extends ServerPlugin {
 	/**
 	 * This initialize the plugin
 	 *
-	 * @param Server $server
+	 * @param \Sabre\DAV\Server $server
 	 */
-	public function initialize(Server $server) {
+	public function initialize(\Sabre\DAV\Server $server) {
 		$server->on('beforeMethod', array($this, 'emitListener'), 15);
 	}
 
-- 
GitLab


From 180ad9e7dfcd13cc375dee7b67798a3a85252695 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 17 Sep 2015 15:50:37 +0200
Subject: [PATCH 401/783] Make version.php PHP 5.3 compatible for the build
 scripts

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index cfc4db82995..0f7fef95be4 100644
--- a/version.php
+++ b/version.php
@@ -23,12 +23,12 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = [8, 2, 0, 5];
+$OC_Version = array(8, 2, 0, 5);
 
 // The human readable string
 $OC_VersionString = '8.2 pre alpha';
 
-$OC_VersionCanBeUpgradedFrom = [8, 1];
+$OC_VersionCanBeUpgradedFrom = array(8, 1);
 
 // The ownCloud channel
 $OC_Channel = 'git';
-- 
GitLab


From 7c80c8e48432b976818b5e1eee075a71b9c2328f Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Thu, 17 Sep 2015 15:05:24 +0200
Subject: [PATCH 402/783] fix missing checkboxes in share dialog

---
 core/js/sharedialogshareelistview.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index 41be49dc241..d2c45bb08b1 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -27,25 +27,31 @@
 			'        {{/if}}' +
 			'        <span class="username">{{shareWithDisplayName}}</span>' +
 			'        {{#if mailPublicNotificationEnabled}} {{#unless isRemoteShare}}' +
-			'        <label><input type="checkbox" name="mailNotification" class="mailNotification" {{#if wasMailSent}}checked="checked"{{/if}} />{{notifyByMailLabel}}</label>' +
+			'        <input id="mail-{{shareWith}}" type="checkbox" name="mailNotification" class="mailNotification" {{#if wasMailSent}}checked="checked"{{/if}} />' +
+			'        <label for="mail-{{shareWith}}">{{notifyByMailLabel}}</label>' +
 			'        {{/unless}} {{/if}}' +
 			'        {{#if isResharingAllowed}} {{#if sharePermissionPossible}} {{#unless isRemoteShare}}' +
-			'        <label><input id="canShare-{{shareWith}}" type="checkbox" name="share" class="permissions" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />{{canShareLabel}}</label>' +
+			'        <input id="canShare-{{shareWith}}" type="checkbox" name="share" class="permissions" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />' +
+			'        <label for="canShare-{{shareWith}}">{{canShareLabel}}</label>' +
 			'        {{/unless}} {{/if}} {{/if}}' +
 			'        {{#if editPermissionPossible}}' +
-			'        <label><input id="canEdit-{{shareWith}}" type="checkbox" name="edit" class="permissions" {{#if hasEditPermission}}checked="checked"{{/if}} />{{canEditLabel}}</label>' +
+			'        <input id="canEdit-{{shareWith}}" type="checkbox" name="edit" class="permissions" {{#if hasEditPermission}}checked="checked"{{/if}} />' +
+			'        <label for="canEdit-{{shareWith}}">{{canEditLabel}}</label>' +
 			'        {{/if}}' +
 			'        {{#unless isRemoteShare}}' +
 			'        <a href="#" class="showCruds"><img class="svg" alt="{{crudsLabel}}" src="{{triangleSImage}}"/></a>' +
 			'        <div class="cruds hidden">' +
 			'            {{#if createPermissionPossible}}' +
-			'            <label><input id="canCreate-{{shareWith}}" type="checkbox" name="create" class="permissions" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>{{createPermissionLabel}}</label>' +
+			'            <input id="canCreate-{{shareWith}}" type="checkbox" name="create" class="permissions" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' +
+			'            <label for="canCreate-{{shareWith}}">{{createPermissionLabel}}</label>' +
 			'            {{/if}}' +
 			'            {{#if updatePermissionPossible}}' +
-			'            <label><input id="canUpdate-{{shareWith}}" type="checkbox" name="update" class="permissions" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>{{updatePermissionLabel}}</label>' +
+			'            <input id="canUpdate-{{shareWith}}" type="checkbox" name="update" class="permissions" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' +
+			'            <label for="canUpdate-{{shareWith}}">{{updatePermissionLabel}}</label>' +
 			'            {{/if}}' +
 			'            {{#if deletePermissionPossible}} {{#unless isRemoteShare}}' +
-			'            <label><input id="canDelete-{{shareWith}}" type="checkbox" name="delete" class="permissions" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>{{deletePermissionLabel}}</label>' +
+			'            <input id="canDelete-{{shareWith}}" type="checkbox" name="delete" class="permissions" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' +
+			'            <label for="canDelete-{{shareWith}}">{{deletePermissionLabel}}</label>' +
 			'            {{/unless}} {{/if}}' +
 			'        </div>' +
 			'        {{/unless}}' +
-- 
GitLab


From 2b21c803356f3332fdaeada02af206d25c2df7c8 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 18 Sep 2015 01:54:55 -0400
Subject: [PATCH 403/783] [tx-robot] updated from transifex

---
 apps/files_external/l10n/da.js      |  1 +
 apps/files_external/l10n/da.json    |  1 +
 apps/files_external/l10n/fi_FI.js   |  2 ++
 apps/files_external/l10n/fi_FI.json |  2 ++
 apps/files_external/l10n/it.js      |  1 +
 apps/files_external/l10n/it.json    |  1 +
 apps/files_external/l10n/nl.js      |  1 +
 apps/files_external/l10n/nl.json    |  1 +
 apps/files_external/l10n/th_TH.js   |  1 +
 apps/files_external/l10n/th_TH.json |  1 +
 core/l10n/da.js                     |  2 ++
 core/l10n/da.json                   |  2 ++
 core/l10n/fi_FI.js                  |  2 ++
 core/l10n/fi_FI.json                |  2 ++
 core/l10n/it.js                     |  2 ++
 core/l10n/it.json                   |  2 ++
 core/l10n/nl.js                     |  2 ++
 core/l10n/nl.json                   |  2 ++
 core/l10n/th_TH.js                  |  2 ++
 core/l10n/th_TH.json                |  2 ++
 settings/l10n/da.js                 | 20 ++++++++++----------
 settings/l10n/da.json               | 20 ++++++++++----------
 22 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js
index 98f020785c9..435884aa11d 100644
--- a/apps/files_external/l10n/da.js
+++ b/apps/files_external/l10n/da.js
@@ -78,6 +78,7 @@ OC.L10N.register(
     "SFTP with secret key login [DEPRECATED]" : "SFTP med det hemmelige nøgle login [DEPRECATED]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Del",
+    "Domain" : "Domæne",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS der bruger OC login [DEPRECATED]",
     "Username as share" : "Brugernavn som deling",
     "OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json
index 5c7bda17a40..631fb196624 100644
--- a/apps/files_external/l10n/da.json
+++ b/apps/files_external/l10n/da.json
@@ -76,6 +76,7 @@
     "SFTP with secret key login [DEPRECATED]" : "SFTP med det hemmelige nøgle login [DEPRECATED]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Del",
+    "Domain" : "Domæne",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS der bruger OC login [DEPRECATED]",
     "Username as share" : "Brugernavn som deling",
     "OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
index 2243f5f5526..92e93d9ed3a 100644
--- a/apps/files_external/l10n/fi_FI.js
+++ b/apps/files_external/l10n/fi_FI.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.",
     "(group)" : "(ryhmä)",
     "Saved" : "Tallennettu",
+    "Builtin" : "Sisäänrakennettu",
     "None" : "Ei mitään",
     "OAuth1" : "OAuth1",
     "App key" : "Sovellusavain",
@@ -33,6 +34,7 @@ OC.L10N.register(
     "OpenStack" : "OpenStack",
     "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
+    "Rackspace" : "Rackspace",
     "API key" : "API-avain",
     "Username and password" : "Käyttäjätunnus ja salasana",
     "RSA public key" : "Julkinen RSA-avain",
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
index b629fad87c6..6459b33a126 100644
--- a/apps/files_external/l10n/fi_FI.json
+++ b/apps/files_external/l10n/fi_FI.json
@@ -21,6 +21,7 @@
     "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.",
     "(group)" : "(ryhmä)",
     "Saved" : "Tallennettu",
+    "Builtin" : "Sisäänrakennettu",
     "None" : "Ei mitään",
     "OAuth1" : "OAuth1",
     "App key" : "Sovellusavain",
@@ -31,6 +32,7 @@
     "OpenStack" : "OpenStack",
     "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
+    "Rackspace" : "Rackspace",
     "API key" : "API-avain",
     "Username and password" : "Käyttäjätunnus ja salasana",
     "RSA public key" : "Julkinen RSA-avain",
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index cae6e428cd8..368ff49195e 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "SFTP with secret key login [DEPRECATED]" : "SFTP con accesso a chiave segreta [DEPRECATO]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Condividi",
+    "Domain" : "Dominio",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS utilizzando le credenziali di OC [DEPRECATO]",
     "Username as share" : "Nome utente come condivisione",
     "OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 8be3cd2cd97..4da556760f6 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -75,6 +75,7 @@
     "SFTP with secret key login [DEPRECATED]" : "SFTP con accesso a chiave segreta [DEPRECATO]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Condividi",
+    "Domain" : "Dominio",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS utilizzando le credenziali di OC [DEPRECATO]",
     "Username as share" : "Nome utente come condivisione",
     "OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index 8367c64c394..a40b2afa7e8 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -78,6 +78,7 @@ OC.L10N.register(
     "SFTP with secret key login [DEPRECATED]" : "SFTP inlog met geheime sleutel [VEROUDERD]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Share",
+    "Domain" : "Domein",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS login met OC [VEROUDERD]",
     "Username as share" : "Gebruikersnaam als share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index 0414e7b08c5..52507dc4744 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -76,6 +76,7 @@
     "SFTP with secret key login [DEPRECATED]" : "SFTP inlog met geheime sleutel [VEROUDERD]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Share",
+    "Domain" : "Domein",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS login met OC [VEROUDERD]",
     "Username as share" : "Gebruikersnaam als share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js
index 34c1f74ecf8..89308e5889c 100644
--- a/apps/files_external/l10n/th_TH.js
+++ b/apps/files_external/l10n/th_TH.js
@@ -78,6 +78,7 @@ OC.L10N.register(
     "SFTP with secret key login [DEPRECATED]" : "SFTP กับรหัสลับเข้าสู่ระบบ [ยกเลิก]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "แชร์",
+    "Domain" : "โดเมน",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS กำลังใช้ OC เข้าสู่ระบบ [ยกเลิก]",
     "Username as share" : "ชื่อผู้ใช้ที่แชร์",
     "OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json
index cb18b221c4a..5b167001e4e 100644
--- a/apps/files_external/l10n/th_TH.json
+++ b/apps/files_external/l10n/th_TH.json
@@ -76,6 +76,7 @@
     "SFTP with secret key login [DEPRECATED]" : "SFTP กับรหัสลับเข้าสู่ระบบ [ยกเลิก]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "แชร์",
+    "Domain" : "โดเมน",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS กำลังใช้ OC เข้าสู่ระบบ [ยกเลิก]",
     "Username as share" : "ชื่อผู้ใช้ที่แชร์",
     "OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index 40407d2980d..5461275fb8e 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "tilpas",
     "delete" : "slet",
     "access control" : "Adgangskontrol",
+    "Share details could not be loaded for this item." : "Detaljer for deling kunne ikke indlæses for dette element.",
     "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen",
     "Share" : "Del",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
     "Share with users or groups …" : "Del med brugere eller grupper",
     "Share with users, groups or remote users …" : "Del med brugere, grupper eller eksterne brugere...",
     "Warning" : "Advarsel",
+    "Error while sending notification" : "Fejl ved afsendelse af notifikation",
     "The object type is not specified." : "Objekttypen er ikke angivet.",
     "Enter new" : "Indtast nyt",
     "Delete" : "Slet",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index b8714521bbe..adf9fb314d5 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -143,12 +143,14 @@
     "change" : "tilpas",
     "delete" : "slet",
     "access control" : "Adgangskontrol",
+    "Share details could not be loaded for this item." : "Detaljer for deling kunne ikke indlæses for dette element.",
     "An error occured. Please try again" : "Der skete en fejl. Prøv venligst igen",
     "Share" : "Del",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
     "Share with users or groups …" : "Del med brugere eller grupper",
     "Share with users, groups or remote users …" : "Del med brugere, grupper eller eksterne brugere...",
     "Warning" : "Advarsel",
+    "Error while sending notification" : "Fejl ved afsendelse af notifikation",
     "The object type is not specified." : "Objekttypen er ikke angivet.",
     "Enter new" : "Indtast nyt",
     "Delete" : "Slet",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 15c63679f21..826305c9b5a 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "muuta",
     "delete" : "poista",
     "access control" : "Pääsyn hallinta",
+    "Share details could not be loaded for this item." : "Tämän kohteen jakamistietoja ei voitu ladata.",
     "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan",
     "Share" : "Jaa",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Jaa toisia ownCloud-järjestelmiä käyttävien kesken käyttäen syntaksia käyttäjätunnus@esimerkki.fi/owncloud",
     "Share with users or groups …" : "Jaa käyttäjien tai ryhmien kanssa…",
     "Share with users, groups or remote users …" : "Jaa käyttäjien, ryhmien tai etäkäyttäjien kanssa…",
     "Warning" : "Varoitus",
+    "Error while sending notification" : "Virhe ilmoitusta lähettäessä",
     "The object type is not specified." : "The object type is not specified.",
     "Enter new" : "Kirjoita uusi",
     "Delete" : "Poista",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 69045e7783f..c8a37ae2ef1 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -143,12 +143,14 @@
     "change" : "muuta",
     "delete" : "poista",
     "access control" : "Pääsyn hallinta",
+    "Share details could not be loaded for this item." : "Tämän kohteen jakamistietoja ei voitu ladata.",
     "An error occured. Please try again" : "Tapahtui virhe. Yritä myöhemmin uudestaan",
     "Share" : "Jaa",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Jaa toisia ownCloud-järjestelmiä käyttävien kesken käyttäen syntaksia käyttäjätunnus@esimerkki.fi/owncloud",
     "Share with users or groups …" : "Jaa käyttäjien tai ryhmien kanssa…",
     "Share with users, groups or remote users …" : "Jaa käyttäjien, ryhmien tai etäkäyttäjien kanssa…",
     "Warning" : "Varoitus",
+    "Error while sending notification" : "Virhe ilmoitusta lähettäessä",
     "The object type is not specified." : "The object type is not specified.",
     "Enter new" : "Kirjoita uusi",
     "Delete" : "Poista",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index cd3fc097c64..48fdf0e9b0c 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "cambia",
     "delete" : "elimina",
     "access control" : "controllo d'accesso",
+    "Share details could not be loaded for this item." : "I dettagli della condivisione non possono essere caricati per questo elemento.",
     "An error occured. Please try again" : "Si è verificato un errore. Prova ancora",
     "Share" : "Condividi",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone su altri ownCloud utilizzando la sintassi nomeutente@esempio.com/owncloud",
     "Share with users or groups …" : "Condividi con utenti o gruppi...",
     "Share with users, groups or remote users …" : "Condividi con utenti, gruppi o utenti remoti...",
     "Warning" : "Avviso",
+    "Error while sending notification" : "Errore durante l'invio della notifica",
     "The object type is not specified." : "Il tipo di oggetto non è specificato.",
     "Enter new" : "Inserisci nuovo",
     "Delete" : "Elimina",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 10049baf3ca..bedb6b8aa66 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -143,12 +143,14 @@
     "change" : "cambia",
     "delete" : "elimina",
     "access control" : "controllo d'accesso",
+    "Share details could not be loaded for this item." : "I dettagli della condivisione non possono essere caricati per questo elemento.",
     "An error occured. Please try again" : "Si è verificato un errore. Prova ancora",
     "Share" : "Condividi",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone su altri ownCloud utilizzando la sintassi nomeutente@esempio.com/owncloud",
     "Share with users or groups …" : "Condividi con utenti o gruppi...",
     "Share with users, groups or remote users …" : "Condividi con utenti, gruppi o utenti remoti...",
     "Warning" : "Avviso",
+    "Error while sending notification" : "Errore durante l'invio della notifica",
     "The object type is not specified." : "Il tipo di oggetto non è specificato.",
     "Enter new" : "Inserisci nuovo",
     "Delete" : "Elimina",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 3734c3e0c40..0b12185cae4 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "wijzig",
     "delete" : "verwijderen",
     "access control" : "toegangscontrole",
+    "Share details could not be loaded for this item." : "Details van shares voor dit object konden niet worden geladen.",
     "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw",
     "Share" : "Delen",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Delen met mensen op andere ownClouds via de syntax gebruikersnaam@voorbeeld.org/owncloud",
     "Share with users or groups …" : "Delen met gebruikers of groepen ...",
     "Share with users, groups or remote users …" : "Delen met gebruikers, groepen of externe gebruikers ...",
     "Warning" : "Waarschuwing",
+    "Error while sending notification" : "Fout bij versturen melding",
     "The object type is not specified." : "Het object type is niet gespecificeerd.",
     "Enter new" : "Opgeven nieuw",
     "Delete" : "Verwijder",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index 1495ccfd5ac..7a9765d8c3a 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -143,12 +143,14 @@
     "change" : "wijzig",
     "delete" : "verwijderen",
     "access control" : "toegangscontrole",
+    "Share details could not be loaded for this item." : "Details van shares voor dit object konden niet worden geladen.",
     "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw",
     "Share" : "Delen",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Delen met mensen op andere ownClouds via de syntax gebruikersnaam@voorbeeld.org/owncloud",
     "Share with users or groups …" : "Delen met gebruikers of groepen ...",
     "Share with users, groups or remote users …" : "Delen met gebruikers, groepen of externe gebruikers ...",
     "Warning" : "Waarschuwing",
+    "Error while sending notification" : "Fout bij versturen melding",
     "The object type is not specified." : "Het object type is niet gespecificeerd.",
     "Enter new" : "Opgeven nieuw",
     "Delete" : "Verwijder",
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index a183ccae7f7..3ed34bc336d 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "เปลี่ยนแปลง",
     "delete" : "ลบ",
     "access control" : "ควบคุมการเข้าถึง",
+    "Share details could not be loaded for this item." : "รายละเอียดการแชร์ไม่สามารถโหลดสำหรับรายการนี้",
     "An error occured. Please try again" : "เกิดข้อผิดพลาด กรุณาลองอีกครั้ง",
     "Share" : "แชร์",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ",
     "Share with users or groups …" : "แชร์กับผู้ใช้หรือกลุ่ม ...",
     "Share with users, groups or remote users …" : "แชร์กับผู้ใช้กลุ่มหรือผู้ใช้ระยะไกล ...",
     "Warning" : "คำเตือน",
+    "Error while sending notification" : "เกิดข้อผิดพลาดขณะกำลังส่งการแจ้งเตือน",
     "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
     "Enter new" : "ใส่ข้อมูลใหม่",
     "Delete" : "ลบ",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index ccdfd94c649..ecf02c36b4b 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -143,12 +143,14 @@
     "change" : "เปลี่ยนแปลง",
     "delete" : "ลบ",
     "access control" : "ควบคุมการเข้าถึง",
+    "Share details could not be loaded for this item." : "รายละเอียดการแชร์ไม่สามารถโหลดสำหรับรายการนี้",
     "An error occured. Please try again" : "เกิดข้อผิดพลาด กรุณาลองอีกครั้ง",
     "Share" : "แชร์",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ",
     "Share with users or groups …" : "แชร์กับผู้ใช้หรือกลุ่ม ...",
     "Share with users, groups or remote users …" : "แชร์กับผู้ใช้กลุ่มหรือผู้ใช้ระยะไกล ...",
     "Warning" : "คำเตือน",
+    "Error while sending notification" : "เกิดข้อผิดพลาดขณะกำลังส่งการแจ้งเตือน",
     "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
     "Enter new" : "ใส่ข้อมูลใหม่",
     "Delete" : "ลบ",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 1b328cc7e3f..61b012de4f7 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -30,7 +30,7 @@ OC.L10N.register(
     "Unable to change password" : "Kunne ikke ændre kodeord",
     "Enabled" : "Aktiveret",
     "Not enabled" : "Slået fra",
-    "installing and updating apps via the app store or Federated Cloud Sharing" : "installation og opdatering af apps via app-butikken eller Federated Cloud Sharing",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "installation og opdatering af apps via app-butikken eller sammensluttet Cloud deling",
     "Federated Cloud Sharing" : "Sammensluttet Cloud deling",
     "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL bruger en forældet %s version (%s). Husk at opdatere dit styresystem ellers vil funktioner såsom %s ikke fungere pålideligt.",
     "A problem occurred, please check your log files (Error: %s)" : "Der opstod en fejl - tjek venligst dine logfiler (fejl: %s)",
@@ -55,8 +55,8 @@ OC.L10N.register(
     "Email saved" : "E-mailadressen er gemt",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sikker på at du vil tilføje \"{domain}\" som et domæne du har tiilid til?",
     "Add trusted domain" : "Tilføj et domæne som du har tillid til",
-    "Migration in progress. Please wait until the migration is finished" : "Overflytning er i gang. Vent venligst indtil overflytningen er afsluttet",
-    "Migration started …" : "Overflytning er påbegyndt...",
+    "Migration in progress. Please wait until the migration is finished" : "Immigration er i gang. Vent venligst indtil overflytningen er afsluttet",
+    "Migration started …" : "Migrering er påbegyndt...",
     "Sending..." : "Sender...",
     "Official" : "Officiel",
     "Approved" : "Godkendt",
@@ -64,7 +64,7 @@ OC.L10N.register(
     "All" : "Alle",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officielt program er udviklet af ownCloud fællesskabet. Funktionerne spiller en central rolle i ownCloud og kan bruges i produktionsmiljøer.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkendte programmer er udviklet af betroet udviklere som har bestået en let sikkerheds gennemgang. De er aktivt vedligeholdt i et åben kode lager og udviklerne vurdere programmet til at være stabilt for normalt brug.",
-    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Dette program er ikke kontrolleret for sikkerhedsproblemer, og er nyt eller kendt for at være ustabilt. Installer for  egen risiko.",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Dette program er ikke kontrolleret for sikkerhedsproblemer, og er nyt eller kendt for at være ustabilt. Installer på eget ansvar.",
     "Update to %s" : "Opdatér til %s",
     "Please wait...." : "Vent venligst...",
     "Error while disabling app" : "Kunne ikke deaktivere app",
@@ -77,7 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Afinstallerer...",
     "Error while uninstalling app" : "Fejl under afinstallering af app",
     "Uninstall" : "Afinstallér",
-    "An error occurred: {message}" : "En fejl opstod:{message}",
+    "An error occurred: {message}" : "Der opstod en fejl:{message}",
     "Select a profile picture" : "Vælg et profilbillede",
     "Very weak password" : "Meget svagt kodeord",
     "Weak password" : "Svagt kodeord",
@@ -133,7 +133,7 @@ OC.L10N.register(
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke muligt at udføre cronjobbet via kommandolinjefladen CLI. Følgende tekniske fejl fremkom:",
     "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktions låsning af filer bliver brugt af databasen som lås til backend, for den bedste ydelse tilrådes det at konfigurere memcache. Se <a target=\"_blank\" href=\"%s\">documentation ↗</a> for mere information",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Dobbelttjek venligst  <a target=\"_blank\" href=\"%s\">, og tjek om der er fejl eller advarsler i <a href=\"#log-section\">loggen</a>.",
-    "All checks passed." : "Alle tjek blev gennemført.",
+    "All checks passed." : "Alle tjek blev bestået.",
     "Open documentation" : "Åben dokumentation",
     "Allow apps to use the Share API" : "Tillad apps til at bruge Share API",
     "Allow users to share via link" : "Tillad brugere at dele via link",
@@ -157,7 +157,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
     "Enable server-side encryption" : "Slå kryptering til på serversiden",
     "Please read carefully before activating server-side encryption: " : "Læs venligst dette omhyggeligt, før der aktivere kryptering på serversiden:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Kryptering på serversiden er en envejsproces. Når krypteringen slås til, så vil alle filer fremefter blive krypteret på serveren, og det vil ikke være muligt at slå kryptering fra efterfølgende",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Kryptering på serversiden er en envejsproces. Når krypteringen slås til, så vil alle filer fremover blive krypteret på serveren, og det vil ikke være muligt at slå kryptering fra efterfølgende",
     "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Enhver med priviligeret adgang til din ownCloud-server kan dekryptere dine filer, enten ved at opsnappe forespørgsler eller aflæse brugerkodeord, der bliver lagret i sessionsfiler med klartekst. Kryptering af serversiden beskytter derfor ikke mod ondsindede administratorer, men kan hjælpe til at beskytte dine data når de lagres hos eksterne værter.",
     "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhængig af det faktiske krypteringsmodul, så øges den generelle filstørrelse (med 35%% eller mere ved brug af standardmodulet)",
     "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør jævnligt foretage sikkerhedskopiering af alle krypteringsnøgler, for at forhindre permanente tab af data (data/<user>/files_encryption and data/files_encryption)",
@@ -165,9 +165,9 @@ OC.L10N.register(
     "Enable encryption" : "Slå kryptering til",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Der er ikke indlæst et krypteringsmodul - slå venligst et krypteringsmodul til i app-menuen.",
     "Select default encryption module:" : "Vælg standardmodulet til kryptering:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Slå venligst \"Standardmodul til kryptering\" til, og kør \"occ encryption:migrate\"",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen.",
-    "Start migration" : "Påbegynd overflytning",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du skal immigrere dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Slå venligst \"Standardmodul til kryptering\" til, og kør \"occ encryption:migrate\"",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du skal immigrere dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen.",
+    "Start migration" : "Påbegynd immigrering",
     "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
     "Send mode" : "Tilstand for afsendelse",
     "Encryption" : "Kryptering",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 8d2aac4bb1e..2f18fedf629 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -28,7 +28,7 @@
     "Unable to change password" : "Kunne ikke ændre kodeord",
     "Enabled" : "Aktiveret",
     "Not enabled" : "Slået fra",
-    "installing and updating apps via the app store or Federated Cloud Sharing" : "installation og opdatering af apps via app-butikken eller Federated Cloud Sharing",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "installation og opdatering af apps via app-butikken eller sammensluttet Cloud deling",
     "Federated Cloud Sharing" : "Sammensluttet Cloud deling",
     "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL bruger en forældet %s version (%s). Husk at opdatere dit styresystem ellers vil funktioner såsom %s ikke fungere pålideligt.",
     "A problem occurred, please check your log files (Error: %s)" : "Der opstod en fejl - tjek venligst dine logfiler (fejl: %s)",
@@ -53,8 +53,8 @@
     "Email saved" : "E-mailadressen er gemt",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sikker på at du vil tilføje \"{domain}\" som et domæne du har tiilid til?",
     "Add trusted domain" : "Tilføj et domæne som du har tillid til",
-    "Migration in progress. Please wait until the migration is finished" : "Overflytning er i gang. Vent venligst indtil overflytningen er afsluttet",
-    "Migration started …" : "Overflytning er påbegyndt...",
+    "Migration in progress. Please wait until the migration is finished" : "Immigration er i gang. Vent venligst indtil overflytningen er afsluttet",
+    "Migration started …" : "Migrering er påbegyndt...",
     "Sending..." : "Sender...",
     "Official" : "Officiel",
     "Approved" : "Godkendt",
@@ -62,7 +62,7 @@
     "All" : "Alle",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Officielt program er udviklet af ownCloud fællesskabet. Funktionerne spiller en central rolle i ownCloud og kan bruges i produktionsmiljøer.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Godkendte programmer er udviklet af betroet udviklere som har bestået en let sikkerheds gennemgang. De er aktivt vedligeholdt i et åben kode lager og udviklerne vurdere programmet til at være stabilt for normalt brug.",
-    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Dette program er ikke kontrolleret for sikkerhedsproblemer, og er nyt eller kendt for at være ustabilt. Installer for  egen risiko.",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Dette program er ikke kontrolleret for sikkerhedsproblemer, og er nyt eller kendt for at være ustabilt. Installer på eget ansvar.",
     "Update to %s" : "Opdatér til %s",
     "Please wait...." : "Vent venligst...",
     "Error while disabling app" : "Kunne ikke deaktivere app",
@@ -75,7 +75,7 @@
     "Uninstalling ...." : "Afinstallerer...",
     "Error while uninstalling app" : "Fejl under afinstallering af app",
     "Uninstall" : "Afinstallér",
-    "An error occurred: {message}" : "En fejl opstod:{message}",
+    "An error occurred: {message}" : "Der opstod en fejl:{message}",
     "Select a profile picture" : "Vælg et profilbillede",
     "Very weak password" : "Meget svagt kodeord",
     "Weak password" : "Svagt kodeord",
@@ -131,7 +131,7 @@
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke muligt at udføre cronjobbet via kommandolinjefladen CLI. Følgende tekniske fejl fremkom:",
     "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaktions låsning af filer bliver brugt af databasen som lås til backend, for den bedste ydelse tilrådes det at konfigurere memcache. Se <a target=\"_blank\" href=\"%s\">documentation ↗</a> for mere information",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Dobbelttjek venligst  <a target=\"_blank\" href=\"%s\">, og tjek om der er fejl eller advarsler i <a href=\"#log-section\">loggen</a>.",
-    "All checks passed." : "Alle tjek blev gennemført.",
+    "All checks passed." : "Alle tjek blev bestået.",
     "Open documentation" : "Åben dokumentation",
     "Allow apps to use the Share API" : "Tillad apps til at bruge Share API",
     "Allow users to share via link" : "Tillad brugere at dele via link",
@@ -155,7 +155,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
     "Enable server-side encryption" : "Slå kryptering til på serversiden",
     "Please read carefully before activating server-side encryption: " : "Læs venligst dette omhyggeligt, før der aktivere kryptering på serversiden:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Kryptering på serversiden er en envejsproces. Når krypteringen slås til, så vil alle filer fremefter blive krypteret på serveren, og det vil ikke være muligt at slå kryptering fra efterfølgende",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Kryptering på serversiden er en envejsproces. Når krypteringen slås til, så vil alle filer fremover blive krypteret på serveren, og det vil ikke være muligt at slå kryptering fra efterfølgende",
     "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Enhver med priviligeret adgang til din ownCloud-server kan dekryptere dine filer, enten ved at opsnappe forespørgsler eller aflæse brugerkodeord, der bliver lagret i sessionsfiler med klartekst. Kryptering af serversiden beskytter derfor ikke mod ondsindede administratorer, men kan hjælpe til at beskytte dine data når de lagres hos eksterne værter.",
     "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhængig af det faktiske krypteringsmodul, så øges den generelle filstørrelse (med 35%% eller mere ved brug af standardmodulet)",
     "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør jævnligt foretage sikkerhedskopiering af alle krypteringsnøgler, for at forhindre permanente tab af data (data/<user>/files_encryption and data/files_encryption)",
@@ -163,9 +163,9 @@
     "Enable encryption" : "Slå kryptering til",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Der er ikke indlæst et krypteringsmodul - slå venligst et krypteringsmodul til i app-menuen.",
     "Select default encryption module:" : "Vælg standardmodulet til kryptering:",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Slå venligst \"Standardmodul til kryptering\" til, og kør \"occ encryption:migrate\"",
-    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du skal overflytte dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen.",
-    "Start migration" : "Påbegynd overflytning",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Du skal immigrere dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen. Slå venligst \"Standardmodul til kryptering\" til, og kør \"occ encryption:migrate\"",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Du skal immigrere dine krypteringsnøgler fra den gamle kryptering (ownCloud <= 8.0) til den nye af slagsen.",
+    "Start migration" : "Påbegynd immigrering",
     "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
     "Send mode" : "Tilstand for afsendelse",
     "Encryption" : "Kryptering",
-- 
GitLab


From 2f102c1f0d2fc93d1d9091297b0cb920fc8947de Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 18 Sep 2015 08:53:02 +0200
Subject: [PATCH 404/783] Do not set single user in constructor

---
 core/command/encryption/decryptall.php         | 18 ++++++++++++++----
 core/command/encryption/encryptall.php         | 15 ++++++++++++++-
 .../core/command/encryption/decryptalltest.php |  7 +++++--
 .../core/command/encryption/encryptalltest.php |  4 +++-
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php
index 696570b7ae6..c71ba5f04c7 100644
--- a/core/command/encryption/decryptall.php
+++ b/core/command/encryption/decryptall.php
@@ -75,14 +75,22 @@ class DecryptAll extends Command {
 		$this->config = $config;
 		$this->decryptAll = $decryptAll;
 		$this->questionHelper = $questionHelper;
+	}
 
+	/**
+	 * Set single user mode and disable the trashbin app
+	 */
+	protected function forceSingleUserAndTrashbin() {
 		$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
 		$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleuser', false);
 		$this->config->setSystemValue('singleuser', true);
 		$this->appManager->disableApp('files_trashbin');
 	}
 
-	public function __destruct() {
+	/**
+	 * Reset the single user mode and re-enable the trashbin app
+	 */
+	protected function resetSingleUserAndTrashbin() {
 		$this->config->setSystemValue('singleuser', $this->wasSingleUserModeEnabled);
 		if ($this->wasTrashbinEnabled) {
 			$this->appManager->enableApp('files_trashbin');
@@ -115,7 +123,6 @@ class DecryptAll extends Command {
 			} else {
 				$output->writeln('Server side encryption not enabled. Nothing to do.');
 				return;
-
 			}
 
 			$output->writeln("\n");
@@ -126,12 +133,14 @@ class DecryptAll extends Command {
 			$output->writeln('');
 			$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
 			if ($this->questionHelper->ask($input, $output, $question)) {
+				$this->forceSingleUserAndTrashbin();
 				$user = $input->getArgument('user');
 				$result = $this->decryptAll->decryptAll($input, $output, $user);
 				if ($result === false) {
-					$this->output->writeln(' aborted.');
+					$output->writeln(' aborted.');
 					$this->config->setAppValue('core', 'encryption_enabled', 'yes');
 				}
+				$this->resetSingleUserAndTrashbin();
 			} else {
 				$output->write('Enable server side encryption... ');
 				$this->config->setAppValue('core', 'encryption_enabled', 'yes');
@@ -141,8 +150,9 @@ class DecryptAll extends Command {
 		} catch (\Exception $e) {
 			// enable server side encryption again if something went wrong
 			$this->config->setAppValue('core', 'encryption_enabled', 'yes');
+			$this->resetSingleUserAndTrashbin();
 			throw $e;
 		}
-	}
 
+	}
 }
diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 950ce5166d8..2269663b21f 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -67,13 +67,22 @@ class EncryptAll extends Command {
 		$this->encryptionManager = $encryptionManager;
 		$this->config = $config;
 		$this->questionHelper = $questionHelper;
+	}
+
+	/**
+	 * Set single user mode and disable the trashbin app
+	 */
+	protected function forceSingleUserAndTrashbin() {
 		$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
 		$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleuser', false);
 		$this->config->setSystemValue('singleuser', true);
 		$this->appManager->disableApp('files_trashbin');
 	}
 
-	public function __destruct() {
+	/**
+	 * Reset the single user mode and re-enable the trashbin app
+	 */
+	protected function resetSingleUserAndTrashbin() {
 		$this->config->setSystemValue('singleuser', $this->wasSingleUserModeEnabled);
 		if ($this->wasTrashbinEnabled) {
 			$this->appManager->enableApp('files_trashbin');
@@ -104,8 +113,12 @@ class EncryptAll extends Command {
 		$output->writeln('');
 		$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
 		if ($this->questionHelper->ask($input, $output, $question)) {
+			$this->forceSingleUserAndTrashbin();
+
 			$defaultModule = $this->encryptionManager->getEncryptionModule();
 			$defaultModule->encryptAll($input, $output);
+
+			$this->resetSingleUserAndTrashbin();
 		} else {
 			$output->writeln('aborted');
 		}
diff --git a/tests/core/command/encryption/decryptalltest.php b/tests/core/command/encryption/decryptalltest.php
index ef36d6d2827..972ea03150c 100644
--- a/tests/core/command/encryption/decryptalltest.php
+++ b/tests/core/command/encryption/decryptalltest.php
@@ -79,7 +79,8 @@ class DecryptAllTest extends TestCase {
 
 	}
 
-	public function testConstructDesctruct() {
+	public function testSingleUserAndTrashbin() {
+
 		// on construct we enable single-user-mode and disable the trash bin
 		$this->config->expects($this->at(1))
 			->method('setSystemValue')
@@ -103,6 +104,7 @@ class DecryptAllTest extends TestCase {
 			$this->decryptAll,
 			$this->questionHelper
 		);
+		$this->invokePrivate($instance, 'forceSingleUserAndTrashbin');
 
 		$this->assertTrue(
 			$this->invokePrivate($instance, 'wasTrashbinEnabled')
@@ -111,6 +113,7 @@ class DecryptAllTest extends TestCase {
 		$this->assertFalse(
 			$this->invokePrivate($instance, 'wasSingleUserModeEnabled')
 		);
+		$this->invokePrivate($instance, 'resetSingleUserAndTrashbin');
 	}
 
 	/**
@@ -187,7 +190,7 @@ class DecryptAllTest extends TestCase {
 			->with('core', 'encryption_enabled', 'no');
 
 		// make sure that we enable encryption again after a exception was thrown
-		$this->config->expects($this->at(1))
+		$this->config->expects($this->at(3))
 			->method('setAppValue')
 			->with('core', 'encryption_enabled', 'yes');
 
diff --git a/tests/core/command/encryption/encryptalltest.php b/tests/core/command/encryption/encryptalltest.php
index 9f7f7375044..128b4caa148 100644
--- a/tests/core/command/encryption/encryptalltest.php
+++ b/tests/core/command/encryption/encryptalltest.php
@@ -85,7 +85,9 @@ class EncryptAllTest extends TestCase {
 		$this->config->expects($this->at(1))->method('setSystemValue')->with('singleuser', true);
 		$this->config->expects($this->at(2))->method('setSystemValue')->with('singleuser', false);
 
-		new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
+		$instance = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
+		$this->invokePrivate($instance, 'forceSingleUserAndTrashbin');
+		$this->invokePrivate($instance, 'resetSingleUserAndTrashbin');
 	}
 
 	/**
-- 
GitLab


From 5247a0685d52b3889339cc5535b9b2a051ee03f2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 8 Sep 2015 15:33:52 +0200
Subject: [PATCH 405/783] clear up tests a bit

---
 .../lib/connector/sabre/requesttest/uploadtest.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/lib/connector/sabre/requesttest/uploadtest.php b/tests/lib/connector/sabre/requesttest/uploadtest.php
index b8cd44afda7..8f39aff81b9 100644
--- a/tests/lib/connector/sabre/requesttest/uploadtest.php
+++ b/tests/lib/connector/sabre/requesttest/uploadtest.php
@@ -8,6 +8,8 @@
 
 namespace Test\Connector\Sabre\RequestTest;
 
+use OC\AppFramework\Http;
+
 class UploadTest extends RequestTest {
 	public function testBasicUpload() {
 		$user = $this->getUniqueID();
@@ -16,7 +18,7 @@ class UploadTest extends RequestTest {
 		$this->assertFalse($view->file_exists('foo.txt'));
 		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
 
-		$this->assertEquals(201, $response->getStatus());
+		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
 		$this->assertTrue($view->file_exists('foo.txt'));
 		$this->assertEquals('asd', $view->file_get_contents('foo.txt'));
 
@@ -33,7 +35,7 @@ class UploadTest extends RequestTest {
 
 		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
 
-		$this->assertEquals(204, $response->getStatus());
+		$this->assertEquals(Http::STATUS_NO_CONTENT, $response->getStatus());
 		$this->assertEquals('asd', $view->file_get_contents('foo.txt'));
 
 		$info = $view->getFileInfo('foo.txt');
@@ -53,7 +55,7 @@ class UploadTest extends RequestTest {
 
 		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-1', 'bar', ['OC-Chunked' => '1']);
 
-		$this->assertEquals(201, $response->getStatus());
+		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
 		$this->assertTrue($view->file_exists('foo.txt'));
 
 		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
@@ -70,12 +72,12 @@ class UploadTest extends RequestTest {
 		$view->file_put_contents('foo.txt', 'bar');
 		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
 
-		$this->assertEquals(201, $response->getStatus());
+		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
 		$this->assertEquals('bar', $view->file_get_contents('foo.txt'));
 
 		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-1', 'bar', ['OC-Chunked' => '1']);
 
-		$this->assertEquals(201, $response->getStatus());
+		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
 
 		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
 
@@ -91,7 +93,7 @@ class UploadTest extends RequestTest {
 		$this->assertFalse($view->file_exists('foo.txt'));
 		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-1', 'bar', ['OC-Chunked' => '1']);
 
-		$this->assertEquals(201, $response->getStatus());
+		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
 		$this->assertFalse($view->file_exists('foo.txt'));
 
 		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt-chunking-123-2-0', 'asd', ['OC-Chunked' => '1']);
-- 
GitLab


From e3e78f809d55533acb7b6d2f77fa9516d402e244 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 8 Sep 2015 15:34:18 +0200
Subject: [PATCH 406/783] create new mounts every time the mount provider is
 called

important for storage wrappers
---
 tests/lib/traits/mountprovidertrait.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/lib/traits/mountprovidertrait.php b/tests/lib/traits/mountprovidertrait.php
index 66eca1597c8..bccb5b693ee 100644
--- a/tests/lib/traits/mountprovidertrait.php
+++ b/tests/lib/traits/mountprovidertrait.php
@@ -32,7 +32,7 @@ trait MountProviderTrait {
 		if (!isset($this->mounts[$userId])) {
 			$this->mounts[$userId] = [];
 		}
-		$this->mounts[$userId][] = new MountPoint($storage, $mountPoint, $arguments, $this->storageFactory);
+		$this->mounts[$userId][] = ['storage' => $storage, 'mountPoint' => $mountPoint, 'arguments' => $arguments];
 	}
 
 	protected function registerStorageWrapper($name, $wrapper) {
@@ -46,7 +46,9 @@ trait MountProviderTrait {
 			->method('getMountsForUser')
 			->will($this->returnCallback(function (IUser $user) {
 				if (isset($this->mounts[$user->getUID()])) {
-					return $this->mounts[$user->getUID()];
+					return array_map(function ($config) {
+						return new MountPoint($config['storage'], $config['mountPoint'], $config['arguments'], $this->storageFactory);
+					}, $this->mounts[$user->getUID()]);
 				} else {
 					return [];
 				}
-- 
GitLab


From a3d734f6cd04ba14456880c3f0b0fd54b40a0acf Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 8 Sep 2015 15:35:13 +0200
Subject: [PATCH 407/783] Add trait to enable encryption for a unit test

---
 tests/lib/traits/encryptiontrait.php | 104 +++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 tests/lib/traits/encryptiontrait.php

diff --git a/tests/lib/traits/encryptiontrait.php b/tests/lib/traits/encryptiontrait.php
new file mode 100644
index 00000000000..92ba3734873
--- /dev/null
+++ b/tests/lib/traits/encryptiontrait.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Traits;
+
+use OC\Encryption\Util;
+use OC\Files\View;
+use OCA\Encryption\AppInfo\Application;
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Users\Setup;
+use OC\Files\Filesystem;
+
+/**
+ * Enables encryption
+ */
+trait EncryptionTrait {
+	// from MountProviderTrait
+	abstract protected function registerStorageWrapper($name, $wrapper);
+
+	// from phpunit
+	abstract protected function markTestSkipped($reason = '');
+	abstract protected function assertTrue($condition, $message = '');
+
+	private $encryptionWasEnabled;
+
+	private $originalEncryptionModule;
+
+	/**
+	 * @var \OCP\IConfig
+	 */
+	private $config;
+
+	/**
+	 * @var \OCA\Encryption\AppInfo\Application
+	 */
+	private $encryptionApp;
+
+	protected function loginWithEncryption($user = '') {
+		\OC_Util::tearDownFS();
+		\OC_User::setUserId('');
+		// needed for fully logout
+		\OC::$server->getUserSession()->setUser(null);
+
+		Filesystem::tearDown();
+		\OC_User::setUserId($user);
+		$this->postLogin();
+		\OC_Util::setupFS($user);
+		if (\OC_User::userExists($user)) {
+			\OC::$server->getUserFolder($user);
+		}
+	}
+
+	protected function setupForUser($name, $password) {
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($name);
+		$container = $this->encryptionApp->getContainer();
+		/** @var KeyManager $keyManager */
+		$keyManager = $container->query('KeyManager');
+		/** @var Setup $userSetup */
+		$userSetup = $container->query('UserSetup');
+		$userSetup->setupServerSide($name, $password);
+		$keyManager->init($name, $password);
+	}
+
+	protected function postLogin() {
+		$util = new Util(
+			new View(),
+			\OC::$server->getUserManager(),
+			\OC::$server->getGroupManager(),
+			\OC::$server->getConfig()
+		);
+		$this->registerStorageWrapper('oc_encryption', array($util, 'wrapStorage'));
+	}
+
+	protected function setUpEncryptionTrait() {
+		$isReady = \OC::$server->getEncryptionManager()->isReady();
+		if (!$isReady) {
+			$this->markTestSkipped('Encryption not ready');
+		}
+
+		\OC_App::loadApp('encryption');
+
+		$this->encryptionApp = new Application([], $isReady);
+
+		$this->config = \OC::$server->getConfig();
+		$this->encryptionWasEnabled = $this->config->getAppValue('core', 'encryption_enabled', 'no');
+		$this->originalEncryptionModule = $this->config->getAppValue('core', 'default_encryption_module');
+		$this->config->setAppValue('core', 'default_encryption_module', \OCA\Encryption\Crypto\Encryption::ID);
+		$this->config->setAppValue('core', 'encryption_enabled', 'yes');
+		$this->assertTrue(\OC::$server->getEncryptionManager()->isEnabled());
+	}
+
+	protected function tearDownEncryptionTrait() {
+		if ($this->config) {
+			$this->config->setAppValue('core', 'encryption_enabled', $this->encryptionWasEnabled);
+			$this->config->setAppValue('core', 'default_encryption_module', $this->originalEncryptionModule);
+		}
+	}
+}
-- 
GitLab


From dc870cb450cabadf79fb805715ed772bab8baafd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 8 Sep 2015 15:35:30 +0200
Subject: [PATCH 408/783] Add tests for doing dav requests with encryption
 enabled

---
 .../requesttest/encryptionuploadtest.php      | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 tests/lib/connector/sabre/requesttest/encryptionuploadtest.php

diff --git a/tests/lib/connector/sabre/requesttest/encryptionuploadtest.php b/tests/lib/connector/sabre/requesttest/encryptionuploadtest.php
new file mode 100644
index 00000000000..f1849c94760
--- /dev/null
+++ b/tests/lib/connector/sabre/requesttest/encryptionuploadtest.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Connector\Sabre\RequestTest;
+
+use OC\Files\View;
+use Test\Traits\EncryptionTrait;
+
+class EncryptionUploadTest extends UploadTest {
+	use EncryptionTrait;
+
+	protected function setupUser($name, $password) {
+		$this->createUser($name, $password);
+		$tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
+		$this->setupForUser($name, $password);
+		$this->loginWithEncryption($name);
+		return new View('/' . $name . '/files');
+	}
+}
-- 
GitLab


From 485ea316a196e86e547eab622e4ed522c4b52588 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 11 Sep 2015 16:45:32 +0200
Subject: [PATCH 409/783] reuse the same datadir

---
 tests/lib/connector/sabre/requesttest/requesttest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/lib/connector/sabre/requesttest/requesttest.php b/tests/lib/connector/sabre/requesttest/requesttest.php
index 7afe2645037..4d4c8173caa 100644
--- a/tests/lib/connector/sabre/requesttest/requesttest.php
+++ b/tests/lib/connector/sabre/requesttest/requesttest.php
@@ -52,7 +52,8 @@ abstract class RequestTest extends TestCase {
 
 	protected function setupUser($name, $password) {
 		$this->createUser($name, $password);
-		$this->registerMount($name, '\OC\Files\Storage\Temporary', '/' . $name);
+		$tmpFolder = \OC::$server->getTempManager()->getTemporaryFolder();
+		$this->registerMount($name, '\OC\Files\Storage\Local', '/' . $name, ['datadir' => $tmpFolder]);
 		$this->loginAsUser($name);
 		return new View('/' . $name . '/files');
 	}
-- 
GitLab


From 947e3d7ab5921d4175dc8a1e30fe35025e714926 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 16 Jul 2015 18:41:08 +0200
Subject: [PATCH 410/783] Add repair step for outdated OCS IDs

There is the case where OCs IDs might become outdated such as it has been with the calendar and contacts app which refer to the old dummy entry. This means that users with the old OCS id can't update updates as well will receive invalid state flags. (e.g. "experimental" instead of "approved")

To allow instances to properly update the applications in the future we need to migrate the OCS IDs for now manually.
---
 lib/private/repair.php                    |   6 +-
 lib/repair/updateoutdatedocsids.php       | 108 ++++++++++++++++++++++
 tests/lib/repair/updateoutdatedocsids.php |  80 ++++++++++++++++
 3 files changed, 192 insertions(+), 2 deletions(-)
 create mode 100644 lib/repair/updateoutdatedocsids.php
 create mode 100644 tests/lib/repair/updateoutdatedocsids.php

diff --git a/lib/private/repair.php b/lib/private/repair.php
index bf385af2c2b..533bf05b54c 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -43,6 +43,7 @@ use OC\Repair\RepairConfig;
 use OC\Repair\RepairLegacyStorages;
 use OC\Repair\RepairMimeTypes;
 use OC\Repair\SearchLuceneTables;
+use OC\Repair\UpdateOutdatedOcsIds;
 
 class Repair extends BasicEmitter {
 	/**
@@ -101,7 +102,7 @@ class Repair extends BasicEmitter {
 	 * @return array of RepairStep instances
 	 */
 	public static function getRepairSteps() {
-		return array(
+		return [
 			new RepairMimeTypes(),
 			new RepairLegacyStorages(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
 			new RepairConfig(),
@@ -111,7 +112,8 @@ class Repair extends BasicEmitter {
 			new DropOldTables(\OC::$server->getDatabaseConnection()),
 			new DropOldJobs(\OC::$server->getJobList()),
 			new RemoveGetETagEntries(\OC::$server->getDatabaseConnection()),
-		);
+			new UpdateOutdatedOcsIds(\OC::$server->getConfig()),
+		];
 	}
 
 	/**
diff --git a/lib/repair/updateoutdatedocsids.php b/lib/repair/updateoutdatedocsids.php
new file mode 100644
index 00000000000..afc9e968cad
--- /dev/null
+++ b/lib/repair/updateoutdatedocsids.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @author Lukas Reschke <l8kas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Repair;
+
+use OC\Hooks\BasicEmitter;
+use OC\RepairStep;
+use OCP\IConfig;
+
+/**
+ * Class UpdateOutdatedOcsIds is used to update invalid outdated OCS IDs, this is
+ * for example the case when an application has had another OCS ID in the past such
+ * as for contacts and calendar when apps.owncloud.com migrated to a unified identifier
+ * for multiple versions.
+ *
+ * @package OC\Repair
+ */
+class UpdateOutdatedOcsIds extends BasicEmitter implements RepairStep {
+	/** @var IConfig */
+	private $config;
+
+	/**
+	 * @param IConfig $config
+	 */
+	public function __construct(IConfig $config) {
+		$this->config = $config;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getName() {
+		return 'Repair outdated OCS IDs';
+	}
+
+	/**
+	 * @param string $appName
+	 * @param string $oldId
+	 * @param string $newId
+	 * @return bool True if updated, false otherwise
+	 */
+	public function fixOcsId($appName, $oldId, $newId) {
+		$existingId = $this->config->getAppValue($appName, 'ocsid');
+
+		if($existingId === $oldId) {
+			$this->config->setAppValue($appName, 'ocsid', $newId);
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function run() {
+		$appsToUpdate = [
+			'contacts' => [
+				'old' => '166044',
+				'new' => '168708',
+			],
+			'calendar' => [
+				'old' => '166043',
+				'new' => '168707',
+			],
+			'bookmarks' => [
+				'old' => '166042',
+				'new' => '168710',
+			],
+			'search_lucene' => [
+				'old' => '166057',
+				'new' => '168709',
+			],
+			'documents' => [
+				'old' => '166045',
+				'new' => '168711',
+			]
+		];
+
+		foreach($appsToUpdate as $appName => $ids) {
+			if ($this->fixOcsId($appName, $ids['old'], $ids['new'])) {
+				$this->emit(
+					'\OC\Repair',
+					'info',
+					[sprintf('Fixed invalid %s OCS id', $appName)]
+				);
+			}
+		}
+	}
+}
diff --git a/tests/lib/repair/updateoutdatedocsids.php b/tests/lib/repair/updateoutdatedocsids.php
new file mode 100644
index 00000000000..3669a64371f
--- /dev/null
+++ b/tests/lib/repair/updateoutdatedocsids.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @author Lukas Reschke <l8kas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Test\Repair;
+
+use OCP\IConfig;
+use Test\TestCase;
+
+/**
+ * Class UpdateOutdatedOcsIds
+ *
+ * @package Test\Repair
+ */
+class UpdateOutdatedOcsIds extends TestCase {
+	/** @var IConfig */
+	private $config;
+	/** @var \OC\Repair\UpdateOutdatedOcsIds */
+	private $updateOutdatedOcsIds;
+
+	public function setUp() {
+		parent::setUp();
+		$this->config = $this->getMockBuilder('\\OCP\\IConfig')->getMock();
+		$this->updateOutdatedOcsIds = new \OC\Repair\UpdateOutdatedOcsIds($this->config);
+	}
+
+	public function testGetName() {
+		$this->assertSame('Repair outdated OCS IDs', $this->updateOutdatedOcsIds->getName());
+	}
+
+	public function testFixOcsIdNoOcsId() {
+		$this->config
+			->expects($this->once())
+			->method('getAppValue')
+			->with('MyNotInstalledApp', 'ocsid')
+			->will($this->returnValue(''));
+		$this->assertFalse($this->updateOutdatedOcsIds->fixOcsId('MyNotInstalledApp', '1337', '0815'));
+	}
+
+	public function testFixOcsIdUpdateOcsId() {
+		$this->config
+			->expects($this->at(0))
+			->method('getAppValue')
+			->with('MyInstalledApp', 'ocsid')
+			->will($this->returnValue('1337'));
+		$this->config
+			->expects($this->at(1))
+			->method('setAppValue')
+			->with('MyInstalledApp', 'ocsid', '0815');
+
+		$this->assertTrue($this->updateOutdatedOcsIds->fixOcsId('MyInstalledApp', '1337', '0815'));
+	}
+
+	public function testFixOcsIdAlreadyFixed() {
+		$this->config
+			->expects($this->once())
+			->method('getAppValue')
+			->with('MyAlreadyFixedAppId', 'ocsid')
+			->will($this->returnValue('0815'));
+
+		$this->assertFalse($this->updateOutdatedOcsIds->fixOcsId('MyAlreadyFixedAppId', '1337', '0815'));
+	}
+}
-- 
GitLab


From 7c6d811584338835f9f4fd563780933ecd638356 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 17 Jul 2015 08:31:42 +0200
Subject: [PATCH 411/783] Prefer OCS Id from database

To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id.
---
 lib/private/app.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/private/app.php b/lib/private/app.php
index e44290369a8..6c9f7615228 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -656,6 +656,12 @@ class OC_App {
 		if (is_array($data)) {
 			$data = OC_App::parseAppInfo($data);
 		}
+		if(isset($data['ocsid'])) {
+			$storedId = \OC::$server->getConfig()->getAppValue($appId, 'ocsid');
+			if($storedId !== '' && $storedId !== $data['ocsid']) {
+				$data['ocsid'] = $storedId;
+			}
+		}
 
 		self::$appInfo[$appId] = $data;
 
-- 
GitLab


From 5db186e77c2eddb62b444b4f5cb56a92c02db6ee Mon Sep 17 00:00:00 2001
From: Nicolai Ehemann <en@enlightened.de>
Date: Fri, 18 Sep 2015 13:42:36 +0200
Subject: [PATCH 412/783] adapted to changed subproject commit

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 70d9c4096e7..6b6575b04c0 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 70d9c4096e767b4103960ffad96b87e3e511ee61
+Subproject commit 6b6575b04c01e30e5f38dbb373fd5166cce0ef54
-- 
GitLab


From 5472a5f455cfd6ff9ce956fa51be206789e608db Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 18 Sep 2015 15:05:18 +0200
Subject: [PATCH 413/783] Also catch exceptions on encryptAll and reset
 trashbin and singleUser mode

---
 core/command/encryption/encryptall.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 2269663b21f..4ae6ae47836 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -115,8 +115,13 @@ class EncryptAll extends Command {
 		if ($this->questionHelper->ask($input, $output, $question)) {
 			$this->forceSingleUserAndTrashbin();
 
-			$defaultModule = $this->encryptionManager->getEncryptionModule();
-			$defaultModule->encryptAll($input, $output);
+			try {
+				$defaultModule = $this->encryptionManager->getEncryptionModule();
+				$defaultModule->encryptAll($input, $output);
+			} catch (\Exception $ex) {
+				$this->resetSingleUserAndTrashbin();
+				throw $ex;
+			}
 
 			$this->resetSingleUserAndTrashbin();
 		} else {
-- 
GitLab


From 5470d0edae11ea72a499456287fb6529a5bd1768 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 18 Sep 2015 19:25:59 +0200
Subject: [PATCH 414/783] Connect to database to verify if it is running

Try to connect to the OCI host via sqlplus to ensure that the connection is already running. Required by the new OCI configuration on CI.
---
 autotest.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index 8d0e20cf2a8..b1b27ec8c8d 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -203,8 +203,14 @@ function execute_tests {
 
 		echo "Waiting for Oracle initialization ... "
 
-		# grep exits on the first match and then the script continues - times out after 2 minutes
-		timeout 240 docker logs -f "$DOCKER_CONTAINER_ID" 2>&1 | grep -q "Grant succeeded."
+		# Try to connect to the OCI host via sqlplus to ensure that the connection is already running
+      		for i in {1..48}
+                do
+                        if sqlplus "system/oracle@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(Host=$DATABASEHOST)(Port=1521))(CONNECT_DATA=(SID=XE)))" < /dev/null | grep 'Connected to'; then
+                                break;
+                        fi
+                        sleep 5
+                done
 
 		DATABASEUSER=autotest
 		DATABASENAME='XE'
-- 
GitLab


From 9d1885a535d17a15d68ebd53113cd62719e1c26f Mon Sep 17 00:00:00 2001
From: C Montero-Luque <cml@owncloud.com>
Date: Fri, 18 Sep 2015 14:01:46 -0400
Subject: [PATCH 415/783] 8.2 beta1

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 0f7fef95be4..711d82f1ca1 100644
--- a/version.php
+++ b/version.php
@@ -23,10 +23,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(8, 2, 0, 5);
+$OC_Version = array(8, 2, 0, 6);
 
 // The human readable string
-$OC_VersionString = '8.2 pre alpha';
+$OC_VersionString = '8.2 beta1';
 
 $OC_VersionCanBeUpgradedFrom = array(8, 1);
 
-- 
GitLab


From c433d48d8e4b6dd1392a25170dff173852544fcf Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 19 Sep 2015 01:55:22 -0400
Subject: [PATCH 416/783] [tx-robot] updated from transifex

---
 apps/files_external/l10n/pt_BR.js   | 1 +
 apps/files_external/l10n/pt_BR.json | 1 +
 core/l10n/pt_BR.js                  | 2 ++
 core/l10n/pt_BR.json                | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index 9b9d1c49a49..68b1c671c3c 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -78,6 +78,7 @@ OC.L10N.register(
     "SFTP with secret key login [DEPRECATED]" : "SFTP com chave secreta de login [DEPRECATED]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
+    "Domain" : "Domínio",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS usando OC de login [DEPRECATED]",
     "Username as share" : "Nome de usuário como compartilhado",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index a863e6abffb..bb4c5b88a2d 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -76,6 +76,7 @@
     "SFTP with secret key login [DEPRECATED]" : "SFTP com chave secreta de login [DEPRECATED]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
+    "Domain" : "Domínio",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS usando OC de login [DEPRECATED]",
     "Username as share" : "Nome de usuário como compartilhado",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 2cf6224b9a9..ca6b56ae0a1 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "mudança",
     "delete" : "remover",
     "access control" : "controle de acesso",
+    "Share details could not be loaded for this item." : "Detalhes de compartilhamento não puderam ser carregados para este item.",
     "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente",
     "Share" : "Compartilhar",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
     "Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
     "Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
     "Warning" : "Aviso",
+    "Error while sending notification" : "Erro ao enviar notificação",
     "The object type is not specified." : "O tipo de objeto não foi especificado.",
     "Enter new" : "Entrar uma nova",
     "Delete" : "Eliminar",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 5e3b723c3c4..7441ad571eb 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -143,12 +143,14 @@
     "change" : "mudança",
     "delete" : "remover",
     "access control" : "controle de acesso",
+    "Share details could not be loaded for this item." : "Detalhes de compartilhamento não puderam ser carregados para este item.",
     "An error occured. Please try again" : "Ocorreu um erro. Por favor tente novamente",
     "Share" : "Compartilhar",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
     "Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
     "Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
     "Warning" : "Aviso",
+    "Error while sending notification" : "Erro ao enviar notificação",
     "The object type is not specified." : "O tipo de objeto não foi especificado.",
     "Enter new" : "Entrar uma nova",
     "Delete" : "Eliminar",
-- 
GitLab


From 9776d60b574e49f3b77b4da64c890804c94aa79b Mon Sep 17 00:00:00 2001
From: Olivier Paroz <oparoz@users.noreply.github.com>
Date: Fri, 18 Sep 2015 23:19:59 +0200
Subject: [PATCH 417/783] Typo

---
 core/js/share.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index a2e6e6af0fc..1131ae8f112 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -395,7 +395,7 @@ OC.Share = _.extend(OC.Share || {}, {
 			attributes: {
 				'data-item-source-name': filename,
 				'data-item-type': itemType,
-				'data-item-soruce': itemSource
+				'data-item-source': itemSource
 			}
 		});
 		dialogView.setShowLink(link);
-- 
GitLab


From 624f5de67af852657d424ea7720a441aca077e09 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Thu, 17 Sep 2015 17:39:27 +0200
Subject: [PATCH 418/783] fix checkboxes in files_external

---
 apps/files_external/js/settings.js         |  7 ++++---
 apps/files_external/templates/settings.php | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index bf9981adabf..4319677f4f4 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -15,12 +15,12 @@ var MOUNT_OPTIONS_DROPDOWN_TEMPLATE =
 	'<div class="drop dropdown mountOptionsDropdown">' +
 	// FIXME: options are hard-coded for now
 	'	<div class="optionRow">' +
-	'		<label for="mountOptionsEncrypt">{{t "files_external" "Enable encryption"}}</label>' +
 	'		<input id="mountOptionsEncrypt" name="encrypt" type="checkbox" value="true" checked="checked"/>' +
+	'		<label for="mountOptionsEncrypt">{{t "files_external" "Enable encryption"}}</label>' +
 	'	</div>' +
 	'	<div class="optionRow">' +
-	'		<label for="mountOptionsPreviews">{{t "files_external" "Enable previews"}}</label>' +
 	'		<input id="mountOptionsPreviews" name="previews" type="checkbox" value="true" checked="checked"/>' +
+	'		<label for="mountOptionsPreviews">{{t "files_external" "Enable previews"}}</label>' +
 	'	</div>' +
 	'	<div class="optionRow">' +
 	'		<label for="mountOptionsFilesystemCheck">{{t "files_external" "Check for changes"}}</label>' +
@@ -808,7 +808,8 @@ MountConfigListView.prototype = _.extend({
 		if (placeholder.indexOf('*') === 0) {
 			newElement = $('<input type="password" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
 		} else if (placeholder.indexOf('!') === 0) {
-			newElement = $('<label><input type="checkbox" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" />'+placeholder.substring(1)+'</label>');
+			var checkboxId = _.uniqueId('checkbox_');
+			newElement = $('<input type="checkbox" id="'+checkboxId+'" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" /><label for="'+checkboxId+'">'+placeholder.substring(1)+'</label>');
 		} else if (placeholder.indexOf('#') === 0) {
 			newElement = $('<input type="hidden" class="'+classes.join(' ')+'" data-parameter="'+parameter+'" />');
 		} else {
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 63a3a19de2f..7762ff60333 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -23,14 +23,14 @@
 			<?php
 			break;
 		case DefinitionParameter::VALUE_BOOLEAN: ?>
-			<label>
-				<input type="checkbox"
-					<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
-					data-parameter="<?php p($parameter->getName()); ?>"
-				 	<?php if ($value === true): ?> checked="checked"<?php endif; ?>
-				/>
-				<?php p($placeholder); ?>
-			</label>
+			<?php $checkboxId = uniqid("checkbox_"); ?>
+			<input type="checkbox"
+				id="<?php p($checkboxId); ?>"
+				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
+				data-parameter="<?php p($parameter->getName()); ?>"
+				<?php if ($value === true): ?> checked="checked"<?php endif; ?>
+			/>
+			<label for="<?php p($checkboxId); ?>"><?php p($placeholder); ?></label>
 			<?php
 			break;
 		case DefinitionParameter::VALUE_HIDDEN: ?>
-- 
GitLab


From bbd1e996050fee80795d0e656da98b6451232c6c Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 20 Sep 2015 01:54:48 -0400
Subject: [PATCH 419/783] [tx-robot] updated from transifex

---
 apps/files_external/l10n/it.js      | 1 +
 apps/files_external/l10n/it.json    | 1 +
 apps/files_external/l10n/nb_NO.js   | 1 +
 apps/files_external/l10n/nb_NO.json | 1 +
 apps/files_sharing/l10n/da.js       | 3 +++
 apps/files_sharing/l10n/da.json     | 3 +++
 apps/files_sharing/l10n/fi_FI.js    | 3 +++
 apps/files_sharing/l10n/fi_FI.json  | 3 +++
 apps/files_sharing/l10n/it.js       | 3 +++
 apps/files_sharing/l10n/it.json     | 3 +++
 apps/files_sharing/l10n/nb_NO.js    | 4 ++++
 apps/files_sharing/l10n/nb_NO.json  | 4 ++++
 apps/files_sharing/l10n/nl.js       | 3 +++
 apps/files_sharing/l10n/nl.json     | 3 +++
 apps/files_sharing/l10n/pt_BR.js    | 3 +++
 apps/files_sharing/l10n/pt_BR.json  | 3 +++
 core/l10n/nb_NO.js                  | 2 ++
 core/l10n/nb_NO.json                | 2 ++
 18 files changed, 46 insertions(+)

diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index 368ff49195e..0844e90b903 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -47,6 +47,7 @@ OC.L10N.register(
     "Username" : "Nome utente",
     "Password" : "Password",
     "Tenant name" : "Nome tenant",
+    "Identity endpoint URL" : "URL endpoint delle identità",
     "Rackspace" : "Rackspace",
     "API key" : "Chiave API",
     "Username and password" : "Nome utente e password",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 4da556760f6..cfe633bc328 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -45,6 +45,7 @@
     "Username" : "Nome utente",
     "Password" : "Password",
     "Tenant name" : "Nome tenant",
+    "Identity endpoint URL" : "URL endpoint delle identità",
     "Rackspace" : "Rackspace",
     "API key" : "Chiave API",
     "Username and password" : "Nome utente e password",
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index 0089d42288d..ea912e4cf7a 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -78,6 +78,7 @@ OC.L10N.register(
     "SFTP with secret key login [DEPRECATED]" : "SFTP med hemmelig nøkkel for pålogging [FORELDET]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Delt ressurs",
+    "Domain" : "Domene",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS med OC-pålogging [FORELDET]",
     "Username as share" : "Brukernavn som share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index 8ee2713f329..800234a931a 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -76,6 +76,7 @@
     "SFTP with secret key login [DEPRECATED]" : "SFTP med hemmelig nøkkel for pålogging [FORELDET]",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Delt ressurs",
+    "Domain" : "Domene",
     "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS med OC-pålogging [FORELDET]",
     "Username as share" : "Brukernavn som share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index 7b54b361d8d..d31acc37760 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Den offentligt delte fil %1$s blev downloadet",
     "You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
     "You shared %1$s with group %2$s" : "Du delte %1$s med gruppen %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s delt %1$s med %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s delt %1$s med gruppen %3$s",
+    "%2$s shared %1$s via link" : "%2$s delt %1$s via link",
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index f430935e8bc..fe702de52e8 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -36,6 +36,9 @@
     "Public shared file %1$s was downloaded" : "Den offentligt delte fil %1$s blev downloadet",
     "You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
     "You shared %1$s with group %2$s" : "Du delte %1$s med gruppen %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s delt %1$s med %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s delt %1$s med gruppen %3$s",
+    "%2$s shared %1$s via link" : "%2$s delt %1$s via link",
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index 060efce51dd..2e4a32480b1 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Julkisesti jaettu tiedosto %1$s ladattiin",
     "You shared %1$s with %2$s" : "Jaoit kohteen %1$s käyttäjän %2$s kanssa",
     "You shared %1$s with group %2$s" : "Jaoit kohteen %1$s ryhmän %2$s kanssa",
+    "%2$s shared %1$s with %3$s" : "%2$s jakoi kohteen %1$s käyttäjän %3$s kanssa",
+    "%2$s shared %1$s with group %3$s" : "%2$s jakoi kohteen %1$s ryhmän %3$s kanssa",
+    "%2$s shared %1$s via link" : "%2$s jakoi kohteen %1$s linkin kautta",
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index 091f7aec81f..2b938d95c0e 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -36,6 +36,9 @@
     "Public shared file %1$s was downloaded" : "Julkisesti jaettu tiedosto %1$s ladattiin",
     "You shared %1$s with %2$s" : "Jaoit kohteen %1$s käyttäjän %2$s kanssa",
     "You shared %1$s with group %2$s" : "Jaoit kohteen %1$s ryhmän %2$s kanssa",
+    "%2$s shared %1$s with %3$s" : "%2$s jakoi kohteen %1$s käyttäjän %3$s kanssa",
+    "%2$s shared %1$s with group %3$s" : "%2$s jakoi kohteen %1$s ryhmän %3$s kanssa",
+    "%2$s shared %1$s via link" : "%2$s jakoi kohteen %1$s linkin kautta",
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 0167ef4625d..6aa6ab5b78b 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
     "You shared %1$s with %2$s" : "Hai condiviso %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s ha condiviso %1$s con %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s ha condiviso %1$s con il gruppo %3$s",
+    "%2$s shared %1$s via link" : "%2$s ha condiviso %1$s tramite collegamento",
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index ae26579572a..d70c97ea933 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -36,6 +36,9 @@
     "Public shared file %1$s was downloaded" : "Il file condiviso pubblicamente %1$s è stato scaricato",
     "You shared %1$s with %2$s" : "Hai condiviso %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Hai condiviso %1$s con il gruppo %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s ha condiviso %1$s con %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s ha condiviso %1$s con il gruppo %3$s",
+    "%2$s shared %1$s via link" : "%2$s ha condiviso %1$s tramite collegamento",
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index b8b6c634959..a8f7fbdbc9b 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -38,9 +38,13 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Offentlig delt fil %1$s ble lastet ned",
     "You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
     "You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s delte %1$s med %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s delte %1$s med gruppe %3$s",
+    "%2$s shared %1$s via link" : "%2$s delte %1$s via lenke",
     "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "You shared %1$s via link" : "Du delte %1$s via lenke",
     "Shares" : "Delinger",
+    "You received %2$s as a remote share from %1$s" : "Du mottok %2$s som en ekstern deling fra %1$s",
     "Accept" : "Aksepter",
     "Decline" : "Avslå",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index 9382119e5c4..e9c67955708 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -36,9 +36,13 @@
     "Public shared file %1$s was downloaded" : "Offentlig delt fil %1$s ble lastet ned",
     "You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
     "You shared %1$s with group %2$s" : "Du delte %1$s med gruppe %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s delte %1$s med %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s delte %1$s med gruppe %3$s",
+    "%2$s shared %1$s via link" : "%2$s delte %1$s via lenke",
     "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "You shared %1$s via link" : "Du delte %1$s via lenke",
     "Shares" : "Delinger",
+    "You received %2$s as a remote share from %1$s" : "Du mottok %2$s som en ekstern deling fra %1$s",
     "Accept" : "Aksepter",
     "Decline" : "Avslå",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index 2ccddb5d9a7..f1edae5f8eb 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Openbaar gedeeld bestand %1$s werd gedownloaded",
     "You shared %1$s with %2$s" : "U deelde %1$s met %2$s",
     "You shared %1$s with group %2$s" : "U deelde %1$s met groep %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s deelde %1$s met %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s deelde %1$s met groep %3$s",
+    "%2$s shared %1$s via link" : "%2$s deelde %1$s via link",
     "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "You shared %1$s via link" : "U deelde %1$s via link",
     "Shares" : "Gedeeld",
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index 53cd8954898..a285071ca30 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -36,6 +36,9 @@
     "Public shared file %1$s was downloaded" : "Openbaar gedeeld bestand %1$s werd gedownloaded",
     "You shared %1$s with %2$s" : "U deelde %1$s met %2$s",
     "You shared %1$s with group %2$s" : "U deelde %1$s met groep %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s deelde %1$s met %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s deelde %1$s met groep %3$s",
+    "%2$s shared %1$s via link" : "%2$s deelde %1$s via link",
     "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "You shared %1$s via link" : "U deelde %1$s via link",
     "Shares" : "Gedeeld",
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index bb455487186..cb167dfb5a4 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "O arquivo %1$s compartilhado publicamente foi baixado",
     "You shared %1$s with %2$s" : "Você compartilhou %1$s com %2$s",
     "You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s compartilhado %1$s com %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s compartilhado %1$s com o grupo %3$s",
+    "%2$s shared %1$s via link" : "%2$s compartilhado via link %1$s",
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 7db2b1f0494..b42a56f03ce 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -36,6 +36,9 @@
     "Public shared file %1$s was downloaded" : "O arquivo %1$s compartilhado publicamente foi baixado",
     "You shared %1$s with %2$s" : "Você compartilhou %1$s com %2$s",
     "You shared %1$s with group %2$s" : "Você compartilhou %1$s com o grupo %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s compartilhado %1$s com %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s compartilhado %1$s com o grupo %3$s",
+    "%2$s shared %1$s via link" : "%2$s compartilhado via link %1$s",
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index d95186a94db..13f133dbaf4 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "endre",
     "delete" : "slette",
     "access control" : "tilgangskontroll",
+    "Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.",
     "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen",
     "Share" : "Del",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud",
     "Share with users or groups …" : "Del med brukere eller grupper ...",
     "Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...",
     "Warning" : "Advarsel",
+    "Error while sending notification" : "Feil ved sending av varsling",
     "The object type is not specified." : "Objekttypen er ikke spesifisert.",
     "Enter new" : "Oppgi ny",
     "Delete" : "Slett",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index 0bde814c095..beb7a53e57b 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -143,12 +143,14 @@
     "change" : "endre",
     "delete" : "slette",
     "access control" : "tilgangskontroll",
+    "Share details could not be loaded for this item." : "Klarte ikke å laste inn detaljer om deling for dette elementet.",
     "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen",
     "Share" : "Del",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud",
     "Share with users or groups …" : "Del med brukere eller grupper ...",
     "Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...",
     "Warning" : "Advarsel",
+    "Error while sending notification" : "Feil ved sending av varsling",
     "The object type is not specified." : "Objekttypen er ikke spesifisert.",
     "Enter new" : "Oppgi ny",
     "Delete" : "Slett",
-- 
GitLab


From b3ff773bbf363e4d7d44d7c6ce7ae2eec8250cfb Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Mon, 23 Mar 2015 01:05:33 +0100
Subject: [PATCH 420/783] delete cached preview when rolling back file's
 version

add random number using OC.parseQueryString and _.extend()

version rollback: add missing prefix to OC\Preview::post_delete

add test to assure that the rollback hook is called
---
 apps/files_versions/lib/storage.php    |  3 +++
 apps/files_versions/tests/versions.php | 37 ++++++++++++++++++++++++++
 lib/base.php                           |  3 ++-
 lib/private/preview.php                |  7 +++++
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index 6aa58c55e9b..bdf1811c5f9 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -315,6 +315,9 @@ class Storage {
 			if (self::copyFileContents($users_view, 'files_versions' . $filename . '.v' . $revision, 'files' . $filename)) {
 				$files_view->touch($file, $revision);
 				Storage::scheduleExpire($uid, $file);
+				\OC_Hook::emit('\OCP\Versions', 'rollback', array(
+					'path' => $filename,
+				));
 				return true;
 			} else if ($versionCreated) {
 				self::deleteVersion($users_view, $version);
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 7cca409ed6c..a9eb1b919b7 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -580,6 +580,35 @@ class Test_Files_Versioning extends \Test\TestCase {
 		$this->doTestRestore();
 	}
 
+	/**
+	 * @param string $hookName name of hook called
+	 * @param string $params variable to recieve parameters provided by hook
+	 */
+	private function connectMockHooks($hookName, &$params) {
+		if ($hookName === null) {
+			return;
+		}
+
+		$eventHandler = $this->getMockBuilder('\stdclass')
+			->setMethods(['callback'])
+			->getMock();
+
+		$eventHandler->expects($this->any())
+			->method('callback')
+			->will($this->returnCallback(
+				function($p) use (&$params) {
+					$params = $p;
+				}
+			));
+
+		\OCP\Util::connectHook(
+			'\OCP\Versions',
+			$hookName,
+			$eventHandler,
+			'callback'
+		);
+	}
+
 	private function doTestRestore() {
 		$filePath = self::TEST_VERSIONS_USER . '/files/sub/test.txt';
 		$this->rootView->file_put_contents($filePath, 'test file');
@@ -608,7 +637,15 @@ class Test_Files_Versioning extends \Test\TestCase {
 		$this->assertEquals('test file', $this->rootView->file_get_contents($filePath));
 		$info1 = $this->rootView->getFileInfo($filePath);
 
+		$params = array();
+		$this->connectMockHooks('rollback', $params);
+
 		\OCA\Files_Versions\Storage::rollback('sub/test.txt', $t2);
+		$expectedParams = array(
+			'path' => '/sub/test.txt',
+		);
+
+		$this->assertEquals($expectedParams, $params);
 
 		$this->assertEquals('version2', $this->rootView->file_get_contents($filePath));
 		$info2 = $this->rootView->getFileInfo($filePath);
diff --git a/lib/base.php b/lib/base.php
index f5ba05ded74..acb9814dd76 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -803,8 +803,9 @@ class OC {
 		OC_Hook::connect('\OCP\Versions', 'preDelete', 'OC\Preview', 'prepare_delete');
 		OC_Hook::connect('\OCP\Trashbin', 'preDelete', 'OC\Preview', 'prepare_delete');
 		OC_Hook::connect('OC_Filesystem', 'post_delete', 'OC\Preview', 'post_delete_files');
-		OC_Hook::connect('\OCP\Versions', 'delete', 'OC\Preview', 'post_delete');
+		OC_Hook::connect('\OCP\Versions', 'delete', 'OC\Preview', 'post_delete_versions');
 		OC_Hook::connect('\OCP\Trashbin', 'delete', 'OC\Preview', 'post_delete');
+		OC_Hook::connect('\OCP\Versions', 'rollback', 'OC\Preview', 'post_delete_versions');
 	}
 
 	/**
diff --git a/lib/private/preview.php b/lib/private/preview.php
index db2a56f9fa5..f2ff40c51f7 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -1300,6 +1300,13 @@ class Preview {
 		self::post_delete($args, 'files/');
 	}
 
+	/**
+	 * @param array $args
+	 */
+	public static function post_delete_versions($args) {
+		self::post_delete($args, 'files/');
+	}
+
 	/**
 	 * @param array $args
 	 * @param string $prefix
-- 
GitLab


From 04b14df35ca05e49194534a7c14ee2ab9199e4bb Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Mon, 20 Jul 2015 16:51:28 +0200
Subject: [PATCH 421/783] Fix preview of old file on public upload conflicts

---
 apps/files_sharing/js/public.js | 24 +++++++++++++-----------
 core/js/oc-dialogs.js           |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 1993efe7d73..4908968a937 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -159,9 +159,18 @@ OCA.Sharing.PublicApp = {
 			};
 
 			this.fileList.generatePreviewUrl = function (urlSpec) {
+				urlSpec = urlSpec || {};
+				if (!urlSpec.x) {
+					urlSpec.x = 36;
+				}
+				if (!urlSpec.y) {
+					urlSpec.y = 36;
+				}
+				urlSpec.x *= window.devicePixelRatio;
+				urlSpec.y *= window.devicePixelRatio;
+				urlSpec.x = Math.floor(urlSpec.x);
+				urlSpec.y = Math.floor(urlSpec.y);
 				urlSpec.t = $('#dirToken').val();
-				urlSpec.y = Math.floor(36 * window.devicePixelRatio);
-				urlSpec.x = Math.floor(36 * window.devicePixelRatio);
 				return OC.generateUrl('/apps/files_sharing/ajax/publicpreview.php?') + $.param(urlSpec);
 			};
 
@@ -293,15 +302,8 @@ $(document).ready(function () {
 
 	if (window.Files) {
 		// HACK: for oc-dialogs previews that depends on Files:
-		Files.lazyLoadPreview = function (path, mime, ready, width, height, etag) {
-			return App.fileList.lazyLoadPreview({
-				path: path,
-				mime: mime,
-				callback: ready,
-				width: width,
-				height: height,
-				etag: etag
-			});
+		Files.generatePreviewUrl = function (urlSpec) {
+			return App.fileList.generatePreviewUrl(urlSpec);
 		};
 	}
 });
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 52ed34f61ec..361cf2dff67 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -388,9 +388,9 @@ var OCdialogs = {
 				c:		original.etag,
 				forceIcon:	0
 			};
-			var previewpath = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
+			var previewpath = Files.generatePreviewUrl(urlSpec);
 			// Escaping single quotes
-			previewpath = previewpath.replace(/'/g, "%27")
+			previewpath = previewpath.replace(/'/g, "%27");
 			$originalDiv.find('.icon').css({"background-image":   "url('" + previewpath + "')"});
 			getCroppedPreview(replacement).then(
 				function(path){
-- 
GitLab


From 62a0a7fab5d2b803066992f495f143ada66d2780 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@gmail.com>
Date: Mon, 21 Sep 2015 00:07:02 +1000
Subject: [PATCH 422/783] Fixed typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a705074d6be..1085d516263 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Quality:
  - Scrutinizer: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/)
  - CodeClimate: [![Code Climate](https://codeclimate.com/github/owncloud/core/badges/gpa.svg)](https://codeclimate.com/github/owncloud/core)
 
-Depencencies:
+Dependencies:
 
 [![Dependency Status](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16/badge.svg?style=flat)](https://www.versioneye.com/user/projects/54f4a2384f3108959a000a16)
 
-- 
GitLab


From 7b483dfcbef1d9b72f5cba96310cfa7fe501b112 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 21 Sep 2015 01:54:41 -0400
Subject: [PATCH 423/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/fr.js      | 4 ++--
 apps/encryption/l10n/fr.json    | 4 ++--
 apps/files_sharing/l10n/it.js   | 2 +-
 apps/files_sharing/l10n/it.json | 2 +-
 settings/l10n/it.js             | 2 +-
 settings/l10n/it.json           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index 0de35f8ec1c..3ee1c05ffa7 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -28,10 +28,10 @@ OC.L10N.register(
     "one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous.  ",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjour,\n\nL'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel.\n",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjour,\n\nL'administrateur a activé le chiffrement sur le serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecter dans l'interface web et aller dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là, mettez à jour votre mot de passe de chiffrement en entrant le mot de passe fourni dans ce message dans le champ \"Ancien mot de passe de connexion\", et votre mot de passe de connexion actuel.\n",
     "The share will expire on %s." : "Le partage expirera le %s.",
     "Cheers!" : "À bientôt !",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>. <br><br>Veuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel. <br><br>",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement sur le serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>.<br><br>\nVeuillez vous connecter dans l'interface web et aller dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là, mettez à jour votre mot de passe de chiffrement en entrant le mot de passe fourni dans ce message dans le champ \"Ancien mot de passe de connexion\", et votre mot de passe de connexion actuel.<br><br>",
     "Enable recovery key" : "Activer la clé de récupération",
     "Disable recovery key" : "Désactiver la clé de récupération",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index 3fa598a72ce..3694682d8bc 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -26,10 +26,10 @@
     "one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous.  ",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjour,\n\nL'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel.\n",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjour,\n\nL'administrateur a activé le chiffrement sur le serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecter dans l'interface web et aller dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là, mettez à jour votre mot de passe de chiffrement en entrant le mot de passe fourni dans ce message dans le champ \"Ancien mot de passe de connexion\", et votre mot de passe de connexion actuel.\n",
     "The share will expire on %s." : "Le partage expirera le %s.",
     "Cheers!" : "À bientôt !",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>. <br><br>Veuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel. <br><br>",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement sur le serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>.<br><br>\nVeuillez vous connecter dans l'interface web et aller dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là, mettez à jour votre mot de passe de chiffrement en entrant le mot de passe fourni dans ce message dans le champ \"Ancien mot de passe de connexion\", et votre mot de passe de connexion actuel.<br><br>",
     "Enable recovery key" : "Activer la clé de récupération",
     "Disable recovery key" : "Désactiver la clé de récupération",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 6aa6ab5b78b..d6fcab9c788 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -49,7 +49,7 @@ OC.L10N.register(
     "Decline" : "Rifiuta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud",
-    "This share is password-protected" : "Questa condivione è protetta da password",
+    "This share is password-protected" : "Questa condivisione è protetta da password",
     "The password is wrong. Try again." : "La password è errata. Prova ancora.",
     "Password" : "Password",
     "No entries found in this folder" : "Nessuna voce trovata in questa cartella",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index d70c97ea933..1ae87296032 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -47,7 +47,7 @@
     "Decline" : "Rifiuta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud",
-    "This share is password-protected" : "Questa condivione è protetta da password",
+    "This share is password-protected" : "Questa condivisione è protetta da password",
     "The password is wrong. Try again." : "La password è errata. Prova ancora.",
     "Password" : "Password",
     "No entries found in this folder" : "Nessuna voce trovata in questa cartella",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 4e6fab34c74..4279a8d41ca 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -136,7 +136,7 @@ OC.L10N.register(
     "All checks passed." : "Tutti i controlli passati.",
     "Open documentation" : "Apri la documentazione",
     "Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
-    "Allow users to share via link" : "Consenti agli utenti di condivere tramite collegamento",
+    "Allow users to share via link" : "Consenti agli utenti di condividere tramite collegamento",
     "Enforce password protection" : "Imponi la protezione con password",
     "Allow public uploads" : "Consenti caricamenti pubblici",
     "Allow users to send mail notification for shared files" : "Consenti agli utenti di inviare email di notifica per i file condivisi",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 9c2d6fd6a91..416d5706280 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -134,7 +134,7 @@
     "All checks passed." : "Tutti i controlli passati.",
     "Open documentation" : "Apri la documentazione",
     "Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
-    "Allow users to share via link" : "Consenti agli utenti di condivere tramite collegamento",
+    "Allow users to share via link" : "Consenti agli utenti di condividere tramite collegamento",
     "Enforce password protection" : "Imponi la protezione con password",
     "Allow public uploads" : "Consenti caricamenti pubblici",
     "Allow users to send mail notification for shared files" : "Consenti agli utenti di inviare email di notifica per i file condivisi",
-- 
GitLab


From f2a1e5bd2be4d04d973cd9799ead8883fab38f2e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 21 Sep 2015 11:15:02 +0200
Subject: [PATCH 424/783] Bump 3rdparty reference

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 6b6575b04c0..338ab170afc 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 6b6575b04c01e30e5f38dbb373fd5166cce0ef54
+Subproject commit 338ab170afcb4770e79cc4427a9803cb29a0a230
-- 
GitLab


From 0f2865abb29e0e910d516703b589c02c792790f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 21 Aug 2015 17:31:58 +0200
Subject: [PATCH 425/783] Repeated calls to loginWithApache() should not not
 try to set user information in the session again

---
 lib/private/user.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/private/user.php b/lib/private/user.php
index 92807246144..e70734ece40 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -277,11 +277,13 @@ class OC_User {
 		OC_Hook::emit("OC_User", "pre_login", array("run" => &$run, "uid" => $uid));
 
 		if ($uid) {
-			self::setUserId($uid);
-			self::setDisplayName($uid);
-			self::getUserSession()->setLoginName($uid);
+			if (self::getUser() !== $uid) {
+				self::setUserId($uid);
+				self::setDisplayName($uid);
+				self::getUserSession()->setLoginName($uid);
 
-			OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => ''));
+				OC_Hook::emit("OC_User", "post_login", array("uid" => $uid, 'password' => ''));
+			}
 			return true;
 		}
 		return false;
-- 
GitLab


From a174ba5a36cff8fa2230a0c10c849ddcdb71ded4 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 21 Sep 2015 11:41:26 +0200
Subject: [PATCH 426/783] make sure to add the correct file size to the file
 info, otherwise we will not show the preview for every filetype

---
 apps/files_trashbin/lib/helper.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index f51185712a9..0baa2b5414b 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -65,11 +65,14 @@ class Helper
 				if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
 					$id = $entryName;
 					if ($dir === '' || $dir === '/') {
+						$size = $view->filesize($id);
 						$pathparts = pathinfo($entryName);
 						$timestamp = substr($pathparts['extension'], 1);
 						$id = $pathparts['filename'];
+
 					} else if ($timestamp === null) {
 						// for subfolders we need to calculate the timestamp only once
+						$size = $view->filesize($dir . '/' . $id);
 						$parts = explode('/', ltrim($dir, '/'));
 						$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
 					}
@@ -86,6 +89,7 @@ class Helper
 						'mimetype' => $view->is_dir($dir . '/' . $entryName) ? 'httpd/unix-directory' : \OC_Helper::getFileNameMimeType($id),
 						'type' => $view->is_dir($dir . '/' . $entryName) ? 'dir' : 'file',
 						'directory' => ($dir === '/') ? '' : $dir,
+						'size' => $size,
 					);
 					if ($originalPath) {
 						$i['extraData'] = $originalPath.'/'.$id;
-- 
GitLab


From 964cfc8e08467c93e18d78ab20f311d05b22eeb9 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Sat, 19 Sep 2015 15:44:49 +0200
Subject: [PATCH 427/783] fix missing checkboxes in file comparator

---
 apps/files/templates/fileexists.html | 12 ++++++++----
 core/css/styles.css                  |  2 ++
 core/js/oc-dialogs.js                |  5 +++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html
index 5360a7c8e8f..c783f9a05c7 100644
--- a/apps/files/templates/fileexists.html
+++ b/apps/files/templates/fileexists.html
@@ -3,24 +3,28 @@
 	<span class="what">{what}<!-- If you select both versions, the copied file will have a number added to its name. --></span><br/>
 	<br/>
 	<table>
-		<th><label><input class="allnewfiles" type="checkbox" />{allnewfiles}<span class="count"></span></label></th>
-		<th><label><input class="allexistingfiles" type="checkbox" />{allexistingfiles}<span class="count"></span></label></th>
+		<th><input id="checkbox-allnewfiles" class="allnewfiles" type="checkbox" /><label for="checkbox-allnewfiles">{allnewfiles}<span class="count"></span></label></th>
+		<th><input id="checkbox-allexistingfiles" class="allexistingfiles" type="checkbox" /><label for="checkbox-allexistingfiles">{allexistingfiles}<span class="count"></span></label></th>
 	</table>
 	<div class="conflicts">
 		<div class="template">
 			<div class="filename"></div>
 			<div class="replacement">
-				<input type="checkbox" />
+				<input type="checkbox" class="u-left"/>
+				<label>
 				<span class="svg icon"></span>
 				<div class="mtime"></div>
 				<div class="size"></div>
+				</label>
 			</div>
 			<div class="original">
-				<input type="checkbox" />
+				<input type="checkbox" class="u-left" />
+				<label>
 				<span class="svg icon"></span>
 				<div class="mtime"></div>
 				<div class="size"></div>
 				<div class="message"></div>
+				</label>
 			</div>
 		</div>
 	</div>
diff --git a/core/css/styles.css b/core/css/styles.css
index 2ec5129a1c5..bc4db43301d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -178,6 +178,8 @@ input[type="checkbox"] + label:before {
 	opacity: 0.7;
 }
 
+input[type="checkbox"].u-left +label:before { float: left; }
+
 input[type="checkbox"].white + label:before {
 	background-image: url('../img/actions/checkbox-white.svg');
 }
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 52ed34f61ec..719ac8587a4 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -400,6 +400,11 @@ var OCdialogs = {
 					$replacementDiv.find('.icon').css('background-image','url(' + path + ')');
 				}
 			);
+			// connect checkboxes with labels
+			var checkboxId = $conflicts.find('.conflict').length;
+			$originalDiv.find('input:checkbox').attr('id', 'checkbox_original_'+checkboxId);
+			$replacementDiv.find('input:checkbox').attr('id', 'checkbox_replacement_'+checkboxId);
+
 			$conflicts.append($conflict);
 
 			//set more recent mtime bold
-- 
GitLab


From 976942bb61e2c758b91de52c23925cb03e3a4cbd Mon Sep 17 00:00:00 2001
From: Individual IT Services <info@individual-it.net>
Date: Mon, 21 Sep 2015 17:01:50 +0545
Subject: [PATCH 428/783] re initialize OC.Share.currentShares
 OC.Share.itemShares

otherwise old values are kept.
fix for #19164
---
 core/js/shareitemmodel.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index ff0d3a6d800..3ed10afd149 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -618,6 +618,8 @@
 			var fileId = this.fileInfoModel.get('id');
 			if (!shares || !shares.length) {
 				delete OC.Share.statuses[fileId];
+				OC.Share.currentShares = {};
+				OC.Share.itemShares = [];
 				return;
 			}
 
-- 
GitLab


From d2e90b6050d1c26cb365c81e987ccc1577ae56d0 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 21 Sep 2015 13:13:38 +0200
Subject: [PATCH 429/783] improved error message if user doesn't exists

---
 lib/private/encryption/decryptall.php   |  5 +++++
 tests/lib/encryption/decryptalltest.php | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/lib/private/encryption/decryptall.php b/lib/private/encryption/decryptall.php
index e59be17886d..1ff9c74ef84 100644
--- a/lib/private/encryption/decryptall.php
+++ b/lib/private/encryption/decryptall.php
@@ -80,6 +80,11 @@ class DecryptAll {
 		$this->input = $input;
 		$this->output = $output;
 
+		if ($user !== '' && $this->userManager->userExists($user) === false) {
+			$this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
+			return false;
+		}
+
 		$this->output->writeln('prepare encryption modules...');
 		if ($this->prepareEncryptionModules($user) === false) {
 			return false;
diff --git a/tests/lib/encryption/decryptalltest.php b/tests/lib/encryption/decryptalltest.php
index eb3bc721f86..c2a0711c0a0 100644
--- a/tests/lib/encryption/decryptalltest.php
+++ b/tests/lib/encryption/decryptalltest.php
@@ -80,11 +80,13 @@ class DecryptAllTest extends TestCase {
 
 	/**
 	 * @dataProvider dataTrueFalse
+	 * @param bool $prepareResult
 	 */
 	public function testDecryptAll($prepareResult) {
 
 		$user = 'user1';
 
+		$this->userManager->expects($this->once())->method('userExists')->willReturn(true);
 		/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject |  $instance */
 		$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
 			->setConstructorArgs(
@@ -120,6 +122,19 @@ class DecryptAllTest extends TestCase {
 		];
 	}
 
+	/**
+	 * test decrypt all call with a user who doesn't exists
+	 */
+	public function testDecryptAllWrongUser() {
+		$this->userManager->expects($this->once())->method('userExists')->willReturn(false);
+		$this->outputInterface->expects($this->once())->method('writeln')
+			->with('User "user1" does not exist. Please check the username and try again');
+
+		$this->assertFalse(
+			$this->instance->decryptAll($this->inputInterface, $this->outputInterface, 'user1')
+		);
+	}
+
 	/**
 	 * @dataProvider dataTrueFalse
 	 */
-- 
GitLab


From 4ecf710dcd071f0282d54a5a3cf59102790da69f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 2 Jul 2015 16:31:10 +0200
Subject: [PATCH 430/783] dont download the existing file for webdav if we're
 going to overwrite it

---
 lib/private/files/storage/dav.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index c1cf17abdee..171afd649c6 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -370,6 +370,7 @@ class DAV extends Common {
 			case 'c':
 			case 'c+':
 				//emulate these
+				$tempManager = \OC::$server->getTempManager();
 				if (strrpos($path, '.') !== false) {
 					$ext = substr($path, strrpos($path, '.'));
 				} else {
@@ -379,12 +380,16 @@ class DAV extends Common {
 					if (!$this->isUpdatable($path)) {
 						return false;
 					}
-					$tmpFile = $this->getCachedFile($path);
+					if ($mode === 'w' or $mode === 'w+') {
+						$tmpFile = $tempManager->getTemporaryFile($ext);
+					} else {
+						$tmpFile = $this->getCachedFile($path);
+					}
 				} else {
 					if (!$this->isCreatable(dirname($path))) {
 						return false;
 					}
-					$tmpFile = Files::tmpFile($ext);
+					$tmpFile = $tempManager->getTemporaryFile($ext);
 				}
 				Close::registerCallback($tmpFile, array($this, 'writeBack'));
 				self::$tempFiles[$tmpFile] = $path;
-- 
GitLab


From 03e05d5dbcd0f87b7a0a6b8720189d8f5ba311bf Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 21 Sep 2015 13:30:04 +0200
Subject: [PATCH 431/783] improve description and help output for the
 encrypt-all and decrypt-all command

---
 core/command/encryption/decryptall.php | 3 ++-
 core/command/encryption/encryptall.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php
index c71ba5f04c7..a8560ce88bb 100644
--- a/core/command/encryption/decryptall.php
+++ b/core/command/encryption/decryptall.php
@@ -101,7 +101,8 @@ class DecryptAll extends Command {
 		parent::configure();
 
 		$this->setName('encryption:decrypt-all');
-		$this->setDescription(
+		$this->setDescription('Disable server-side encryption and decrypt all files');
+		$this->setHelp(
 			'This will disable server-side encryption and decrypt all files for '
 			. 'all users if it is supported by your encryption module. '
 			. 'Please make sure that no user access his files during this process!'
diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 4ae6ae47836..8294264f212 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -93,7 +93,8 @@ class EncryptAll extends Command {
 		parent::configure();
 
 		$this->setName('encryption:encrypt-all');
-		$this->setDescription(
+		$this->setDescription('Encrypt all files for all users');
+		$this->setHelp(
 			'This will encrypt all files for all users. '
 			. 'Please make sure that no user access his files during this process!'
 		);
-- 
GitLab


From daf5d1ff2ead7697b94a85adbdfec7f783bec0f9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 21 Sep 2015 13:35:07 +0200
Subject: [PATCH 432/783] fix small typo

---
 apps/encryption/lib/crypto/decryptall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/encryption/lib/crypto/decryptall.php b/apps/encryption/lib/crypto/decryptall.php
index 599cd82aa4d..d7cd422c5e9 100644
--- a/apps/encryption/lib/crypto/decryptall.php
+++ b/apps/encryption/lib/crypto/decryptall.php
@@ -90,7 +90,7 @@ class DecryptAll {
 			);
 			$useLoginPassword = $this->questionHelper->ask($input, $output, $questionUseLoginPassword);
 			if ($useLoginPassword) {
-				$question = new Question('Please enter the users login password: ');
+				$question = new Question('Please enter the user\'s login password: ');
 			} else if ($this->util->isRecoveryEnabledForUser($user) === false) {
 				$output->writeln('No recovery key available for user ' . $user);
 				return false;
-- 
GitLab


From b1f05ef1f36cff5f0bc50f79a05b2393233efe46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 21 Sep 2015 17:24:30 +0200
Subject: [PATCH 433/783] Move WebDAVAuth to User_External

---
 apps/user_webdavauth/appinfo/app.php        |  39 --------
 apps/user_webdavauth/appinfo/info.xml       |  15 ---
 apps/user_webdavauth/appinfo/version        |   1 -
 apps/user_webdavauth/img/app.svg            |   5 -
 apps/user_webdavauth/l10n/.gitkeep          |   0
 apps/user_webdavauth/l10n/ar.js             |   9 --
 apps/user_webdavauth/l10n/ar.json           |   7 --
 apps/user_webdavauth/l10n/ast.js            |   9 --
 apps/user_webdavauth/l10n/ast.json          |   7 --
 apps/user_webdavauth/l10n/az.js             |   9 --
 apps/user_webdavauth/l10n/az.json           |   7 --
 apps/user_webdavauth/l10n/bg_BG.js          |   9 --
 apps/user_webdavauth/l10n/bg_BG.json        |   7 --
 apps/user_webdavauth/l10n/bn_BD.js          |   9 --
 apps/user_webdavauth/l10n/bn_BD.json        |   7 --
 apps/user_webdavauth/l10n/bn_IN.js          |   9 --
 apps/user_webdavauth/l10n/bn_IN.json        |   7 --
 apps/user_webdavauth/l10n/bs.js             |   9 --
 apps/user_webdavauth/l10n/bs.json           |   7 --
 apps/user_webdavauth/l10n/ca.js             |   9 --
 apps/user_webdavauth/l10n/ca.json           |   7 --
 apps/user_webdavauth/l10n/cs_CZ.js          |   9 --
 apps/user_webdavauth/l10n/cs_CZ.json        |   7 --
 apps/user_webdavauth/l10n/cy_GB.js          |   6 --
 apps/user_webdavauth/l10n/cy_GB.json        |   4 -
 apps/user_webdavauth/l10n/da.js             |   9 --
 apps/user_webdavauth/l10n/da.json           |   7 --
 apps/user_webdavauth/l10n/de.js             |   9 --
 apps/user_webdavauth/l10n/de.json           |   7 --
 apps/user_webdavauth/l10n/de_AT.js          |   6 --
 apps/user_webdavauth/l10n/de_AT.json        |   4 -
 apps/user_webdavauth/l10n/de_DE.js          |   9 --
 apps/user_webdavauth/l10n/de_DE.json        |   7 --
 apps/user_webdavauth/l10n/el.js             |   9 --
 apps/user_webdavauth/l10n/el.json           |   7 --
 apps/user_webdavauth/l10n/en_GB.js          |   9 --
 apps/user_webdavauth/l10n/en_GB.json        |   7 --
 apps/user_webdavauth/l10n/eo.js             |   7 --
 apps/user_webdavauth/l10n/eo.json           |   5 -
 apps/user_webdavauth/l10n/es.js             |   9 --
 apps/user_webdavauth/l10n/es.json           |   7 --
 apps/user_webdavauth/l10n/es_AR.js          |   8 --
 apps/user_webdavauth/l10n/es_AR.json        |   6 --
 apps/user_webdavauth/l10n/es_MX.js          |   8 --
 apps/user_webdavauth/l10n/es_MX.json        |   6 --
 apps/user_webdavauth/l10n/et_EE.js          |   9 --
 apps/user_webdavauth/l10n/et_EE.json        |   7 --
 apps/user_webdavauth/l10n/eu.js             |   9 --
 apps/user_webdavauth/l10n/eu.json           |   7 --
 apps/user_webdavauth/l10n/fa.js             |   9 --
 apps/user_webdavauth/l10n/fa.json           |   7 --
 apps/user_webdavauth/l10n/fi_FI.js          |   9 --
 apps/user_webdavauth/l10n/fi_FI.json        |   7 --
 apps/user_webdavauth/l10n/fr.js             |   9 --
 apps/user_webdavauth/l10n/fr.json           |   7 --
 apps/user_webdavauth/l10n/gl.js             |   9 --
 apps/user_webdavauth/l10n/gl.json           |   7 --
 apps/user_webdavauth/l10n/he.js             |   7 --
 apps/user_webdavauth/l10n/he.json           |   5 -
 apps/user_webdavauth/l10n/hi.js             |   6 --
 apps/user_webdavauth/l10n/hi.json           |   4 -
 apps/user_webdavauth/l10n/hr.js             |   9 --
 apps/user_webdavauth/l10n/hr.json           |   7 --
 apps/user_webdavauth/l10n/hu_HU.js          |   9 --
 apps/user_webdavauth/l10n/hu_HU.json        |   7 --
 apps/user_webdavauth/l10n/hy.js             |   8 --
 apps/user_webdavauth/l10n/hy.json           |   6 --
 apps/user_webdavauth/l10n/ia.js             |   6 --
 apps/user_webdavauth/l10n/ia.json           |   4 -
 apps/user_webdavauth/l10n/id.js             |   9 --
 apps/user_webdavauth/l10n/id.json           |   7 --
 apps/user_webdavauth/l10n/is.js             |   9 --
 apps/user_webdavauth/l10n/is.json           |   7 --
 apps/user_webdavauth/l10n/it.js             |   9 --
 apps/user_webdavauth/l10n/it.json           |   7 --
 apps/user_webdavauth/l10n/ja.js             |   9 --
 apps/user_webdavauth/l10n/ja.json           |   7 --
 apps/user_webdavauth/l10n/ka_GE.js          |   7 --
 apps/user_webdavauth/l10n/ka_GE.json        |   5 -
 apps/user_webdavauth/l10n/km.js             |   8 --
 apps/user_webdavauth/l10n/km.json           |   6 --
 apps/user_webdavauth/l10n/kn.js             |   6 --
 apps/user_webdavauth/l10n/kn.json           |   4 -
 apps/user_webdavauth/l10n/ko.js             |   9 --
 apps/user_webdavauth/l10n/ko.json           |   7 --
 apps/user_webdavauth/l10n/ku_IQ.js          |   6 --
 apps/user_webdavauth/l10n/ku_IQ.json        |   4 -
 apps/user_webdavauth/l10n/lb.js             |   6 --
 apps/user_webdavauth/l10n/lb.json           |   4 -
 apps/user_webdavauth/l10n/lt_LT.js          |   9 --
 apps/user_webdavauth/l10n/lt_LT.json        |   7 --
 apps/user_webdavauth/l10n/lv.js             |   7 --
 apps/user_webdavauth/l10n/lv.json           |   5 -
 apps/user_webdavauth/l10n/mk.js             |   6 --
 apps/user_webdavauth/l10n/mk.json           |   4 -
 apps/user_webdavauth/l10n/mn.js             |   8 --
 apps/user_webdavauth/l10n/mn.json           |   6 --
 apps/user_webdavauth/l10n/ms_MY.js          |   9 --
 apps/user_webdavauth/l10n/ms_MY.json        |   7 --
 apps/user_webdavauth/l10n/nb_NO.js          |   9 --
 apps/user_webdavauth/l10n/nb_NO.json        |   7 --
 apps/user_webdavauth/l10n/nl.js             |   9 --
 apps/user_webdavauth/l10n/nl.json           |   7 --
 apps/user_webdavauth/l10n/nn_NO.js          |   8 --
 apps/user_webdavauth/l10n/nn_NO.json        |   6 --
 apps/user_webdavauth/l10n/oc.js             |   9 --
 apps/user_webdavauth/l10n/oc.json           |   7 --
 apps/user_webdavauth/l10n/pl.js             |   9 --
 apps/user_webdavauth/l10n/pl.json           |   7 --
 apps/user_webdavauth/l10n/pt_BR.js          |   9 --
 apps/user_webdavauth/l10n/pt_BR.json        |   7 --
 apps/user_webdavauth/l10n/pt_PT.js          |   9 --
 apps/user_webdavauth/l10n/pt_PT.json        |   7 --
 apps/user_webdavauth/l10n/ro.js             |   8 --
 apps/user_webdavauth/l10n/ro.json           |   6 --
 apps/user_webdavauth/l10n/ru.js             |   9 --
 apps/user_webdavauth/l10n/ru.json           |   7 --
 apps/user_webdavauth/l10n/si_LK.js          |   6 --
 apps/user_webdavauth/l10n/si_LK.json        |   4 -
 apps/user_webdavauth/l10n/sk_SK.js          |   9 --
 apps/user_webdavauth/l10n/sk_SK.json        |   7 --
 apps/user_webdavauth/l10n/sl.js             |   9 --
 apps/user_webdavauth/l10n/sl.json           |   7 --
 apps/user_webdavauth/l10n/sq.js             |   6 --
 apps/user_webdavauth/l10n/sq.json           |   4 -
 apps/user_webdavauth/l10n/sr.js             |   9 --
 apps/user_webdavauth/l10n/sr.json           |   7 --
 apps/user_webdavauth/l10n/sr@latin.js       |   9 --
 apps/user_webdavauth/l10n/sr@latin.json     |   7 --
 apps/user_webdavauth/l10n/sv.js             |   9 --
 apps/user_webdavauth/l10n/sv.json           |   7 --
 apps/user_webdavauth/l10n/ta_LK.js          |   6 --
 apps/user_webdavauth/l10n/ta_LK.json        |   4 -
 apps/user_webdavauth/l10n/te.js             |   6 --
 apps/user_webdavauth/l10n/te.json           |   4 -
 apps/user_webdavauth/l10n/th_TH.js          |   9 --
 apps/user_webdavauth/l10n/th_TH.json        |   7 --
 apps/user_webdavauth/l10n/tr.js             |   9 --
 apps/user_webdavauth/l10n/tr.json           |   7 --
 apps/user_webdavauth/l10n/ug.js             |   7 --
 apps/user_webdavauth/l10n/ug.json           |   5 -
 apps/user_webdavauth/l10n/uk.js             |   9 --
 apps/user_webdavauth/l10n/uk.json           |   7 --
 apps/user_webdavauth/l10n/ur_PK.js          |   6 --
 apps/user_webdavauth/l10n/ur_PK.json        |   4 -
 apps/user_webdavauth/l10n/vi.js             |   9 --
 apps/user_webdavauth/l10n/vi.json           |   7 --
 apps/user_webdavauth/l10n/zh_CN.js          |   9 --
 apps/user_webdavauth/l10n/zh_CN.json        |   7 --
 apps/user_webdavauth/l10n/zh_HK.js          |   9 --
 apps/user_webdavauth/l10n/zh_HK.json        |   7 --
 apps/user_webdavauth/l10n/zh_TW.js          |   8 --
 apps/user_webdavauth/l10n/zh_TW.json        |   6 --
 apps/user_webdavauth/settings.php           |  41 --------
 apps/user_webdavauth/templates/settings.php |   7 --
 apps/user_webdavauth/user_webdavauth.php    | 101 --------------------
 156 files changed, 1279 deletions(-)
 delete mode 100644 apps/user_webdavauth/appinfo/app.php
 delete mode 100644 apps/user_webdavauth/appinfo/info.xml
 delete mode 100644 apps/user_webdavauth/appinfo/version
 delete mode 100644 apps/user_webdavauth/img/app.svg
 delete mode 100644 apps/user_webdavauth/l10n/.gitkeep
 delete mode 100644 apps/user_webdavauth/l10n/ar.js
 delete mode 100644 apps/user_webdavauth/l10n/ar.json
 delete mode 100644 apps/user_webdavauth/l10n/ast.js
 delete mode 100644 apps/user_webdavauth/l10n/ast.json
 delete mode 100644 apps/user_webdavauth/l10n/az.js
 delete mode 100644 apps/user_webdavauth/l10n/az.json
 delete mode 100644 apps/user_webdavauth/l10n/bg_BG.js
 delete mode 100644 apps/user_webdavauth/l10n/bg_BG.json
 delete mode 100644 apps/user_webdavauth/l10n/bn_BD.js
 delete mode 100644 apps/user_webdavauth/l10n/bn_BD.json
 delete mode 100644 apps/user_webdavauth/l10n/bn_IN.js
 delete mode 100644 apps/user_webdavauth/l10n/bn_IN.json
 delete mode 100644 apps/user_webdavauth/l10n/bs.js
 delete mode 100644 apps/user_webdavauth/l10n/bs.json
 delete mode 100644 apps/user_webdavauth/l10n/ca.js
 delete mode 100644 apps/user_webdavauth/l10n/ca.json
 delete mode 100644 apps/user_webdavauth/l10n/cs_CZ.js
 delete mode 100644 apps/user_webdavauth/l10n/cs_CZ.json
 delete mode 100644 apps/user_webdavauth/l10n/cy_GB.js
 delete mode 100644 apps/user_webdavauth/l10n/cy_GB.json
 delete mode 100644 apps/user_webdavauth/l10n/da.js
 delete mode 100644 apps/user_webdavauth/l10n/da.json
 delete mode 100644 apps/user_webdavauth/l10n/de.js
 delete mode 100644 apps/user_webdavauth/l10n/de.json
 delete mode 100644 apps/user_webdavauth/l10n/de_AT.js
 delete mode 100644 apps/user_webdavauth/l10n/de_AT.json
 delete mode 100644 apps/user_webdavauth/l10n/de_DE.js
 delete mode 100644 apps/user_webdavauth/l10n/de_DE.json
 delete mode 100644 apps/user_webdavauth/l10n/el.js
 delete mode 100644 apps/user_webdavauth/l10n/el.json
 delete mode 100644 apps/user_webdavauth/l10n/en_GB.js
 delete mode 100644 apps/user_webdavauth/l10n/en_GB.json
 delete mode 100644 apps/user_webdavauth/l10n/eo.js
 delete mode 100644 apps/user_webdavauth/l10n/eo.json
 delete mode 100644 apps/user_webdavauth/l10n/es.js
 delete mode 100644 apps/user_webdavauth/l10n/es.json
 delete mode 100644 apps/user_webdavauth/l10n/es_AR.js
 delete mode 100644 apps/user_webdavauth/l10n/es_AR.json
 delete mode 100644 apps/user_webdavauth/l10n/es_MX.js
 delete mode 100644 apps/user_webdavauth/l10n/es_MX.json
 delete mode 100644 apps/user_webdavauth/l10n/et_EE.js
 delete mode 100644 apps/user_webdavauth/l10n/et_EE.json
 delete mode 100644 apps/user_webdavauth/l10n/eu.js
 delete mode 100644 apps/user_webdavauth/l10n/eu.json
 delete mode 100644 apps/user_webdavauth/l10n/fa.js
 delete mode 100644 apps/user_webdavauth/l10n/fa.json
 delete mode 100644 apps/user_webdavauth/l10n/fi_FI.js
 delete mode 100644 apps/user_webdavauth/l10n/fi_FI.json
 delete mode 100644 apps/user_webdavauth/l10n/fr.js
 delete mode 100644 apps/user_webdavauth/l10n/fr.json
 delete mode 100644 apps/user_webdavauth/l10n/gl.js
 delete mode 100644 apps/user_webdavauth/l10n/gl.json
 delete mode 100644 apps/user_webdavauth/l10n/he.js
 delete mode 100644 apps/user_webdavauth/l10n/he.json
 delete mode 100644 apps/user_webdavauth/l10n/hi.js
 delete mode 100644 apps/user_webdavauth/l10n/hi.json
 delete mode 100644 apps/user_webdavauth/l10n/hr.js
 delete mode 100644 apps/user_webdavauth/l10n/hr.json
 delete mode 100644 apps/user_webdavauth/l10n/hu_HU.js
 delete mode 100644 apps/user_webdavauth/l10n/hu_HU.json
 delete mode 100644 apps/user_webdavauth/l10n/hy.js
 delete mode 100644 apps/user_webdavauth/l10n/hy.json
 delete mode 100644 apps/user_webdavauth/l10n/ia.js
 delete mode 100644 apps/user_webdavauth/l10n/ia.json
 delete mode 100644 apps/user_webdavauth/l10n/id.js
 delete mode 100644 apps/user_webdavauth/l10n/id.json
 delete mode 100644 apps/user_webdavauth/l10n/is.js
 delete mode 100644 apps/user_webdavauth/l10n/is.json
 delete mode 100644 apps/user_webdavauth/l10n/it.js
 delete mode 100644 apps/user_webdavauth/l10n/it.json
 delete mode 100644 apps/user_webdavauth/l10n/ja.js
 delete mode 100644 apps/user_webdavauth/l10n/ja.json
 delete mode 100644 apps/user_webdavauth/l10n/ka_GE.js
 delete mode 100644 apps/user_webdavauth/l10n/ka_GE.json
 delete mode 100644 apps/user_webdavauth/l10n/km.js
 delete mode 100644 apps/user_webdavauth/l10n/km.json
 delete mode 100644 apps/user_webdavauth/l10n/kn.js
 delete mode 100644 apps/user_webdavauth/l10n/kn.json
 delete mode 100644 apps/user_webdavauth/l10n/ko.js
 delete mode 100644 apps/user_webdavauth/l10n/ko.json
 delete mode 100644 apps/user_webdavauth/l10n/ku_IQ.js
 delete mode 100644 apps/user_webdavauth/l10n/ku_IQ.json
 delete mode 100644 apps/user_webdavauth/l10n/lb.js
 delete mode 100644 apps/user_webdavauth/l10n/lb.json
 delete mode 100644 apps/user_webdavauth/l10n/lt_LT.js
 delete mode 100644 apps/user_webdavauth/l10n/lt_LT.json
 delete mode 100644 apps/user_webdavauth/l10n/lv.js
 delete mode 100644 apps/user_webdavauth/l10n/lv.json
 delete mode 100644 apps/user_webdavauth/l10n/mk.js
 delete mode 100644 apps/user_webdavauth/l10n/mk.json
 delete mode 100644 apps/user_webdavauth/l10n/mn.js
 delete mode 100644 apps/user_webdavauth/l10n/mn.json
 delete mode 100644 apps/user_webdavauth/l10n/ms_MY.js
 delete mode 100644 apps/user_webdavauth/l10n/ms_MY.json
 delete mode 100644 apps/user_webdavauth/l10n/nb_NO.js
 delete mode 100644 apps/user_webdavauth/l10n/nb_NO.json
 delete mode 100644 apps/user_webdavauth/l10n/nl.js
 delete mode 100644 apps/user_webdavauth/l10n/nl.json
 delete mode 100644 apps/user_webdavauth/l10n/nn_NO.js
 delete mode 100644 apps/user_webdavauth/l10n/nn_NO.json
 delete mode 100644 apps/user_webdavauth/l10n/oc.js
 delete mode 100644 apps/user_webdavauth/l10n/oc.json
 delete mode 100644 apps/user_webdavauth/l10n/pl.js
 delete mode 100644 apps/user_webdavauth/l10n/pl.json
 delete mode 100644 apps/user_webdavauth/l10n/pt_BR.js
 delete mode 100644 apps/user_webdavauth/l10n/pt_BR.json
 delete mode 100644 apps/user_webdavauth/l10n/pt_PT.js
 delete mode 100644 apps/user_webdavauth/l10n/pt_PT.json
 delete mode 100644 apps/user_webdavauth/l10n/ro.js
 delete mode 100644 apps/user_webdavauth/l10n/ro.json
 delete mode 100644 apps/user_webdavauth/l10n/ru.js
 delete mode 100644 apps/user_webdavauth/l10n/ru.json
 delete mode 100644 apps/user_webdavauth/l10n/si_LK.js
 delete mode 100644 apps/user_webdavauth/l10n/si_LK.json
 delete mode 100644 apps/user_webdavauth/l10n/sk_SK.js
 delete mode 100644 apps/user_webdavauth/l10n/sk_SK.json
 delete mode 100644 apps/user_webdavauth/l10n/sl.js
 delete mode 100644 apps/user_webdavauth/l10n/sl.json
 delete mode 100644 apps/user_webdavauth/l10n/sq.js
 delete mode 100644 apps/user_webdavauth/l10n/sq.json
 delete mode 100644 apps/user_webdavauth/l10n/sr.js
 delete mode 100644 apps/user_webdavauth/l10n/sr.json
 delete mode 100644 apps/user_webdavauth/l10n/sr@latin.js
 delete mode 100644 apps/user_webdavauth/l10n/sr@latin.json
 delete mode 100644 apps/user_webdavauth/l10n/sv.js
 delete mode 100644 apps/user_webdavauth/l10n/sv.json
 delete mode 100644 apps/user_webdavauth/l10n/ta_LK.js
 delete mode 100644 apps/user_webdavauth/l10n/ta_LK.json
 delete mode 100644 apps/user_webdavauth/l10n/te.js
 delete mode 100644 apps/user_webdavauth/l10n/te.json
 delete mode 100644 apps/user_webdavauth/l10n/th_TH.js
 delete mode 100644 apps/user_webdavauth/l10n/th_TH.json
 delete mode 100644 apps/user_webdavauth/l10n/tr.js
 delete mode 100644 apps/user_webdavauth/l10n/tr.json
 delete mode 100644 apps/user_webdavauth/l10n/ug.js
 delete mode 100644 apps/user_webdavauth/l10n/ug.json
 delete mode 100644 apps/user_webdavauth/l10n/uk.js
 delete mode 100644 apps/user_webdavauth/l10n/uk.json
 delete mode 100644 apps/user_webdavauth/l10n/ur_PK.js
 delete mode 100644 apps/user_webdavauth/l10n/ur_PK.json
 delete mode 100644 apps/user_webdavauth/l10n/vi.js
 delete mode 100644 apps/user_webdavauth/l10n/vi.json
 delete mode 100644 apps/user_webdavauth/l10n/zh_CN.js
 delete mode 100644 apps/user_webdavauth/l10n/zh_CN.json
 delete mode 100644 apps/user_webdavauth/l10n/zh_HK.js
 delete mode 100644 apps/user_webdavauth/l10n/zh_HK.json
 delete mode 100644 apps/user_webdavauth/l10n/zh_TW.js
 delete mode 100644 apps/user_webdavauth/l10n/zh_TW.json
 delete mode 100644 apps/user_webdavauth/settings.php
 delete mode 100644 apps/user_webdavauth/templates/settings.php
 delete mode 100644 apps/user_webdavauth/user_webdavauth.php

diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
deleted file mode 100644
index 3f76f803efd..00000000000
--- a/apps/user_webdavauth/appinfo/app.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * @author Felix Moeller <mail@felixmoeller.de>
- * @author Frank Karlitschek <frank@owncloud.org>
- * @author j-ed <juergen@eisfair.org>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-require_once OC_App::getAppPath('user_webdavauth').'/user_webdavauth.php';
-
-OC_APP::registerAdmin('user_webdavauth', 'settings');
-
-OC_User::registerBackend("WEBDAVAUTH");
-OC_User::useBackend( "WEBDAVAUTH" );
-
-// add settings page to navigation
-$entry = array(
-	'id' => "user_webdavauth_settings",
-	'order'=>1,
-	'href' => \OCP\Util::linkTo( "user_webdavauth", "settings.php" ),
-	'name' => 'WEBDAVAUTH'
-);
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
deleted file mode 100644
index b0827fb51f8..00000000000
--- a/apps/user_webdavauth/appinfo/info.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>user_webdavauth</id>
-	<name>User backend using remote HTTP servers</name>
-	<description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other web server to authenticate. It should return http 200 for right credentials and http 401 for wrong ones.
-
-	Attention: This app is not compatible with the LDAP user and group backend. This app is not the WebDAV interface of ownCloud, if you don't understand what it does then do not enable it.</description>
-	<licence>AGPL</licence>
-	<author>Frank Karlitschek</author>
-	<requiremin>4.93</requiremin>
-	<shipped>true</shipped>
-	<types>
-		<authentication/>
-	</types>
-</info>
diff --git a/apps/user_webdavauth/appinfo/version b/apps/user_webdavauth/appinfo/version
deleted file mode 100644
index a3fdef3af89..00000000000
--- a/apps/user_webdavauth/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-1.1.0.2
diff --git a/apps/user_webdavauth/img/app.svg b/apps/user_webdavauth/img/app.svg
deleted file mode 100644
index 0ce7ed867bd..00000000000
--- a/apps/user_webdavauth/img/app.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" fill="#fff" d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z"/>
-</svg>
diff --git a/apps/user_webdavauth/l10n/.gitkeep b/apps/user_webdavauth/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/apps/user_webdavauth/l10n/ar.js b/apps/user_webdavauth/l10n/ar.js
deleted file mode 100644
index 4b78f99ec6f..00000000000
--- a/apps/user_webdavauth/l10n/ar.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "تأكد شخصية ال WebDAV",
-    "Address:" : "العنوان:",
-    "Save" : "حفظ",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "سيتم إرسال معلومات المستخدم إلى هذا العنوان. يقوم هذا البرنامج بالتحقق من البيانات ويقوم بإعتبار رودود حالة HTTP برقم 401 و403 كمعلومات غير صحيحة, أما غيرها فسيعتبر صحيح."
-},
-"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/user_webdavauth/l10n/ar.json b/apps/user_webdavauth/l10n/ar.json
deleted file mode 100644
index d424faf0abc..00000000000
--- a/apps/user_webdavauth/l10n/ar.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "تأكد شخصية ال WebDAV",
-    "Address:" : "العنوان:",
-    "Save" : "حفظ",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "سيتم إرسال معلومات المستخدم إلى هذا العنوان. يقوم هذا البرنامج بالتحقق من البيانات ويقوم بإعتبار رودود حالة HTTP برقم 401 و403 كمعلومات غير صحيحة, أما غيرها فسيعتبر صحيح."
-},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ast.js b/apps/user_webdavauth/l10n/ast.js
deleted file mode 100644
index 87a890666cb..00000000000
--- a/apps/user_webdavauth/l10n/ast.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autenticación per aciu de WevDAV",
-    "Address:" : "Direición:",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les credenciales d'usuariu van unviase a esta direición. Esti complementu verifica la rempuesta y va interpretar los códigos de rempuesta HTTP 401 y 403 como credenciales inválides y toles otres rempuestes como credenciales válides."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ast.json b/apps/user_webdavauth/l10n/ast.json
deleted file mode 100644
index 52172d5afb9..00000000000
--- a/apps/user_webdavauth/l10n/ast.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autenticación per aciu de WevDAV",
-    "Address:" : "Direición:",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les credenciales d'usuariu van unviase a esta direición. Esti complementu verifica la rempuesta y va interpretar los códigos de rempuesta HTTP 401 y 403 como credenciales inválides y toles otres rempuestes como credenciales válides."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/az.js b/apps/user_webdavauth/l10n/az.js
deleted file mode 100644
index e39b9a160e0..00000000000
--- a/apps/user_webdavauth/l10n/az.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV qeydiyyatı",
-    "Address:" : "Ünvan: ",
-    "Save" : "Saxla",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "İstifadəçi verilənləri bu ünvana göndəriləcək. Bu əlavə imkan cavabı yoxlayır və HTTP status code-lari 401,403-ü yalnış verilənlər kimi interpretasiya edir. Bütün digər cavablar isə dügün verilənlərdir."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/az.json b/apps/user_webdavauth/l10n/az.json
deleted file mode 100644
index cd63759e75c..00000000000
--- a/apps/user_webdavauth/l10n/az.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV qeydiyyatı",
-    "Address:" : "Ünvan: ",
-    "Save" : "Saxla",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "İstifadəçi verilənləri bu ünvana göndəriləcək. Bu əlavə imkan cavabı yoxlayır və HTTP status code-lari 401,403-ü yalnış verilənlər kimi interpretasiya edir. Bütün digər cavablar isə dügün verilənlərdir."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/bg_BG.js b/apps/user_webdavauth/l10n/bg_BG.js
deleted file mode 100644
index 7a1272be90c..00000000000
--- a/apps/user_webdavauth/l10n/bg_BG.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV Идентификация",
-    "Address:" : "Адрес:",
-    "Save" : "Запиши",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Потребителското име и парола ще да бъдат изптатени до този адрес. Добавката ще провери отговора и ще интрепретира HTTP кодове 401 и 403 като невалидни, а всички останали като потвърдена идентификация."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/bg_BG.json b/apps/user_webdavauth/l10n/bg_BG.json
deleted file mode 100644
index 4ab9458e8e4..00000000000
--- a/apps/user_webdavauth/l10n/bg_BG.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV Идентификация",
-    "Address:" : "Адрес:",
-    "Save" : "Запиши",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Потребителското име и парола ще да бъдат изптатени до този адрес. Добавката ще провери отговора и ще интрепретира HTTP кодове 401 и 403 като невалидни, а всички останали като потвърдена идентификация."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/bn_BD.js b/apps/user_webdavauth/l10n/bn_BD.js
deleted file mode 100644
index 9773db8bef6..00000000000
--- a/apps/user_webdavauth/l10n/bn_BD.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV অনুমোদন",
-    "Address:" : "ঠিকানা",
-    "Save" : "সংরক্ষণ",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ব্যবহারকারীর তথ্যাদি এই ঠিকানায় পাঠানো হবে। এই প্লাগইন প্রত্যুত্তর পরীক্ষা করে দেখবে এবং HTTP statuscodes 401 and 403 কে অবৈধ তথ্যাদিরূপে অনুবাদ করে অন্য সকল প্রত্যুত্তরকে বৈধতা দেবে। "
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/bn_BD.json b/apps/user_webdavauth/l10n/bn_BD.json
deleted file mode 100644
index cda6cf08e31..00000000000
--- a/apps/user_webdavauth/l10n/bn_BD.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV অনুমোদন",
-    "Address:" : "ঠিকানা",
-    "Save" : "সংরক্ষণ",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ব্যবহারকারীর তথ্যাদি এই ঠিকানায় পাঠানো হবে। এই প্লাগইন প্রত্যুত্তর পরীক্ষা করে দেখবে এবং HTTP statuscodes 401 and 403 কে অবৈধ তথ্যাদিরূপে অনুবাদ করে অন্য সকল প্রত্যুত্তরকে বৈধতা দেবে। "
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/bn_IN.js b/apps/user_webdavauth/l10n/bn_IN.js
deleted file mode 100644
index 6790de24520..00000000000
--- a/apps/user_webdavauth/l10n/bn_IN.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV প্রমাণীকরণ",
-    "Address:" : "ঠিকানা",
-    "Save" : "সেভ",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ব্যবহারকারীর শংসাপত্র এই ঠিকানায় পাঠানো হবে।এই প্লাগিন প্রতিক্রিয়া পরীক্ষা করে এবং HTTP-statuscodes 401 এবং 403 কে অবৈধ প্রমাণপত্রাদি হিসাবে ব্যাখা করে,এবং সমস্ত অন্যান্য প্রত্যুত্তর বৈধ প্রমাণপত্রাদি হিসেবে ব্যাখ্যা করে।"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/bn_IN.json b/apps/user_webdavauth/l10n/bn_IN.json
deleted file mode 100644
index 3542f14a7b1..00000000000
--- a/apps/user_webdavauth/l10n/bn_IN.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV প্রমাণীকরণ",
-    "Address:" : "ঠিকানা",
-    "Save" : "সেভ",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ব্যবহারকারীর শংসাপত্র এই ঠিকানায় পাঠানো হবে।এই প্লাগিন প্রতিক্রিয়া পরীক্ষা করে এবং HTTP-statuscodes 401 এবং 403 কে অবৈধ প্রমাণপত্রাদি হিসাবে ব্যাখা করে,এবং সমস্ত অন্যান্য প্রত্যুত্তর বৈধ প্রমাণপত্রাদি হিসেবে ব্যাখ্যা করে।"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/bs.js b/apps/user_webdavauth/l10n/bs.js
deleted file mode 100644
index 5cdb03a07f1..00000000000
--- a/apps/user_webdavauth/l10n/bs.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV autentifikacija",
-    "Address:" : "Adresa:",
-    "Save" : "Spasi",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnikovi akreditivi biti će poslani na ovu adresu. Ovaj plugin proverava odgovor i tumači status HTTP kodova 401 i 403 kao nevažeće akreditive, i sve druge odgovore kao validne akreditive."
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/bs.json b/apps/user_webdavauth/l10n/bs.json
deleted file mode 100644
index 823be754a41..00000000000
--- a/apps/user_webdavauth/l10n/bs.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV autentifikacija",
-    "Address:" : "Adresa:",
-    "Save" : "Spasi",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnikovi akreditivi biti će poslani na ovu adresu. Ovaj plugin proverava odgovor i tumači status HTTP kodova 401 i 403 kao nevažeće akreditive, i sve druge odgovore kao validne akreditive."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ca.js b/apps/user_webdavauth/l10n/ca.js
deleted file mode 100644
index baaa239098f..00000000000
--- a/apps/user_webdavauth/l10n/ca.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autenticació WebDAV",
-    "Address:" : "Adreça:",
-    "Save" : "Desa",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les credencials d'usuari s'enviaran a aquesta adreça. Aquest connector comprova la resposta i interpreta els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ca.json b/apps/user_webdavauth/l10n/ca.json
deleted file mode 100644
index 715c286af48..00000000000
--- a/apps/user_webdavauth/l10n/ca.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autenticació WebDAV",
-    "Address:" : "Adreça:",
-    "Save" : "Desa",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les credencials d'usuari s'enviaran a aquesta adreça. Aquest connector comprova la resposta i interpreta els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/cs_CZ.js b/apps/user_webdavauth/l10n/cs_CZ.js
deleted file mode 100644
index 0fbf38d53ef..00000000000
--- a/apps/user_webdavauth/l10n/cs_CZ.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Ověření WebDAV",
-    "Address:" : "Adresa:",
-    "Save" : "Uložit",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Uživatelské přihlašovací údaje budou odeslány na tuto adresu. Tento plugin zkontroluje odpověď serveru a interpretuje návratový kód HTTP 401 a 403 jako neplatné přihlašovací údaje a jakýkoli jiný jako platné přihlašovací údaje."
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/user_webdavauth/l10n/cs_CZ.json b/apps/user_webdavauth/l10n/cs_CZ.json
deleted file mode 100644
index 0ee73e9a9dd..00000000000
--- a/apps/user_webdavauth/l10n/cs_CZ.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Ověření WebDAV",
-    "Address:" : "Adresa:",
-    "Save" : "Uložit",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Uživatelské přihlašovací údaje budou odeslány na tuto adresu. Tento plugin zkontroluje odpověď serveru a interpretuje návratový kód HTTP 401 a 403 jako neplatné přihlašovací údaje a jakýkoli jiný jako platné přihlašovací údaje."
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/cy_GB.js b/apps/user_webdavauth/l10n/cy_GB.js
deleted file mode 100644
index 739908abf4b..00000000000
--- a/apps/user_webdavauth/l10n/cy_GB.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Cadw"
-},
-"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/apps/user_webdavauth/l10n/cy_GB.json b/apps/user_webdavauth/l10n/cy_GB.json
deleted file mode 100644
index e0ec790857f..00000000000
--- a/apps/user_webdavauth/l10n/cy_GB.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Cadw"
-},"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/da.js b/apps/user_webdavauth/l10n/da.js
deleted file mode 100644
index f545d82413b..00000000000
--- a/apps/user_webdavauth/l10n/da.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV-godkendelse",
-    "Address:" : "Adresse:",
-    "Save" : "Gem",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Bruger oplysningerne vil blive sendt til denne adresse. Udvidelsen registrerer svaret og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/da.json b/apps/user_webdavauth/l10n/da.json
deleted file mode 100644
index c0e7a709b57..00000000000
--- a/apps/user_webdavauth/l10n/da.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV-godkendelse",
-    "Address:" : "Adresse:",
-    "Save" : "Gem",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Bruger oplysningerne vil blive sendt til denne adresse. Udvidelsen registrerer svaret og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/de.js b/apps/user_webdavauth/l10n/de.js
deleted file mode 100644
index 6e667dca0b7..00000000000
--- a/apps/user_webdavauth/l10n/de.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV-Authentifizierung",
-    "Address:" : "Adresse:",
-    "Save" : "Speichern",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/de.json b/apps/user_webdavauth/l10n/de.json
deleted file mode 100644
index f347f7724e5..00000000000
--- a/apps/user_webdavauth/l10n/de.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV-Authentifizierung",
-    "Address:" : "Adresse:",
-    "Save" : "Speichern",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/de_AT.js b/apps/user_webdavauth/l10n/de_AT.js
deleted file mode 100644
index 61b244f4ae4..00000000000
--- a/apps/user_webdavauth/l10n/de_AT.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Speichern"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/de_AT.json b/apps/user_webdavauth/l10n/de_AT.json
deleted file mode 100644
index a61814a0978..00000000000
--- a/apps/user_webdavauth/l10n/de_AT.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Speichern"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/de_DE.js b/apps/user_webdavauth/l10n/de_DE.js
deleted file mode 100644
index 6e667dca0b7..00000000000
--- a/apps/user_webdavauth/l10n/de_DE.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV-Authentifizierung",
-    "Address:" : "Adresse:",
-    "Save" : "Speichern",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/de_DE.json b/apps/user_webdavauth/l10n/de_DE.json
deleted file mode 100644
index f347f7724e5..00000000000
--- a/apps/user_webdavauth/l10n/de_DE.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV-Authentifizierung",
-    "Address:" : "Adresse:",
-    "Save" : "Speichern",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/el.js b/apps/user_webdavauth/l10n/el.js
deleted file mode 100644
index 81a2cea52fd..00000000000
--- a/apps/user_webdavauth/l10n/el.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Πιστοποίηση μέσω WebDAV ",
-    "Address:" : "Διεύθυνση:",
-    "Save" : "Αποθήκευση",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Τα διαπιστευτήρια του χρήστη θα σταλούν σε αυτή την διεύθυνση. Αυτό το πρόσθετο ελέγχει την απόκριση και θα ερμηνεύσει τους κωδικούς κατάστασης HTTP 401 και 402 ως μη έγκυρα διαπιστευτήρια και όλες τις άλλες αποκρίσεις ως έγκυρα διαπιστευτήρια."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/el.json b/apps/user_webdavauth/l10n/el.json
deleted file mode 100644
index 2335801c723..00000000000
--- a/apps/user_webdavauth/l10n/el.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Πιστοποίηση μέσω WebDAV ",
-    "Address:" : "Διεύθυνση:",
-    "Save" : "Αποθήκευση",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Τα διαπιστευτήρια του χρήστη θα σταλούν σε αυτή την διεύθυνση. Αυτό το πρόσθετο ελέγχει την απόκριση και θα ερμηνεύσει τους κωδικούς κατάστασης HTTP 401 και 402 ως μη έγκυρα διαπιστευτήρια και όλες τις άλλες αποκρίσεις ως έγκυρα διαπιστευτήρια."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/en_GB.js b/apps/user_webdavauth/l10n/en_GB.js
deleted file mode 100644
index 5eaa8449d4d..00000000000
--- a/apps/user_webdavauth/l10n/en_GB.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV Authentication",
-    "Address:" : "Address:",
-    "Save" : "Save",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/en_GB.json b/apps/user_webdavauth/l10n/en_GB.json
deleted file mode 100644
index 12957ea2b02..00000000000
--- a/apps/user_webdavauth/l10n/en_GB.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV Authentication",
-    "Address:" : "Address:",
-    "Save" : "Save",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/eo.js b/apps/user_webdavauth/l10n/eo.js
deleted file mode 100644
index 657042a08f6..00000000000
--- a/apps/user_webdavauth/l10n/eo.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV-aŭtentigo",
-    "Save" : "Konservi"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/eo.json b/apps/user_webdavauth/l10n/eo.json
deleted file mode 100644
index 17bb6935824..00000000000
--- a/apps/user_webdavauth/l10n/eo.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV-aŭtentigo",
-    "Save" : "Konservi"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/es.js b/apps/user_webdavauth/l10n/es.js
deleted file mode 100644
index 107e7332e4e..00000000000
--- a/apps/user_webdavauth/l10n/es.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autenticación mediante WevDAV",
-    "Address:" : "Dirección:",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/es.json b/apps/user_webdavauth/l10n/es.json
deleted file mode 100644
index 57d2c4f7027..00000000000
--- a/apps/user_webdavauth/l10n/es.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autenticación mediante WevDAV",
-    "Address:" : "Dirección:",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/es_AR.js b/apps/user_webdavauth/l10n/es_AR.js
deleted file mode 100644
index ab1e59432ba..00000000000
--- a/apps/user_webdavauth/l10n/es_AR.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autenticación de WebDAV",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/es_AR.json b/apps/user_webdavauth/l10n/es_AR.json
deleted file mode 100644
index 36947d9c1a6..00000000000
--- a/apps/user_webdavauth/l10n/es_AR.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autenticación de WebDAV",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales del usuario serán enviadas a esta dirección. Este plug-in verificará la respuesta e interpretará los códigos de estado HTTP 401 y 403 como credenciales inválidas y cualquier otra respuesta como válida."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/es_MX.js b/apps/user_webdavauth/l10n/es_MX.js
deleted file mode 100644
index 57412d0c230..00000000000
--- a/apps/user_webdavauth/l10n/es_MX.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autenticación mediante WevDAV",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/es_MX.json b/apps/user_webdavauth/l10n/es_MX.json
deleted file mode 100644
index 26b45a98600..00000000000
--- a/apps/user_webdavauth/l10n/es_MX.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autenticación mediante WevDAV",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las credenciales de usuario se enviarán a esta dirección. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/et_EE.js b/apps/user_webdavauth/l10n/et_EE.js
deleted file mode 100644
index 3644bb8cd8d..00000000000
--- a/apps/user_webdavauth/l10n/et_EE.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV autentimine",
-    "Address:" : "Aadress:",
-    "Save" : "Salvesta",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab ning tõlgendab HTTP olekukoodid 401 ja 403 valedeks andmeteks ning kõik teised vastused korrektseteks andmeteks."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/et_EE.json b/apps/user_webdavauth/l10n/et_EE.json
deleted file mode 100644
index 5893006b4a5..00000000000
--- a/apps/user_webdavauth/l10n/et_EE.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV autentimine",
-    "Address:" : "Aadress:",
-    "Save" : "Salvesta",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab ning tõlgendab HTTP olekukoodid 401 ja 403 valedeks andmeteks ning kõik teised vastused korrektseteks andmeteks."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/eu.js b/apps/user_webdavauth/l10n/eu.js
deleted file mode 100644
index abc45c1adf3..00000000000
--- a/apps/user_webdavauth/l10n/eu.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV Autentikazioa",
-    "Address:" : "Helbidea:",
-    "Save" : "Gorde",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Erabiltzailearen kredentzialak helbide honetara bidaliko dira. Plugin honek erantzuna aztertu eta HTTP 401 eta 403 egoera-kodeak kredentzial ez-egokitzat hartuko ditu, eta beste edozein erantzun, aldiz, kredentzial egokitzat."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/eu.json b/apps/user_webdavauth/l10n/eu.json
deleted file mode 100644
index 83763ecaaff..00000000000
--- a/apps/user_webdavauth/l10n/eu.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV Autentikazioa",
-    "Address:" : "Helbidea:",
-    "Save" : "Gorde",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Erabiltzailearen kredentzialak helbide honetara bidaliko dira. Plugin honek erantzuna aztertu eta HTTP 401 eta 403 egoera-kodeak kredentzial ez-egokitzat hartuko ditu, eta beste edozein erantzun, aldiz, kredentzial egokitzat."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/fa.js b/apps/user_webdavauth/l10n/fa.js
deleted file mode 100644
index 13f994c5520..00000000000
--- a/apps/user_webdavauth/l10n/fa.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "اعتبار سنجی WebDAV ",
-    "Address:" : "آدرس:",
-    "Save" : "ذخیره",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "جزئیات کاربر به این آدرس ارسال خواهد شد. این پلاگین پاسخ را بررسی خواهد کرد و کدهای حالت HTTP شماره 401 و 403 را به عنوان اعتبارات غیر معتبر ترجمه می کند، و باقی موارد را به عنوان موارد معتبر تشخیص می دهد."
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/fa.json b/apps/user_webdavauth/l10n/fa.json
deleted file mode 100644
index e200dc46986..00000000000
--- a/apps/user_webdavauth/l10n/fa.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "اعتبار سنجی WebDAV ",
-    "Address:" : "آدرس:",
-    "Save" : "ذخیره",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "جزئیات کاربر به این آدرس ارسال خواهد شد. این پلاگین پاسخ را بررسی خواهد کرد و کدهای حالت HTTP شماره 401 و 403 را به عنوان اعتبارات غیر معتبر ترجمه می کند، و باقی موارد را به عنوان موارد معتبر تشخیص می دهد."
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/fi_FI.js b/apps/user_webdavauth/l10n/fi_FI.js
deleted file mode 100644
index 4d98c51d778..00000000000
--- a/apps/user_webdavauth/l10n/fi_FI.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV-todennus",
-    "Address:" : "Osoite:",
-    "Save" : "Tallenna",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Käyttäjätiedot lähetetään tähän osoitteeseen. Liitännäinen tarkistaa vastauksen, ja tulkitsee HTTP-tilakoodit 401 ja 403 vääriksi käyttäjätiedoiksi. Kaikki muut vastaukset tulkitaan kelvollisiksi käyttäjätiedoiksi."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/fi_FI.json b/apps/user_webdavauth/l10n/fi_FI.json
deleted file mode 100644
index 412813eea4a..00000000000
--- a/apps/user_webdavauth/l10n/fi_FI.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV-todennus",
-    "Address:" : "Osoite:",
-    "Save" : "Tallenna",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Käyttäjätiedot lähetetään tähän osoitteeseen. Liitännäinen tarkistaa vastauksen, ja tulkitsee HTTP-tilakoodit 401 ja 403 vääriksi käyttäjätiedoiksi. Kaikki muut vastaukset tulkitaan kelvollisiksi käyttäjätiedoiksi."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/fr.js b/apps/user_webdavauth/l10n/fr.js
deleted file mode 100644
index 5a89cf211ef..00000000000
--- a/apps/user_webdavauth/l10n/fr.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Authentification WebDAV",
-    "Address:" : "Adresse :",
-    "Save" : "Sauvegarder",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et toute autre valeur comme une authentification valide."
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_webdavauth/l10n/fr.json b/apps/user_webdavauth/l10n/fr.json
deleted file mode 100644
index 72336cad0b2..00000000000
--- a/apps/user_webdavauth/l10n/fr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Authentification WebDAV",
-    "Address:" : "Adresse :",
-    "Save" : "Sauvegarder",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Les informations de connexion de l'utilisateur seront envoyées à cette adresse. Ce module analyse le code de la réponse HTTP et considère les codes 401 et 403 comme une authentification invalide et toute autre valeur comme une authentification valide."
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/gl.js b/apps/user_webdavauth/l10n/gl.js
deleted file mode 100644
index cd561a4ee56..00000000000
--- a/apps/user_webdavauth/l10n/gl.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autenticación WebDAV",
-    "Address:" : "Enderezo:",
-    "Save" : "Gardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais do usuario serán enviadas a este enderezo. Este engadido comproba a resposta e interpretará os códigos de estado 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/gl.json b/apps/user_webdavauth/l10n/gl.json
deleted file mode 100644
index 54a2af90867..00000000000
--- a/apps/user_webdavauth/l10n/gl.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autenticación WebDAV",
-    "Address:" : "Enderezo:",
-    "Save" : "Gardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais do usuario serán enviadas a este enderezo. Este engadido comproba a resposta e interpretará os códigos de estado 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/he.js b/apps/user_webdavauth/l10n/he.js
deleted file mode 100644
index b88c6b72aac..00000000000
--- a/apps/user_webdavauth/l10n/he.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "הזדהות מול WebDAV",
-    "Save" : "שמירה"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/he.json b/apps/user_webdavauth/l10n/he.json
deleted file mode 100644
index fc168aae3d6..00000000000
--- a/apps/user_webdavauth/l10n/he.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "הזדהות מול WebDAV",
-    "Save" : "שמירה"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/hi.js b/apps/user_webdavauth/l10n/hi.js
deleted file mode 100644
index 840317d2906..00000000000
--- a/apps/user_webdavauth/l10n/hi.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "सहेजें"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/hi.json b/apps/user_webdavauth/l10n/hi.json
deleted file mode 100644
index 8ddb046ec63..00000000000
--- a/apps/user_webdavauth/l10n/hi.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "सहेजें"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/hr.js b/apps/user_webdavauth/l10n/hr.js
deleted file mode 100644
index 1c3044b69b3..00000000000
--- a/apps/user_webdavauth/l10n/hr.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV autentifikacija",
-    "Address:" : "Adresa:",
-    "Save" : "Spremi",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički podaci će biti poslani na tu adresu. Ovaj dodatak provjerava odgovor i interpretira HTTP status 401 i 403 kao neuspječnu prijavu, svi ostali statusi znače da je prijava uspješna i da su korisnički podaci točni."
-},
-"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/apps/user_webdavauth/l10n/hr.json b/apps/user_webdavauth/l10n/hr.json
deleted file mode 100644
index 20ff7796fbb..00000000000
--- a/apps/user_webdavauth/l10n/hr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV autentifikacija",
-    "Address:" : "Adresa:",
-    "Save" : "Spremi",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički podaci će biti poslani na tu adresu. Ovaj dodatak provjerava odgovor i interpretira HTTP status 401 i 403 kao neuspječnu prijavu, svi ostali statusi znače da je prijava uspješna i da su korisnički podaci točni."
-},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/hu_HU.js b/apps/user_webdavauth/l10n/hu_HU.js
deleted file mode 100644
index 354283be7b9..00000000000
--- a/apps/user_webdavauth/l10n/hu_HU.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV hitelesítés",
-    "Address:" : "Cím:",
-    "Save" : "Mentés",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "A felhasználói hitelesítő adatai el lesznek küldve erre a címre. Ez a bővítőmodul leellenőrzi a választ és ha a HTTP hibakód nem 401 vagy 403 azaz érvénytelen a hitelesítő adat, akkor minden más válasz érvényes lesz."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/hu_HU.json b/apps/user_webdavauth/l10n/hu_HU.json
deleted file mode 100644
index 6631ee61c63..00000000000
--- a/apps/user_webdavauth/l10n/hu_HU.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV hitelesítés",
-    "Address:" : "Cím:",
-    "Save" : "Mentés",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "A felhasználói hitelesítő adatai el lesznek küldve erre a címre. Ez a bővítőmodul leellenőrzi a választ és ha a HTTP hibakód nem 401 vagy 403 azaz érvénytelen a hitelesítő adat, akkor minden más válasz érvényes lesz."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/hy.js b/apps/user_webdavauth/l10n/hy.js
deleted file mode 100644
index 83f869e3dbd..00000000000
--- a/apps/user_webdavauth/l10n/hy.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV նույնականացում",
-    "Address:" : "Հասցե՝",
-    "Save" : "Պահպանել"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/hy.json b/apps/user_webdavauth/l10n/hy.json
deleted file mode 100644
index 17703f4e54e..00000000000
--- a/apps/user_webdavauth/l10n/hy.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV նույնականացում",
-    "Address:" : "Հասցե՝",
-    "Save" : "Պահպանել"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ia.js b/apps/user_webdavauth/l10n/ia.js
deleted file mode 100644
index 651840bf0c1..00000000000
--- a/apps/user_webdavauth/l10n/ia.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Salveguardar"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ia.json b/apps/user_webdavauth/l10n/ia.json
deleted file mode 100644
index 91d310a33b7..00000000000
--- a/apps/user_webdavauth/l10n/ia.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Salveguardar"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/id.js b/apps/user_webdavauth/l10n/id.js
deleted file mode 100644
index d71da240e27..00000000000
--- a/apps/user_webdavauth/l10n/id.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Otentikasi WebDAV",
-    "Address:" : "Alamat:",
-    "Save" : "Simpan",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan mengartikan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid."
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/id.json b/apps/user_webdavauth/l10n/id.json
deleted file mode 100644
index ba327c72dda..00000000000
--- a/apps/user_webdavauth/l10n/id.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Otentikasi WebDAV",
-    "Address:" : "Alamat:",
-    "Save" : "Simpan",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan mengartikan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid."
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/is.js b/apps/user_webdavauth/l10n/is.js
deleted file mode 100644
index 1a09c2729e5..00000000000
--- a/apps/user_webdavauth/l10n/is.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV Auðkenni",
-    "Address:" : "Netfang:",
-    "Save" : "Vista",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Notanda auðkenni verður sent á þetta netfang. Þessi viðbót fer yfir viðbrögð og túlkar HTTP statuscodes 401 og 403 sem ógilda auðkenni, og öll önnur svör sem gilt auðkenni."
-},
-"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/user_webdavauth/l10n/is.json b/apps/user_webdavauth/l10n/is.json
deleted file mode 100644
index 08ff2d6df30..00000000000
--- a/apps/user_webdavauth/l10n/is.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV Auðkenni",
-    "Address:" : "Netfang:",
-    "Save" : "Vista",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Notanda auðkenni verður sent á þetta netfang. Þessi viðbót fer yfir viðbrögð og túlkar HTTP statuscodes 401 og 403 sem ógilda auðkenni, og öll önnur svör sem gilt auðkenni."
-},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/it.js b/apps/user_webdavauth/l10n/it.js
deleted file mode 100644
index cd129949e0b..00000000000
--- a/apps/user_webdavauth/l10n/it.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autenticazione WebDAV",
-    "Address:" : "Indirizzo:",
-    "Save" : "Salva",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Le credenziali dell'utente saranno inviate a questo indirizzo. Questa estensione controlla la risposta e interpreterà i codici di stato HTTP 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/it.json b/apps/user_webdavauth/l10n/it.json
deleted file mode 100644
index c842c6c19e6..00000000000
--- a/apps/user_webdavauth/l10n/it.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autenticazione WebDAV",
-    "Address:" : "Indirizzo:",
-    "Save" : "Salva",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Le credenziali dell'utente saranno inviate a questo indirizzo. Questa estensione controlla la risposta e interpreterà i codici di stato HTTP 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ja.js b/apps/user_webdavauth/l10n/ja.js
deleted file mode 100644
index 52e8445ff00..00000000000
--- a/apps/user_webdavauth/l10n/ja.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV認証",
-    "Address:" : "アドレス:",
-    "Save" : "保存",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ユーザー資格情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTPステータスコードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/ja.json b/apps/user_webdavauth/l10n/ja.json
deleted file mode 100644
index dbf17d776e0..00000000000
--- a/apps/user_webdavauth/l10n/ja.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV認証",
-    "Address:" : "アドレス:",
-    "Save" : "保存",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ユーザー資格情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTPステータスコードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ka_GE.js b/apps/user_webdavauth/l10n/ka_GE.js
deleted file mode 100644
index c8eb069dc21..00000000000
--- a/apps/user_webdavauth/l10n/ka_GE.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV აუთენთიფიკაცია",
-    "Save" : "შენახვა"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/ka_GE.json b/apps/user_webdavauth/l10n/ka_GE.json
deleted file mode 100644
index 05851e83eed..00000000000
--- a/apps/user_webdavauth/l10n/ka_GE.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV აუთენთიფიკაცია",
-    "Save" : "შენახვა"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/km.js b/apps/user_webdavauth/l10n/km.js
deleted file mode 100644
index 118d2c483d9..00000000000
--- a/apps/user_webdavauth/l10n/km.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ WebDAV",
-    "Save" : "រក្សាទុក",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "អត្តសញ្ញាណ​អ្នក​ប្រើ​នឹង​ត្រូវ​ផ្ញើ​ទៅ​អាសយដ្ឋាន​នេះ។ កម្មវិធី​បន្ថែម​នេះ​ពិនិត្យ​ចម្លើយ​តប ហើយ​នឹង​បក​ស្រាយ​កូដ​ស្ថានភាព HTTP ដូច​ជា 401 និង 403 ថា​ជា​អត្តសញ្ញាណ​មិន​ត្រឹម​ត្រូវ ហើយ​និង​ចម្លើយ​តប​ផ្សេងៗ​ថា​ត្រឹម​ត្រូវ។"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/km.json b/apps/user_webdavauth/l10n/km.json
deleted file mode 100644
index a93f04a0e31..00000000000
--- a/apps/user_webdavauth/l10n/km.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ WebDAV",
-    "Save" : "រក្សាទុក",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "អត្តសញ្ញាណ​អ្នក​ប្រើ​នឹង​ត្រូវ​ផ្ញើ​ទៅ​អាសយដ្ឋាន​នេះ។ កម្មវិធី​បន្ថែម​នេះ​ពិនិត្យ​ចម្លើយ​តប ហើយ​នឹង​បក​ស្រាយ​កូដ​ស្ថានភាព HTTP ដូច​ជា 401 និង 403 ថា​ជា​អត្តសញ្ញាណ​មិន​ត្រឹម​ត្រូវ ហើយ​និង​ចម្លើយ​តប​ផ្សេងៗ​ថា​ត្រឹម​ត្រូវ។"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/kn.js b/apps/user_webdavauth/l10n/kn.js
deleted file mode 100644
index 2c7f6526c06..00000000000
--- a/apps/user_webdavauth/l10n/kn.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "ಉಳಿಸಿ"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/kn.json b/apps/user_webdavauth/l10n/kn.json
deleted file mode 100644
index 5699698e22c..00000000000
--- a/apps/user_webdavauth/l10n/kn.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "ಉಳಿಸಿ"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ko.js b/apps/user_webdavauth/l10n/ko.js
deleted file mode 100644
index 331e65c0200..00000000000
--- a/apps/user_webdavauth/l10n/ko.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV 인증",
-    "Address:" : "주소:",
-    "Save" : "저장",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud에서 이 URL로 사용자 인증 정보를 보냅니다. 이 플러그인은 응답을 확인하여 HTTP 상태 코드 401이나 403이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다."
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/ko.json b/apps/user_webdavauth/l10n/ko.json
deleted file mode 100644
index 7e42e9d3fd7..00000000000
--- a/apps/user_webdavauth/l10n/ko.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV 인증",
-    "Address:" : "주소:",
-    "Save" : "저장",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud에서 이 URL로 사용자 인증 정보를 보냅니다. 이 플러그인은 응답을 확인하여 HTTP 상태 코드 401이나 403이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다."
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ku_IQ.js b/apps/user_webdavauth/l10n/ku_IQ.js
deleted file mode 100644
index cdfe62f14ba..00000000000
--- a/apps/user_webdavauth/l10n/ku_IQ.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "پاشکه‌وتکردن"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ku_IQ.json b/apps/user_webdavauth/l10n/ku_IQ.json
deleted file mode 100644
index 63f5aac1d28..00000000000
--- a/apps/user_webdavauth/l10n/ku_IQ.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "پاشکه‌وتکردن"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/lb.js b/apps/user_webdavauth/l10n/lb.js
deleted file mode 100644
index b358220a867..00000000000
--- a/apps/user_webdavauth/l10n/lb.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Späicheren"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/lb.json b/apps/user_webdavauth/l10n/lb.json
deleted file mode 100644
index e6ae53e9625..00000000000
--- a/apps/user_webdavauth/l10n/lb.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Späicheren"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/lt_LT.js b/apps/user_webdavauth/l10n/lt_LT.js
deleted file mode 100644
index 33b674d7a73..00000000000
--- a/apps/user_webdavauth/l10n/lt_LT.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV autentikacija",
-    "Address:" : "Adresas:",
-    "Save" : "Išsaugoti",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. "
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/lt_LT.json b/apps/user_webdavauth/l10n/lt_LT.json
deleted file mode 100644
index 0d43b99518d..00000000000
--- a/apps/user_webdavauth/l10n/lt_LT.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV autentikacija",
-    "Address:" : "Adresas:",
-    "Save" : "Išsaugoti",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Naudotojo duomenys bus nusiųsti šiuo adresu. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. "
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/lv.js b/apps/user_webdavauth/l10n/lv.js
deleted file mode 100644
index 4fe05c1e1f3..00000000000
--- a/apps/user_webdavauth/l10n/lv.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV autentifikācija",
-    "Save" : "Saglabāt"
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/lv.json b/apps/user_webdavauth/l10n/lv.json
deleted file mode 100644
index 5887d845d79..00000000000
--- a/apps/user_webdavauth/l10n/lv.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV autentifikācija",
-    "Save" : "Saglabāt"
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/mk.js b/apps/user_webdavauth/l10n/mk.js
deleted file mode 100644
index 6a853ecbd9e..00000000000
--- a/apps/user_webdavauth/l10n/mk.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Сними"
-},
-"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/user_webdavauth/l10n/mk.json b/apps/user_webdavauth/l10n/mk.json
deleted file mode 100644
index 2960717f448..00000000000
--- a/apps/user_webdavauth/l10n/mk.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Сними"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/mn.js b/apps/user_webdavauth/l10n/mn.js
deleted file mode 100644
index ecbe9c6693c..00000000000
--- a/apps/user_webdavauth/l10n/mn.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV Нотолгоо",
-    "Address:" : "Хаяг:",
-    "Save" : "Хадгалах"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/mn.json b/apps/user_webdavauth/l10n/mn.json
deleted file mode 100644
index ba322132591..00000000000
--- a/apps/user_webdavauth/l10n/mn.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV Нотолгоо",
-    "Address:" : "Хаяг:",
-    "Save" : "Хадгалах"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ms_MY.js b/apps/user_webdavauth/l10n/ms_MY.js
deleted file mode 100644
index 50d5a443e6a..00000000000
--- a/apps/user_webdavauth/l10n/ms_MY.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Pengesahan WebDAV",
-    "Address:" : "Alamat:",
-    "Save" : "Simpan",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Butiran pengguna akan dihantar ke alamat ini. Plugin ini memeriksa maklum balas dan akan mentafsir kod status HTTP 401 dan 403 sebagai butiran tidak sah, dan semua maklum balas lain sebagai butiran yang sah."
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/ms_MY.json b/apps/user_webdavauth/l10n/ms_MY.json
deleted file mode 100644
index 875c2f6c288..00000000000
--- a/apps/user_webdavauth/l10n/ms_MY.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Pengesahan WebDAV",
-    "Address:" : "Alamat:",
-    "Save" : "Simpan",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Butiran pengguna akan dihantar ke alamat ini. Plugin ini memeriksa maklum balas dan akan mentafsir kod status HTTP 401 dan 403 sebagai butiran tidak sah, dan semua maklum balas lain sebagai butiran yang sah."
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/nb_NO.js b/apps/user_webdavauth/l10n/nb_NO.js
deleted file mode 100644
index 72a099875e9..00000000000
--- a/apps/user_webdavauth/l10n/nb_NO.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV-autentisering",
-    "Address:" : "Adresse:",
-    "Save" : "Lagre",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Brukerens påloggingsinformasjon vil bli sendt til denne adressen. Denne utvidelsen sjekker svaret og vil tolke HTTP-statuskodene 401 og 403 som ugyldig bruker eller passord, og alle andre svar tolkes som gyldig påloggings."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/nb_NO.json b/apps/user_webdavauth/l10n/nb_NO.json
deleted file mode 100644
index 0ef46124f93..00000000000
--- a/apps/user_webdavauth/l10n/nb_NO.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV-autentisering",
-    "Address:" : "Adresse:",
-    "Save" : "Lagre",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Brukerens påloggingsinformasjon vil bli sendt til denne adressen. Denne utvidelsen sjekker svaret og vil tolke HTTP-statuskodene 401 og 403 som ugyldig bruker eller passord, og alle andre svar tolkes som gyldig påloggings."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/nl.js b/apps/user_webdavauth/l10n/nl.js
deleted file mode 100644
index 8633c851fbc..00000000000
--- a/apps/user_webdavauth/l10n/nl.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV authenticatie",
-    "Address:" : "Adres:",
-    "Save" : "Bewaren",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "De inloggegevens worden opgestuurd naar dit adres. Deze plugin controleert de terugkoppeling en interpreteert HTTP statuscodes 401 en 403 als ongeldige inloggegevens en alle andere terugkoppelingen als valide inloggegevens."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/nl.json b/apps/user_webdavauth/l10n/nl.json
deleted file mode 100644
index 73bb6f40e51..00000000000
--- a/apps/user_webdavauth/l10n/nl.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV authenticatie",
-    "Address:" : "Adres:",
-    "Save" : "Bewaren",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "De inloggegevens worden opgestuurd naar dit adres. Deze plugin controleert de terugkoppeling en interpreteert HTTP statuscodes 401 en 403 als ongeldige inloggegevens en alle andere terugkoppelingen als valide inloggegevens."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/nn_NO.js b/apps/user_webdavauth/l10n/nn_NO.js
deleted file mode 100644
index 4777921772f..00000000000
--- a/apps/user_webdavauth/l10n/nn_NO.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV-autentisering",
-    "Save" : "Lagra",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/nn_NO.json b/apps/user_webdavauth/l10n/nn_NO.json
deleted file mode 100644
index 2ad0b5b6448..00000000000
--- a/apps/user_webdavauth/l10n/nn_NO.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV-autentisering",
-    "Save" : "Lagra",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Innloggingsinformasjon blir sendt til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/oc.js b/apps/user_webdavauth/l10n/oc.js
deleted file mode 100644
index 704e791756b..00000000000
--- a/apps/user_webdavauth/l10n/oc.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autentificacion WebDAV",
-    "Address:" : "Adreça :",
-    "Save" : "Salvar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las informacions de connexion de l'utilizaire seràn mandadas a aquesta adreça. Aqueste modul analisa lo còde de la responsa HTTP e considèra los còdes 401 e 403 coma una autentificacion invalida e tota autra valor coma una autentificacion valida."
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_webdavauth/l10n/oc.json b/apps/user_webdavauth/l10n/oc.json
deleted file mode 100644
index a2e3daa93c3..00000000000
--- a/apps/user_webdavauth/l10n/oc.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autentificacion WebDAV",
-    "Address:" : "Adreça :",
-    "Save" : "Salvar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Las informacions de connexion de l'utilizaire seràn mandadas a aquesta adreça. Aqueste modul analisa lo còde de la responsa HTTP e considèra los còdes 401 e 403 coma una autentificacion invalida e tota autra valor coma una autentificacion valida."
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/pl.js b/apps/user_webdavauth/l10n/pl.js
deleted file mode 100644
index 4104adfa6b0..00000000000
--- a/apps/user_webdavauth/l10n/pl.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Uwierzytelnienie WebDAV",
-    "Address:" : "Adres:",
-    "Save" : "Zapisz",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Dane uwierzytelniające użytkownika zostaną wysłane na ten adres. Ta wtyczka sprawdza odpowiedź i będzie interpretować  kody 401 i 403 statusów HTTP jako nieprawidłowe dane uwierzytelniające, a wszystkie inne odpowiedzi jako prawidłowe uwierzytelnienie."
-},
-"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/pl.json b/apps/user_webdavauth/l10n/pl.json
deleted file mode 100644
index 64cc4899d07..00000000000
--- a/apps/user_webdavauth/l10n/pl.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Uwierzytelnienie WebDAV",
-    "Address:" : "Adres:",
-    "Save" : "Zapisz",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Dane uwierzytelniające użytkownika zostaną wysłane na ten adres. Ta wtyczka sprawdza odpowiedź i będzie interpretować  kody 401 i 403 statusów HTTP jako nieprawidłowe dane uwierzytelniające, a wszystkie inne odpowiedzi jako prawidłowe uwierzytelnienie."
-},"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/pt_BR.js b/apps/user_webdavauth/l10n/pt_BR.js
deleted file mode 100644
index b553c1b50fc..00000000000
--- a/apps/user_webdavauth/l10n/pt_BR.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autenticação WebDAV",
-    "Address:" : "Endereço:",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais de usuário serão enviadas para este endereço. Este plugin verifica a resposta e interpretará os códigos de status HTTP 401 e 403 como \"credenciais inválidas\", e todas as outras respostas como \"credenciais válidas\"."
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_webdavauth/l10n/pt_BR.json b/apps/user_webdavauth/l10n/pt_BR.json
deleted file mode 100644
index b42d7a6b514..00000000000
--- a/apps/user_webdavauth/l10n/pt_BR.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autenticação WebDAV",
-    "Address:" : "Endereço:",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais de usuário serão enviadas para este endereço. Este plugin verifica a resposta e interpretará os códigos de status HTTP 401 e 403 como \"credenciais inválidas\", e todas as outras respostas como \"credenciais válidas\"."
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/pt_PT.js b/apps/user_webdavauth/l10n/pt_PT.js
deleted file mode 100644
index c06d80a3e7d..00000000000
--- a/apps/user_webdavauth/l10n/pt_PT.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autenticação WebDAV",
-    "Address:" : "Endereço:",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais do utilizador vão ser enviadas para endereço URL. Este plugin verifica a resposta e vai interpretar os códigos de estado HTTP 401 e 403 como credenciais inválidas, e todas as outras respostas como válidas."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/pt_PT.json b/apps/user_webdavauth/l10n/pt_PT.json
deleted file mode 100644
index c2a7ebf3685..00000000000
--- a/apps/user_webdavauth/l10n/pt_PT.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autenticação WebDAV",
-    "Address:" : "Endereço:",
-    "Save" : "Guardar",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "As credenciais do utilizador vão ser enviadas para endereço URL. Este plugin verifica a resposta e vai interpretar os códigos de estado HTTP 401 e 403 como credenciais inválidas, e todas as outras respostas como válidas."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ro.js b/apps/user_webdavauth/l10n/ro.js
deleted file mode 100644
index 46637452e5f..00000000000
--- a/apps/user_webdavauth/l10n/ro.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Autentificare WebDAV",
-    "Address:" : "Adresa:",
-    "Save" : "Salvează"
-},
-"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/user_webdavauth/l10n/ro.json b/apps/user_webdavauth/l10n/ro.json
deleted file mode 100644
index c3b2bcdc970..00000000000
--- a/apps/user_webdavauth/l10n/ro.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Autentificare WebDAV",
-    "Address:" : "Adresa:",
-    "Save" : "Salvează"
-},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ru.js b/apps/user_webdavauth/l10n/ru.js
deleted file mode 100644
index 2af520e8396..00000000000
--- a/apps/user_webdavauth/l10n/ru.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Аутентификация WebDAV",
-    "Address:" : "Адрес:",
-    "Save" : "Сохранить",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Учётные данные пользователя будут отправлены на этот адрес. Плагин проверит ответ и будет рассматривать HTTP коды 401 и 403 как неверные учётные данные, при любом другом ответе - учётные данные пользователя верны."
-},
-"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/apps/user_webdavauth/l10n/ru.json b/apps/user_webdavauth/l10n/ru.json
deleted file mode 100644
index 88b53330acc..00000000000
--- a/apps/user_webdavauth/l10n/ru.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Аутентификация WebDAV",
-    "Address:" : "Адрес:",
-    "Save" : "Сохранить",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Учётные данные пользователя будут отправлены на этот адрес. Плагин проверит ответ и будет рассматривать HTTP коды 401 и 403 как неверные учётные данные, при любом другом ответе - учётные данные пользователя верны."
-},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/si_LK.js b/apps/user_webdavauth/l10n/si_LK.js
deleted file mode 100644
index 4a408625e4f..00000000000
--- a/apps/user_webdavauth/l10n/si_LK.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "සුරකින්න"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/si_LK.json b/apps/user_webdavauth/l10n/si_LK.json
deleted file mode 100644
index cf286f67edf..00000000000
--- a/apps/user_webdavauth/l10n/si_LK.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "සුරකින්න"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sk_SK.js b/apps/user_webdavauth/l10n/sk_SK.js
deleted file mode 100644
index 455d18213e3..00000000000
--- a/apps/user_webdavauth/l10n/sk_SK.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV overenie",
-    "Address:" : "Adresa:",
-    "Save" : "Uložiť",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Používateľské prihlasovacie údaje budú odoslané na túto adresu. Tento plugin skontroluje odpoveď servera a interpretuje návratový kód HTTP 401 a 403 ako neplatné prihlasovacie údaje a akýkoľvek iný ako platné prihlasovacie údaje."
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/user_webdavauth/l10n/sk_SK.json b/apps/user_webdavauth/l10n/sk_SK.json
deleted file mode 100644
index bffebf3f253..00000000000
--- a/apps/user_webdavauth/l10n/sk_SK.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV overenie",
-    "Address:" : "Adresa:",
-    "Save" : "Uložiť",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Používateľské prihlasovacie údaje budú odoslané na túto adresu. Tento plugin skontroluje odpoveď servera a interpretuje návratový kód HTTP 401 a 403 ako neplatné prihlasovacie údaje a akýkoľvek iný ako platné prihlasovacie údaje."
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sl.js b/apps/user_webdavauth/l10n/sl.js
deleted file mode 100644
index e175c9b3c0c..00000000000
--- a/apps/user_webdavauth/l10n/sl.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Overitev WebDAV",
-    "Address:" : "Naslov:",
-    "Save" : "Shrani",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Uporabniška poverila bodo poslana na naveden naslov. Vstavek preveri odziv in kodi stanja 401 in 403 obravnava kot neveljavna poverila, vse ostale odzive pa kot veljavna."
-},
-"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/user_webdavauth/l10n/sl.json b/apps/user_webdavauth/l10n/sl.json
deleted file mode 100644
index 184d2df74b2..00000000000
--- a/apps/user_webdavauth/l10n/sl.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Overitev WebDAV",
-    "Address:" : "Naslov:",
-    "Save" : "Shrani",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Uporabniška poverila bodo poslana na naveden naslov. Vstavek preveri odziv in kodi stanja 401 in 403 obravnava kot neveljavna poverila, vse ostale odzive pa kot veljavna."
-},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sq.js b/apps/user_webdavauth/l10n/sq.js
deleted file mode 100644
index 73b3024dce2..00000000000
--- a/apps/user_webdavauth/l10n/sq.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Ruaj"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/sq.json b/apps/user_webdavauth/l10n/sq.json
deleted file mode 100644
index c3290a31319..00000000000
--- a/apps/user_webdavauth/l10n/sq.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Ruaj"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sr.js b/apps/user_webdavauth/l10n/sr.js
deleted file mode 100644
index a68c0e94395..00000000000
--- a/apps/user_webdavauth/l10n/sr.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "ВебДАВ аутентификација",
-    "Address:" : "Адреса:",
-    "Save" : "Сачувај",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Кориснички акредитиви биће послати на ову адресу. Прикључак проверава одговор и ХТТП кодове 401 и 403 тумачиће као неисправне акредитиве а све остале одговоре као исправне."
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/sr.json b/apps/user_webdavauth/l10n/sr.json
deleted file mode 100644
index 5a999a10e71..00000000000
--- a/apps/user_webdavauth/l10n/sr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "ВебДАВ аутентификација",
-    "Address:" : "Адреса:",
-    "Save" : "Сачувај",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Кориснички акредитиви биће послати на ову адресу. Прикључак проверава одговор и ХТТП кодове 401 и 403 тумачиће као неисправне акредитиве а све остале одговоре као исправне."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sr@latin.js b/apps/user_webdavauth/l10n/sr@latin.js
deleted file mode 100644
index cd7a973d450..00000000000
--- a/apps/user_webdavauth/l10n/sr@latin.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV autentifikacija",
-    "Address:" : "Adresa:",
-    "Save" : "Sačuvaj",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički akreditivi biće poslati na ovu adresu. Priključak proverava odgovor i HTTP kodove 401 i 403 tumačiće kao neispravne akreditive a sve ostale odgovore kao ispravne."
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/sr@latin.json b/apps/user_webdavauth/l10n/sr@latin.json
deleted file mode 100644
index a26e0f73765..00000000000
--- a/apps/user_webdavauth/l10n/sr@latin.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV autentifikacija",
-    "Address:" : "Adresa:",
-    "Save" : "Sačuvaj",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Korisnički akreditivi biće poslati na ovu adresu. Priključak proverava odgovor i HTTP kodove 401 i 403 tumačiće kao neispravne akreditive a sve ostale odgovore kao ispravne."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sv.js b/apps/user_webdavauth/l10n/sv.js
deleted file mode 100644
index b16f60985ea..00000000000
--- a/apps/user_webdavauth/l10n/sv.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV-autentisering",
-    "Address:" : "Adress:",
-    "Save" : "Spara",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud kommer skicka användaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/sv.json b/apps/user_webdavauth/l10n/sv.json
deleted file mode 100644
index fa09724c784..00000000000
--- a/apps/user_webdavauth/l10n/sv.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV-autentisering",
-    "Address:" : "Adress:",
-    "Save" : "Spara",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "ownCloud kommer skicka användaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ta_LK.js b/apps/user_webdavauth/l10n/ta_LK.js
deleted file mode 100644
index d71f18fe198..00000000000
--- a/apps/user_webdavauth/l10n/ta_LK.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "சேமிக்க "
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ta_LK.json b/apps/user_webdavauth/l10n/ta_LK.json
deleted file mode 100644
index e881e682241..00000000000
--- a/apps/user_webdavauth/l10n/ta_LK.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "சேமிக்க "
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/te.js b/apps/user_webdavauth/l10n/te.js
deleted file mode 100644
index e632cc07e4f..00000000000
--- a/apps/user_webdavauth/l10n/te.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "భద్రపరచు"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/te.json b/apps/user_webdavauth/l10n/te.json
deleted file mode 100644
index d250e26411e..00000000000
--- a/apps/user_webdavauth/l10n/te.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "భద్రపరచు"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/th_TH.js b/apps/user_webdavauth/l10n/th_TH.js
deleted file mode 100644
index 4dd22b61ed5..00000000000
--- a/apps/user_webdavauth/l10n/th_TH.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "ยืนยันตัวตน WebDAV",
-    "Address:" : "ที่อยู่:",
-    "Save" : "บันทึก",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "สิทธิของผู้ใช้จะถูกส่งไปยังที่อยู่นี้ ปลั๊กอินนี้จะตรวจสอบการตอบสนองและจะแปลรหัสสถานะ HTTP 401 และ 403 ข้อมูลประจำตัวที่ไม่ถูกต้องและการตอบสนองอื่นๆ ทั้งหมดให้เป็นข้อมูลประจำตัวที่ถูกต้อง"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/th_TH.json b/apps/user_webdavauth/l10n/th_TH.json
deleted file mode 100644
index cbbe7b60c36..00000000000
--- a/apps/user_webdavauth/l10n/th_TH.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "ยืนยันตัวตน WebDAV",
-    "Address:" : "ที่อยู่:",
-    "Save" : "บันทึก",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "สิทธิของผู้ใช้จะถูกส่งไปยังที่อยู่นี้ ปลั๊กอินนี้จะตรวจสอบการตอบสนองและจะแปลรหัสสถานะ HTTP 401 และ 403 ข้อมูลประจำตัวที่ไม่ถูกต้องและการตอบสนองอื่นๆ ทั้งหมดให้เป็นข้อมูลประจำตัวที่ถูกต้อง"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/tr.js b/apps/user_webdavauth/l10n/tr.js
deleted file mode 100644
index dd0a66a45ef..00000000000
--- a/apps/user_webdavauth/l10n/tr.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV Kimlik Doğrulaması",
-    "Address:" : "Adres:",
-    "Save" : "Kaydet",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kullanıcı kimlik bilgileri bu adrese gönderilecek. Bu eklenti yanıtı kontrol edecek ve 401 ile 403 HTTP durum kodlarını geçersiz kimlik bilgileri olarak, diğer yanıtları ise doğru kimlik bilgileri olarak algılayacaktır."
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_webdavauth/l10n/tr.json b/apps/user_webdavauth/l10n/tr.json
deleted file mode 100644
index 3c8845256c3..00000000000
--- a/apps/user_webdavauth/l10n/tr.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV Kimlik Doğrulaması",
-    "Address:" : "Adres:",
-    "Save" : "Kaydet",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Kullanıcı kimlik bilgileri bu adrese gönderilecek. Bu eklenti yanıtı kontrol edecek ve 401 ile 403 HTTP durum kodlarını geçersiz kimlik bilgileri olarak, diğer yanıtları ise doğru kimlik bilgileri olarak algılayacaktır."
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ug.js b/apps/user_webdavauth/l10n/ug.js
deleted file mode 100644
index 2fe5c26fe23..00000000000
--- a/apps/user_webdavauth/l10n/ug.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV سالاھىيەت دەلىللەش",
-    "Save" : "ساقلا"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/ug.json b/apps/user_webdavauth/l10n/ug.json
deleted file mode 100644
index a897a27d54a..00000000000
--- a/apps/user_webdavauth/l10n/ug.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV سالاھىيەت دەلىللەش",
-    "Save" : "ساقلا"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/uk.js b/apps/user_webdavauth/l10n/uk.js
deleted file mode 100644
index f0febc1d21c..00000000000
--- a/apps/user_webdavauth/l10n/uk.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Аутентифікація WebDAV",
-    "Address:" : "Адреси:",
-    "Save" : "Зберегти",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Облікові дані користувача буде надіслано на цю адресу. Цей плагін перевіряє відповідь і буде інтерпретувати коди статусу HTTP 401 і 403, як неправильні облікові дані, а всі інші відповіді, вважатимуться правильними."
-},
-"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/user_webdavauth/l10n/uk.json b/apps/user_webdavauth/l10n/uk.json
deleted file mode 100644
index 1bec19cbbdd..00000000000
--- a/apps/user_webdavauth/l10n/uk.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Аутентифікація WebDAV",
-    "Address:" : "Адреси:",
-    "Save" : "Зберегти",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Облікові дані користувача буде надіслано на цю адресу. Цей плагін перевіряє відповідь і буде інтерпретувати коди статусу HTTP 401 і 403, як неправильні облікові дані, а всі інші відповіді, вважатимуться правильними."
-},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ur_PK.js b/apps/user_webdavauth/l10n/ur_PK.js
deleted file mode 100644
index 45493bf7bf3..00000000000
--- a/apps/user_webdavauth/l10n/ur_PK.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "حفظ"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/ur_PK.json b/apps/user_webdavauth/l10n/ur_PK.json
deleted file mode 100644
index 2c8f5af7ae5..00000000000
--- a/apps/user_webdavauth/l10n/ur_PK.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "حفظ"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/vi.js b/apps/user_webdavauth/l10n/vi.js
deleted file mode 100644
index 7b8d7949ba5..00000000000
--- a/apps/user_webdavauth/l10n/vi.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "Xác thực WebDAV",
-    "Address:" : "Địa chỉ:",
-    "Save" : "Lưu",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Các thông tin người dùng sẽ được gửi đến địa chỉ này. Plugin này sẽ kiểm tra các phản hồi và các statuscodes HTTP 401 và 403 không hợp lệ, và tất cả những phản h khác như thông tin hợp lệ."
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/vi.json b/apps/user_webdavauth/l10n/vi.json
deleted file mode 100644
index ebe1725a929..00000000000
--- a/apps/user_webdavauth/l10n/vi.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "Xác thực WebDAV",
-    "Address:" : "Địa chỉ:",
-    "Save" : "Lưu",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Các thông tin người dùng sẽ được gửi đến địa chỉ này. Plugin này sẽ kiểm tra các phản hồi và các statuscodes HTTP 401 và 403 không hợp lệ, và tất cả những phản h khác như thông tin hợp lệ."
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/zh_CN.js b/apps/user_webdavauth/l10n/zh_CN.js
deleted file mode 100644
index 9cca337fd6d..00000000000
--- a/apps/user_webdavauth/l10n/zh_CN.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV 认证",
-    "Address:" : "地址：",
-    "Save" : "保存",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/zh_CN.json b/apps/user_webdavauth/l10n/zh_CN.json
deleted file mode 100644
index 5bd8489403d..00000000000
--- a/apps/user_webdavauth/l10n/zh_CN.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV 认证",
-    "Address:" : "地址：",
-    "Save" : "保存",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "用户的身份将会被发送到此 URL。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/zh_HK.js b/apps/user_webdavauth/l10n/zh_HK.js
deleted file mode 100644
index 87e29b7432f..00000000000
--- a/apps/user_webdavauth/l10n/zh_HK.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV 認證",
-    "Address:" : "地址：",
-    "Save" : "儲存",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應，HTTP狀態碼 401與403將會被理解為無效憑證，而所有其他的回應將會被理解為有效憑證。"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/zh_HK.json b/apps/user_webdavauth/l10n/zh_HK.json
deleted file mode 100644
index a2108b738be..00000000000
--- a/apps/user_webdavauth/l10n/zh_HK.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV 認證",
-    "Address:" : "地址：",
-    "Save" : "儲存",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應，HTTP狀態碼 401與403將會被理解為無效憑證，而所有其他的回應將會被理解為有效憑證。"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/zh_TW.js b/apps/user_webdavauth/l10n/zh_TW.js
deleted file mode 100644
index a4de3acc406..00000000000
--- a/apps/user_webdavauth/l10n/zh_TW.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV 認證",
-    "Save" : "儲存",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應，HTTP狀態碼 401與403將會被理解為無效憑證，而所有其他的回應將會被理解為有效憑證。"
-},
-"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/zh_TW.json b/apps/user_webdavauth/l10n/zh_TW.json
deleted file mode 100644
index aca5151be08..00000000000
--- a/apps/user_webdavauth/l10n/zh_TW.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV 認證",
-    "Save" : "儲存",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "使用者憑證將會被傳送到此位址。此外掛程式將會檢查回應，HTTP狀態碼 401與403將會被理解為無效憑證，而所有其他的回應將會被理解為有效憑證。"
-},"pluralForm" :"nplurals=1; plural=0;"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
deleted file mode 100644
index 1a647fafb16..00000000000
--- a/apps/user_webdavauth/settings.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Frank Karlitschek <frank@owncloud.org>
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-OC_Util::checkAdminUser();
-
-if($_POST) {
-	// CSRF check
-	OCP\JSON::callCheck();
-
-	if(isset($_POST['webdav_url'])) {
-		OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
-	}
-}
-
-// fill template
-$tmpl = new OC_Template( 'user_webdavauth', 'settings');
-$tmpl->assign( 'webdav_url', OC_Config::getValue( "user_webdavauth_url" ));
-
-return $tmpl->fetchPage();
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
deleted file mode 100644
index a87c0ad159a..00000000000
--- a/apps/user_webdavauth/templates/settings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<form id="webdavauth" class="section" action="#" method="post">
-	<h2><?php p($l->t('WebDAV Authentication'));?></h2>
-	<p><label for="webdav_url"><?php p($l->t('Address:').' ');?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
-	 <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
-	<input type="submit" value="<?php p($l->t('Save')); ?>" />
-	<br /><?php p($l->t('The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?>
-</form>
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
deleted file mode 100644
index acd7ec8507c..00000000000
--- a/apps/user_webdavauth/user_webdavauth.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Felix Moeller <mail@felixmoeller.de>
- * @author Frank Karlitschek <frank@owncloud.org>
- * @author Georg Ehrke <georg@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author opensaucesystems <ashley@opensaucesystems.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-class OC_USER_WEBDAVAUTH extends OC_User_Backend implements \OCP\IUserBackend {
-	protected $webdavauth_url;
-
-	public function __construct() {
-		$this->webdavauth_url = OC_Config::getValue( "user_webdavauth_url" );
-	}
-
-	public function deleteUser($uid) {
-		// Can't delete user
-		OCP\Util::writeLog('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend', 3);
-		return false;
-	}
-
-	public function setPassword ( $uid, $password ) {
-		// We can't change user password
-		OCP\Util::writeLog('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend', 3);
-		return false;
-	}
-
-	public function checkPassword( $uid, $password ) {
-		$arr = explode('://', $this->webdavauth_url, 2);
-		if( ! isset($arr) OR count($arr) !== 2) {
-			OCP\Util::writeLog('OC_USER_WEBDAVAUTH', 'Invalid Url: "'.$this->webdavauth_url.'" ', 3);
-			return false;
-		}
-		list($webdavauth_protocol, $webdavauth_url_path) = $arr;
-		$url= $webdavauth_protocol.'://'.urlencode($uid).':'.urlencode($password).'@'.$webdavauth_url_path;
-		$headers = get_headers($url);
-		if($headers==false) {
-			OCP\Util::writeLog('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$webdavauth_protocol.'://'.$webdavauth_url_path.'" ', 3);
-			return false;
-
-		}
-		$returncode= substr($headers[0], 9, 3);
-
-		if(substr($returncode, 0, 1) === '2') {
-			return $uid;
-		} else {
-			return false;
-		}
-
-	}
-
-	/*
-	* we don´t know if a user exists without the password. so we have to return true all the time
-	*/
-	public function userExists( $uid ){
-		return true;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function hasUserListings() {
-		return false;
-	}
-
-	/*
-	* we don´t know the users so all we can do it return an empty array here
-	*/
-	public function getUsers($search = '', $limit = 10, $offset = 0) {
-		$returnArray = array();
-
-		return $returnArray;
-	}
-
-	/**
-	 * Backend name to be shown in user management
-	 * @return string the name of the backend to be shown
-	 */
-	public function getBackendName(){
-		return 'WebDAV';
-	}
-}
-- 
GitLab


From a165710e99edae933b571b475ec13e72b2e89428 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Mon, 21 Sep 2015 23:04:25 +0545
Subject: [PATCH 434/783] Minor text typos

that I noticed while looking at some code.
---
 autotest.sh                    | 2 +-
 config/config.sample.php       | 2 +-
 cron.php                       | 2 +-
 lib/base.php                   | 6 +++---
 lib/private/activity/event.php | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index 8d0e20cf2a8..243b8df0c6a 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -171,7 +171,7 @@ function execute_tests {
 		else
 			if [ "MariaDB" != "$(mysql --version | grep -o MariaDB)" ] ; then
 				echo "Your mysql binary is not provided by MariaDB"
-				echo "To use the docker container set the USEDOCKER enviroment variable"
+				echo "To use the docker container set the USEDOCKER environment variable"
 				exit -1
 			fi
 			mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
diff --git a/config/config.sample.php b/config/config.sample.php
index d561ad27e84..8949bd44465 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -452,7 +452,7 @@ $CONFIG = array(
  *                 expire rules. Please refer to Files_versions online documentation 
  *                 for more info.
  *   ``D, auto``   keep versions at least for D days, apply expire rules to all
- *                 versions that older than D days
+ *                 versions that are older than D days
  * * ``auto, D``   delete all versions that are older than D days automatically,
  *                 delete other versions according to expire rules
  * * ``D1, D2``    keep versions for at least D1 days and delete when exceeds D2 days
diff --git a/cron.php b/cron.php
index ed2a20a1e1f..e83e37b3471 100644
--- a/cron.php
+++ b/cron.php
@@ -113,7 +113,7 @@ try {
 			\OCP\BackgroundJob::setExecutionType('cron');
 		}
 
-		// open the file and try to lock if. If it is not locked, the background
+		// open the file and try to lock it. If it is not locked, the background
 		// job can be executed, otherwise another instance is already running
 		$fp = fopen($lockFile, 'w');
 		$isLocked = flock($fp, LOCK_EX|LOCK_NB, $wouldBlock);
diff --git a/lib/base.php b/lib/base.php
index f5ba05ded74..3624a3fbaf9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -228,7 +228,7 @@ class OC {
 	public static function checkConfig() {
 		$l = \OC::$server->getL10N('lib');
 
-		// Create config in case it does not already exists
+		// Create config if it does not already exist
 		$configFilePath = self::$configDir .'/config.php';
 		if(!file_exists($configFilePath)) {
 			@touch($configFilePath);
@@ -314,7 +314,7 @@ class OC {
 	}
 
 	/**
-	 * check if the instance needs to preform an upgrade
+	 * check if the instance needs to perform an upgrade
 	 *
 	 * @return bool
 	 * @deprecated use \OCP\Util::needUpgrade() instead
@@ -567,7 +567,7 @@ class OC {
 
 		//try to configure php to enable big file uploads.
 		//this doesn´t work always depending on the webserver and php configuration.
-		//Let´s try to overwrite some defaults anyways
+		//Let´s try to overwrite some defaults anyway
 
 		//try to set the maximum execution time to 60min
 		@set_time_limit(3600);
diff --git a/lib/private/activity/event.php b/lib/private/activity/event.php
index fe6fc485b7b..247113d54a9 100644
--- a/lib/private/activity/event.php
+++ b/lib/private/activity/event.php
@@ -90,7 +90,7 @@ class Event implements IEvent {
 	}
 
 	/**
-	 * Set the author of the activity
+	 * Set the timestamp of the activity
 	 *
 	 * @param int $timestamp
 	 * @return IEvent
-- 
GitLab


From 36ce254ffd5ace8357fd777c8af42a98df01ad29 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 22 Sep 2015 00:56:36 +0200
Subject: [PATCH 435/783] Move dummy backend to Tests namespace

---
 apps/files_sharing/tests/locking.php          |  4 +-
 apps/files_sharing/tests/testcase.php         |  2 +-
 apps/files_versions/tests/versions.php        |  2 +-
 lib/private/user.php                          |  4 +
 tests/lib/cache/file.php                      |  2 +-
 tests/lib/files/etagtest.php                  |  4 +-
 tests/lib/files/filesystem.php                |  4 +-
 tests/lib/files/node/file.php                 |  2 +-
 tests/lib/files/node/folder.php               |  2 +-
 tests/lib/files/node/integration.php          |  2 +-
 tests/lib/files/node/node.php                 |  2 +-
 tests/lib/files/node/root.php                 |  2 +-
 tests/lib/files/utils/scanner.php             |  4 +-
 tests/lib/files/view.php                      |  2 +-
 tests/lib/group.php                           |  6 +-
 tests/lib/preview.php                         |  2 +-
 tests/lib/preview/provider.php                |  2 +-
 tests/lib/traits/usertrait.php                |  4 +-
 tests/lib/user.php                            |  2 +-
 tests/lib/user/avataruserdummy.php            |  2 +-
 tests/lib/user/dummy.php                      |  2 +-
 tests/lib/user/manager.php                    | 92 +++++++++----------
 tests/lib/user/session.php                    | 22 ++---
 tests/lib/user/user.php                       | 24 ++---
 .../private => tests/lib/util}/user/dummy.php |  6 +-
 .../controller/userscontrollertest.php        | 36 ++++----
 26 files changed, 121 insertions(+), 117 deletions(-)
 rename {lib/private => tests/lib/util}/user/dummy.php (97%)

diff --git a/apps/files_sharing/tests/locking.php b/apps/files_sharing/tests/locking.php
index 6d13fc1cda5..269c924d142 100644
--- a/apps/files_sharing/tests/locking.php
+++ b/apps/files_sharing/tests/locking.php
@@ -30,7 +30,7 @@ use OCP\Lock\ILockingProvider;
 
 class Locking extends TestCase {
 	/**
-	 * @var \OC_User_Dummy
+	 * @var \Test\Util\User\Dummy
 	 */
 	private $userBackend;
 
@@ -40,7 +40,7 @@ class Locking extends TestCase {
 	public function setUp() {
 		parent::setUp();
 
-		$this->userBackend = new \OC_User_Dummy();
+		$this->userBackend = new \Test\Util\User\Dummy();
 		\OC::$server->getUserManager()->registerBackend($this->userBackend);
 
 		$this->ownerUid = $this->getUniqueID('owner_');
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index 7533b13f79d..c91734a5b03 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -72,7 +72,7 @@ abstract class TestCase extends \Test\TestCase {
 		\OC::registerShareHooks();
 
 		// create users
-		$backend = new \OC_User_Dummy();
+		$backend = new \Test\Util\User\Dummy();
 		\OC_User::useBackend($backend);
 		$backend->createUser(self::TEST_FILES_SHARING_API_USER1, self::TEST_FILES_SHARING_API_USER1);
 		$backend->createUser(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_USER2);
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 7cca409ed6c..da214ead60a 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -749,7 +749,7 @@ class Test_Files_Versioning extends \Test\TestCase {
 	public static function loginHelper($user, $create = false) {
 
 		if ($create) {
-			$backend  = new \OC_User_Dummy();
+			$backend  = new \Test\Util\User\Dummy();
 			$backend->createUser($user, $user);
 			\OC::$server->getUserManager()->registerBackend($backend);
 		}
diff --git a/lib/private/user.php b/lib/private/user.php
index e70734ece40..ee1ff6f3766 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -146,6 +146,10 @@ class OC_User {
 					self::$_usedBackends[$backend] = new OC_User_Database();
 					self::getManager()->registerBackend(self::$_usedBackends[$backend]);
 					break;
+				case 'dummy':
+					self::$_usedBackends[$backend] = new \Test\Util\User\Dummy();
+					self::getManager()->registerBackend(self::$_usedBackends[$backend]);
+					break;
 				default:
 					\OCP\Util::writeLog('core', 'Adding default user backend ' . $backend . '.', \OCP\Util::DEBUG);
 					$className = 'OC_USER_' . strToUpper($backend);
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 94001291d86..b5f186c5416 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -60,7 +60,7 @@ class FileCache extends \Test_Cache {
 		\OC_Config::setValue('cachedirectory', $datadir);
 
 		\OC_User::clearBackends();
-		\OC_User::useBackend(new \OC_User_Dummy());
+		\OC_User::useBackend(new \Test\Util\User\Dummy());
 
 		//login
 		\OC_User::createUser('test', 'test');
diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php
index c3d364d6800..1a11b29cf00 100644
--- a/tests/lib/files/etagtest.php
+++ b/tests/lib/files/etagtest.php
@@ -17,7 +17,7 @@ class EtagTest extends \Test\TestCase {
 	private $tmpDir;
 
 	/**
-	 * @var \OC_User_Dummy $userBackend
+	 * @var \Test\Util\User\Dummy $userBackend
 	 */
 	private $userBackend;
 
@@ -35,7 +35,7 @@ class EtagTest extends \Test\TestCase {
 		$this->tmpDir = \OC_Helper::tmpFolder();
 		\OC_Config::setValue('datadirectory', $this->tmpDir);
 
-		$this->userBackend = new \OC_User_Dummy();
+		$this->userBackend = new \Test\Util\User\Dummy();
 		\OC_User::useBackend($this->userBackend);
 	}
 
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index b7061bd19a0..cc01ed70b5d 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -72,7 +72,7 @@ class Filesystem extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$userBackend = new \OC_User_Dummy();
+		$userBackend = new \Test\Util\User\Dummy();
 		$userBackend->createUser(self::TEST_FILESYSTEM_USER1, self::TEST_FILESYSTEM_USER1);
 		$userBackend->createUser(self::TEST_FILESYSTEM_USER2, self::TEST_FILESYSTEM_USER2);
 		\OC::$server->getUserManager()->registerBackend($userBackend);
@@ -274,7 +274,7 @@ class Filesystem extends \Test\TestCase {
 			$user = \OC_User::getUser();
 		} else {
 			$user = self::TEST_FILESYSTEM_USER1;
-			$backend = new \OC_User_Dummy();
+			$backend = new \Test\Util\User\Dummy();
 			\OC_User::useBackend($backend);
 			$backend->createUser($user, $user);
 			$userObj = \OC::$server->getUserManager()->get($user);
diff --git a/tests/lib/files/node/file.php b/tests/lib/files/node/file.php
index e3b8019b4ca..c431a2eb366 100644
--- a/tests/lib/files/node/file.php
+++ b/tests/lib/files/node/file.php
@@ -18,7 +18,7 @@ class File extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$this->user = new \OC\User\User('', new \OC_User_Dummy);
+		$this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
 	}
 
 	protected function getFileInfo($data) {
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
index 96795cb02ef..b30f352847d 100644
--- a/tests/lib/files/node/folder.php
+++ b/tests/lib/files/node/folder.php
@@ -21,7 +21,7 @@ class Folder extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$this->user = new \OC\User\User('', new \OC_User_Dummy);
+		$this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
 	}
 
 	protected function getFileInfo($data) {
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php
index 2d5ccd1fb85..5580b40a126 100644
--- a/tests/lib/files/node/integration.php
+++ b/tests/lib/files/node/integration.php
@@ -36,7 +36,7 @@ class IntegrationTests extends \Test\TestCase {
 
 		\OC_Hook::clear('OC_Filesystem');
 
-		$user = new User($this->getUniqueID('user'), new \OC_User_Dummy);
+		$user = new User($this->getUniqueID('user'), new \Test\Util\User\Dummy);
 		$this->loginAsUser($user->getUID());
 
 		$this->view = new View();
diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php
index 01ed84c4a06..afcf4cbabaa 100644
--- a/tests/lib/files/node/node.php
+++ b/tests/lib/files/node/node.php
@@ -15,7 +15,7 @@ class Node extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$this->user = new \OC\User\User('', new \OC_User_Dummy);
+		$this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
 	}
 
 	protected function getFileInfo($data) {
diff --git a/tests/lib/files/node/root.php b/tests/lib/files/node/root.php
index a763428209c..4b1aea1da4e 100644
--- a/tests/lib/files/node/root.php
+++ b/tests/lib/files/node/root.php
@@ -17,7 +17,7 @@ class Root extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$this->user = new \OC\User\User('', new \OC_User_Dummy);
+		$this->user = new \OC\User\User('', new \Test\Util\User\Dummy);
 	}
 
 	protected function getFileInfo($data) {
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index 75cd75ee3f5..5492774f42e 100644
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -42,14 +42,14 @@ class TestScanner extends \OC\Files\Utils\Scanner {
 
 class Scanner extends \Test\TestCase {
 	/**
-	 * @var \OC_User_Dummy
+	 * @var \Test\Util\User\Dummy
 	 */
 	private $userBackend;
 
 	protected function setUp() {
 		parent::setUp();
 
-		$this->userBackend = new \OC_User_Dummy();
+		$this->userBackend = new \Test\Util\User\Dummy();
 		\OC::$server->getUserManager()->registerBackend($this->userBackend);
 		$this->loginAsUser();
 	}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index bb42f385fc5..abb1696ae70 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -68,7 +68,7 @@ class View extends \Test\TestCase {
 		\OC_Hook::clear();
 
 		\OC_User::clearBackends();
-		\OC_User::useBackend(new \OC_User_Dummy());
+		\OC_User::useBackend(new \Test\Util\User\Dummy());
 
 		//login
 		$userManager = \OC::$server->getUserManager();
diff --git a/tests/lib/group.php b/tests/lib/group.php
index 795de695513..066dddc738e 100644
--- a/tests/lib/group.php
+++ b/tests/lib/group.php
@@ -30,7 +30,7 @@ class Test_Group extends \Test\TestCase {
 	}
 
 	public function testSingleBackend() {
-		$userBackend = new \OC_User_Dummy();
+		$userBackend = new \Test\Util\User\Dummy();
 		\OC_User::getManager()->registerBackend($userBackend);
 		OC_Group::useBackend(new OC_Group_Dummy());
 
@@ -112,7 +112,7 @@ class Test_Group extends \Test\TestCase {
 
 	public function testUsersInGroup() {
 		OC_Group::useBackend(new OC_Group_Dummy());
-		$userBackend = new \OC_User_Dummy();
+		$userBackend = new \Test\Util\User\Dummy();
 		\OC_User::getManager()->registerBackend($userBackend);
 
 		$group1 = $this->getUniqueID();
@@ -141,7 +141,7 @@ class Test_Group extends \Test\TestCase {
 	}
 
 	public function testMultiBackend() {
-		$userBackend = new \OC_User_Dummy();
+		$userBackend = new \Test\Util\User\Dummy();
 		\OC_User::getManager()->registerBackend($userBackend);
 		$backend1 = new OC_Group_Dummy();
 		$backend2 = new OC_Group_Dummy();
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index 82ee8e2eca2..9e118014bac 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -61,7 +61,7 @@ class Preview extends TestCase {
 
 		$userManager = \OC::$server->getUserManager();
 		$userManager->clearBackends();
-		$backend = new \OC_User_Dummy();
+		$backend = new \Test\Util\User\Dummy();
 		$userManager->registerBackend($backend);
 		$backend->createUser(self::TEST_PREVIEW_USER1, self::TEST_PREVIEW_USER1);
 		$this->loginAsUser(self::TEST_PREVIEW_USER1);
diff --git a/tests/lib/preview/provider.php b/tests/lib/preview/provider.php
index 02459b83bb3..5377f30df82 100644
--- a/tests/lib/preview/provider.php
+++ b/tests/lib/preview/provider.php
@@ -49,7 +49,7 @@ abstract class Provider extends \Test\TestCase {
 
 		$userManager = \OC::$server->getUserManager();
 		$userManager->clearBackends();
-		$backend = new \OC_User_Dummy();
+		$backend = new \Test\Util\User\Dummy();
 		$userManager->registerBackend($backend);
 
 		$userId = $this->getUniqueID();
diff --git a/tests/lib/traits/usertrait.php b/tests/lib/traits/usertrait.php
index 401d8b8a832..229087a5200 100644
--- a/tests/lib/traits/usertrait.php
+++ b/tests/lib/traits/usertrait.php
@@ -13,7 +13,7 @@ namespace Test\Traits;
  */
 trait UserTrait {
 	/**
-	 * @var \OC_User_Dummy|\OCP\UserInterface
+	 * @var \Test\Util\User\Dummy|\OCP\UserInterface
 	 */
 	protected $userBackend;
 
@@ -22,7 +22,7 @@ trait UserTrait {
 	}
 
 	protected function setUpUserTrait() {
-		$this->userBackend = new \OC_User_Dummy();
+		$this->userBackend = new \Test\Util\User\Dummy();
 		\OC::$server->getUserManager()->registerBackend($this->userBackend);
 	}
 
diff --git a/tests/lib/user.php b/tests/lib/user.php
index cb0c661b2a4..3c068be2826 100644
--- a/tests/lib/user.php
+++ b/tests/lib/user.php
@@ -18,7 +18,7 @@ class User extends TestCase {
 	protected function setUp(){
 		parent::setUp();
 
-		$this->backend = $this->getMock('\OC_User_Dummy');
+		$this->backend = $this->getMock('\Test\Util\User\Dummy');
 		$manager = \OC_User::getManager();
 		$manager->registerBackend($this->backend);
 	}
diff --git a/tests/lib/user/avataruserdummy.php b/tests/lib/user/avataruserdummy.php
index 738b10492ea..086adb6043f 100644
--- a/tests/lib/user/avataruserdummy.php
+++ b/tests/lib/user/avataruserdummy.php
@@ -20,7 +20,7 @@
 *
 */
 
-class Avatar_User_Dummy extends \OC_User_Dummy {
+class Avatar_User_Dummy extends \Test\Util\User\Dummy {
 	public function canChangeAvatar($uid) {
 		return true;
 	}
diff --git a/tests/lib/user/dummy.php b/tests/lib/user/dummy.php
index fcc921de4b1..c6c79d7a860 100644
--- a/tests/lib/user/dummy.php
+++ b/tests/lib/user/dummy.php
@@ -23,6 +23,6 @@
 class Test_User_Dummy extends Test_User_Backend {
 	protected function setUp() {
 		parent::setUp();
-		$this->backend=new OC_User_Dummy();
+		$this->backend=new \Test\Util\User\Dummy();
 	}
 }
diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php
index cc8bcd65896..df673f581c4 100644
--- a/tests/lib/user/manager.php
+++ b/tests/lib/user/manager.php
@@ -11,7 +11,7 @@ namespace Test\User;
 
 class Manager extends \Test\TestCase {
 	public function testGetBackends() {
-		$userDummyBackend = $this->getMock('\OC_User_Dummy');
+		$userDummyBackend = $this->getMock('\Test\Util\User\Dummy');
 		$manager = new \OC\User\Manager();
 		$manager->registerBackend($userDummyBackend);
 		$this->assertEquals([$userDummyBackend], $manager->getBackends());
@@ -23,9 +23,9 @@ class Manager extends \Test\TestCase {
 
 	public function testUserExistsSingleBackendExists() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('userExists')
 			->with($this->equalTo('foo'))
@@ -39,9 +39,9 @@ class Manager extends \Test\TestCase {
 
 	public function testUserExistsSingleBackendNotExists() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('userExists')
 			->with($this->equalTo('foo'))
@@ -61,18 +61,18 @@ class Manager extends \Test\TestCase {
 
 	public function testUserExistsTwoBackendsSecondExists() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
 		 */
-		$backend1 = $this->getMock('\OC_User_Dummy');
+		$backend1 = $this->getMock('\Test\Util\User\Dummy');
 		$backend1->expects($this->once())
 			->method('userExists')
 			->with($this->equalTo('foo'))
 			->will($this->returnValue(false));
 
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
 		 */
-		$backend2 = $this->getMock('\OC_User_Dummy');
+		$backend2 = $this->getMock('\Test\Util\User\Dummy');
 		$backend2->expects($this->once())
 			->method('userExists')
 			->with($this->equalTo('foo'))
@@ -87,18 +87,18 @@ class Manager extends \Test\TestCase {
 
 	public function testUserExistsTwoBackendsFirstExists() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
 		 */
-		$backend1 = $this->getMock('\OC_User_Dummy');
+		$backend1 = $this->getMock('\Test\Util\User\Dummy');
 		$backend1->expects($this->once())
 			->method('userExists')
 			->with($this->equalTo('foo'))
 			->will($this->returnValue(true));
 
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
 		 */
-		$backend2 = $this->getMock('\OC_User_Dummy');
+		$backend2 = $this->getMock('\Test\Util\User\Dummy');
 		$backend2->expects($this->never())
 			->method('userExists');
 
@@ -113,7 +113,7 @@ class Manager extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('checkPassword')
 			->with($this->equalTo('foo'), $this->equalTo('bar'))
@@ -140,7 +140,7 @@ class Manager extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->never())
 			->method('checkPassword');
 
@@ -156,9 +156,9 @@ class Manager extends \Test\TestCase {
 
 	public function testGetOneBackendExists() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('userExists')
 			->with($this->equalTo('foo'))
@@ -172,9 +172,9 @@ class Manager extends \Test\TestCase {
 
 	public function testGetOneBackendNotExists() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('userExists')
 			->with($this->equalTo('foo'))
@@ -188,9 +188,9 @@ class Manager extends \Test\TestCase {
 
 	public function testSearchOneBackend() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('getUsers')
 			->with($this->equalTo('fo'))
@@ -207,18 +207,18 @@ class Manager extends \Test\TestCase {
 
 	public function testSearchTwoBackendLimitOffset() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
 		 */
-		$backend1 = $this->getMock('\OC_User_Dummy');
+		$backend1 = $this->getMock('\Test\Util\User\Dummy');
 		$backend1->expects($this->once())
 			->method('getUsers')
 			->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
 			->will($this->returnValue(array('foo1', 'foo2')));
 
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
 		 */
-		$backend2 = $this->getMock('\OC_User_Dummy');
+		$backend2 = $this->getMock('\Test\Util\User\Dummy');
 		$backend2->expects($this->once())
 			->method('getUsers')
 			->with($this->equalTo('fo'), $this->equalTo(3), $this->equalTo(1))
@@ -237,9 +237,9 @@ class Manager extends \Test\TestCase {
 
 	public function testCreateUserSingleBackendNotExists() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->any())
 			->method('implementsActions')
 			->will($this->returnValue(true));
@@ -265,9 +265,9 @@ class Manager extends \Test\TestCase {
 	 */
 	public function testCreateUserSingleBackendExists() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->any())
 			->method('implementsActions')
 			->will($this->returnValue(true));
@@ -288,9 +288,9 @@ class Manager extends \Test\TestCase {
 
 	public function testCreateUserSingleBackendNotSupported() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->any())
 			->method('implementsActions')
 			->will($this->returnValue(false));
@@ -320,9 +320,9 @@ class Manager extends \Test\TestCase {
 	 */
 	public function testCreateUserTwoBackendExists() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend1
 		 */
-		$backend1 = $this->getMock('\OC_User_Dummy');
+		$backend1 = $this->getMock('\Test\Util\User\Dummy');
 		$backend1->expects($this->any())
 			->method('implementsActions')
 			->will($this->returnValue(true));
@@ -336,9 +336,9 @@ class Manager extends \Test\TestCase {
 			->will($this->returnValue(false));
 
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend2
 		 */
-		$backend2 = $this->getMock('\OC_User_Dummy');
+		$backend2 = $this->getMock('\Test\Util\User\Dummy');
 		$backend2->expects($this->any())
 			->method('implementsActions')
 			->will($this->returnValue(true));
@@ -368,9 +368,9 @@ class Manager extends \Test\TestCase {
 
 	public function testCountUsersOneBackend() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('countUsers')
 			->will($this->returnValue(7));
@@ -382,14 +382,14 @@ class Manager extends \Test\TestCase {
 
 		$backend->expects($this->once())
 			->method('getBackendName')
-			->will($this->returnValue('Mock_OC_User_Dummy'));
+			->will($this->returnValue('Mock_Test_Util_User_Dummy'));
 
 		$manager = new \OC\User\Manager();
 		$manager->registerBackend($backend);
 
 		$result = $manager->countUsers();
 		$keys = array_keys($result);
-		$this->assertTrue(strpos($keys[0], 'Mock_OC_User_Dummy') !== false);
+		$this->assertTrue(strpos($keys[0], 'Mock_Test_Util_User_Dummy') !== false);
 
 		$users = array_shift($result);
 		$this->assertEquals(7, $users);
@@ -397,9 +397,9 @@ class Manager extends \Test\TestCase {
 
 	public function testCountUsersTwoBackends() {
 		/**
-		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
+		 * @var \Test\Util\User\Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend1 = $this->getMock('\OC_User_Dummy');
+		$backend1 = $this->getMock('\Test\Util\User\Dummy');
 		$backend1->expects($this->once())
 			->method('countUsers')
 			->will($this->returnValue(7));
@@ -410,9 +410,9 @@ class Manager extends \Test\TestCase {
 			->will($this->returnValue(true));
 		$backend1->expects($this->once())
 			->method('getBackendName')
-			->will($this->returnValue('Mock_OC_User_Dummy'));
+			->will($this->returnValue('Mock_Test_Util_User_Dummy'));
 
-		$backend2 = $this->getMock('\OC_User_Dummy');
+		$backend2 = $this->getMock('\Test\Util\User\Dummy');
 		$backend2->expects($this->once())
 			->method('countUsers')
 			->will($this->returnValue(16));
@@ -423,7 +423,7 @@ class Manager extends \Test\TestCase {
 			->will($this->returnValue(true));
 		$backend2->expects($this->once())
 			->method('getBackendName')
-			->will($this->returnValue('Mock_OC_User_Dummy'));
+			->will($this->returnValue('Mock_Test_Util_User_Dummy'));
 
 		$manager = new \OC\User\Manager();
 		$manager->registerBackend($backend1);
@@ -433,7 +433,7 @@ class Manager extends \Test\TestCase {
 		//because the backends have the same class name, only one value expected
 		$this->assertEquals(1, count($result));
 		$keys = array_keys($result);
-		$this->assertTrue(strpos($keys[0], 'Mock_OC_User_Dummy') !== false);
+		$this->assertTrue(strpos($keys[0], 'Mock_Test_Util_User_Dummy') !== false);
 
 		$users = array_shift($result);
 		//users from backends shall be summed up
@@ -442,7 +442,7 @@ class Manager extends \Test\TestCase {
 
 	public function testDeleteUser() {
 		$manager = new \OC\User\Manager();
-		$backend = new \OC_User_Dummy();
+		$backend = new \Test\Util\User\Dummy();
 
 		$backend->createUser('foo', 'bar');
 		$manager->registerBackend($backend);
diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php
index 4dc7f29c5b8..d9dace2ef05 100644
--- a/tests/lib/user/session.php
+++ b/tests/lib/user/session.php
@@ -20,7 +20,7 @@ class Session extends \Test\TestCase {
 			->with('user_id')
 			->will($this->returnValue('foo'));
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('userExists')
 			->with('foo')
@@ -41,7 +41,7 @@ class Session extends \Test\TestCase {
 			->with('user_id')
 			->will($this->returnValue('foo'));
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('userExists')
 			->with('foo')
@@ -62,7 +62,7 @@ class Session extends \Test\TestCase {
 			->with('user_id')
 			->will($this->returnValue(null));
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->never())
 			->method('userExists');
 
@@ -82,7 +82,7 @@ class Session extends \Test\TestCase {
 
 		$manager = $this->getMock('\OC\User\Manager');
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
 		$user->expects($this->once())
@@ -122,7 +122,7 @@ class Session extends \Test\TestCase {
 		}
 		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
 		$user->expects($this->once())
@@ -161,7 +161,7 @@ class Session extends \Test\TestCase {
 		}
 		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
 		$user->expects($this->once())
@@ -196,7 +196,7 @@ class Session extends \Test\TestCase {
 		}
 		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
 		$user->expects($this->never())
@@ -220,7 +220,7 @@ class Session extends \Test\TestCase {
 
 		$manager = $this->getMock('\OC\User\Manager');
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$manager->expects($this->once())
 			->method('checkPassword')
@@ -257,7 +257,7 @@ class Session extends \Test\TestCase {
 		}
 		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
 
@@ -305,7 +305,7 @@ class Session extends \Test\TestCase {
 		}
 		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
 
@@ -347,7 +347,7 @@ class Session extends \Test\TestCase {
 		}
 		$manager = $this->getMock('\OC\User\Manager', $managerMethods, array());
 
-		$backend = $this->getMock('OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$user = $this->getMock('\OC\User\User', array(), array('foo', $backend));
 
diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
index b1df975b60f..bc1365d35bf 100644
--- a/tests/lib/user/user.php
+++ b/tests/lib/user/user.php
@@ -74,7 +74,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('setPassword')
 			->with($this->equalTo('foo'), $this->equalTo('bar'));
@@ -97,7 +97,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->never())
 			->method('setPassword');
 
@@ -182,7 +182,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('deleteUser')
 			->with($this->equalTo('foo'));
@@ -195,7 +195,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('getHome')
 			->with($this->equalTo('foo'))
@@ -216,7 +216,7 @@ class User extends \Test\TestCase {
 	}
 
 	public function testGetBackendClassName() {
-		$user = new \OC\User\User('foo', new \OC_User_Dummy());
+		$user = new \OC\User\User('foo', new \Test\Util\User\Dummy());
 		$this->assertEquals('Dummy', $user->getBackendClassName());
 		$user = new \OC\User\User('foo', new \OC_User_Database());
 		$this->assertEquals('Database', $user->getBackendClassName());
@@ -226,7 +226,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->never())
 			->method('getHome');
 
@@ -253,7 +253,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$backend->expects($this->any())
 			->method('implementsActions')
@@ -273,7 +273,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$backend->expects($this->any())
 			->method('implementsActions')
@@ -287,7 +287,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$backend->expects($this->any())
 			->method('implementsActions')
@@ -307,7 +307,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 
 		$backend->expects($this->any())
 			->method('implementsActions')
@@ -393,7 +393,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('setPassword');
 
@@ -434,7 +434,7 @@ class User extends \Test\TestCase {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 		 */
-		$backend = $this->getMock('\OC_User_Dummy');
+		$backend = $this->getMock('\Test\Util\User\Dummy');
 		$backend->expects($this->once())
 			->method('deleteUser');
 
diff --git a/lib/private/user/dummy.php b/tests/lib/util/user/dummy.php
similarity index 97%
rename from lib/private/user/dummy.php
rename to tests/lib/util/user/dummy.php
index 3779f7b5ddf..6e23e22ab67 100644
--- a/lib/private/user/dummy.php
+++ b/tests/lib/util/user/dummy.php
@@ -25,10 +25,14 @@
  *
  */
 
+namespace Test\Util\User;
+
+use OC_User_Backend;
+
 /**
  * dummy user backend, does not keep state, only for testing use
  */
-class OC_User_Dummy extends OC_User_Backend implements \OCP\IUserBackend {
+class Dummy extends OC_User_Backend implements \OCP\IUserBackend {
 	private $users = array();
 	private $displayNames = array();
 
diff --git a/tests/settings/controller/userscontrollertest.php b/tests/settings/controller/userscontrollertest.php
index 06065a8454e..6fab43d6a16 100644
--- a/tests/settings/controller/userscontrollertest.php
+++ b/tests/settings/controller/userscontrollertest.php
@@ -100,7 +100,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$admin
 			->expects($this->once())
 			->method('getBackendClassName')
-			->will($this->returnValue('OC_User_Dummy'));
+			->will($this->returnValue('\Test\Util\User\Dummy'));
 		$bar = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$bar
@@ -120,7 +120,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$bar
 			->expects($this->once())
 			->method('getBackendClassName')
-			->will($this->returnValue('OC_User_Dummy'));
+			->will($this->returnValue('\Test\Util\User\Dummy'));
 
 		$this->container['GroupManager']
 			->expects($this->once())
@@ -175,7 +175,7 @@ class UsersControllerTest extends \Test\TestCase {
 					'quota' => 404,
 					'storageLocation' => '/home/admin',
 					'lastLogin' => 12000,
-					'backend' => 'OC_User_Dummy',
+					'backend' => '\Test\Util\User\Dummy',
 					'email' => 'admin@bar.com',
 					'isRestoreDisabled' => false,
 				),
@@ -187,7 +187,7 @@ class UsersControllerTest extends \Test\TestCase {
 					'quota' => 2323,
 					'storageLocation' => '/home/bar',
 					'lastLogin' => 3999000,
-					'backend' => 'OC_User_Dummy',
+					'backend' => '\Test\Util\User\Dummy',
 					'email' => 'bar@dummy.com',
 					'isRestoreDisabled' => false,
 				),
@@ -257,7 +257,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$admin
 			->expects($this->once())
 			->method('getBackendClassName')
-			->will($this->returnValue('OC_User_Dummy'));
+			->will($this->returnValue('\Test\Util\User\Dummy'));
 		$bar = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$bar
@@ -277,7 +277,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$bar
 			->expects($this->once())
 			->method('getBackendClassName')
-			->will($this->returnValue('OC_User_Dummy'));
+			->will($this->returnValue('\Test\Util\User\Dummy'));
 
 		$this->container['GroupManager']
 			->expects($this->at(0))
@@ -343,7 +343,7 @@ class UsersControllerTest extends \Test\TestCase {
 					'quota' => 404,
 					'storageLocation' => '/home/admin',
 					'lastLogin' => 12000,
-					'backend' => 'OC_User_Dummy',
+					'backend' => '\Test\Util\User\Dummy',
 					'email' => 'admin@bar.com',
 					'isRestoreDisabled' => false,
 				],
@@ -355,7 +355,7 @@ class UsersControllerTest extends \Test\TestCase {
 					'quota' => 2323,
 					'storageLocation' => '/home/bar',
 					'lastLogin' => 3999000,
-					'backend' => 'OC_User_Dummy',
+					'backend' => '\Test\Util\User\Dummy',
 					'email' => 'bar@dummy.com',
 					'isRestoreDisabled' => false,
 				],
@@ -414,7 +414,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$admin
 			->expects($this->once())
 			->method('getBackendClassName')
-			->will($this->returnValue('OC_User_Dummy'));
+			->will($this->returnValue('\Test\Util\User\Dummy'));
 		$bar = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()->getMock();
 		$bar
@@ -434,7 +434,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$bar
 			->expects($this->once())
 			->method('getBackendClassName')
-			->will($this->returnValue('OC_User_Dummy'));
+			->will($this->returnValue('\Test\Util\User\Dummy'));
 
 		$this->container['UserManager']
 			->expects($this->once())
@@ -474,7 +474,7 @@ class UsersControllerTest extends \Test\TestCase {
 					'quota' => 404,
 					'storageLocation' => '/home/admin',
 					'lastLogin' => 12000,
-					'backend' => 'OC_User_Dummy',
+					'backend' => '\Test\Util\User\Dummy',
 					'email' => 'admin@bar.com',
 					'isRestoreDisabled' => false,
 				),
@@ -486,7 +486,7 @@ class UsersControllerTest extends \Test\TestCase {
 					'quota' => 2323,
 					'storageLocation' => '/home/bar',
 					'lastLogin' => 3999000,
-					'backend' => 'OC_User_Dummy',
+					'backend' => '\Test\Util\User\Dummy',
 					'email' => 'bar@dummy.com',
 					'isRestoreDisabled' => false,
 				),
@@ -522,14 +522,10 @@ class UsersControllerTest extends \Test\TestCase {
 		$this->container['UserManager']
 			->expects($this->once())
 			->method('getBackends')
-			->will($this->returnValue([new \OC_User_Dummy(), new \OC_User_Database()]));
+			->will($this->returnValue([new \Test\Util\User\Dummy(), new \OC_User_Database()]));
 		$this->container['UserManager']
 			->expects($this->once())
 			->method('clearBackends');
-		$this->container['UserManager']
-			->expects($this->once())
-			->method('registerBackend')
-			->with(new \OC_User_Dummy());
 		$this->container['UserManager']
 			->expects($this->once())
 			->method('search')
@@ -552,7 +548,7 @@ class UsersControllerTest extends \Test\TestCase {
 				)
 			)
 		);
-		$response = $this->container['UsersController']->index(0, 10, '','', 'OC_User_Dummy');
+		$response = $this->container['UsersController']->index(0, 10, '','', '\Test\Util\User\Dummy');
 		$this->assertEquals($expectedResponse, $response);
 	}
 
@@ -562,7 +558,7 @@ class UsersControllerTest extends \Test\TestCase {
 		$this->container['UserManager']
 			->expects($this->once())
 			->method('getBackends')
-			->will($this->returnValue([new \OC_User_Dummy(), new \OC_User_Database()]));
+			->will($this->returnValue([new \Test\Util\User\Dummy(), new \OC_User_Database()]));
 		$this->container['UserManager']
 			->expects($this->once())
 			->method('search')
@@ -570,7 +566,7 @@ class UsersControllerTest extends \Test\TestCase {
 			->will($this->returnValue([]));
 
 		$expectedResponse = new DataResponse([]);
-		$response = $this->container['UsersController']->index(0, 10, '','', 'OC_User_Dummy');
+		$response = $this->container['UsersController']->index(0, 10, '','', '\Test\Util\User\Dummy');
 		$this->assertEquals($expectedResponse, $response);
 	}
 
-- 
GitLab


From 17a64360e53798cdc6c6479aa40643c8aeb4ff3e Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 22 Sep 2015 11:18:42 +0200
Subject: [PATCH 436/783] catch excexptions during the copy operation and make
 sure that we free the lock correctly

---
 lib/private/files/view.php | 97 +++++++++++++++++++++-----------------
 tests/lib/files/view.php   | 43 +++++++++++++++++
 2 files changed, 98 insertions(+), 42 deletions(-)

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 9afa9d40b20..c04ca2ef461 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -759,59 +759,72 @@ class View {
 
 			$this->lockFile($path2, ILockingProvider::LOCK_SHARED);
 			$this->lockFile($path1, ILockingProvider::LOCK_SHARED);
+			$lockTypePath1 = ILockingProvider::LOCK_SHARED;
+			$lockTypePath2 = ILockingProvider::LOCK_SHARED;
 
-			$exists = $this->file_exists($path2);
-			if ($this->shouldEmitHooks()) {
-				\OC_Hook::emit(
-					Filesystem::CLASSNAME,
-					Filesystem::signal_copy,
-					array(
-						Filesystem::signal_param_oldpath => $this->getHookPath($path1),
-						Filesystem::signal_param_newpath => $this->getHookPath($path2),
-						Filesystem::signal_param_run => &$run
-					)
-				);
-				$this->emit_file_hooks_pre($exists, $path2, $run);
-			}
-			if ($run) {
-				$mount1 = $this->getMount($path1);
-				$mount2 = $this->getMount($path2);
-				$storage1 = $mount1->getStorage();
-				$internalPath1 = $mount1->getInternalPath($absolutePath1);
-				$storage2 = $mount2->getStorage();
-				$internalPath2 = $mount2->getInternalPath($absolutePath2);
-
-				$this->changeLock($path2, ILockingProvider::LOCK_EXCLUSIVE);
-
-				if ($mount1->getMountPoint() == $mount2->getMountPoint()) {
-					if ($storage1) {
-						$result = $storage1->copy($internalPath1, $internalPath2);
-					} else {
-						$result = false;
-					}
-				} else {
-					$result = $storage2->copyFromStorage($storage1, $internalPath1, $internalPath2);
-				}
-
-				$this->updater->update($path2);
-
-				$this->changeLock($path2, ILockingProvider::LOCK_SHARED);
+			try {
 
-				if ($this->shouldEmitHooks() && $result !== false) {
+				$exists = $this->file_exists($path2);
+				if ($this->shouldEmitHooks()) {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
-						Filesystem::signal_post_copy,
+						Filesystem::signal_copy,
 						array(
 							Filesystem::signal_param_oldpath => $this->getHookPath($path1),
-							Filesystem::signal_param_newpath => $this->getHookPath($path2)
+							Filesystem::signal_param_newpath => $this->getHookPath($path2),
+							Filesystem::signal_param_run => &$run
 						)
 					);
-					$this->emit_file_hooks_post($exists, $path2);
+					$this->emit_file_hooks_pre($exists, $path2, $run);
 				}
+				if ($run) {
+					$mount1 = $this->getMount($path1);
+					$mount2 = $this->getMount($path2);
+					$storage1 = $mount1->getStorage();
+					$internalPath1 = $mount1->getInternalPath($absolutePath1);
+					$storage2 = $mount2->getStorage();
+					$internalPath2 = $mount2->getInternalPath($absolutePath2);
+
+					$this->changeLock($path2, ILockingProvider::LOCK_EXCLUSIVE);
+					$lockTypePath2 = ILockingProvider::LOCK_EXCLUSIVE;
+
+					if ($mount1->getMountPoint() == $mount2->getMountPoint()) {
+						if ($storage1) {
+							$result = $storage1->copy($internalPath1, $internalPath2);
+						} else {
+							$result = false;
+						}
+					} else {
+						$result = $storage2->copyFromStorage($storage1, $internalPath1, $internalPath2);
+					}
 
-				$this->unlockFile($path2, ILockingProvider::LOCK_SHARED);
-				$this->unlockFile($path1, ILockingProvider::LOCK_SHARED);
+					$this->updater->update($path2);
+
+					$this->changeLock($path2, ILockingProvider::LOCK_SHARED);
+					$lockTypePath2 = ILockingProvider::LOCK_SHARED;
+
+					if ($this->shouldEmitHooks() && $result !== false) {
+						\OC_Hook::emit(
+							Filesystem::CLASSNAME,
+							Filesystem::signal_post_copy,
+							array(
+								Filesystem::signal_param_oldpath => $this->getHookPath($path1),
+								Filesystem::signal_param_newpath => $this->getHookPath($path2)
+							)
+						);
+						$this->emit_file_hooks_post($exists, $path2);
+					}
+
+				}
+			} catch (\Exception $e) {
+				$this->unlockFile($path2, $lockTypePath2);
+				$this->unlockFile($path1, $lockTypePath1);
+				throw $e;
 			}
+
+			$this->unlockFile($path2, $lockTypePath2);
+			$this->unlockFile($path1, $lockTypePath1);
+
 		}
 		return $result;
 	}
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index bb42f385fc5..618f29fc6f2 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -1817,6 +1817,49 @@ class View extends \Test\TestCase {
 		$this->assertNull($this->getFileLockType($view, $targetPath), 'Target file not locked after operation');
 	}
 
+	/**
+	 * simulate a failed copy operation.
+	 * We expect that we catch the exception, free the lock and re-throw it.
+	 *
+	 * @expectedException \Exception
+	 */
+	public function testLockFileCopyException() {
+		$view = new \OC\Files\View('/' . $this->user . '/files/');
+
+		$storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
+			->setMethods(['copy'])
+			->getMock();
+
+		$sourcePath = 'original.txt';
+		$targetPath = 'target.txt';
+
+		\OC\Files\Filesystem::mount($storage, array(), $this->user . '/');
+		$storage->mkdir('files');
+		$view->file_put_contents($sourcePath, 'meh');
+
+		$storage->expects($this->once())
+			->method('copy')
+			->will($this->returnCallback(
+				function() {
+					throw new \Exception();
+				}
+			));
+
+		$this->connectMockHooks('copy', $view, $sourcePath, $lockTypeSourcePre, $lockTypeSourcePost);
+		$this->connectMockHooks('copy', $view, $targetPath, $lockTypeTargetPre, $lockTypeTargetPost);
+
+		$this->assertNull($this->getFileLockType($view, $sourcePath), 'Source file not locked before operation');
+		$this->assertNull($this->getFileLockType($view, $targetPath), 'Target file not locked before operation');
+
+		try {
+			$view->copy($sourcePath, $targetPath);
+		} catch (\Exception $e) {
+			$this->assertNull($this->getFileLockType($view, $sourcePath), 'Source file not locked after operation');
+			$this->assertNull($this->getFileLockType($view, $targetPath), 'Target file not locked after operation');
+			throw $e;
+		}
+	}
+
 	/**
 	 * Test rename operation: unlock first path when second path was locked
 	 */
-- 
GitLab


From b9cd5bc1dc3c68701804013f218b7866621a8d40 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 20 May 2015 18:31:32 +0200
Subject: [PATCH 437/783] Prevent wrong matches in getRelativePath

Before this fix, the root "/files" with path "/files_trashbin" would
return "_trashbin" as relative path...
---
 lib/private/files/view.php |  5 ++++-
 tests/lib/files/view.php   | 27 +++++++++++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 9afa9d40b20..d3c88e9d490 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -153,7 +153,10 @@ class View {
 			return '/';
 		}
 
-		if (strpos($path, $this->fakeRoot) !== 0) {
+		// missing slashes can cause wrong matches!
+		$root = rtrim($this->fakeRoot, '/') . '/';
+
+		if (strpos($path, $root) !== 0) {
 			return null;
 		} else {
 			$path = substr($path, strlen($this->fakeRoot));
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index bb42f385fc5..dd099674e62 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -853,22 +853,29 @@ class View extends \Test\TestCase {
 	/**
 	 * @dataProvider relativePathProvider
 	 */
-	function testGetRelativePath($absolutePath, $expectedPath) {
+	function testGetRelativePath($root, $absolutePath, $expectedPath) {
 		$view = new \OC\Files\View('/files');
-		// simulate a external storage mount point which has a trailing slash
-		$view->chroot('/files/');
+		$view->chroot($root);
 		$this->assertEquals($expectedPath, $view->getRelativePath($absolutePath));
 	}
 
 	function relativePathProvider() {
 		return array(
-			array('/files/', '/'),
-			array('/files', '/'),
-			array('/files/0', '0'),
-			array('/files/false', 'false'),
-			array('/files/true', 'true'),
-			array('/files/test', 'test'),
-			array('/files/test/foo', 'test/foo'),
+			// TODO: add many more cases with mixed slashes, which is only possible
+			// once getRelativePath's behavior is made consistent
+
+			// with slashes
+			array('/files/', '/files/', '/'),
+			array('/files/', '/files', '/'),
+			array('/files/', '/files/0', '0'),
+			array('/files/', '/files/false', 'false'),
+			array('/files/', '/files/true', 'true'),
+			array('/files/', '/files/test', 'test'),
+			array('/files/', '/files/test/foo', 'test/foo'),
+			// mix
+			array('files', 'files_trashbin/test', null),
+			array('/files', '/files_trashbin/test', null),
+			array('/files', 'files_trashbin/test', null),
 		);
 	}
 
-- 
GitLab


From d26c49b995ef3a574d7239388b97b4cdd0c747e8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 21 May 2015 11:10:14 +0200
Subject: [PATCH 438/783] Add more tests for relativePath

---
 tests/lib/files/view.php | 114 +++++++++++++++++++++++++++++++--------
 1 file changed, 91 insertions(+), 23 deletions(-)

diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index dd099674e62..4a2dc65afce 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -193,7 +193,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testGetPath() {
+	public function testGetPath() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
 		$storage3 = $this->getTestStorage();
@@ -219,7 +219,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testMountPointOverwrite() {
+	public function testMountPointOverwrite() {
 		$storage1 = $this->getTestStorage(false);
 		$storage2 = $this->getTestStorage();
 		$storage1->mkdir('substorage');
@@ -265,7 +265,7 @@ class View extends \Test\TestCase {
 		$appConfig->setValue('core', 'shareapi_exclude_groups_list', $oldExcludeGroupsList);
 	}
 
-	function testCacheIncompleteFolder() {
+	public function testCacheIncompleteFolder() {
 		$storage1 = $this->getTestStorage(false);
 		\OC\Files\Filesystem::clearMounts();
 		\OC\Files\Filesystem::mount($storage1, array(), '/incomplete');
@@ -300,7 +300,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testSearch() {
+	public function testSearch() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
 		$storage3 = $this->getTestStorage();
@@ -350,7 +350,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testWatcher() {
+	public function testWatcher() {
 		$storage1 = $this->getTestStorage();
 		\OC\Files\Filesystem::mount($storage1, array(), '/');
 		$storage1->getWatcher()->setPolicy(Watcher::CHECK_ALWAYS);
@@ -371,7 +371,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testCopyBetweenStorageNoCross() {
+	public function testCopyBetweenStorageNoCross() {
 		$storage1 = $this->getTestStorage(true, '\Test\Files\TemporaryNoCross');
 		$storage2 = $this->getTestStorage(true, '\Test\Files\TemporaryNoCross');
 		$this->copyBetweenStorages($storage1, $storage2);
@@ -380,7 +380,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testCopyBetweenStorageCross() {
+	public function testCopyBetweenStorageCross() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
 		$this->copyBetweenStorages($storage1, $storage2);
@@ -389,7 +389,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testCopyBetweenStorageCrossNonLocal() {
+	public function testCopyBetweenStorageCrossNonLocal() {
 		$storage1 = $this->getTestStorage(true, '\Test\Files\TemporaryNoLocal');
 		$storage2 = $this->getTestStorage(true, '\Test\Files\TemporaryNoLocal');
 		$this->copyBetweenStorages($storage1, $storage2);
@@ -417,7 +417,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testMoveBetweenStorageNoCross() {
+	public function testMoveBetweenStorageNoCross() {
 		$storage1 = $this->getTestStorage(true, '\Test\Files\TemporaryNoCross');
 		$storage2 = $this->getTestStorage(true, '\Test\Files\TemporaryNoCross');
 		$this->moveBetweenStorages($storage1, $storage2);
@@ -426,7 +426,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testMoveBetweenStorageCross() {
+	public function testMoveBetweenStorageCross() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
 		$this->moveBetweenStorages($storage1, $storage2);
@@ -435,7 +435,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testMoveBetweenStorageCrossNonLocal() {
+	public function testMoveBetweenStorageCrossNonLocal() {
 		$storage1 = $this->getTestStorage(true, '\Test\Files\TemporaryNoLocal');
 		$storage2 = $this->getTestStorage(true, '\Test\Files\TemporaryNoLocal');
 		$this->moveBetweenStorages($storage1, $storage2);
@@ -458,7 +458,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testUnlink() {
+	public function testUnlink() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
 		\OC\Files\Filesystem::mount($storage1, array(), '/');
@@ -481,7 +481,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testUnlinkRootMustFail() {
+	public function testUnlinkRootMustFail() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
 		\OC\Files\Filesystem::mount($storage1, array(), '/');
@@ -500,7 +500,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testTouch() {
+	public function testTouch() {
 		$storage = $this->getTestStorage(true, '\Test\Files\TemporaryNoTouch');
 
 		\OC\Files\Filesystem::mount($storage, array(), '/');
@@ -524,7 +524,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testViewHooks() {
+	public function testViewHooks() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
 		$defaultRoot = \OC\Files\Filesystem::getRoot();
@@ -590,7 +590,7 @@ class View extends \Test\TestCase {
 	/**
 	 * @medium
 	 */
-	function testViewHooksIfRootStartsTheSame() {
+	public function testViewHooksIfRootStartsTheSame() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
 		$defaultRoot = \OC\Files\Filesystem::getRoot();
@@ -851,28 +851,95 @@ class View extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider relativePathProvider
+	 * @dataProvider chrootRelativePathProvider
 	 */
-	function testGetRelativePath($root, $absolutePath, $expectedPath) {
+	function testChrootGetRelativePath($root, $absolutePath, $expectedPath) {
 		$view = new \OC\Files\View('/files');
 		$view->chroot($root);
 		$this->assertEquals($expectedPath, $view->getRelativePath($absolutePath));
 	}
 
-	function relativePathProvider() {
+	public function chrootRelativePathProvider() {
+		return $this->relativePathProvider('/');
+	}
+
+	/**
+	 * @dataProvider initRelativePathProvider
+	 */
+	public function testInitGetRelativePath($root, $absolutePath, $expectedPath) {
+		$view = new \OC\Files\View($root);
+		$this->assertEquals($expectedPath, $view->getRelativePath($absolutePath));
+	}
+
+	public function initRelativePathProvider() {
+		return $this->relativePathProvider(null);
+	}
+
+	public function relativePathProvider($missingRootExpectedPath) {
 		return array(
-			// TODO: add many more cases with mixed slashes, which is only possible
-			// once getRelativePath's behavior is made consistent
+			// No root - returns the path
+			array('', '/files', '/files'),
+			array('', '/files/', '/files/'),
 
-			// with slashes
+			// Root equals path - /
 			array('/files/', '/files/', '/'),
 			array('/files/', '/files', '/'),
+			array('/files', '/files/', '/'),
+			array('/files', '/files', '/'),
+
+			// False negatives: chroot fixes those by adding the leading slash.
+			// But setting them up with this root (instead of chroot($root))
+			// will fail them, althought they should be the same.
+			// TODO init should be fixed, so it also adds the leading slash
+			array('files/', '/files/', $missingRootExpectedPath),
+			array('files', '/files/', $missingRootExpectedPath),
+			array('files/', '/files', $missingRootExpectedPath),
+			array('files', '/files', $missingRootExpectedPath),
+
+			// False negatives: Paths provided to the method should have a leading slash
+			// TODO input should be checked to have a leading slash
+			array('/files/', 'files/', null),
+			array('/files', 'files/', null),
+			array('/files/', 'files', null),
+			array('/files', 'files', null),
+
+			// with trailing slashes
 			array('/files/', '/files/0', '0'),
 			array('/files/', '/files/false', 'false'),
 			array('/files/', '/files/true', 'true'),
 			array('/files/', '/files/test', 'test'),
 			array('/files/', '/files/test/foo', 'test/foo'),
-			// mix
+
+			// without trailing slashes
+			// TODO false expectation: Should match "with trailing slashes"
+			array('/files', '/files/0', '/0'),
+			array('/files', '/files/false', '/false'),
+			array('/files', '/files/true', '/true'),
+			array('/files', '/files/test', '/test'),
+			array('/files', '/files/test/foo', '/test/foo'),
+
+			// leading slashes
+			array('/files/', '/files_trashbin/', null),
+			array('/files', '/files_trashbin/', null),
+			array('/files/', '/files_trashbin', null),
+			array('/files', '/files_trashbin', null),
+
+			// no leading slashes
+			array('files/', 'files_trashbin/', null),
+			array('files', 'files_trashbin/', null),
+			array('files/', 'files_trashbin', null),
+			array('files', 'files_trashbin', null),
+
+			// mixed leading slashes
+			array('files/', '/files_trashbin/', null),
+			array('/files/', 'files_trashbin/', null),
+			array('files', '/files_trashbin/', null),
+			array('/files', 'files_trashbin/', null),
+			array('files/', '/files_trashbin', null),
+			array('/files/', 'files_trashbin', null),
+			array('files', '/files_trashbin', null),
+			array('/files', 'files_trashbin', null),
+
 			array('files', 'files_trashbin/test', null),
 			array('/files', '/files_trashbin/test', null),
 			array('/files', 'files_trashbin/test', null),
@@ -1019,6 +1086,7 @@ class View extends \Test\TestCase {
 		$storage2->expects($this->any())
 			->method('fopen')
 			->will($this->returnCallback(function ($path, $mode) use ($storage2) {
+				/** @var \PHPUnit_Framework_MockObject_MockObject | \OC\Files\Storage\Temporary $storage2 */
 				$source = fopen($storage2->getSourcePath($path), $mode);
 				return \OC\Files\Stream\Quota::wrap($source, 9);
 			}));
-- 
GitLab


From c8a6fea1b476dae8953a36540d49e00865f5d807 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 13 Jul 2015 12:01:15 +0200
Subject: [PATCH 439/783] Allow ajax requests on public webdav interface

Whenever outgoing shares are disabled, still allow ajax requests to make
it possible to use the Webdav interface in the public link page.

Please note that disabling outgoing shares isn't strong anyway as
someone could abuse the ajax endpoints to access files anyway. To
properly disable remote sharing, public link sharing must be disabled
too.
---
 apps/files_sharing/publicwebdav.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
index 773a15c888e..fbf9d22cf76 100644
--- a/apps/files_sharing/publicwebdav.php
+++ b/apps/files_sharing/publicwebdav.php
@@ -46,7 +46,8 @@ $serverFactory = new \OC\Connector\Sabre\ServerFactory(
 $requestUri = \OC::$server->getRequest()->getRequestUri();
 
 $server = $serverFactory->createServer($baseuri, $requestUri, $authBackend, function () use ($authBackend) {
-	if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false) {
+	$isAjax = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest');
+	if (OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled() === false && !$isAjax) {
 		// this is what is thrown when trying to access a non-existing share
 		throw new \Sabre\DAV\Exception\NotAuthenticated();
 	}
-- 
GitLab


From 2e1cfe03e9039c6a8257e56e5898a29522c86ea9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 7 Jan 2015 12:33:51 +0100
Subject: [PATCH 440/783] Publish an activity when sending a share link via
 email

---
 apps/files_sharing/lib/activity.php |  8 ++++++++
 core/ajax/share.php                 | 31 +++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/apps/files_sharing/lib/activity.php b/apps/files_sharing/lib/activity.php
index 1257e7a445c..63ac2e90b2a 100644
--- a/apps/files_sharing/lib/activity.php
+++ b/apps/files_sharing/lib/activity.php
@@ -58,6 +58,7 @@ class Activity implements IExtension {
 	const SUBJECT_RESHARED_GROUP_BY = 'reshared_group_by';
 	const SUBJECT_RESHARED_LINK_BY = 'reshared_link_by';
 	const SUBJECT_RESHARED_USER_BY = 'reshared_user_by';
+	const SUBJECT_SHARED_EMAIL = 'shared_with_email';
 	const SUBJECT_SHARED_WITH_BY = 'shared_with_by';
 
 	/** @var IFactory */
@@ -182,6 +183,8 @@ class Activity implements IExtension {
 					return (string) $l->t('%2$s shared %1$s with you', $params);
 				case self::SUBJECT_SHARED_LINK_SELF:
 					return (string) $l->t('You shared %1$s via link', $params);
+				case self::SUBJECT_SHARED_EMAIL:
+					return (string) $l->t('You shared %1$s with %2$s', $params);
 			}
 		}
 
@@ -227,6 +230,11 @@ class Activity implements IExtension {
 						1 => 'username',
 						2 => '',
 					];
+				case self::SUBJECT_SHARED_EMAIL:
+					return array(
+						0 => 'file',
+						1 => '',// 'email' is neither supported nor planned for now
+					);
 
 				case self::SUBJECT_SHARED_USER_SELF:
 				case self::SUBJECT_SHARED_WITH_BY:
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 69b84564ab1..253095f2980 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -183,6 +183,37 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 
 			$result = $mailNotification->sendLinkShareMail($to_address, $file, $link, $expiration);
 			if(empty($result)) {
+				// Get the token from the link
+				$linkParts = explode('/', $link);
+				$token = array_pop($linkParts);
+
+				// Get the share for the token
+				$share = \OCP\Share::getShareByToken($token, false);
+				if ($share !== false) {
+					$currentUser = \OC::$server->getUserSession()->getUser()->getUID();
+					$file = '/' . ltrim($file, '/');
+
+					// Check whether share belongs to the user and whether the file is the same
+					if ($share['file_target'] === $file && $share['uid_owner'] === $currentUser) {
+
+						// Get the path for the user
+						$view = new \OC\Files\View('/' . $currentUser . '/files');
+						$fileId = (int) $share['item_source'];
+						$path = $view->getPath((int) $share['item_source']);
+
+						if ($path !== null) {
+							$event = \OC::$server->getActivityManager()->generateEvent();
+							$event->setApp(\OCA\Files_Sharing\Activity::FILES_SHARING_APP)
+								->setType(\OCA\Files_Sharing\Activity::TYPE_SHARED)
+								->setAuthor($currentUser)
+								->setAffectedUser($currentUser)
+								->setObject('files', $fileId, $path)
+								->setSubject(\OCA\Files_Sharing\Activity::SUBJECT_SHARED_EMAIL, [$path, $to_address]);
+							\OC::$server->getActivityManager()->publish($event);
+						}
+					}
+				}
+
 				\OCP\JSON::success();
 			} else {
 				$l = \OC::$server->getL10N('core');
-- 
GitLab


From f6aeb023cfa989c85691733ac3d59ec2e51b9782 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 22 Sep 2015 14:13:56 +0200
Subject: [PATCH 441/783] remove float from file/folder name in sidebar, fix
 #19243

---
 apps/files/css/detailsView.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index ea9d48b470c..8acf884f219 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -71,17 +71,14 @@
 
 #app-sidebar .fileName h3 {
 	max-width: 300px;
-	float:left;
+	display: inline-block;
 	padding: 5px 0;
 	margin: -5px 0;
 }
 
 #app-sidebar .file-details {
-	margin-top: 3px;
-	margin-bottom: 15px;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
 	opacity: .5;
-	float:left;
 }
 #app-sidebar .action-favorite {
 	vertical-align: text-bottom;
-- 
GitLab


From a35144e961a55e2a5ca45d84b190156898e07c35 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 22 Sep 2015 14:52:52 +0200
Subject: [PATCH 442/783] Properly translate file actions

---
 apps/files/js/fileactions.js  | 2 ++
 apps/files/js/filelist.js     | 1 +
 apps/files/js/tagsplugin.js   | 2 +-
 apps/files_trashbin/js/app.js | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index f3f137a0537..d3904f2f6d3 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -594,6 +594,7 @@
 
 			this.registerAction({
 				name: 'Rename',
+				displayName: t('files', 'Rename'),
 				mime: 'all',
 				permissions: OC.PERMISSION_UPDATE,
 				icon: function() {
@@ -614,6 +615,7 @@
 
 			this.registerAction({
 				name: 'Delete',
+				displayName: t('files', 'Delete'),
 				mime: 'all',
 				// permission is READ because we show a hint instead if there is no permission
 				permissions: OC.PERMISSION_DELETE,
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 2af5be73d96..ece330d41cc 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -300,6 +300,7 @@
 			if (this._detailsView) {
 				this.fileActions.registerAction({
 					name: 'Details',
+					displayName: t('files', 'Details'),
 					mime: 'all',
 					icon: OC.imagePath('core', 'actions/details'),
 					permissions: OC.PERMISSION_READ,
diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js
index 9f45da9a6e2..23945d52603 100644
--- a/apps/files/js/tagsplugin.js
+++ b/apps/files/js/tagsplugin.js
@@ -78,7 +78,7 @@
 			// register "star" action
 			fileActions.registerAction({
 				name: 'Favorite',
-				displayName: 'Favorite',
+				displayName: t('files', 'Favorite'),
 				mime: 'all',
 				permissions: OC.PERMISSION_READ,
 				type: OCA.Files.FileActions.TYPE_INLINE,
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index 473cce88a71..c3be762f095 100644
--- a/apps/files_trashbin/js/app.js
+++ b/apps/files_trashbin/js/app.js
@@ -59,6 +59,7 @@ OCA.Trashbin.App = {
 
 		fileActions.registerAction({
 			name: 'Delete',
+			displayName: t('files', 'Delete'),
 			mime: 'all',
 			permissions: OC.PERMISSION_READ,
 			icon: function() {
-- 
GitLab


From d9db959331faddfa58c6b023bd2383cb60f60655 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 22 Sep 2015 15:01:31 +0200
Subject: [PATCH 443/783] Revert "Show cached previews directly"

This reverts commit 1b708e26efbcb4052becad3d7b6618064c2605a6.
---
 lib/private/preview.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index db2a56f9fa5..978da1161c2 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -772,12 +772,6 @@ class Preview {
 			throw new NotFoundException('File not found.');
 		}
 
-		if ($cachedPath = $this->isCached($this->info->getId())) {
-			header('Content-Type: ' . $this->info->getMimetype());
-			$this->userView->readfile($cachedPath);
-			return;
-		}
-
 		if (is_null($this->preview)) {
 			$this->getPreview();
 		}
-- 
GitLab


From 5f11049852faaff2fffc69c7d59ba50c9482190c Mon Sep 17 00:00:00 2001
From: Individual IT Services <info@individual-it.net>
Date: Fri, 11 Sep 2015 15:07:13 +0545
Subject: [PATCH 444/783] reduce amount of db calls needed for file-locks

return result of insertIfNotExist()

reducing initLockField, throwing exeption in releaseLock

don't throw exception in releaseLock()

cleaning up whitespaces
---
 lib/private/lock/dblockingprovider.php | 36 +++++++++++++++++---------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php
index bfa86a6920e..a08357a6024 100644
--- a/lib/private/lock/dblockingprovider.php
+++ b/lib/private/lock/dblockingprovider.php
@@ -58,9 +58,17 @@ class DBLockingProvider extends AbstractLockingProvider {
 		$this->timeFactory = $timeFactory;
 	}
 
-	protected function initLockField($path) {
+	/**
+	 * Insert a file locking row if it does not exists.
+	 *
+	 * @param string $path
+	 * @param int $lock
+	 * @return int number of inserted rows
+	 */
+
+	protected function initLockField($path, $lock = 0) {
 		$expire = $this->getExpireTime();
-		$this->connection->insertIfNotExist('*PREFIX*file_locks', ['key' => $path, 'lock' => 0, 'ttl' => $expire], ['key']);
+		return $this->connection->insertIfNotExist('*PREFIX*file_locks', ['key' => $path, 'lock' => $lock, 'ttl' => $expire], ['key']);
 	}
 
 	/**
@@ -98,18 +106,23 @@ class DBLockingProvider extends AbstractLockingProvider {
 			$this->logger->warning("Trying to acquire a lock for '$path' while inside a transition");
 		}
 
-		$this->initLockField($path);
 		$expire = $this->getExpireTime();
 		if ($type === self::LOCK_SHARED) {
-			$result = $this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` + 1, `ttl` = ? WHERE `key` = ? AND `lock` >= 0',
-				[$expire, $path]
-			);
+			$result = $this->initLockField($path,1);
+			if ($result <= 0) {
+				$result = $this->connection->executeUpdate (
+					'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` + 1, `ttl` = ? WHERE `key` = ? AND `lock` >= 0',
+					[$expire, $path]
+				);
+			}
 		} else {
-			$result = $this->connection->executeUpdate(
-				'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = 0',
-				[$expire, $path]
-			);
+			$result = $this->initLockField($path,-1);
+			if ($result <= 0) {
+				$result = $this->connection->executeUpdate(
+					'UPDATE `*PREFIX*file_locks` SET `lock` = -1, `ttl` = ? WHERE `key` = ? AND `lock` = 0',
+					[$expire, $path]
+				);
+			}
 		}
 		if ($result !== 1) {
 			throw new LockedException($path);
@@ -122,7 +135,6 @@ class DBLockingProvider extends AbstractLockingProvider {
 	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
 	 */
 	public function releaseLock($path, $type) {
-		$this->initLockField($path);
 		if ($type === self::LOCK_SHARED) {
 			$this->connection->executeUpdate(
 				'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` - 1 WHERE `key` = ? AND `lock` > 0',
-- 
GitLab


From 4dba046712ebe611ba946ae31d780eb48d224cf0 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 22 Sep 2015 14:47:04 +0200
Subject: [PATCH 445/783] Respect disabled sharing API settings

If the sharing API setting is disabled that sharing check middle ware
should block the request. Thus making link shares unavailable.
Fixes #18970

* Unit test added
* Unit tests updated
---
 .../lib/middleware/sharingcheckmiddleware.php |  5 +++
 .../middleware/sharingcheckmiddleware.php     | 35 +++++++++++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
index 3787ef42d9f..1c29b1da736 100644
--- a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
@@ -87,6 +87,11 @@ class SharingCheckMiddleware extends Middleware {
 			return false;
 		}
 
+		// Check if the shareAPI is enabled
+		if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+			return false;
+		}
+
 		// Check whether public sharing is enabled
 		if($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
 			return false;
diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
index 0db8a1ed5bc..58f4b841339 100644
--- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
@@ -54,7 +54,13 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->will($this->returnValue(true));
 
 		$this->config
-			->expects($this->once())
+			->expects($this->at(0))
+			->method('getAppValue')
+			->with('core', 'shareapi_enabled', 'yes')
+			->will($this->returnValue('yes'));
+
+		$this->config
+			->expects($this->at(1))
 			->method('getAppValue')
 			->with('core', 'shareapi_allow_links', 'yes')
 			->will($this->returnValue('yes'));
@@ -72,7 +78,7 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
 	}
 
-	public function testIsSharingEnabledWithSharingDisabled() {
+	public function testIsSharingEnabledWithLinkSharingDisabled() {
 		$this->appManager
 			->expects($this->once())
 			->method('isEnabledForUser')
@@ -80,11 +86,34 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->will($this->returnValue(true));
 
 		$this->config
-			->expects($this->once())
+			->expects($this->at(0))
+			->method('getAppValue')
+			->with('core', 'shareapi_enabled', 'yes')
+			->will($this->returnValue('yes'));
+
+		$this->config
+			->expects($this->at(1))
 			->method('getAppValue')
 			->with('core', 'shareapi_allow_links', 'yes')
 			->will($this->returnValue('no'));
 
 		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
 	}
+
+	public function testIsSharingEnabledWithSharingAPIDisabled() {
+		$this->appManager
+			->expects($this->once())
+			->method('isEnabledForUser')
+			->with('files_sharing')
+			->will($this->returnValue(true));
+
+		$this->config
+			->expects($this->once())
+			->method('getAppValue')
+			->with('core', 'shareapi_enabled', 'yes')
+			->will($this->returnValue('no'));
+
+		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+	}
+
 }
-- 
GitLab


From fa725fba7362734d6f9fdd5acb6b5fe4f1aff0ca Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 22 Sep 2015 15:28:48 +0200
Subject: [PATCH 446/783] Properly show sidebar for trash and sharing sections

---
 apps/files/js/detailsview.js | 2 +-
 apps/files/js/filelist.js    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index 3a775c29ec6..b01f9cea610 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -84,7 +84,7 @@
 		},
 
 		_onClose: function(event) {
-			OC.Apps.hideAppSidebar();
+			OC.Apps.hideAppSidebar(this.$el);
 			event.preventDefault();
 		},
 
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 2af5be73d96..151c70bfce1 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -305,7 +305,7 @@
 					permissions: OC.PERMISSION_READ,
 					actionHandler: function(fileName, context) {
 						self._updateDetailsView(fileName);
-						OC.Apps.showAppSidebar();
+						OC.Apps.showAppSidebar(self._detailsView.$el);
 					}
 				});
 			}
@@ -380,7 +380,7 @@
 			if (tabId) {
 				this._detailsView.selectTab(tabId);
 			}
-			OC.Apps.showAppSidebar();
+			OC.Apps.showAppSidebar(this._detailsView.$el);
 		},
 
 		/**
-- 
GitLab


From a8e8a9dfb968d7e93b01404b9a12c1e48d8431a4 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 8 Sep 2015 12:09:11 +0200
Subject: [PATCH 447/783] Move certificate bundle into resources/config/

---
 lib/private/http/client/client.php          | 2 +-
 lib/private/security/certificatemanager.php | 2 +-
 lib/private/updater.php                     | 7 -------
 {config => resources/config}/ca-bundle.crt  | 0
 4 files changed, 2 insertions(+), 9 deletions(-)
 rename {config => resources/config}/ca-bundle.crt (100%)

diff --git a/lib/private/http/client/client.php b/lib/private/http/client/client.php
index b0aff10a413..1907937e55e 100644
--- a/lib/private/http/client/client.php
+++ b/lib/private/http/client/client.php
@@ -62,7 +62,7 @@ class Client implements IClient {
 			$dataDir = $this->config->getSystemValue('datadirectory');
 			$this->client->setDefaultOption('verify', $dataDir.'/'.$this->certificateManager->getCertificateBundle());
 		} else {
-			$this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/config/ca-bundle.crt');
+			$this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
 		}
 
 		$this->client->setDefaultOption('headers/User-Agent', 'ownCloud Server Crawler');
diff --git a/lib/private/security/certificatemanager.php b/lib/private/security/certificatemanager.php
index 4d470f69a66..ded81863a73 100644
--- a/lib/private/security/certificatemanager.php
+++ b/lib/private/security/certificatemanager.php
@@ -110,7 +110,7 @@ class CertificateManager implements ICertificateManager {
 		}
 
 		// Append the default certificates
-		$defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/config/ca-bundle.crt');
+		$defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
 		fwrite($fh_certs, $defaultCertificates);
 		fclose($fh_certs);
 	}
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 71e9732c307..b33180c3425 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -279,13 +279,6 @@ class Updater extends BasicEmitter {
 			throw new \Exception($e->getMessage());
 		}
 
-		// FIXME: Some users do not upload the new ca-bundle.crt, let's catch this
-		// in the update. For a newer release we shall use an integrity check after
-		// the update.
-		if(!file_exists(\OC::$configDir .'/ca-bundle.crt')) {
-			throw new \Exception('Please upload the ca-bundle.crt file into the \'config\' directory.');
-		}
-
 		// create empty file in data dir, so we can later find
 		// out that this is indeed an ownCloud data directory
 		// (in case it didn't exist before)
diff --git a/config/ca-bundle.crt b/resources/config/ca-bundle.crt
similarity index 100%
rename from config/ca-bundle.crt
rename to resources/config/ca-bundle.crt
-- 
GitLab


From 63b2bc136aa9b101b424cab89f31c772a9a4baea Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 8 Sep 2015 12:17:57 +0200
Subject: [PATCH 448/783] Move mimetype files into /resources/config/

---
 lib/private/files/type/detection.php          | 35 ++++++----
 lib/private/server.php                        |  4 +-
 .../config}/mimetypealiases.dist.json         |  2 +-
 .../config}/mimetypemapping.dist.json         |  2 +-
 tests/lib/files/type/detection.php            | 66 ++++++++++---------
 5 files changed, 62 insertions(+), 47 deletions(-)
 rename {config => resources/config}/mimetypealiases.dist.json (97%)
 rename {config => resources/config}/mimetypemapping.dist.json (99%)

diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index 3dc3975fb2a..0c647ab44c6 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -49,15 +49,22 @@ class Detection implements IMimeTypeDetector {
 	private $urlGenerator;
 
 	/** @var string */
-	private $configDir;
+	private $customConfigDir;
+
+	/** @var string */
+	private $defaultConfigDir;
 
 	/**
 	 * @param IURLGenerator $urlGenerator
-	 * @param string $configDir
+	 * @param string $customConfigDir
+	 * @param string $defaultConfigDir
 	 */
-	public function __construct(IURLGenerator $urlGenerator, $configDir) {
+	public function __construct(IURLGenerator $urlGenerator,
+								$customConfigDir,
+								$defaultConfigDir) {
 		$this->urlGenerator = $urlGenerator;
-		$this->configDir = $configDir;
+		$this->customConfigDir = $customConfigDir;
+		$this->defaultConfigDir = $defaultConfigDir;
 	}
 
 	/**
@@ -71,7 +78,9 @@ class Detection implements IMimeTypeDetector {
 	 * @param string $mimetype
 	 * @param string|null $secureMimeType
 	 */
-	public function registerType($extension, $mimetype, $secureMimeType = null) {
+	public function registerType($extension,
+								 $mimetype,
+								 $secureMimeType = null) {
 		$this->mimetypes[$extension] = array($mimetype, $secureMimeType);
 		$this->secureMimeTypes[$mimetype] = $secureMimeType ?: $mimetype;
 	}
@@ -102,10 +111,10 @@ class Detection implements IMimeTypeDetector {
 			return;
 		}
 
-		$this->mimeTypeAlias = json_decode(file_get_contents($this->configDir . '/mimetypealiases.dist.json'), true);
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypealiases.dist.json'), true);
 
-		if (file_exists($this->configDir . '/mimetypealiases.json')) {
-			$custom = json_decode(file_get_contents($this->configDir . '/mimetypealiases.json'), true);
+		if (file_exists($this->customConfigDir . '/mimetypealiases.json')) {
+			$custom = json_decode(file_get_contents($this->customConfigDir . '/mimetypealiases.json'), true);
 			$this->mimeTypeAlias = array_merge($this->mimeTypeAlias, $custom);
 		}
 	}
@@ -126,15 +135,15 @@ class Detection implements IMimeTypeDetector {
 			return;
 		}
 
-		$mimetypemapping = json_decode(file_get_contents($this->configDir . '/mimetypemapping.dist.json'), true);
+		$mimetypeMapping = json_decode(file_get_contents($this->defaultConfigDir . '/mimetypemapping.dist.json'), true);
 
 		//Check if need to load custom mappings
-		if (file_exists($this->configDir . '/mimetypemapping.json')) {
-			$custom = json_decode(file_get_contents($this->configDir . '/mimetypemapping.json'), true);
-			$mimetypemapping = array_merge($mimetypemapping, $custom);
+		if (file_exists($this->customConfigDir . '/mimetypemapping.json')) {
+			$custom = json_decode(file_get_contents($this->customConfigDir . '/mimetypemapping.json'), true);
+			$mimetypeMapping = array_merge($mimetypeMapping, $custom);
 		}
 
-		$this->registerTypeArray($mimetypemapping);
+		$this->registerTypeArray($mimetypeMapping);
 	}
 
 	/**
diff --git a/lib/private/server.php b/lib/private/server.php
index d5f4f532c1c..9f99ead849b 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -470,7 +470,9 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('MimeTypeDetector', function(Server $c) {
 			return new \OC\Files\Type\Detection(
 				$c->getURLGenerator(),
-				\OC::$configDir);
+				\OC::$SERVERROOT . '/config/',
+				\OC::$SERVERROOT . '/resources/config/'
+				);
 		});
 		$this->registerService('MimeTypeLoader', function(Server $c) {
 			return new \OC\Files\Type\Loader(
diff --git a/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
similarity index 97%
rename from config/mimetypealiases.dist.json
rename to resources/config/mimetypealiases.dist.json
index 2c9bdaa00c8..3d6c5edc132 100644
--- a/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -1,7 +1,7 @@
 {
 	"_comment" : "Array of mimetype aliases.",
 	"_comment2": "Any changes you make here will be overwritten on an update of ownCloud.",
-	"_comment3": "Put any custom aliases in a new file mimetypealiases.json in this directory",
+	"_comment3": "Put any custom mappings in a new file mimetypealiases.json in the config/ folder of ownCloud",
 
 	"_comment4": "After any change to mimetypealiases.json run:",
 	"_comment5": "./occ maintenance:mimetypesjs",
diff --git a/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
similarity index 99%
rename from config/mimetypemapping.dist.json
rename to resources/config/mimetypemapping.dist.json
index 48ec4a56dab..79b0ca65240 100644
--- a/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -4,7 +4,7 @@
 	"_comment3": "and the second (if present] is a secure alternative",
 
 	"_comment4": "Any changes you make here will be overwritten on an update of ownCloud",
-	"_comment5": "Put any custom mappings in a new file mimetypemapping.json in this directory",
+	"_comment5": "Put any custom mappings in a new file mimetypemapping.json in the config/ folder of ownCloud",
 
 
 	"3gp": ["video/3gpp"],
diff --git a/tests/lib/files/type/detection.php b/tests/lib/files/type/detection.php
index 1997fa4dfd6..5800f4eb8e3 100644
--- a/tests/lib/files/type/detection.php
+++ b/tests/lib/files/type/detection.php
@@ -19,58 +19,64 @@
  *
  */
 
-namespace OC\Files\Type;
+namespace Test\Files\Type;
 
 use \OC\Files\Type\Detection;
 
 class DetectionTest extends \Test\TestCase {
+	/** @var Detection */
+	private $detection;
+
+	public function setUp() {
+		parent::setUp();
+		$this->detection = new Detection(
+			\OC::$server->getURLGenerator(),
+			\OC::$SERVERROOT . '/config/',
+			\OC::$SERVERROOT . '/resources/config/'
+		);
+	}
 
 	public function testDetect() {
-		$detection = new Detection(\OC::$server->getURLGenerator(), \OC::$configDir);
 		$dir = \OC::$SERVERROOT.'/tests/data';
 
-		$result = $detection->detect($dir."/");
+		$result = $this->detection->detect($dir."/");
 		$expected = 'httpd/unix-directory';
 		$this->assertEquals($expected, $result);
 
-		$result = $detection->detect($dir."/data.tar.gz");
+		$result = $this->detection->detect($dir."/data.tar.gz");
 		$expected = 'application/x-gzip';
 		$this->assertEquals($expected, $result);
 
-		$result = $detection->detect($dir."/data.zip");
+		$result = $this->detection->detect($dir."/data.zip");
 		$expected = 'application/zip';
 		$this->assertEquals($expected, $result);
 
-		$result = $detection->detect($dir."/testimagelarge.svg");
+		$result = $this->detection->detect($dir."/testimagelarge.svg");
 		$expected = 'image/svg+xml';
 		$this->assertEquals($expected, $result);
 
-		$result = $detection->detect($dir."/testimage.png");
+		$result = $this->detection->detect($dir."/testimage.png");
 		$expected = 'image/png';
 		$this->assertEquals($expected, $result);
 	}
 
 	public function testGetSecureMimeType() {
-		$detection = new Detection(\OC::$server->getURLGenerator(), \OC::$configDir);
-
-		$result = $detection->getSecureMimeType('image/svg+xml');
+		$result = $this->detection->getSecureMimeType('image/svg+xml');
 		$expected = 'text/plain';
 		$this->assertEquals($expected, $result);
 
-		$result = $detection->getSecureMimeType('image/png');
+		$result = $this->detection->getSecureMimeType('image/png');
 		$expected = 'image/png';
 		$this->assertEquals($expected, $result);
 	}
 
 	public function testDetectPath() {
-		$detection = new Detection(\OC::$server->getURLGenerator(), \OC::$configDir);
-
-		$this->assertEquals('text/plain', $detection->detectPath('foo.txt'));
-		$this->assertEquals('image/png', $detection->detectPath('foo.png'));
-		$this->assertEquals('image/png', $detection->detectPath('foo.bar.png'));
-		$this->assertEquals('application/octet-stream', $detection->detectPath('.png'));
-		$this->assertEquals('application/octet-stream', $detection->detectPath('foo'));
-		$this->assertEquals('application/octet-stream', $detection->detectPath(''));
+		$this->assertEquals('text/plain', $this->detection->detectPath('foo.txt'));
+		$this->assertEquals('image/png', $this->detection->detectPath('foo.png'));
+		$this->assertEquals('image/png', $this->detection->detectPath('foo.bar.png'));
+		$this->assertEquals('application/octet-stream', $this->detection->detectPath('.png'));
+		$this->assertEquals('application/octet-stream', $this->detection->detectPath('foo'));
+		$this->assertEquals('application/octet-stream', $this->detection->detectPath(''));
 	}
 
 	public function testDetectString() {
@@ -78,16 +84,14 @@ class DetectionTest extends \Test\TestCase {
 			$this->markTestSkipped('[Windows] Strings have mimetype application/octet-stream on Windows');
 		}
 
-		$detection = new Detection(\OC::$server->getURLGenerator(), \OC::$configDir);
-
-		$result = $detection->detectString("/data/data.tar.gz");
+		$result = $this->detection->detectString("/data/data.tar.gz");
 		$expected = 'text/plain; charset=us-ascii';
 		$this->assertEquals($expected, $result);
 	}
 
 	public function testMimeTypeIcon() {
 		if (!class_exists('org\\bovigo\\vfs\\vfsStream')) {
-			$this->markTestSkipped('Pacakge vfsStream not installed');
+			$this->markTestSkipped('Package vfsStream not installed');
 		}
 		$confDir = \org\bovigo\vfs\vfsStream::setup();
 		$mimetypealiases_dist = \org\bovigo\vfs\vfsStream::newFile('mimetypealiases.dist.json')->at($confDir);
@@ -111,7 +115,7 @@ class DetectionTest extends \Test\TestCase {
 			->with($this->equalTo('core'), $this->equalTo('filetypes/folder.png'))
 			->willReturn('folder.svg');
 
-		$detection = new Detection($urlGenerator, $confDir->url());
+		$detection = new Detection($urlGenerator, $confDir->url(), $confDir->url());
 		$mimeType = $detection->mimeTypeIcon('dir');
 		$this->assertEquals('folder.svg', $mimeType);
 
@@ -130,7 +134,7 @@ class DetectionTest extends \Test\TestCase {
 			->with($this->equalTo('core'), $this->equalTo('filetypes/folder-shared.png'))
 			->willReturn('folder-shared.svg');
 
-		$detection = new Detection($urlGenerator, $confDir->url());
+		$detection = new Detection($urlGenerator, $confDir->url(), $confDir->url());
 		$mimeType = $detection->mimeTypeIcon('dir-shared');
 		$this->assertEquals('folder-shared.svg', $mimeType);
 
@@ -150,7 +154,7 @@ class DetectionTest extends \Test\TestCase {
 			->with($this->equalTo('core'), $this->equalTo('filetypes/folder-external.png'))
 			->willReturn('folder-external.svg');
 
-		$detection = new Detection($urlGenerator, $confDir->url());
+		$detection = new Detection($urlGenerator, $confDir->url(), $confDir->url());
 		$mimeType = $detection->mimeTypeIcon('dir-external');
 		$this->assertEquals('folder-external.svg', $mimeType);
 
@@ -170,7 +174,7 @@ class DetectionTest extends \Test\TestCase {
 			->with($this->equalTo('core'), $this->equalTo('filetypes/my-type.png'))
 			->willReturn('my-type.svg');
 
-		$detection = new Detection($urlGenerator, $confDir->url());
+		$detection = new Detection($urlGenerator, $confDir->url(), $confDir->url());
 		$mimeType = $detection->mimeTypeIcon('my-type');
 		$this->assertEquals('my-type.svg', $mimeType);
 
@@ -200,7 +204,7 @@ class DetectionTest extends \Test\TestCase {
 				}
 			));
 
-		$detection = new Detection($urlGenerator, $confDir->url());
+		$detection = new Detection($urlGenerator, $confDir->url(), $confDir->url());
 		$mimeType = $detection->mimeTypeIcon('my-type');
 		$this->assertEquals('my.svg', $mimeType);
 
@@ -231,7 +235,7 @@ class DetectionTest extends \Test\TestCase {
 				}
 			));
 
-		$detection = new Detection($urlGenerator, $confDir->url());
+		$detection = new Detection($urlGenerator, $confDir->url(), $confDir->url());
 		$mimeType = $detection->mimeTypeIcon('foo-bar');
 		$this->assertEquals('file.svg', $mimeType);
 
@@ -250,7 +254,7 @@ class DetectionTest extends \Test\TestCase {
 			->with($this->equalTo('core'), $this->equalTo('filetypes/foo-bar.png'))
 			->willReturn('foo-bar.svg');
 
-		$detection = new Detection($urlGenerator, $confDir->url());
+		$detection = new Detection($urlGenerator, $confDir->url(), $confDir->url());
 		$mimeType = $detection->mimeTypeIcon('foo-bar');
 		$this->assertEquals('foo-bar.svg', $mimeType);
 		$mimeType = $detection->mimeTypeIcon('foo-bar');
@@ -276,7 +280,7 @@ class DetectionTest extends \Test\TestCase {
 			->with($this->equalTo('core'), $this->equalTo('filetypes/foobar-baz.png'))
 			->willReturn('foobar-baz.svg');
 
-		$detection = new Detection($urlGenerator, $confDir->url());
+		$detection = new Detection($urlGenerator, $confDir->url(), $confDir->url());
 		$mimeType = $detection->mimeTypeIcon('foo');
 		$this->assertEquals('foobar-baz.svg', $mimeType);
 	}
-- 
GitLab


From 4201f59402cfe7dbc9d69912abb19c3c6f19d8a4 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 8 Sep 2015 12:19:04 +0200
Subject: [PATCH 449/783] Update mimetypes

---
 core/js/mimetypelist.js | 57 +++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 34 deletions(-)

diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index e49ace6df73..af2ad73c51b 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -9,26 +9,23 @@
 OC.MimeTypeList={
 	aliases: {
     "application/coreldraw": "image",
-    "application/epub+zip": "text",
-    "application/font-sfnt": "image",
-    "application/font-woff": "image",
-    "application/illustrator": "image",
-	"application/javascript": "text/code",
+    "application/font-sfnt": "font",
+    "application/font-woff": "font",
+    "application/illustrator": "image/vector",
     "application/json": "text/code",
-    "application/msaccess": "file",
+    "application/msaccess": "database",
     "application/msexcel": "x-office/spreadsheet",
     "application/mspowerpoint": "x-office/presentation",
     "application/msword": "x-office/document",
     "application/octet-stream": "file",
-    "application/postscript": "image",
-	"application/rss+xml": "text/code",
+    "application/postscript": "image/vector",
     "application/vnd.android.package-archive": "package/x-generic",
     "application/vnd.ms-excel": "x-office/spreadsheet",
     "application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
-    "application/vnd.ms-fontobject": "image",
+    "application/vnd.ms-fontobject": "font",
     "application/vnd.ms-powerpoint": "x-office/presentation",
     "application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
     "application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -52,56 +49,48 @@ OC.MimeTypeList={
     "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
     "application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
     "application/x-7z-compressed": "package/x-generic",
-    "application/x-cbr": "text",
     "application/x-compressed": "package/x-generic",
     "application/x-dcraw": "image",
     "application/x-deb": "package/x-generic",
-    "application/x-font": "image",
+    "application/x-font": "font",
     "application/x-gimp": "image",
     "application/x-gzip": "package/x-generic",
     "application/x-perl": "text/code",
     "application/x-photoshop": "image",
     "application/x-php": "text/code",
     "application/x-rar-compressed": "package/x-generic",
-    "application/x-shockwave-flash": "application",
     "application/x-tar": "package/x-generic",
     "application/x-tex": "text",
     "application/xml": "text/html",
     "application/yaml": "text/code",
     "application/zip": "package/x-generic",
-    "database": "file",
     "httpd/unix-directory": "dir",
-    "image/svg+xml": "image",
-    "image/vector": "image",
+    "image/svg+xml": "image/vector",
     "text/css": "text/code",
     "text/csv": "x-office/spreadsheet",
-	"text/html": "text/code",
-	"text/x-c": "text/code",
-	"text/x-h": "text/code",
-	"text/x-python": "text/code",
-	"text/x-shellscript": "text/code",
-	"web": "text/code"
+    "text/x-shellscript": "text/code"
 },
 	files: [
-    "video",
+    "application-pdf",
+    "application",
+    "audio",
+    "file",
     "folder-drag-accept",
+    "folder-external",
     "folder-public",
+    "folder-shared",
+    "folder-starred",
+    "folder",
+    "image",
     "package-x-generic",
-    "folder-external",
-    "text-vcard",
-    "application",
+    "text-calendar",
     "text-code",
-    "x-office-spreadsheet",
-    "application-pdf",
-    "folder",
+    "text-vcard",
+    "text",
+    "video",
     "x-office-document",
-    "text-calendar",
     "x-office-presentation",
-    "file",
-    "text",
-    "folder-shared",
-    "image",
-    "audio"
+    "x-office-spreadsheet"
 ],
 	themes: []
 };
-- 
GitLab


From a7d84287ad150bc9b3008074829bb947f5cdd611 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 22 Sep 2015 16:47:52 +0200
Subject: [PATCH 450/783] Only render the plus button when it makes sense

---
 apps/files/js/filelist.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index ece330d41cc..3b7d39adf0f 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2537,8 +2537,9 @@
 		},
 
 		_renderNewButton: function() {
-			// if an upload button (legacy) already exists, skip
-			if ($('#controls .button.upload').length) {
+			// if an upload button (legacy) already exists or no actions container exist, skip
+			var $actionsContainer = this.$el.find('#controls .actions');
+			if (!$actionsContainer.length || this.$el.find('.button.upload').length) {
 				return;
 			}
 			if (!this._addButtonTemplate) {
@@ -2549,7 +2550,7 @@
 				iconUrl: OC.imagePath('core', 'actions/add')
 			}));
 
-			$('#controls .actions').prepend($newButton);
+			$actionsContainer.prepend($newButton);
 			$newButton.tooltip({'placement': 'bottom'});
 
 			$newButton.click(_.bind(this._onClickNewButton, this));
-- 
GitLab


From 03ca76f54f17ea46721292e6a8375e1dfc682d2c Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 22 Sep 2015 17:16:20 +0200
Subject: [PATCH 451/783] Fix bogus entry that appears when switching with
 arrow keys

---
 core/js/sharedialogview.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 2b61dab3ceb..57743118f28 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -176,6 +176,9 @@
 				$shareField.autocomplete({
 					minLength: 2,
 					delay: 750,
+					focus: function(event) {
+						event.preventDefault();
+					},
 					source: this.autocompleteHandler,
 					select: this._onSelectRecipient
 				}).data('ui-autocomplete')._renderItem = this.autocompleteRenderItem;
-- 
GitLab


From bea164274a210c7de56d8dbb5abcb61d4f60f80f Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Tue, 22 Sep 2015 16:00:14 +0200
Subject: [PATCH 452/783] left align checkboxes in group dropdown

---
 core/css/multiselect.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index a9451964f59..a4b03319156 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -33,9 +33,8 @@ ul.multiselectoptions>li {
 	white-space: nowrap;
 }
 
-ul.multiselectoptions > li > input[type="checkbox"] {
-	margin: 10px 7px;
-	vertical-align: middle;
+ul.multiselectoptions > li > input[type="checkbox"]+label:before {
+	margin-left: 7px;
 }
 ul.multiselectoptions > li input[type='checkbox']+label {
 	font-weight: normal;
-- 
GitLab


From 491250320a6b19f9a7d546598e97eac1e90f78f7 Mon Sep 17 00:00:00 2001
From: Martin <martin.mattel@diemattels.at>
Date: Mon, 21 Sep 2015 14:09:28 +0200
Subject: [PATCH 453/783] Replaces if ($file === '.' || $file === '..') by
 if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this
 operation is used.

---
 apps/files_external/lib/amazons3.php                 | 2 +-
 apps/files_external/lib/swift.php                    | 4 ++--
 apps/files_trashbin/lib/trashbin.php                 | 2 +-
 lib/private/files/storage/common.php                 | 4 ++--
 lib/private/files/storage/local.php                  | 2 +-
 lib/private/files/storage/polyfill/copydirectory.php | 2 +-
 lib/private/files/view.php                           | 2 +-
 lib/private/util.php                                 | 2 +-
 tests/lib/files/storage/wrapper/jail.php             | 2 +-
 tests/lib/testcase.php                               | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 34e8974a6d5..24a0346df63 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -517,7 +517,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			$dh = $this->opendir($path1);
 			if (is_resource($dh)) {
 				while (($file = readdir($dh)) !== false) {
-					if ($file === '.' || $file === '..') {
+					if (\OC\Files\Filesystem::isIgnoredDir($file)) {
 						continue;
 					}
 
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 6f93f3c84cd..20d2b8f4988 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -175,7 +175,7 @@ class Swift extends \OC\Files\Storage\Common {
 
 		$dh = $this->opendir($path);
 		while ($file = readdir($dh)) {
-			if ($file === '.' || $file === '..') {
+			if (\OC\Files\Filesystem::isIgnoredDir($file)) {
 				continue;
 			}
 
@@ -429,7 +429,7 @@ class Swift extends \OC\Files\Storage\Common {
 
 			$dh = $this->opendir($path1);
 			while ($file = readdir($dh)) {
-				if ($file === '.' || $file === '..') {
+				if (\OC\Files\Filesystem::isIgnoredDir($file)) {
 					continue;
 				}
 
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 3b2d4cf5929..2a9df94988d 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -895,7 +895,7 @@ class Trashbin {
 		$view = new \OC\Files\View('/' . $user . '/files_trashbin');
 		if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
 			while ($file = readdir($dh)) {
-				if ($file !== '.' and $file !== '..') {
+				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
 					return false;
 				}
 			}
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index a5ed5fd3996..2d579fa2b60 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -260,7 +260,7 @@ abstract class Common implements Storage {
 		$dh = $this->opendir($path);
 		if (is_resource($dh)) {
 			while (($file = readdir($dh)) !== false) {
-				if ($file !== '.' and $file !== '..') {
+				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
 					if ($this->is_dir($path . '/' . $file)) {
 						mkdir($target . '/' . $file);
 						$this->addLocalFolder($path . '/' . $file, $target . '/' . $file);
@@ -283,7 +283,7 @@ abstract class Common implements Storage {
 		$dh = $this->opendir($dir);
 		if (is_resource($dh)) {
 			while (($item = readdir($dh)) !== false) {
-				if ($item == '.' || $item == '..') continue;
+				if (\OC\Files\Filesystem::isIgnoredDir($item)) continue;
 				if (strstr(strtolower($item), strtolower($query)) !== false) {
 					$files[] = $dir . '/' . $item;
 				}
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 3676fe69131..4b6b08a16fd 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -283,7 +283,7 @@ class Local extends \OC\Files\Storage\Common {
 		$files = array();
 		$physicalDir = $this->getSourcePath($dir);
 		foreach (scandir($physicalDir) as $item) {
-			if ($item == '.' || $item == '..')
+			if (\OC\Files\Filesystem::isIgnoredDir($item))
 				continue;
 			$physicalItem = $physicalDir . '/' . $item;
 
diff --git a/lib/private/files/storage/polyfill/copydirectory.php b/lib/private/files/storage/polyfill/copydirectory.php
index 1b4873a3a76..73c6d3d5436 100644
--- a/lib/private/files/storage/polyfill/copydirectory.php
+++ b/lib/private/files/storage/polyfill/copydirectory.php
@@ -72,7 +72,7 @@ trait CopyDirectory {
 		$dh = $this->opendir($source);
 		$result = true;
 		while ($file = readdir($dh)) {
-			if ($file !== '.' and $file !== '..') {
+			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
 				if ($this->is_dir($source . '/' . $file)) {
 					$this->mkdir($target . '/' . $file);
 					$result = $this->copyRecursive($source . '/' . $file, $target . '/' . $file);
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 9afa9d40b20..d7119cf030d 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1656,7 +1656,7 @@ class View {
 		if ($trimmed === '') {
 			throw new InvalidPathException($l10n->t('Empty filename is not allowed'));
 		}
-		if ($trimmed === '.' || $trimmed === '..') {
+		if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) {
 			throw new InvalidPathException($l10n->t('Dot files are not allowed'));
 		}
 
diff --git a/lib/private/util.php b/lib/private/util.php
index eb1de5be5a4..667d358655f 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1433,7 +1433,7 @@ class OC_Util {
 		if ($trimmed === '') {
 			return false;
 		}
-		if ($trimmed === '.' || $trimmed === '..') {
+		if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) {
 			return false;
 		}
 		foreach (str_split($trimmed) as $char) {
diff --git a/tests/lib/files/storage/wrapper/jail.php b/tests/lib/files/storage/wrapper/jail.php
index a7bd684df44..9b16bc5a321 100644
--- a/tests/lib/files/storage/wrapper/jail.php
+++ b/tests/lib/files/storage/wrapper/jail.php
@@ -30,7 +30,7 @@ class Jail extends \Test\Files\Storage\Storage {
 		$contents = array();
 		$dh = $this->sourceStorage->opendir('');
 		while ($file = readdir($dh)) {
-			if ($file !== '.' and $file !== '..') {
+			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
 				$contents[] = $file;
 			}
 		}
diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index 854d5f4f65b..7e4890a46c2 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -193,7 +193,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 	static protected function tearDownAfterClassCleanStrayDataUnlinkDir($dir) {
 		if ($dh = @opendir($dir)) {
 			while (($file = readdir($dh)) !== false) {
-				if ($file === '..' || $file === '.') {
+				if (\OC\Files\Filesystem::isIgnoredDir($file)) {
 					continue;
 				}
 				$path = $dir . '/' . $file;
-- 
GitLab


From 7b19b99e82e22979a0d22db4a69b1138e777a586 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Tue, 22 Sep 2015 19:02:08 +0200
Subject: [PATCH 454/783] add style for disabled checkboxes

---
 core/css/styles.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/css/styles.css b/core/css/styles.css
index 1a4a4ab4f3d..aefc0ff755a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -178,6 +178,8 @@ input[type="checkbox"] + label:before {
 	opacity: 0.7;
 }
 
+input[type="checkbox"]:disabled +label:before { opacity: .6; }
+
 input[type="checkbox"].u-left +label:before { float: left; }
 
 input[type="checkbox"].white + label:before {
-- 
GitLab


From 3f0a870908fb0c63b46e15d32fa9468105e224a1 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Tue, 22 Sep 2015 23:31:50 +0200
Subject: [PATCH 455/783] implement builder pattern in tipsy shim

---
 core/js/js.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/js/js.js b/core/js/js.js
index de773dc1221..b5971bfc579 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1972,4 +1972,5 @@ jQuery.fn.tipsy = function(argument) {
 		this.tooltip(argument);
 		jQuery.fn.tooltip.call(this, argument);
 	}
+	return this;
 }
-- 
GitLab


From ee75f9f59491cf7498cbe787694605d963b3dfc9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 23 Sep 2015 10:13:41 +0200
Subject: [PATCH 456/783] Fix type hint errors in the container and the
 interface

---
 lib/private/appframework/utility/simplecontainer.php | 4 ++--
 lib/public/icontainer.php                            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index 5d7ea48752b..3de6d9ba5bc 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -45,7 +45,7 @@ class SimpleContainer extends Container implements IContainer {
 
 	/**
 	 * @param ReflectionClass $class the class to instantiate
-	 * @return stdClass the created class
+	 * @return \stdClass the created class
 	 */
 	private function buildClass(ReflectionClass $class) {
 		$constructor = $class->getConstructor();
@@ -74,7 +74,7 @@ class SimpleContainer extends Container implements IContainer {
 	 * If a parameter is not registered in the container try to instantiate it
 	 * by using reflection to find out how to build the class
 	 * @param string $name the class name to resolve
-	 * @return stdClass
+	 * @return \stdClass
 	 * @throws QueryException if the class could not be found or instantiated
 	 */
 	public function resolve($name) {
diff --git a/lib/public/icontainer.php b/lib/public/icontainer.php
index ffd1d16c97e..64d5a7d8c1a 100644
--- a/lib/public/icontainer.php
+++ b/lib/public/icontainer.php
@@ -31,6 +31,7 @@
 namespace OCP;
 
 use Closure;
+use OCP\AppFramework\QueryException;
 
 
 /**
-- 
GitLab


From 4410ca50354d245106e454a8eec08231509f2d1d Mon Sep 17 00:00:00 2001
From: Carla Schroder <carla@owncloud.com>
Date: Fri, 18 Sep 2015 08:46:12 -0700
Subject: [PATCH 457/783] add example for 3rdparty configuration

---
 config/config.sample.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 8949bd44465..51529cdb0cc 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -609,7 +609,9 @@ $CONFIG = array(
 /**
  * ownCloud uses some 3rd party PHP components to provide certain functionality.
  * These components are shipped as part of the software package and reside in
- * ``owncloud/3rdparty``. Use this option to configure a different location.
+ * ``owncloud/3rdparty``. Use this option to configure a different location. 
+ * For example, if your location is /var/www/owncloud/foo/3rdparty, then the 
+ * correct configuration is '3rdpartyroot' => '/var/www/owncloud/foo/',
  */
 '3rdpartyroot' => '',
 
-- 
GitLab


From 0bda4d54c5b77b4ea2865fbcc27f8c86d9f20513 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 25 Aug 2015 14:09:38 +0200
Subject: [PATCH 458/783] Repair mime types only when upgrading from OC 8.0

---
 lib/private/repair.php               |  2 +-
 lib/repair/repairmimetypes.php       | 66 ++++++++++++++++++----------
 tests/lib/repair/repairmimetypes.php | 11 ++++-
 3 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/lib/private/repair.php b/lib/private/repair.php
index 533bf05b54c..3639440a518 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -103,7 +103,7 @@ class Repair extends BasicEmitter {
 	 */
 	public static function getRepairSteps() {
 		return [
-			new RepairMimeTypes(),
+			new RepairMimeTypes(\OC::$server->getConfig()),
 			new RepairLegacyStorages(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
 			new RepairConfig(),
 			new AssetCache(),
diff --git a/lib/repair/repairmimetypes.php b/lib/repair/repairmimetypes.php
index 89ad0ed16c7..db11f526ad6 100644
--- a/lib/repair/repairmimetypes.php
+++ b/lib/repair/repairmimetypes.php
@@ -29,6 +29,17 @@ namespace OC\Repair;
 use OC\Hooks\BasicEmitter;
 
 class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
+	/**
+	 * @var \OCP\IConfig
+	 */
+	protected $config;
+
+	/**
+	 * @param \OCP\IConfig $config
+	 */
+	public function __construct($config) {
+		$this->config = $config;
+	}
 
 	public function getName() {
 		return 'Repair mime types';
@@ -243,36 +254,45 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
 	 * Fix mime types
 	 */
 	public function run() {
-		if ($this->fixOfficeMimeTypes()) {
-			$this->emit('\OC\Repair', 'info', array('Fixed office mime types'));
-		}
 
-		if ($this->fixApkMimeType()) {
-			$this->emit('\OC\Repair', 'info', array('Fixed APK mime type'));
-		}
+		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
 
-		if ($this->fixFontsMimeTypes()) {
-			$this->emit('\OC\Repair', 'info', array('Fixed fonts mime types'));
-		}
+		// NOTE TO DEVELOPERS: when adding new mime types, please make sure to
+		// add a version comparison to avoid doing it every time
 
-		if ($this->fixPostscriptMimeType()) {
-			$this->emit('\OC\Repair', 'info', array('Fixed Postscript mime types'));
-		}
+		// only update mime types if necessary as it can be expensive
+		if (version_compare($ocVersionFromBeforeUpdate, '8.2.0', '<')) {
+			if ($this->fixOfficeMimeTypes()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed office mime types'));
+			}
 
-		if ($this->introduceRawMimeType()) {
-			$this->emit('\OC\Repair', 'info', array('Fixed Raw mime types'));
-		}
+			if ($this->fixApkMimeType()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed APK mime type'));
+			}
 
-		if ($this->introduce3dImagesMimeType()) {
-			$this->emit('\OC\Repair', 'info', array('Fixed 3D images mime types'));
-		}
+			if ($this->fixFontsMimeTypes()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed fonts mime types'));
+			}
 
-		if ($this->introduceConfMimeType()) {
-			$this->emit('\OC\Repair', 'info', array('Fixed Conf/cnf mime types'));
-		}
+			if ($this->fixPostscriptMimeType()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed Postscript mime types'));
+			}
+
+			if ($this->introduceRawMimeType()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed Raw mime types'));
+			}
+
+			if ($this->introduce3dImagesMimeType()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed 3D images mime types'));
+			}
 
-		if ($this->introduceYamlMimeType()) {
-			$this->emit('\OC\Repair', 'info', array('Fixed Yaml/Yml mime types'));
+			if ($this->introduceConfMimeType()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed Conf/cnf mime types'));
+			}
+
+			if ($this->introduceYamlMimeType()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed Yaml/Yml mime types'));
+			}
 		}
 	}
 }
diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php
index da36e7de58a..3c100b808cf 100644
--- a/tests/lib/repair/repairmimetypes.php
+++ b/tests/lib/repair/repairmimetypes.php
@@ -26,8 +26,17 @@ class RepairMimeTypes extends \Test\TestCase {
 		$this->savedMimetypeLoader = \OC::$server->getMimeTypeLoader();
 		$this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
 
+		$config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$config->expects($this->any())
+			->method('getSystemValue')
+			->with('version')
+			->will($this->returnValue('8.0.0.0'));
+
 		$this->storage = new \OC\Files\Storage\Temporary([]);
-		$this->repair = new \OC\Repair\RepairMimeTypes();
+
+		$this->repair = new \OC\Repair\RepairMimeTypes($config);
 	}
 
 	protected function tearDown() {
-- 
GitLab


From bf1cb20e908d6cc6d84be733f7137a6edf92697b Mon Sep 17 00:00:00 2001
From: Individual IT Services <info@individual-it.net>
Date: Thu, 17 Sep 2015 12:59:04 +0545
Subject: [PATCH 459/783] do not load unnecessary code in case of webdav

changing from "protected static" to "protected"
as suggested by @nickvergessen
https://github.com/owncloud/core/pull/19114#discussion_r39719851

moving initTemplate() into template constr.

reduce to move initTemplate only

cleanup spaces
---
 lib/base.php             | 66 +---------------------------------
 lib/private/server.php   | 21 +++++++++++
 lib/private/template.php | 77 ++++++++++++++++++++++++++++++++++++++++
 lib/private/util.php     | 30 ++++++++++++----
 4 files changed, 122 insertions(+), 72 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 3624a3fbaf9..a607be87b59 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -376,63 +376,6 @@ class OC {
 		$tmpl->printPage();
 	}
 
-	public static function initTemplateEngine() {
-		// Add the stuff we need always
-		// following logic will import all vendor libraries that are
-		// specified in core/js/core.json
-		$fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
-		if($fileContent !== false) {
-			$coreDependencies = json_decode($fileContent, true);
-			foreach($coreDependencies['vendor'] as $vendorLibrary) {
-				// remove trailing ".js" as addVendorScript will append it
-				OC_Util::addVendorScript(
-					substr($vendorLibrary, 0, strlen($vendorLibrary) - 3));
-			}
-		} else {
-			throw new \Exception('Cannot read core/js/core.json');
-		}
-
-		OC_Util::addScript("placeholders");
-		OC_Util::addScript("compatibility");
-		OC_Util::addScript("jquery.ocdialog");
-		OC_Util::addScript("oc-dialogs");
-		OC_Util::addScript("js");
-		OC_Util::addScript("l10n");
-		OC_Util::addTranslations("core");
-		OC_Util::addScript("octemplate");
-		OC_Util::addScript("eventsource");
-		OC_Util::addScript("config");
-		OC_Util::addScript('search', 'search');
-		OC_Util::addScript("oc-requesttoken");
-		OC_Util::addScript("apps");
-		OC_Util::addScript('mimetype');
-		OC_Util::addScript('mimetypelist');
-		OC_Util::addVendorScript('snapjs/dist/latest/snap');
-		OC_Util::addVendorScript('core', 'backbone/backbone');
-		OC_Util::addScript('oc-backbone');
-
-		// avatars
-		if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) {
-			\OC_Util::addScript('placeholder');
-			\OC_Util::addVendorScript('blueimp-md5/js/md5');
-			\OC_Util::addScript('jquery.avatar');
-			\OC_Util::addScript('avatar');
-		}
-
-		OC_Util::addStyle("styles");
-		OC_Util::addStyle("header");
-		OC_Util::addStyle("mobile");
-		OC_Util::addStyle("icons");
-		OC_Util::addStyle("fonts");
-		OC_Util::addStyle("apps");
-		OC_Util::addStyle("fixes");
-		OC_Util::addStyle("multiselect");
-		OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui');
-		OC_Util::addStyle('jquery-ui-fixes');
-		OC_Util::addStyle("tooltip");
-		OC_Util::addStyle("jquery.ocdialog");
-	}
-
 	public static function initSession() {
 		// prevents javascript from accessing php session cookies
 		ini_set('session.cookie_httponly', true);
@@ -611,7 +554,6 @@ class OC {
 			self::initSession();
 		}
 		\OC::$server->getEventLogger()->end('init_session');
-		self::initTemplateEngine();
 		self::checkConfig();
 		self::checkInstalled();
 
@@ -673,7 +615,7 @@ class OC {
 		self::registerFilesystemHooks();
 		if ($systemConfig->getValue('enable_previews', true)) {
 			self::registerPreviewHooks();
-		}	
+		}
 		self::registerShareHooks();
 		self::registerLogRotate();
 		self::registerLocalAddressBook();
@@ -686,12 +628,6 @@ class OC {
 		$lockProvider = \OC::$server->getLockingProvider();
 		register_shutdown_function(array($lockProvider, 'releaseAll'));
 
-		if ($systemConfig->getValue('installed', false) && !self::checkUpgrade(false)) {
-			if (\OC::$server->getConfig()->getAppValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
-				OC_Util::addScript('backgroundjobs');
-			}
-		}
-
 		// Check whether the sample configuration has been copied
 		if($systemConfig->getValue('copied_sample_config', false)) {
 			$l = \OC::$server->getL10N('lib');
diff --git a/lib/private/server.php b/lib/private/server.php
index 9f99ead849b..2e77eeb91c5 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -76,6 +76,9 @@ class Server extends SimpleContainer implements IServerContainer {
 	/** @var string */
 	private $webRoot;
 
+	/** @var string */
+	protected $service = null;
+	
 	/**
 	 * @param string $webRoot
 	 */
@@ -1067,6 +1070,23 @@ class Server extends SimpleContainer implements IServerContainer {
 		return $this->query('CryptoWrapper');
 	}
 
+	/**
+	 * @return requested service
+	 */
+	public function getService() {
+		if (! isset ($this->service )) {
+			$pathInfo = self::getRequest ()->getPathInfo ();
+			if ($pathInfo === false || $pathInfo === '') {
+				return;
+			}
+			if (! $pos = strpos ( $pathInfo, '/', 1 )) {
+				$pos = strlen ( $pathInfo );
+			}
+		$this->service=substr ( $pathInfo, 1, $pos - 1 );
+		}
+		return $this->service;
+	}	
+	
 	/**
 	 * Not a public API as of 8.2, wait for 9.0
 	 * @return \OCA\Files_External\Service\BackendService
@@ -1098,4 +1118,5 @@ class Server extends SimpleContainer implements IServerContainer {
 	public function getUserStoragesService() {
 		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserStoragesService');
 	}
+	
 }
diff --git a/lib/private/template.php b/lib/private/template.php
index 920be71abbf..ef2f71b7f86 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -56,8 +56,13 @@ class OC_Template extends \OC\Template\Base {
 	 * according layout. For now, renderas can be set to "guest", "user" or
 	 * "admin".
 	 */
+	
+	protected static $initTemplateEngineFirstrun = true;
+	
 	public function __construct( $app, $name, $renderas = "", $registerCall = true ) {
 		// Read the selected theme from the config file
+		$this->initTemplateEngine();
+		
 		$theme = OC_Util::getTheme();
 
 		$requesttoken = (OC::$server->getSession() and $registerCall) ? OC_Util::callRegister() : '';
@@ -76,6 +81,78 @@ class OC_Template extends \OC\Template\Base {
 		parent::__construct($template, $requesttoken, $l10n, $themeDefaults);
 	}
 
+	public static function initTemplateEngine() {
+		if (self::$initTemplateEngineFirstrun){
+			
+			//apps that started before the template initialization can load their own scripts
+			//so to make sure this scripts here are loaded first we use OC_Util::addScript() with $prepend=true
+			//meaning the last scripts in this list will be loaded first
+			if (\OC::$server->getSystemConfig ()->getValue ( 'installed', false ) && ! \OCP\Util::needUpgrade ()) {
+				if (\OC::$server->getConfig ()->getAppValue ( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax') {
+					OC_Util::addScript ( 'backgroundjobs', null, true );
+				}
+			}
+
+			OC_Util::addStyle ( "styles" );
+			OC_Util::addStyle ( "header" );
+			OC_Util::addStyle ( "mobile" );
+			OC_Util::addStyle ( "icons" );
+			OC_Util::addStyle ( "fonts" );
+			OC_Util::addStyle ( "apps" );
+			OC_Util::addStyle ( "fixes" );
+			OC_Util::addStyle ( "multiselect" );
+			OC_Util::addVendorStyle ( 'jquery-ui/themes/base/jquery-ui');
+			OC_Util::addStyle ( 'jquery-ui-fixes' );
+			OC_Util::addStyle ( "tooltip" );
+			
+			// avatars
+			if (\OC::$server->getSystemConfig ()->getValue ( 'enable_avatars', true ) === true) {
+				\OC_Util::addScript ( 'avatar', null, true );
+				\OC_Util::addScript ( 'jquery.avatar', null, true );
+				\OC_Util::addScript ( 'placeholder', null, true );
+			}			
+			
+			OC_Util::addScript ( 'oc-backbone', null, true );
+			OC_Util::addVendorScript ( 'core', 'backbone/backbone', null, true );
+			OC_Util::addVendorScript ( 'snapjs/dist/latest/snap', null, true );
+			OC_Util::addScript ( 'mimetypelist', null, true );
+			OC_Util::addScript ( 'mimetype', null, true );
+			OC_Util::addScript ( "apps", null, true );
+			OC_Util::addScript ( "oc-requesttoken", null, true );
+			OC_Util::addScript ( 'search', 'search', true );
+			OC_Util::addScript ( "config", null, true );
+			OC_Util::addScript ( "eventsource", null, true );
+			OC_Util::addScript ( "octemplate", null, true );
+			OC_Util::addTranslations ( "core", null, true );
+			OC_Util::addScript ( "l10n", null, true );
+			OC_Util::addScript ( "js", null, true );
+			OC_Util::addScript ( "oc-dialogs", null, true );
+			OC_Util::addScript ( "jquery.ocdialog", null, true );
+			OC_Util::addStyle ( "jquery.ocdialog" );
+			OC_Util::addScript ( "compatibility", null, true );
+			OC_Util::addScript ( "placeholders", null, true );		
+			
+			// Add the stuff we need always
+			// following logic will import all vendor libraries that are
+			// specified in core/js/core.json
+			$fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
+			if($fileContent !== false) {
+				$coreDependencies = json_decode($fileContent, true);
+				foreach(array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
+					// remove trailing ".js" as addVendorScript will append it
+					OC_Util::addVendorScript(
+							substr($vendorLibrary, 0, strlen($vendorLibrary) - 3),null,true);
+				}
+			} else {
+				throw new \Exception('Cannot read core/js/core.json');
+			}
+			
+			self::$initTemplateEngineFirstrun = false;
+		}
+	
+	}
+	
+	
 	/**
 	 * find the template with the given name
 	 * @param string $name of the template file (without suffix)
diff --git a/lib/private/util.php b/lib/private/util.php
index eb1de5be5a4..117e57f66d7 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -439,16 +439,22 @@ class OC_Util {
 	 *
 	 * @param string $application application id
 	 * @param string|null $file filename
+	 * @param bool $prepend prepend the Script to the beginning of the list
 	 * @return void
 	 */
-	public static function addScript($application, $file = null) {
+	public static function addScript($application, $file = null, $prepend = false) {
 		$path = OC_Util::generatePath($application, 'js', $file);
 		if (!in_array($path, self::$scripts)) {
 			// core js files need separate handling
 			if ($application !== 'core' && $file !== null) {
 				self::addTranslations($application);
 			}
-			self::$scripts[] = $path;
+			if ($prepend===true) {
+				array_unshift(self::$scripts, $path);
+			}
+			else {
+				self::$scripts[] = $path;
+			}
 		}
 	}
 
@@ -457,12 +463,17 @@ class OC_Util {
 	 *
 	 * @param string $application application id
 	 * @param string|null $file filename
+	 * @param bool $prepend prepend the Script to the beginning of the list
 	 * @return void
 	 */
-	public static function addVendorScript($application, $file = null) {
+	public static function addVendorScript($application, $file = null, $prepend = false) {
 		$path = OC_Util::generatePath($application, 'vendor', $file);
-		if (!in_array($path, self::$scripts)) {
-			self::$scripts[] = $path;
+		if (! in_array ( $path, self::$scripts )) {
+			if ($prepend === true) {
+				array_unshift ( self::$scripts, $path );
+			} else {
+				self::$scripts [] = $path;
+			}
 		}
 	}
 
@@ -471,8 +482,9 @@ class OC_Util {
 	 *
 	 * @param string $application application id
 	 * @param string $languageCode language code, defaults to the current language
+	 * @param bool $prepend prepend the Script to the beginning of the list 
 	 */
-	public static function addTranslations($application, $languageCode = null) {
+	public static function addTranslations($application, $languageCode = null, $prepend = false) {
 		if (is_null($languageCode)) {
 			$languageCode = \OC_L10N::findLanguage($application);
 		}
@@ -482,7 +494,11 @@ class OC_Util {
 			$path = "l10n/$languageCode";
 		}
 		if (!in_array($path, self::$scripts)) {
-			self::$scripts[] = $path;
+			if ($prepend === true) {
+				array_unshift ( self::$scripts, $path );
+			} else {
+				self::$scripts [] = $path;
+			}
 		}
 	}
 
-- 
GitLab


From af39e59e8893f75d156257f998f5f4d8faf668e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 23 Sep 2015 12:00:07 +0200
Subject: [PATCH 460/783] getService() is not needed -> remove

---
 lib/private/server.php | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/lib/private/server.php b/lib/private/server.php
index 2e77eeb91c5..26eb99927fc 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -76,9 +76,6 @@ class Server extends SimpleContainer implements IServerContainer {
 	/** @var string */
 	private $webRoot;
 
-	/** @var string */
-	protected $service = null;
-	
 	/**
 	 * @param string $webRoot
 	 */
@@ -1070,23 +1067,6 @@ class Server extends SimpleContainer implements IServerContainer {
 		return $this->query('CryptoWrapper');
 	}
 
-	/**
-	 * @return requested service
-	 */
-	public function getService() {
-		if (! isset ($this->service )) {
-			$pathInfo = self::getRequest ()->getPathInfo ();
-			if ($pathInfo === false || $pathInfo === '') {
-				return;
-			}
-			if (! $pos = strpos ( $pathInfo, '/', 1 )) {
-				$pos = strlen ( $pathInfo );
-			}
-		$this->service=substr ( $pathInfo, 1, $pos - 1 );
-		}
-		return $this->service;
-	}	
-	
 	/**
 	 * Not a public API as of 8.2, wait for 9.0
 	 * @return \OCA\Files_External\Service\BackendService
-- 
GitLab


From 38a260e963abd04b75aff8d67a8cf7b3b20a9c67 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 17 Sep 2015 10:24:19 +0100
Subject: [PATCH 461/783] Revert "Implement more fine-grained external storage
 permissions model"

This reverts commit 0b97a05e7bd631d66de1c2aee115113ada8a5f63.
This reverts commit d2e3c17c0000bc0020f1ff641190452f370434de.
This reverts commit cc88c5f4b84da57c425cbdb7dc8b391b1942b503.
---
 .../controller/globalstoragescontroller.php   |  12 +-
 .../controller/storagescontroller.php         |  13 +-
 .../controller/userstoragescontroller.php     |  12 +-
 .../files_external/lib/auth/authmechanism.php |   6 +-
 apps/files_external/lib/backend/backend.php   |   6 +-
 apps/files_external/lib/backend/local.php     |   2 +-
 apps/files_external/lib/backend/sftp_key.php  |   2 -
 apps/files_external/lib/backend/smb_oc.php    |   2 -
 apps/files_external/lib/permissionstrait.php  | 164 ------------------
 apps/files_external/lib/visibilitytrait.php   | 136 +++++++++++++++
 apps/files_external/personal.php              |   4 +-
 .../files_external/service/backendservice.php |  20 +--
 apps/files_external/settings.php              |   8 +-
 apps/files_external/templates/settings.php    |   2 +-
 .../controller/storagescontrollertest.php     |  16 +-
 .../controller/userstoragescontrollertest.php |  16 +-
 .../tests/service/backendservicetest.php      |   6 +-
 17 files changed, 190 insertions(+), 237 deletions(-)
 delete mode 100644 apps/files_external/lib/permissionstrait.php
 create mode 100644 apps/files_external/lib/visibilitytrait.php

diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php
index 7d97fdbb4f4..3686a6189b4 100644
--- a/apps/files_external/controller/globalstoragescontroller.php
+++ b/apps/files_external/controller/globalstoragescontroller.php
@@ -98,7 +98,7 @@ class GlobalStoragesController extends StoragesController {
 			return $newStorage;
 		}
 
-		$response = $this->validate($newStorage, BackendService::PERMISSION_CREATE);
+		$response = $this->validate($newStorage);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -154,7 +154,7 @@ class GlobalStoragesController extends StoragesController {
 		}
 		$storage->setId($id);
 
-		$response = $this->validate($storage, BackendService::PERMISSION_MODIFY);
+		$response = $this->validate($storage);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -180,12 +180,12 @@ class GlobalStoragesController extends StoragesController {
 	}
 
 	/**
-	 * Get the user type for this controller, used in validation
+	 * Get the visibility type for this controller, used in validation
 	 *
-	 * @return string BackendService::USER_* constants
+	 * @return string BackendService::VISIBILITY_* constants
 	 */
-	protected function getUserType() {
-		return BackendService::USER_ADMIN;
+	protected function getVisibilityType() {
+		return BackendService::VISIBILITY_ADMIN;
 	}
 
 
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php
index 46202c8ba4a..71055fd1b9c 100644
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/controller/storagescontroller.php
@@ -125,11 +125,10 @@ abstract class StoragesController extends Controller {
 	 * Validate storage config
 	 *
 	 * @param StorageConfig $storage storage config
-	 * @param int $permissionCheck permission to check
 	 *
 	 * @return DataResponse|null returns response in case of validation error
 	 */
-	protected function validate(StorageConfig $storage, $permissionCheck = BackendService::PERMISSION_CREATE) {
+	protected function validate(StorageConfig $storage) {
 		$mountPoint = $storage->getMountPoint();
 		if ($mountPoint === '' || $mountPoint === '/') {
 			return new DataResponse(
@@ -166,7 +165,7 @@ abstract class StoragesController extends Controller {
 			);
 		}
 
-		if (!$backend->isPermitted($this->getUserType(), $permissionCheck)) {
+		if (!$backend->isVisibleFor($this->getVisibilityType())) {
 			// not permitted to use backend
 			return new DataResponse(
 				array(
@@ -177,7 +176,7 @@ abstract class StoragesController extends Controller {
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
 		}
-		if (!$authMechanism->isPermitted($this->getUserType(), $permissionCheck)) {
+		if (!$authMechanism->isVisibleFor($this->getVisibilityType())) {
 			// not permitted to use auth mechanism
 			return new DataResponse(
 				array(
@@ -212,11 +211,11 @@ abstract class StoragesController extends Controller {
 	}
 
 	/**
-	 * Get the user type for this controller, used in validation
+	 * Get the visibility type for this controller, used in validation
 	 *
-	 * @return string BackendService::USER_* constants
+	 * @return string BackendService::VISIBILITY_* constants
 	 */
-	abstract protected function getUserType();
+	abstract protected function getVisibilityType();
 
 	/**
 	 * Check whether the given storage is available / valid.
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php
index 801c9ab0aae..fcbe692d79e 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/controller/userstoragescontroller.php
@@ -103,7 +103,7 @@ class UserStoragesController extends StoragesController {
 			return $newStorage;
 		}
 
-		$response = $this->validate($newStorage, BackendService::PERMISSION_CREATE);
+		$response = $this->validate($newStorage);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -151,7 +151,7 @@ class UserStoragesController extends StoragesController {
 		}
 		$storage->setId($id);
 
-		$response = $this->validate($storage, BackendService::PERMISSION_MODIFY);
+		$response = $this->validate($storage);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -188,12 +188,12 @@ class UserStoragesController extends StoragesController {
 	}
 
 	/**
-	 * Get the user type for this controller, used in validation
+	 * Get the visibility type for this controller, used in validation
 	 *
-	 * @return string BackendService::USER_* constants
+	 * @return string BackendService::VISIBILITY_* constants
 	 */
-	protected function getUserType() {
-		return BackendService::USER_PERSONAL;
+	protected function getVisibilityType() {
+		return BackendService::VISIBILITY_PERSONAL;
 	}
 
 }
diff --git a/apps/files_external/lib/auth/authmechanism.php b/apps/files_external/lib/auth/authmechanism.php
index ddc0c6a4dca..11d99bb330d 100644
--- a/apps/files_external/lib/auth/authmechanism.php
+++ b/apps/files_external/lib/auth/authmechanism.php
@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Lib\Auth;
 
 use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\PermissionsTrait;
+use \OCA\Files_External\Lib\VisibilityTrait;
 use \OCA\Files_External\Lib\IdentifierTrait;
 use \OCA\Files_External\Lib\FrontendDefinitionTrait;
 use \OCA\Files_External\Lib\StorageModifierTrait;
@@ -40,7 +40,7 @@ use \OCA\Files_External\Lib\StorageModifierTrait;
  * scheme, which are provided from the authentication mechanism.
  *
  * This class uses the following traits:
- *  - PermissionsTrait
+ *  - VisibilityTrait
  *      Restrict usage to admin-only/none
  *  - FrontendDefinitionTrait
  *      Specify configuration parameters and other definitions
@@ -58,7 +58,7 @@ class AuthMechanism implements \JsonSerializable {
 	const SCHEME_PUBLICKEY = 'publickey';
 	const SCHEME_OPENSTACK = 'openstack';
 
-	use PermissionsTrait;
+	use VisibilityTrait;
 	use FrontendDefinitionTrait;
 	use StorageModifierTrait;
 	use IdentifierTrait;
diff --git a/apps/files_external/lib/backend/backend.php b/apps/files_external/lib/backend/backend.php
index 2a2add3ac59..90d5d38ed94 100644
--- a/apps/files_external/lib/backend/backend.php
+++ b/apps/files_external/lib/backend/backend.php
@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\PermissionsTrait;
+use \OCA\Files_External\Lib\VisibilityTrait;
 use \OCA\Files_External\Lib\FrontendDefinitionTrait;
 use \OCA\Files_External\Lib\PriorityTrait;
 use \OCA\Files_External\Lib\DependencyTrait;
@@ -43,7 +43,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  * scheme, which are provided from the authentication mechanism.
  *
  * This class uses the following traits:
- *  - PermissionsTrait
+ *  - VisibilityTrait
  *      Restrict usage to admin-only/none
  *  - FrontendDefinitionTrait
  *      Specify configuration parameters and other definitions
@@ -56,7 +56,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  */
 class Backend implements \JsonSerializable {
 
-	use PermissionsTrait;
+	use VisibilityTrait;
 	use FrontendDefinitionTrait;
 	use PriorityTrait;
 	use DependencyTrait;
diff --git a/apps/files_external/lib/backend/local.php b/apps/files_external/lib/backend/local.php
index a6635491b6e..a80b437fab7 100644
--- a/apps/files_external/lib/backend/local.php
+++ b/apps/files_external/lib/backend/local.php
@@ -39,7 +39,7 @@ class Local extends Backend {
 			->addParameters([
 				(new DefinitionParameter('datadir', $l->t('Location'))),
 			])
-			->setAllowedPermissions(BackendService::USER_PERSONAL, BackendService::PERMISSION_NONE)
+			->setAllowedVisibility(BackendService::VISIBILITY_ADMIN)
 			->setPriority(BackendService::PRIORITY_DEFAULT + 50)
 			->addAuthScheme(AuthMechanism::SCHEME_NULL)
 			->setLegacyAuthMechanism($legacyAuth)
diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/backend/sftp_key.php
index 6a75172026d..4a7f565eb19 100644
--- a/apps/files_external/lib/backend/sftp_key.php
+++ b/apps/files_external/lib/backend/sftp_key.php
@@ -40,8 +40,6 @@ class SFTP_Key extends Backend {
 				(new DefinitionParameter('root', $l->t('Remote subfolder')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
-			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
-			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
 			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php
index d21b0ddaf42..a3f3a824040 100644
--- a/apps/files_external/lib/backend/smb_oc.php
+++ b/apps/files_external/lib/backend/smb_oc.php
@@ -51,8 +51,6 @@ class SMB_OC extends Backend {
 				(new DefinitionParameter('root', $l->t('Remote subfolder')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
-			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
-			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
 			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
diff --git a/apps/files_external/lib/permissionstrait.php b/apps/files_external/lib/permissionstrait.php
deleted file mode 100644
index 8509a01e422..00000000000
--- a/apps/files_external/lib/permissionstrait.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/**
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Files_External\Lib;
-
-use \OCA\Files_External\Service\BackendService;
-
-/**
- * Trait to implement backend and auth mechanism permissions
- *
- * For user type constants, see BackendService::USER_*
- * For permission constants, see BackendService::PERMISSION_*
- */
-trait PermissionsTrait {
-
-	/** @var array [user type => permissions] */
-	protected $permissions = [
-		BackendService::USER_PERSONAL => BackendService::PERMISSION_DEFAULT,
-		BackendService::USER_ADMIN => BackendService::PERMISSION_DEFAULT,
-	];
-
-	/** @var array [user type => allowed permissions] */
-	protected $allowedPermissions = [
-		BackendService::USER_PERSONAL => BackendService::PERMISSION_DEFAULT,
-		BackendService::USER_ADMIN => BackendService::PERMISSION_DEFAULT,
-	];
-
-	/**
-	 * @param string $userType
-	 * @return int
-	 */
-	public function getPermissions($userType) {
-		if (isset($this->permissions[$userType])) {
-			return $this->permissions[$userType];
-		}
-		return BackendService::PERMISSION_NONE;
-	}
-
-	/**
-	 * Check if the user type has permission
-	 *
-	 * @param string $userType
-	 * @param int $permission
-	 * @return bool
-	 */
-	public function isPermitted($userType, $permission) {
-		if ($this->getPermissions($userType) & $permission) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permissions
-	 * @return self
-	 */
-	public function setPermissions($userType, $permissions) {
-		$this->permissions[$userType] = $permissions;
-		$this->allowedPermissions[$userType] =
-			$this->getAllowedPermissions($userType) | $permissions;
-		return $this;
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permission
-	 * @return self
-	 */
-	public function addPermission($userType, $permission) {
-		return $this->setPermissions($userType,
-			$this->getPermissions($userType) | $permission
-		);
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permission
-	 * @return self
-	 */
-	public function removePermission($userType, $permission) {
-		return $this->setPermissions($userType,
-			$this->getPermissions($userType) & ~$permission
-		);
-	}
-
-	/**
-	 * @param string $userType
-	 * @return int
-	 */
-	public function getAllowedPermissions($userType) {
-		if (isset($this->allowedPermissions[$userType])) {
-			return $this->allowedPermissions[$userType];
-		}
-		return BackendService::PERMISSION_NONE;
-	}
-
-	/**
-	 * Check if the user type has an allowed permission
-	 *
-	 * @param string $userType
-	 * @param int $permission
-	 * @return bool
-	 */
-	public function isAllowedPermitted($userType, $permission) {
-		if ($this->getAllowedPermissions($userType) & $permission) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permissions
-	 * @return self
-	 */
-	public function setAllowedPermissions($userType, $permissions) {
-		$this->allowedPermissions[$userType] = $permissions;
-		$this->permissions[$userType] =
-			$this->getPermissions($userType) & $permissions;
-		return $this;
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permission
-	 * @return self
-	 */
-	public function addAllowedPermission($userType, $permission) {
-		return $this->setAllowedPermissions($userType,
-			$this->getAllowedPermissions($userType) | $permission
-		);
-	}
-
-	/**
-	 * @param string $userType
-	 * @param int $permission
-	 * @return self
-	 */
-	public function removeAllowedPermission($userType, $permission) {
-		return $this->setAllowedPermissions($userType,
-			$this->getAllowedPermissions($userType) & ~$permission
-		);
-	}
-
-}
diff --git a/apps/files_external/lib/visibilitytrait.php b/apps/files_external/lib/visibilitytrait.php
new file mode 100644
index 00000000000..dfd2d323ca6
--- /dev/null
+++ b/apps/files_external/lib/visibilitytrait.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_External\Lib;
+
+use \OCA\Files_External\Service\BackendService;
+
+/**
+ * Trait to implement visibility mechanics for a configuration class
+ *
+ * The standard visibility defines which users/groups can use or see the
+ * object. The allowed visibility defines the maximum visibility allowed to be
+ * set on the object. The standard visibility is often set dynamically by
+ * stored configuration parameters that can be modified by the administrator,
+ * while the allowed visibility is set directly by the object and cannot be
+ * modified by the administrator.
+ */
+trait VisibilityTrait {
+
+	/** @var int visibility */
+	protected $visibility = BackendService::VISIBILITY_DEFAULT;
+
+	/** @var int allowed visibilities */
+	protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
+
+	/**
+	 * @return int
+	 */
+	public function getVisibility() {
+		return $this->visibility;
+	}
+
+	/**
+	 * Check if the backend is visible for a user type
+	 *
+	 * @param int $visibility
+	 * @return bool
+	 */
+	public function isVisibleFor($visibility) {
+		if ($this->visibility & $visibility) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param int $visibility
+	 * @return self
+	 */
+	public function setVisibility($visibility) {
+		$this->visibility = $visibility;
+		$this->allowedVisibility |= $visibility;
+		return $this;
+	}
+
+	/**
+	 * @param int $visibility
+	 * @return self
+	 */
+	public function addVisibility($visibility) {
+		return $this->setVisibility($this->visibility | $visibility);
+	}
+
+	/**
+	 * @param int $visibility
+	 * @return self
+	 */
+	public function removeVisibility($visibility) {
+		return $this->setVisibility($this->visibility & ~$visibility);
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getAllowedVisibility() {
+		return $this->allowedVisibility;
+	}
+
+	/**
+	 * Check if the backend is allowed to be visible for a user type
+	 *
+	 * @param int $allowedVisibility
+	 * @return bool
+	 */
+	public function isAllowedVisibleFor($allowedVisibility) {
+		if ($this->allowedVisibility & $allowedVisibility) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param int $allowedVisibility
+	 * @return self
+	 */
+	public function setAllowedVisibility($allowedVisibility) {
+		$this->allowedVisibility = $allowedVisibility;
+		$this->visibility &= $allowedVisibility;
+		return $this;
+	}
+
+	/**
+	 * @param int $allowedVisibility
+	 * @return self
+	 */
+	public function addAllowedVisibility($allowedVisibility) {
+		return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
+	}
+
+	/**
+	 * @param int $allowedVisibility
+	 * @return self
+	 */
+	public function removeAllowedVisibility($allowedVisibility) {
+		return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
+	}
+
+}
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index d47f983b357..efd23512ffe 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -35,10 +35,10 @@ OCP\Util::addScript('files_external', 'settings');
 OCP\Util::addStyle('files_external', 'settings');
 
 $backends = array_filter($backendService->getAvailableBackends(), function($backend) {
-	return $backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE);
+	return $backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL);
 });
 $authMechanisms = array_filter($backendService->getAuthMechanisms(), function($authMechanism) {
-	return $authMechanism->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE);
+	return $authMechanism->isVisibleFor(BackendService::VISIBILITY_PERSONAL);
 });
 foreach ($backends as $backend) {
 	if ($backend->getCustomJs()) {
diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/service/backendservice.php
index 70cb9291660..1e90247b3e4 100644
--- a/apps/files_external/service/backendservice.php
+++ b/apps/files_external/service/backendservice.php
@@ -31,17 +31,13 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  */
 class BackendService {
 
-	/** Permission constants for PermissionsTrait */
-	const PERMISSION_NONE = 0;
-	const PERMISSION_MOUNT = 1;
-	const PERMISSION_CREATE = 2;
-	const PERMISSION_MODIFY = 4;
+	/** Visibility constants for VisibilityTrait */
+	const VISIBILITY_NONE = 0;
+	const VISIBILITY_PERSONAL = 1;
+	const VISIBILITY_ADMIN = 2;
+	//const VISIBILITY_ALIENS = 4;
 
-	const PERMISSION_DEFAULT = 7; // MOUNT | CREATE | MODIFY
-
-	/** User contants */
-	const USER_ADMIN = 'admin';
-	const USER_PERSONAL = 'personal';
+	const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN
 
 	/** Priority constants for PriorityTrait */
 	const PRIORITY_DEFAULT = 100;
@@ -85,7 +81,7 @@ class BackendService {
 	 */
 	public function registerBackend(Backend $backend) {
 		if (!$this->isAllowedUserBackend($backend)) {
-			$backend->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT);
+			$backend->removeVisibility(BackendService::VISIBILITY_PERSONAL);
 		}
 		foreach ($backend->getIdentifierAliases() as $alias) {
 			$this->backends[$alias] = $backend;
@@ -107,7 +103,7 @@ class BackendService {
 	 */
 	public function registerAuthMechanism(AuthMechanism $authMech) {
 		if (!$this->isAllowedAuthMechanism($authMech)) {
-			$authMech->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT);
+			$authMech->removeVisibility(BackendService::VISIBILITY_PERSONAL);
 		}
 		foreach ($authMech->getIdentifierAliases() as $alias) {
 			$this->authMechanisms[$alias] = $authMech;
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 840f1325fb5..5c920a1495b 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -42,10 +42,10 @@ OCP\Util::addStyle('files_external', 'settings');
 \OC_Util::addVendorStyle('select2/select2');
 
 $backends = array_filter($backendService->getAvailableBackends(), function($backend) {
-	return $backend->isPermitted(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE);
+	return $backend->isVisibleFor(BackendService::VISIBILITY_ADMIN);
 });
 $authMechanisms = array_filter($backendService->getAuthMechanisms(), function($authMechanism) {
-	return $authMechanism->isPermitted(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE);
+	return $authMechanism->isVisibleFor(BackendService::VISIBILITY_ADMIN);
 });
 foreach ($backends as $backend) {
 	if ($backend->getCustomJs()) {
@@ -59,9 +59,7 @@ foreach ($authMechanisms as $authMechanism) {
 }
 
 $userBackends = array_filter($backendService->getAvailableBackends(), function($backend) {
-	return $backend->isAllowedPermitted(
-		BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT
-	);
+	return $backend->isAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL);
 });
 
 $tmpl = new OCP\Template('files_external', 'settings');
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 7762ff60333..d8b07273028 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -197,7 +197,7 @@
 		<p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
 			<?php p($l->t('Allow users to mount the following external storage')); ?><br />
 			<?php $i = 0; foreach ($_['userBackends'] as $backend): ?>
-				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT)) print_unescaped(' checked="checked"'); ?> />
+				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
 				<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
 				<?php $i++; ?>
 			<?php endforeach; ?>
diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php
index c43761f3bcb..5e1deb821f4 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/controller/storagescontrollertest.php
@@ -75,12 +75,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -116,12 +116,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -249,12 +249,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(255);
@@ -338,13 +338,13 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn($backendValidate);
-		$backend->method('isPermitted')
+		$backend->method('isVisibleFor')
 			->willReturn(true);
 
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->will($this->returnValue($authMechValidate));
-		$authMech->method('isPermitted')
+		$authMech->method('isVisibleFor')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig();
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index b61174b0797..9f1a8df8d2e 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -49,21 +49,15 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 	}
 
 	public function testAddOrUpdateStorageDisallowedBackend() {
-		$backend1 = $this->getBackendMock();
-		$backend1->expects($this->once())
-			->method('isPermitted')
-			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
-			->willReturn(false);
-		$backend2 = $this->getBackendMock();
-		$backend2->expects($this->once())
-			->method('isPermitted')
-			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_MODIFY)
+		$backend = $this->getBackendMock();
+		$backend->method('isVisibleFor')
+			->with(BackendService::VISIBILITY_PERSONAL)
 			->willReturn(false);
 		$authMech = $this->getAuthMechMock();
 
 		$storageConfig = new StorageConfig(1);
 		$storageConfig->setMountPoint('mount');
-		$storageConfig->setBackend($backend1);
+		$storageConfig->setBackend($backend);
 		$storageConfig->setAuthMechanism($authMech);
 		$storageConfig->setBackendOptions([]);
 
@@ -88,8 +82,6 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 
 		$this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus());
 
-		$storageConfig->setBackend($backend2);
-
 		$response = $this->controller->update(
 			1,
 			'mount',
diff --git a/apps/files_external/tests/service/backendservicetest.php b/apps/files_external/tests/service/backendservicetest.php
index b37b5e9b466..414a9eee2ec 100644
--- a/apps/files_external/tests/service/backendservicetest.php
+++ b/apps/files_external/tests/service/backendservicetest.php
@@ -83,11 +83,11 @@ class BackendServiceTest extends \Test\TestCase {
 
 		$backendAllowed = $this->getBackendMock('\User\Mount\Allowed');
 		$backendAllowed->expects($this->never())
-			->method('removePermission');
+			->method('removeVisibility');
 		$backendNotAllowed = $this->getBackendMock('\User\Mount\NotAllowed');
 		$backendNotAllowed->expects($this->once())
-			->method('removePermission')
-			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE | BackendService::PERMISSION_MOUNT);
+			->method('removeVisibility')
+			->with(BackendService::VISIBILITY_PERSONAL);
 
 		$backendAlias = $this->getMockBuilder('\OCA\Files_External\Lib\Backend\Backend')
 			->disableOriginalConstructor()
-- 
GitLab


From 060d16961596b24a2d0cf9e30408482ce33cefe6 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 17 Sep 2015 16:40:56 +0100
Subject: [PATCH 462/783] Add deprecation mechanic to IdentifierTrait

Deprecation allows a backend/auth mechanism to designate an object that
it deprecates to, allowing clean transitions to updated codebases.
---
 .../files_external/lib/auth/authmechanism.php |  2 ++
 apps/files_external/lib/backend/backend.php   |  1 +
 apps/files_external/lib/identifiertrait.php   | 34 +++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/apps/files_external/lib/auth/authmechanism.php b/apps/files_external/lib/auth/authmechanism.php
index 11d99bb330d..2ab34ed0105 100644
--- a/apps/files_external/lib/auth/authmechanism.php
+++ b/apps/files_external/lib/auth/authmechanism.php
@@ -92,6 +92,8 @@ class AuthMechanism implements \JsonSerializable {
 	 */
 	public function jsonSerialize() {
 		$data = $this->jsonSerializeDefinition();
+		$data += $this->jsonSerializeIdentifier();
+
 		$data['scheme'] = $this->getScheme();
 
 		return $data;
diff --git a/apps/files_external/lib/backend/backend.php b/apps/files_external/lib/backend/backend.php
index 90d5d38ed94..68585cf377e 100644
--- a/apps/files_external/lib/backend/backend.php
+++ b/apps/files_external/lib/backend/backend.php
@@ -142,6 +142,7 @@ class Backend implements \JsonSerializable {
 	 */
 	public function jsonSerialize() {
 		$data = $this->jsonSerializeDefinition();
+		$data += $this->jsonSerializeIdentifier();
 
 		$data['backend'] = $data['name']; // legacy compat
 		$data['priority'] = $this->getPriority();
diff --git a/apps/files_external/lib/identifiertrait.php b/apps/files_external/lib/identifiertrait.php
index 139911580fc..7f36144e474 100644
--- a/apps/files_external/lib/identifiertrait.php
+++ b/apps/files_external/lib/identifiertrait.php
@@ -23,6 +23,7 @@ namespace OCA\Files_External\Lib;
 
 /**
  * Trait for objects requiring an identifier (and/or identifier aliases)
+ * Also supports deprecation to a different object, linking the objects
  */
 trait IdentifierTrait {
 
@@ -32,6 +33,9 @@ trait IdentifierTrait {
 	/** @var string[] */
 	protected $identifierAliases = [];
 
+	/** @var IdentifierTrait */
+	protected $deprecateTo = null;
+
 	/**
 	 * @return string
 	 */
@@ -65,4 +69,34 @@ trait IdentifierTrait {
 		return $this;
 	}
 
+	/**
+	 * @return object|null
+	 */
+	public function getDeprecateTo() {
+		return $this->deprecateTo;
+	}
+
+	/**
+	 * @param object $destinationObject
+	 * @return self
+	 */
+	public function deprecateTo($destinationObject) {
+		$this->deprecateTo = $destinationObject;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function jsonSerializeIdentifier() {
+		$data = [
+			'identifier' => $this->identifier,
+			'identifierAliases' => $this->identifierAliases,
+		];
+		if ($this->deprecateTo) {
+			$data['deprecateTo'] = $this->deprecateTo->getIdentifier();
+		}
+		return $data;
+	}
+
 }
-- 
GitLab


From 2bef3ef34bc81737c1667187aa3b21ecf1442e03 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 17 Sep 2015 17:00:15 +0100
Subject: [PATCH 463/783] Hide deprecated backends in external storage GUI

Selecting/deselecting the deprecate-to backends in the user mountable
storages selection will also change the corresponding deprecated
backend.
---
 apps/files_external/js/settings.js         | 13 ++++++++++++-
 apps/files_external/templates/settings.php |  9 +++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 4319677f4f4..5da34c52193 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -1113,7 +1113,18 @@ $(document).ready(function() {
 
 	$('input[name="allowUserMountingBackends\\[\\]"]').bind('change', function() {
 		OC.msg.startSaving('#userMountingMsg');
-		var userMountingBackends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){return $(this).val();}).get();
+
+		var userMountingBackends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){
+			return $(this).val();
+		}).get();
+		var deprecatedBackends = $('input[name="allowUserMountingBackends\\[\\]"][data-deprecate-to]').map(function(){
+			if ($.inArray($(this).data('deprecate-to'), userMountingBackends) !== -1) {
+				return $(this).val();
+			}
+			return null;
+		}).get();
+		userMountingBackends = userMountingBackends.concat(deprecatedBackends);
+
 		OC.AppConfig.setValue('files_external', 'user_mounting_backends', userMountingBackends.join());
 		OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('files_external', 'Saved')}});
 
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index d8b07273028..141994d0050 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -157,6 +157,7 @@
 							});
 						?>
 						<?php foreach ($sortedBackends as $backend): ?>
+							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
 						<?php endforeach; ?>
 					</select>
@@ -197,8 +198,12 @@
 		<p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
 			<?php p($l->t('Allow users to mount the following external storage')); ?><br />
 			<?php $i = 0; foreach ($_['userBackends'] as $backend): ?>
-				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
-				<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
+				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
+					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
+				<?php else: ?>
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
+					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
+				<?php endif; ?>
 				<?php $i++; ?>
 			<?php endforeach; ?>
 		</p>
-- 
GitLab


From 634c1c497c51f00ba5512dae69dfffaf6cf0e3e1 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Thu, 17 Sep 2015 17:01:55 +0100
Subject: [PATCH 464/783] Mark SMB_OC and SFTP_Key as deprecated backends

---
 apps/files_external/lib/backend/sftp_key.php | 6 ++++--
 apps/files_external/lib/backend/smb_oc.php   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/backend/sftp_key.php
index 4a7f565eb19..13f45f1140c 100644
--- a/apps/files_external/lib/backend/sftp_key.php
+++ b/apps/files_external/lib/backend/sftp_key.php
@@ -27,14 +27,15 @@ use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Auth\PublicKey\RSA;
+use \OCA\Files_External\Lib\Backend\SFTP;
 
 class SFTP_Key extends Backend {
 
-	public function __construct(IL10N $l, RSA $legacyAuth) {
+	public function __construct(IL10N $l, RSA $legacyAuth, SFTP $sftpBackend) {
 		$this
 			->setIdentifier('\OC\Files\Storage\SFTP_Key')
 			->setStorageClass('\OC\Files\Storage\SFTP')
-			->setText($l->t('SFTP with secret key login [DEPRECATED]'))
+			->setText($l->t('SFTP with secret key login'))
 			->addParameters([
 				(new DefinitionParameter('host', $l->t('Host'))),
 				(new DefinitionParameter('root', $l->t('Remote subfolder')))
@@ -42,6 +43,7 @@ class SFTP_Key extends Backend {
 			])
 			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
 			->setLegacyAuthMechanism($legacyAuth)
+			->deprecateTo($sftpBackend)
 		;
 	}
 
diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php
index a3f3a824040..9fc17400884 100644
--- a/apps/files_external/lib/backend/smb_oc.php
+++ b/apps/files_external/lib/backend/smb_oc.php
@@ -29,6 +29,7 @@ use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Auth\Password\SessionCredentials;
 use \OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+use \OCA\Files_External\Lib\Backend\SMB;
 
 /**
  * Deprecated SMB_OC class - use SMB with the password::sessioncredentials auth mechanism
@@ -37,11 +38,11 @@ class SMB_OC extends Backend {
 
 	use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, SessionCredentials $legacyAuth) {
+	public function __construct(IL10N $l, SessionCredentials $legacyAuth, SMB $smbBackend) {
 		$this
 			->setIdentifier('\OC\Files\Storage\SMB_OC')
 			->setStorageClass('\OC\Files\Storage\SMB')
-			->setText($l->t('SMB / CIFS using OC login [DEPRECATED]'))
+			->setText($l->t('SMB / CIFS using OC login'))
 			->addParameters([
 				(new DefinitionParameter('host', $l->t('Host'))),
 				(new DefinitionParameter('username_as_share', $l->t('Username as share')))
@@ -54,6 +55,7 @@ class SMB_OC extends Backend {
 			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
+			->deprecateTo($smbBackend)
 		;
 	}
 
-- 
GitLab


From 6ea27e2b035f996a121723bfb845fd47b4ebce23 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 23 Sep 2015 12:14:09 +0200
Subject: [PATCH 465/783] Fix parsing int attributes from share.php response

Sometimes the attributes returned by share.php are integers but packaged
as strings.

This fix makes sure that such attributes are parsed as integers
---
 core/js/shareitemmodel.js                 | 27 ++++++++++--
 core/js/tests/specs/shareitemmodelSpec.js | 50 +++++++++++++++++++++--
 2 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 3ed10afd149..d883497433f 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -50,7 +50,7 @@
 	 * @property {string} token
 	 * @property {string} share_with
 	 * @property {string} share_with_displayname
-	 * @property {string} share_mail_send
+	 * @property {string} mail_send
 	 * @property {OC.Share.Types.Collection|undefined} collection
 	 * @property {Date} expiration optional?
 	 * @property {number} stime optional?
@@ -63,6 +63,15 @@
 	 * @property {OC.Share.Types.LinkShareInfo|undefined} linkShare
 	 */
 
+	/**
+	 * These properties are sometimes returned by the server as strings instead
+	 * of integers, so we need to convert them accordingly...
+	 */
+	var SHARE_RESPONSE_INT_PROPS = [
+		'id', 'file_parent', 'mail_send', 'file_source', 'item_source', 'permissions',
+		'storage', 'share_type', 'parent', 'stime', 'expiration'
+	];
+
 	/**
 	 * @class OCA.Share.ShareItemModel
 	 * @classdesc
@@ -462,7 +471,7 @@
 			if(!_.isObject(share)) {
 				throw "Unknown Share";
 			}
-			return share.share_mail_send === '1';
+			return share.mail_send === 1;
 		},
 
 		/**
@@ -673,7 +682,19 @@
 			}
 
 			/** @type {OC.Share.Types.ShareInfo[]} **/
-			var shares = _.toArray(data.shares);
+			var shares = _.map(data.shares, function(share) {
+				// properly parse some values because sometimes the server
+				// returns integers as string...
+				var i;
+				for (i = 0; i < SHARE_RESPONSE_INT_PROPS.length; i++) {
+					var prop = SHARE_RESPONSE_INT_PROPS[i];
+					if (!_.isUndefined(share[prop])) {
+						share[prop] = parseInt(share[prop], 10);
+					}
+				}
+				return share;
+			});
+
 			this._legacyFillCurrentShares(shares);
 
 			var linkShare = { isLinkShare: false };
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index c1d820052e2..07a6fbdc23f 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -249,10 +249,7 @@ describe('OC.Share.ShareItemModel', function() {
 		it('allows owner to share their own share when they are also the recipient', function() {
 			OC.currentUser = 'user1';
 			loadItemStub.yields({
-				reshare: {
-					permissions: OC.PERMISSION_READ,
-					uid_owner: 'user1'
-				},
+				reshare: {},
 				shares: []
 			});
 
@@ -261,6 +258,51 @@ describe('OC.Share.ShareItemModel', function() {
 			// sharing still allowed
 			expect(model.get('permissions') & OC.PERMISSION_SHARE).toEqual(OC.PERMISSION_SHARE);
 		});
+		it('properly parses integer values when the server is in the mood of returning ints as string', function() {
+			loadItemStub.yields({
+				reshare: {},
+				shares: [{
+					displayname_owner: 'root',
+					expiration: '1403900000',
+					file_source: '123',
+					file_target: '/folder',
+					id: '20',
+					item_source: '123',
+					item_type: 'file',
+					mail_send: '0',
+					parent: '999',
+					path: '/folder',
+					permissions: '' + OC.PERMISSION_READ,
+					share_type: '' + OC.Share.SHARE_TYPE_USER,
+					share_with: 'user1',
+					stime: '1403884258',
+					storage: '1',
+					token: 'tehtoken',
+					uid_owner: 'root'
+				}]
+			});
+
+			model.fetch();
+
+			var shares = model.get('shares');
+			expect(shares.length).toEqual(1);
+
+			var share = shares[0];
+			expect(share.id).toEqual(20);
+			expect(share.file_source).toEqual(123);
+			expect(share.file_target).toEqual('/folder');
+			expect(share.item_source).toEqual(123);
+			expect(share.item_type).toEqual('file');
+			expect(share.displayname_owner).toEqual('root');
+			expect(share.mail_send).toEqual(0);
+			expect(share.parent).toEqual(999);
+			expect(share.path).toEqual('/folder');
+			expect(share.permissions).toEqual(OC.PERMISSION_READ);
+			expect(share.share_type).toEqual(OC.Share.SHARE_TYPE_USER);
+			expect(share.share_with).toEqual('user1');
+			expect(share.stime).toEqual(1403884258);
+			expect(share.expiration).toEqual(1403900000);
+		});
 	});
 
 	describe('Util', function() {
-- 
GitLab


From ca8d589f270017087776202f0ba470c39fed050b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 23 Sep 2015 12:31:45 +0200
Subject: [PATCH 466/783] use assertSame, add failing case

---
 tests/lib/appframework/http/RequestTest.php | 87 +++++++++++----------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php
index deb28909869..e9a0755d1f8 100644
--- a/tests/lib/appframework/http/RequestTest.php
+++ b/tests/lib/appframework/http/RequestTest.php
@@ -60,18 +60,18 @@ class RequestTest extends \Test\TestCase {
 		);
 
 		// Countable
-		$this->assertEquals(2, count($request));
+		$this->assertSame(2, count($request));
 		// Array access
-		$this->assertEquals('Joey', $request['nickname']);
+		$this->assertSame('Joey', $request['nickname']);
 		// "Magic" accessors
-		$this->assertEquals('Joey', $request->{'nickname'});
+		$this->assertSame('Joey', $request->{'nickname'});
 		$this->assertTrue(isset($request['nickname']));
 		$this->assertTrue(isset($request->{'nickname'}));
-		$this->assertEquals(false, isset($request->{'flickname'}));
+		$this->assertFalse(isset($request->{'flickname'}));
 		// Only testing 'get', but same approach for post, files etc.
-		$this->assertEquals('Joey', $request->get['nickname']);
+		$this->assertSame('Joey', $request->get['nickname']);
 		// Always returns null if variable not set.
-		$this->assertEquals(null, $request->{'flickname'});
+		$this->assertSame(null, $request->{'flickname'});
 
 	}
 
@@ -92,9 +92,9 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals(3, count($request));
-		$this->assertEquals('Janey', $request->{'nickname'});
-		$this->assertEquals('Johnny Weissmüller', $request->{'name'});
+		$this->assertSame(3, count($request));
+		$this->assertSame('Janey', $request->{'nickname'});
+		$this->assertSame('Johnny Weissmüller', $request->{'name'});
 	}
 
 
@@ -172,10 +172,10 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('GET', $request->method);
+		$this->assertSame('GET', $request->method);
 		$result = $request->get;
-		$this->assertEquals('John Q. Public', $result['name']);
-		$this->assertEquals('Joey', $result['nickname']);
+		$this->assertSame('John Q. Public', $result['name']);
+		$this->assertSame('Joey', $result['nickname']);
 	}
 
 	public function testJsonPost() {
@@ -194,12 +194,12 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('POST', $request->method);
+		$this->assertSame('POST', $request->method);
 		$result = $request->post;
-		$this->assertEquals('John Q. Public', $result['name']);
-		$this->assertEquals('Joey', $result['nickname']);
-		$this->assertEquals('Joey', $request->params['nickname']);
-		$this->assertEquals('Joey', $request['nickname']);
+		$this->assertSame('John Q. Public', $result['name']);
+		$this->assertSame('Joey', $result['nickname']);
+		$this->assertSame('Joey', $request->params['nickname']);
+		$this->assertSame('Joey', $request['nickname']);
 	}
 
 	public function testPatch() {
@@ -219,11 +219,11 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('PATCH', $request->method);
+		$this->assertSame('PATCH', $request->method);
 		$result = $request->patch;
 
-		$this->assertEquals('John Q. Public', $result['name']);
-		$this->assertEquals('Joey', $result['nickname']);
+		$this->assertSame('John Q. Public', $result['name']);
+		$this->assertSame('Joey', $result['nickname']);
 	}
 
 	public function testJsonPatchAndPut() {
@@ -244,11 +244,11 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('PUT', $request->method);
+		$this->assertSame('PUT', $request->method);
 		$result = $request->put;
 
-		$this->assertEquals('John Q. Public', $result['name']);
-		$this->assertEquals('Joey', $result['nickname']);
+		$this->assertSame('John Q. Public', $result['name']);
+		$this->assertSame('Joey', $result['nickname']);
 
 		// PATCH content
 		$data = '{"name": "John Q. Public", "nickname": null}';
@@ -265,11 +265,11 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('PATCH', $request->method);
+		$this->assertSame('PATCH', $request->method);
 		$result = $request->patch;
 
-		$this->assertEquals('John Q. Public', $result['name']);
-		$this->assertEquals(null, $result['nickname']);
+		$this->assertSame('John Q. Public', $result['name']);
+		$this->assertSame(null, $result['nickname']);
 	}
 
 	public function testPutStream() {
@@ -290,10 +290,10 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('PUT', $request->method);
+		$this->assertSame('PUT', $request->method);
 		$resource = $request->put;
 		$contents = stream_get_contents($resource);
-		$this->assertEquals($data, $contents);
+		$this->assertSame($data, $contents);
 
 		try {
 			$resource = $request->put;
@@ -322,7 +322,7 @@ class RequestTest extends \Test\TestCase {
 
 		$newParams = array('id' => '3', 'test' => 'test2');
 		$request->setUrlParameters($newParams);
-		$this->assertEquals('test2', $request->getParam('test'));
+		$this->assertSame('test2', $request->getParam('test'));
 		$this->assertEquals('3', $request->getParam('id'));
 		$this->assertEquals('3', $request->getParams()['id']);
 	}
@@ -660,7 +660,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals($matches, $request->isUserAgent($userAgent));
+		$this->assertSame($matches, $request->isUserAgent($userAgent));
 	}
 
 	/**
@@ -749,7 +749,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('from.server.name:8080',  $request->getInsecureServerHost());
+		$this->assertSame('from.server.name:8080',  $request->getInsecureServerHost());
 	}
 
 	public function testInsecureServerHostHttpHostHeader() {
@@ -766,7 +766,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('from.host.header:8080',  $request->getInsecureServerHost());
+		$this->assertSame('from.host.header:8080',  $request->getInsecureServerHost());
 	}
 
 	public function testInsecureServerHostHttpFromForwardedHeaderSingle() {
@@ -784,7 +784,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('from.forwarded.host:8080',  $request->getInsecureServerHost());
+		$this->assertSame('from.forwarded.host:8080',  $request->getInsecureServerHost());
 	}
 
 	public function testInsecureServerHostHttpFromForwardedHeaderStacked() {
@@ -802,7 +802,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('from.forwarded.host2:8080',  $request->getInsecureServerHost());
+		$this->assertSame('from.forwarded.host2:8080',  $request->getInsecureServerHost());
 	}
 
 	public function testGetServerHostWithOverwriteHost() {
@@ -830,7 +830,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('my.overwritten.host',  $request->getServerHost());
+		$this->assertSame('my.overwritten.host',  $request->getServerHost());
 	}
 
 	public function testGetServerHostWithTrustedDomain() {
@@ -852,7 +852,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('my.trusted.host',  $request->getServerHost());
+		$this->assertSame('my.trusted.host',  $request->getServerHost());
 	}
 
 	public function testGetServerHostWithUntrustedDomain() {
@@ -879,7 +879,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('my.trusted.host',  $request->getServerHost());
+		$this->assertSame('my.trusted.host',  $request->getServerHost());
 	}
 
 	public function testGetServerHostWithNoTrustedDomain() {
@@ -906,7 +906,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('',  $request->getServerHost());
+		$this->assertSame('',  $request->getServerHost());
 	}
 
 	public function testGetOverwriteHostDefaultNull() {
@@ -967,7 +967,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals('apps/files/',  $request->getPathInfo());
+		$this->assertSame('apps/files/',  $request->getPathInfo());
 	}
 
 	/**
@@ -1032,7 +1032,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals($expected, $request->getPathInfo());
+		$this->assertSame($expected, $request->getPathInfo());
 	}
 
 	/**
@@ -1055,7 +1055,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals($expected, $request->getRawPathInfo());
+		$this->assertSame($expected, $request->getRawPathInfo());
 	}
 
 	/**
@@ -1078,7 +1078,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals($expected, $request->getRawPathInfo());
+		$this->assertSame($expected, $request->getRawPathInfo());
 	}
 
 	/**
@@ -1101,7 +1101,7 @@ class RequestTest extends \Test\TestCase {
 			$this->stream
 		);
 
-		$this->assertEquals($expected, $request->getPathInfo());
+		$this->assertSame($expected, $request->getPathInfo());
 	}
 
 	/**
@@ -1109,6 +1109,7 @@ class RequestTest extends \Test\TestCase {
 	 */
 	public function genericPathInfoProvider() {
 		return [
+			['/core/index.php?XDEBUG_SESSION_START=14600', '/core/index.php', ''],
 			['/index.php/apps/files/', 'index.php', '/apps/files/'],
 			['/index.php/apps/files/../&amp;/&?someQueryParameter=QueryParam', 'index.php', '/apps/files/../&amp;/&'],
 			['/remote.php/漢字編碼方法 / 汉字编码方法', 'remote.php', '/漢字編碼方法 / 汉字编码方法'],
-- 
GitLab


From d81416c51dc85b9eaf8b0e5128e216585c7b781b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 23 Sep 2015 12:32:49 +0200
Subject: [PATCH 467/783] return '' instead of false

---
 lib/private/appframework/http/request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index b430673f9a9..af6015b0eef 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -603,7 +603,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 		if (strpos($pathInfo, $name) === 0) {
 			$pathInfo = substr($pathInfo, strlen($name));
 		}
-		if($pathInfo === '/'){
+		if($pathInfo === false || $pathInfo === '/'){
 			return '';
 		} else {
 			return $pathInfo;
-- 
GitLab


From 52cbaff061b93cb1a5e81623e58e14867c818810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 23 Sep 2015 13:59:37 +0200
Subject: [PATCH 468/783] use correct variable

wow ... just wow ...
---
 lib/private/files/storage/wrapper/permissionsmask.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/files/storage/wrapper/permissionsmask.php b/lib/private/files/storage/wrapper/permissionsmask.php
index 50c3f2a6268..8d40d023630 100644
--- a/lib/private/files/storage/wrapper/permissionsmask.php
+++ b/lib/private/files/storage/wrapper/permissionsmask.php
@@ -66,7 +66,7 @@ class PermissionsMask extends Wrapper {
 	}
 
 	public function isSharable($path) {
-		return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($parm);
+		return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($path);
 	}
 
 	public function getPermissions($path) {
-- 
GitLab


From d54d9a573fac498c4aaeea0df832a204cf525b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 23 Sep 2015 14:09:52 +0200
Subject: [PATCH 469/783] Revert "use correct variable"

This reverts commit 52cbaff061b93cb1a5e81623e58e14867c818810.
---
 lib/private/files/storage/wrapper/permissionsmask.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/files/storage/wrapper/permissionsmask.php b/lib/private/files/storage/wrapper/permissionsmask.php
index 8d40d023630..50c3f2a6268 100644
--- a/lib/private/files/storage/wrapper/permissionsmask.php
+++ b/lib/private/files/storage/wrapper/permissionsmask.php
@@ -66,7 +66,7 @@ class PermissionsMask extends Wrapper {
 	}
 
 	public function isSharable($path) {
-		return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($path);
+		return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($parm);
 	}
 
 	public function getPermissions($path) {
-- 
GitLab


From 0db9b28f3fa6bfdc236218c84a507da47cd29e43 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 23 Sep 2015 12:44:25 +0200
Subject: [PATCH 470/783] Fix ShareItemModel.hasUserShares to only check shares
 of current item

The shares array is based on what the server returns and can contain
share info for parent folders.

hasUserShares is now fixed to ignore parent folders and only checks for
shares on the current item.
---
 core/js/shareitemmodel.js                 | 17 ++++++-
 core/js/tests/specs/shareitemmodelSpec.js | 57 +++++++++++++++++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index d883497433f..0c8b5f6f199 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -297,8 +297,7 @@
 		 * @returns {boolean}
 		 */
 		hasUserShares: function() {
-			var shares = this.get('shares');
-			return _.isArray(shares) && shares.length > 0;
+			return this.getSharesWithCurrentItem().length > 0;
 		},
 
 		/**
@@ -407,6 +406,20 @@
 			return this.get('reshare').share_type;
 		},
 
+		/**
+		 * Returns all share entries that only apply to the current item
+		 * (file/folder)
+		 *
+		 * @return {Array.<OC.Share.Types.ShareInfo>}
+		 */
+		getSharesWithCurrentItem: function() {
+			var shares = this.get('shares') || [];
+			var fileId = this.fileInfoModel.get('id');
+			return _.filter(shares, function(share) {
+				return share.item_source === fileId;
+			});
+		},
+
 		/**
 		 * @param shareIndex
 		 * @returns {string}
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index 07a6fbdc23f..b169962f1d6 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -304,6 +304,63 @@ describe('OC.Share.ShareItemModel', function() {
 			expect(share.expiration).toEqual(1403900000);
 		});
 	});
+	describe('hasUserShares', function() {
+		it('returns false when no user shares exist', function() {
+			loadItemStub.yields({
+				reshare: {},
+				shares: []
+			});
+
+			model.fetch();
+
+			expect(model.hasUserShares()).toEqual(false);
+		});
+		it('returns true when user shares exist on the current item', function() {
+			loadItemStub.yields({
+				reshare: {},
+				shares: [{
+					id: 1,
+					share_type: OC.Share.SHARE_TYPE_USER,
+					share_with: 'user1',
+					item_source: '123'
+				}]
+			});
+
+			model.fetch();
+
+			expect(model.hasUserShares()).toEqual(true);
+		});
+		it('returns true when group shares exist on the current item', function() {
+			loadItemStub.yields({
+				reshare: {},
+				shares: [{
+					id: 1,
+					share_type: OC.Share.SHARE_TYPE_GROUP,
+					share_with: 'group1',
+					item_source: '123'
+				}]
+			});
+
+			model.fetch();
+
+			expect(model.hasUserShares()).toEqual(true);
+		});
+		it('returns false when share exist on parent item', function() {
+			loadItemStub.yields({
+				reshare: {},
+				shares: [{
+					id: 1,
+					share_type: OC.Share.SHARE_TYPE_GROUP,
+					share_with: 'group1',
+					item_source: '111'
+				}]
+			});
+
+			model.fetch();
+
+			expect(model.hasUserShares()).toEqual(false);
+		});
+	});
 
 	describe('Util', function() {
 		it('parseTime should properly parse strings', function() {
-- 
GitLab


From d0ea62a51cc689d19c3be8d2c1775f2c343b914e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 23 Sep 2015 14:56:13 +0200
Subject: [PATCH 471/783] adjust the height of the sidebar preview image when
 resizing the browser

---
 apps/files/css/detailsView.css          | 8 +++++++-
 apps/files/js/mainfileinfodetailview.js | 6 ++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index 8acf884f219..faa26678562 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -32,12 +32,18 @@
 #app-sidebar .image .thumbnail {
 	width:100%;
 	display:block;
-	height: 250px;
 	background-repeat: no-repeat;
 	background-position: center;
 	background-size: 100%;
 	float: none;
 	margin: 0;
+	height: auto;
+}
+
+#app-sidebar .image.landscape .thumbnail::before {
+	content: '';
+	display: block;
+	padding-bottom: 56.25%; /* sets height of .thumbnail to 9/16 of the width */
 }
 
 #app-sidebar .image.portrait .thumbnail {
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 830f074f3f1..82cca0d0fb3 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -176,9 +176,7 @@
 					$iconDiv.removeClass('icon-loading icon-32');
 					var targetHeight = getTargetHeight(img);
 					if (this.model.isImage() && targetHeight > smallPreviewSize) {
-						if (!isLandscape(img)) {
-							$container.addClass('portrait');
-						}
+						$container.addClass(isLandscape(img)? 'landscape': 'portrait');
 						$container.addClass('image');
 					}
 
@@ -186,7 +184,7 @@
 					// when we dont have a preview we show the mime icon in the error handler
 					$iconDiv.css({
 						'background-image': 'url("' + previewUrl + '")',
-						'height': targetHeight
+						height: (isLandscape(img) && targetHeight > smallPreviewSize)? 'auto': targetHeight
 					});
 				}.bind(this),
 				error: function () {
-- 
GitLab


From 2ea2ec00040a9f42d11213c4baa0118ea702b995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 23 Sep 2015 15:00:58 +0200
Subject: [PATCH 472/783] Show 'Apps' in the browser title when app management
 is open

---
 lib/private/app.php            | 2 +-
 lib/private/templatelayout.php | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index 6c9f7615228..26d51947642 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -411,7 +411,7 @@ class OC_App {
 	/**
 	 * Returns the Settings Navigation
 	 *
-	 * @return string
+	 * @return string[]
 	 *
 	 * This function returns an array containing all settings pages added. The
 	 * entries are sorted by the key 'order' ascending.
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 93bf6cbd307..ae3c1093b20 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -116,9 +116,14 @@ class OC_TemplateLayout extends OC_Template {
 				}
 			}
 			$userDisplayName = OC_User::getDisplayName();
+			$appsMgmtActive = strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')) === 0;
+			if ($appsMgmtActive) {
+				$l = \OC::$server->getL10N('lib');
+				$this->assign('application', $l->t('Apps'));
+			}
 			$this->assign('user_displayname', $userDisplayName);
 			$this->assign('user_uid', OC_User::getUser());
-			$this->assign('appsmanagement_active', strpos(\OC::$server->getRequest()->getRequestUri(), \OC::$server->getURLGenerator()->linkToRoute('settings.AppSettings.viewApps')) === 0 );
+			$this->assign('appsmanagement_active', $appsMgmtActive);
 			$this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true));
 			$this->assign('userAvatarSet', \OC_Helper::userAvatarSet(OC_User::getUser()));
 		} else if ($renderAs == 'error') {
@@ -148,7 +153,7 @@ class OC_TemplateLayout extends OC_Template {
 		} else {
 			// Add the js files
 			$jsFiles = self::findJavascriptFiles(OC_Util::$scripts);
-			$this->assign('jsfiles', array(), false);
+			$this->assign('jsfiles', array());
 			if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
 				$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
 			}
-- 
GitLab


From 6636605ea6d2fb44a8534f570b8555dc4aac3400 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 17 Aug 2015 10:16:56 +0200
Subject: [PATCH 473/783] Add option to disable autocomplete in share dialog

---
 core/ajax/share.php          | 10 ++++++++++
 settings/admin.php           |  1 +
 settings/templates/admin.php |  5 +++++
 3 files changed, 16 insertions(+)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 69b84564ab1..4546217def3 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -379,6 +379,16 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 					}
 				}
 
+				$sharingAutocompletion = \OC::$server->getConfig()
+					->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes');
+
+				if ($sharingAutocompletion !== 'yes') {
+					$searchTerm = strtolower($_GET['search']);
+					$shareWith = array_filter($shareWith, function($user) use ($searchTerm) {
+						return strtolower($user['label']) === $searchTerm
+							|| strtolower($user['value']['shareWith']) === $searchTerm;
+					});
+				}
 
 				$sorter = new \OC\Share\SearchResultSorter((string)$_GET['search'],
 														   'label',
diff --git a/settings/admin.php b/settings/admin.php
index 38683438f3a..c8bf1d32749 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -122,6 +122,7 @@ $template->assign('allowPublicUpload', $appConfig->getValue('core', 'shareapi_al
 $template->assign('allowResharing', $appConfig->getValue('core', 'shareapi_allow_resharing', 'yes'));
 $template->assign('allowPublicMailNotification', $appConfig->getValue('core', 'shareapi_allow_public_notification', 'no'));
 $template->assign('allowMailNotification', $appConfig->getValue('core', 'shareapi_allow_mail_notification', 'no'));
+$template->assign('allowShareDialogUserEnumeration', $appConfig->getValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes'));
 $template->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMembersOnly());
 $databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false);
 $template->assign('databaseOverload', $databaseOverload);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 36088d9f8c2..bfb0d5d364d 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -265,6 +265,11 @@ if ($_['cronErrors']) {
 			<br />
 			<em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
 		</p>
+		<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+			<input type="checkbox" name="shareapi_allow_share_dialog_user_enumeration" value="1" id="shareapi_allow_share_dialog_user_enumeration"
+				<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered.'));?></label><br />
+		</p>
 
 		<?php print_unescaped($_['fileSharingSettings']); ?>
 	</div>
-- 
GitLab


From 4eb299a308fa7501d3106c2857539bfc51bf5509 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 23 Sep 2015 15:09:49 +0200
Subject: [PATCH 474/783] hide sort indicator when in multiselect mode, ref
 #19056

---
 apps/files/css/files.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index c0701fb18b8..5b1cd48fd49 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -186,7 +186,8 @@ table th .sort-indicator {
 	filter: alpha(opacity=30);
 	opacity: .3;
 }
-.sort-indicator.hidden {
+.sort-indicator.hidden,
+.multiselect .sort-indicator {
 	visibility: hidden;
 }
 table th:hover .sort-indicator.hidden,
-- 
GitLab


From 19e7a08cbffbf4f9736646e9b3c90b4410642005 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 26 Aug 2015 12:30:07 +0200
Subject: [PATCH 475/783] Do not allow user enumeration if the config is
 disabled

---
 apps/files_sharing/api/sharees.php           |  20 +-
 apps/files_sharing/tests/api/shareestest.php | 438 +++++++++++++++++--
 2 files changed, 409 insertions(+), 49 deletions(-)

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 9e324078dad..734c267020f 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -62,6 +62,9 @@ class Sharees {
 	/** @var bool */
 	protected $shareWithGroupOnly = false;
 
+	/** @var bool */
+	protected $shareeEnumeration = true;
+
 	/** @var int */
 	protected $offset = 0;
 
@@ -134,7 +137,7 @@ class Sharees {
 			}
 		}
 
-		if (sizeof($users) < $this->limit) {
+		if (!$this->shareeEnumeration || sizeof($users) < $this->limit) {
 			$this->reachedEndFor[] = 'users';
 		}
 
@@ -176,6 +179,10 @@ class Sharees {
 				]);
 			}
 		}
+
+		if (!$this->shareeEnumeration) {
+			$this->result['users'] = [];
+		}
 	}
 
 	/**
@@ -187,7 +194,7 @@ class Sharees {
 		$groups = $this->groupManager->search($search, $this->limit, $this->offset);
 		$groups = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
 
-		if (sizeof($groups) < $this->limit) {
+		if (!$this->shareeEnumeration || sizeof($groups) < $this->limit) {
 			$this->reachedEndFor[] = 'groups';
 		}
 
@@ -233,6 +240,10 @@ class Sharees {
 				]);
 			}
 		}
+
+		if (!$this->shareeEnumeration) {
+			$this->result['groups'] = [];
+		}
 	}
 
 	/**
@@ -273,6 +284,10 @@ class Sharees {
 			}
 		}
 
+		if (!$this->shareeEnumeration) {
+			$this->result['remotes'] = [];
+		}
+
 		if (!$foundRemoteById && substr_count($search, '@') >= 1 && substr_count($search, ' ') === 0 && $this->offset === 0) {
 			$this->result['exact']['remotes'][] = [
 				'label' => $search,
@@ -322,6 +337,7 @@ class Sharees {
 		}
 
 		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
 		$this->limit = (int) $perPage;
 		$this->offset = $perPage * ($page - 1);
 
diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index 5c5d5b0d309..91b8b1c7e66 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -110,16 +110,30 @@ class ShareesTest extends TestCase {
 
 	public function dataGetUsers() {
 		return [
-			['test', false, [], [], [], [], true, false],
-			['test', true, [], [], [], [], true, false],
+			['test', false, true, [], [], [], [], true, false],
+			['test', false, false, [], [], [], [], true, false],
+			['test', true, true, [], [], [], [], true, false],
+			['test', true, false, [], [], [], [], true, false],
 			[
-				'test', false, [], [],
+				'test', false, true, [], [],
 				[
 					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
 				], [], true, $this->getUserMock('test', 'Test')
 			],
 			[
-				'test', true, [], [],
+				'test', false, false, [], [],
+				[
+					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
+				], [], true, $this->getUserMock('test', 'Test')
+			],
+			[
+				'test', true, true, [], [],
+				[
+					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
+				], [], true, $this->getUserMock('test', 'Test')
+			],
+			[
+				'test', true, false, [], [],
 				[
 					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
 				], [], true, $this->getUserMock('test', 'Test')
@@ -127,6 +141,7 @@ class ShareesTest extends TestCase {
 			[
 				'test',
 				false,
+				true,
 				[],
 				[
 					$this->getUserMock('test1', 'Test One'),
@@ -141,6 +156,20 @@ class ShareesTest extends TestCase {
 			[
 				'test',
 				false,
+				false,
+				[],
+				[
+					$this->getUserMock('test1', 'Test One'),
+				],
+				[],
+				[],
+				true,
+				false,
+			],
+			[
+				'test',
+				false,
+				true,
 				[],
 				[
 					$this->getUserMock('test1', 'Test One'),
@@ -157,6 +186,21 @@ class ShareesTest extends TestCase {
 			[
 				'test',
 				false,
+				false,
+				[],
+				[
+					$this->getUserMock('test1', 'Test One'),
+					$this->getUserMock('test2', 'Test Two'),
+				],
+				[],
+				[],
+				true,
+				false,
+			],
+			[
+				'test',
+				false,
+				true,
 				[],
 				[
 					$this->getUserMock('test0', 'Test'),
@@ -173,9 +217,27 @@ class ShareesTest extends TestCase {
 				false,
 				false,
 			],
+			[
+				'test',
+				false,
+				false,
+				[],
+				[
+					$this->getUserMock('test0', 'Test'),
+					$this->getUserMock('test1', 'Test One'),
+					$this->getUserMock('test2', 'Test Two'),
+				],
+				[
+					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test0']],
+				],
+				[],
+				true,
+				false,
+			],
 			[
 				'test',
 				true,
+				true,
 				['abc', 'xyz'],
 				[
 					['abc', 'test', 2, 0, ['test1' => 'Test One']],
@@ -191,6 +253,21 @@ class ShareesTest extends TestCase {
 			[
 				'test',
 				true,
+				false,
+				['abc', 'xyz'],
+				[
+					['abc', 'test', 2, 0, ['test1' => 'Test One']],
+					['xyz', 'test', 2, 0, []],
+				],
+				[],
+				[],
+				true,
+				false,
+			],
+			[
+				'test',
+				true,
+				true,
 				['abc', 'xyz'],
 				[
 					['abc', 'test', 2, 0, [
@@ -213,6 +290,27 @@ class ShareesTest extends TestCase {
 			[
 				'test',
 				true,
+				false,
+				['abc', 'xyz'],
+				[
+					['abc', 'test', 2, 0, [
+						'test1' => 'Test One',
+						'test2' => 'Test Two',
+					]],
+					['xyz', 'test', 2, 0, [
+						'test1' => 'Test One',
+						'test2' => 'Test Two',
+					]],
+				],
+				[],
+				[],
+				true,
+				false,
+			],
+			[
+				'test',
+				true,
+				true,
 				['abc', 'xyz'],
 				[
 					['abc', 'test', 2, 0, [
@@ -231,6 +329,26 @@ class ShareesTest extends TestCase {
 				false,
 				false,
 			],
+			[
+				'test',
+				true,
+				false,
+				['abc', 'xyz'],
+				[
+					['abc', 'test', 2, 0, [
+						'test' => 'Test One',
+					]],
+					['xyz', 'test', 2, 0, [
+						'test2' => 'Test Two',
+					]],
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
+				],
+				[],
+				true,
+				false,
+			],
 		];
 	}
 
@@ -239,6 +357,7 @@ class ShareesTest extends TestCase {
 	 *
 	 * @param string $searchTerm
 	 * @param bool $shareWithGroupOnly
+	 * @param bool $shareeEnumeration
 	 * @param array $groupResponse
 	 * @param array $userResponse
 	 * @param array $exactExpected
@@ -246,10 +365,11 @@ class ShareesTest extends TestCase {
 	 * @param bool $reachedEnd
 	 * @param mixed $singleUser
 	 */
-	public function testGetUsers($searchTerm, $shareWithGroupOnly, $groupResponse, $userResponse, $exactExpected, $expected, $reachedEnd, $singleUser) {
+	public function testGetUsers($searchTerm, $shareWithGroupOnly, $shareeEnumeration, $groupResponse, $userResponse, $exactExpected, $expected, $reachedEnd, $singleUser) {
 		$this->invokePrivate($this->sharees, 'limit', [2]);
 		$this->invokePrivate($this->sharees, 'offset', [0]);
 		$this->invokePrivate($this->sharees, 'shareWithGroupOnly', [$shareWithGroupOnly]);
+		$this->invokePrivate($this->sharees, 'shareeEnumeration', [$shareeEnumeration]);
 
 		$user = $this->getUserMock('admin', 'Administrator');
 		$this->session->expects($this->any())
@@ -290,9 +410,10 @@ class ShareesTest extends TestCase {
 
 	public function dataGetGroups() {
 		return [
-			['test', false, [], [], [], [], true, false],
+			['test', false, true, [], [], [], [], true, false],
+			['test', false, false, [], [], [], [], true, false],
 			[
-				'test', false,
+				'test', false, true,
 				[$this->getGroupMock('test1')],
 				[],
 				[],
@@ -301,7 +422,16 @@ class ShareesTest extends TestCase {
 				false,
 			],
 			[
-				'test', false,
+				'test', false, false,
+				[$this->getGroupMock('test1')],
+				[],
+				[],
+				[],
+				true,
+				false,
+			],
+			[
+				'test', false, true,
 				[
 					$this->getGroupMock('test'),
 					$this->getGroupMock('test1'),
@@ -313,7 +443,19 @@ class ShareesTest extends TestCase {
 				false,
 			],
 			[
-				'test', false,
+				'test', false, false,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[],
+				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
+				[],
+				true,
+				false,
+			],
+			[
+				'test', false, true,
 				[
 					$this->getGroupMock('test0'),
 					$this->getGroupMock('test1'),
@@ -328,7 +470,19 @@ class ShareesTest extends TestCase {
 				null,
 			],
 			[
-				'test', false,
+				'test', false, false,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[],
+				[],
+				[],
+				true,
+				null,
+			],
+			[
+				'test', false, true,
 				[
 					$this->getGroupMock('test0'),
 					$this->getGroupMock('test1'),
@@ -344,9 +498,24 @@ class ShareesTest extends TestCase {
 				false,
 				$this->getGroupMock('test'),
 			],
-			['test', true, [], [], [], [], true, false],
 			[
-				'test', true,
+				'test', false, false,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[],
+				[
+					['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']],
+				],
+				[],
+				true,
+				$this->getGroupMock('test'),
+			],
+			['test', true, true, [], [], [], [], true, false],
+			['test', true, false, [], [], [], [], true, false],
+			[
+				'test', true, true,
 				[
 					$this->getGroupMock('test1'),
 					$this->getGroupMock('test2'),
@@ -358,7 +527,19 @@ class ShareesTest extends TestCase {
 				false,
 			],
 			[
-				'test', true,
+				'test', true, false,
+				[
+					$this->getGroupMock('test1'),
+					$this->getGroupMock('test2'),
+				],
+				[$this->getGroupMock('test1')],
+				[],
+				[],
+				true,
+				false,
+			],
+			[
+				'test', true, true,
 				[
 					$this->getGroupMock('test'),
 					$this->getGroupMock('test1'),
@@ -370,7 +551,19 @@ class ShareesTest extends TestCase {
 				false,
 			],
 			[
-				'test', true,
+				'test', true, false,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test')],
+				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
+				[],
+				true,
+				false,
+			],
+			[
+				'test', true, true,
 				[
 					$this->getGroupMock('test'),
 					$this->getGroupMock('test1'),
@@ -382,7 +575,19 @@ class ShareesTest extends TestCase {
 				false,
 			],
 			[
-				'test', true,
+				'test', true, false,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test1')],
+				[],
+				[],
+				true,
+				false,
+			],
+			[
+				'test', true, true,
 				[
 					$this->getGroupMock('test'),
 					$this->getGroupMock('test1'),
@@ -394,7 +599,19 @@ class ShareesTest extends TestCase {
 				false,
 			],
 			[
-				'test', true,
+				'test', true, false,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
+				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
+				[],
+				true,
+				false,
+			],
+			[
+				'test', true, true,
 				[
 					$this->getGroupMock('test0'),
 					$this->getGroupMock('test1'),
@@ -409,7 +626,19 @@ class ShareesTest extends TestCase {
 				null,
 			],
 			[
-				'test', true,
+				'test', true, false,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
+				[],
+				[],
+				true,
+				null,
+			],
+			[
+				'test', true, true,
 				[
 					$this->getGroupMock('test0'),
 					$this->getGroupMock('test1'),
@@ -425,6 +654,20 @@ class ShareesTest extends TestCase {
 				false,
 				$this->getGroupMock('test'),
 			],
+			[
+				'test', true, false,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
+				[
+					['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']],
+				],
+				[],
+				true,
+				$this->getGroupMock('test'),
+			],
 		];
 	}
 
@@ -433,6 +676,7 @@ class ShareesTest extends TestCase {
 	 *
 	 * @param string $searchTerm
 	 * @param bool $shareWithGroupOnly
+	 * @param bool $shareeEnumeration
 	 * @param array $groupResponse
 	 * @param array $userGroupsResponse
 	 * @param array $exactExpected
@@ -440,10 +684,11 @@ class ShareesTest extends TestCase {
 	 * @param bool $reachedEnd
 	 * @param mixed $singleGroup
 	 */
-	public function testGetGroups($searchTerm, $shareWithGroupOnly, $groupResponse, $userGroupsResponse, $exactExpected, $expected, $reachedEnd, $singleGroup) {
+	public function testGetGroups($searchTerm, $shareWithGroupOnly, $shareeEnumeration, $groupResponse, $userGroupsResponse, $exactExpected, $expected, $reachedEnd, $singleGroup) {
 		$this->invokePrivate($this->sharees, 'limit', [2]);
 		$this->invokePrivate($this->sharees, 'offset', [0]);
 		$this->invokePrivate($this->sharees, 'shareWithGroupOnly', [$shareWithGroupOnly]);
+		$this->invokePrivate($this->sharees, 'shareeEnumeration', [$shareeEnumeration]);
 
 		$this->groupManager->expects($this->once())
 			->method('search')
@@ -480,10 +725,22 @@ class ShareesTest extends TestCase {
 
 	public function dataGetRemote() {
 		return [
-			['test', [], [], [], true],
+			['test', [], true, [], [], true],
+			['test', [], false, [], [], true],
+			[
+				'test@remote',
+				[],
+				true,
+				[
+					['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
+				],
+				[],
+				true,
+			],
 			[
 				'test@remote',
 				[],
+				false,
 				[
 					['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
 				],
@@ -508,12 +765,36 @@ class ShareesTest extends TestCase {
 						],
 					],
 				],
+				true,
 				[],
 				[
 					['label' => 'User @ Localhost', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
 				],
 				true,
 			],
+			[
+				'test',
+				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User @ Localhost',
+						'CLOUD' => [
+							'username@localhost',
+						],
+					],
+				],
+				false,
+				[],
+				[],
+				true,
+			],
 			[
 				'test@remote',
 				[
@@ -532,6 +813,7 @@ class ShareesTest extends TestCase {
 						],
 					],
 				],
+				true,
 				[
 					['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
 				],
@@ -540,6 +822,31 @@ class ShareesTest extends TestCase {
 				],
 				true,
 			],
+			[
+				'test@remote',
+				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User @ Localhost',
+						'CLOUD' => [
+							'username@localhost',
+						],
+					],
+				],
+				false,
+				[
+					['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
+				],
+				[],
+				true,
+			],
 			[
 				'username@localhost',
 				[
@@ -558,11 +865,36 @@ class ShareesTest extends TestCase {
 						],
 					],
 				],
+				true,
 				[
 					['label' => 'User @ Localhost', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
 				],
+				[],
+				true,
+			],
+			[
+				'username@localhost',
 				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User @ Localhost',
+						'CLOUD' => [
+							'username@localhost',
+						],
+					],
 				],
+				false,
+				[
+					['label' => 'User @ Localhost', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
+				],
+				[],
 				true,
 			],
 		];
@@ -573,11 +905,13 @@ class ShareesTest extends TestCase {
 	 *
 	 * @param string $searchTerm
 	 * @param array $contacts
+	 * @param bool $shareeEnumeration
 	 * @param array $exactExpected
 	 * @param array $expected
 	 * @param bool $reachedEnd
 	 */
-	public function testGetRemote($searchTerm, $contacts, $exactExpected, $expected, $reachedEnd) {
+	public function testGetRemote($searchTerm, $contacts, $shareeEnumeration, $exactExpected, $expected, $reachedEnd) {
+		$this->invokePrivate($this->sharees, 'shareeEnumeration', [$shareeEnumeration]);
 		$this->contactsManager->expects($this->any())
 			->method('search')
 			->with($searchTerm, ['CLOUD', 'FN'])
@@ -595,80 +929,84 @@ class ShareesTest extends TestCase {
 		$allTypes = [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE];
 
 		return [
-			[[], '', true, '', null, $allTypes, 1, 200, false],
+			[[], '', 'yes', true, '', null, $allTypes, 1, 200, false, true],
 
 			// Test itemType
 			[[
 				'search' => '',
-			], '', true, '', null, $allTypes, 1, 200, false],
+			], '', 'yes', true, '', null, $allTypes, 1, 200, false, true],
 			[[
 				'search' => 'foobar',
-			], '', true, 'foobar', null, $allTypes, 1, 200, false],
+			], '', 'yes', true, 'foobar', null, $allTypes, 1, 200, false, true],
 			[[
 				'search' => 0,
-			], '', true, '0', null, $allTypes, 1, 200, false],
+			], '', 'yes', true, '0', null, $allTypes, 1, 200, false, true],
 
 			// Test itemType
 			[[
 				'itemType' => '',
-			], '', true, '', '', $allTypes, 1, 200, false],
+			], '', 'yes', true, '', '', $allTypes, 1, 200, false, true],
 			[[
 				'itemType' => 'folder',
-			], '', true, '', 'folder', $allTypes, 1, 200, false],
+			], '', 'yes', true, '', 'folder', $allTypes, 1, 200, false, true],
 			[[
 				'itemType' => 0,
-			], '', true, '', '0', $allTypes, 1, 200, false],
+			], '', 'yes', true, '', '0', $allTypes, 1, 200, false, true],
 
 			// Test shareType
 			[[
-			], '', true, '', null, $allTypes, 1, 200, false],
+			], '', 'yes', true, '', null, $allTypes, 1, 200, false, true],
 			[[
 				'shareType' => 0,
-			], '', true, '', null, [0], 1, 200, false],
+			], '', 'yes', true, '', null, [0], 1, 200, false, true],
 			[[
 				'shareType' => '0',
-			], '', true, '', null, [0], 1, 200, false],
+			], '', 'yes', true, '', null, [0], 1, 200, false, true],
 			[[
 				'shareType' => 1,
-			], '', true, '', null, [1], 1, 200, false],
+			], '', 'yes', true, '', null, [1], 1, 200, false, true],
 			[[
 				'shareType' => 12,
-			], '', true, '', null, [], 1, 200, false],
+			], '', 'yes', true, '', null, [], 1, 200, false, true],
 			[[
 				'shareType' => 'foobar',
-			], '', true, '', null, $allTypes, 1, 200, false],
+			], '', 'yes', true, '', null, $allTypes, 1, 200, false, true],
 			[[
 				'shareType' => [0, 1, 2],
-			], '', true, '', null, [0, 1], 1, 200, false],
+			], '', 'yes', true, '', null, [0, 1], 1, 200, false, true],
 			[[
 				'shareType' => [0, 1],
-			], '', true, '', null, [0, 1], 1, 200, false],
+			], '', 'yes', true, '', null, [0, 1], 1, 200, false, true],
 			[[
 				'shareType' => $allTypes,
-			], '', true, '', null, $allTypes, 1, 200, false],
+			], '', 'yes', true, '', null, $allTypes, 1, 200, false, true],
 			[[
 				'shareType' => $allTypes,
-			], '', false, '', null, [0, 1], 1, 200, false],
+			], '', 'yes', false, '', null, [0, 1], 1, 200, false, true],
 
 			// Test pagination
 			[[
 				'page' => 1,
-			], '', true, '', null, $allTypes, 1, 200, false],
+			], '', 'yes', true, '', null, $allTypes, 1, 200, false, true],
 			[[
 				'page' => 10,
-			], '', true, '', null, $allTypes, 10, 200, false],
+			], '', 'yes', true, '', null, $allTypes, 10, 200, false, true],
 
 			// Test perPage
 			[[
 				'perPage' => 1,
-			], '', true, '', null, $allTypes, 1, 1, false],
+			], '', 'yes', true, '', null, $allTypes, 1, 1, false, true],
 			[[
 				'perPage' => 10,
-			], '', true, '', null, $allTypes, 1, 10, false],
+			], '', 'yes', true, '', null, $allTypes, 1, 10, false, true],
 
 			// Test $shareWithGroupOnly setting
-			[[], 'no', true, '', null, $allTypes, 1, 200, false],
-			[[], 'yes', true, '', null, $allTypes, 1, 200, true],
+			[[], 'no', 'yes',  true, '', null, $allTypes, 1, 200, false, true],
+			[[], 'yes', 'yes', true, '', null, $allTypes, 1, 200, true, true],
+
+			// Test $shareeEnumeration setting
+			[[], 'no', 'yes',  true, '', null, $allTypes, 1, 200, false, true],
+			[[], 'no', 'no', true, '', null, $allTypes, 1, 200, false, false],
 
 		];
 	}
@@ -678,6 +1016,7 @@ class ShareesTest extends TestCase {
 	 *
 	 * @param array $getData
 	 * @param string $apiSetting
+	 * @param string $enumSetting
 	 * @param bool $remoteSharingEnabled
 	 * @param string $search
 	 * @param string $itemType
@@ -685,18 +1024,22 @@ class ShareesTest extends TestCase {
 	 * @param int $page
 	 * @param int $perPage
 	 * @param bool $shareWithGroupOnly
+	 * @param bool $shareeEnumeration
 	 */
-	public function testSearch($getData, $apiSetting, $remoteSharingEnabled, $search, $itemType, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
+	public function testSearch($getData, $apiSetting, $enumSetting, $remoteSharingEnabled, $search, $itemType, $shareTypes, $page, $perPage, $shareWithGroupOnly, $shareeEnumeration) {
 		$oldGet = $_GET;
 		$_GET = $getData;
 
 		$config = $this->getMockBuilder('OCP\IConfig')
 			->disableOriginalConstructor()
 			->getMock();
-		$config->expects($this->once())
+		$config->expects($this->exactly(2))
 			->method('getAppValue')
-			->with('core', 'shareapi_only_share_with_group_members', 'no')
-			->willReturn($apiSetting);
+			->with('core', $this->anything(), $this->anything())
+			->willReturnMap([
+				['core', 'shareapi_only_share_with_group_members', 'no', $apiSetting],
+				['core', 'shareapi_allow_share_dialog_user_enumeration', 'yes', $enumSetting],
+			]);
 
 		$sharees = $this->getMockBuilder('\OCA\Files_Sharing\API\Sharees')
 			->setConstructorArgs([
@@ -735,6 +1078,7 @@ class ShareesTest extends TestCase {
 		$this->assertInstanceOf('\OC_OCS_Result', $sharees->search());
 
 		$this->assertSame($shareWithGroupOnly, $this->invokePrivate($sharees, 'shareWithGroupOnly'));
+		$this->assertSame($shareeEnumeration, $this->invokePrivate($sharees, 'shareeEnumeration'));
 
 		$_GET = $oldGet;
 	}
-- 
GitLab


From 1493e86deafb19f3f98ecee35389119daf2911a4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 22 Sep 2015 11:43:40 +0200
Subject: [PATCH 476/783] Allow listeners to set status code and message

---
 .../connector/sabre/listenerplugin.php        | 12 +++-
 lib/public/sabrepluginevent.php               | 72 +++++++++++++++++++
 lib/public/sabrepluginexception.php           | 37 ++++++++++
 3 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 lib/public/sabrepluginevent.php
 create mode 100644 lib/public/sabrepluginexception.php

diff --git a/lib/private/connector/sabre/listenerplugin.php b/lib/private/connector/sabre/listenerplugin.php
index d0d40f4dc86..ec628add28b 100644
--- a/lib/private/connector/sabre/listenerplugin.php
+++ b/lib/private/connector/sabre/listenerplugin.php
@@ -21,6 +21,9 @@
 
 namespace OC\Connector\Sabre;
 
+use OCP\AppFramework\Http;
+use OCP\SabrePluginEvent;
+use OCP\SabrePluginException;
 use Sabre\DAV\ServerPlugin;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
@@ -49,9 +52,16 @@ class ListenerPlugin extends ServerPlugin {
 	 * in case the system is in maintenance mode.
 	 *
 	 * @return bool
+	 * @throws \Exception
 	 */
 	public function emitListener() {
-		$this->dispatcher->dispatch('OC\Connector\Sabre::beforeMethod');
+		$event = new SabrePluginEvent();
+
+		$this->dispatcher->dispatch('OC\Connector\Sabre::beforeMethod', $event);
+
+		if ($event->getStatusCode() !== Http::STATUS_OK) {
+			throw new SabrePluginException($event->getMessage(), $event->getStatusCode());
+		}
 
 		return true;
 	}
diff --git a/lib/public/sabrepluginevent.php b/lib/public/sabrepluginevent.php
new file mode 100644
index 00000000000..581113a42ea
--- /dev/null
+++ b/lib/public/sabrepluginevent.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP;
+
+
+use OCP\AppFramework\Http;
+use Symfony\Component\EventDispatcher\Event;
+
+class SabrePluginEvent extends Event {
+
+	/** @var int */
+	protected $statusCode;
+
+	/** @var string */
+	protected $message;
+
+	public function __construct() {
+		$this->message = '';
+		$this->statusCode = Http::STATUS_OK;
+	}
+
+	/**
+	 * @param int $statusCode
+	 * @return self
+	 */
+	public function setStatusCode($statusCode) {
+		$this->statusCode = (int) $statusCode;
+		return $this;
+	}
+
+	/**
+	 * @param string $message
+	 * @return self
+	 */
+	public function setMessage($message) {
+		$this->message = (string) $message;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getStatusCode() {
+		return $this->statusCode;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getMessage() {
+		return $this->message;
+	}
+}
diff --git a/lib/public/sabrepluginexception.php b/lib/public/sabrepluginexception.php
new file mode 100644
index 00000000000..2aa4c688802
--- /dev/null
+++ b/lib/public/sabrepluginexception.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCP;
+
+
+use Sabre\DAV\Exception;
+
+class SabrePluginException extends Exception {
+
+	/**
+	 * Returns the HTTP statuscode for this exception
+	 *
+	 * @return int
+	 */
+	public function getHTTPCode() {
+		return $this->code;
+	}
+}
-- 
GitLab


From ebe9bea709dd74e3cab3bbb8e9b1ea141bdf90bf Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 23 Sep 2015 14:16:41 +0100
Subject: [PATCH 477/783] Unit test for preventing warning decoding content

---
 tests/lib/appframework/http/RequestTest.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php
index deb28909869..5140e37e515 100644
--- a/tests/lib/appframework/http/RequestTest.php
+++ b/tests/lib/appframework/http/RequestTest.php
@@ -202,6 +202,27 @@ class RequestTest extends \Test\TestCase {
 		$this->assertEquals('Joey', $request['nickname']);
 	}
 
+	public function testNotJsonPost() {
+		global $data;
+		$data = 'this is not valid json';
+		$vars = array(
+			'method' => 'POST',
+			'server' => array('CONTENT_TYPE' => 'application/json; utf-8')
+		);
+
+		$request = new Request(
+			$vars,
+			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
+			$this->config,
+			$this->stream
+		);
+
+		$this->assertEquals('POST', $request->method);
+		$result = $request->post;
+		// ensure there's no error attempting to decode the content
+	}
+
 	public function testPatch() {
 		global $data;
 		$data = http_build_query(array('name' => 'John Q. Public', 'nickname' => 'Joey'), '', '&');
-- 
GitLab


From 2c00587b5d2930f867cd74b6d9c0c7d696f1d61a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 23 Sep 2015 16:15:56 +0200
Subject: [PATCH 478/783] Add since-tag

---
 lib/public/sabrepluginevent.php     | 10 ++++++++++
 lib/public/sabrepluginexception.php |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/lib/public/sabrepluginevent.php b/lib/public/sabrepluginevent.php
index 581113a42ea..fed3237166d 100644
--- a/lib/public/sabrepluginevent.php
+++ b/lib/public/sabrepluginevent.php
@@ -25,6 +25,9 @@ namespace OCP;
 use OCP\AppFramework\Http;
 use Symfony\Component\EventDispatcher\Event;
 
+/**
+ * @since 8.2.0
+ */
 class SabrePluginEvent extends Event {
 
 	/** @var int */
@@ -33,6 +36,9 @@ class SabrePluginEvent extends Event {
 	/** @var string */
 	protected $message;
 
+	/**
+	 * @since 8.2.0
+	 */
 	public function __construct() {
 		$this->message = '';
 		$this->statusCode = Http::STATUS_OK;
@@ -41,6 +47,7 @@ class SabrePluginEvent extends Event {
 	/**
 	 * @param int $statusCode
 	 * @return self
+	 * @since 8.2.0
 	 */
 	public function setStatusCode($statusCode) {
 		$this->statusCode = (int) $statusCode;
@@ -50,6 +57,7 @@ class SabrePluginEvent extends Event {
 	/**
 	 * @param string $message
 	 * @return self
+	 * @since 8.2.0
 	 */
 	public function setMessage($message) {
 		$this->message = (string) $message;
@@ -58,6 +66,7 @@ class SabrePluginEvent extends Event {
 
 	/**
 	 * @return int
+	 * @since 8.2.0
 	 */
 	public function getStatusCode() {
 		return $this->statusCode;
@@ -65,6 +74,7 @@ class SabrePluginEvent extends Event {
 
 	/**
 	 * @return string
+	 * @since 8.2.0
 	 */
 	public function getMessage() {
 		return $this->message;
diff --git a/lib/public/sabrepluginexception.php b/lib/public/sabrepluginexception.php
index 2aa4c688802..5dba3b90a02 100644
--- a/lib/public/sabrepluginexception.php
+++ b/lib/public/sabrepluginexception.php
@@ -24,12 +24,16 @@ namespace OCP;
 
 use Sabre\DAV\Exception;
 
+/**
+ * @since 8.2.0
+ */
 class SabrePluginException extends Exception {
 
 	/**
 	 * Returns the HTTP statuscode for this exception
 	 *
 	 * @return int
+	 * @since 8.2.0
 	 */
 	public function getHTTPCode() {
 		return $this->code;
-- 
GitLab


From 88f03192ba1f74a5ab8881c0c1cbb3b2203f9f3f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 4 Sep 2015 16:43:41 +0200
Subject: [PATCH 479/783] Delay listening to owner changes untill we use a
 share for that owner

---
 apps/files_sharing/lib/mountprovider.php |  3 +--
 apps/files_sharing/lib/sharedstorage.php | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/mountprovider.php b/apps/files_sharing/lib/mountprovider.php
index 14a79625993..458e7f2619b 100644
--- a/apps/files_sharing/lib/mountprovider.php
+++ b/apps/files_sharing/lib/mountprovider.php
@@ -69,12 +69,11 @@ class MountProvider implements IMountProvider {
 			// for updating etags for the share owner when we make changes to this share.
 			$ownerPropagator = $this->propagationManager->getChangePropagator($share['uid_owner']);
 
-			// for updating our etags when changes are made to the share from the owners side (probably indirectly by us trough another share)
-			$this->propagationManager->listenToOwnerChanges($share['uid_owner'], $user->getUID());
 			return new SharedMount(
 				'\OC\Files\Storage\Shared',
 				'/' . $user->getUID() . '/' . $share['file_target'],
 				array(
+					'propagationManager' => $this->propagationManager,
 					'propagator' => $ownerPropagator,
 					'share' => $share,
 					'user' => $user->getUID()
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 1ac401f3cf8..47f3bcf7602 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -50,13 +50,28 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	 */
 	private $ownerView;
 
+	/**
+	 * @var \OCA\Files_Sharing\Propagation\PropagationManager
+	 */
+	private $propagationManager;
+
+	/**
+	 * @var string
+	 */
+	private $user;
+
 	public function __construct($arguments) {
 		$this->share = $arguments['share'];
 		$this->ownerView = $arguments['ownerView'];
+		$this->propagationManager = $arguments['propagationManager'];
+		$this->user = $arguments['user'];
 	}
 
 	private function init() {
 		Filesystem::initMountPoints($this->share['uid_owner']);
+
+		// for updating our etags when changes are made to the share from the owners side (probably indirectly by us trough another share)
+		$this->propagationManager->listenToOwnerChanges($this->share['uid_owner'], $this->user);
 	}
 
 	/**
-- 
GitLab


From 7d53427ee6ff1a61e005423da952b49b7b8d3147 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 4 Sep 2015 16:48:45 +0200
Subject: [PATCH 480/783] only initialize once

---
 apps/files_sharing/lib/sharedstorage.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 47f3bcf7602..27dd2f1e485 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -60,6 +60,8 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	 */
 	private $user;
 
+	private $initialized = false;
+
 	public function __construct($arguments) {
 		$this->share = $arguments['share'];
 		$this->ownerView = $arguments['ownerView'];
@@ -68,6 +70,10 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	}
 
 	private function init() {
+		if ($this->initialized) {
+			return;
+		}
+		$this->initialized = true;
 		Filesystem::initMountPoints($this->share['uid_owner']);
 
 		// for updating our etags when changes are made to the share from the owners side (probably indirectly by us trough another share)
-- 
GitLab


From 9d03b7c6b7131761f29f79e6c33473b0ca483856 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Aug 2015 00:55:42 +0200
Subject: [PATCH 481/783] read all relevant user attributes on login and user
 search, in one query. saves us some.

---
 apps/user_ldap/lib/access.php         |  29 ++++-
 apps/user_ldap/lib/user/manager.php   |  37 ++++++
 apps/user_ldap/lib/user/user.php      | 180 ++++++++++++++++++++++----
 apps/user_ldap/tests/access.php       |  67 ++++++++--
 apps/user_ldap/tests/group_ldap.php   |   6 +-
 apps/user_ldap/tests/user/manager.php |  42 ++++++
 apps/user_ldap/tests/user/user.php    |  65 +++++++++-
 apps/user_ldap/tests/user_ldap.php    |  18 ++-
 apps/user_ldap/user_ldap.php          |  60 ++-------
 9 files changed, 404 insertions(+), 100 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index a2eb834b496..fe9eefb3116 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -536,6 +536,16 @@ class Access extends LDAPUtility implements user\IUserTools {
 		return $ownCloudNames;
 	}
 
+	/**
+	 * caches the user display name
+	 * @param string $ocName the internal ownCloud username
+	 * @param string|false $home the home directory path
+	 */
+	public function cacheUserHome($ocName, $home) {
+		$cacheKey = 'getHome'.$ocName;
+		$this->connection->writeToCache($cacheKey, $home);
+	}
+
 	/**
 	 * caches a user as existing
 	 * @param string $ocName the internal ownCloud username
@@ -656,7 +666,24 @@ class Access extends LDAPUtility implements user\IUserTools {
 	 * @return array
 	 */
 	public function fetchListOfUsers($filter, $attr, $limit = null, $offset = null) {
-		return $this->fetchList($this->searchUsers($filter, $attr, $limit, $offset), (count($attr) > 1));
+		$ldapRecords = $this->searchUsers($filter, $attr, $limit, $offset);
+		$this->batchApplyUserAttributes($ldapRecords);
+		return $this->fetchList($ldapRecords, (count($attr) > 1));
+	}
+
+	/**
+	 * provided with an array of LDAP user records the method will fetch the
+	 * user object and requests it to process the freshly fetched attributes and
+	 * and their values
+	 * @param array $ldapRecords
+	 */
+	public function batchApplyUserAttributes(array $ldapRecords){
+		foreach($ldapRecords as $userRecord) {
+			$ocName  = $this->dn2ocname($userRecord['dn'], $userRecord[$this->connection->ldapUserDisplayName]);
+			$this->cacheUserExists($ocName);
+			$user = $this->userManager->get($ocName);
+			$user->processAttributes($userRecord);
+		}
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php
index b70e057741f..86f0b8991d7 100644
--- a/apps/user_ldap/lib/user/manager.php
+++ b/apps/user_ldap/lib/user/manager.php
@@ -126,6 +126,43 @@ class Manager {
 		}
 	}
 
+	/**
+	 * returns a list of attributes that will be processed further, e.g. quota,
+	 * email, displayname, or others.
+	 * @param bool $minimal - optional, set to true to skip attributes with big
+	 * payload
+	 * @return string[]
+	 */
+	public function getAttributes($minimal = false) {
+		$attributes = array('dn', 'uid', 'samaccountname', 'memberof');
+		$possible = array(
+			$this->access->getConnection()->ldapQuotaAttribute,
+			$this->access->getConnection()->ldapEmailAttribute,
+			$this->access->getConnection()->ldapUserDisplayName,
+		);
+		foreach($possible as $attr) {
+			if(!is_null($attr)) {
+				$attributes[] = $attr;
+			}
+		}
+
+		$homeRule = $this->access->getConnection()->homeFolderNamingRule;
+		if(strpos($homeRule, 'attr:') === 0) {
+			$attributes[] = substr($homeRule, strlen('attr:'));
+		}
+
+		if(!$minimal) {
+			// attributes that are not really important but may come with big
+			// payload.
+			$attributes = array_merge($attributes, array(
+				'jpegphoto',
+				'thumbnailphoto'
+			));
+		}
+
+		return $attributes;
+	}
+
 	/**
 	 * Checks whether the specified user is marked as deleted
 	 * @param string $id the ownCloud user name
diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php
index ac5d8f5a374..3bfe0c27077 100644
--- a/apps/user_ldap/lib/user/user.php
+++ b/apps/user_ldap/lib/user/user.php
@@ -138,6 +138,69 @@ class User {
 		}
 	}
 
+	/**
+	 * processes results from LDAP for attributes as returned by getAttributesToRead()
+	 * @param array $ldapEntry the user entry as retrieved from LDAP
+	 */
+	public function processAttributes($ldapEntry) {
+		$this->markRefreshTime();
+		//Quota
+		$attr = strtolower($this->connection->ldapQuotaAttribute);
+		if(isset($ldapEntry[$attr])) {
+			$this->updateQuota($ldapEntry[$attr]);
+		}
+		unset($attr);
+
+		//Email
+		$attr = strtolower($this->connection->ldapEmailAttribute);
+		if(isset($ldapEntry[$attr])) {
+			$this->updateEmail($ldapEntry[$attr]);
+		}
+		unset($attr);
+
+		//displayName
+		$attr = strtolower($this->connection->ldapUserDisplayName);
+		if(isset($ldapEntry[$attr])) {
+			$displayName = $ldapEntry[$attr];
+			if(!empty($displayName)) {
+				$this->storeDisplayName($displayName);
+				$this->access->cacheUserDisplayName($this->getUsername(), $displayName);
+			}
+		}
+		unset($attr);
+
+		// LDAP Username, needed for s2s sharing
+		if(isset($ldapEntry['uid'])) {
+			$this->storeLDAPUserName($ldapEntry['uid']);
+		} else if(isset($ldapEntry['samaccountname'])) {
+			$this->storeLDAPUserName($ldapEntry['samaccountname']);
+		}
+		//homePath
+		if(strpos($this->connection->homeFolderNamingRule, 'attr:') === 0) {
+			$attr = strtolower(substr($this->connection->homeFolderNamingRule, strlen('attr:')));
+			if(isset($ldapEntry[$attr])) {
+				$this->access->cacheUserHome(
+					$this->getUsername(), $this->getHomePath($ldapEntry[$attr]));
+			}
+		}
+		//memberOf groups
+		$cacheKey = 'getMemberOf'.$this->getUsername();
+		$groups = false;
+		if(isset($ldapEntry['memberof'])) {
+			$groups = $ldapEntry['memberof'];
+		}
+		$this->connection->writeToCache($cacheKey, $groups);
+		//Avatar
+		$attrs = array('jpegphoto', 'thumbnailphoto');
+		foreach ($attrs as $attr)  {
+			if(isset($ldapEntry[$attr])) {
+				$this->avatarImage = $ldapEntry[$attr];
+				$this->updateAvatar();
+				break;
+			}
+		}
+	}
+
 	/**
 	 * @brief returns the LDAP DN of the user
 	 * @return string
@@ -154,6 +217,65 @@ class User {
 		return $this->uid;
 	}
 
+	/**
+	 * returns the home directory of the user if specified by LDAP settings
+	 * @param string $valueFromLDAP
+	 * @return bool|string
+	 * @throws \Exception
+	 */
+	public function getHomePath($valueFromLDAP = null) {
+		$path = $valueFromLDAP;
+
+		if(   is_null($path)
+		   && strpos($this->access->connection->homeFolderNamingRule, 'attr:') === 0
+		   && $this->access->connection->homeFolderNamingRule !== 'attr:')
+		{
+			$attr = substr($this->access->connection->homeFolderNamingRule, strlen('attr:'));
+			$homedir = $this->access->readAttribute(
+				$this->access->username2dn($this->getUsername()), $attr);
+			if ($homedir && isset($homedir[0])) {
+				$path = $homedir[0];
+			}
+		}
+
+		if(!empty($path)) {
+			//if attribute's value is an absolute path take this, otherwise append it to data dir
+			//check for / at the beginning or pattern c:\ resp. c:/
+			if(   '/' !== $path[0]
+			   && !(3 < strlen($path) && ctype_alpha($path[0])
+			       && $path[1] === ':' && ('\\' === $path[2] || '/' === $path[2]))
+			) {
+				$path = $this->config->getSystemValue('datadirectory',
+						\OC::$SERVERROOT.'/data' ) . '/' . $path;
+			}
+			//we need it to store it in the DB as well in case a user gets
+			//deleted so we can clean up afterwards
+			$this->config->setUserValue(
+				$this->getUsername(), 'user_ldap', 'homePath', $path
+			);
+			return $path;
+		}
+
+		if($this->config->getAppValue('user_ldap', 'enforce_home_folder_naming_rule', true)) {
+			// a naming rule attribute is defined, but it doesn't exist for that LDAP user
+			throw new \Exception('Home dir attribute can\'t be read from LDAP for uid: ' . $this->getUsername());
+		}
+
+		//false will apply default behaviour as defined and done by OC_User
+		$this->config->setUserValue($this->getUsername(), 'user_ldap', 'homePath', '');
+		return false;
+	}
+
+	public function getMemberOfGroups() {
+		$cacheKey = 'getMemberOf'.$this->getUsername();
+		if($this->connection->isCached($cacheKey)) {
+			return $this->connection->getFromCache($cacheKey);
+		}
+		$groupDNs = $this->access->readAttribute($this->getDN(), 'memberOf');
+		$this->connection->writeToCache($cacheKey, $groupDNs);
+		return $groupDNs;
+	}
+
 	/**
 	 * @brief reads the image from LDAP that shall be used as Avatar
 	 * @return string data (provided by LDAP) | false
@@ -189,7 +311,7 @@ class User {
 	 * @brief marks the time when user features like email have been updated
 	 * @return null
 	 */
-	private function markRefreshTime() {
+	public function markRefreshTime() {
 		$this->config->setUserValue(
 			$this->uid, 'user_ldap', self::USER_PREFKEY_LASTREFRESH, time());
 	}
@@ -252,48 +374,52 @@ class User {
 	}
 
 	/**
-	 * @brief fetches the email from LDAP and stores it as ownCloud user value
+	 * fetches the email from LDAP and stores it as ownCloud user value
+	 * @param string $valueFromLDAP if known, to save an LDAP read request
 	 * @return null
 	 */
-	public function updateEmail() {
+	public function updateEmail($valueFromLDAP = null) {
 		if($this->wasRefreshed('email')) {
 			return;
 		}
-
-		$email = null;
-		$emailAttribute = $this->connection->ldapEmailAttribute;
-		if(!empty($emailAttribute)) {
-			$aEmail = $this->access->readAttribute($this->dn, $emailAttribute);
-			if($aEmail && (count($aEmail) > 0)) {
-				$email = $aEmail[0];
-			}
-			if(!is_null($email)) {
-				$this->config->setUserValue(
-					$this->uid, 'settings', 'email', $email);
+		$email = $valueFromLDAP;
+		if(is_null($valueFromLDAP)) {
+			$emailAttribute = $this->connection->ldapEmailAttribute;
+			if(!empty($emailAttribute)) {
+				$aEmail = $this->access->readAttribute($this->dn, $emailAttribute);
+				if(is_array($aEmail) && (count($aEmail) > 0)) {
+					$email = $aEmail[0];
+				}
 			}
 		}
+		if(!is_null($email)) {
+			$this->config->setUserValue(
+				$this->uid, 'settings', 'email', $email);
+		}
 	}
 
 	/**
-	 * @brief fetches the quota from LDAP and stores it as ownCloud user value
+	 * fetches the quota from LDAP and stores it as ownCloud user value
+	 * @param string $valueFromLDAP the quota attribute's value can be passed,
+	 * to save the readAttribute request
 	 * @return null
 	 */
-	public function updateQuota() {
+	public function updateQuota($valueFromLDAP = null) {
 		if($this->wasRefreshed('quota')) {
 			return;
 		}
-
-		$quota = null;
+		//can be null
 		$quotaDefault = $this->connection->ldapQuotaDefault;
-		$quotaAttribute = $this->connection->ldapQuotaAttribute;
-		if(!empty($quotaDefault)) {
-			$quota = $quotaDefault;
-		}
-		if(!empty($quotaAttribute)) {
-			$aQuota = $this->access->readAttribute($this->dn, $quotaAttribute);
-
-			if($aQuota && (count($aQuota) > 0)) {
-				$quota = $aQuota[0];
+		$quota = !is_null($valueFromLDAP)
+			? $valueFromLDAP
+			: $quotaDefault !== '' ? $quotaDefault : null;
+		if(is_null($valueFromLDAP)) {
+			$quotaAttribute = $this->connection->ldapQuotaAttribute;
+			if(!empty($quotaAttribute)) {
+				$aQuota = $this->access->readAttribute($this->dn, $quotaAttribute);
+				if($aQuota && (count($aQuota) > 0)) {
+					$quota = $aQuota[0];
+				}
 			}
 		}
 		if(!is_null($quota)) {
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php
index c4cd2036461..5bf1a65bd51 100644
--- a/apps/user_ldap/tests/access.php
+++ b/apps/user_ldap/tests/access.php
@@ -29,7 +29,7 @@ use \OCA\user_ldap\lib\Connection;
 use \OCA\user_ldap\lib\ILDAPWrapper;
 
 class Test_Access extends \Test\TestCase {
-	private function getConnecterAndLdapMock() {
+	private function getConnectorAndLdapMock() {
 		static $conMethods;
 		static $accMethods;
 		static $umMethods;
@@ -56,7 +56,7 @@ class Test_Access extends \Test\TestCase {
 	}
 
 	public function testEscapeFilterPartValidChars() {
-		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
 		$access = new Access($con, $lw, $um);
 
 		$input = 'okay';
@@ -64,7 +64,7 @@ class Test_Access extends \Test\TestCase {
 	}
 
 	public function testEscapeFilterPartEscapeWildcard() {
-		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
 		$access = new Access($con, $lw, $um);
 
 		$input = '*';
@@ -73,7 +73,7 @@ class Test_Access extends \Test\TestCase {
 	}
 
 	public function testEscapeFilterPartEscapeWildcard2() {
-		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
 		$access = new Access($con, $lw, $um);
 
 		$input = 'foo*bar';
@@ -83,7 +83,7 @@ class Test_Access extends \Test\TestCase {
 
 	/** @dataProvider convertSID2StrSuccessData */
 	public function testConvertSID2StrSuccess(array $sidArray, $sidExpected) {
-		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
 		$access = new Access($con, $lw, $um);
 
 		$sidBinary = implode('', $sidArray);
@@ -118,7 +118,7 @@ class Test_Access extends \Test\TestCase {
 	}
 
 	public function testConvertSID2StrInputError() {
-		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
 		$access = new Access($con, $lw, $um);
 
 		$sidIllegal = 'foobar';
@@ -128,7 +128,7 @@ class Test_Access extends \Test\TestCase {
 	}
 
 	public function testGetDomainDNFromDNSuccess() {
-		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
 		$access = new Access($con, $lw, $um);
 
 		$inputDN = 'uid=zaphod,cn=foobar,dc=my,dc=server,dc=com';
@@ -143,7 +143,7 @@ class Test_Access extends \Test\TestCase {
 	}
 
 	public function testGetDomainDNFromDNError() {
-		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
 		$access = new Access($con, $lw, $um);
 
 		$inputDN = 'foobar';
@@ -178,7 +178,7 @@ class Test_Access extends \Test\TestCase {
 	}
 
 	public function testStringResemblesDN() {
-		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
 		$access = new Access($con, $lw, $um);
 
 		$cases = $this->getResemblesDNInputData();
@@ -199,7 +199,7 @@ class Test_Access extends \Test\TestCase {
 	}
 
 	public function testStringResemblesDNLDAPmod() {
-		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
 		$lw = new \OCA\user_ldap\lib\LDAP();
 		$access = new Access($con, $lw, $um);
 
@@ -213,4 +213,51 @@ class Test_Access extends \Test\TestCase {
 			$this->assertSame($case['expectedResult'], $access->stringResemblesDN($case['input']));
 		}
 	}
+
+	public function testCacheUserHome() {
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
+		$access = new Access($con, $lw, $um);
+
+		$con->expects($this->once())
+			->method('writeToCache');
+
+		$access->cacheUserHome('foobar', '/foobars/path');
+	}
+
+	public function testBatchApplyUserAttributes() {
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
+		$access = new Access($con, $lw, $um);
+		$mapperMock = $this->getMockBuilder('\OCA\User_LDAP\Mapping\UserMapping')
+			->disableOriginalConstructor()
+			->getMock();
+		$userMock = $this->getMockBuilder('\OCA\user_ldap\lib\user\User')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$access->setUserMapper($mapperMock);
+
+		$data = array(
+			array(
+				'dn' => 'foobar',
+				$con->ldapUserDisplayName => 'barfoo'
+			),
+			array(
+				'dn' => 'foo',
+				$con->ldapUserDisplayName => 'bar'
+			),
+			array(
+				'dn' => 'raboof',
+				$con->ldapUserDisplayName => 'oofrab'
+			)
+		);
+
+		$userMock->expects($this->exactly(count($data)))
+			->method('processAttributes');
+
+		$um->expects($this->exactly(count($data)))
+			->method('get')
+			->will($this->returnValue($userMock));
+
+		$access->batchApplyUserAttributes($data);
+	}
 }
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index 805238e7d37..7007afd5162 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -53,6 +53,10 @@ class Test_Group_Ldap extends \Test\TestCase {
 								 $accMethods,
 								 array($connector, $lw, $um));
 
+		$access->expects($this->any())
+			->method('getConnection')
+			->will($this->returnValue($connector));
+
 		return $access;
 	}
 
@@ -391,7 +395,7 @@ class Test_Group_Ldap extends \Test\TestCase {
 
 		$access->connection->hasPrimaryGroups = false;
 
-		$access->expects($this->once())
+		$access->expects($this->any())
 			->method('username2dn')
 			->will($this->returnValue($dn));
 
diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/user/manager.php
index d659323fc7f..98e48638d8b 100644
--- a/apps/user_ldap/tests/user/manager.php
+++ b/apps/user_ldap/tests/user/manager.php
@@ -37,6 +37,16 @@ class Test_User_Manager extends \Test\TestCase {
 		$image = $this->getMock('\OCP\Image');
 		$dbc = $this->getMock('\OCP\IDBConnection');
 
+		$connection = new \OCA\user_ldap\lib\Connection(
+			$lw  = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper'),
+			'',
+			null
+		);
+
+		$access->expects($this->any())
+			->method('getConnection')
+			->will($this->returnValue($connection));
+
 		return array($access, $config, $filesys, $image, $log, $avaMgr, $dbc);
 	}
 
@@ -206,4 +216,36 @@ class Test_User_Manager extends \Test\TestCase {
 		$this->assertNull($user);
 	}
 
+	public function testGetAttributesAll() {
+		list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) =
+			$this->getTestInstances();
+
+		$manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc);
+		$manager->setLdapAccess($access);
+
+		$connection = $access->getConnection();
+		$connection->setConfiguration(array('ldapEmailAttribute' => 'mail'));
+
+		$attributes = $manager->getAttributes();
+
+		$this->assertTrue(in_array('dn', $attributes));
+		$this->assertTrue(in_array($access->getConnection()->ldapEmailAttribute, $attributes));
+		$this->assertTrue(in_array('jpegphoto', $attributes));
+		$this->assertTrue(in_array('thumbnailphoto', $attributes));
+	}
+
+	public function testGetAttributesMinimal() {
+		list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) =
+			$this->getTestInstances();
+
+		$manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc);
+		$manager->setLdapAccess($access);
+
+		$attributes = $manager->getAttributes(true);
+
+		$this->assertTrue(in_array('dn', $attributes));
+		$this->assertTrue(!in_array('jpegphoto', $attributes));
+		$this->assertTrue(!in_array('thumbnailphoto', $attributes));
+	}
+
 }
diff --git a/apps/user_ldap/tests/user/user.php b/apps/user_ldap/tests/user/user.php
index 80baafcb250..c074b2ceb75 100644
--- a/apps/user_ldap/tests/user/user.php
+++ b/apps/user_ldap/tests/user/user.php
@@ -221,7 +221,7 @@ class Test_User_User extends \Test\TestCase {
 		$connection->expects($this->at(0))
 			->method('__get')
 			->with($this->equalTo('ldapQuotaDefault'))
-			->will($this->returnValue('23 GB'));
+			->will($this->returnValue('25 GB'));
 
 		$connection->expects($this->at(1))
 			->method('__get')
@@ -242,7 +242,7 @@ class Test_User_User extends \Test\TestCase {
 			->with($this->equalTo('alice'),
 				$this->equalTo('files'),
 				$this->equalTo('quota'),
-				$this->equalTo('23 GB'))
+				$this->equalTo('25 GB'))
 			->will($this->returnValue(true));
 
 		$uid = 'alice';
@@ -278,14 +278,14 @@ class Test_User_User extends \Test\TestCase {
 			->method('readAttribute')
 			->with($this->equalTo('uid=alice,dc=foo,dc=bar'),
 				$this->equalTo('myquota'))
-			->will($this->returnValue(array('23 GB')));
+			->will($this->returnValue(array('27 GB')));
 
 		$config->expects($this->once())
 			->method('setUserValue')
 			->with($this->equalTo('alice'),
 				$this->equalTo('files'),
 				$this->equalTo('quota'),
-				$this->equalTo('23 GB'))
+				$this->equalTo('27 GB'))
 			->will($this->returnValue(true));
 
 		$uid = 'alice';
@@ -679,4 +679,61 @@ class Test_User_User extends \Test\TestCase {
 		//photo is returned
 		$photo = $user->getAvatarImage();
 	}
+
+	public function testProcessAttributes() {
+		list(, $config, $filesys, $image, $log, $avaMgr, $dbc) =
+			$this->getTestInstances();
+
+		list($access, $connection) =
+			$this->getAdvancedMocks($config, $filesys, $log, $avaMgr, $dbc);
+
+		$uid = 'alice';
+		$dn = 'uid=alice';
+
+		$requiredMethods = array(
+			'markRefreshTime',
+			'updateQuota',
+			'updateEmail',
+			'storeDisplayName',
+			'storeLDAPUserName',
+			'getHomePath',
+			'updateAvatar'
+		);
+
+		$userMock = $this->getMockBuilder('OCA\user_ldap\lib\user\User')
+			->setConstructorArgs(array($uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr))
+			->setMethods($requiredMethods)
+			->getMock();
+
+		$connection->setConfiguration(array(
+			'homeFolderNamingRule' => 'homeDirectory'
+		));
+
+		$connection->expects($this->any())
+			->method('__get')
+			//->will($this->returnArgument(0));
+			->will($this->returnCallback(function($name) {
+				if($name === 'homeFolderNamingRule') {
+					return 'attr:homeDirectory';
+				}
+				return $name;
+			}));
+
+		$record = array(
+			strtolower($connection->ldapQuotaAttribute) => array('4096'),
+			strtolower($connection->ldapEmailAttribute) => array('alice@wonderland.org'),
+			strtolower($connection->ldapUserDisplayName) => array('Aaaaalice'),
+			'uid' => array($uid),
+			'homedirectory' => array('Alice\'s Folder'),
+			'memberof' => array('cn=groupOne', 'cn=groupTwo'),
+			'jpegphoto' => array('here be an image')
+		);
+
+		foreach($requiredMethods as $method) {
+			$userMock->expects($this->once())
+				->method($method);
+		}
+
+		$userMock->processAttributes($record);
+	}
 }
diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php
index 2b99e1c2dc8..69a76c0b7ac 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/user_ldap.php
@@ -34,6 +34,7 @@ use \OCA\user_ldap\lib\ILDAPWrapper;
 class Test_User_Ldap_Direct extends \Test\TestCase {
 	protected $backend;
 	protected $access;
+	protected $configMock;
 
 	protected function setUp() {
 		parent::setUp();
@@ -61,8 +62,9 @@ class Test_User_Ldap_Direct extends \Test\TestCase {
 									$conMethods,
 									array($lw, null, null));
 
+		$this->configMock = $this->getMock('\OCP\IConfig');
 		$um = new \OCA\user_ldap\lib\user\Manager(
-				$this->getMock('\OCP\IConfig'),
+				$this->configMock,
 				$this->getMock('\OCA\user_ldap\lib\FilesystemHelper'),
 				$this->getMock('\OCA\user_ldap\lib\LogWrapper'),
 				$this->getMock('\OCP\IAvatarManager'),
@@ -586,6 +588,13 @@ class Test_User_Ldap_Direct extends \Test\TestCase {
 		$backend = new UserLDAP($access, $config);
 		$this->prepareMockForUserExists($access);
 
+		$dataDir = \OC::$server->getConfig()->getSystemValue(
+			'datadirectory', \OC::$SERVERROOT.'/data');
+
+		$this->configMock->expects($this->once())
+			->method('getSystemValue')
+			->will($this->returnValue($dataDir));
+
 		$access->connection->expects($this->any())
 			->method('__get')
 			->will($this->returnCallback(function($name) {
@@ -609,14 +618,9 @@ class Test_User_Ldap_Direct extends \Test\TestCase {
 						return false;
 				}
 			}));
-		//datadir-relativ path
-		$datadir = '/my/data/dir';
-		$config->expects($this->once())
-			->method('getSystemValue')
-			->will($this->returnValue($datadir));
 
 		$result = $backend->getHome('ladyofshadows');
-		$this->assertEquals($datadir.'/susannah/', $result);
+		$this->assertEquals($dataDir.'/susannah/', $result);
 	}
 
 	/**
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 00cba718369..7304088ba95 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -98,9 +98,8 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 	 */
 	public function getLDAPUserByLoginName($loginName) {
 		//find out dn of the user name
-		$attrs = array($this->access->connection->ldapUserDisplayName, 'dn',
-			'uid', 'samaccountname');
-		$users = $this->access->fetchUsersByLoginName($loginName, $attrs);
+		$attrs = $this->access->userManager->getAttributes();
+		$users = $this->access->fetchUsersByLoginName($loginName, $attrs, 1);
 		if(count($users) < 1) {
 			throw new \Exception('No user available for the given login name.');
 		}
@@ -137,16 +136,9 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 				return false;
 			}
 
+			$this->access->cacheUserExists($user->getUsername());
+			$user->processAttributes($ldapRecord);
 			$user->markLogin();
-			if(isset($ldapRecord[$this->access->connection->ldapUserDisplayName])) {
-				$dpn = $ldapRecord[$this->access->connection->ldapUserDisplayName];
-				$user->storeDisplayName($dpn);
-			}
-			if(isset($ldapRecord['uid'])) {
-				$user->storeLDAPUserName($ldapRecord['uid']);
-			} else if(isset($ldapRecord['samaccountname'])) {
-				$user->storeLDAPUserName($ldapRecord['samaccountname']);
-			}
 
 			return $user->getUsername();
 		}
@@ -188,7 +180,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 		//do the search and translate results to owncloud names
 		$ldap_users = $this->access->fetchListOfUsers(
 			$filter,
-			array($this->access->connection->ldapUserDisplayName, 'dn'),
+			$this->access->userManager->getAttributes(true),
 			$limit, $offset);
 		$ldap_users = $this->access->ownCloudUserNames($ldap_users);
 		\OCP\Util::writeLog('user_ldap', 'getUsers: '.count($ldap_users). ' Users found', \OCP\Util::DEBUG);
@@ -302,44 +294,12 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 		if($this->access->connection->isCached($cacheKey)) {
 			return $this->access->connection->getFromCache($cacheKey);
 		}
-		if(strpos($this->access->connection->homeFolderNamingRule, 'attr:') === 0 &&
-			$this->access->connection->homeFolderNamingRule !== 'attr:') {
-			$attr = substr($this->access->connection->homeFolderNamingRule, strlen('attr:'));
-			$homedir = $this->access->readAttribute(
-						$this->access->username2dn($uid), $attr);
-			if($homedir && isset($homedir[0])) {
-				$path = $homedir[0];
-				//if attribute's value is an absolute path take this, otherwise append it to data dir
-				//check for / at the beginning or pattern c:\ resp. c:/
-				if(
-					'/' === $path[0]
-					|| (3 < strlen($path) && ctype_alpha($path[0])
-						&& $path[1] === ':' && ('\\' === $path[2] || '/' === $path[2]))
-				) {
-					$homedir = $path;
-				} else {
-					$homedir = $this->ocConfig->getSystemValue('datadirectory',
-						\OC::$SERVERROOT.'/data' ) . '/' . $homedir[0];
-				}
-				$this->access->connection->writeToCache($cacheKey, $homedir);
-				//we need it to store it in the DB as well in case a user gets
-				//deleted so we can clean up afterwards
-				$this->ocConfig->setUserValue(
-					$uid, 'user_ldap', 'homePath', $homedir
-				);
-				//TODO: if home directory changes, the old one needs to be removed.
-				return $homedir;
-			}
-			if($this->ocConfig->getAppValue('user_ldap', 'enforce_home_folder_naming_rule', true)) {
-				// a naming rule attribute is defined, but it doesn't exist for that LDAP user
-				throw new \Exception('Home dir attribute can\'t be read from LDAP for uid: ' . $uid);
-			}
-		}
 
-		//false will apply default behaviour as defined and done by OC_User
-		$this->access->connection->writeToCache($cacheKey, false);
-		$this->ocConfig->setUserValue($uid, 'user_ldap', 'homePath', '');
-		return false;
+		$user = $this->access->userManager->get($uid);
+		$path = $user->getHomePath();
+		$this->access->cacheUserHome($uid, $path);
+
+		return $path;
 	}
 
 	/**
-- 
GitLab


From 845485cfe637c3a7fdb72a110cb68c769b2f8d4b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 26 Aug 2015 15:17:46 +0200
Subject: [PATCH 482/783] adjust to nested group fix

---
 apps/user_ldap/group_ldap.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index a5fc59d3b07..d2e69b4e12a 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -31,6 +31,7 @@ namespace OCA\user_ldap;
 
 use OCA\user_ldap\lib\Access;
 use OCA\user_ldap\lib\BackendUtility;
+use OCA\user_ldap\lib\user\User;
 
 class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	protected $enabled = false;
@@ -195,7 +196,11 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 			return array();
 		}
 		$seen[$DN] = 1;
-		$groups = $this->access->readAttribute($DN, 'memberOf');
+		$user = $this->access->userManager->get($DN);
+		if(!$user instanceof User) {
+			return array();
+		}
+		$groups = $user->getMemberOfGroups();
 		if (!is_array($groups)) {
 			return array();
 		}
-- 
GitLab


From 24043333008b12dfbe7374cb318d9041717b87e0 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 23 Sep 2015 15:35:17 +0100
Subject: [PATCH 483/783] Perform visibility checks on storages

StoragesService::getStorages() will check the visibility of the backend
and auth mechanism for the storage, and if either are not visible to the
user (aka disabled by admin) then the storage will be filtered out. The
original method StoragesService::getAllStorages() still exists in case
such storages need to be detected, but its use is discouraged.
---
 .../controller/globalstoragescontroller.php   |  9 ----
 .../controller/storagescontroller.php         | 13 ++----
 .../controller/userstoragescontroller.php     |  9 ----
 apps/files_external/lib/config.php            | 14 +++---
 .../lib/config/configadapter.php              |  2 +-
 apps/files_external/personal.php              |  2 +-
 .../service/globalstoragesservice.php         |  9 ++++
 .../service/storagesservice.php               | 45 ++++++++++++++++++-
 .../service/userglobalstoragesservice.php     |  2 +-
 .../service/userstoragesservice.php           |  9 ++++
 apps/files_external/settings.php              |  2 +-
 .../globalstoragescontrollertest.php          |  4 ++
 .../controller/userstoragescontrollertest.php |  3 ++
 .../service/userglobalstoragesservicetest.php |  4 ++
 14 files changed, 87 insertions(+), 40 deletions(-)

diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php
index 3686a6189b4..3c1f2022505 100644
--- a/apps/files_external/controller/globalstoragescontroller.php
+++ b/apps/files_external/controller/globalstoragescontroller.php
@@ -179,14 +179,5 @@ class GlobalStoragesController extends StoragesController {
 
 	}
 
-	/**
-	 * Get the visibility type for this controller, used in validation
-	 *
-	 * @return string BackendService::VISIBILITY_* constants
-	 */
-	protected function getVisibilityType() {
-		return BackendService::VISIBILITY_ADMIN;
-	}
-
 
 }
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php
index 71055fd1b9c..6a01112f8c5 100644
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/controller/storagescontroller.php
@@ -153,7 +153,7 @@ abstract class StoragesController extends Controller {
 		$backend = $storage->getBackend();
 		/** @var AuthMechanism */
 		$authMechanism = $storage->getAuthMechanism();
-		if (!$backend || $backend->checkDependencies()) {
+		if ($backend->checkDependencies()) {
 			// invalid backend
 			return new DataResponse(
 				array(
@@ -165,7 +165,7 @@ abstract class StoragesController extends Controller {
 			);
 		}
 
-		if (!$backend->isVisibleFor($this->getVisibilityType())) {
+		if (!$backend->isVisibleFor($this->service->getVisibilityType())) {
 			// not permitted to use backend
 			return new DataResponse(
 				array(
@@ -176,7 +176,7 @@ abstract class StoragesController extends Controller {
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
 		}
-		if (!$authMechanism->isVisibleFor($this->getVisibilityType())) {
+		if (!$authMechanism->isVisibleFor($this->service->getVisibilityType())) {
 			// not permitted to use auth mechanism
 			return new DataResponse(
 				array(
@@ -210,13 +210,6 @@ abstract class StoragesController extends Controller {
 		return null;
 	}
 
-	/**
-	 * Get the visibility type for this controller, used in validation
-	 *
-	 * @return string BackendService::VISIBILITY_* constants
-	 */
-	abstract protected function getVisibilityType();
-
 	/**
 	 * Check whether the given storage is available / valid.
 	 *
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php
index fcbe692d79e..f39f8a85d2d 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/controller/userstoragescontroller.php
@@ -187,13 +187,4 @@ class UserStoragesController extends StoragesController {
 		return parent::destroy($id);
 	}
 
-	/**
-	 * Get the visibility type for this controller, used in validation
-	 *
-	 * @return string BackendService::VISIBILITY_* constants
-	 */
-	protected function getVisibilityType() {
-		return BackendService::VISIBILITY_PERSONAL;
-	}
-
 }
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 2dc7de30a6c..afea7ead4e6 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -112,7 +112,7 @@ class OC_Mount_Config {
 	 * @param string $uid user
 	 * @return array of mount point string as key, mountpoint config as value
 	 *
-	 * @deprecated 8.2.0 use UserGlobalStoragesService::getAllStorages() and UserStoragesService::getAllStorages()
+	 * @deprecated 8.2.0 use UserGlobalStoragesService::getStorages() and UserStoragesService::getStorages()
 	 */
 	public static function getAbsoluteMountPoints($uid) {
 		$mountPoints = array();
@@ -124,7 +124,7 @@ class OC_Mount_Config {
 		$userGlobalStoragesService->setUser($user);
 		$userStoragesService->setUser($user);
 
-		foreach ($userGlobalStoragesService->getAllStorages() as $storage) {
+		foreach ($userGlobalStoragesService->getStorages() as $storage) {
 			$mountPoint = '/'.$uid.'/files'.$storage->getMountPoint();
 			$mountEntry = self::prepareMountPointEntry($storage, false);
 			foreach ($mountEntry['options'] as &$option) {
@@ -133,7 +133,7 @@ class OC_Mount_Config {
 			$mountPoints[$mountPoint] = $mountEntry;
 		}
 
-		foreach ($userStoragesService->getAllStorages() as $storage) {
+		foreach ($userStoragesService->getStorages() as $storage) {
 			$mountPoint = '/'.$uid.'/files'.$storage->getMountPoint();
 			$mountEntry = self::prepareMountPointEntry($storage, true);
 			foreach ($mountEntry['options'] as &$option) {
@@ -153,13 +153,13 @@ class OC_Mount_Config {
 	 *
 	 * @return array
 	 *
-	 * @deprecated 8.2.0 use GlobalStoragesService::getAllStorages()
+	 * @deprecated 8.2.0 use GlobalStoragesService::getStorages()
 	 */
 	public static function getSystemMountPoints() {
 		$mountPoints = [];
 		$service = self::$app->getContainer()->query('OCA\Files_External\Service\GlobalStoragesService');
 
-		foreach ($service->getAllStorages() as $storage) {
+		foreach ($service->getStorages() as $storage) {
 			$mountPoints[] = self::prepareMountPointEntry($storage, false);
 		}
 
@@ -171,13 +171,13 @@ class OC_Mount_Config {
 	 *
 	 * @return array
 	 *
-	 * @deprecated 8.2.0 use UserStoragesService::getAllStorages()
+	 * @deprecated 8.2.0 use UserStoragesService::getStorages()
 	 */
 	public static function getPersonalMountPoints() {
 		$mountPoints = [];
 		$service = self::$app->getContainer()->query('OCA\Files_External\Service\UserStoragesService');
 
-		foreach ($service->getAllStorages() as $storage) {
+		foreach ($service->getStorages() as $storage) {
 			$mountPoints[] = self::prepareMountPointEntry($storage, true);
 		}
 
diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index cb8c2f24caa..fb36e011655 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -133,7 +133,7 @@ class ConfigAdapter implements IMountProvider {
 			$mounts[$storage->getMountPoint()] = $mount;
 		}
 
-		foreach ($this->userStoragesService->getAllStorages() as $storage) {
+		foreach ($this->userStoragesService->getStorages() as $storage) {
 			try {
 				$this->prepareStorageConfig($storage, $user);
 				$impl = $this->constructStorage($storage);
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index efd23512ffe..f048d65540b 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -54,7 +54,7 @@ foreach ($authMechanisms as $authMechanism) {
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled());
 $tmpl->assign('isAdminPage', false);
-$tmpl->assign('storages', $userStoragesService->getAllStorages());
+$tmpl->assign('storages', $userStoragesService->getStorages());
 $tmpl->assign('dependencies', OC_Mount_Config::dependencyMessage($backendService->getBackends()));
 $tmpl->assign('backends', $backends);
 $tmpl->assign('authMechanisms', $authMechanisms);
diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/service/globalstoragesservice.php
index 0e2d3f2b9c1..49ffea43d1b 100644
--- a/apps/files_external/service/globalstoragesservice.php
+++ b/apps/files_external/service/globalstoragesservice.php
@@ -210,4 +210,13 @@ class GlobalStoragesService extends StoragesService {
 			);
 		}
 	}
+
+	/**
+	 * Get the visibility type for this controller, used in validation
+	 *
+	 * @return string BackendService::VISIBILITY_* constants
+	 */
+	public function getVisibilityType() {
+		return BackendService::VISIBILITY_ADMIN;
+	}
 }
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 703f277d84e..83a82de0bed 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -29,6 +29,8 @@ use \OC\Files\Filesystem;
 use \OCA\Files_external\Lib\StorageConfig;
 use \OCA\Files_external\NotFoundException;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
 
 /**
  * Service class to manage external storages
@@ -331,7 +333,7 @@ abstract class StoragesService {
 	}
 
 	/**
-	 * Gets all storages
+	 * Gets all storages, valid or not
 	 *
 	 * @return array array of storage configs
 	 */
@@ -339,6 +341,47 @@ abstract class StoragesService {
 		return $this->readConfig();
 	}
 
+	/**
+	 * Gets all valid storages
+	 *
+	 * @return array
+	 */
+	public function getStorages() {
+		return array_filter($this->getAllStorages(), [$this, 'validateStorage']);
+	}
+
+	/**
+	 * Validate storage
+	 * FIXME: De-duplicate with StoragesController::validate()
+	 *
+	 * @param StorageConfig $storage
+	 * @return bool
+	 */
+	protected function validateStorage(StorageConfig $storage) {
+		/** @var Backend */
+		$backend = $storage->getBackend();
+		/** @var AuthMechanism */
+		$authMechanism = $storage->getAuthMechanism();
+
+		if (!$backend->isVisibleFor($this->getVisibilityType())) {
+			// not permitted to use backend
+			return false;
+		}
+		if (!$authMechanism->isVisibleFor($this->getVisibilityType())) {
+			// not permitted to use auth mechanism
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get the visibility type for this controller, used in validation
+	 *
+	 * @return string BackendService::VISIBILITY_* constants
+	 */
+	abstract public function getVisibilityType();
+
 	/**
 	 * Add new storage to the configuration
 	 *
diff --git a/apps/files_external/service/userglobalstoragesservice.php b/apps/files_external/service/userglobalstoragesservice.php
index b60473f131e..7c60bc6d497 100644
--- a/apps/files_external/service/userglobalstoragesservice.php
+++ b/apps/files_external/service/userglobalstoragesservice.php
@@ -117,7 +117,7 @@ class UserGlobalStoragesService extends GlobalStoragesService {
 	 * @return StorageConfig[]
 	 */
 	public function getUniqueStorages() {
-		$storages = $this->getAllStorages();
+		$storages = $this->getStorages();
 
 		$storagesByMountpoint = [];
 		foreach ($storages as $storage) {
diff --git a/apps/files_external/service/userstoragesservice.php b/apps/files_external/service/userstoragesservice.php
index c69b8d4f51e..6e3c327c09c 100644
--- a/apps/files_external/service/userstoragesservice.php
+++ b/apps/files_external/service/userstoragesservice.php
@@ -171,4 +171,13 @@ class UserStoragesService extends StoragesService {
 			$this->triggerHooks($newStorage, Filesystem::signal_create_mount);
 		}
 	}
+
+	/**
+	 * Get the visibility type for this controller, used in validation
+	 *
+	 * @return string BackendService::VISIBILITY_* constants
+	 */
+	public function getVisibilityType() {
+		return BackendService::VISIBILITY_PERSONAL;
+	}
 }
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 5c920a1495b..f82ab035c1c 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -65,7 +65,7 @@ $userBackends = array_filter($backendService->getAvailableBackends(), function($
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled());
 $tmpl->assign('isAdminPage', true);
-$tmpl->assign('storages', $globalStoragesService->getAllStorages());
+$tmpl->assign('storages', $globalStoragesService->getStorages());
 $tmpl->assign('backends', $backends);
 $tmpl->assign('authMechanisms', $authMechanisms);
 $tmpl->assign('userBackends', $userBackends);
diff --git a/apps/files_external/tests/controller/globalstoragescontrollertest.php b/apps/files_external/tests/controller/globalstoragescontrollertest.php
index e1bfad8caf6..6b020198bd8 100644
--- a/apps/files_external/tests/controller/globalstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/globalstoragescontrollertest.php
@@ -24,6 +24,7 @@ use \OCA\Files_external\Controller\GlobalStoragesController;
 use \OCA\Files_external\Service\GlobalStoragesService;
 use \OCP\AppFramework\Http;
 use \OCA\Files_external\NotFoundException;
+use \OCA\Files_External\Service\BackendService;
 
 class GlobalStoragesControllerTest extends StoragesControllerTest {
 	public function setUp() {
@@ -32,6 +33,9 @@ class GlobalStoragesControllerTest extends StoragesControllerTest {
 			->disableOriginalConstructor()
 			->getMock();
 
+		$this->service->method('getVisibilityType')
+			->willReturn(BackendService::VISIBILITY_ADMIN);
+
 		$this->controller = new GlobalStoragesController(
 			'files_external',
 			$this->getMock('\OCP\IRequest'),
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index 9f1a8df8d2e..33ef274c87c 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -40,6 +40,9 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 			->disableOriginalConstructor()
 			->getMock();
 
+		$this->service->method('getVisibilityType')
+			->willReturn(BackendService::VISIBILITY_PERSONAL);
+
 		$this->controller = new UserStoragesController(
 			'files_external',
 			$this->getMock('\OCP\IRequest'),
diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php
index 867872f3683..8b4b9b0163e 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php
@@ -209,7 +209,11 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$expectedPrecedence
 	) {
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
+		$backend->method('isVisibleFor')
+			->willReturn(true);
 		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
+		$authMechanism->method('isVisibleFor')
+			->willReturn(true);
 
 		$storage1 = new StorageConfig();
 		$storage1->setMountPoint('mountpoint');
-- 
GitLab


From 97c4691c052b3f7b344cfc4fff7d4719ba587686 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Wed, 23 Sep 2015 16:00:21 +0100
Subject: [PATCH 484/783] Unit tests for storage validation in service

---
 .../tests/service/storagesservicetest.php     | 46 +++++++++++++++++++
 .../service/userglobalstoragesservicetest.php | 10 ++++
 2 files changed, 56 insertions(+)

diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/service/storagesservicetest.php
index 28220c9bc2e..ddf52e6272e 100644
--- a/apps/files_external/tests/service/storagesservicetest.php
+++ b/apps/files_external/tests/service/storagesservicetest.php
@@ -305,6 +305,52 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 		);
 	}
 
+	public function testGetStoragesBackendNotVisible() {
+		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
+		$backend->expects($this->once())
+			->method('isVisibleFor')
+			->with($this->service->getVisibilityType())
+			->willReturn(false);
+		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
+		$authMechanism->method('isVisibleFor')
+			->with($this->service->getVisibilityType())
+			->willReturn(true);
+
+		$storage = new StorageConfig(255);
+		$storage->setMountPoint('mountpoint');
+		$storage->setBackend($backend);
+		$storage->setAuthMechanism($authMechanism);
+		$storage->setBackendOptions(['password' => 'testPassword']);
+
+		$newStorage = $this->service->addStorage($storage);
+
+		$this->assertCount(1, $this->service->getAllStorages());
+		$this->assertEmpty($this->service->getStorages());
+	}
+
+	public function testGetStoragesAuthMechanismNotVisible() {
+		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
+		$backend->method('isVisibleFor')
+			->with($this->service->getVisibilityType())
+			->willReturn(true);
+		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
+		$authMechanism->expects($this->once())
+			->method('isVisibleFor')
+			->with($this->service->getVisibilityType())
+			->willReturn(false);
+
+		$storage = new StorageConfig(255);
+		$storage->setMountPoint('mountpoint');
+		$storage->setBackend($backend);
+		$storage->setAuthMechanism($authMechanism);
+		$storage->setBackendOptions(['password' => 'testPassword']);
+
+		$newStorage = $this->service->addStorage($storage);
+
+		$this->assertCount(1, $this->service->getAllStorages());
+		$this->assertEmpty($this->service->getStorages());
+	}
+
 	public static function createHookCallback($params) {
 		self::$hookCalls[] = array(
 			'signal' => Filesystem::signal_create_mount,
diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php
index 8b4b9b0163e..b6dc952605d 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php
@@ -247,6 +247,16 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		}
 	}
 
+	public function testGetStoragesBackendNotVisible() {
+		// we don't test this here
+		$this->assertTrue(true);
+	}
+
+	public function testGetStoragesAuthMechanismNotVisible() {
+		// we don't test this here
+		$this->assertTrue(true);
+	}
+
 	public function testHooksAddStorage($a = null, $b = null, $c = null) {
 		// we don't test this here
 		$this->assertTrue(true);
-- 
GitLab


From 7a8cc9783159f488c9643d556b621d9e4cc68196 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Wed, 23 Sep 2015 13:32:58 +0200
Subject: [PATCH 485/783] display checkboxes in ie8

---
 core/css/fixes.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/css/fixes.css b/core/css/fixes.css
index 7ef44ba6909..e5dbeb137ab 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -115,3 +115,8 @@ select {
 	line-height: 38px;
 }
 
+.lte8 input[type="checkbox"] + label:before { background-image: url('../img/actions/checkbox.png'); }
+.lte8 input[type="checkbox"].white + label:before { background-image: url('../img/actions/checkbox-white.png'); }
+.lte8 input[type="checkbox"]:checked + label:before { background-image: url('../img/actions/checkbox-checked.png'); }
+.lte8 input[type="checkbox"].white:checked + label:before { background-image: url('../img/actions/checkbox-checked-white.png'); }
+
-- 
GitLab


From 002b6bf059377853dc174c1d49792e62983c4bec Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 23 Sep 2015 16:52:48 +0200
Subject: [PATCH 486/783] do not throw exception when no attribute is specified

---
 apps/user_ldap/lib/user/user.php   |   5 +-
 apps/user_ldap/tests/user/user.php | 103 +++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php
index 3bfe0c27077..6498cdf913f 100644
--- a/apps/user_ldap/lib/user/user.php
+++ b/apps/user_ldap/lib/user/user.php
@@ -225,6 +225,7 @@ class User {
 	 */
 	public function getHomePath($valueFromLDAP = null) {
 		$path = $valueFromLDAP;
+		$attr = null;
 
 		if(   is_null($path)
 		   && strpos($this->access->connection->homeFolderNamingRule, 'attr:') === 0
@@ -256,7 +257,9 @@ class User {
 			return $path;
 		}
 
-		if($this->config->getAppValue('user_ldap', 'enforce_home_folder_naming_rule', true)) {
+		if(    !is_null($attr)
+			&& $this->config->getAppValue('user_ldap', 'enforce_home_folder_naming_rule', true)
+		) {
 			// a naming rule attribute is defined, but it doesn't exist for that LDAP user
 			throw new \Exception('Home dir attribute can\'t be read from LDAP for uid: ' . $this->getUsername());
 		}
diff --git a/apps/user_ldap/tests/user/user.php b/apps/user_ldap/tests/user/user.php
index c074b2ceb75..1c41eb71ec2 100644
--- a/apps/user_ldap/tests/user/user.php
+++ b/apps/user_ldap/tests/user/user.php
@@ -736,4 +736,107 @@ class Test_User_User extends \Test\TestCase {
 
 		$userMock->processAttributes($record);
 	}
+
+	public function emptyHomeFolderAttributeValueProvider() {
+		return array(
+			'empty' => array(''),
+			'prefixOnly' => array('attr:'),
+		);
+	}
+
+	/**
+	 * @dataProvider emptyHomeFolderAttributeValueProvider
+	 */
+	public function testGetHomePathNotConfigured($attributeValue) {
+		list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) =
+			$this->getTestInstances();
+
+		list($access, $connection) =
+			$this->getAdvancedMocks($config, $filesys, $log, $avaMgr, $dbc);
+
+		$connection->expects($this->any())
+			->method('__get')
+			->with($this->equalTo('homeFolderNamingRule'))
+			->will($this->returnValue($attributeValue));
+
+		$access->expects($this->never())
+			->method('readAttribute');
+
+		$config->expects($this->never())
+			->method('getAppValue');
+
+		$uid = 'alice';
+		$dn  = 'uid=alice,dc=foo,dc=bar';
+
+		$user = new User(
+			$uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr);
+
+		$path = $user->getHomePath();
+		$this->assertSame($path, false);
+	}
+
+	public function testGetHomePathConfiguredNotAvailableAllowed() {
+		list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) =
+			$this->getTestInstances();
+
+		list($access, $connection) =
+			$this->getAdvancedMocks($config, $filesys, $log, $avaMgr, $dbc);
+
+		$connection->expects($this->any())
+			->method('__get')
+			->with($this->equalTo('homeFolderNamingRule'))
+			->will($this->returnValue('attr:foobar'));
+
+		$access->expects($this->once())
+			->method('readAttribute')
+			->will($this->returnValue(false));
+
+		// asks for "enforce_home_folder_naming_rule"
+		$config->expects($this->once())
+			->method('getAppValue')
+			->will($this->returnValue(false));
+
+		$uid = 'alice';
+		$dn  = 'uid=alice,dc=foo,dc=bar';
+
+		$user = new User(
+			$uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr);
+
+		$path = $user->getHomePath();
+
+		$this->assertSame($path, false);
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testGetHomePathConfiguredNotAvailableNotAllowed() {
+		list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) =
+			$this->getTestInstances();
+
+		list($access, $connection) =
+			$this->getAdvancedMocks($config, $filesys, $log, $avaMgr, $dbc);
+
+		$connection->expects($this->any())
+			->method('__get')
+			->with($this->equalTo('homeFolderNamingRule'))
+			->will($this->returnValue('attr:foobar'));
+
+		$access->expects($this->once())
+			->method('readAttribute')
+			->will($this->returnValue(false));
+
+		// asks for "enforce_home_folder_naming_rule"
+		$config->expects($this->once())
+			->method('getAppValue')
+			->will($this->returnValue(true));
+
+		$uid = 'alice';
+		$dn  = 'uid=alice,dc=foo,dc=bar';
+
+		$user = new User(
+			$uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr);
+
+		$user->getHomePath();
+	}
 }
-- 
GitLab


From 9162cc153e35ae2d4f2adfa97bf701a40ca1f5e9 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 18 Sep 2015 12:19:07 +0200
Subject: [PATCH 487/783] fix wording of other search results to 'in other
 folders'

---
 core/search/js/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/search/js/search.js b/core/search/js/search.js
index bc67eb0e154..4e83a070170 100644
--- a/core/search/js/search.js
+++ b/core/search/js/search.js
@@ -217,10 +217,10 @@
 					$status.addClass('emptycontent').removeClass('status');
 					$status.html('');
 					$status.append('<div class="icon-search"></div>');
-					$status.append('<h2>' + t('core', 'No search results in other places') + '</h2>');
+					$status.append('<h2>' + t('core', 'No search results in other folders') + '</h2>');
 				} else {
 					$status.removeClass('emptycontent').addClass('status');
-					$status.text(n('core', '{count} search result in other places', '{count} search results in other places', count, {count:count}));
+					$status.text(n('core', '{count} search result in another folder', '{count} search results in other folders', count, {count:count}));
 				}
 			}
 			function renderCurrent() {
-- 
GitLab


From dada7d0c341cc40ab48a8e26fa28224bcd00be3b Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 23 Sep 2015 11:42:29 +0200
Subject: [PATCH 488/783] add slight shadow to close icon to make it visible on
 top of dark images, fix #19291

---
 core/img/actions/close.png | Bin 206 -> 493 bytes
 core/img/actions/close.svg |   9 ++++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/img/actions/close.png b/core/img/actions/close.png
index ece33258e5676951d9aa54ae634aa6948b0c0e4d..66e3c26cc65a1b9e48fbcce71fcdea12e5df7093 100644
GIT binary patch
delta 478
zcmV<40U`d*0qp~j8Gi%-006c6H|hWY00MJDNmK|3RqRFt00009a7bBm000fw000fw
z0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10c=S`K~yMH
zMUg*ln{XUQztL|nQiQOCr@+wGf3UL@n~@9+K1H~Iac)rXNq<VNVCn;e#Y>J58pX0L
z)mxZ@kkHG3ql_Qv4IjNHT%gb}Ffr($&Z|ck4aJ3^xWs0P&rhz<(Xnv3VTR2mO3<+R
zMZ|9w1UQTdh)B5S78_0IGGqC)_TFAH67C3D?J}?2Zdfv-EA;S5rll}^KR)t@bf5pI
z1g|9KhMr*H5`XQoVI>Ue<MZj+sfBOVzrRGd7=nhyoYgKL)WW2hG{T_X<*b-vp$Q6|
zF(K*yV$ul0usIZ@gpAQqE#MH6o{H-;a4bl<!)bvI76Hj2AJxLB88yPFKI9|>SajNx
zi~V}|F7)d|aVnfz_+GtaEZUPMKCxE{{c4|+^03eQl~>@s5#wW?MQu0J@-<^cNJ#R!
zo|fAU_pK-mn_HH|M9gt;2v`t*scvJ<@Nu!w(YeCK|BBV-?qXt~p-^-%Fh6sD0F*8_
Uoen|J)&Kwi07*qoM6N<$f*;1*%K!iX

literal 206
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!R)9~4>;M1%flOk+vtZ9IpgP`?
zAirP+Q895Dx%C^iUAlbb>fdXndw>#do-U3d6^zLW{2MkHHff~sg{@$a)>jW`>1>}a
zt99T6r%2)xHg08?9SSuq94-Bt4Hph|rm-l`aM&cKbEfT;ft#7wCmS{fsXt77>0XW3
PKu+>>^>bP0l+XkKQra_?

diff --git a/core/img/actions/close.svg b/core/img/actions/close.svg
index 4471dbc6301..e060da3f8bb 100644
--- a/core/img/actions/close.svg
+++ b/core/img/actions/close.svg
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path d="M12.95,11.536,11.536,12.95,8,9.4142,4.4645,12.95,3.0503,11.536,6.5858,8,3.0503,4.4644,4.4645,3.0502,8,6.5858,11.516,3.0311,12.95,4.4644,9.4143,8z" fill="#000"/>
+ <defs>
+  <filter id="a" style="color-interpolation-filters:sRGB" height="1.5994" width="1.6006" y="-.29971" x="-.30029">
+   <feGaussianBlur stdDeviation="1.2386625"/>
+  </filter>
+ </defs>
+ <path d="m12.95 11.536-1.414 1.414-3.536-3.5358-3.5355 3.5358-1.4142-1.414 3.5355-3.536-3.5355-3.5356 1.4142-1.4142 3.5355 3.5356 3.516-3.5547 1.434 1.4333-3.5357 3.5356z" filter="url(#a)" stroke="#fff" stroke-width="2" fill="#fff"/>
+ <path d="m12.95 11.536-1.414 1.414-3.536-3.5358-3.5355 3.5358-1.4142-1.414 3.5355-3.536-3.5355-3.5356 1.4142-1.4142 3.5355 3.5356 3.516-3.5547 1.434 1.4333-3.5357 3.5356z"/>
 </svg>
-- 
GitLab


From 8b90a55831b2da00ee7d71878eb69d975f7a2424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 23 Sep 2015 13:59:37 +0200
Subject: [PATCH 489/783] use correct variable

wow ... just wow ...
---
 lib/private/files/storage/wrapper/permissionsmask.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/files/storage/wrapper/permissionsmask.php b/lib/private/files/storage/wrapper/permissionsmask.php
index 50c3f2a6268..8d40d023630 100644
--- a/lib/private/files/storage/wrapper/permissionsmask.php
+++ b/lib/private/files/storage/wrapper/permissionsmask.php
@@ -66,7 +66,7 @@ class PermissionsMask extends Wrapper {
 	}
 
 	public function isSharable($path) {
-		return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($parm);
+		return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($path);
 	}
 
 	public function getPermissions($path) {
-- 
GitLab


From 17ef187681fa781afb0cd6f318edc58d70156c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 23 Sep 2015 14:26:55 +0200
Subject: [PATCH 490/783] add is* storage tests

---
 tests/lib/files/storage/storage.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index fcd7f73dcde..d381b4cdf40 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -573,4 +573,29 @@ abstract class Storage extends \Test\TestCase {
 		$this->assertSameAsLorem($target);
 		$this->assertTrue($this->instance->file_exists($source), $source . ' was deleted');
 	}
+
+	public function testIsCreatable() {
+		$this->instance->mkdir('source');
+		$this->assertTrue($this->instance->isCreatable('source'));
+	}
+
+	public function testIsReadable() {
+		$this->instance->mkdir('source');
+		$this->assertTrue($this->instance->isReadable('source'));
+	}
+
+	public function testIsUpdatable() {
+		$this->instance->mkdir('source');
+		$this->assertTrue($this->instance->isUpdatable('source'));
+	}
+
+	public function testIsDeletable() {
+		$this->instance->mkdir('source');
+		$this->assertTrue($this->instance->isDeletable('source'));
+	}
+
+	public function testIsShareable() {
+		$this->instance->mkdir('source');
+		$this->assertTrue($this->instance->isSharable('source'));
+	}
 }
-- 
GitLab


From 82c33aa422ce650bd8d2385494ee2e2e9273cec7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 24 Sep 2015 09:28:11 +0200
Subject: [PATCH 491/783] Update the list of shipped apps

---
 core/shipped.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/shipped.json b/core/shipped.json
index 7993b61569c..504951e2df9 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -3,11 +3,11 @@
   "shippedApps": [
     "activity",
     "admin_audit",
+    "encryption",
     "enterprise_key",
     "external",
     "files",
     "files_antivirus",
-    "encryption",
     "files_external",
     "files_ldap_home",
     "files_locking",
@@ -21,6 +21,7 @@
     "firewall",
     "firstrunwizard",
     "gallery",
+    "notifications",
     "objectstore",
     "provisioning_api",
     "sharepoint",
-- 
GitLab


From 70572c1e3cf9e297a49091d31461d50f7611300c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 24 Sep 2015 08:59:19 +0200
Subject: [PATCH 492/783] Allow `set('column', 'null')` to work like in
 Doctrine

---
 lib/private/db/querybuilder/quotehelper.php   | 2 +-
 tests/lib/db/querybuilder/quotehelpertest.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/private/db/querybuilder/quotehelper.php b/lib/private/db/querybuilder/quotehelper.php
index 0735f313abc..4b62fee6a6c 100644
--- a/lib/private/db/querybuilder/quotehelper.php
+++ b/lib/private/db/querybuilder/quotehelper.php
@@ -52,7 +52,7 @@ class QuoteHelper {
 			return (string) $string;
 		}
 
-		if ($string === null || $string === '*') {
+		if ($string === null || $string === 'null' || $string === '*') {
 			return $string;
 		}
 
diff --git a/tests/lib/db/querybuilder/quotehelpertest.php b/tests/lib/db/querybuilder/quotehelpertest.php
index 904b4c500db..b83d9eed2df 100644
--- a/tests/lib/db/querybuilder/quotehelpertest.php
+++ b/tests/lib/db/querybuilder/quotehelpertest.php
@@ -43,6 +43,10 @@ class QuoteHelperTest extends \Test\TestCase {
 			[new Literal('literal'), 'literal'],
 			[new Literal(1), '1'],
 			[new Parameter(':param'), ':param'],
+
+			// (string) 'null' is Doctrines way to set columns to null
+			// See https://github.com/owncloud/core/issues/19314
+			['null', 'null'],
 		];
 	}
 
-- 
GitLab


From 2d557b065f744dce0f7f1aa27af54d314a108f7b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 24 Sep 2015 09:59:14 +0200
Subject: [PATCH 493/783] Remove user_webdavauth which is now part of
 user_external

---
 core/shipped.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/shipped.json b/core/shipped.json
index 504951e2df9..ffa4ee9c738 100644
--- a/core/shipped.json
+++ b/core/shipped.json
@@ -30,7 +30,6 @@
     "user_external",
     "user_ldap",
     "user_shibboleth",
-    "user_webdavauth",
     "windows_network_drive"
   ]
 }
-- 
GitLab


From 5a11e145da68cb5df781060c76c5bdca27228e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 24 Sep 2015 11:03:01 +0200
Subject: [PATCH 494/783] Clean code

---
 lib/private/template.php | 122 +++++++++++++++++++++------------------
 1 file changed, 66 insertions(+), 56 deletions(-)

diff --git a/lib/private/template.php b/lib/private/template.php
index ef2f71b7f86..60ff49a5b3e 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -37,31 +37,39 @@ require_once __DIR__.'/template/functions.php';
  * This class provides the templates for ownCloud.
  */
 class OC_Template extends \OC\Template\Base {
-	private $renderas; // Create a full page?
+
+	/** @var string */
+	private $renderAs; // Create a full page?
+
+	/** @var string */
 	private $path; // The path to the template
+
+	/** @var array */
 	private $headers = array(); //custom headers
+
+	/** @var string */
 	protected $app; // app id
 
 	/**
 	 * Constructor
 	 * @param string $app app providing the template
 	 * @param string $name of the template file (without suffix)
-	 * @param string $renderas = ""; produce a full page
+	 * @param string $renderAs = ""; produce a full page
 	 * @param bool $registerCall = true
 	 * @return OC_Template object
 	 *
 	 * This function creates an OC_Template object.
 	 *
-	 * If $renderas is set, OC_Template will try to produce a full page in the
-	 * according layout. For now, renderas can be set to "guest", "user" or
+	 * If $renderAs is set, OC_Template will try to produce a full page in the
+	 * according layout. For now, $renderAs can be set to "guest", "user" or
 	 * "admin".
 	 */
 	
-	protected static $initTemplateEngineFirstrun = true;
+	protected static $initTemplateEngineFirstRun = true;
 	
-	public function __construct( $app, $name, $renderas = "", $registerCall = true ) {
+	public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
 		// Read the selected theme from the config file
-		$this->initTemplateEngine();
+		self::initTemplateEngine();
 		
 		$theme = OC_Util::getTheme();
 
@@ -74,7 +82,7 @@ class OC_Template extends \OC\Template\Base {
 		list($path, $template) = $this->findTemplate($theme, $app, $name);
 
 		// Set the private data
-		$this->renderas = $renderas;
+		$this->renderAs = $renderAs;
 		$this->path = $path;
 		$this->app = $app;
 
@@ -82,7 +90,7 @@ class OC_Template extends \OC\Template\Base {
 	}
 
 	public static function initTemplateEngine() {
-		if (self::$initTemplateEngineFirstrun){
+		if (self::$initTemplateEngineFirstRun){
 			
 			//apps that started before the template initialization can load their own scripts
 			//so to make sure this scripts here are loaded first we use OC_Util::addScript() with $prepend=true
@@ -93,44 +101,44 @@ class OC_Template extends \OC\Template\Base {
 				}
 			}
 
-			OC_Util::addStyle ( "styles" );
-			OC_Util::addStyle ( "header" );
-			OC_Util::addStyle ( "mobile" );
-			OC_Util::addStyle ( "icons" );
-			OC_Util::addStyle ( "fonts" );
-			OC_Util::addStyle ( "apps" );
-			OC_Util::addStyle ( "fixes" );
-			OC_Util::addStyle ( "multiselect" );
-			OC_Util::addVendorStyle ( 'jquery-ui/themes/base/jquery-ui');
-			OC_Util::addStyle ( 'jquery-ui-fixes' );
-			OC_Util::addStyle ( "tooltip" );
-			
+			OC_Util::addStyle("styles");
+			OC_Util::addStyle("header");
+			OC_Util::addStyle("mobile");
+			OC_Util::addStyle("icons");
+			OC_Util::addStyle("fonts");
+			OC_Util::addStyle("apps");
+			OC_Util::addStyle("fixes");
+			OC_Util::addStyle("multiselect");
+			OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui');
+			OC_Util::addStyle('jquery-ui-fixes');
+			OC_Util::addStyle("tooltip");
+
 			// avatars
-			if (\OC::$server->getSystemConfig ()->getValue ( 'enable_avatars', true ) === true) {
-				\OC_Util::addScript ( 'avatar', null, true );
-				\OC_Util::addScript ( 'jquery.avatar', null, true );
-				\OC_Util::addScript ( 'placeholder', null, true );
-			}			
-			
-			OC_Util::addScript ( 'oc-backbone', null, true );
-			OC_Util::addVendorScript ( 'core', 'backbone/backbone', null, true );
-			OC_Util::addVendorScript ( 'snapjs/dist/latest/snap', null, true );
-			OC_Util::addScript ( 'mimetypelist', null, true );
-			OC_Util::addScript ( 'mimetype', null, true );
-			OC_Util::addScript ( "apps", null, true );
-			OC_Util::addScript ( "oc-requesttoken", null, true );
-			OC_Util::addScript ( 'search', 'search', true );
-			OC_Util::addScript ( "config", null, true );
-			OC_Util::addScript ( "eventsource", null, true );
-			OC_Util::addScript ( "octemplate", null, true );
-			OC_Util::addTranslations ( "core", null, true );
-			OC_Util::addScript ( "l10n", null, true );
-			OC_Util::addScript ( "js", null, true );
-			OC_Util::addScript ( "oc-dialogs", null, true );
-			OC_Util::addScript ( "jquery.ocdialog", null, true );
-			OC_Util::addStyle ( "jquery.ocdialog" );
-			OC_Util::addScript ( "compatibility", null, true );
-			OC_Util::addScript ( "placeholders", null, true );		
+			if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) {
+				\OC_Util::addScript('avatar', null, true);
+				\OC_Util::addScript('jquery.avatar', null, true);
+				\OC_Util::addScript('placeholder', null, true);
+			}
+
+			OC_Util::addScript('oc-backbone', null, true);
+			OC_Util::addVendorScript('core', 'backbone/backbone', true);
+			OC_Util::addVendorScript('snapjs/dist/latest/snap', null, true);
+			OC_Util::addScript('mimetypelist', null, true);
+			OC_Util::addScript('mimetype', null, true);
+			OC_Util::addScript("apps", null, true);
+			OC_Util::addScript("oc-requesttoken", null, true);
+			OC_Util::addScript('search', 'search', true);
+			OC_Util::addScript("config", null, true);
+			OC_Util::addScript("eventsource", null, true);
+			OC_Util::addScript("octemplate", null, true);
+			OC_Util::addTranslations("core", null, true);
+			OC_Util::addScript("l10n", null, true);
+			OC_Util::addScript("js", null, true);
+			OC_Util::addScript("oc-dialogs", null, true);
+			OC_Util::addScript("jquery.ocdialog", null, true);
+			OC_Util::addStyle("jquery.ocdialog");
+			OC_Util::addScript("compatibility", null, true);
+			OC_Util::addScript("placeholders", null, true);
 			
 			// Add the stuff we need always
 			// following logic will import all vendor libraries that are
@@ -147,7 +155,7 @@ class OC_Template extends \OC\Template\Base {
 				throw new \Exception('Cannot read core/js/core.json');
 			}
 			
-			self::$initTemplateEngineFirstrun = false;
+			self::$initTemplateEngineFirstRun = false;
 		}
 	
 	}
@@ -195,14 +203,14 @@ class OC_Template extends \OC\Template\Base {
 	 * Process the template
 	 * @return boolean|string
 	 *
-	 * This function process the template. If $this->renderas is set, it
+	 * This function process the template. If $this->renderAs is set, it
 	 * will produce a full page.
 	 */
 	public function fetchPage() {
 		$data = parent::fetchPage();
 
-		if( $this->renderas ) {
-			$page = new OC_TemplateLayout($this->renderas, $this->app);
+		if( $this->renderAs ) {
+			$page = new OC_TemplateLayout($this->renderAs, $this->app);
 
 			// Add custom headers
 			$headers = '';
@@ -218,18 +226,20 @@ class OC_Template extends \OC\Template\Base {
 				}
 			}
 
-			$page->assign('headers', $headers, false);
+			$page->assign('headers', $headers);
 
-			$page->assign('content', $data, false );
+			$page->assign('content', $data);
 			return $page->fetchPage();
 		}
-		else{
-			return $data;
-		}
+
+		return $data;
 	}
 
 	/**
 	 * Include template
+	 *
+	 * @param string $file
+	 * @param array|null $additionalParams
 	 * @return string returns content of included template
 	 *
 	 * Includes another template. use <?php echo $this->inc('template'); ?> to
@@ -299,7 +309,7 @@ class OC_Template extends \OC\Template\Base {
 
 	/**
 	 * print error page using Exception details
-	 * @param Exception|Error $exception
+	 * @param Exception $exception
 	 */
 	public static function printExceptionErrorPage($exception) {
 		$request = \OC::$server->getRequest();
-- 
GitLab


From 9f9bdd8f90d3c75158d6adadfe6d0d122d7d08ec Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Thu, 24 Sep 2015 15:01:45 +0545
Subject: [PATCH 495/783] Comment typos in tests/lib/files/view.php

Correct a comment typo just introduced at line 892, plus another and some white space at EOL.
---
 tests/lib/files/view.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 56269ec5ad2..ceeb9ba7a94 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -889,7 +889,7 @@ class View extends \Test\TestCase {
 
 			// False negatives: chroot fixes those by adding the leading slash.
 			// But setting them up with this root (instead of chroot($root))
-			// will fail them, althought they should be the same.
+			// will fail them, although they should be the same.
 			// TODO init should be fixed, so it also adds the leading slash
 			array('files/', '/files/', $missingRootExpectedPath),
 			array('files', '/files/', $missingRootExpectedPath),
@@ -1095,7 +1095,7 @@ class View extends \Test\TestCase {
 		$storage1->file_put_contents('foo.txt', '0123456789ABCDEFGH');
 		$storage1->mkdir('dirtomove');
 		$storage1->file_put_contents('dirtomove/indir1.txt', '0123456'); // fits
-		$storage1->file_put_contents('dirtomove/indir2.txt', '0123456789ABCDEFGH'); // doesn't fit 
+		$storage1->file_put_contents('dirtomove/indir2.txt', '0123456789ABCDEFGH'); // doesn't fit
 		$storage2->file_put_contents('existing.txt', '0123');
 		$storage1->getScanner()->scan('');
 		$storage2->getScanner()->scan('');
@@ -1371,7 +1371,7 @@ class View extends \Test\TestCase {
 
 		$thrown = false;
 		try {
-			// this actually acquires two locks, one on the mount point and one no the storage root,
+			// this actually acquires two locks, one on the mount point and one on the storage root,
 			// but the one on the storage root will fail
 			$view->lockFile('/mountpoint.txt', ILockingProvider::LOCK_SHARED);
 		} catch (\OCP\Lock\LockedException $e) {
-- 
GitLab


From 9b652ed5d50a40a1edde0f1b8c859f49ff8248c9 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Sun, 16 Aug 2015 17:49:45 +0200
Subject: [PATCH 496/783] [App Code Check] add check for version and mandatory
 fields

* ref #17598
* including unit tests for mandatory fields/versions
---
 core/command/app/checkcode.php                |  69 ++++++++-
 core/register_command.php                     |   3 +-
 lib/private/app/codechecker/infochecker.php   | 141 ++++++++++++++++++
 .../appinfo/info.xml                          |   9 ++
 .../appinfo/version                           |   1 +
 .../testapp-infoxml-version/appinfo/info.xml  |   9 ++
 .../testapp-infoxml-version/appinfo/version   |   1 +
 tests/apps/testapp-infoxml/appinfo/info.xml   |   9 ++
 .../testapp-name-missing/appinfo/info.xml     |   8 +
 .../testapp-version-missing/appinfo/info.xml  |   8 +
 tests/apps/testapp-version/appinfo/info.xml   |   8 +
 tests/apps/testapp-version/appinfo/version    |   1 +
 tests/lib/app/codechecker/infocheckertest.php |  73 +++++++++
 13 files changed, 338 insertions(+), 2 deletions(-)
 create mode 100644 lib/private/app/codechecker/infochecker.php
 create mode 100644 tests/apps/testapp-infoxml-version-different/appinfo/info.xml
 create mode 100644 tests/apps/testapp-infoxml-version-different/appinfo/version
 create mode 100644 tests/apps/testapp-infoxml-version/appinfo/info.xml
 create mode 100644 tests/apps/testapp-infoxml-version/appinfo/version
 create mode 100644 tests/apps/testapp-infoxml/appinfo/info.xml
 create mode 100644 tests/apps/testapp-name-missing/appinfo/info.xml
 create mode 100644 tests/apps/testapp-version-missing/appinfo/info.xml
 create mode 100644 tests/apps/testapp-version/appinfo/info.xml
 create mode 100644 tests/apps/testapp-version/appinfo/version
 create mode 100644 tests/lib/app/codechecker/infocheckertest.php

diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php
index a4e7322460f..0db9958f387 100644
--- a/core/command/app/checkcode.php
+++ b/core/command/app/checkcode.php
@@ -26,6 +26,8 @@ namespace OC\Core\Command\App;
 
 use OC\App\CodeChecker\CodeChecker;
 use OC\App\CodeChecker\EmptyCheck;
+use OC\App\CodeChecker\InfoChecker;
+use OC\App\InfoParser;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -33,12 +35,21 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class CheckCode extends Command {
+
+	/** @var InfoParser */
+	private $infoParser;
+
 	protected $checkers = [
 		'private' => '\OC\App\CodeChecker\PrivateCheck',
 		'deprecation' => '\OC\App\CodeChecker\DeprecationCheck',
 		'strong-comparison' => '\OC\App\CodeChecker\StrongComparisonCheck',
 	];
 
+	public function __construct(InfoParser $infoParser) {
+		parent::__construct();
+		$this->infoParser = $infoParser;
+	}
+
 	protected function configure() {
 		$this
 			->setName('app:check-code')
@@ -54,6 +65,12 @@ class CheckCode extends Command {
 				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
 				'enable the specified checker(s)',
 				[ 'private', 'deprecation', 'strong-comparison' ]
+			)
+			->addOption(
+				'--skip-validate-info',
+				null,
+				InputOption::VALUE_NONE,
+				'skips the info.xml/version check'
 			);
 	}
 
@@ -84,7 +101,7 @@ class CheckCode extends Command {
 				$output->writeln("<info>Analysing {$filename}</info>");
 			}
 
-			// show error count if there are errros present or the verbosity is high
+			// show error count if there are errors present or the verbosity is high
 			if($count > 0 || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
 				$output->writeln(" {$count} errors");
 			}
@@ -98,6 +115,56 @@ class CheckCode extends Command {
 			}
 		});
 		$errors = $codeChecker->analyse($appId);
+
+		if(!$input->getOption('skip-validate-info')) {
+			$infoChecker = new InfoChecker($this->infoParser);
+
+			$infoChecker->listen('InfoChecker', 'mandatoryFieldMissing', function($key) use ($output) {
+				$output->writeln("<error>Mandatory field missing: $key</error>");
+			});
+
+			$infoChecker->listen('InfoChecker', 'deprecatedFieldFound', function($key, $value) use ($output) {
+				if($value === [] || is_null($value) || $value === '') {
+					$output->writeln("<info>Deprecated field available: $key</info>");
+				} else {
+					if(is_array($value)) {
+						$value = 'Array of ' . count($value) . ' element(s)';
+					}
+					$output->writeln("<info>Deprecated field available: $key => $value</info>");
+				}
+			});
+
+			$infoChecker->listen('InfoChecker', 'differentVersions', function($versionFile, $infoXML) use ($output) {
+				$output->writeln("<error>Different versions provided (appinfo/version: $versionFile - appinfo/info.xml: $infoXML)</error>");
+			});
+
+			$infoChecker->listen('InfoChecker', 'sameVersions', function($path) use ($output) {
+				$output->writeln("<info>Version file isn't needed anymore and can be safely removed ($path)</info>");
+			});
+
+			$infoChecker->listen('InfoChecker', 'migrateVersion', function($version) use ($output) {
+				$output->writeln("<info>Migrate the app version to appinfo/info.xml (add <version>$version</version> to appinfo/info.xml and remove appinfo/version)</info>");
+			});
+
+			if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+				$infoChecker->listen('InfoChecker', 'mandatoryFieldFound', function($key, $value) use ($output) {
+					$output->writeln("<info>Mandatory field available: $key => $value</info>");
+				});
+
+				$infoChecker->listen('InfoChecker', 'optionalFieldFound', function($key, $value) use ($output) {
+					$output->writeln("<info>Optional field available: $key => $value</info>");
+				});
+
+				$infoChecker->listen('InfoChecker', 'unusedFieldFound', function($key, $value) use ($output) {
+					$output->writeln("<info>Unused field available: $key => $value</info>");
+				});
+			}
+
+			$infoErrors = $infoChecker->analyse($appId);
+
+			$errors = array_merge($errors, $infoErrors);
+		}
+
 		if (empty($errors)) {
 			$output->writeln('<info>App is compliant - awesome job!</info>');
 			return 0;
diff --git a/core/register_command.php b/core/register_command.php
index 114e115c491..878542f72c9 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -28,7 +28,8 @@
 /** @var $application Symfony\Component\Console\Application */
 $application->add(new OC\Core\Command\Status);
 $application->add(new OC\Core\Command\Check(\OC::$server->getConfig()));
-$application->add(new OC\Core\Command\App\CheckCode());
+$infoParser = new \OC\App\InfoParser(\OC::$server->getHTTPHelper(), \OC::$server->getURLGenerator());
+$application->add(new OC\Core\Command\App\CheckCode($infoParser));
 $application->add(new OC\Core\Command\L10n\CreateJs());
 
 if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
diff --git a/lib/private/app/codechecker/infochecker.php b/lib/private/app/codechecker/infochecker.php
new file mode 100644
index 00000000000..2af72ebedc3
--- /dev/null
+++ b/lib/private/app/codechecker/infochecker.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\App\CodeChecker;
+
+use OC\App\InfoParser;
+use OC\Hooks\BasicEmitter;
+
+class InfoChecker extends BasicEmitter {
+
+	/** @var InfoParser */
+	private $infoParser;
+
+	private $mandatoryFields = [
+		'author',
+		'description',
+		'id',
+		'licence',
+		'name',
+	];
+	private $optionalFields = [
+		'bugs',
+		'category',
+		'documentation',
+		'namespace',
+		'ocsid',
+		'repository',
+		'require',
+		'requiremin',
+		'types',
+		'version',
+		'website',
+	];
+	private $deprecatedFields = [
+		'default_enable',
+		'public',
+		'remote',
+		'shipped',
+		'standalone',
+	];
+
+	public function __construct(InfoParser $infoParser) {
+		$this->infoParser = $infoParser;
+	}
+
+	/**
+	 * @param string $appId
+	 * @return array
+	 */
+	public function analyse($appId) {
+		$appPath = \OC_App::getAppPath($appId);
+		if ($appPath === false) {
+			throw new \RuntimeException("No app with given id <$appId> known.");
+		}
+
+		$errors = [];
+
+		$info = $this->infoParser->parse($appPath . '/appinfo/info.xml');
+
+		foreach ($info as $key => $value) {
+			if (in_array($key, $this->mandatoryFields)) {
+				$this->emit('InfoChecker', 'mandatoryFieldFound', [$key, $value]);
+				continue;
+			}
+
+			if (in_array($key, $this->optionalFields)) {
+				$this->emit('InfoChecker', 'optionalFieldFound', [$key, $value]);
+				continue;
+			}
+
+			if (in_array($key, $this->deprecatedFields)) {
+				// skip empty arrays - empty arrays for remote and public are always added
+				if($value === []) {
+					continue;
+				}
+				$this->emit('InfoChecker', 'deprecatedFieldFound', [$key, $value]);
+				continue;
+			}
+
+			$this->emit('InfoChecker', 'unusedFieldFound', [$key, $value]);
+		}
+
+		foreach ($this->mandatoryFields as $key) {
+			if(!isset($info[$key])) {
+				$this->emit('InfoChecker', 'mandatoryFieldMissing', [$key]);
+				$errors[] = [
+					'type' => 'mandatoryFieldMissing',
+					'field' => $key,
+				];
+			}
+		}
+
+		$versionFile = $appPath . '/appinfo/version';
+		if (is_file($versionFile)) {
+			$version = trim(file_get_contents($versionFile));
+			if(isset($info['version'])) {
+				if($info['version'] !== $version) {
+					$this->emit('InfoChecker', 'differentVersions',
+						[$version, $info['version']]);
+					$errors[] = [
+						'type' => 'differentVersions',
+						'message' => 'appinfo/version: ' . $version .
+							' - appinfo/info.xml: ' . $info['version'],
+					];
+				} else {
+					$this->emit('InfoChecker', 'sameVersions', [$versionFile]);
+				}
+			} else {
+				$this->emit('InfoChecker', 'migrateVersion', [$version]);
+			}
+		} else {
+			if(!isset($info['version'])) {
+				$this->emit('InfoChecker', 'mandatoryFieldMissing', ['version']);
+				$errors[] = [
+					'type' => 'mandatoryFieldMissing',
+					'field' => 'version',
+				];
+			}
+		}
+
+		return $errors;
+	}
+}
diff --git a/tests/apps/testapp-infoxml-version-different/appinfo/info.xml b/tests/apps/testapp-infoxml-version-different/appinfo/info.xml
new file mode 100644
index 00000000000..c765400a76f
--- /dev/null
+++ b/tests/apps/testapp-infoxml-version-different/appinfo/info.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<info>
+	<id>testapp-infoxml-version</id>
+	<version>1.2.3</version>
+	<author>Jane</author>
+	<description>A b c</description>
+	<licence>Abc</licence>
+	<name>Test app</name>
+</info>
diff --git a/tests/apps/testapp-infoxml-version-different/appinfo/version b/tests/apps/testapp-infoxml-version-different/appinfo/version
new file mode 100644
index 00000000000..e8ea05db814
--- /dev/null
+++ b/tests/apps/testapp-infoxml-version-different/appinfo/version
@@ -0,0 +1 @@
+1.2.4
diff --git a/tests/apps/testapp-infoxml-version/appinfo/info.xml b/tests/apps/testapp-infoxml-version/appinfo/info.xml
new file mode 100644
index 00000000000..c765400a76f
--- /dev/null
+++ b/tests/apps/testapp-infoxml-version/appinfo/info.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<info>
+	<id>testapp-infoxml-version</id>
+	<version>1.2.3</version>
+	<author>Jane</author>
+	<description>A b c</description>
+	<licence>Abc</licence>
+	<name>Test app</name>
+</info>
diff --git a/tests/apps/testapp-infoxml-version/appinfo/version b/tests/apps/testapp-infoxml-version/appinfo/version
new file mode 100644
index 00000000000..0495c4a88ca
--- /dev/null
+++ b/tests/apps/testapp-infoxml-version/appinfo/version
@@ -0,0 +1 @@
+1.2.3
diff --git a/tests/apps/testapp-infoxml/appinfo/info.xml b/tests/apps/testapp-infoxml/appinfo/info.xml
new file mode 100644
index 00000000000..cb63a0fc76e
--- /dev/null
+++ b/tests/apps/testapp-infoxml/appinfo/info.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<info>
+	<id>testapp-infoxml</id>
+	<version>1.2.3</version>
+	<author>Jane</author>
+	<description>A b c</description>
+	<licence>Abc</licence>
+	<name>Test app</name>
+</info>
diff --git a/tests/apps/testapp-name-missing/appinfo/info.xml b/tests/apps/testapp-name-missing/appinfo/info.xml
new file mode 100644
index 00000000000..f0a62b8d380
--- /dev/null
+++ b/tests/apps/testapp-name-missing/appinfo/info.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<info>
+	<id>testapp-version</id>
+	<version>1.1.1</version>
+	<author>Jane</author>
+	<description>A b c</description>
+	<licence>Abc</licence>
+</info>
diff --git a/tests/apps/testapp-version-missing/appinfo/info.xml b/tests/apps/testapp-version-missing/appinfo/info.xml
new file mode 100644
index 00000000000..d7da3e07e36
--- /dev/null
+++ b/tests/apps/testapp-version-missing/appinfo/info.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<info>
+	<id>testapp-version</id>
+	<author>Jane</author>
+	<description>A b c</description>
+	<licence>Abc</licence>
+	<name>Test app</name>
+</info>
diff --git a/tests/apps/testapp-version/appinfo/info.xml b/tests/apps/testapp-version/appinfo/info.xml
new file mode 100644
index 00000000000..d7da3e07e36
--- /dev/null
+++ b/tests/apps/testapp-version/appinfo/info.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<info>
+	<id>testapp-version</id>
+	<author>Jane</author>
+	<description>A b c</description>
+	<licence>Abc</licence>
+	<name>Test app</name>
+</info>
diff --git a/tests/apps/testapp-version/appinfo/version b/tests/apps/testapp-version/appinfo/version
new file mode 100644
index 00000000000..0495c4a88ca
--- /dev/null
+++ b/tests/apps/testapp-version/appinfo/version
@@ -0,0 +1 @@
+1.2.3
diff --git a/tests/lib/app/codechecker/infocheckertest.php b/tests/lib/app/codechecker/infocheckertest.php
new file mode 100644
index 00000000000..59c1316b769
--- /dev/null
+++ b/tests/lib/app/codechecker/infocheckertest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\App\CodeChecker;
+
+use OC\App\InfoParser;
+use Test\TestCase;
+
+class InfoCheckerTest extends TestCase {
+	/** @var  InfoChecker */
+	protected $infoChecker;
+
+	public static function setUpBeforeClass() {
+		\OC::$APPSROOTS[] = [
+			'path' => \OC::$SERVERROOT . '/tests/apps',
+			'url' => '/apps-test',
+			'writable' => false,
+		];
+	}
+
+	public static function tearDownAfterClass() {
+		// remove last element
+		array_pop(\OC::$APPSROOTS);
+	}
+
+	protected function setUp() {
+		parent::setUp();
+		$infoParser = new InfoParser(\OC::$server->getHTTPHelper(), \OC::$server->getURLGenerator());
+
+		$this->infoChecker = new InfoChecker($infoParser);
+	}
+
+	public function appInfoData() {
+		return [
+			['testapp-infoxml', []],
+			['testapp-version', []],
+			['testapp-infoxml-version', []],
+			['testapp-infoxml-version-different', [['type' => 'differentVersions', 'message' => 'appinfo/version: 1.2.4 - appinfo/info.xml: 1.2.3']]],
+			['testapp-version-missing', [['type' => 'mandatoryFieldMissing', 'field' => 'version']]],
+			['testapp-name-missing', [['type' => 'mandatoryFieldMissing', 'field' => 'name']]],
+		];
+	}
+
+	/**
+	 * @dataProvider appInfoData
+	 *
+	 * @param $appId
+	 * @param $expectedErrors
+	 */
+	public function testApps($appId, $expectedErrors) {
+		$errors = $this->infoChecker->analyse($appId);
+
+		$this->assertEquals($expectedErrors, $errors);
+	}
+}
-- 
GitLab


From 9da4869cd44b0275be561409df48ac4459ceaa09 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 24 Sep 2015 12:06:29 +0200
Subject: [PATCH 497/783] Correctly check whether an app is shipped

---
 lib/private/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index 26d51947642..5122a4964d4 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -837,7 +837,7 @@ class OC_App {
 
 				$info['active'] = $active;
 
-				if (isset($info['shipped']) and ($info['shipped'] == 'true')) {
+				if (self::isShipped($app)) {
 					$info['internal'] = true;
 					$info['level'] = self::officialApp;
 					$info['removable'] = false;
-- 
GitLab


From 76e30d0df7c1b4b1f68ddd8596c4ab6d66bef366 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 24 Sep 2015 12:21:19 +0200
Subject: [PATCH 498/783] Expiration date was always a string

---
 core/js/shareitemmodel.js                 | 2 +-
 core/js/tests/specs/shareitemmodelSpec.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index d883497433f..db80a9aa76f 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -69,7 +69,7 @@
 	 */
 	var SHARE_RESPONSE_INT_PROPS = [
 		'id', 'file_parent', 'mail_send', 'file_source', 'item_source', 'permissions',
-		'storage', 'share_type', 'parent', 'stime', 'expiration'
+		'storage', 'share_type', 'parent', 'stime'
 	];
 
 	/**
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index 07a6fbdc23f..a2f3d6fa0ad 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -169,7 +169,7 @@ describe('OC.Share.ShareItemModel', function() {
 				/* jshint camelcase: false */
 				shares: [{
 					displayname_owner: 'root',
-					expiration: 1111,
+					expiration: '2015-10-12 00:00:00',
 					file_source: 123,
 					file_target: '/folder',
 					id: 20,
@@ -187,7 +187,7 @@ describe('OC.Share.ShareItemModel', function() {
 					uid_owner: 'root'
 				}, {
 					displayname_owner: 'root',
-					expiration: 2222,
+					expiration: '2015-10-15 00:00:00',
 					file_source: 456,
 					file_target: '/file_in_folder.txt',
 					id: 21,
@@ -263,7 +263,7 @@ describe('OC.Share.ShareItemModel', function() {
 				reshare: {},
 				shares: [{
 					displayname_owner: 'root',
-					expiration: '1403900000',
+					expiration: '2015-10-12 00:00:00',
 					file_source: '123',
 					file_target: '/folder',
 					id: '20',
@@ -301,7 +301,7 @@ describe('OC.Share.ShareItemModel', function() {
 			expect(share.share_type).toEqual(OC.Share.SHARE_TYPE_USER);
 			expect(share.share_with).toEqual('user1');
 			expect(share.stime).toEqual(1403884258);
-			expect(share.expiration).toEqual(1403900000);
+			expect(share.expiration).toEqual('2015-10-12 00:00:00');
 		});
 	});
 
-- 
GitLab


From d697ea58a42920518d5dbe30d41098cdd3f4b7d7 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 24 Sep 2015 12:21:40 +0200
Subject: [PATCH 499/783] only check if the user exists if a user was added as
 parameter

---
 lib/private/encryption/decryptall.php   |  2 +-
 tests/lib/encryption/decryptalltest.php | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/private/encryption/decryptall.php b/lib/private/encryption/decryptall.php
index 1ff9c74ef84..c1875f16abd 100644
--- a/lib/private/encryption/decryptall.php
+++ b/lib/private/encryption/decryptall.php
@@ -80,7 +80,7 @@ class DecryptAll {
 		$this->input = $input;
 		$this->output = $output;
 
-		if ($user !== '' && $this->userManager->userExists($user) === false) {
+		if (!empty($user) && $this->userManager->userExists($user) === false) {
 			$this->output->writeln('User "' . $user . '" does not exist. Please check the username and try again');
 			return false;
 		}
diff --git a/tests/lib/encryption/decryptalltest.php b/tests/lib/encryption/decryptalltest.php
index c2a0711c0a0..ce5bcf1e5ae 100644
--- a/tests/lib/encryption/decryptalltest.php
+++ b/tests/lib/encryption/decryptalltest.php
@@ -82,11 +82,13 @@ class DecryptAllTest extends TestCase {
 	 * @dataProvider dataTrueFalse
 	 * @param bool $prepareResult
 	 */
-	public function testDecryptAll($prepareResult) {
+	public function testDecryptAll($prepareResult, $user) {
 
-		$user = 'user1';
-
-		$this->userManager->expects($this->once())->method('userExists')->willReturn(true);
+		if (!empty($user)) {
+			$this->userManager->expects($this->once())->method('userExists')->willReturn(true);
+		} else {
+			$this->userManager->expects($this->never())->method('userExists');
+		}
 		/** @var DecryptAll | \PHPUnit_Framework_MockObject_MockObject |  $instance */
 		$instance = $this->getMockBuilder('OC\Encryption\DecryptAll')
 			->setConstructorArgs(
@@ -117,8 +119,10 @@ class DecryptAllTest extends TestCase {
 
 	public function dataTrueFalse() {
 		return [
-			[true],
-			[false]
+			[true, 'user1'],
+			[false, 'user1'],
+			[true, ''],
+			[true, null]
 		];
 	}
 
-- 
GitLab


From 90f1e3dc94bc10ce4d2290dda730d5726fb13f17 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 24 Sep 2015 12:47:46 +0200
Subject: [PATCH 500/783] no need to list users if all users already had a
 key-pair

---
 apps/encryption/lib/crypto/encryptall.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/encryption/lib/crypto/encryptall.php b/apps/encryption/lib/crypto/encryptall.php
index a0c69c13fdd..8e97fe341b4 100644
--- a/apps/encryption/lib/crypto/encryptall.php
+++ b/apps/encryption/lib/crypto/encryptall.php
@@ -280,6 +280,12 @@ class EncryptAll {
 				$newPasswords[] = [$uid, $password];
 			}
 		}
+
+		if (empty($newPasswords)) {
+			$this->output->writeln("\nAll users already had a key-pair, no further action needed.\n");
+			return;
+		}
+
 		$table->setRows($newPasswords);
 		$table->render();
 
-- 
GitLab


From 5a3e57c2f5e558f88fbd83010ff64632bec46123 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 24 Sep 2015 12:48:44 +0200
Subject: [PATCH 501/783] encode arrays as string

---
 core/command/app/checkcode.php              | 3 ---
 lib/private/app/codechecker/infochecker.php | 7 ++++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php
index 0db9958f387..9f6e0729ce9 100644
--- a/core/command/app/checkcode.php
+++ b/core/command/app/checkcode.php
@@ -127,9 +127,6 @@ class CheckCode extends Command {
 				if($value === [] || is_null($value) || $value === '') {
 					$output->writeln("<info>Deprecated field available: $key</info>");
 				} else {
-					if(is_array($value)) {
-						$value = 'Array of ' . count($value) . ' element(s)';
-					}
 					$output->writeln("<info>Deprecated field available: $key => $value</info>");
 				}
 			});
diff --git a/lib/private/app/codechecker/infochecker.php b/lib/private/app/codechecker/infochecker.php
index 2af72ebedc3..1272707a339 100644
--- a/lib/private/app/codechecker/infochecker.php
+++ b/lib/private/app/codechecker/infochecker.php
@@ -39,6 +39,7 @@ class InfoChecker extends BasicEmitter {
 	private $optionalFields = [
 		'bugs',
 		'category',
+		'dependencies',
 		'documentation',
 		'namespace',
 		'ocsid',
@@ -51,6 +52,7 @@ class InfoChecker extends BasicEmitter {
 	];
 	private $deprecatedFields = [
 		'default_enable',
+		'info',
 		'public',
 		'remote',
 		'shipped',
@@ -76,6 +78,9 @@ class InfoChecker extends BasicEmitter {
 		$info = $this->infoParser->parse($appPath . '/appinfo/info.xml');
 
 		foreach ($info as $key => $value) {
+			if(is_array($value)) {
+				$value = json_encode($value);
+			}
 			if (in_array($key, $this->mandatoryFields)) {
 				$this->emit('InfoChecker', 'mandatoryFieldFound', [$key, $value]);
 				continue;
@@ -88,7 +93,7 @@ class InfoChecker extends BasicEmitter {
 
 			if (in_array($key, $this->deprecatedFields)) {
 				// skip empty arrays - empty arrays for remote and public are always added
-				if($value === []) {
+				if($value === '[]' && in_array($key, ['public', 'remote', 'info'])) {
 					continue;
 				}
 				$this->emit('InfoChecker', 'deprecatedFieldFound', [$key, $value]);
-- 
GitLab


From 8e57757045577abe84b9497179c97023d3ecd3c2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 24 Sep 2015 13:33:37 +0200
Subject: [PATCH 502/783] LDAP Wizard: enable/disable test login name button
 depending on whether a login name is provided or not

---
 apps/user_ldap/js/wizard/wizardTabLoginFilter.js    | 13 ++++++++++++-
 .../user_ldap/templates/part.wizard-loginfilter.php |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
index b73d267d168..0316db5b61c 100644
--- a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
@@ -71,7 +71,8 @@ OCA = OCA || {};
 				],
 				'ldap_login_filter_mode'
 			);
-			_.bindAll(this, 'onVerifyClick');
+			_.bindAll(this, 'onVerifyClick', 'onTestLoginnameChange');
+			this.managedItems.ldap_test_loginname.$element.keyup(this.onTestLoginnameChange);
 			this.managedItems.ldap_test_loginname.$relatedElements.click(this.onVerifyClick);
 		},
 
@@ -231,6 +232,16 @@ OCA = OCA || {};
 			} else {
 				this.configModel.requestWizard('ldap_test_loginname', {ldap_test_loginname: testLogin});
 			}
+		},
+
+		/**
+		 * enables/disables the "Verify Settings" button, depending whether
+		 * the corresponding text input has a value or not
+		 */
+		onTestLoginnameChange: function() {
+			var loginName = this.managedItems.ldap_test_loginname.$element.val();
+			var beDisabled = !_.isString(loginName) || !loginName.trim();
+			this.managedItems.ldap_test_loginname.$relatedElements.prop('disabled', beDisabled);
 		}
 
 	});
diff --git a/apps/user_ldap/templates/part.wizard-loginfilter.php b/apps/user_ldap/templates/part.wizard-loginfilter.php
index 8d9fccf24b8..a13931d9327 100644
--- a/apps/user_ldap/templates/part.wizard-loginfilter.php
+++ b/apps/user_ldap/templates/part.wizard-loginfilter.php
@@ -52,7 +52,7 @@
 				   placeholder="<?php p($l->t('Test Loginname'));?>"
 				   class="ldapVerifyInput"
 				   title="Attempts to receive a DN for the given loginname and the current login filter"/>
-			<button class="ldapVerifyLoginName" name="ldapTestLoginSettings" type="button">
+			<button class="ldapVerifyLoginName" name="ldapTestLoginSettings" type="button" disabled="disabled">
 				<?php p($l->t('Verify settings'));?>
 			</button>
 		</p>
-- 
GitLab


From 03bf2f786ad84a2ecbe066a2c80097bf625a91d2 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 24 Sep 2015 16:47:00 +0200
Subject: [PATCH 503/783] public, remote and default_enable are not deprecated

---
 lib/private/app/codechecker/infochecker.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/private/app/codechecker/infochecker.php b/lib/private/app/codechecker/infochecker.php
index 1272707a339..91580bde07d 100644
--- a/lib/private/app/codechecker/infochecker.php
+++ b/lib/private/app/codechecker/infochecker.php
@@ -39,10 +39,13 @@ class InfoChecker extends BasicEmitter {
 	private $optionalFields = [
 		'bugs',
 		'category',
+		'default_enable',
 		'dependencies',
 		'documentation',
 		'namespace',
 		'ocsid',
+		'public',
+		'remote',
 		'repository',
 		'require',
 		'requiremin',
@@ -51,10 +54,7 @@ class InfoChecker extends BasicEmitter {
 		'website',
 	];
 	private $deprecatedFields = [
-		'default_enable',
 		'info',
-		'public',
-		'remote',
 		'shipped',
 		'standalone',
 	];
-- 
GitLab


From f140084a8d69aea78058ac4f539019b9ff17f898 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Mon, 27 Apr 2015 20:06:24 +0200
Subject: [PATCH 504/783] Use a 3rd party normalizer for the logger

---
 lib/private/log.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/private/log.php b/lib/private/log.php
index 3c0e7b45d1b..3c8149bc1d0 100644
--- a/lib/private/log.php
+++ b/lib/private/log.php
@@ -3,6 +3,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <owncloud@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
@@ -26,6 +27,8 @@
 
 namespace OC;
 
+use InterfaSys\LogNormalizer\Normalizer;
+
 use \OCP\ILogger;
 use OCP\Security\StringUtils;
 
@@ -48,12 +51,15 @@ class Log implements ILogger {
 
 	/** @var boolean|null cache the result of the log condition check for the request */
 	private $logConditionSatisfied = null;
+	/** @var Normalizer */
+	private $normalizer;
 
 	/**
 	 * @param string $logger The logger that should be used
 	 * @param SystemConfig $config the system config object
+	 * @param null $normalizer
 	 */
-	public function __construct($logger=null, SystemConfig $config=null) {
+	public function __construct($logger=null, SystemConfig $config=null, $normalizer = null) {
 		// FIXME: Add this for backwards compatibility, should be fixed at some point probably
 		if($config === null) {
 			$config = \OC::$server->getSystemConfig();
@@ -68,6 +74,11 @@ class Log implements ILogger {
 		} else {
 			$this->logger = $logger;
 		}
+		if ($normalizer === null) {
+			$this->normalizer = new Normalizer();
+		} else {
+			$this->normalizer = $normalizer;
+		}
 
 	}
 
@@ -175,6 +186,8 @@ class Log implements ILogger {
 		$minLevel = min($this->config->getValue('loglevel', \OCP\Util::WARN), \OCP\Util::ERROR);
 		$logCondition = $this->config->getValue('log.condition', []);
 
+		array_walk($context, [$this->normalizer, 'format']);
+
 		if (isset($context['app'])) {
 			$app = $context['app'];
 
-- 
GitLab


From 866f84189b6d46469f11b023a83abf1b6f7f6f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 14 Sep 2015 21:28:56 +0200
Subject: [PATCH 505/783] Adding 3rdparty ref

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 338ab170afc..3cd7b7048e3 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 338ab170afcb4770e79cc4427a9803cb29a0a230
+Subproject commit 3cd7b7048e33e0076c1f94cf2ed721934e0c4977
-- 
GitLab


From 43eeb290c194141803d0061c3d906103662d800a Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 24 Sep 2015 18:42:23 +0200
Subject: [PATCH 506/783] Revert "Update apps.css (Scroll more smoothly for
 Webkit browser)"

---
 core/css/apps.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/css/apps.css b/core/css/apps.css
index 6dd7e63bb69..23e0c519d00 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -417,7 +417,6 @@
 	position: relative;
 	height: 100%;
 	overflow-y: auto;
-	-webkit-overflow-scrolling: touch;
 }
 
 #app-content-wrapper {
-- 
GitLab


From db8e7ce8b95c882c876f932296f25ec08883a1d3 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 24 Sep 2015 17:01:31 +0200
Subject: [PATCH 507/783] Remove passwords from logged exception stack traces

* fixed #16318
* create logException in ILogger
* add unit tests
---
 lib/private/log.php    | 21 ++++++++++++++++++++
 lib/public/ilogger.php | 10 ++++++++++
 lib/public/util.php    | 11 ++---------
 tests/lib/logger.php   | 44 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/lib/private/log.php b/lib/private/log.php
index 3c0e7b45d1b..1b26ece7624 100644
--- a/lib/private/log.php
+++ b/lib/private/log.php
@@ -241,4 +241,25 @@ class Log implements ILogger {
 			call_user_func(array($logger, 'write'), $app, $message, $level);
 		}
 	}
+
+	/**
+	 * Logs an exception very detailed
+	 *
+	 * @param \Exception $exception
+	 * @param array $context
+	 * @return void
+	 * @since 8.2.0
+	 */
+	public function logException(\Exception $exception, array $context = array()) {
+		$exception = array(
+			'Exception' => get_class($exception),
+			'Message' => $exception->getMessage(),
+			'Code' => $exception->getCode(),
+			'Trace' => $exception->getTraceAsString(),
+			'File' => $exception->getFile(),
+			'Line' => $exception->getLine(),
+		);
+		$exception['Trace'] = preg_replace('!(login|checkPassword)\(.*\)!', '$1(*** username and password replaced ***)', $exception['Trace']);
+		$this->error('Exception: ' . json_encode($exception), $context);
+	}
 }
diff --git a/lib/public/ilogger.php b/lib/public/ilogger.php
index 43b1ef70e5b..27a5d63dfdb 100644
--- a/lib/public/ilogger.php
+++ b/lib/public/ilogger.php
@@ -122,4 +122,14 @@ interface ILogger {
 	 * @since 7.0.0
 	 */
 	public function log($level, $message, array $context = array());
+
+	/**
+	 * Logs an exception very detailed
+	 *
+	 * @param \Exception $exception
+	 * @param array $context
+	 * @return void
+	 * @since 8.2.0
+	 */
+	public function logException(\Exception $exception, array $context = array());
 }
diff --git a/lib/public/util.php b/lib/public/util.php
index c32668b14a8..652df5192cf 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -158,17 +158,10 @@ class Util {
 	 * @param \Exception $ex exception to log
 	 * @param int $level log level, defaults to \OCP\Util::FATAL
 	 * @since ....0.0 - parameter $level was added in 7.0.0
+	 * @deprecated 8.2.0 use logException of \OCP\ILogger
 	 */
 	public static function logException( $app, \Exception $ex, $level = \OCP\Util::FATAL ) {
-		$exception = array(
-			'Exception' => get_class($ex),
-			'Message' => $ex->getMessage(),
-			'Code' => $ex->getCode(),
-			'Trace' => $ex->getTraceAsString(),
-			'File' => $ex->getFile(),
-			'Line' => $ex->getLine(),
-		);
-		\OCP\Util::writeLog($app, 'Exception: ' . json_encode($exception), $level);
+		\OC::$server->getLogger()->logException($ex, ['app' => $app]);
 	}
 
 	/**
diff --git a/tests/lib/logger.php b/tests/lib/logger.php
index c8566988cf4..9c9cd9e6728 100644
--- a/tests/lib/logger.php
+++ b/tests/lib/logger.php
@@ -63,4 +63,48 @@ class Logger extends TestCase {
 	public static function write($app, $message, $level) {
 		self::$logs[]= "$level $message";
 	}
+
+	public function userAndPasswordData() {
+		return [
+			['abc', 'def'],
+			['mySpecialUsername', 'MySuperSecretPassword'],
+			['my-user', '324324()#ä234'],
+			['my-user', ')qwer'],
+			['my-user', 'qwer)asdf'],
+			['my-user', 'qwer)'],
+			['my-user', '(qwer'],
+			['my-user', 'qwer(asdf'],
+			['my-user', 'qwer('],
+		];
+	}
+
+	/**
+	 * @dataProvider userAndPasswordData
+	 */
+	public function testDetectlogin($user, $password) {
+		$e = new \Exception('test');
+		$this->logger->logException($e);
+
+		$logLines = $this->getLogs();
+		foreach($logLines as $logLine) {
+			$this->assertNotContains($user, $logLine);
+			$this->assertNotContains($password, $logLine);
+			$this->assertContains('login(*** username and password replaced ***)', $logLine);
+		}
+	}
+
+	/**
+	 * @dataProvider userAndPasswordData
+	 */
+	public function testDetectcheckPassword($user, $password) {
+		$e = new \Exception('test');
+		$this->logger->logException($e);
+		$logLines = $this->getLogs();
+
+		foreach($logLines as $logLine) {
+			$this->assertNotContains($user, $logLine);
+			$this->assertNotContains($password, $logLine);
+			$this->assertContains('checkPassword(*** username and password replaced ***)', $logLine);
+		}
+	}
 }
-- 
GitLab


From a5e9301ec0e5368aa26bab795629475465eb24b7 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 25 Sep 2015 09:13:23 +1200
Subject: [PATCH 508/783] simplify upload icon

---
 core/img/actions/upload.png | Bin 144 -> 142 bytes
 core/img/actions/upload.svg |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/img/actions/upload.png b/core/img/actions/upload.png
index a6969c23fa6640726d3300a233ff15264c0b32c6..8955ed9641202f08a70536bf9708e67eb7d328f2 100644
GIT binary patch
delta 113
zcmbQh*vB|QC5tD(C&ZNj37Eb#p9bVImjw9*Gc<H4O$%=aa`il2978G?lMk>;%)Id9
z%o(4InhuU8enH0%f=V2AtMml;T_$TgNEj$H`Y`%1Fywz_c&gR=|0Kv<Pgg&ebxsLQ
E09w5tc>n+a

delta 115
zcmeBUoWM9iC5JP>C&cyt|NjhNP#3r|7RX>K3GxeOXqc_-CjsP{c)B=-R4^ttFuA#L
z@IE&-G+gviQHjIOh2@}ohr*8)yBur;d{;8e;S_H8B;ZxZwSdWoks)du!$rOG&PPGU
Ndb;|#taD0e0syj>BJBVG

diff --git a/core/img/actions/upload.svg b/core/img/actions/upload.svg
index 80231797c96..bf1c08cd488 100644
--- a/core/img/actions/upload.svg
+++ b/core/img/actions/upload.svg
@@ -1,4 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path d="M10,12,6,12,6,6,2,6,8,0,14,6,10,6z"/>
- <path fill="#000" d="m0,11,0,5,16,0,0-5-2,0,0,3-12,0,0-3z"/>
+ <path d="m8 1-6 6h4v4h4v-4h4zm-6 12v2h12v-2z"/>
 </svg>
-- 
GitLab


From 0566af3a12464f68058dd39eb3d8a885d76315a6 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 25 Sep 2015 09:58:02 +1200
Subject: [PATCH 509/783] increase visibility of slideshow controls, fix
 @owncloud/gallery#51

---
 core/img/actions/view-close.png    | Bin 317 -> 1442 bytes
 core/img/actions/view-close.svg    |   9 ++++++++-
 core/img/actions/view-next.png     | Bin 232 -> 1215 bytes
 core/img/actions/view-next.svg     |  10 +++++++---
 core/img/actions/view-pause.png    | Bin 108 -> 682 bytes
 core/img/actions/view-pause.svg    |  12 ++++++++++--
 core/img/actions/view-play.png     | Bin 154 -> 870 bytes
 core/img/actions/view-play.svg     |  12 ++++++++++--
 core/img/actions/view-previous.png | Bin 231 -> 1189 bytes
 core/img/actions/view-previous.svg |  10 +++++++---
 10 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/core/img/actions/view-close.png b/core/img/actions/view-close.png
index c21f6ee30e780f09554e76839c212e6cf3e34425..0874381a5760a174529ad5278a25b4e0d211c5e2 100644
GIT binary patch
delta 1435
zcmV;M1!VfY0-_6$8Gi-<0047(dh`GQ00eVFNmK|32nc)#WQYI&010qNS#tmY4c7nw
z4c7reD4Tcy000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*E^l&Yo9;Xs000FaNkl<Z
zScS!xT}+c#7{`AUgd(DVAFR~2P}^GD)fmmfE{tOFW4CNNlYg;`W%p|0Znk7umh9GD
zEZMRv7iY4VW!bzmflw2-YhyCLgwl_cmLj02d{m`9yXbT5DHP&xnI}1U&-?Lz&i_2;
zd7krs;SIN{4W3ncr&e8G8(UMsfbJG!tfUt<Ah9WIO$7rMpjzHl%e?~fz=~Y+6;^1e
zfYk(641B>Pp??XOlWzfP0jpfA1@r>Q0ncTeH&#+5-)#Zvq;C;>dBNo5yB8*jYQuoV
zFwg+(0Gfd9a$jqB!*pYnETj(D3N#9?S;kf&he7(~c9<T}?z0MTrx>Xhz#=d&B%cUo
zMesE;`F6oH3+XCgS#ZerdOH-LER>pdW37OjySlpk!+*oWUxz}W0N@1dz#e0DTa8sW
z%R4*ZJbd`@+xPF^|0Wy`9}tgdFV;{YODy8TCZHYY1kMf*5C5%{QkhI<#_#uE0WJdP
zfiB=6;E{e%o}C9Sg+ifkv)SydQc8`Cj0^&2fp^7rlgwq&6YFNCO93dHJ9qBaOeQm9
zv)Oh<B7c!jgTbH=*ek1S18maU<k?=I&$sW^ty`b8wzlq^o}QlT?d|=IQWh1Ad8kA{
zN9;1NI5adg9S(=DO-@eE*=)AvzP`TRKp^0e?QpH?POsOyZ(v~HW4qnnGBq{z=+voG
zKi|E3H$yRga;(jsvdX2ipkCaxTUO=Jh8+$^OMg0@eth!e$(y62qtjv(!0PdMc1I$S
z9*4uxoXKS7PoF;h%h1r!IFJI;zyshhutX^p%ZO+K4Kle8I0}3ST=sZ8KO~dMhe|1x
zN~NB7Jf54tb>Mn?d;1@WL}Fekr6wmQ=L3PjkHBXV6Gz3?9<i<K!<s-ev!D@p3-ANS
zfq!1$bGO@lH6D-8E2UI2nOx}T==jTSxBodYG4WIr^ZWfj0bdBF3pgOQ8YvaFDs$4+
zBrKE)OC!)iG00p%hs)*iMk0|jZnt||G#bq*rSN*a)_6R=7!HT~5{bkZ5C@V#2ABh$
z0?#Ow;)+42n_2gBNI=To<&w$d;<01L?thJqjpaNZkJan-T4S-;v+nNhdx=D1K`@KJ
zf?)K-Wx=-*f&aBtBA{cThGJQ+rx-k20jta9YPfUf&LN-AXPuas$c>MW=iF|0-N3-W
zq4xInZGve4wh5+=^3!qMw&@^@Mx&b!LUZy>r=iQ``dt(Iw`ura6e0!GyWQ^Hw|{Tn
z?r}PuW+55_CfT46SymCy>DNH<blbIm|Ngy^NTk={aI}cw8>6G6I@O}U1Q3tKV$tsI
z?i;C8>S0@3TT_33|3{%v$VKs3Z<3hM@vx>4S!929P^|Os0PhEb!7tP4^aD8&9|nWL
z@5Qyfz<c7}qre$?cG>IoewRw6W`C7ZDx1yD9yxO4E8qjM>6AINxG5vB(Q!N*2n4PG
zmstNeJ}&Wc(eL+PNvG2@uW}r(mSi=Q^q_TQWF+0$*=g_T>A5;MIG6;o(q|~D9DT|?
z#}J;gv$M<n{r!U{PMm1HaN)wWSS&Ur`@cZ3FujZcy$@QB)yiHqvA!gGM1N6|Em2vL
zX+78=c9#V+C-?;+oCgY86KWxnmlZvg=Q)a*QIPS1^qgS?N@X@Lt6LJ{7P(&(n>osb
zN!fpa*6&q@(Iv`d`7^_XW^Fgs)QYTH2bw9%^;WGBBzpX+KPFnXnQgrvlR^dTOIcRw
pIDVDit1?~pI@mY<bNa^HKNNrqd`SwUeVYIP002ovPDHLkV1lXnzY72W

literal 317
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyP60k4uKy_p4Ab(D15Fbx3GxeO
z2n`F5h>VJkiAzXINy{j&`2FYazhz(V&Ic-(>gnPbQgQ3<#7Mrw3OuZ`*WR&hzw>|9
z+KozCLeCjy&i`Pt_ygk{ZlC|!58rq%wg_7iw&nOWsn$}~U%r3)ueWpS9~SOs=}Om^
zk&pc@s3sS4g*9Pi(cQM+yTu>bzA1Rk`ukPFbZzmXi3eNzY@Z0;h~v5~T=+0&{?o_4
z`{kM*9ygS#>)BHKZcP!3tDt=slkkkIQ#qDD;`Y4GyYE|p=pmp389ZJ6T-G@yGywpa
CzNhg3

diff --git a/core/img/actions/view-close.svg b/core/img/actions/view-close.svg
index 89d1fab88dd..2b91e382eb1 100644
--- a/core/img/actions/view-close.svg
+++ b/core/img/actions/view-close.svg
@@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path fill="#FFF" d="m23.071,6.1013,2.8278,2.8278-7.0713,7.0717,7.071,7.0704-2.8279,2.8283-7.0714-7.0704l-7.0713,7.071-2.8282-2.828,7.0705-7.071-7.1084-7.0316,2.8665-2.8679,7.0709,7.0705z"/>
+ <defs>
+  <filter id="a" style="color-interpolation-filters:sRGB" height="1.5997" width="1.6003" y="-.29984" x="-.30016">
+   <feGaussianBlur stdDeviation="2.2386623"/>
+  </filter>
+ </defs>
+ <path d="m24.955 23.538-1.414 1.414-7.536-7.5358-7.5355 7.5358-1.4142-1.414 7.5355-7.536-7.5355-7.5356 1.4142-1.4142 7.5355 7.5356 7.516-7.5547 1.434 1.4333-7.5357 7.5356z" filter="url(#a)" stroke="#000" stroke-width="2"/>
+ <path d="m24.955 23.538-1.414 1.414-7.536-7.5358-7.5355 7.5358-1.4142-1.414 7.5355-7.536-7.5355-7.5356 1.4142-1.4142 7.5355 7.5356 7.516-7.5547 1.434 1.4333-7.5357 7.5356z" fill="#fff"/>
 </svg>
diff --git a/core/img/actions/view-next.png b/core/img/actions/view-next.png
index 8a23452e083f8d5206e510535d5d969ca5542582..d8c749bec9b6b032342938ba6705b2baf2561a4b 100644
GIT binary patch
delta 1207
zcmV;o1W5bn0lx{57=H)`0001UdV2H#000DYLP=Bz2nYy#2xN!=000SaNLh0L01ejw
z01ejxLMWSf0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$UJV``B
zR9J<zm(5RORTzgK=m3L2`6?f6Ep4rk2Eu}{ai!356WmGAm4D8Ri6+K>WBv*k#>t58
z+`A~3Htt!Gk{W2kZ7sD>7-0C2kD)HkIpJ`*Eg#}ZZrXcu+u!s4-t)fqy$xJn4L~E{
z0-AtkphbSVfJ@*UI0H`Q_X~NwDvx_Dm+ib!9#5oj8{h^yfev}zto^QP`@HvhVmnt3
zGyzY6cA#4Vw13EZPJn%RPow+|2sbY83)EQSnhO!>dqC&h+}vm;lX*EZGV&qd1H3>V
z(1mcN#Rk;i@V|FjE=1%#zz4ubz-Jp98-G@-)oMPUFNVY6m%#VH7r-aL81TM?X+^lI
zJ5zT#IRIB1>Jngne*RUtT&@HH0beSW`YsZQgn&U{0DtfxQq;}^oNxlD0`CwxJq1pd
zmzTE;!}zgOD(wyp4fQWAEqxt{M20kozK25C0aVoQr1%kV0PL--tP~Byc&#8z(|qw5
z5VZg<G=P0z2iQ)h)0SZv3#C$NHy8}|nWp(%LJT|<qFxHl5G8jY0k(j0I-TCILxjU&
zCx|;$hkug;PHET&DzzYz$)tkN)1jBBUK!UQYB``>xB&hE4uL&j8z@T%%P@?E&CSg>
z3L+E=1ra?$uZ~u(y63G9)PgwGASxO}!7z+p6+|kPdL|(Tfqq0k=|J=rM;B@V*dbI&
z9!ZED=|*LBb#*fykN;LI7Waa|peL0|eH99YLVp^7Te{HX<U&1wS`f#`(gfZB2boM}
zXL@@2_d=m?pdccVh!3$3+NA^bXUClYbO=?R>QQ{69cOE6Ye!R4Q-9?1`M1Gf(34Ci
zzllbp9z_22=<l3@|GZo-`_umBvOkWUmLgVjf*Mj<wWE1>c(~0p&5r|tK!;^nm6@5D
zpMTcZ*DDCe&Jk&>VjEm;15n~>LTW)gqTPu6b_4EcG}^nkxcI5x?{{04Rf)x7zvObc
zB4VE$B1&1!3)g0adMR)cZ<E5kh-Tv%9Ub+Vrun(w@9)yYHxNy07qMYaY%bgipo^>V
ztX+zGkZpHtY%GvSB);_deBG91ZO3A<g@0TwX90g}0B@xOj<cgv3hd%)H0zR4EAe0=
zk$C3ydb=&l+K$KLKj(6}f)p<!8rHsy{>&+QCjfoJxwx{uQ%2q|#Y0lOM~P>%*}N1k
zBbwA6qH&$piXNO(prUU^>~J?C=l2oc*TnVBcf$cYfL?BT^u0izX8Ud8hj$UL2Y;a3
z?*_WY$H)DNMB;@e{#uHwoZnmA2|z*UrPn$+IXRF>B);`}y*>GSek&f2zj_RDr&V_>
zFBA%oK9)PZnyK<rEw{z8tiL8ECI)9`XMf0Mvzv$#+vcj&?zG{YmYve2xu7<ndNq40
z|5VM1d-C)6q2h3}52(lPIih<hhcHg%y;XVr7!kE<G7rwV6M#MygJ>eh{7<jv{{qI2
V7z=(LHJAVZ002ovPDHLkV1jcEE<peQ

literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`*Z;(Uz+HcZfLeG;g8YIR
zSOnEvvKprDzWMHVprJM|P&~!c#W6%9I5|OqZ^^=sH_xdo;My?XvQ6v2jplVO!m*s6
zrAk!qz3_@Szd(DXW4Kb|x|U47T|(L=syfvdrXE?K?I?cWLQ|eb+g1ra=W?sI=NI<&
r3p%`T><~O5aj`)#P$IBXoPj~M&zN!Ty4tfq`xrc3{an^LB{Ts5>Vjw8

diff --git a/core/img/actions/view-next.svg b/core/img/actions/view-next.svg
index 07c95b73ff0..4b719842efd 100644
--- a/core/img/actions/view-next.svg
+++ b/core/img/actions/view-next.svg
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1020.4)">
-  <path d="m9 1024.4 2-2 14 14-14 14-2-2 10-12z" fill="#fff"/>
- </g>
+ <defs>
+  <filter id="a" style="color-interpolation-filters:sRGB" height="1.4477" width="1.8073" y="-.22386" x="-.40365">
+   <feGaussianBlur stdDeviation="2.4158278"/>
+  </filter>
+ </defs>
+ <path d="m10.414 28.952-1.414-1.414 11.535-11.536-11.535-11.536 1.414-1.4138 12.95 12.95z" filter="url(#a)" stroke="#000" stroke-width="2"/>
+ <path d="m10.414 28.952-1.414-1.414 11.535-11.536-11.535-11.536 1.414-1.4138 12.95 12.95z" fill="#fff"/>
 </svg>
diff --git a/core/img/actions/view-pause.png b/core/img/actions/view-pause.png
index 1de1fb4654bf873680151ec1280baac8fb21c8fb..87a18128adec2ffa1a721eae5f4a4a1068559302 100644
GIT binary patch
delta 669
zcmV;O0%HAass)f3e+UKu0047(dh`GQ00eVFNmK|32nc)#WQYI&010qNS#tmY4c7nw
z4c7reD4Tcy000?uMObuGZ)S9NVRB^vcXxL#X>MzCV_|S*E^l&Yo9;Xs0006fNkl<Z
zScUDEO>){m5QRVefC-RA>@1R;!WU8HD!zwL;)|t{O6*i6f8b!DpDgqmwFWfyf`SdN
zs%x5Jru%h|G<pMPMl$j{3G5KsS7P~j-Ue&)AV317vdsBDxGipiMCkz{t>!gA?fhMw
z+%2-?IWUz?^xKnY0<+}aeDVs|0;R0-Bzy-f`3#r?OO00|VgzahspLb~tz4El0$bn(
zcm`G)H-4?}e?Y3L=fDTxM&nW>G8eQ|psm(VMBKWTD8Y*o{{|ipbg=aVGA&*z`4`|5
za1AURfl`$`D*+-nmrWgkHSh$y(>&|Q)^!i-!~*yX+yY;LyEcNNC?0@&;Jzq|huB=;
zPBCwlV`1GNdj^)Od=#6_=A(5$ehk;ZPsO%}dRIB@f4>DYu^dHJRZHN#^J7>9$#>_=
zp>x2V=xHos(=-#hy*EFGDg7HVINb7JqCfpoB52z-Q$X`$@Kp~^%#c7x<TboyPBdP$
z%2VJ%;6mU+VC)?5@+pS5%!$Se33%-mO0EHtB&pFSRelT&`?_$Cfc<HTr;J5R)6~B0
z=Eq=Cf2<Bk7y(~(MW=Swv50w|uYkYKk6}$O#e6pg9q`FlbV_Cvv)Swy@I(I9D+Hbt
z(~|)D4@5?<2XE-4*fAy9ci@}GN3AV^+HXNkr`1;U0`ec7k~x+rUD4~o!4}y5TXksS
zAC51}OZw+v?<#i6i%AQ#UL>6IYPNd|&VD&P7d!p~0HP=Y^fq5@00000NkvXXu0mjf
Dv!W|5

delta 90
zcmZ3*nlnKngprwnfx&aji|s&)Ex;$l^*<Pd)_lzYiZGT0`2{mLJiCzw<cN5>IEHXU
nCnp@>p7H;N`~uTPaR!Do0ri{C{~z`O<rzF({an^LB{Ts5y+0r&

diff --git a/core/img/actions/view-pause.svg b/core/img/actions/view-pause.svg
index f5fdc030479..e9ff43be0bf 100644
--- a/core/img/actions/view-pause.svg
+++ b/core/img/actions/view-pause.svg
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1020.4)">
-  <path d="m6 1026.4v20h8v-20h-8zm12 0v20h8v-20h-8z" fill="#fff"/>
+ <defs>
+  <filter id="a" style="color-interpolation-filters:sRGB" height="1.6" width="1.6" y="-.3" x="-.3">
+   <feGaussianBlur stdDeviation="2.5"/>
+  </filter>
+ </defs>
+ <g transform="matrix(.9 0 0 .9 1.6 -916.76)" filter="url(#a)" stroke="#000" stroke-width="2.2222">
+  <path d="m6 1026.4v20h8v-20h-8zm12 0v20h8v-20h-8z" stroke="#000" stroke-width="2.2222"/>
+ </g>
+ <g transform="matrix(.9 0 0 .9 1.6 -916.76)">
+  <path fill="#fff" d="m6 1026.4v20h8v-20h-8zm12 0v20h8v-20h-8z"/>
  </g>
 </svg>
diff --git a/core/img/actions/view-play.png b/core/img/actions/view-play.png
index c506815c0cfb13f1a0fee40a5bdb97910fbac03c..b07c6de3cfd1835fb410c37a5470828f7e322e87 100644
GIT binary patch
delta 859
zcmV-h1El<#0p<pf7=H)`0001UdV2H#000DYLP=Bz2nYy#2xN!=000SaNLh0L01ejw
z01ejxLMWSf0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$S<4Ht8
zR9J<zmpyM2K@f(YvmHVlKAk`iC=rSRSV~F?3Th;N0JSBGRDYl}R4Hg^A{!~S(<JsU
zff6eX(w%aRC3lD*JD)ht$7LyYR^D8E#+Qpn8r|va+j;iA-PsujZH~Bo?*K}kDa*00
zi7gWfm;%yrH2?}Yx7-e%7{mrh10(V*BM?Z?Ga!(w4U-te0GQyTz)f-UTL7F`erf?F
z2C)Hd09oKRaDPi6QWB^G906^)KfW%IG~L;cN$?ynDV_uF2-v7Vns>}P3A-`-zAwOt
zHT!!Kc&gE8d<lZUsnu!-SQf3yDBX3E7{rl5$0Yb8U>cZKN__?JegAi{SgftDulv9*
zup_<;>;nhDU-T!6`ZST-*8pVEaz6o{0<%h~&-NcZ&wpzci^a`qwdw&a@x&mG%svZD
z$n0l<=Srzhy(Dv8w^b^YHmlXDD*y&$rw_=f1#%&&8GvyCm;vU17fPw6UI0BnY(-iT
zigeIh*j7XV$_AJe1)c$UrPRlM0DTl`T8ium$RT<Q9}7qzehFa40{AcpKm<tBa-+(g
zDAKmnIDbz?j5p98wrycyAy=tX-ngz?C=?2>(TjNocnmxM?xQDavTO=)q5!UJ^Yil)
z8yg#Mx3;$4FD@>=0;bUG%T8#+12C4)=O32K<#+XZeQ9}l`6c>Oo8W0g<)Hx#YMEgT
z?EC)q>gwwEwY9Y$z%ROa!E8k}6adfjnx#^yR)48fegc1hZS-!~r@IwRU7?}?VxQ|V
zwqd6qK)Cjc8#qoPx&&Y!6n1g(zrcx7u>r7)&olJlG3bmF9Y&cR!B0f43pT9d*jB(4
zpGPtvF#LkVC}3vakpWwcMx(y6vhuB5E;nTG1N5RYewZY%F^6tBJ`UVP=j|N24jhpI
zk5nY!p@6iL1`aD=<Zq+%^ch;-xMg|l)-4R+$Uw)$YfP@(Gui;g0s$DLHA~#AhHLpj
lo6~FSlEW=|7;5P4`9J(l56y$(-D&^;002ovPDHLkV1idsb(H`B

delta 138
zcmaFHHj8nBL_HHT0|Nt}$fR^2#S`EY;`$#6d|k>{3>0TB3GxeOa5ykA+cO);weoav
z43W6pdrpy$!GVL>@!$GicZ0j53PTsn;%qz@qt=%0-~<D|oU1Hr4gQ+M>crX=&trAT
X^E13NrK=xk3WKMspUXOCr-UW|rJpon

diff --git a/core/img/actions/view-play.svg b/core/img/actions/view-play.svg
index d9fa355371c..e617e29cb01 100644
--- a/core/img/actions/view-play.svg
+++ b/core/img/actions/view-play.svg
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1020.4)">
-  <path d="m4 1024.4 24 12-24 12z" fill="#fff"/>
+ <defs>
+  <filter id="a" style="color-interpolation-filters:sRGB" height="1.6" width="1.6" y="-.3" x="-.3">
+   <feGaussianBlur stdDeviation="3"/>
+  </filter>
+ </defs>
+ <g transform="matrix(.83333 0 0 .83333 2.6667 -847.67)" filter="url(#a)" stroke="#000" stroke-width="2.4">
+  <path d="m4 1024.4 24 12-24 12z" stroke="#000" stroke-width="2.4"/>
+ </g>
+ <g transform="matrix(.83333 0 0 .83333 2.6667 -847.67)">
+  <path fill="#fff" d="m4 1024.4 24 12-24 12z"/>
  </g>
 </svg>
diff --git a/core/img/actions/view-previous.png b/core/img/actions/view-previous.png
index 79dcb2301df943a25671a2d0a5698962b7ba0c90..f601ec2ba44ca26ff930b4f95adac37314abb5c8 100644
GIT binary patch
delta 1181
zcmV;O1Y-N=0i_9$7=H)`0001UdV2H#000DYLP=Bz2nYy#2xN!=000SaNLh0L01ejw
z01ejxLMWSf0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$UB1uF+
zR9J<rmt9PoRT#&A^zB;8x}nZZUB(<j3ktLtb-lnMAzb)XjelO5A&Jh9cwvktHL`3N
zAmPf8cn!TWd?ZcUCI(_81{yZJ@q&A9mL+BjIBb(`*jn1xi*pV=bfxXvd6JVieS6OP
z|DES~&U4PwKz*%2>jrQPZ~#vEGyoIG0a@Aq1@f{Z|HuA_;&v(C2pk8R0GE7U05ZUR
zIo6cDpv3C|D1Q}qNWl|8v+T#^e>o{`lcM{G)fXsQ!4g0@@g^z$1aL||-AhYLp;Rih
zJ2EnokRTc09|@zrWn!T<$jJu6&nJMV01prV-UcoM;b=6vYMQ2*&*%3;q0raB0PwsV
z??$-H_K?COh=+hrfh&uPi#McrVS0Lc9=HU&26O^v5P$Bm1W=3kXTa5kg@p|zJ~cI!
z0KNp?ljEL4xJLzO!~Y@vjuM}rpZ{HnPfkw$41|FXfkB`PI18MlxJ9c1)FnPKF|h=E
z2Ydv)4!j6F3p}o^-c}7jPcT-+M}d!lH-MLbR^Ukv`@W{t8whi`5y7L2e-2!WL?Y{D
z#4iJH0)H<f{C--BTQ>bMIq@{m23*v{$0Cu)b<O9?z?CD!-6i5x0c;3Axe!r%0b$Cw
z5N7{=c6Rn)tBsG3{{mbEK9OTyk-&9{D*y+=@6RA2cnA?x*JfsB4z}9Z*w}BtB=Ci_
zPC$yEsaG6|f%h09dM^U+1K;RA9~~XN0sIJj3x9k7^dpkZ(-PiUk2n;~e@d?ARp8Rx
z+}y89JRA=H0sI8~0DJ|!i}3pe4kw$MBEF`S=yJIZ4lUC(Egd4&no;sw&jISFZHh*t
zJ6^B%q|fJT85$Zoo6TnLZES381ADS(5SNY|;;1#XUeOBW0BjVqpgMLP@pyc@t*y=7
z+ke}8Zg6n0rBEo`UteF}k)k=odB2Z1@AXSZMTl|$x+QGd)0Rji?zFeJH~Ibka{~hd
ztu~u&FPTi<rFhfPyRtw<h*E%Z?U2tCiNtM>$K&$*{Vo0d{q2TfWRl6`-`ZG95S0MT
zl3tMS8{+Z!ZLins^7(u%!C=s17)CakOn>fDyy;Yes0vVeT`K(`02LtgIe8w2smTJ$
zRQl>mAu3ry%~jWM6`VB#=*<#@-EPmUt*!k<@g}Txh=S2wQWHQW2vb3HbaXWOe7^I+
zV9@JyI`>vrSMMN-5ml6^!sL)8Y6YkY5sStC?Ck7p?CI$_-`CgI(cIjeURhbWiGR3`
zt3;){!n6ud38DZHi^XnrcXvCwy1H5efxru!o0}V3TU*<}0|`-@DJ`8;H5Vq!%gdp3
zI=wqQJe&Y_fV)5nk+!osw56l+2#9K>Sqex4_sUqoa&4$@qkZk2iueqoP}Pgm2Z%UO
v!UgRcbydfu5Xzr<gn5rD&vTT?1s4ASapC?>dv56f00000NkvXXu0mjfMPVeQ

literal 231
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`*Z;(Uz+HcZfLeG;g8YIR
zSOnEvvKprDzWMHVprJM|P(0bw#W6(Vd~$*U<C29RZ=O?G!1ZK~rbBRn6NB$T6%*Fw
zJQqZA9D@tgfZW0o*4_**Kdl9t5k1QuY+;_&w3w%Y)nH44R9B+zvcm>*`d(V{yiaBm
na1%&kGjcOYa1(J0dBntE)@IB&(~GqZXdQ#6tDnm{r-UW|8=PSZ

diff --git a/core/img/actions/view-previous.svg b/core/img/actions/view-previous.svg
index 68a31c04433..8a5013aad40 100644
--- a/core/img/actions/view-previous.svg
+++ b/core/img/actions/view-previous.svg
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g transform="translate(0 -1020.4)">
-  <path d="m23 1024.4-2-2-14 14 14 14 2-2-10-12z" fill="#fff"/>
- </g>
+ <defs>
+  <filter id="a" style="color-interpolation-filters:sRGB" height="1.4477" width="1.8073" y="-.22386" x="-.40365">
+   <feGaussianBlur stdDeviation="2.4158278"/>
+  </filter>
+ </defs>
+ <path d="m10.414 28.952-1.414-1.414 11.535-11.536-11.535-11.536 1.414-1.4138 12.95 12.95z" transform="matrix(-1 0 0 1 32.364 0)" filter="url(#a)" stroke="#000" stroke-width="2"/>
+ <path d="m21.95 28.952 1.414-1.414-11.536-11.536 11.536-11.536-1.414-1.4138-12.95 12.95z" fill="#fff"/>
 </svg>
-- 
GitLab


From ec005fc5d0185d81a17646c5b131ed918ffd515c Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Thu, 24 Sep 2015 09:44:18 +0200
Subject: [PATCH 510/783] add .checkbox class for new checkbox style

---
 core/css/fixes.css  |  5 -----
 core/css/styles.css | 20 +++++++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/core/css/fixes.css b/core/css/fixes.css
index e5dbeb137ab..7ef44ba6909 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -115,8 +115,3 @@ select {
 	line-height: 38px;
 }
 
-.lte8 input[type="checkbox"] + label:before { background-image: url('../img/actions/checkbox.png'); }
-.lte8 input[type="checkbox"].white + label:before { background-image: url('../img/actions/checkbox-white.png'); }
-.lte8 input[type="checkbox"]:checked + label:before { background-image: url('../img/actions/checkbox-checked.png'); }
-.lte8 input[type="checkbox"].white:checked + label:before { background-image: url('../img/actions/checkbox-checked-white.png'); }
-
diff --git a/core/css/styles.css b/core/css/styles.css
index aefc0ff755a..ad9d03f5879 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -158,7 +158,9 @@ textarea:hover, textarea:focus, textarea:active {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	opacity: 1;
 }
-input[type="checkbox"] {
+
+/* ie8 doesn't support :checked */
+html:not(.ie8) input[type="checkbox"].checkbox {
 	margin:0;
 	padding:0;
 	height:auto;
@@ -166,7 +168,7 @@ input[type="checkbox"] {
 	display: none;
 }
 
-input[type="checkbox"] + label:before {
+html:not(.ie8) input[type="checkbox"].checkbox + label:before {
 	content: "";
 	display: inline-block;
 
@@ -174,27 +176,27 @@ input[type="checkbox"] + label:before {
 	width: 20px;
 	vertical-align: middle;
 
-	background: url('../img/actions/checkbox.svg') left center no-repeat;
+	background: url('../img/actions/checkbox.svg') left top no-repeat;
 	opacity: 0.7;
 }
 
-input[type="checkbox"]:disabled +label:before { opacity: .6; }
+html:not(.ie8) input[type="checkbox"].checkbox:disabled +label:before { opacity: .6; }
 
-input[type="checkbox"].u-left +label:before { float: left; }
+html:not(.ie8) input[type="checkbox"].checkbox.u-left +label:before { float: left; }
 
-input[type="checkbox"].white + label:before {
+html:not(.ie8) input[type="checkbox"].checkbox.white + label:before {
 	background-image: url('../img/actions/checkbox-white.svg');
 }
 
-input[type="checkbox"]:checked + label:before {
+html:not(.ie8) input[type="checkbox"].checkbox:checked + label:before {
 	background-image: url('../img/actions/checkbox-checked.svg');
 }
 
-input[type="checkbox"].white:checked + label:before {
+html:not(.ie8) input[type="checkbox"].checkbox.white:checked + label:before {
 	background-image: url('../img/actions/checkbox-checked-white.svg');
 }
 
-input[type="checkbox"]:hover+label:before, input[type="checkbox"]:focus+label:before {
+html:not(.ie8) input[type="checkbox"].checkbox:hover+label:before, input[type="checkbox"]:focus+label:before {
 	color:#111 !important;
 }
 
-- 
GitLab


From 28d3c1cc0b03d02dd3be5516c1c59ac6842fc904 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Thu, 24 Sep 2015 14:12:54 +0200
Subject: [PATCH 511/783] fix filelist checkboxes

---
 apps/files/js/filelist.js            | 2 +-
 apps/files/templates/fileexists.html | 4 ++--
 apps/files/templates/list.php        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 4b1b38d783c..ad3dce19778 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -925,7 +925,7 @@
 			if (this._allowSelection) {
 				td.append(
 					'<input id="select-' + this.id + '-' + fileData.id +
-					'" type="checkbox" class="selectCheckBox"/><label for="select-' + this.id + '-' + fileData.id + '">' +
+					'" type="checkbox" class="selectCheckBox checkbox"/><label for="select-' + this.id + '-' + fileData.id + '">' +
 					'<div class="thumbnail" style="background-image:url(' + icon + '); background-size: 32px;"></div>' +
 					'<span class="hidden-visually">' + t('files', 'Select') + '</span>' +
 					'</label>'
diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html
index c783f9a05c7..459b3d22c18 100644
--- a/apps/files/templates/fileexists.html
+++ b/apps/files/templates/fileexists.html
@@ -10,7 +10,7 @@
 		<div class="template">
 			<div class="filename"></div>
 			<div class="replacement">
-				<input type="checkbox" class="u-left"/>
+				<input type="checkbox" class="checkbox u-left"/>
 				<label>
 				<span class="svg icon"></span>
 				<div class="mtime"></div>
@@ -18,7 +18,7 @@
 				</label>
 			</div>
 			<div class="original">
-				<input type="checkbox" class="u-left" />
+				<input type="checkbox" class="checkbox u-left" />
 				<label>
 				<span class="svg icon"></span>
 				<div class="mtime"></div>
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 15af1970dc3..bbbce8473de 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -56,7 +56,7 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<input type="checkbox" id="select_all_files" class="select-all"/>
+					<input type="checkbox" id="select_all_files" class="select-all checkbox"/>
 					<label for="select_all_files">
 						<span class="hidden-visually"><?php p($l->t('Select all'))?></span>
 					</label>
-- 
GitLab


From dba9211d5d2e3e8eea4c4e1da22c754faef608a6 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Thu, 24 Sep 2015 23:34:53 +0200
Subject: [PATCH 512/783] fix filecomparator

---
 apps/files/templates/fileexists.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html
index 459b3d22c18..e3513237d2b 100644
--- a/apps/files/templates/fileexists.html
+++ b/apps/files/templates/fileexists.html
@@ -3,8 +3,8 @@
 	<span class="what">{what}<!-- If you select both versions, the copied file will have a number added to its name. --></span><br/>
 	<br/>
 	<table>
-		<th><input id="checkbox-allnewfiles" class="allnewfiles" type="checkbox" /><label for="checkbox-allnewfiles">{allnewfiles}<span class="count"></span></label></th>
-		<th><input id="checkbox-allexistingfiles" class="allexistingfiles" type="checkbox" /><label for="checkbox-allexistingfiles">{allexistingfiles}<span class="count"></span></label></th>
+		<th><input id="checkbox-allnewfiles" class="allnewfiles checkbox" type="checkbox" /><label for="checkbox-allnewfiles">{allnewfiles}<span class="count"></span></label></th>
+		<th><input id="checkbox-allexistingfiles" class="allexistingfiles checkbox" type="checkbox" /><label for="checkbox-allexistingfiles">{allexistingfiles}<span class="count"></span></label></th>
 	</table>
 	<div class="conflicts">
 		<div class="template">
-- 
GitLab


From c23cac33227e09f27a35eb51b619e9f1b7d31a5f Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Thu, 24 Sep 2015 23:54:07 +0200
Subject: [PATCH 513/783] fix login

---
 core/css/styles.css      | 4 ++--
 core/templates/login.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index ad9d03f5879..d952a33c24a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -184,7 +184,7 @@ html:not(.ie8) input[type="checkbox"].checkbox:disabled +label:before { opacity:
 
 html:not(.ie8) input[type="checkbox"].checkbox.u-left +label:before { float: left; }
 
-html:not(.ie8) input[type="checkbox"].checkbox.white + label:before {
+html:not(.ie8) input[type="checkbox"].checkbox--white + label:before {
 	background-image: url('../img/actions/checkbox-white.svg');
 }
 
@@ -192,7 +192,7 @@ html:not(.ie8) input[type="checkbox"].checkbox:checked + label:before {
 	background-image: url('../img/actions/checkbox-checked.svg');
 }
 
-html:not(.ie8) input[type="checkbox"].checkbox.white:checked + label:before {
+html:not(.ie8) input[type="checkbox"].checkbox--white:checked + label:before {
 	background-image: url('../img/actions/checkbox-checked-white.svg');
 }
 
diff --git a/core/templates/login.php b/core/templates/login.php
index 2057b1034d0..db77f63bbd0 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -65,7 +65,7 @@ script('core', [
 		<?php endif; ?>
 		<?php if ($_['rememberLoginAllowed'] === true) : ?>
 		<div class="remember-login-container">
-			<input type="checkbox" name="remember_login" value="1" id="remember_login" class="white">
+			<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white">
 			<label for="remember_login"><?php p($l->t('remember')); ?></label>
 		</div>
 		<?php endif; ?>
-- 
GitLab


From 604f5783fd6f50c0bf5319927a02071143bfa3a3 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Fri, 25 Sep 2015 00:47:48 +0200
Subject: [PATCH 514/783] fix multiselect

---
 core/js/multiselect.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 41dc68ac051..6d5c54ac0f5 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -109,6 +109,9 @@
 				var id='ms'+multiSelectId+'-option-'+item;
 				var input=$('<input type="' + inputType + '"/>');
 				input.attr('id',id);
+				if(inputType === 'checkbox') {
+					input.addClass('checkbox');
+				}
 				if(settings.singleSelect) {
 					input.attr('name', 'ms'+multiSelectId+'-option');
 				}
-- 
GitLab


From 0c32eab904a9dad14957ece396ad85fc8f304e25 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 25 Sep 2015 18:09:43 +1200
Subject: [PATCH 515/783] fix name autocomplete not showing on mobile, fix
 #18551

---
 core/css/mobile.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/css/mobile.css b/core/css/mobile.css
index 29507a0faa9..e8ed33933b7 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -45,6 +45,10 @@
 	width: 80% !important;
 }
 
+/* fix name autocomplete not showing on mobile */
+.ui-autocomplete {
+	z-index: 1000 !important;
+}
 
 /* fix error display on smaller screens */
 .error-wide {
-- 
GitLab


From e91e36f8dfdcdf56bb7f3063f1337105cd9e51bc Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 25 Sep 2015 09:05:12 +0200
Subject: [PATCH 516/783] Add the L10N Factory to the container interface

---
 lib/public/iservercontainer.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 8be23dff214..e37652c1adc 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -193,6 +193,12 @@ interface IServerContainer {
 	 */
 	public function getAppConfig();
 
+	/**
+	 * @return \OCP\L10N\IFactory
+	 * @since 8.2.0
+	 */
+	public function getL10NFactory();
+
 	/**
 	 * get an L10N instance
 	 * @param string $app appid
-- 
GitLab


From faba02564a24187e69ebe274078793d66fd1a2a2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 25 Sep 2015 11:08:33 +0200
Subject: [PATCH 517/783] Move the filtering of sensitive data to the config
 class

---
 core/command/config/listconfigs.php           | 43 ++-------------
 lib/private/allconfig.php                     | 11 ++++
 lib/private/systemconfig.php                  | 53 +++++++++++++++++++
 lib/public/iconfig.php                        | 15 ++++++
 tests/core/command/config/listconfigstest.php | 25 +++++----
 5 files changed, 99 insertions(+), 48 deletions(-)

diff --git a/core/command/config/listconfigs.php b/core/command/config/listconfigs.php
index 5796362f2fc..37aeb53c6f5 100644
--- a/core/command/config/listconfigs.php
+++ b/core/command/config/listconfigs.php
@@ -32,20 +32,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 class ListConfigs extends Base {
 	protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY;
 
-	/** @var array */
-	protected $sensitiveValues = [
-		'dbpassword' => true,
-		'dbuser' => true,
-		'mail_smtpname' => true,
-		'mail_smtppassword' => true,
-		'passwordsalt' => true,
-		'secret' => true,
-		'ldap_agent_password' => true,
-		'objectstore' => ['arguments' => ['password' => true]],
-	];
-
-	const SENSITIVE_VALUE = '***REMOVED SENSITIVE VALUE***';
-
 	/** * @var SystemConfig */
 	protected $systemConfig;
 
@@ -127,10 +113,10 @@ class ListConfigs extends Base {
 
 		$configs = [];
 		foreach ($keys as $key) {
-			$value = $this->systemConfig->getValue($key, serialize(null));
-
-			if ($noSensitiveValues && isset($this->sensitiveValues[$key])) {
-				$value = $this->removeSensitiveValue($this->sensitiveValues[$key], $value);
+			if ($noSensitiveValues) {
+				$value = $this->systemConfig->getFilteredValue($key, serialize(null));
+			} else {
+				$value = $this->systemConfig->getValue($key, serialize(null));
 			}
 
 			if ($value !== 'N;') {
@@ -140,25 +126,4 @@ class ListConfigs extends Base {
 
 		return $configs;
 	}
-
-	/**
-	 * @param bool|array $keysToRemove
-	 * @param mixed $value
-	 * @return mixed
-	 */
-	protected function removeSensitiveValue($keysToRemove, $value) {
-		if ($keysToRemove === true) {
-			return self::SENSITIVE_VALUE;
-		}
-
-		if (is_array($value)) {
-			foreach ($keysToRemove as $keyToRemove => $valueToRemove) {
-				if (isset($value[$keyToRemove])) {
-					$value[$keyToRemove] = $this->removeSensitiveValue($valueToRemove, $value[$keyToRemove]);
-				}
-			}
-		}
-
-		return $value;
-	}
 }
diff --git a/lib/private/allconfig.php b/lib/private/allconfig.php
index 63cc92601bb..7c2037e8048 100644
--- a/lib/private/allconfig.php
+++ b/lib/private/allconfig.php
@@ -118,6 +118,17 @@ class AllConfig implements \OCP\IConfig {
 		return $this->systemConfig->getValue($key, $default);
 	}
 
+	/**
+	 * Looks up a system wide defined value and filters out sensitive data
+	 *
+	 * @param string $key the key of the value, under which it was saved
+	 * @param mixed $default the default value to be returned if the value isn't set
+	 * @return mixed the value or $default
+	 */
+	public function getFilteredSystemValue($key, $default = '') {
+		return $this->systemConfig->getFilteredValue($key, $default);
+	}
+
 	/**
 	 * Delete a system wide defined value
 	 *
diff --git a/lib/private/systemconfig.php b/lib/private/systemconfig.php
index 13b0959768a..3b7930f2842 100644
--- a/lib/private/systemconfig.php
+++ b/lib/private/systemconfig.php
@@ -28,6 +28,21 @@ namespace OC;
  * fixes cyclic DI: AllConfig needs AppConfig needs Database needs AllConfig
  */
 class SystemConfig {
+
+	/** @var array */
+	protected $sensitiveValues = [
+		'dbpassword' => true,
+		'dbuser' => true,
+		'mail_smtpname' => true,
+		'mail_smtppassword' => true,
+		'passwordsalt' => true,
+		'secret' => true,
+		'ldap_agent_password' => true,
+		'objectstore' => ['arguments' => ['password' => true]],
+	];
+
+	const SENSITIVE_VALUE = '***REMOVED SENSITIVE VALUE***';
+
 	/**
 	 * Lists all available config keys
 	 * @return array an array of key names
@@ -67,6 +82,23 @@ class SystemConfig {
 		return \OC_Config::getValue($key, $default);
 	}
 
+	/**
+	 * Looks up a system wide defined value and filters out sensitive data
+	 *
+	 * @param string $key the key of the value, under which it was saved
+	 * @param mixed $default the default value to be returned if the value isn't set
+	 * @return mixed the value or $default
+	 */
+	public function getFilteredValue($key, $default = '') {
+		$value = $this->getValue($key, $default);
+
+		if (isset($this->sensitiveValues[$key])) {
+			$value = $this->removeSensitiveValue($this->sensitiveValues[$key], $value);
+		}
+
+		return $value;
+	}
+
 	/**
 	 * Delete a system wide defined value
 	 *
@@ -75,4 +107,25 @@ class SystemConfig {
 	public function deleteValue($key) {
 		\OC_Config::deleteKey($key);
 	}
+
+	/**
+	 * @param bool|array $keysToRemove
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	protected function removeSensitiveValue($keysToRemove, $value) {
+		if ($keysToRemove === true) {
+			return self::SENSITIVE_VALUE;
+		}
+
+		if (is_array($value)) {
+			foreach ($keysToRemove as $keyToRemove => $valueToRemove) {
+				if (isset($value[$keyToRemove])) {
+					$value[$keyToRemove] = $this->removeSensitiveValue($valueToRemove, $value[$keyToRemove]);
+				}
+			}
+		}
+
+		return $value;
+	}
 }
diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php
index ff0b6c6a5b0..933eef97ae1 100644
--- a/lib/public/iconfig.php
+++ b/lib/public/iconfig.php
@@ -40,6 +40,11 @@ namespace OCP;
  * @since 6.0.0
  */
 interface IConfig {
+	/**
+	 * @since 8.2.0
+	 */
+	const SENSITIVE_VALUE = '***REMOVED SENSITIVE VALUE***';
+
 	/**
 	 * Sets and deletes system wide values
 	 *
@@ -68,6 +73,16 @@ interface IConfig {
 	 */
 	public function getSystemValue($key, $default = '');
 
+	/**
+	 * Looks up a system wide defined value and filters out sensitive data
+	 *
+	 * @param string $key the key of the value, under which it was saved
+	 * @param mixed $default the default value to be returned if the value isn't set
+	 * @return mixed the value or $default
+	 * @since 8.2.0
+	 */
+	public function getFilteredSystemValue($key, $default = '');
+
 	/**
 	 * Delete a system wide defined value
 	 *
diff --git a/tests/core/command/config/listconfigstest.php b/tests/core/command/config/listconfigstest.php
index 7492701cce3..bde6a1b0db3 100644
--- a/tests/core/command/config/listconfigstest.php
+++ b/tests/core/command/config/listconfigstest.php
@@ -23,6 +23,7 @@ namespace Tests\Core\Command\Config;
 
 
 use OC\Core\Command\Config\ListConfigs;
+use OCP\IConfig;
 use Test\TestCase;
 
 class ListConfigsTest extends TestCase {
@@ -66,7 +67,7 @@ class ListConfigsTest extends TestCase {
 					'overwrite.cli.url',
 				],
 				[
-					['secret', 'N;', 'my secret'],
+					['secret', 'N;', IConfig::SENSITIVE_VALUE],
 					['overwrite.cli.url', 'N;', 'http://localhost'],
 				],
 				// app config
@@ -81,7 +82,7 @@ class ListConfigsTest extends TestCase {
 				false,
 				json_encode([
 					'system' => [
-						'secret' => ListConfigs::SENSITIVE_VALUE,
+						'secret' => IConfig::SENSITIVE_VALUE,
 						'overwrite.cli.url' => 'http://localhost',
 					],
 					'apps' => [
@@ -139,12 +140,12 @@ class ListConfigsTest extends TestCase {
 					'overwrite.cli.url',
 				],
 				[
-					['secret', 'N;', 'my secret'],
+					['secret', 'N;', IConfig::SENSITIVE_VALUE],
 					['objectstore', 'N;', [
 						'class' => 'OC\\Files\\ObjectStore\\Swift',
 						'arguments' => [
 							'username' => 'facebook100000123456789',
-							'password' => 'Secr3tPaSSWoRdt7',
+							'password' => IConfig::SENSITIVE_VALUE,
 						],
 					]],
 					['overwrite.cli.url', 'N;', 'http://localhost'],
@@ -161,12 +162,12 @@ class ListConfigsTest extends TestCase {
 				false,
 				json_encode([
 					'system' => [
-						'secret' => ListConfigs::SENSITIVE_VALUE,
+						'secret' => IConfig::SENSITIVE_VALUE,
 						'objectstore' => [
 							'class' => 'OC\\Files\\ObjectStore\\Swift',
 							'arguments' => [
 								'username' => 'facebook100000123456789',
-								'password' => ListConfigs::SENSITIVE_VALUE,
+								'password' => IConfig::SENSITIVE_VALUE,
 							],
 						],
 						'overwrite.cli.url' => 'http://localhost',
@@ -276,9 +277,15 @@ class ListConfigsTest extends TestCase {
 		$this->systemConfig->expects($this->any())
 			->method('getKeys')
 			->willReturn($systemConfigs);
-		$this->systemConfig->expects($this->any())
-			->method('getValue')
-			->willReturnMap($systemConfigMap);
+		if ($private) {
+			$this->systemConfig->expects($this->any())
+				->method('getValue')
+				->willReturnMap($systemConfigMap);
+		} else {
+			$this->systemConfig->expects($this->any())
+				->method('getFilteredValue')
+				->willReturnMap($systemConfigMap);
+		}
 
 		$this->appConfig->expects($this->any())
 			->method('getApps')
-- 
GitLab


From 1694f213875797410ae302b20c9155ef39bfb4a7 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 25 Sep 2015 11:16:26 +0200
Subject: [PATCH 518/783] Add the method to the mock

---
 apps/files_trashbin/tests/expiration.php     | 1 +
 apps/files_versions/tests/expirationtest.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/files_trashbin/tests/expiration.php b/apps/files_trashbin/tests/expiration.php
index b3c6fcd95af..76fb24aa4df 100644
--- a/apps/files_trashbin/tests/expiration.php
+++ b/apps/files_trashbin/tests/expiration.php
@@ -207,6 +207,7 @@ class Expiration_Test extends \PHPUnit_Framework_TestCase {
 						'setSystemValues',
 						'setSystemValue',
 						'getSystemValue',
+						'getFilteredSystemValue',
 						'deleteSystemValue',
 						'getAppKeys',
 						'setAppValue',
diff --git a/apps/files_versions/tests/expirationtest.php b/apps/files_versions/tests/expirationtest.php
index 54024b85b78..11a4746c5e7 100644
--- a/apps/files_versions/tests/expirationtest.php
+++ b/apps/files_versions/tests/expirationtest.php
@@ -177,6 +177,7 @@ class Expiration_Test extends \Test\TestCase {
 						'setSystemValues',
 						'setSystemValue',
 						'getSystemValue',
+						'getFilteredSystemValue',
 						'deleteSystemValue',
 						'getAppKeys',
 						'setAppValue',
-- 
GitLab


From 2ee36dc4de06979f9c761687d7b21399f74fb9db Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Fri, 25 Sep 2015 11:54:26 +0200
Subject: [PATCH 519/783] restyle checkboxes in sidebar

---
 core/js/sharedialogexpirationview.js |  2 +-
 core/js/sharedialoglinkshareview.js  |  6 +++---
 core/js/sharedialogshareelistview.js | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index 3fba4b135d9..fab48f5e6bc 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -19,7 +19,7 @@
 			// in the LinkShareView to ease reusing it in future. Then,
 			// modifications (getting rid of IDs) are still necessary.
 			'{{#if isLinkShare}}' +
-			'<input type="checkbox" name="expirationCheckbox" class="expirationCheckbox" id="expirationCheckbox" value="1" ' +
+			'<input type="checkbox" name="expirationCheckbox" class="expirationCheckbox checkbox" id="expirationCheckbox" value="1" ' +
 				'{{#if isExpirationSet}}checked="checked"{{/if}} {{#if disableCheckbox}}disabled="disabled"{{/if}} />' +
 			'<label for="expirationCheckbox">{{setExpirationLabel}}</label>' +
 			'<div class="expirationDateContainer {{#unless isExpirationSet}}hidden{{/unless}}">' +
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index ab591b9c6e8..cb9325231dd 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -16,12 +16,12 @@
 	var TEMPLATE =
 			'{{#if shareAllowed}}' +
 			'<span class="icon-loading-small hidden"></span>' +
-			'<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" {{#if isLinkShare}}checked="checked"{{/if}} /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
+			'<input type="checkbox" name="linkCheckbox" id="linkCheckbox" class="checkbox" value="1" {{#if isLinkShare}}checked="checked"{{/if}} /><label for="linkCheckbox">{{linkShareLabel}}</label>' +
 			'<br />' +
 			'<label for="linkText" class="hidden-visually">{{urlLabel}}</label>' +
 			'<input id="linkText" {{#unless isLinkShare}}class="hidden"{{/unless}} type="text" readonly="readonly" value="{{shareLinkURL}}" />' +
 			'   {{#if showPasswordCheckBox}}' +
-			'<input type="checkbox" name="showPassword" id="showPassword" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" /><label for="showPassword">{{enablePasswordLabel}}</label>' +
+			'<input type="checkbox" name="showPassword" id="showPassword" class="checkbox" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" /><label for="showPassword">{{enablePasswordLabel}}</label>' +
 			'   {{/if}}' +
 			'<div id="linkPass" {{#unless isPasswordSet}}class="hidden"{{/unless}}>' +
 			'    <label for="linkPassText" class="hidden-visually">{{passwordLabel}}</label>' +
@@ -31,7 +31,7 @@
 			'    {{#if publicUpload}}' +
 			'<div id="allowPublicUploadWrapper">' +
 			'    <span class="icon-loading-small hidden"></span>' +
-			'    <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" {{{publicUploadChecked}}} />' +
+			'    <input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload" class="checkbox" {{{publicUploadChecked}}} />' +
 			'<label for="sharingDialogAllowPublicUpload">{{publicUploadLabel}}</label>' +
 			'</div>' +
 			'    {{/if}}' +
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index d2c45bb08b1..d7624456016 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -27,30 +27,30 @@
 			'        {{/if}}' +
 			'        <span class="username">{{shareWithDisplayName}}</span>' +
 			'        {{#if mailPublicNotificationEnabled}} {{#unless isRemoteShare}}' +
-			'        <input id="mail-{{shareWith}}" type="checkbox" name="mailNotification" class="mailNotification" {{#if wasMailSent}}checked="checked"{{/if}} />' +
+			'        <input id="mail-{{shareWith}}" type="checkbox" name="mailNotification" class="mailNotification checkbox" {{#if wasMailSent}}checked="checked"{{/if}} />' +
 			'        <label for="mail-{{shareWith}}">{{notifyByMailLabel}}</label>' +
 			'        {{/unless}} {{/if}}' +
 			'        {{#if isResharingAllowed}} {{#if sharePermissionPossible}} {{#unless isRemoteShare}}' +
-			'        <input id="canShare-{{shareWith}}" type="checkbox" name="share" class="permissions" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />' +
+			'        <input id="canShare-{{shareWith}}" type="checkbox" name="share" class="permissions checkbox" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />' +
 			'        <label for="canShare-{{shareWith}}">{{canShareLabel}}</label>' +
 			'        {{/unless}} {{/if}} {{/if}}' +
 			'        {{#if editPermissionPossible}}' +
-			'        <input id="canEdit-{{shareWith}}" type="checkbox" name="edit" class="permissions" {{#if hasEditPermission}}checked="checked"{{/if}} />' +
+			'        <input id="canEdit-{{shareWith}}" type="checkbox" name="edit" class="permissions checkbox" {{#if hasEditPermission}}checked="checked"{{/if}} />' +
 			'        <label for="canEdit-{{shareWith}}">{{canEditLabel}}</label>' +
 			'        {{/if}}' +
 			'        {{#unless isRemoteShare}}' +
 			'        <a href="#" class="showCruds"><img class="svg" alt="{{crudsLabel}}" src="{{triangleSImage}}"/></a>' +
 			'        <div class="cruds hidden">' +
 			'            {{#if createPermissionPossible}}' +
-			'            <input id="canCreate-{{shareWith}}" type="checkbox" name="create" class="permissions" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' +
+			'            <input id="canCreate-{{shareWith}}" type="checkbox" name="create" class="permissions checkbox" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' +
 			'            <label for="canCreate-{{shareWith}}">{{createPermissionLabel}}</label>' +
 			'            {{/if}}' +
 			'            {{#if updatePermissionPossible}}' +
-			'            <input id="canUpdate-{{shareWith}}" type="checkbox" name="update" class="permissions" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' +
+			'            <input id="canUpdate-{{shareWith}}" type="checkbox" name="update" class="permissions checkbox" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' +
 			'            <label for="canUpdate-{{shareWith}}">{{updatePermissionLabel}}</label>' +
 			'            {{/if}}' +
 			'            {{#if deletePermissionPossible}} {{#unless isRemoteShare}}' +
-			'            <input id="canDelete-{{shareWith}}" type="checkbox" name="delete" class="permissions" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' +
+			'            <input id="canDelete-{{shareWith}}" type="checkbox" name="delete" class="permissions checkbox" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' +
 			'            <label for="canDelete-{{shareWith}}">{{deletePermissionLabel}}</label>' +
 			'            {{/unless}} {{/if}}' +
 			'        </div>' +
-- 
GitLab


From 2e42f99d007f9897cb6a7d017dce91bd8b1a6546 Mon Sep 17 00:00:00 2001
From: Individual IT Services <info@individual-it.net>
Date: Fri, 25 Sep 2015 15:41:55 +0545
Subject: [PATCH 520/783] add $prepend option to addStyle() & addVendorStyle()

---
 lib/private/template.php | 28 ++++++++++++++--------------
 lib/private/util.php     | 18 ++++++++++++++----
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/lib/private/template.php b/lib/private/template.php
index 60ff49a5b3e..0300e43edea 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -92,26 +92,26 @@ class OC_Template extends \OC\Template\Base {
 	public static function initTemplateEngine() {
 		if (self::$initTemplateEngineFirstRun){
 			
-			//apps that started before the template initialization can load their own scripts
-			//so to make sure this scripts here are loaded first we use OC_Util::addScript() with $prepend=true
-			//meaning the last scripts in this list will be loaded first
+			//apps that started before the template initialization can load their own scripts/styles
+			//so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true
+			//meaning the last script/style in this list will be loaded first
 			if (\OC::$server->getSystemConfig ()->getValue ( 'installed', false ) && ! \OCP\Util::needUpgrade ()) {
 				if (\OC::$server->getConfig ()->getAppValue ( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax') {
 					OC_Util::addScript ( 'backgroundjobs', null, true );
 				}
 			}
 
-			OC_Util::addStyle("styles");
-			OC_Util::addStyle("header");
-			OC_Util::addStyle("mobile");
-			OC_Util::addStyle("icons");
-			OC_Util::addStyle("fonts");
-			OC_Util::addStyle("apps");
-			OC_Util::addStyle("fixes");
-			OC_Util::addStyle("multiselect");
-			OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui');
-			OC_Util::addStyle('jquery-ui-fixes');
-			OC_Util::addStyle("tooltip");
+			OC_Util::addStyle("tooltip",null,true);
+			OC_Util::addStyle('jquery-ui-fixes',null,true);
+			OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',null,true);
+			OC_Util::addStyle("multiselect",null,true);
+			OC_Util::addStyle("fixes",null,true);
+			OC_Util::addStyle("apps",null,true);
+			OC_Util::addStyle("fonts",null,true);
+			OC_Util::addStyle("icons",null,true);
+			OC_Util::addStyle("mobile",null,true);
+			OC_Util::addStyle("header",null,true);
+			OC_Util::addStyle("styles",null,true);
 
 			// avatars
 			if (\OC::$server->getSystemConfig()->getValue('enable_avatars', true) === true) {
diff --git a/lib/private/util.php b/lib/private/util.php
index 117e57f66d7..9702f38a48f 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -507,12 +507,17 @@ class OC_Util {
 	 *
 	 * @param string $application application id
 	 * @param string|null $file filename
+	 * @param bool $prepend prepend the Style to the beginning of the list
 	 * @return void
 	 */
-	public static function addStyle($application, $file = null) {
+	public static function addStyle($application, $file = null, $prepend = false) {
 		$path = OC_Util::generatePath($application, 'css', $file);
 		if (!in_array($path, self::$styles)) {
-			self::$styles[] = $path;
+			if ($prepend === true) {
+				array_unshift ( self::$styles, $path );
+			} else {
+				self::$styles[] = $path;
+			}	
 		}
 	}
 
@@ -521,12 +526,17 @@ class OC_Util {
 	 *
 	 * @param string $application application id
 	 * @param string|null $file filename
+	 * @param bool $prepend prepend the Style to the beginning of the list
 	 * @return void
 	 */
-	public static function addVendorStyle($application, $file = null) {
+	public static function addVendorStyle($application, $file = null, $prepend = false) {
 		$path = OC_Util::generatePath($application, 'vendor', $file);
 		if (!in_array($path, self::$styles)) {
-			self::$styles[] = $path;
+			if ($prepend === true) {
+				array_unshift ( self::$styles, $path );
+			} else {
+				self::$styles[] = $path;
+			}	
 		}
 	}
 
-- 
GitLab


From db84791bb00b62aba0bab23b4998ee055e0a1cb2 Mon Sep 17 00:00:00 2001
From: Individual IT Services <info@individual-it.net>
Date: Fri, 25 Sep 2015 15:43:12 +0545
Subject: [PATCH 521/783] Todo for myself to eliminate double code

This will be in a new PR
---
 lib/private/util.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/private/util.php b/lib/private/util.php
index 9702f38a48f..a18fa1463f9 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -444,6 +444,7 @@ class OC_Util {
 	 */
 	public static function addScript($application, $file = null, $prepend = false) {
 		$path = OC_Util::generatePath($application, 'js', $file);
+		//TODO eliminate double code		
 		if (!in_array($path, self::$scripts)) {
 			// core js files need separate handling
 			if ($application !== 'core' && $file !== null) {
@@ -468,6 +469,7 @@ class OC_Util {
 	 */
 	public static function addVendorScript($application, $file = null, $prepend = false) {
 		$path = OC_Util::generatePath($application, 'vendor', $file);
+		//TODO eliminate double code		
 		if (! in_array ( $path, self::$scripts )) {
 			if ($prepend === true) {
 				array_unshift ( self::$scripts, $path );
@@ -493,6 +495,7 @@ class OC_Util {
 		} else {
 			$path = "l10n/$languageCode";
 		}
+		//TODO eliminate double code		
 		if (!in_array($path, self::$scripts)) {
 			if ($prepend === true) {
 				array_unshift ( self::$scripts, $path );
@@ -512,6 +515,7 @@ class OC_Util {
 	 */
 	public static function addStyle($application, $file = null, $prepend = false) {
 		$path = OC_Util::generatePath($application, 'css', $file);
+		//TODO eliminate double code		
 		if (!in_array($path, self::$styles)) {
 			if ($prepend === true) {
 				array_unshift ( self::$styles, $path );
@@ -531,6 +535,7 @@ class OC_Util {
 	 */
 	public static function addVendorStyle($application, $file = null, $prepend = false) {
 		$path = OC_Util::generatePath($application, 'vendor', $file);
+		//TODO eliminate double code
 		if (!in_array($path, self::$styles)) {
 			if ($prepend === true) {
 				array_unshift ( self::$styles, $path );
-- 
GitLab


From 9a373cb5bbe2cc56ba96f1a6dff298912f4d88e7 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 23 Sep 2015 10:27:35 +0200
Subject: [PATCH 522/783] Do not blindy copy expiration date on reshare

If a file/folder is reshared we should not blindly copy the expiration
date of the parent share. User/Group shares do not have expiration dates
currently, and thus this is always set to null.

Fixes #19119

* Added testcase
---
 lib/private/share/share.php |  1 -
 tests/lib/share/share.php   | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 07c7f31a853..32389f34868 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1998,7 +1998,6 @@ class Share extends Constants {
 			$suggestedItemTarget = $result['suggestedItemTarget'];
 			$suggestedFileTarget = $result['suggestedFileTarget'];
 			$filePath = $result['filePath'];
-			$expirationDate = $result['expirationDate'];
 		}
 
 		$isGroupShare = false;
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index ef0d9822085..58a76470afa 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -1567,6 +1567,43 @@ class Test_Share extends \Test\TestCase {
 		$this->setHttpHelper($oldHttpHelper);
 	}
 
+	/**
+	 * Test case for #19119
+	 */
+	public function testReshareWithLinkDefaultExpirationDate() {
+		$config = \OC::$server->getConfig();
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'yes');
+		$config->setAppValue('core', 'shareapi_expire_after_n_days', '2');
+
+		// Expiration date
+		$expireAt = time() + 2 * 24*60*60;
+		$date = new DateTime();
+		$date->setTimestamp($expireAt);
+		$date->setTime(0, 0, 0);
+
+		//Share a file from user 1 to user 2
+		$this->shareUserTestFileWithUser($this->user1, $this->user2);
+
+		//User 2 shares as link
+		OC_User::setUserId($this->user2);
+		$result = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, \OCP\Constants::PERMISSION_READ);
+		$this->assertTrue(is_string($result));
+
+		//Check if expire date is correct
+		$result = OCP\Share::getItemShared('test', 'test.txt');
+		$this->assertCount(1, $result);
+		$result = reset($result);
+		$this->assertNotEmpty($result['expiration']);
+		$expireDate = new DateTime($result['expiration']);
+		$this->assertEquals($date, $expireDate);
+
+		//Unshare
+		$this->assertTrue(OCP\Share::unshareAll('test', 'test.txt'));
+
+		//Reset config
+		$config->deleteAppValue('core', 'shareapi_default_expire_date');
+		$config->deleteAppValue('core', 'shareapi_expire_after_n_days');
+	}
 }
 
 class DummyShareClass extends \OC\Share\Share {
-- 
GitLab


From ab69a226065d576120d629f857464633fb5d17d9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 25 Sep 2015 13:17:23 +0200
Subject: [PATCH 523/783] Deduplicate constant

---
 lib/private/systemconfig.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/private/systemconfig.php b/lib/private/systemconfig.php
index 3b7930f2842..94b815aebd7 100644
--- a/lib/private/systemconfig.php
+++ b/lib/private/systemconfig.php
@@ -22,6 +22,9 @@
 
 namespace OC;
 
+
+use OCP\IConfig;
+
 /**
  * Class which provides access to the system config values stored in config.php
  * Internal class for bootstrap only.
@@ -41,8 +44,6 @@ class SystemConfig {
 		'objectstore' => ['arguments' => ['password' => true]],
 	];
 
-	const SENSITIVE_VALUE = '***REMOVED SENSITIVE VALUE***';
-
 	/**
 	 * Lists all available config keys
 	 * @return array an array of key names
@@ -115,7 +116,7 @@ class SystemConfig {
 	 */
 	protected function removeSensitiveValue($keysToRemove, $value) {
 		if ($keysToRemove === true) {
-			return self::SENSITIVE_VALUE;
+			return IConfig::SENSITIVE_VALUE;
 		}
 
 		if (is_array($value)) {
-- 
GitLab


From f6cd7362cdd738b273f71b6e72156391f9a80361 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 25 Sep 2015 06:24:08 +0200
Subject: [PATCH 524/783] Save the settings in the user management page

Store the setting in the user managerment page (e.g. show e-mail
address).

Fixes #12727
---
 settings/js/users/users.js        | 29 +++++++++++++++++++++++++++++
 settings/templates/users/main.php | 15 ++++++++++-----
 settings/users.php                |  7 +++++++
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 5b12366ad40..47d63c11b95 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -813,44 +813,73 @@ $(document).ready(function () {
 			});
 	});
 
+	if ($('#CheckboxStorageLocation').is(':checked')) {
+		$("#userlist .storageLocation").show();
+	}
 	// Option to display/hide the "Storage location" column
 	$('#CheckboxStorageLocation').click(function() {
 		if ($('#CheckboxStorageLocation').is(':checked')) {
 			$("#userlist .storageLocation").show();
+			OC.AppConfig.setValue('core', 'umgmt_show_storage_location', 'true');
 		} else {
 			$("#userlist .storageLocation").hide();
+			OC.AppConfig.setValue('core', 'umgmt_show_storage_location', 'false');
 		}
 	});
+
+	if ($('#CheckboxLastLogin').is(':checked')) {
+		$("#userlist .lastLogin").show();
+	}
 	// Option to display/hide the "Last Login" column
 	$('#CheckboxLastLogin').click(function() {
 		if ($('#CheckboxLastLogin').is(':checked')) {
 			$("#userlist .lastLogin").show();
+			OC.AppConfig.setValue('core', 'umgmt_show_last_login', 'true');
 		} else {
 			$("#userlist .lastLogin").hide();
+			OC.AppConfig.setValue('core', 'umgmt_show_last_login', 'false');
 		}
 	});
+
+	if ($('#CheckboxEmailAddress').is(':checked')) {
+		$("#userlist .mailAddress").show();
+	}
 	// Option to display/hide the "Mail Address" column
 	$('#CheckboxEmailAddress').click(function() {
 		if ($('#CheckboxEmailAddress').is(':checked')) {
 			$("#userlist .mailAddress").show();
+			OC.AppConfig.setValue('core', 'umgmt_show_email', 'true');
 		} else {
 			$("#userlist .mailAddress").hide();
+			OC.AppConfig.setValue('core', 'umgmt_show_email', 'false');
 		}
 	});
+
+	if ($('#CheckboxUserBackend').is(':checked')) {
+		$("#userlist .userBackend").show();
+	}
 	// Option to display/hide the "User Backend" column
 	$('#CheckboxUserBackend').click(function() {
 		if ($('#CheckboxUserBackend').is(':checked')) {
 			$("#userlist .userBackend").show();
+			OC.AppConfig.setValue('core', 'umgmt_show_backend', 'true');
 		} else {
 			$("#userlist .userBackend").hide();
+			OC.AppConfig.setValue('core', 'umgmt_show_backend', 'false');
 		}
 	});
+
+	if ($('#CheckboxMailOnUserCreate').is(':checked')) {
+		$("#newemail").show();
+	}
 	// Option to display/hide the "E-Mail" input field
 	$('#CheckboxMailOnUserCreate').click(function() {
 		if ($('#CheckboxMailOnUserCreate').is(':checked')) {
 			$("#newemail").show();
+			OC.AppConfig.setValue('core', 'umgmt_send_email', 'true');
 		} else {
 			$("#newemail").hide();
+			OC.AppConfig.setValue('core', 'umgmt_send_email', 'false');
 		}
 	});
 
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
index 73552f8ad2e..0abe31f4a59 100644
--- a/settings/templates/users/main.php
+++ b/settings/templates/users/main.php
@@ -45,31 +45,36 @@ translation('settings');
 
 			<div id="userlistoptions">
 				<p>
-					<input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation">
+					<input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation" 
+						<?php if ($_['show_storage_location'] === 'true') print_unescaped('checked="checked"'); ?> />
 					<label for="CheckboxStorageLocation">
 						<?php p($l->t('Show storage location')) ?>
 					</label>
 				</p>
 				<p>
-					<input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin">
+					<input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin"
+						<?php if ($_['show_last_login'] === 'true') print_unescaped('checked="checked"'); ?> />
 					<label for="CheckboxLastLogin">
 						<?php p($l->t('Show last log in')) ?>
 					</label>
 				</p>
 				<p>
-					<input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend">
+					<input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend"
+						<?php if ($_['show_backend'] === 'true') print_unescaped('checked="checked"'); ?> />
 					<label for="CheckboxUserBackend">
 						<?php p($l->t('Show user backend')) ?>
 					</label>
 				</p>
 				<p>
-					<input type="checkbox" name="MailOnUserCreate" value="MailOnUserCreate" id="CheckboxMailOnUserCreate">
+					<input type="checkbox" name="MailOnUserCreate" value="MailOnUserCreate" id="CheckboxMailOnUserCreate"
+						<?php if ($_['send_email'] === 'true') print_unescaped('checked="checked"'); ?> />
 					<label for="CheckboxMailOnUserCreate">
 						<?php p($l->t('Send email to new user')) ?>
 					</label>
 				</p>
 				<p>
-					<input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress">
+					<input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress"
+						<?php if ($_['show_email'] === 'true') print_unescaped('checked="checked"'); ?> />
 					<label for="CheckboxEmailAddress">
 						<?php p($l->t('Show email address')) ?>
 					</label>
diff --git a/settings/users.php b/settings/users.php
index 843995a57f9..e0ef56f15c5 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -99,4 +99,11 @@ $tmpl->assign('default_quota', $defaultQuota);
 $tmpl->assign('defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
 $tmpl->assign('recoveryAdminEnabled', $recoveryAdminEnabled);
 $tmpl->assign('enableAvatars', \OC::$server->getConfig()->getSystemValue('enable_avatars', true));
+
+$tmpl->assign('show_storage_location', $config->getAppValue('core', 'umgmt_show_storage_location', 'false'));
+$tmpl->assign('show_last_login', $config->getAppValue('core', 'umgmt_show_last_login', 'false'));
+$tmpl->assign('show_email', $config->getAppValue('core', 'umgmt_show_email', 'false'));
+$tmpl->assign('show_backend', $config->getAppValue('core', 'umgmt_show_backend', 'false'));
+$tmpl->assign('send_email', $config->getAppValue('core', 'umgmt_send_email', 'false'));
+
 $tmpl->printPage();
-- 
GitLab


From b2a528e3039386357929e7fc7889319b9e63d2ee Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 25 Sep 2015 14:16:50 +0200
Subject: [PATCH 525/783] remove warning when trying to get a lock while in
 transaction

---
 lib/private/lock/dblockingprovider.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php
index a08357a6024..8f017a713c1 100644
--- a/lib/private/lock/dblockingprovider.php
+++ b/lib/private/lock/dblockingprovider.php
@@ -102,10 +102,6 @@ class DBLockingProvider extends AbstractLockingProvider {
 	 * @throws \OCP\Lock\LockedException
 	 */
 	public function acquireLock($path, $type) {
-		if ($this->connection->inTransaction()) {
-			$this->logger->warning("Trying to acquire a lock for '$path' while inside a transition");
-		}
-
 		$expire = $this->getExpireTime();
 		if ($type === self::LOCK_SHARED) {
 			$result = $this->initLockField($path,1);
-- 
GitLab


From 60b87048c1f5bc51c194fe7f6b0f2075c6feb11a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 25 Sep 2015 09:17:51 +0200
Subject: [PATCH 526/783] Add doc to config.sample for enforce LDAP home folder
 naming rule

* ref #16891
---
 config/config.sample.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/config/config.sample.php b/config/config.sample.php
index 51529cdb0cc..e0c486d75c1 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -806,6 +806,21 @@ $CONFIG = array(
  */
 'ldapUserCleanupInterval' => 51,
 
+/**
+ * Enforce the existence of the home folder naming rule for all users
+ *
+ * Following scenario:
+ *  * a home folder naming rule is set in LDAP advanced settings
+ *  * a user doesn't have the home folder naming rule attribute set
+ *
+ * If this is set to **true** (default) it will NOT fallback to the core's
+ * default naming rule of using the internal user ID as home folder name.
+ *
+ * If this is set to **false** it will fallback for the users without the
+ * attribute set to naming the home folder like the internal user ID.
+ *
+ */
+'enforce_home_folder_naming_rule' => true,
 
 /**
  * Maintenance
-- 
GitLab


From db0217362783b4cdd51122e34b1e39c4ff79e09a Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 25 Sep 2015 11:24:23 +0200
Subject: [PATCH 527/783] Reflect enabled shareAPI in capabilities

If the shareAPI is disabled we not return the other sharing
capabilities.

This allows clients to properly check if sharing is even available.
---
 apps/files_sharing/lib/capabilities.php   | 42 ++++++++++++++---------
 apps/files_sharing/tests/capabilities.php | 37 ++++++++++++++++++++
 2 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/apps/files_sharing/lib/capabilities.php b/apps/files_sharing/lib/capabilities.php
index b24eb8d61f0..c8ba1273281 100644
--- a/apps/files_sharing/lib/capabilities.php
+++ b/apps/files_sharing/lib/capabilities.php
@@ -45,28 +45,36 @@ class Capabilities implements ICapability {
 	public function getCapabilities() {
 		$res = [];
 
-		$public = [];
-		$public['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes';
-		if ($public['enabled']) {
-			$public['password'] = [];
-			$public['password']['enforced'] = ($this->config->getAppValue('core', 'shareapi_enforce_links_password', 'no') === 'yes');
+		if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+			$res['api_enabled'] = false;
+			$res['public'] = ['enabled' => false];
+			$res['user'] = ['send_mail' => false];
+			$res['resharing'] = false;
+		} else {
+			$res['api_enabled'] = true;
 
-			$public['expire_date'] = [];
-			$public['expire_date']['enabled'] = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
-			if ($public['expire_date']['enabled']) {
-				$public['expire_date']['days'] = $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
-				$public['expire_date']['enforced'] = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
-			}
+			$public = [];
+			$public['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes';
+			if ($public['enabled']) {
+				$public['password'] = [];
+				$public['password']['enforced'] = ($this->config->getAppValue('core', 'shareapi_enforce_links_password', 'no') === 'yes');
 
-			$public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
-			$public['upload'] = $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
-		}
-		$res["public"] = $public;
+				$public['expire_date'] = [];
+				$public['expire_date']['enabled'] = $this->config->getAppValue('core', 'shareapi_default_expire_date', 'no') === 'yes';
+				if ($public['expire_date']['enabled']) {
+					$public['expire_date']['days'] = $this->config->getAppValue('core', 'shareapi_expire_after_n_days', '7');
+					$public['expire_date']['enforced'] = $this->config->getAppValue('core', 'shareapi_enforce_expire_date', 'no') === 'yes';
+				}
 
-		$res['user']['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no') === 'yes';
+				$public['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_public_notification', 'no') === 'yes';
+				$public['upload'] = $this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes';
+			}
+			$res["public"] = $public;
 
-		$res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';
+			$res['user']['send_mail'] = $this->config->getAppValue('core', 'shareapi_allow_mail_notification', 'no') === 'yes';
 
+			$res['resharing'] = $this->config->getAppValue('core', 'shareapi_allow_resharing', 'yes') === 'yes';
+		}
 
 		//Federated sharing
 		$res['federation'] = [
diff --git a/apps/files_sharing/tests/capabilities.php b/apps/files_sharing/tests/capabilities.php
index f1a9626db9b..cff7bdf1fe8 100644
--- a/apps/files_sharing/tests/capabilities.php
+++ b/apps/files_sharing/tests/capabilities.php
@@ -56,8 +56,31 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 		return $result;
 	}
 
+	public function testEnabledSharingAPI() {
+		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
+		];
+		$result = $this->getResults($map);
+		$this->assertTrue($result['api_enabled']);
+		$this->assertContains('public', $result);
+		$this->assertContains('user', $result);
+		$this->assertContains('resharing', $result);
+	}
+
+	public function testDisabledSharingAPI() {
+		$map = [
+			['core', 'shareapi_enabled', 'yes', 'no'],
+		];
+		$result = $this->getResults($map);
+		$this->assertFalse($result['api_enabled']);
+		$this->assertNotContains('public', $result);
+		$this->assertNotContains('user', $result);
+		$this->assertNotContains('resharing', $result);
+	}
+
 	public function testNoLinkSharing() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'no'],
 		];
 		$result = $this->getResults($map);
@@ -67,6 +90,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testOnlyLinkSharing() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 		];
 		$result = $this->getResults($map);
@@ -76,6 +100,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testLinkPassword() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 			['core', 'shareapi_enforce_links_password', 'no', 'yes'],
 		];
@@ -87,6 +112,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testLinkNoPassword() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 			['core', 'shareapi_enforce_links_password', 'no', 'no'],
 		];
@@ -98,6 +124,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testLinkNoExpireDate() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 			['core', 'shareapi_default_expire_date', 'no', 'no'],
 		];
@@ -109,6 +136,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testLinkExpireDate() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 			['core', 'shareapi_default_expire_date', 'no', 'yes'],
 			['core', 'shareapi_expire_after_n_days', '7', '7'],
@@ -124,6 +152,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testLinkExpireDateEnforced() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 			['core', 'shareapi_default_expire_date', 'no', 'yes'],
 			['core', 'shareapi_enforce_expire_date', 'no', 'yes'],
@@ -136,6 +165,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testLinkSendMail() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 			['core', 'shareapi_allow_public_notification', 'no', 'yes'],
 		];
@@ -145,6 +175,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testLinkNoSendMail() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 			['core', 'shareapi_allow_public_notification', 'no', 'no'],
 		];
@@ -154,6 +185,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testUserSendMail() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_mail_notification', 'no', 'yes'],
 		];
 		$result = $this->getResults($map);
@@ -162,6 +194,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testUserNoSendMail() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_mail_notification', 'no', 'no'],
 		];
 		$result = $this->getResults($map);
@@ -170,6 +203,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testResharing() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_resharing', 'yes', 'yes'],
 		];
 		$result = $this->getResults($map);
@@ -178,6 +212,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testNoResharing() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_resharing', 'yes', 'no'],
 		];
 		$result = $this->getResults($map);
@@ -186,6 +221,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testLinkPublicUpload() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 			['core', 'shareapi_allow_public_upload', 'yes', 'yes'],
 		];
@@ -195,6 +231,7 @@ class FilesSharingCapabilitiesTest extends \Test\TestCase {
 
 	public function testLinkNoPublicUpload() {
 		$map = [
+			['core', 'shareapi_enabled', 'yes', 'yes'],
 			['core', 'shareapi_allow_links', 'yes', 'yes'],
 			['core', 'shareapi_allow_public_upload', 'yes', 'no'],
 		];
-- 
GitLab


From 0ae931ed57ce8daa9df9129e95c2cd9524bae830 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Fri, 25 Sep 2015 12:11:50 +0200
Subject: [PATCH 528/783] fix sidebar spinner

---
 apps/files_sharing/css/sharetabview.css | 6 +++++-
 core/js/sharedialogshareelistview.js    | 8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index fe7a1947502..1745eba5846 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -73,5 +73,9 @@
 }
 
 .shareTabView .icon-loading-small {
-	margin-left: -30px;
+	position: absolute;
+	display: inline-block;
+	z-index: 1;
+	background-color: white;
+	padding: 2px;
 }
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index d2c45bb08b1..8c1934ff264 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -21,7 +21,7 @@
 			'    {{/if}}' +
 			'    {{#unless isCollection}}' +
 			'    <li data-share-type="{{shareType}}" data-share-with="{{shareWith}}" title="{{shareWith}}">' +
-			'        <a href="#" class="unshare"><img class="svg" alt="{{unshareLabel}}" title="{{unshareLabel}}" src="{{unshareImage}}" /></a>' +
+			'        <a href="#" class="unshare"><span class="icon-loading-small hidden"></span><img class="svg" alt="{{unshareLabel}}" title="{{unshareLabel}}" src="{{unshareImage}}" /></a>' +
 			'        {{#if avatarEnabled}}' +
 			'        <div class="avatar {{#if modSeed}}imageplaceholderseed{{/if}}" data-username="{{shareWith}}" {{#if modSeed}}data-seed="{{shareWith}} {{shareType}}"{{/if}}></div>' +
 			'        {{/if}}' +
@@ -244,12 +244,14 @@
 
 		onUnshare: function(event) {
 			var $element = $(event.target);
+			console.log($element);
 
-			if($element.hasClass('icon-loading-small')) {
+			var $loading = $element.siblings('.icon-loading-small').eq(0);
+			if(!$loading.hasClass('hidden')) {
 				// in process
 				return;
 			}
-			$element.empty().addClass('icon-loading-small');
+			$loading.removeClass('hidden');
 
 			var $li = $element.closest('li');
 			var shareType = $li.data('share-type');
-- 
GitLab


From 46475b81147633060cd24f026d54eee77aa559d2 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Sun, 27 Sep 2015 12:46:25 +0200
Subject: [PATCH 529/783] Switch from Math.floor() to Math.ceil() when sending
 the dimension to Preview Fixes #18203

---
 apps/files/js/filelist.js       | 4 ++--
 apps/files_sharing/js/public.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index ad3dce19778..8eaae74d3c3 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1393,8 +1393,8 @@
 			}
 			urlSpec.x *= window.devicePixelRatio;
 			urlSpec.y *= window.devicePixelRatio;
-			urlSpec.x = Math.floor(urlSpec.x);
-			urlSpec.y = Math.floor(urlSpec.y);
+			urlSpec.x = Math.ceil(urlSpec.x);
+			urlSpec.y = Math.ceil(urlSpec.y);
 			urlSpec.forceIcon = 0;
 			return OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
 		},
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 4908968a937..6a6095317af 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -90,8 +90,8 @@ OCA.Sharing.PublicApp = {
 		// dynamically load image previews
 		var token = $('#sharingToken').val();
 		var bottomMargin = 350;
-		var previewWidth = Math.floor($(window).width() * window.devicePixelRatio);
-		var previewHeight = Math.floor(($(window).height() - bottomMargin) * window.devicePixelRatio);
+		var previewWidth = Math.ceil($(window).width() * window.devicePixelRatio);
+		var previewHeight = Math.ceil(($(window).height() - bottomMargin) * window.devicePixelRatio);
 		previewHeight = Math.max(200, previewHeight);
 		var params = {
 			x: previewWidth,
@@ -168,8 +168,8 @@ OCA.Sharing.PublicApp = {
 				}
 				urlSpec.x *= window.devicePixelRatio;
 				urlSpec.y *= window.devicePixelRatio;
-				urlSpec.x = Math.floor(urlSpec.x);
-				urlSpec.y = Math.floor(urlSpec.y);
+				urlSpec.x = Math.ceil(urlSpec.x);
+				urlSpec.y = Math.ceil(urlSpec.y);
 				urlSpec.t = $('#dirToken').val();
 				return OC.generateUrl('/apps/files_sharing/ajax/publicpreview.php?') + $.param(urlSpec);
 			};
-- 
GitLab


From ff4227bbfc54709a209885bfb78054c60fdb519c Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Sun, 27 Sep 2015 13:03:31 +0200
Subject: [PATCH 530/783] Use a universal shebang Fixes #15037

---
 apps/files_external/tests/env/start-amazons3-ceph.sh   | 2 +-
 apps/files_external/tests/env/start-ftp-morrisjobke.sh | 2 +-
 apps/files_external/tests/env/start-sftp-atmoz.sh      | 2 +-
 apps/files_external/tests/env/start-smb-silvershell.sh | 2 +-
 apps/files_external/tests/env/start-smb-windows.sh     | 2 +-
 apps/files_external/tests/env/start-webdav-ownCloud.sh | 2 +-
 apps/files_external/tests/env/stop-amazons3-ceph.sh    | 2 +-
 apps/files_external/tests/env/stop-ftp-morrisjobke.sh  | 2 +-
 apps/files_external/tests/env/stop-sftp-atmoz.sh       | 2 +-
 apps/files_external/tests/env/stop-smb-silvershell.sh  | 2 +-
 apps/files_external/tests/env/stop-smb-windows.sh      | 2 +-
 apps/files_external/tests/env/stop-webdav-ownCloud.sh  | 2 +-
 autotest-external.sh                                   | 2 +-
 autotest-js.sh                                         | 2 +-
 autotest.sh                                            | 2 +-
 buildjsdocs.sh                                         | 2 +-
 core/img/image-optimization.sh                         | 2 +-
 l10n/rm-old.sh                                         | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/files_external/tests/env/start-amazons3-ceph.sh b/apps/files_external/tests/env/start-amazons3-ceph.sh
index 5f274f10ca2..ad0fedba989 100755
--- a/apps/files_external/tests/env/start-amazons3-ceph.sh
+++ b/apps/files_external/tests/env/start-amazons3-ceph.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/start-ftp-morrisjobke.sh b/apps/files_external/tests/env/start-ftp-morrisjobke.sh
index a082e6195fb..14112d7f803 100755
--- a/apps/files_external/tests/env/start-ftp-morrisjobke.sh
+++ b/apps/files_external/tests/env/start-ftp-morrisjobke.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/start-sftp-atmoz.sh b/apps/files_external/tests/env/start-sftp-atmoz.sh
index 04b829add59..91eb5747c54 100755
--- a/apps/files_external/tests/env/start-sftp-atmoz.sh
+++ b/apps/files_external/tests/env/start-sftp-atmoz.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/start-smb-silvershell.sh b/apps/files_external/tests/env/start-smb-silvershell.sh
index afada44d4f7..c45807cc4c8 100755
--- a/apps/files_external/tests/env/start-smb-silvershell.sh
+++ b/apps/files_external/tests/env/start-smb-silvershell.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/start-smb-windows.sh b/apps/files_external/tests/env/start-smb-windows.sh
index a5a19ff1bcf..2143d7e7499 100755
--- a/apps/files_external/tests/env/start-smb-windows.sh
+++ b/apps/files_external/tests/env/start-smb-windows.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/start-webdav-ownCloud.sh b/apps/files_external/tests/env/start-webdav-ownCloud.sh
index d6b36c8d90c..6bf9142ee53 100755
--- a/apps/files_external/tests/env/start-webdav-ownCloud.sh
+++ b/apps/files_external/tests/env/start-webdav-ownCloud.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-amazons3-ceph.sh b/apps/files_external/tests/env/stop-amazons3-ceph.sh
index 01b39b4c680..3f56a6f1e5d 100755
--- a/apps/files_external/tests/env/stop-amazons3-ceph.sh
+++ b/apps/files_external/tests/env/stop-amazons3-ceph.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-ftp-morrisjobke.sh b/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
index 899b9a53971..e30ec2e594a 100755
--- a/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
+++ b/apps/files_external/tests/env/stop-ftp-morrisjobke.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-sftp-atmoz.sh b/apps/files_external/tests/env/stop-sftp-atmoz.sh
index 64570cfd68d..0c2fd0b5bc6 100755
--- a/apps/files_external/tests/env/stop-sftp-atmoz.sh
+++ b/apps/files_external/tests/env/stop-sftp-atmoz.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-smb-silvershell.sh b/apps/files_external/tests/env/stop-smb-silvershell.sh
index aae954284e9..40147b89106 100755
--- a/apps/files_external/tests/env/stop-smb-silvershell.sh
+++ b/apps/files_external/tests/env/stop-smb-silvershell.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-smb-windows.sh b/apps/files_external/tests/env/stop-smb-windows.sh
index 4f89451ce11..39c49e2c505 100755
--- a/apps/files_external/tests/env/stop-smb-windows.sh
+++ b/apps/files_external/tests/env/stop-smb-windows.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/apps/files_external/tests/env/stop-webdav-ownCloud.sh b/apps/files_external/tests/env/stop-webdav-ownCloud.sh
index c87760a1052..8eaf1ba754f 100755
--- a/apps/files_external/tests/env/stop-webdav-ownCloud.sh
+++ b/apps/files_external/tests/env/stop-webdav-ownCloud.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/autotest-external.sh b/autotest-external.sh
index cb5a3dad503..b738669b48c 100755
--- a/autotest-external.sh
+++ b/autotest-external.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/autotest-js.sh b/autotest-js.sh
index 99cc09f9085..2d8552811cf 100755
--- a/autotest-js.sh
+++ b/autotest-js.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/autotest.sh b/autotest.sh
index cd36193cf6c..f69a9b34a48 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/buildjsdocs.sh b/buildjsdocs.sh
index ef18dc8c9a9..90562558f66 100755
--- a/buildjsdocs.sh
+++ b/buildjsdocs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # ownCloud
 #
diff --git a/core/img/image-optimization.sh b/core/img/image-optimization.sh
index e6374c419b2..3fad080dc79 100755
--- a/core/img/image-optimization.sh
+++ b/core/img/image-optimization.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function recursive_optimize_images() {
 cd $1;
diff --git a/l10n/rm-old.sh b/l10n/rm-old.sh
index 30e4509db25..e5e1348014b 100644
--- a/l10n/rm-old.sh
+++ b/l10n/rm-old.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 lang=(ach ady af_ZA ak am_ET ar ast az bal be bg_BG bn_BD bn_IN bs ca cs_CZ cy_GB da de de_AT de_DE el en_GB en@pirate eo es es_AR es_CL es_MX et_EE eu fa fi_FI fil fr fy_NL gl gu he hi hr hu_HU hy ia id io is it ja jv ka_GE km kn ko ku_IQ la lb lo lt_LT lv mg mk ml ml_IN mn mr ms_MY mt_MT my_MM nb_NO nds ne nl nn_NO nqo oc or_IN pa pl pt_BR pt_PT ro ru si_LK sk_SK sl sq sr sr@latin su sv sw_KE ta_IN ta_LK te tg_TJ th_TH tl_PH tr tzl tzm ug uk ur_PK uz vi yo zh_CN zh_HK zh_TW)
 
-- 
GitLab


From 2a0a928fc82eb7c6500636949b6dd71ee6b85ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 28 Sep 2015 08:48:23 +0200
Subject: [PATCH 531/783] Remove webdavauth from tranisfex

---
 l10n/.tx/config | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/l10n/.tx/config b/l10n/.tx/config
index 875e1324dbc..a91a236641e 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -62,9 +62,3 @@ source_file = templates/user_ldap.pot
 source_lang = en
 type = PO
 
-[owncloud.user_webdavauth]
-file_filter = <lang>/user_webdavauth.po
-source_file = templates/user_webdavauth.pot
-source_lang = en
-type = PO
-
-- 
GitLab


From c7f7747b4874bab2b25c1cb554aaa7b7bf6f00d2 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 25 Sep 2015 09:21:51 +1200
Subject: [PATCH 532/783] remove border around button of password protected
 link confirmation

---
 apps/files_sharing/css/authenticate.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/css/authenticate.css b/apps/files_sharing/css/authenticate.css
index ac76d4c6870..43707c76100 100644
--- a/apps/files_sharing/css/authenticate.css
+++ b/apps/files_sharing/css/authenticate.css
@@ -11,7 +11,8 @@ input[type='submit'] {
 
 #body-login input[type='submit'] {
 	position: absolute;
-	top: 0px;
+	top: 0;
+	border: none;
 }
 
 fieldset > p {
-- 
GitLab


From b50d1aae5647795781d4965e52a6154c53e87860 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 25 Sep 2015 16:00:36 +0200
Subject: [PATCH 533/783] rename config test to prevent autoloader issue

---
 tests/lib/{config.php => configtests.php} | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename tests/lib/{config.php => configtests.php} (97%)

diff --git a/tests/lib/config.php b/tests/lib/configtests.php
similarity index 97%
rename from tests/lib/config.php
rename to tests/lib/configtests.php
index 91154579ab5..0269ae542f4 100644
--- a/tests/lib/config.php
+++ b/tests/lib/configtests.php
@@ -6,7 +6,9 @@
  * See the COPYING-README file.
  */
 
-class Test_Config extends \Test\TestCase {
+namespace Test;
+
+class ConfigTests extends TestCase {
 	const TESTCONTENT = '<?php $CONFIG=array("foo"=>"bar", "beers" => array("Appenzeller", "Guinness", "Kölsch"), "alcohol_free" => false);';
 
 	/** @var array */
@@ -24,7 +26,7 @@ class Test_Config extends \Test\TestCase {
 		$this->randomTmpDir = \OC_Helper::tmpFolder();
 		$this->configFile = $this->randomTmpDir.'testconfig.php';
 		file_put_contents($this->configFile, self::TESTCONTENT);
-		$this->config = new OC\Config($this->randomTmpDir, 'testconfig.php');
+		$this->config = new \OC\Config($this->randomTmpDir, 'testconfig.php');
 	}
 
 	protected function tearDown() {
-- 
GitLab


From 60f123193ba4fcd4dc26d628e9688aee6ffe1e12 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 28 Sep 2015 05:07:18 -0400
Subject: [PATCH 534/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/ca.js             |   2 +
 apps/encryption/l10n/ca.json           |   2 +
 apps/encryption/l10n/es.js             |   4 +-
 apps/encryption/l10n/es.json           |   4 +-
 apps/encryption/l10n/uk.js             |   1 +
 apps/encryption/l10n/uk.json           |   1 +
 apps/files/l10n/ar.js                  |   4 +-
 apps/files/l10n/ar.json                |   4 +-
 apps/files/l10n/ast.js                 |   4 +-
 apps/files/l10n/ast.json               |   4 +-
 apps/files/l10n/az.js                  |   4 +-
 apps/files/l10n/az.json                |   4 +-
 apps/files/l10n/bg_BG.js               |   4 +-
 apps/files/l10n/bg_BG.json             |   4 +-
 apps/files/l10n/bn_BD.js               |   4 +-
 apps/files/l10n/bn_BD.json             |   4 +-
 apps/files/l10n/bn_IN.js               |   5 +-
 apps/files/l10n/bn_IN.json             |   5 +-
 apps/files/l10n/bs.js                  |   3 +-
 apps/files/l10n/bs.json                |   3 +-
 apps/files/l10n/ca.js                  |   4 +-
 apps/files/l10n/ca.json                |   4 +-
 apps/files/l10n/cs_CZ.js               |   4 +-
 apps/files/l10n/cs_CZ.json             |   4 +-
 apps/files/l10n/cy_GB.js               |   4 +-
 apps/files/l10n/cy_GB.json             |   4 +-
 apps/files/l10n/da.js                  |   4 +-
 apps/files/l10n/da.json                |   4 +-
 apps/files/l10n/de.js                  |   4 +-
 apps/files/l10n/de.json                |   4 +-
 apps/files/l10n/de_AT.js               |   5 +-
 apps/files/l10n/de_AT.json             |   5 +-
 apps/files/l10n/de_DE.js               |   4 +-
 apps/files/l10n/de_DE.json             |   4 +-
 apps/files/l10n/el.js                  |   4 +-
 apps/files/l10n/el.json                |   4 +-
 apps/files/l10n/en_GB.js               |   4 +-
 apps/files/l10n/en_GB.json             |   4 +-
 apps/files/l10n/eo.js                  |   4 +-
 apps/files/l10n/eo.json                |   4 +-
 apps/files/l10n/es.js                  |   4 +-
 apps/files/l10n/es.json                |   4 +-
 apps/files/l10n/es_AR.js               |   4 +-
 apps/files/l10n/es_AR.json             |   4 +-
 apps/files/l10n/es_CL.js               |   2 +
 apps/files/l10n/es_CL.json             |   2 +
 apps/files/l10n/es_MX.js               |   4 +-
 apps/files/l10n/es_MX.json             |   4 +-
 apps/files/l10n/et_EE.js               |   4 +-
 apps/files/l10n/et_EE.json             |   4 +-
 apps/files/l10n/eu.js                  |   4 +-
 apps/files/l10n/eu.json                |   4 +-
 apps/files/l10n/fa.js                  |   4 +-
 apps/files/l10n/fa.json                |   4 +-
 apps/files/l10n/fi_FI.js               |   4 +-
 apps/files/l10n/fi_FI.json             |   4 +-
 apps/files/l10n/fr.js                  |   4 +-
 apps/files/l10n/fr.json                |   4 +-
 apps/files/l10n/gl.js                  |   4 +-
 apps/files/l10n/gl.json                |   4 +-
 apps/files/l10n/he.js                  |   4 +-
 apps/files/l10n/he.json                |   4 +-
 apps/files/l10n/hi.js                  |   1 +
 apps/files/l10n/hi.json                |   1 +
 apps/files/l10n/hr.js                  |   4 +-
 apps/files/l10n/hr.json                |   4 +-
 apps/files/l10n/hu_HU.js               |   6 +-
 apps/files/l10n/hu_HU.json             |   6 +-
 apps/files/l10n/hy.js                  |   4 +-
 apps/files/l10n/hy.json                |   4 +-
 apps/files/l10n/ia.js                  |   2 +-
 apps/files/l10n/ia.json                |   2 +-
 apps/files/l10n/id.js                  |   4 +-
 apps/files/l10n/id.json                |   4 +-
 apps/files/l10n/is.js                  |   3 +-
 apps/files/l10n/is.json                |   3 +-
 apps/files/l10n/it.js                  |   4 +-
 apps/files/l10n/it.json                |   4 +-
 apps/files/l10n/ja.js                  |   4 +-
 apps/files/l10n/ja.json                |   4 +-
 apps/files/l10n/ka_GE.js               |   4 +-
 apps/files/l10n/ka_GE.json             |   4 +-
 apps/files/l10n/km.js                  |   4 +-
 apps/files/l10n/km.json                |   4 +-
 apps/files/l10n/kn.js                  |   3 +-
 apps/files/l10n/kn.json                |   3 +-
 apps/files/l10n/ko.js                  |   4 +-
 apps/files/l10n/ko.json                |   4 +-
 apps/files/l10n/lb.js                  |   4 +-
 apps/files/l10n/lb.json                |   4 +-
 apps/files/l10n/lt_LT.js               |   4 +-
 apps/files/l10n/lt_LT.json             |   4 +-
 apps/files/l10n/lv.js                  |   4 +-
 apps/files/l10n/lv.json                |   4 +-
 apps/files/l10n/mk.js                  |   4 +-
 apps/files/l10n/mk.json                |   4 +-
 apps/files/l10n/ms_MY.js               |   3 +-
 apps/files/l10n/ms_MY.json             |   3 +-
 apps/files/l10n/nb_NO.js               |   4 +-
 apps/files/l10n/nb_NO.json             |   4 +-
 apps/files/l10n/nl.js                  |   4 +-
 apps/files/l10n/nl.json                |   4 +-
 apps/files/l10n/nn_NO.js               |   4 +-
 apps/files/l10n/nn_NO.json             |   4 +-
 apps/files/l10n/oc.js                  |   3 +-
 apps/files/l10n/oc.json                |   3 +-
 apps/files/l10n/pa.js                  |   6 +-
 apps/files/l10n/pa.json                |   6 +-
 apps/files/l10n/pl.js                  |   4 +-
 apps/files/l10n/pl.json                |   4 +-
 apps/files/l10n/pt_BR.js               |   4 +-
 apps/files/l10n/pt_BR.json             |   4 +-
 apps/files/l10n/pt_PT.js               |   4 +-
 apps/files/l10n/pt_PT.json             |   4 +-
 apps/files/l10n/ro.js                  |   4 +-
 apps/files/l10n/ro.json                |   4 +-
 apps/files/l10n/ru.js                  |   4 +-
 apps/files/l10n/ru.json                |   4 +-
 apps/files/l10n/si_LK.js               |   3 +-
 apps/files/l10n/si_LK.json             |   3 +-
 apps/files/l10n/sk_SK.js               |  14 ++-
 apps/files/l10n/sk_SK.json             |  14 ++-
 apps/files/l10n/sl.js                  |   4 +-
 apps/files/l10n/sl.json                |   4 +-
 apps/files/l10n/sq.js                  |   3 +-
 apps/files/l10n/sq.json                |   3 +-
 apps/files/l10n/sr.js                  |   4 +-
 apps/files/l10n/sr.json                |   4 +-
 apps/files/l10n/sr@latin.js            |   4 +-
 apps/files/l10n/sr@latin.json          |   4 +-
 apps/files/l10n/sv.js                  |   4 +-
 apps/files/l10n/sv.json                |   4 +-
 apps/files/l10n/ta_IN.js               |   1 +
 apps/files/l10n/ta_IN.json             |   1 +
 apps/files/l10n/ta_LK.js               |   4 +-
 apps/files/l10n/ta_LK.json             |   4 +-
 apps/files/l10n/te.js                  |   4 +-
 apps/files/l10n/te.json                |   4 +-
 apps/files/l10n/th_TH.js               |   4 +-
 apps/files/l10n/th_TH.json             |   4 +-
 apps/files/l10n/tr.js                  |   4 +-
 apps/files/l10n/tr.json                |   4 +-
 apps/files/l10n/ug.js                  |   3 +-
 apps/files/l10n/ug.json                |   3 +-
 apps/files/l10n/uk.js                  |   4 +-
 apps/files/l10n/uk.json                |   4 +-
 apps/files/l10n/ur_PK.js               |   4 +-
 apps/files/l10n/ur_PK.json             |   4 +-
 apps/files/l10n/vi.js                  |   4 +-
 apps/files/l10n/vi.json                |   4 +-
 apps/files/l10n/zh_CN.js               |   6 +-
 apps/files/l10n/zh_CN.json             |   6 +-
 apps/files/l10n/zh_HK.js               |   5 +-
 apps/files/l10n/zh_HK.json             |   5 +-
 apps/files/l10n/zh_TW.js               |   4 +-
 apps/files/l10n/zh_TW.json             |   4 +-
 apps/files_external/l10n/ast.js        |   1 +
 apps/files_external/l10n/ast.json      |   1 +
 apps/files_external/l10n/az.js         |   1 +
 apps/files_external/l10n/az.json       |   1 +
 apps/files_external/l10n/bg_BG.js      |   1 +
 apps/files_external/l10n/bg_BG.json    |   1 +
 apps/files_external/l10n/ca.js         |   2 +
 apps/files_external/l10n/ca.json       |   2 +
 apps/files_external/l10n/cs_CZ.js      |   2 +
 apps/files_external/l10n/cs_CZ.json    |   2 +
 apps/files_external/l10n/da.js         |   4 +-
 apps/files_external/l10n/da.json       |   4 +-
 apps/files_external/l10n/de.js         |   2 +
 apps/files_external/l10n/de.json       |   2 +
 apps/files_external/l10n/de_DE.js      |   2 +
 apps/files_external/l10n/de_DE.json    |   2 +
 apps/files_external/l10n/el.js         |   5 +-
 apps/files_external/l10n/el.json       |   5 +-
 apps/files_external/l10n/en_GB.js      |   2 +
 apps/files_external/l10n/en_GB.json    |   2 +
 apps/files_external/l10n/es.js         |   7 +-
 apps/files_external/l10n/es.json       |   7 +-
 apps/files_external/l10n/et_EE.js      |   2 +
 apps/files_external/l10n/et_EE.json    |   2 +
 apps/files_external/l10n/eu.js         |   1 +
 apps/files_external/l10n/eu.json       |   1 +
 apps/files_external/l10n/fi_FI.js      |   1 +
 apps/files_external/l10n/fi_FI.json    |   1 +
 apps/files_external/l10n/fr.js         |   5 +
 apps/files_external/l10n/fr.json       |   5 +
 apps/files_external/l10n/gl.js         |   2 +
 apps/files_external/l10n/gl.json       |   2 +
 apps/files_external/l10n/hr.js         |   1 +
 apps/files_external/l10n/hr.json       |   1 +
 apps/files_external/l10n/id.js         |  12 ++
 apps/files_external/l10n/id.json       |  12 ++
 apps/files_external/l10n/it.js         |   4 +-
 apps/files_external/l10n/it.json       |   4 +-
 apps/files_external/l10n/ja.js         |   2 +
 apps/files_external/l10n/ja.json       |   2 +
 apps/files_external/l10n/ko.js         |   2 +
 apps/files_external/l10n/ko.json       |   2 +
 apps/files_external/l10n/nb_NO.js      |   4 +-
 apps/files_external/l10n/nb_NO.json    |   4 +-
 apps/files_external/l10n/nl.js         |   4 +-
 apps/files_external/l10n/nl.json       |   4 +-
 apps/files_external/l10n/oc.js         |   3 +
 apps/files_external/l10n/oc.json       |   3 +
 apps/files_external/l10n/pl.js         |   2 +
 apps/files_external/l10n/pl.json       |   2 +
 apps/files_external/l10n/pt_BR.js      |   4 +-
 apps/files_external/l10n/pt_BR.json    |   4 +-
 apps/files_external/l10n/pt_PT.js      |   1 +
 apps/files_external/l10n/pt_PT.json    |   1 +
 apps/files_external/l10n/ru.js         |   2 +
 apps/files_external/l10n/ru.json       |   2 +
 apps/files_external/l10n/sk_SK.js      |  38 +++++++
 apps/files_external/l10n/sk_SK.json    |  38 +++++++
 apps/files_external/l10n/sl.js         |   2 +
 apps/files_external/l10n/sl.json       |   2 +
 apps/files_external/l10n/sr.js         |   2 +
 apps/files_external/l10n/sr.json       |   2 +
 apps/files_external/l10n/sr@latin.js   |   1 +
 apps/files_external/l10n/sr@latin.json |   1 +
 apps/files_external/l10n/sv.js         |   1 +
 apps/files_external/l10n/sv.json       |   1 +
 apps/files_external/l10n/th_TH.js      |   4 +-
 apps/files_external/l10n/th_TH.json    |   4 +-
 apps/files_external/l10n/tr.js         |   2 +
 apps/files_external/l10n/tr.json       |   2 +
 apps/files_external/l10n/uk.js         |   1 +
 apps/files_external/l10n/uk.json       |   1 +
 apps/files_external/l10n/zh_CN.js      |   1 +
 apps/files_external/l10n/zh_CN.json    |   1 +
 apps/files_sharing/l10n/ca.js          |   2 +
 apps/files_sharing/l10n/ca.json        |   2 +
 apps/files_sharing/l10n/el.js          |   6 +-
 apps/files_sharing/l10n/el.json        |   6 +-
 apps/files_sharing/l10n/es.js          |   3 +-
 apps/files_sharing/l10n/es.json        |   3 +-
 apps/files_sharing/l10n/fr.js          |   3 +
 apps/files_sharing/l10n/fr.json        |   3 +
 apps/files_sharing/l10n/hu_HU.js       |   4 +
 apps/files_sharing/l10n/hu_HU.json     |   4 +
 apps/files_sharing/l10n/id.js          |   4 +
 apps/files_sharing/l10n/id.json        |   4 +
 apps/files_sharing/l10n/oc.js          |  72 +++++++++++-
 apps/files_sharing/l10n/oc.json        |  72 +++++++++++-
 apps/files_sharing/l10n/sk_SK.js       |   4 +
 apps/files_sharing/l10n/sk_SK.json     |   4 +
 apps/files_sharing/l10n/th_TH.js       |   3 +
 apps/files_sharing/l10n/th_TH.json     |   3 +
 apps/files_trashbin/l10n/oc.js         |   4 +-
 apps/files_trashbin/l10n/oc.json       |   4 +-
 apps/user_ldap/l10n/oc.js              | 150 ++++++++++++++++++++++++-
 apps/user_ldap/l10n/oc.json            | 150 ++++++++++++++++++++++++-
 apps/user_ldap/l10n/zh_CN.js           |  12 ++
 apps/user_ldap/l10n/zh_CN.json         |  12 ++
 core/l10n/bg_BG.js                     |   1 -
 core/l10n/bg_BG.json                   |   1 -
 core/l10n/ca.js                        |   2 -
 core/l10n/ca.json                      |   2 -
 core/l10n/cs_CZ.js                     |   2 -
 core/l10n/cs_CZ.json                   |   2 -
 core/l10n/da.js                        |   4 +-
 core/l10n/da.json                      |   4 +-
 core/l10n/de.js                        |   2 -
 core/l10n/de.json                      |   2 -
 core/l10n/de_DE.js                     |   2 -
 core/l10n/de_DE.json                   |   2 -
 core/l10n/el.js                        |   4 +-
 core/l10n/el.json                      |   4 +-
 core/l10n/en_GB.js                     |   2 -
 core/l10n/en_GB.json                   |   2 -
 core/l10n/es.js                        |   4 +-
 core/l10n/es.json                      |   4 +-
 core/l10n/et_EE.js                     |   2 -
 core/l10n/et_EE.json                   |   2 -
 core/l10n/eu.js                        |   1 -
 core/l10n/eu.json                      |   1 -
 core/l10n/fi_FI.js                     |   4 +-
 core/l10n/fi_FI.json                   |   4 +-
 core/l10n/fr.js                        |   4 +-
 core/l10n/fr.json                      |   4 +-
 core/l10n/gl.js                        |   2 -
 core/l10n/gl.json                      |   2 -
 core/l10n/hr.js                        |   1 -
 core/l10n/hr.json                      |   1 -
 core/l10n/hu_HU.js                     |   3 +-
 core/l10n/hu_HU.json                   |   3 +-
 core/l10n/id.js                        |   4 +-
 core/l10n/id.json                      |   4 +-
 core/l10n/is.js                        |   4 +-
 core/l10n/is.json                      |   4 +-
 core/l10n/it.js                        |   4 +-
 core/l10n/it.json                      |   4 +-
 core/l10n/ja.js                        |   2 -
 core/l10n/ja.json                      |   2 -
 core/l10n/ko.js                        |   2 -
 core/l10n/ko.json                      |   2 -
 core/l10n/nb_NO.js                     |   2 -
 core/l10n/nb_NO.json                   |   2 -
 core/l10n/nl.js                        |   4 +-
 core/l10n/nl.json                      |   4 +-
 core/l10n/oc.js                        |   1 -
 core/l10n/oc.json                      |   1 -
 core/l10n/pt_BR.js                     |   4 +-
 core/l10n/pt_BR.json                   |   4 +-
 core/l10n/pt_PT.js                     |   2 -
 core/l10n/pt_PT.json                   |   2 -
 core/l10n/ru.js                        |   2 -
 core/l10n/ru.json                      |   2 -
 core/l10n/sk_SK.js                     |   2 -
 core/l10n/sk_SK.json                   |   2 -
 core/l10n/sr.js                        |   2 -
 core/l10n/sr.json                      |   2 -
 core/l10n/sv.js                        |   1 -
 core/l10n/sv.json                      |   1 -
 core/l10n/th_TH.js                     |   4 +-
 core/l10n/th_TH.json                   |   4 +-
 core/l10n/tr.js                        |   2 -
 core/l10n/tr.json                      |   2 -
 core/l10n/uk.js                        |  26 ++++-
 core/l10n/uk.json                      |  26 ++++-
 core/l10n/zh_CN.js                     |   2 -
 core/l10n/zh_CN.json                   |   2 -
 lib/l10n/af_ZA.js                      |   3 +-
 lib/l10n/af_ZA.json                    |   3 +-
 lib/l10n/ar.js                         |   1 +
 lib/l10n/ar.json                       |   1 +
 lib/l10n/ast.js                        |   1 +
 lib/l10n/ast.json                      |   1 +
 lib/l10n/bg_BG.js                      |   1 +
 lib/l10n/bg_BG.json                    |   1 +
 lib/l10n/bn_BD.js                      |   3 +-
 lib/l10n/bn_BD.json                    |   3 +-
 lib/l10n/bs.js                         |   1 +
 lib/l10n/bs.json                       |   1 +
 lib/l10n/ca.js                         |   1 +
 lib/l10n/ca.json                       |   1 +
 lib/l10n/cs_CZ.js                      |   1 +
 lib/l10n/cs_CZ.json                    |   1 +
 lib/l10n/cy_GB.js                      |   3 +-
 lib/l10n/cy_GB.json                    |   3 +-
 lib/l10n/da.js                         |   1 +
 lib/l10n/da.json                       |   1 +
 lib/l10n/de.js                         |   1 +
 lib/l10n/de.json                       |   1 +
 lib/l10n/de_DE.js                      |   1 +
 lib/l10n/de_DE.json                    |   1 +
 lib/l10n/el.js                         |   1 +
 lib/l10n/el.json                       |   1 +
 lib/l10n/en_GB.js                      |   1 +
 lib/l10n/en_GB.json                    |   1 +
 lib/l10n/eo.js                         |   1 +
 lib/l10n/eo.json                       |   1 +
 lib/l10n/es.js                         |   1 +
 lib/l10n/es.json                       |   1 +
 lib/l10n/es_AR.js                      |   1 +
 lib/l10n/es_AR.json                    |   1 +
 lib/l10n/es_MX.js                      |   1 +
 lib/l10n/es_MX.json                    |   1 +
 lib/l10n/et_EE.js                      |   1 +
 lib/l10n/et_EE.json                    |   1 +
 lib/l10n/eu.js                         |   1 +
 lib/l10n/eu.json                       |   1 +
 lib/l10n/fa.js                         |   1 +
 lib/l10n/fa.json                       |   1 +
 lib/l10n/fi_FI.js                      |   1 +
 lib/l10n/fi_FI.json                    |   1 +
 lib/l10n/fr.js                         |   1 +
 lib/l10n/fr.json                       |   1 +
 lib/l10n/gl.js                         |   1 +
 lib/l10n/gl.json                       |   1 +
 lib/l10n/he.js                         |   1 +
 lib/l10n/he.json                       |   1 +
 lib/l10n/hi.js                         |   3 +-
 lib/l10n/hi.json                       |   3 +-
 lib/l10n/hr.js                         |   1 +
 lib/l10n/hr.json                       |   1 +
 lib/l10n/hu_HU.js                      |   1 +
 lib/l10n/hu_HU.json                    |   1 +
 lib/l10n/ia.js                         |   3 +-
 lib/l10n/ia.json                       |   3 +-
 lib/l10n/id.js                         |   1 +
 lib/l10n/id.json                       |   1 +
 lib/l10n/is.js                         |   3 +-
 lib/l10n/is.json                       |   3 +-
 lib/l10n/it.js                         |   1 +
 lib/l10n/it.json                       |   1 +
 lib/l10n/ja.js                         |   1 +
 lib/l10n/ja.json                       |   1 +
 lib/l10n/ka_GE.js                      |   1 +
 lib/l10n/ka_GE.json                    |   1 +
 lib/l10n/km.js                         |   1 +
 lib/l10n/km.json                       |   1 +
 lib/l10n/kn.js                         |   1 +
 lib/l10n/kn.json                       |   1 +
 lib/l10n/ko.js                         |   1 +
 lib/l10n/ko.json                       |   1 +
 lib/l10n/ku_IQ.js                      |   3 +-
 lib/l10n/ku_IQ.json                    |   3 +-
 lib/l10n/lb.js                         |   1 +
 lib/l10n/lb.json                       |   1 +
 lib/l10n/lt_LT.js                      |   1 +
 lib/l10n/lt_LT.json                    |   1 +
 lib/l10n/lv.js                         |   1 +
 lib/l10n/lv.json                       |   1 +
 lib/l10n/mk.js                         |   1 +
 lib/l10n/mk.json                       |   1 +
 lib/l10n/ms_MY.js                      |   3 +-
 lib/l10n/ms_MY.json                    |   3 +-
 lib/l10n/my_MM.js                      |   3 +-
 lib/l10n/my_MM.json                    |   3 +-
 lib/l10n/nb_NO.js                      |   1 +
 lib/l10n/nb_NO.json                    |   1 +
 lib/l10n/nl.js                         |   1 +
 lib/l10n/nl.json                       |   1 +
 lib/l10n/nn_NO.js                      |   1 +
 lib/l10n/nn_NO.json                    |   1 +
 lib/l10n/oc.js                         |   1 +
 lib/l10n/oc.json                       |   1 +
 lib/l10n/pl.js                         |   1 +
 lib/l10n/pl.json                       |   1 +
 lib/l10n/pt_BR.js                      |   1 +
 lib/l10n/pt_BR.json                    |   1 +
 lib/l10n/pt_PT.js                      |   1 +
 lib/l10n/pt_PT.json                    |   1 +
 lib/l10n/ro.js                         |   1 +
 lib/l10n/ro.json                       |   1 +
 lib/l10n/ru.js                         |   1 +
 lib/l10n/ru.json                       |   1 +
 lib/l10n/si_LK.js                      |   3 +-
 lib/l10n/si_LK.json                    |   3 +-
 lib/l10n/sk_SK.js                      |  18 +++
 lib/l10n/sk_SK.json                    |  18 +++
 lib/l10n/sl.js                         |   1 +
 lib/l10n/sl.json                       |   1 +
 lib/l10n/sq.js                         |   1 +
 lib/l10n/sq.json                       |   1 +
 lib/l10n/sr.js                         |   1 +
 lib/l10n/sr.json                       |   1 +
 lib/l10n/sr@latin.js                   |   3 +-
 lib/l10n/sr@latin.json                 |   3 +-
 lib/l10n/sv.js                         |   1 +
 lib/l10n/sv.json                       |   1 +
 lib/l10n/ta_LK.js                      |   3 +-
 lib/l10n/ta_LK.json                    |   3 +-
 lib/l10n/th_TH.js                      |   1 +
 lib/l10n/th_TH.json                    |   1 +
 lib/l10n/tr.js                         |   1 +
 lib/l10n/tr.json                       |   1 +
 lib/l10n/ug.js                         |   1 +
 lib/l10n/ug.json                       |   1 +
 lib/l10n/uk.js                         |   1 +
 lib/l10n/uk.json                       |   1 +
 lib/l10n/ur_PK.js                      |   3 +-
 lib/l10n/ur_PK.json                    |   3 +-
 lib/l10n/vi.js                         |   3 +-
 lib/l10n/vi.json                       |   3 +-
 lib/l10n/zh_CN.js                      |   1 +
 lib/l10n/zh_CN.json                    |   1 +
 lib/l10n/zh_HK.js                      |   3 +-
 lib/l10n/zh_HK.json                    |   3 +-
 lib/l10n/zh_TW.js                      |   1 +
 lib/l10n/zh_TW.json                    |   1 +
 settings/l10n/da.js                    |   1 +
 settings/l10n/da.json                  |   1 +
 settings/l10n/fi_FI.js                 |   1 +
 settings/l10n/fi_FI.json               |   1 +
 settings/l10n/fr.js                    |   4 +
 settings/l10n/fr.json                  |   4 +
 settings/l10n/it.js                    |   1 +
 settings/l10n/it.json                  |   1 +
 settings/l10n/nl.js                    |   1 +
 settings/l10n/nl.json                  |   1 +
 settings/l10n/oc.js                    |   1 +
 settings/l10n/oc.json                  |   1 +
 settings/l10n/pt_BR.js                 |   1 +
 settings/l10n/pt_BR.json               |   1 +
 settings/l10n/uk.js                    |  88 ++++++++-------
 settings/l10n/uk.json                  |  88 ++++++++-------
 settings/l10n/zh_CN.js                 |   3 +
 settings/l10n/zh_CN.json               |   3 +
 480 files changed, 1622 insertions(+), 450 deletions(-)

diff --git a/apps/encryption/l10n/ca.js b/apps/encryption/l10n/ca.js
index 9a318f2d4c2..b9ca7f97565 100644
--- a/apps/encryption/l10n/ca.js
+++ b/apps/encryption/l10n/ca.js
@@ -5,6 +5,8 @@ OC.L10N.register(
     "Could not enable recovery key. Please check your recovery key password!" : "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
     "Recovery key successfully disabled" : "La clau de recuperació s'ha descativat",
     "Could not disable recovery key. Please check your recovery key password!" : "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!",
+    "Please provide a new recovery password" : "Siusplau proporcioneu una nova contrasenya de recuperació",
+    "Please repeat the new recovery password" : "Repetiu la nova contrasenya de recuperació",
     "Password successfully changed." : "La contrasenya s'ha canviat.",
     "Could not change the password. Maybe the old password was not correct." : "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
     "Private key password successfully updated." : "La contrasenya de la clau privada s'ha actualitzat.",
diff --git a/apps/encryption/l10n/ca.json b/apps/encryption/l10n/ca.json
index b172da4a0df..cedebee12c0 100644
--- a/apps/encryption/l10n/ca.json
+++ b/apps/encryption/l10n/ca.json
@@ -3,6 +3,8 @@
     "Could not enable recovery key. Please check your recovery key password!" : "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
     "Recovery key successfully disabled" : "La clau de recuperació s'ha descativat",
     "Could not disable recovery key. Please check your recovery key password!" : "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!",
+    "Please provide a new recovery password" : "Siusplau proporcioneu una nova contrasenya de recuperació",
+    "Please repeat the new recovery password" : "Repetiu la nova contrasenya de recuperació",
     "Password successfully changed." : "La contrasenya s'ha canviat.",
     "Could not change the password. Maybe the old password was not correct." : "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
     "Private key password successfully updated." : "La contrasenya de la clau privada s'ha actualitzat.",
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index cadedbcc0d4..6b49b3917fd 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -28,10 +28,10 @@ OC.L10N.register(
     "one-time password for server-side-encryption" : "Contraseña de un solo uso para el cifrado en el lado servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hola,\n\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:  '%s'.\n\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.\n\n",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hola,\n\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:  '%s'.\n\nPor favor, identifíquese en la interfaz web, vaya a la sección 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la nueva en su correspondiente campo.\n\n",
     "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
     "Cheers!" : "¡Saludos!",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hola,\n<br><br>\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:   <strong>%s</strong>\n<br><br>\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.<br><br>",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hola,\n<br><br>\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:   <strong>%s</strong>\n<br><br>\nPor favor, identifíquese en la interfaz web, vaya a la sección 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la nueva en su correspondiente campo.<br><br>",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 9bdad94cb6d..3f21b4c09a0 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -26,10 +26,10 @@
     "one-time password for server-side-encryption" : "Contraseña de un solo uso para el cifrado en el lado servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hola,\n\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:  '%s'.\n\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.\n\n",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hola,\n\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:  '%s'.\n\nPor favor, identifíquese en la interfaz web, vaya a la sección 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la nueva en su correspondiente campo.\n\n",
     "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
     "Cheers!" : "¡Saludos!",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hola,\n<br><br>\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:   <strong>%s</strong>\n<br><br>\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.<br><br>",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hola,\n<br><br>\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:   <strong>%s</strong>\n<br><br>\nPor favor, identifíquese en la interfaz web, vaya a la sección 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la nueva en su correspondiente campo.<br><br>",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
diff --git a/apps/encryption/l10n/uk.js b/apps/encryption/l10n/uk.js
index 553478a7f4c..aa1821729ef 100644
--- a/apps/encryption/l10n/uk.js
+++ b/apps/encryption/l10n/uk.js
@@ -24,6 +24,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
     "Encryption App is enabled and ready" : "Додаток кодування дозволений і готовий",
+    "one-time password for server-side-encryption" : "одноразовий пароль для шифрування на сервері",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
     "The share will expire on %s." : "Спільний доступ закінчиться %s.",
     "Cheers!" : "Будьмо!",
diff --git a/apps/encryption/l10n/uk.json b/apps/encryption/l10n/uk.json
index e474e25cea4..cf54cadc708 100644
--- a/apps/encryption/l10n/uk.json
+++ b/apps/encryption/l10n/uk.json
@@ -22,6 +22,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
     "Encryption App is enabled and ready" : "Додаток кодування дозволений і готовий",
+    "one-time password for server-side-encryption" : "одноразовий пароль для шифрування на сервері",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
     "The share will expire on %s." : "Спільний доступ закінчиться %s.",
     "Cheers!" : "Будьмо!",
diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js
index 6dab5f6ba27..f6bc5581b76 100644
--- a/apps/files/l10n/ar.js
+++ b/apps/files/l10n/ar.js
@@ -29,6 +29,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
     "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",
+    "Rename" : "إعادة التسمية",
+    "Delete" : "إلغاء",
+    "Details" : "تفاصيل",
     "Pending" : "قيد الانتظار",
     "Error moving file" : "حدث خطأ أثناء نقل الملف",
     "Error" : "خطأ",
@@ -71,7 +74,6 @@ OC.L10N.register(
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
     "Cancel upload" : "إلغاء الرفع",
-    "Delete" : "إلغاء",
     "Upload too large" : "حجم الترفيع أعلى من المسموح",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.",
     "Files are being scanned, please wait." : "يرجى الانتظار , جاري فحص الملفات ."
diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json
index 745d82dc19b..2de484b30f2 100644
--- a/apps/files/l10n/ar.json
+++ b/apps/files/l10n/ar.json
@@ -27,6 +27,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
     "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",
+    "Rename" : "إعادة التسمية",
+    "Delete" : "إلغاء",
+    "Details" : "تفاصيل",
     "Pending" : "قيد الانتظار",
     "Error moving file" : "حدث خطأ أثناء نقل الملف",
     "Error" : "خطأ",
@@ -69,7 +72,6 @@
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
     "Cancel upload" : "إلغاء الرفع",
-    "Delete" : "إلغاء",
     "Upload too large" : "حجم الترفيع أعلى من المسموح",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.",
     "Files are being scanned, please wait." : "يرجى الانتظار , جاري فحص الملفات ."
diff --git a/apps/files/l10n/ast.js b/apps/files/l10n/ast.js
index 33bf5e37c0a..ffba40ec793 100644
--- a/apps/files/l10n/ast.js
+++ b/apps/files/l10n/ast.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
     "Actions" : "Aiciones",
     "Download" : "Descargar",
+    "Rename" : "Renomar",
+    "Delete" : "Desaniciar",
+    "Details" : "Detalles",
     "Select" : "Esbillar",
     "Pending" : "Pendiente",
     "Unable to determine date" : "Imposible determinar la fecha",
@@ -92,7 +95,6 @@ OC.L10N.register(
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usa esta direición <a href=\"%s\" target=\"_blank\">p'acceder a los ficheros a traviés de WebDAV</a>",
     "Cancel upload" : "Encaboxar xuba",
-    "Delete" : "Desaniciar",
     "Upload too large" : "La xuba ye abondo grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubíes de ficheros nesti servidor.",
     "Files are being scanned, please wait." : "Tan escaniándose los ficheros, espera por favor.",
diff --git a/apps/files/l10n/ast.json b/apps/files/l10n/ast.json
index 601bf2d85f1..353511d5586 100644
--- a/apps/files/l10n/ast.json
+++ b/apps/files/l10n/ast.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
     "Actions" : "Aiciones",
     "Download" : "Descargar",
+    "Rename" : "Renomar",
+    "Delete" : "Desaniciar",
+    "Details" : "Detalles",
     "Select" : "Esbillar",
     "Pending" : "Pendiente",
     "Unable to determine date" : "Imposible determinar la fecha",
@@ -90,7 +93,6 @@
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usa esta direición <a href=\"%s\" target=\"_blank\">p'acceder a los ficheros a traviés de WebDAV</a>",
     "Cancel upload" : "Encaboxar xuba",
-    "Delete" : "Desaniciar",
     "Upload too large" : "La xuba ye abondo grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubíes de ficheros nesti servidor.",
     "Files are being scanned, please wait." : "Tan escaniándose los ficheros, espera por favor.",
diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js
index 54b17d6df55..b278fad62b1 100644
--- a/apps/files/l10n/az.js
+++ b/apps/files/l10n/az.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
     "Actions" : "İşlər",
     "Download" : "Yüklə",
+    "Rename" : "Adı dəyiş",
+    "Delete" : "Sil",
+    "Details" : "Detallar",
     "Select" : "Seç",
     "Pending" : "Gözləmə",
     "Unable to determine date" : "Tarixi təyin etmək mümkün olmadı",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Bezi kontenti yüklə yada, öz avadanlıqlarınızla sinxronizasiya edin!",
     "No entries found in this folder" : "Bu qovluqda heç bir verilən tapılmadı",
     "Select all" : "Hamısıı seç",
-    "Delete" : "Sil",
     "Upload too large" : "Yüklənmə şox böyükdür",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yükləmək istədiyiniz faylların həcmi, bu serverdə izin verilmiş maksimal yüklənmə həcmindən böyükdür.",
     "Files are being scanned, please wait." : "Faylların skanı başlanıb, xahiş olunur gözləyəsiniz.",
diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json
index 14d728f248a..8603939790d 100644
--- a/apps/files/l10n/az.json
+++ b/apps/files/l10n/az.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
     "Actions" : "İşlər",
     "Download" : "Yüklə",
+    "Rename" : "Adı dəyiş",
+    "Delete" : "Sil",
+    "Details" : "Detallar",
     "Select" : "Seç",
     "Pending" : "Gözləmə",
     "Unable to determine date" : "Tarixi təyin etmək mümkün olmadı",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Bezi kontenti yüklə yada, öz avadanlıqlarınızla sinxronizasiya edin!",
     "No entries found in this folder" : "Bu qovluqda heç bir verilən tapılmadı",
     "Select all" : "Hamısıı seç",
-    "Delete" : "Sil",
     "Upload too large" : "Yüklənmə şox böyükdür",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yükləmək istədiyiniz faylların həcmi, bu serverdə izin verilmiş maksimal yüklənmə həcmindən böyükdür.",
     "Files are being scanned, please wait." : "Faylların skanı başlanıb, xahiş olunur gözləyəsiniz.",
diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js
index f21c5de9dc1..98e0e2bd4b9 100644
--- a/apps/files/l10n/bg_BG.js
+++ b/apps/files/l10n/bg_BG.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.",
     "Actions" : "Действия",
     "Download" : "Изтегли",
+    "Rename" : "Преименуване",
+    "Delete" : "Изтрий",
+    "Details" : "Подробности",
     "Select" : "Избери",
     "Pending" : "Чакащо",
     "Unable to determine date" : "Неуспешно установяване на дата",
@@ -100,7 +103,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!",
     "No entries found in this folder" : "Няма намерени записи в тази папка",
     "Select all" : "Избери всички",
-    "Delete" : "Изтрий",
     "Upload too large" : "Прекалено голям файл за качване.",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
     "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.",
diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json
index 6778eff6da8..48d6729232b 100644
--- a/apps/files/l10n/bg_BG.json
+++ b/apps/files/l10n/bg_BG.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.",
     "Actions" : "Действия",
     "Download" : "Изтегли",
+    "Rename" : "Преименуване",
+    "Delete" : "Изтрий",
+    "Details" : "Подробности",
     "Select" : "Избери",
     "Pending" : "Чакащо",
     "Unable to determine date" : "Неуспешно установяване на дата",
@@ -98,7 +101,6 @@
     "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!",
     "No entries found in this folder" : "Няма намерени записи в тази папка",
     "Select all" : "Избери всички",
-    "Delete" : "Изтрий",
     "Upload too large" : "Прекалено голям файл за качване.",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
     "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.",
diff --git a/apps/files/l10n/bn_BD.js b/apps/files/l10n/bn_BD.js
index 1272966209b..bc8d7ce8d5c 100644
--- a/apps/files/l10n/bn_BD.js
+++ b/apps/files/l10n/bn_BD.js
@@ -29,6 +29,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
     "Actions" : "পদক্ষেপসমূহ",
     "Download" : "ডাউনলোড",
+    "Rename" : "পূনঃনামকরণ",
+    "Delete" : "মুছে",
+    "Details" : "বিস্তারিত",
     "Pending" : "মুলতুবি",
     "Error moving file." : "ফাইল সরাতে সমস্যা হলো।",
     "Error moving file" : "ফাইল সরাতে সমস্যা হলো",
@@ -65,7 +68,6 @@ OC.L10N.register(
     "Settings" : "নিয়ামকসমূহ",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "আপলোড বাতিল কর",
-    "Delete" : "মুছে",
     "Upload too large" : "আপলোডের আকারটি অনেক বড়",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ",
     "Files are being scanned, please wait." : "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
diff --git a/apps/files/l10n/bn_BD.json b/apps/files/l10n/bn_BD.json
index 472aae78865..43ebbc8ad96 100644
--- a/apps/files/l10n/bn_BD.json
+++ b/apps/files/l10n/bn_BD.json
@@ -27,6 +27,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
     "Actions" : "পদক্ষেপসমূহ",
     "Download" : "ডাউনলোড",
+    "Rename" : "পূনঃনামকরণ",
+    "Delete" : "মুছে",
+    "Details" : "বিস্তারিত",
     "Pending" : "মুলতুবি",
     "Error moving file." : "ফাইল সরাতে সমস্যা হলো।",
     "Error moving file" : "ফাইল সরাতে সমস্যা হলো",
@@ -63,7 +66,6 @@
     "Settings" : "নিয়ামকসমূহ",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "আপলোড বাতিল কর",
-    "Delete" : "মুছে",
     "Upload too large" : "আপলোডের আকারটি অনেক বড়",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ",
     "Files are being scanned, please wait." : "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
diff --git a/apps/files/l10n/bn_IN.js b/apps/files/l10n/bn_IN.js
index 995c9ad45d1..d7f61133133 100644
--- a/apps/files/l10n/bn_IN.js
+++ b/apps/files/l10n/bn_IN.js
@@ -16,6 +16,8 @@ OC.L10N.register(
     "Files" : "ফাইলস",
     "Close" : "বন্ধ",
     "Download" : "ডাউনলোড করুন",
+    "Rename" : "পুনঃনামকরণ",
+    "Delete" : "মুছে ফেলা",
     "Pending" : "মুলতুবি",
     "Error" : "ভুল",
     "Name" : "নাম",
@@ -32,7 +34,6 @@ OC.L10N.register(
     "You deleted %1$s" : "আপনি %1$s কে মুছেছেন",
     "%2$s deleted %1$s" : "%2$s মুছেছে %1$s কে",
     "Save" : "সেভ",
-    "Settings" : "সেটিংস",
-    "Delete" : "মুছে ফেলা"
+    "Settings" : "সেটিংস"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/bn_IN.json b/apps/files/l10n/bn_IN.json
index 17ce39d023a..f2d5d9fbf74 100644
--- a/apps/files/l10n/bn_IN.json
+++ b/apps/files/l10n/bn_IN.json
@@ -14,6 +14,8 @@
     "Files" : "ফাইলস",
     "Close" : "বন্ধ",
     "Download" : "ডাউনলোড করুন",
+    "Rename" : "পুনঃনামকরণ",
+    "Delete" : "মুছে ফেলা",
     "Pending" : "মুলতুবি",
     "Error" : "ভুল",
     "Name" : "নাম",
@@ -30,7 +32,6 @@
     "You deleted %1$s" : "আপনি %1$s কে মুছেছেন",
     "%2$s deleted %1$s" : "%2$s মুছেছে %1$s কে",
     "Save" : "সেভ",
-    "Settings" : "সেটিংস",
-    "Delete" : "মুছে ফেলা"
+    "Settings" : "সেটিংস"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/bs.js b/apps/files/l10n/bs.js
index f10c87bfef8..6ca6ebe90c5 100644
--- a/apps/files/l10n/bs.js
+++ b/apps/files/l10n/bs.js
@@ -38,6 +38,8 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u toku. Napuštanje stranice prekinut će učitavanje.",
     "Actions" : "Radnje",
     "Download" : "Preuzmi",
+    "Rename" : "Preimenuj",
+    "Delete" : "Izbriši",
     "Select" : "Izaberi",
     "Pending" : "Na čekanju",
     "Unable to determine date" : "Nemoguće odrediti datum",
@@ -81,7 +83,6 @@ OC.L10N.register(
     "Cancel upload" : "Prekini učitavanje",
     "Upload some content or sync with your devices!" : "Učitaj neki sadržaj ili sinhronizuj sa tvojim uređajima!",
     "Select all" : "Označi sve",
-    "Delete" : "Izbriši",
     "Upload too large" : "Učitavanje je preveliko",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati prelaze maksimalnu veličinu za učitavanje datoteka na ovom serveru.",
     "Files are being scanned, please wait." : "Datoteke se provjeravaju, molim pričekajte.",
diff --git a/apps/files/l10n/bs.json b/apps/files/l10n/bs.json
index 7d8a87f6398..553662622f2 100644
--- a/apps/files/l10n/bs.json
+++ b/apps/files/l10n/bs.json
@@ -36,6 +36,8 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u toku. Napuštanje stranice prekinut će učitavanje.",
     "Actions" : "Radnje",
     "Download" : "Preuzmi",
+    "Rename" : "Preimenuj",
+    "Delete" : "Izbriši",
     "Select" : "Izaberi",
     "Pending" : "Na čekanju",
     "Unable to determine date" : "Nemoguće odrediti datum",
@@ -79,7 +81,6 @@
     "Cancel upload" : "Prekini učitavanje",
     "Upload some content or sync with your devices!" : "Učitaj neki sadržaj ili sinhronizuj sa tvojim uređajima!",
     "Select all" : "Označi sve",
-    "Delete" : "Izbriši",
     "Upload too large" : "Učitavanje je preveliko",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati prelaze maksimalnu veličinu za učitavanje datoteka na ovom serveru.",
     "Files are being scanned, please wait." : "Datoteke se provjeravaju, molim pričekajte.",
diff --git a/apps/files/l10n/ca.js b/apps/files/l10n/ca.js
index f8388534802..b5cd0beedfe 100644
--- a/apps/files/l10n/ca.js
+++ b/apps/files/l10n/ca.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
     "Actions" : "Accions",
     "Download" : "Baixa",
+    "Rename" : "Reanomena",
+    "Delete" : "Esborra",
+    "Details" : "Detalls",
     "Select" : "Selecciona",
     "Pending" : "Pendent",
     "Unable to determine date" : "No s'ha pogut determinar la data",
@@ -103,7 +106,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.",
     "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
     "Select all" : "Seleccionar tot",
-    "Delete" : "Esborra",
     "Upload too large" : "La pujada és massa gran",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
     "Files are being scanned, please wait." : "S'estan escanejant els fitxers, espereu",
diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json
index 10a39fc941a..7558821627f 100644
--- a/apps/files/l10n/ca.json
+++ b/apps/files/l10n/ca.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
     "Actions" : "Accions",
     "Download" : "Baixa",
+    "Rename" : "Reanomena",
+    "Delete" : "Esborra",
+    "Details" : "Detalls",
     "Select" : "Selecciona",
     "Pending" : "Pendent",
     "Unable to determine date" : "No s'ha pogut determinar la data",
@@ -101,7 +104,6 @@
     "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.",
     "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
     "Select all" : "Seleccionar tot",
-    "Delete" : "Esborra",
     "Upload too large" : "La pujada és massa gran",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
     "Files are being scanned, please wait." : "S'estan escanejant els fitxers, espereu",
diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js
index a5c1449e995..7ef3a2ec9aa 100644
--- a/apps/files/l10n/cs_CZ.js
+++ b/apps/files/l10n/cs_CZ.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
     "Actions" : "Činnosti",
     "Download" : "Stáhnout",
+    "Rename" : "Přejmenovat",
+    "Delete" : "Smazat",
+    "Details" : "Podrobnosti",
     "Select" : "Vybrat",
     "Pending" : "Nevyřízené",
     "Unable to determine date" : "Nelze určit datum",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!",
     "No entries found in this folder" : "V této složce nebylo nic nalezeno",
     "Select all" : "Vybrat vše",
-    "Delete" : "Smazat",
     "Upload too large" : "Odesílaný soubor je příliš velký",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
     "Files are being scanned, please wait." : "Soubory se prohledávají, prosím čekejte.",
diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json
index 1da4bfb8868..55b374f9ea6 100644
--- a/apps/files/l10n/cs_CZ.json
+++ b/apps/files/l10n/cs_CZ.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
     "Actions" : "Činnosti",
     "Download" : "Stáhnout",
+    "Rename" : "Přejmenovat",
+    "Delete" : "Smazat",
+    "Details" : "Podrobnosti",
     "Select" : "Vybrat",
     "Pending" : "Nevyřízené",
     "Unable to determine date" : "Nelze určit datum",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!",
     "No entries found in this folder" : "V této složce nebylo nic nalezeno",
     "Select all" : "Vybrat vše",
-    "Delete" : "Smazat",
     "Upload too large" : "Odesílaný soubor je příliš velký",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
     "Files are being scanned, please wait." : "Soubory se prohledávají, prosím čekejte.",
diff --git a/apps/files/l10n/cy_GB.js b/apps/files/l10n/cy_GB.js
index bdf61e20f24..2f64d032f01 100644
--- a/apps/files/l10n/cy_GB.js
+++ b/apps/files/l10n/cy_GB.js
@@ -20,6 +20,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
     "Actions" : "Gweithredoedd",
     "Download" : "Llwytho i lawr",
+    "Rename" : "Ailenwi",
+    "Delete" : "Dileu",
+    "Details" : "Manylion",
     "Pending" : "I ddod",
     "Error" : "Gwall",
     "{new_name} already exists" : "{new_name} yn bodoli'n barod",
@@ -39,7 +42,6 @@ OC.L10N.register(
     "Save" : "Cadw",
     "Settings" : "Gosodiadau",
     "Cancel upload" : "Diddymu llwytho i fyny",
-    "Delete" : "Dileu",
     "Upload too large" : "Maint llwytho i fyny'n rhy fawr",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",
     "Files are being scanned, please wait." : "Arhoswch, mae ffeiliau'n cael eu sganio."
diff --git a/apps/files/l10n/cy_GB.json b/apps/files/l10n/cy_GB.json
index eb66c24ec62..602cc780abe 100644
--- a/apps/files/l10n/cy_GB.json
+++ b/apps/files/l10n/cy_GB.json
@@ -18,6 +18,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
     "Actions" : "Gweithredoedd",
     "Download" : "Llwytho i lawr",
+    "Rename" : "Ailenwi",
+    "Delete" : "Dileu",
+    "Details" : "Manylion",
     "Pending" : "I ddod",
     "Error" : "Gwall",
     "{new_name} already exists" : "{new_name} yn bodoli'n barod",
@@ -37,7 +40,6 @@
     "Save" : "Cadw",
     "Settings" : "Gosodiadau",
     "Cancel upload" : "Diddymu llwytho i fyny",
-    "Delete" : "Dileu",
     "Upload too large" : "Maint llwytho i fyny'n rhy fawr",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",
     "Files are being scanned, please wait." : "Arhoswch, mae ffeiliau'n cael eu sganio."
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index cc7aac18351..84d342e85d9 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
     "Actions" : "Handlinger",
     "Download" : "Download",
+    "Rename" : "Omdøb",
+    "Delete" : "Slet",
+    "Details" : "Detaljer",
     "Select" : "Vælg",
     "Pending" : "Afventer",
     "Unable to determine date" : "Kan ikke fastslå datoen",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!",
     "No entries found in this folder" : "Der blev ikke fundet poster i denne mappe",
     "Select all" : "Vælg alle",
-    "Delete" : "Slet",
     "Upload too large" : "Upload er for stor",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
     "Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index b77937420f4..53de8656af2 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
     "Actions" : "Handlinger",
     "Download" : "Download",
+    "Rename" : "Omdøb",
+    "Delete" : "Slet",
+    "Details" : "Detaljer",
     "Select" : "Vælg",
     "Pending" : "Afventer",
     "Unable to determine date" : "Kan ikke fastslå datoen",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!",
     "No entries found in this folder" : "Der blev ikke fundet poster i denne mappe",
     "Select all" : "Vælg alle",
-    "Delete" : "Slet",
     "Upload too large" : "Upload er for stor",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
     "Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.",
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index 5e22e05f80d..2f9a48f0fd4 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
     "Actions" : "Aktionen",
     "Download" : "Herunterladen",
+    "Rename" : "Umbenennen",
+    "Delete" : "Löschen",
+    "Details" : "Details",
     "Select" : "Auswählen",
     "Pending" : "Ausstehend",
     "Unable to determine date" : "Datum konnte nicht ermittelt werden",
@@ -107,7 +110,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Lade Inhalte hoch oder synchronisiere mit Deinen Geräten!",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner",
     "Select all" : "Alle auswählen",
-    "Delete" : "Löschen",
     "Upload too large" : "Der Upload ist zu groß",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
     "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index 5e93d2b3856..6457eded01a 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
     "Actions" : "Aktionen",
     "Download" : "Herunterladen",
+    "Rename" : "Umbenennen",
+    "Delete" : "Löschen",
+    "Details" : "Details",
     "Select" : "Auswählen",
     "Pending" : "Ausstehend",
     "Unable to determine date" : "Datum konnte nicht ermittelt werden",
@@ -105,7 +108,6 @@
     "Upload some content or sync with your devices!" : "Lade Inhalte hoch oder synchronisiere mit Deinen Geräten!",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner",
     "Select all" : "Alle auswählen",
-    "Delete" : "Löschen",
     "Upload too large" : "Der Upload ist zu groß",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
     "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/de_AT.js b/apps/files/l10n/de_AT.js
index 70adef6bb08..4f5296dc11f 100644
--- a/apps/files/l10n/de_AT.js
+++ b/apps/files/l10n/de_AT.js
@@ -4,6 +4,8 @@ OC.L10N.register(
     "Unknown error" : "Unbekannter Fehler",
     "Files" : "Dateien",
     "Download" : "Herunterladen",
+    "Delete" : "Löschen",
+    "Details" : "Details",
     "Error" : "Fehler",
     "Upload" : "Hochladen",
     "New folder" : "Neuer Ordner",
@@ -18,7 +20,6 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s löschte %1$s",
     "Save" : "Speichern",
     "Settings" : "Einstellungen",
-    "Cancel upload" : "Hochladen abbrechen",
-    "Delete" : "Löschen"
+    "Cancel upload" : "Hochladen abbrechen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/de_AT.json b/apps/files/l10n/de_AT.json
index 8766f264741..91ec7e5e4e1 100644
--- a/apps/files/l10n/de_AT.json
+++ b/apps/files/l10n/de_AT.json
@@ -2,6 +2,8 @@
     "Unknown error" : "Unbekannter Fehler",
     "Files" : "Dateien",
     "Download" : "Herunterladen",
+    "Delete" : "Löschen",
+    "Details" : "Details",
     "Error" : "Fehler",
     "Upload" : "Hochladen",
     "New folder" : "Neuer Ordner",
@@ -16,7 +18,6 @@
     "%2$s deleted %1$s" : "%2$s löschte %1$s",
     "Save" : "Speichern",
     "Settings" : "Einstellungen",
-    "Cancel upload" : "Hochladen abbrechen",
-    "Delete" : "Löschen"
+    "Cancel upload" : "Hochladen abbrechen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index 34c6c8fb4a6..9a75b417ace 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
     "Actions" : "Aktionen",
     "Download" : "Herunterladen",
+    "Rename" : "Umbenennen",
+    "Delete" : "Löschen",
+    "Details" : "Details",
     "Select" : "Auswählen",
     "Pending" : "Ausstehend",
     "Unable to determine date" : "Datum konnte nicht ermittelt werden",
@@ -105,7 +108,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden",
     "Select all" : "Alle auswählen",
-    "Delete" : "Löschen",
     "Upload too large" : "Der Upload ist zu groß",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
     "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index 390e5e0e575..910ad9ac6aa 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
     "Actions" : "Aktionen",
     "Download" : "Herunterladen",
+    "Rename" : "Umbenennen",
+    "Delete" : "Löschen",
+    "Details" : "Details",
     "Select" : "Auswählen",
     "Pending" : "Ausstehend",
     "Unable to determine date" : "Datum konnte nicht ermittelt werden",
@@ -103,7 +106,6 @@
     "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden",
     "Select all" : "Alle auswählen",
-    "Delete" : "Löschen",
     "Upload too large" : "Der Upload ist zu groß",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
     "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js
index fe65869c3bb..895ffe19267 100644
--- a/apps/files/l10n/el.js
+++ b/apps/files/l10n/el.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
     "Actions" : "Ενέργειες",
     "Download" : "Λήψη",
+    "Rename" : "Μετονομασία",
+    "Delete" : "Διαγραφή",
+    "Details" : "Λεπτομέρειες",
     "Select" : "Επιλογή",
     "Pending" : "Εκκρεμεί",
     "Unable to determine date" : "Αδυναμία προσδιορισμού ημερομηνίας ",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!",
     "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο",
     "Select all" : "Επιλογή όλων",
-    "Delete" : "Διαγραφή",
     "Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
     "Files are being scanned, please wait." : "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json
index 37ff95b406e..0d24b6c7015 100644
--- a/apps/files/l10n/el.json
+++ b/apps/files/l10n/el.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
     "Actions" : "Ενέργειες",
     "Download" : "Λήψη",
+    "Rename" : "Μετονομασία",
+    "Delete" : "Διαγραφή",
+    "Details" : "Λεπτομέρειες",
     "Select" : "Επιλογή",
     "Pending" : "Εκκρεμεί",
     "Unable to determine date" : "Αδυναμία προσδιορισμού ημερομηνίας ",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!",
     "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο",
     "Select all" : "Επιλογή όλων",
-    "Delete" : "Διαγραφή",
     "Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
     "Files are being scanned, please wait." : "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js
index decfe4dcd83..5109eb0743b 100644
--- a/apps/files/l10n/en_GB.js
+++ b/apps/files/l10n/en_GB.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
     "Actions" : "Actions",
     "Download" : "Download",
+    "Rename" : "Rename",
+    "Delete" : "Delete",
+    "Details" : "Details",
     "Select" : "Select",
     "Pending" : "Pending",
     "Unable to determine date" : "Unable to determine date",
@@ -101,7 +104,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!",
     "No entries found in this folder" : "No entries found in this folder",
     "Select all" : "Select all",
-    "Delete" : "Delete",
     "Upload too large" : "Upload too large",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "The files you are trying to upload exceed the maximum size for file uploads on this server.",
     "Files are being scanned, please wait." : "Files are being scanned, please wait.",
diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json
index cf06affa55e..1f9acabeda3 100644
--- a/apps/files/l10n/en_GB.json
+++ b/apps/files/l10n/en_GB.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
     "Actions" : "Actions",
     "Download" : "Download",
+    "Rename" : "Rename",
+    "Delete" : "Delete",
+    "Details" : "Details",
     "Select" : "Select",
     "Pending" : "Pending",
     "Unable to determine date" : "Unable to determine date",
@@ -99,7 +102,6 @@
     "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!",
     "No entries found in this folder" : "No entries found in this folder",
     "Select all" : "Select all",
-    "Delete" : "Delete",
     "Upload too large" : "Upload too large",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "The files you are trying to upload exceed the maximum size for file uploads on this server.",
     "Files are being scanned, please wait." : "Files are being scanned, please wait.",
diff --git a/apps/files/l10n/eo.js b/apps/files/l10n/eo.js
index 3c208a6bc17..b881c3d9d01 100644
--- a/apps/files/l10n/eo.js
+++ b/apps/files/l10n/eo.js
@@ -31,6 +31,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
     "Actions" : "Agoj",
     "Download" : "Elŝuti",
+    "Rename" : "Alinomigi",
+    "Delete" : "Forigi",
+    "Details" : "Detaloj",
     "Select" : "Elekti",
     "Pending" : "Traktotaj",
     "Error moving file" : "Eraris movo de dosiero",
@@ -76,7 +79,6 @@ OC.L10N.register(
     "Cancel upload" : "Nuligi alŝuton",
     "No files in here" : "Neniu dosiero estas ĉi tie",
     "Select all" : "Elekti ĉion",
-    "Delete" : "Forigi",
     "Upload too large" : "Alŝuto tro larĝa",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
     "Files are being scanned, please wait." : "Dosieroj estas skanataj, bonvolu atendi."
diff --git a/apps/files/l10n/eo.json b/apps/files/l10n/eo.json
index bf69b68d883..93f3bdbede1 100644
--- a/apps/files/l10n/eo.json
+++ b/apps/files/l10n/eo.json
@@ -29,6 +29,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
     "Actions" : "Agoj",
     "Download" : "Elŝuti",
+    "Rename" : "Alinomigi",
+    "Delete" : "Forigi",
+    "Details" : "Detaloj",
     "Select" : "Elekti",
     "Pending" : "Traktotaj",
     "Error moving file" : "Eraris movo de dosiero",
@@ -74,7 +77,6 @@
     "Cancel upload" : "Nuligi alŝuton",
     "No files in here" : "Neniu dosiero estas ĉi tie",
     "Select all" : "Elekti ĉion",
-    "Delete" : "Forigi",
     "Upload too large" : "Alŝuto tro larĝa",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
     "Files are being scanned, please wait." : "Dosieroj estas skanataj, bonvolu atendi."
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index 318a86e5884..11dce6e8da5 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
     "Actions" : "Acciones",
     "Download" : "Descargar",
+    "Rename" : "Renombrar",
+    "Delete" : "Eliminar",
+    "Details" : "Detalles",
     "Select" : "Seleccionar",
     "Pending" : "Pendiente",
     "Unable to determine date" : "No se pudo determinar la fecha",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Suba contenidos o sincronice sus dispositivos.",
     "No entries found in this folder" : "No hay entradas en esta carpeta",
     "Select all" : "Seleccionar todo",
-    "Delete" : "Eliminar",
     "Upload too large" : "Subida demasido grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que está intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
     "Files are being scanned, please wait." : "Los archivos se están escaneando, por favor espere.",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index 26761bf2073..6a325f1c3c6 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
     "Actions" : "Acciones",
     "Download" : "Descargar",
+    "Rename" : "Renombrar",
+    "Delete" : "Eliminar",
+    "Details" : "Detalles",
     "Select" : "Seleccionar",
     "Pending" : "Pendiente",
     "Unable to determine date" : "No se pudo determinar la fecha",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Suba contenidos o sincronice sus dispositivos.",
     "No entries found in this folder" : "No hay entradas en esta carpeta",
     "Select all" : "Seleccionar todo",
-    "Delete" : "Eliminar",
     "Upload too large" : "Subida demasido grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que está intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
     "Files are being scanned, please wait." : "Los archivos se están escaneando, por favor espere.",
diff --git a/apps/files/l10n/es_AR.js b/apps/files/l10n/es_AR.js
index f99464401b6..f81f0e6bed1 100644
--- a/apps/files/l10n/es_AR.js
+++ b/apps/files/l10n/es_AR.js
@@ -31,6 +31,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
     "Actions" : "Acciones",
     "Download" : "Descargar",
+    "Rename" : "Cambiar nombre",
+    "Delete" : "Borrar",
+    "Details" : "Detalles",
     "Select" : "Seleccionar",
     "Pending" : "Pendientes",
     "Error moving file" : "Error moviendo el archivo",
@@ -75,7 +78,6 @@ OC.L10N.register(
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
     "Cancel upload" : "Cancelar subida",
-    "Delete" : "Borrar",
     "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que intentás subir sobrepasan el tamaño máximo ",
     "Files are being scanned, please wait." : "Se están escaneando los archivos, por favor esperá."
diff --git a/apps/files/l10n/es_AR.json b/apps/files/l10n/es_AR.json
index 43dc9d35c3c..a9d5c8ece30 100644
--- a/apps/files/l10n/es_AR.json
+++ b/apps/files/l10n/es_AR.json
@@ -29,6 +29,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
     "Actions" : "Acciones",
     "Download" : "Descargar",
+    "Rename" : "Cambiar nombre",
+    "Delete" : "Borrar",
+    "Details" : "Detalles",
     "Select" : "Seleccionar",
     "Pending" : "Pendientes",
     "Error moving file" : "Error moviendo el archivo",
@@ -73,7 +76,6 @@
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
     "Cancel upload" : "Cancelar subida",
-    "Delete" : "Borrar",
     "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que intentás subir sobrepasan el tamaño máximo ",
     "Files are being scanned, please wait." : "Se están escaneando los archivos, por favor esperá."
diff --git a/apps/files/l10n/es_CL.js b/apps/files/l10n/es_CL.js
index c6269cdafd1..9b0929f50af 100644
--- a/apps/files/l10n/es_CL.js
+++ b/apps/files/l10n/es_CL.js
@@ -4,6 +4,8 @@ OC.L10N.register(
     "Unknown error" : "Error desconocido",
     "Files" : "Archivos",
     "Download" : "Descargar",
+    "Rename" : "Renombrar",
+    "Details" : "detalles",
     "Error" : "Error",
     "Upload" : "Subir",
     "New folder" : "Nuevo directorio",
diff --git a/apps/files/l10n/es_CL.json b/apps/files/l10n/es_CL.json
index 75215c9cb7f..57c23a61ea7 100644
--- a/apps/files/l10n/es_CL.json
+++ b/apps/files/l10n/es_CL.json
@@ -2,6 +2,8 @@
     "Unknown error" : "Error desconocido",
     "Files" : "Archivos",
     "Download" : "Descargar",
+    "Rename" : "Renombrar",
+    "Details" : "detalles",
     "Error" : "Error",
     "Upload" : "Subir",
     "New folder" : "Nuevo directorio",
diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js
index b58037005aa..29514b18226 100644
--- a/apps/files/l10n/es_MX.js
+++ b/apps/files/l10n/es_MX.js
@@ -31,6 +31,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
     "Actions" : "Acciones",
     "Download" : "Descargar",
+    "Rename" : "Renombrar",
+    "Delete" : "Eliminar",
+    "Details" : "Detalles",
     "Pending" : "Pendiente",
     "Error moving file" : "Error moviendo archivo",
     "Error" : "Error",
@@ -65,7 +68,6 @@ OC.L10N.register(
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
     "Cancel upload" : "Cancelar subida",
-    "Delete" : "Eliminar",
     "Upload too large" : "Subida demasido grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
     "Files are being scanned, please wait." : "Los archivos están siendo escaneados,  por favor espere."
diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json
index 5655fd4bf09..520f2d0c446 100644
--- a/apps/files/l10n/es_MX.json
+++ b/apps/files/l10n/es_MX.json
@@ -29,6 +29,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
     "Actions" : "Acciones",
     "Download" : "Descargar",
+    "Rename" : "Renombrar",
+    "Delete" : "Eliminar",
+    "Details" : "Detalles",
     "Pending" : "Pendiente",
     "Error moving file" : "Error moviendo archivo",
     "Error" : "Error",
@@ -63,7 +66,6 @@
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
     "Cancel upload" : "Cancelar subida",
-    "Delete" : "Eliminar",
     "Upload too large" : "Subida demasido grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
     "Files are being scanned, please wait." : "Los archivos están siendo escaneados,  por favor espere."
diff --git a/apps/files/l10n/et_EE.js b/apps/files/l10n/et_EE.js
index 173c6d5503a..86bda48300b 100644
--- a/apps/files/l10n/et_EE.js
+++ b/apps/files/l10n/et_EE.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
     "Actions" : "Tegevused",
     "Download" : "Lae alla",
+    "Rename" : "Nimeta ümber",
+    "Delete" : "Kustuta",
+    "Details" : "Üksikasjad",
     "Select" : "Vali",
     "Pending" : "Ootel",
     "Unable to determine date" : "Kuupäeva tuvastamine ei õnnestunud",
@@ -106,7 +109,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!",
     "No entries found in this folder" : "Selles kaustast ei leitud kirjeid",
     "Select all" : "Vali kõik",
-    "Delete" : "Kustuta",
     "Upload too large" : "Üleslaadimine on liiga suur",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
     "Files are being scanned, please wait." : "Faile skannitakse, palun oota.",
diff --git a/apps/files/l10n/et_EE.json b/apps/files/l10n/et_EE.json
index d880d3d4720..a95de6cf039 100644
--- a/apps/files/l10n/et_EE.json
+++ b/apps/files/l10n/et_EE.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
     "Actions" : "Tegevused",
     "Download" : "Lae alla",
+    "Rename" : "Nimeta ümber",
+    "Delete" : "Kustuta",
+    "Details" : "Üksikasjad",
     "Select" : "Vali",
     "Pending" : "Ootel",
     "Unable to determine date" : "Kuupäeva tuvastamine ei õnnestunud",
@@ -104,7 +107,6 @@
     "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!",
     "No entries found in this folder" : "Selles kaustast ei leitud kirjeid",
     "Select all" : "Vali kõik",
-    "Delete" : "Kustuta",
     "Upload too large" : "Üleslaadimine on liiga suur",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
     "Files are being scanned, please wait." : "Faile skannitakse, palun oota.",
diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js
index 249e73b1871..c01afc96c55 100644
--- a/apps/files/l10n/eu.js
+++ b/apps/files/l10n/eu.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
     "Actions" : "Ekintzak",
     "Download" : "Deskargatu",
+    "Rename" : "Berrizendatu",
+    "Delete" : "Ezabatu",
+    "Details" : "Xehetasunak",
     "Select" : "hautatu",
     "Pending" : "Zain",
     "Unable to determine date" : "Ezin izan da data zehaztu",
@@ -96,7 +99,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
     "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
     "Select all" : "Hautatu dena",
-    "Delete" : "Ezabatu",
     "Upload too large" : "Igoera handiegia da",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
     "Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json
index 5e610f3f4fa..997e8bf73cf 100644
--- a/apps/files/l10n/eu.json
+++ b/apps/files/l10n/eu.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
     "Actions" : "Ekintzak",
     "Download" : "Deskargatu",
+    "Rename" : "Berrizendatu",
+    "Delete" : "Ezabatu",
+    "Details" : "Xehetasunak",
     "Select" : "hautatu",
     "Pending" : "Zain",
     "Unable to determine date" : "Ezin izan da data zehaztu",
@@ -94,7 +97,6 @@
     "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
     "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
     "Select all" : "Hautatu dena",
-    "Delete" : "Ezabatu",
     "Upload too large" : "Igoera handiegia da",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
     "Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
diff --git a/apps/files/l10n/fa.js b/apps/files/l10n/fa.js
index 984c53c3740..d238f45eb7e 100644
--- a/apps/files/l10n/fa.js
+++ b/apps/files/l10n/fa.js
@@ -24,6 +24,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
     "Actions" : "فعالیت ها",
     "Download" : "دانلود",
+    "Rename" : "تغییرنام",
+    "Delete" : "حذف",
+    "Details" : "جزئیات",
     "Pending" : "در انتظار",
     "Error" : "خطا",
     "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
@@ -61,7 +64,6 @@ OC.L10N.register(
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
     "Cancel upload" : "متوقف کردن بار گذاری",
-    "Delete" : "حذف",
     "Upload too large" : "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
     "Files are being scanned, please wait." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
diff --git a/apps/files/l10n/fa.json b/apps/files/l10n/fa.json
index 361dbee1a1f..5985202ae8d 100644
--- a/apps/files/l10n/fa.json
+++ b/apps/files/l10n/fa.json
@@ -22,6 +22,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
     "Actions" : "فعالیت ها",
     "Download" : "دانلود",
+    "Rename" : "تغییرنام",
+    "Delete" : "حذف",
+    "Details" : "جزئیات",
     "Pending" : "در انتظار",
     "Error" : "خطا",
     "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
@@ -59,7 +62,6 @@
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
     "Cancel upload" : "متوقف کردن بار گذاری",
-    "Delete" : "حذف",
     "Upload too large" : "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
     "Files are being scanned, please wait." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js
index c6615a61234..a44c9f4fcd9 100644
--- a/apps/files/l10n/fi_FI.js
+++ b/apps/files/l10n/fi_FI.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
     "Actions" : "Toiminnot",
     "Download" : "Lataa",
+    "Rename" : "Nimeä uudelleen",
+    "Delete" : "Poista",
+    "Details" : "Tiedot",
     "Select" : "Valitse",
     "Pending" : "Odottaa",
     "Unable to determine date" : "Päivämäärän määrittäminen epäonnistui",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!",
     "No entries found in this folder" : "Ei kohteita tässä kansiossa",
     "Select all" : "Valitse kaikki",
-    "Delete" : "Poista",
     "Upload too large" : "Lähetettävä tiedosto on liian suuri",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
     "Files are being scanned, please wait." : "Tiedostoja tarkistetaan, odota hetki.",
diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json
index 9be7c66d37a..7528802b94b 100644
--- a/apps/files/l10n/fi_FI.json
+++ b/apps/files/l10n/fi_FI.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
     "Actions" : "Toiminnot",
     "Download" : "Lataa",
+    "Rename" : "Nimeä uudelleen",
+    "Delete" : "Poista",
+    "Details" : "Tiedot",
     "Select" : "Valitse",
     "Pending" : "Odottaa",
     "Unable to determine date" : "Päivämäärän määrittäminen epäonnistui",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!",
     "No entries found in this folder" : "Ei kohteita tässä kansiossa",
     "Select all" : "Valitse kaikki",
-    "Delete" : "Poista",
     "Upload too large" : "Lähetettävä tiedosto on liian suuri",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
     "Files are being scanned, please wait." : "Tiedostoja tarkistetaan, odota hetki.",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 3b84a6c0c53..bd39511a431 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
     "Actions" : "Actions",
     "Download" : "Télécharger",
+    "Rename" : "Renommer",
+    "Delete" : "Supprimer",
+    "Details" : "Détails",
     "Select" : "Sélectionner",
     "Pending" : "En attente",
     "Unable to determine date" : "Impossible de déterminer la date",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
     "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier",
     "Select all" : "Tout sélectionner",
-    "Delete" : "Supprimer",
     "Upload too large" : "Téléversement trop volumineux",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Les fichiers que vous essayez d'envoyer dépassent la taille maximale d'envoi permise par ce serveur.",
     "Files are being scanned, please wait." : "Les fichiers sont en cours d'analyse, veuillez patienter.",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 4d05b5a42c3..dbff6e6731d 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
     "Actions" : "Actions",
     "Download" : "Télécharger",
+    "Rename" : "Renommer",
+    "Delete" : "Supprimer",
+    "Details" : "Détails",
     "Select" : "Sélectionner",
     "Pending" : "En attente",
     "Unable to determine date" : "Impossible de déterminer la date",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
     "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier",
     "Select all" : "Tout sélectionner",
-    "Delete" : "Supprimer",
     "Upload too large" : "Téléversement trop volumineux",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Les fichiers que vous essayez d'envoyer dépassent la taille maximale d'envoi permise par ce serveur.",
     "Files are being scanned, please wait." : "Les fichiers sont en cours d'analyse, veuillez patienter.",
diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js
index 4293b3ab9ba..2910ab97ea4 100644
--- a/apps/files/l10n/gl.js
+++ b/apps/files/l10n/gl.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
     "Actions" : "Accións",
     "Download" : "Descargar",
+    "Rename" : "Renomear",
+    "Delete" : "Eliminar",
+    "Details" : "Detalles",
     "Select" : "Seleccionar",
     "Pending" : "Pendentes",
     "Unable to determine date" : "Non é posíbel determinar a data",
@@ -107,7 +110,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Envíe algún contido ou sincronice cos seus dispositivos!",
     "No entries found in this folder" : "Non se atoparon entradas neste cartafol",
     "Select all" : "Seleccionar todo",
-    "Delete" : "Eliminar",
     "Upload too large" : "Envío grande de máis",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
     "Files are being scanned, please wait." : "Estanse analizando os ficheiros. Agarde.",
diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json
index 34eeaa6a369..386df1569a9 100644
--- a/apps/files/l10n/gl.json
+++ b/apps/files/l10n/gl.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
     "Actions" : "Accións",
     "Download" : "Descargar",
+    "Rename" : "Renomear",
+    "Delete" : "Eliminar",
+    "Details" : "Detalles",
     "Select" : "Seleccionar",
     "Pending" : "Pendentes",
     "Unable to determine date" : "Non é posíbel determinar a data",
@@ -105,7 +108,6 @@
     "Upload some content or sync with your devices!" : "Envíe algún contido ou sincronice cos seus dispositivos!",
     "No entries found in this folder" : "Non se atoparon entradas neste cartafol",
     "Select all" : "Seleccionar todo",
-    "Delete" : "Eliminar",
     "Upload too large" : "Envío grande de máis",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
     "Files are being scanned, please wait." : "Estanse analizando os ficheiros. Agarde.",
diff --git a/apps/files/l10n/he.js b/apps/files/l10n/he.js
index 94956cbff0e..1eaf54aad71 100644
--- a/apps/files/l10n/he.js
+++ b/apps/files/l10n/he.js
@@ -24,6 +24,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
     "Actions" : "פעולות",
     "Download" : "הורדה",
+    "Rename" : "שינוי שם",
+    "Delete" : "מחיקה",
+    "Details" : "פרטים",
     "Select" : "בחר",
     "Pending" : "ממתין",
     "Error" : "שגיאה",
@@ -57,7 +60,6 @@ OC.L10N.register(
     "Settings" : "הגדרות",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "ביטול ההעלאה",
-    "Delete" : "מחיקה",
     "Upload too large" : "העלאה גדולה מידי",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
     "Files are being scanned, please wait." : "הקבצים נסרקים, נא להמתין."
diff --git a/apps/files/l10n/he.json b/apps/files/l10n/he.json
index 8dfc57f3276..fe56eef25c2 100644
--- a/apps/files/l10n/he.json
+++ b/apps/files/l10n/he.json
@@ -22,6 +22,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
     "Actions" : "פעולות",
     "Download" : "הורדה",
+    "Rename" : "שינוי שם",
+    "Delete" : "מחיקה",
+    "Details" : "פרטים",
     "Select" : "בחר",
     "Pending" : "ממתין",
     "Error" : "שגיאה",
@@ -55,7 +58,6 @@
     "Settings" : "הגדרות",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "ביטול ההעלאה",
-    "Delete" : "מחיקה",
     "Upload too large" : "העלאה גדולה מידי",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
     "Files are being scanned, please wait." : "הקבצים נסרקים, נא להמתין."
diff --git a/apps/files/l10n/hi.js b/apps/files/l10n/hi.js
index c040105875d..2a546af9b1e 100644
--- a/apps/files/l10n/hi.js
+++ b/apps/files/l10n/hi.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Files" : "फाइलें ",
     "Close" : "बंद करें ",
+    "Details" : "विवरण ",
     "Error" : "त्रुटि",
     "Upload" : "अपलोड ",
     "New folder" : "नया फ़ोल्डर",
diff --git a/apps/files/l10n/hi.json b/apps/files/l10n/hi.json
index 70db8f9d7f1..47830eca416 100644
--- a/apps/files/l10n/hi.json
+++ b/apps/files/l10n/hi.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Files" : "फाइलें ",
     "Close" : "बंद करें ",
+    "Details" : "विवरण ",
     "Error" : "त्रुटि",
     "Upload" : "अपलोड ",
     "New folder" : "नया फ़ोल्डर",
diff --git a/apps/files/l10n/hr.js b/apps/files/l10n/hr.js
index 379d43f4dbd..d6e48d1da13 100644
--- a/apps/files/l10n/hr.js
+++ b/apps/files/l10n/hr.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u tijeku. Napuštanje stranice prekinut će učitavanje.",
     "Actions" : "Radnje",
     "Download" : "Preuzimanje",
+    "Rename" : "Preimenujte",
+    "Delete" : "Izbrišite",
+    "Details" : "Detalji",
     "Select" : "Selektiraj",
     "Pending" : "Na čekanju",
     "Unable to determine date" : "Nemogucnost odredjivanja datuma",
@@ -96,7 +99,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!",
     "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ",
     "Select all" : "Selektiraj sve",
-    "Delete" : "Izbrišite",
     "Upload too large" : "Unos je prevelik",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati premašuju maksimalnu veličinu za unos datoteka na ovom poslužitelju.",
     "Files are being scanned, please wait." : "Datoteke se provjeravaju, molimo pričekajte.",
diff --git a/apps/files/l10n/hr.json b/apps/files/l10n/hr.json
index a8d935848ea..99f7737b66c 100644
--- a/apps/files/l10n/hr.json
+++ b/apps/files/l10n/hr.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u tijeku. Napuštanje stranice prekinut će učitavanje.",
     "Actions" : "Radnje",
     "Download" : "Preuzimanje",
+    "Rename" : "Preimenujte",
+    "Delete" : "Izbrišite",
+    "Details" : "Detalji",
     "Select" : "Selektiraj",
     "Pending" : "Na čekanju",
     "Unable to determine date" : "Nemogucnost odredjivanja datuma",
@@ -94,7 +97,6 @@
     "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!",
     "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ",
     "Select all" : "Selektiraj sve",
-    "Delete" : "Izbrišite",
     "Upload too large" : "Unos je prevelik",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati premašuju maksimalnu veličinu za unos datoteka na ovom poslužitelju.",
     "Files are being scanned, please wait." : "Datoteke se provjeravaju, molimo pričekajte.",
diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js
index 8b9b7c17f15..dfa628279c9 100644
--- a/apps/files/l10n/hu_HU.js
+++ b/apps/files/l10n/hu_HU.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
     "Actions" : "Műveletek",
     "Download" : "Letöltés",
+    "Rename" : "Átnevezés",
+    "Delete" : "Törlés",
+    "Details" : "Részletek",
     "Select" : "Kiválaszt",
     "Pending" : "Folyamatban",
     "Unable to determine date" : "Nem lehet meghatározni a dátumot",
@@ -95,7 +98,7 @@ OC.L10N.register(
     "%2$s restored %1$s" : "%1$s visszatöltötte %2$s",
     "%s could not be renamed as it has been deleted" : "%s nem lehet átnevezni, mivel törölve lett",
     "%s could not be renamed" : "%s átnevezése nem sikerült",
-    "Upload (max. %s)" : "Feltöltés (max. %s)",
+    "Upload (max. %s)" : "Feltöltés (max.: %s)",
     "File handling" : "Fájlkezelés",
     "Maximum upload size" : "Maximális feltölthető fájlméret",
     "max. possible: " : "max. lehetséges: ",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!",
     "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban",
     "Select all" : "Összes kijelölése",
-    "Delete" : "Törlés",
     "Upload too large" : "A feltöltés túl nagy",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
     "Files are being scanned, please wait." : "A fájllista ellenőrzése zajlik, kis türelmet!",
diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json
index 6d82cd60413..0a6c87b9892 100644
--- a/apps/files/l10n/hu_HU.json
+++ b/apps/files/l10n/hu_HU.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
     "Actions" : "Műveletek",
     "Download" : "Letöltés",
+    "Rename" : "Átnevezés",
+    "Delete" : "Törlés",
+    "Details" : "Részletek",
     "Select" : "Kiválaszt",
     "Pending" : "Folyamatban",
     "Unable to determine date" : "Nem lehet meghatározni a dátumot",
@@ -93,7 +96,7 @@
     "%2$s restored %1$s" : "%1$s visszatöltötte %2$s",
     "%s could not be renamed as it has been deleted" : "%s nem lehet átnevezni, mivel törölve lett",
     "%s could not be renamed" : "%s átnevezése nem sikerült",
-    "Upload (max. %s)" : "Feltöltés (max. %s)",
+    "Upload (max. %s)" : "Feltöltés (max.: %s)",
     "File handling" : "Fájlkezelés",
     "Maximum upload size" : "Maximális feltölthető fájlméret",
     "max. possible: " : "max. lehetséges: ",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!",
     "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban",
     "Select all" : "Összes kijelölése",
-    "Delete" : "Törlés",
     "Upload too large" : "A feltöltés túl nagy",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
     "Files are being scanned, please wait." : "A fájllista ellenőrzése zajlik, kis türelmet!",
diff --git a/apps/files/l10n/hy.js b/apps/files/l10n/hy.js
index 9ddfc91b18b..7c49399856c 100644
--- a/apps/files/l10n/hy.js
+++ b/apps/files/l10n/hy.js
@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Close" : "Փակել",
     "Download" : "Բեռնել",
-    "Save" : "Պահպանել",
-    "Delete" : "Ջնջել"
+    "Delete" : "Ջնջել",
+    "Save" : "Պահպանել"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/hy.json b/apps/files/l10n/hy.json
index 2c9d1859b12..8501b7eb9b2 100644
--- a/apps/files/l10n/hy.json
+++ b/apps/files/l10n/hy.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Close" : "Փակել",
     "Download" : "Բեռնել",
-    "Save" : "Պահպանել",
-    "Delete" : "Ջնջել"
+    "Delete" : "Ջնջել",
+    "Save" : "Պահպանել"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/ia.js b/apps/files/l10n/ia.js
index 9b5d321937e..84f3b4d8c45 100644
--- a/apps/files/l10n/ia.js
+++ b/apps/files/l10n/ia.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Home" : "Domo",
     "Close" : "Clauder",
     "Download" : "Discargar",
+    "Delete" : "Deler",
     "Error" : "Error",
     "Name" : "Nomine",
     "Size" : "Dimension",
@@ -36,7 +37,6 @@ OC.L10N.register(
     "Maximum upload size" : "Dimension maxime de incargamento",
     "Save" : "Salveguardar",
     "Settings" : "Configurationes",
-    "Delete" : "Deler",
     "Upload too large" : "Incargamento troppo longe"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ia.json b/apps/files/l10n/ia.json
index 461634d526a..2843f8789ac 100644
--- a/apps/files/l10n/ia.json
+++ b/apps/files/l10n/ia.json
@@ -7,6 +7,7 @@
     "Home" : "Domo",
     "Close" : "Clauder",
     "Download" : "Discargar",
+    "Delete" : "Deler",
     "Error" : "Error",
     "Name" : "Nomine",
     "Size" : "Dimension",
@@ -34,7 +35,6 @@
     "Maximum upload size" : "Dimension maxime de incargamento",
     "Save" : "Salveguardar",
     "Settings" : "Configurationes",
-    "Delete" : "Deler",
     "Upload too large" : "Incargamento troppo longe"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js
index e41d94643a9..4eb8836d1c8 100644
--- a/apps/files/l10n/id.js
+++ b/apps/files/l10n/id.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
     "Actions" : "Tindakan",
     "Download" : "Unduh",
+    "Rename" : "Ubah nama",
+    "Delete" : "Hapus",
+    "Details" : "Rincian",
     "Select" : "Pilih",
     "Pending" : "Tertunda",
     "Unable to determine date" : "Tidak dapat menentukan tanggal",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!",
     "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
     "Select all" : "Pilih Semua",
-    "Delete" : "Hapus",
     "Upload too large" : "Yang diunggah terlalu besar",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
     "Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.",
diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json
index 6be0c1a226c..bcf66fa3a1e 100644
--- a/apps/files/l10n/id.json
+++ b/apps/files/l10n/id.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
     "Actions" : "Tindakan",
     "Download" : "Unduh",
+    "Rename" : "Ubah nama",
+    "Delete" : "Hapus",
+    "Details" : "Rincian",
     "Select" : "Pilih",
     "Pending" : "Tertunda",
     "Unable to determine date" : "Tidak dapat menentukan tanggal",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!",
     "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
     "Select all" : "Pilih Semua",
-    "Delete" : "Hapus",
     "Upload too large" : "Yang diunggah terlalu besar",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
     "Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.",
diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js
index 7ac24eba462..780dbe4301f 100644
--- a/apps/files/l10n/is.js
+++ b/apps/files/l10n/is.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "Upload cancelled." : "Hætt við innsendingu.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.",
     "Download" : "Niðurhal",
+    "Rename" : "Endurskýra",
+    "Delete" : "Eyða",
     "Select" : "Velja",
     "Pending" : "Bíður",
     "Error" : "Villa",
@@ -38,7 +40,6 @@ OC.L10N.register(
     "Cancel upload" : "Hætta við innsendingu",
     "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
     "Select all" : "Velja allt",
-    "Delete" : "Eyða",
     "Upload too large" : "Innsend skrá er of stór",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
     "Files are being scanned, please wait." : "Verið er að skima skrár, vinsamlegast hinkraðu."
diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json
index 8e723d963a7..aed9568f7d0 100644
--- a/apps/files/l10n/is.json
+++ b/apps/files/l10n/is.json
@@ -15,6 +15,8 @@
     "Upload cancelled." : "Hætt við innsendingu.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.",
     "Download" : "Niðurhal",
+    "Rename" : "Endurskýra",
+    "Delete" : "Eyða",
     "Select" : "Velja",
     "Pending" : "Bíður",
     "Error" : "Villa",
@@ -36,7 +38,6 @@
     "Cancel upload" : "Hætta við innsendingu",
     "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
     "Select all" : "Velja allt",
-    "Delete" : "Eyða",
     "Upload too large" : "Innsend skrá er of stór",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
     "Files are being scanned, please wait." : "Verið er að skima skrár, vinsamlegast hinkraðu."
diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js
index aa92ffc0f70..681940955dc 100644
--- a/apps/files/l10n/it.js
+++ b/apps/files/l10n/it.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
     "Actions" : "Azioni",
     "Download" : "Scarica",
+    "Rename" : "Rinomina",
+    "Delete" : "Elimina",
+    "Details" : "Dettagli",
     "Select" : "Seleziona",
     "Pending" : "In corso",
     "Unable to determine date" : "Impossibile determinare la data",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!",
     "No entries found in this folder" : "Nessuna voce trovata in questa cartella",
     "Select all" : "Seleziona tutto",
-    "Delete" : "Elimina",
     "Upload too large" : "Caricamento troppo grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
     "Files are being scanned, please wait." : "Scansione dei file in corso, attendi",
diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json
index 8f18858b2eb..1075d43e984 100644
--- a/apps/files/l10n/it.json
+++ b/apps/files/l10n/it.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
     "Actions" : "Azioni",
     "Download" : "Scarica",
+    "Rename" : "Rinomina",
+    "Delete" : "Elimina",
+    "Details" : "Dettagli",
     "Select" : "Seleziona",
     "Pending" : "In corso",
     "Unable to determine date" : "Impossibile determinare la data",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!",
     "No entries found in this folder" : "Nessuna voce trovata in questa cartella",
     "Select all" : "Seleziona tutto",
-    "Delete" : "Elimina",
     "Upload too large" : "Caricamento troppo grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
     "Files are being scanned, please wait." : "Scansione dei file in corso, attendi",
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 91e75e6e76a..dbf66176c06 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
     "Actions" : "アクション",
     "Download" : "ダウンロード",
+    "Rename" : "名前の変更",
+    "Delete" : "削除",
+    "Details" : "詳細",
     "Select" : "選択",
     "Pending" : "中断",
     "Unable to determine date" : "更新日不明",
@@ -108,7 +111,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。",
     "No entries found in this folder" : "このフォルダーにはエントリーがありません",
     "Select all" : "すべて選択",
-    "Delete" : "削除",
     "Upload too large" : "アップロードには大きすぎます。",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
     "Files are being scanned, please wait." : "ファイルをスキャンしています、しばらくお待ちください。",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index 7c0c94c0348..5a562f400c0 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
     "Actions" : "アクション",
     "Download" : "ダウンロード",
+    "Rename" : "名前の変更",
+    "Delete" : "削除",
+    "Details" : "詳細",
     "Select" : "選択",
     "Pending" : "中断",
     "Unable to determine date" : "更新日不明",
@@ -106,7 +109,6 @@
     "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。",
     "No entries found in this folder" : "このフォルダーにはエントリーがありません",
     "Select all" : "すべて選択",
-    "Delete" : "削除",
     "Upload too large" : "アップロードには大きすぎます。",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
     "Files are being scanned, please wait." : "ファイルをスキャンしています、しばらくお待ちください。",
diff --git a/apps/files/l10n/ka_GE.js b/apps/files/l10n/ka_GE.js
index 33135feb7cc..c76e75864f9 100644
--- a/apps/files/l10n/ka_GE.js
+++ b/apps/files/l10n/ka_GE.js
@@ -22,6 +22,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
     "Actions" : "მოქმედებები",
     "Download" : "ჩამოტვირთვა",
+    "Rename" : "გადარქმევა",
+    "Delete" : "წაშლა",
+    "Details" : "დეტალური ინფორმაცია",
     "Pending" : "მოცდის რეჟიმში",
     "Error" : "შეცდომა",
     "{new_name} already exists" : "{new_name} უკვე არსებობს",
@@ -44,7 +47,6 @@ OC.L10N.register(
     "Settings" : "პარამეტრები",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "ატვირთვის გაუქმება",
-    "Delete" : "წაშლა",
     "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",
     "Files are being scanned, please wait." : "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
diff --git a/apps/files/l10n/ka_GE.json b/apps/files/l10n/ka_GE.json
index ef3f109d306..058bee2618b 100644
--- a/apps/files/l10n/ka_GE.json
+++ b/apps/files/l10n/ka_GE.json
@@ -20,6 +20,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
     "Actions" : "მოქმედებები",
     "Download" : "ჩამოტვირთვა",
+    "Rename" : "გადარქმევა",
+    "Delete" : "წაშლა",
+    "Details" : "დეტალური ინფორმაცია",
     "Pending" : "მოცდის რეჟიმში",
     "Error" : "შეცდომა",
     "{new_name} already exists" : "{new_name} უკვე არსებობს",
@@ -42,7 +45,6 @@
     "Settings" : "პარამეტრები",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "ატვირთვის გაუქმება",
-    "Delete" : "წაშლა",
     "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",
     "Files are being scanned, please wait." : "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
diff --git a/apps/files/l10n/km.js b/apps/files/l10n/km.js
index 6b8517e7229..030bdd35eda 100644
--- a/apps/files/l10n/km.js
+++ b/apps/files/l10n/km.js
@@ -10,6 +10,9 @@ OC.L10N.register(
     "Close" : "បិទ",
     "Upload cancelled." : "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
     "Download" : "ទាញយក",
+    "Rename" : "ប្ដូរ​ឈ្មោះ",
+    "Delete" : "លុប",
+    "Details" : "ព័ត៌មាន​លម្អិត",
     "Pending" : "កំពុង​រង់ចាំ",
     "Error" : "កំហុស",
     "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
@@ -33,7 +36,6 @@ OC.L10N.register(
     "Settings" : "ការកំណត់",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "បោះបង់​ការ​ផ្ទុកឡើង",
-    "Delete" : "លុប",
     "Upload too large" : "ផ្ទុក​ឡើង​ធំ​ពេក"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files/l10n/km.json b/apps/files/l10n/km.json
index ebbb9a8b4ab..679787a5ce2 100644
--- a/apps/files/l10n/km.json
+++ b/apps/files/l10n/km.json
@@ -8,6 +8,9 @@
     "Close" : "បិទ",
     "Upload cancelled." : "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
     "Download" : "ទាញយក",
+    "Rename" : "ប្ដូរ​ឈ្មោះ",
+    "Delete" : "លុប",
+    "Details" : "ព័ត៌មាន​លម្អិត",
     "Pending" : "កំពុង​រង់ចាំ",
     "Error" : "កំហុស",
     "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
@@ -31,7 +34,6 @@
     "Settings" : "ការកំណត់",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "បោះបង់​ការ​ផ្ទុកឡើង",
-    "Delete" : "លុប",
     "Upload too large" : "ផ្ទុក​ឡើង​ធំ​ពេក"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/kn.js b/apps/files/l10n/kn.js
index 9bd8982fdaf..7538d9b033e 100644
--- a/apps/files/l10n/kn.js
+++ b/apps/files/l10n/kn.js
@@ -29,6 +29,8 @@ OC.L10N.register(
     "Upload cancelled." : "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಯಿತು.",
     "Could not get result from server." : "ಪರಿಚಾರಕ ಕಣಕದಿಂದ ಫಲಿತಾಂಶವನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.",
     "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ",
+    "Rename" : "ಮರುಹೆಸರಿಸು",
+    "Delete" : "ಅಳಿಸಿ",
     "Select" : "ಆಯ್ಕೆ ಮಾಡಿ",
     "Pending" : "ಬಾಕಿ ಇದೆ",
     "Unable to determine date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕ ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ",
@@ -64,7 +66,6 @@ OC.L10N.register(
     "WebDAV" : "WebDAV",
     "Cancel upload" : "ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ",
     "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ",
-    "Delete" : "ಅಳಿಸಿ",
     "Upload too large" : "ದೊಡ್ಡ ಪ್ರಮಾಣದ ಪ್ರತಿಗಳನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾದ್ಯವಿಲ್ಲ",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ನೀವು ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಕಡತಗಳ ಗಾತ್ರ, ಈ ಗಣಕ ಕೋಶದ ಗರಿಷ್ಠ ಕಡತ ಮೀತಿಯಾನ್ನು ಮೀರುವಂತಿಲ್ಲ.",
     "Files are being scanned, please wait." : "ಕಡತಗಳನ್ನು ಪರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ, ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ.",
diff --git a/apps/files/l10n/kn.json b/apps/files/l10n/kn.json
index 803b1c87cf4..b9f55d4151a 100644
--- a/apps/files/l10n/kn.json
+++ b/apps/files/l10n/kn.json
@@ -27,6 +27,8 @@
     "Upload cancelled." : "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಯಿತು.",
     "Could not get result from server." : "ಪರಿಚಾರಕ ಕಣಕದಿಂದ ಫಲಿತಾಂಶವನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.",
     "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ",
+    "Rename" : "ಮರುಹೆಸರಿಸು",
+    "Delete" : "ಅಳಿಸಿ",
     "Select" : "ಆಯ್ಕೆ ಮಾಡಿ",
     "Pending" : "ಬಾಕಿ ಇದೆ",
     "Unable to determine date" : "ಮುಕ್ತಾಯ ದಿನಾಂಕ ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ",
@@ -62,7 +64,6 @@
     "WebDAV" : "WebDAV",
     "Cancel upload" : "ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ",
     "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ",
-    "Delete" : "ಅಳಿಸಿ",
     "Upload too large" : "ದೊಡ್ಡ ಪ್ರಮಾಣದ ಪ್ರತಿಗಳನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾದ್ಯವಿಲ್ಲ",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ನೀವು ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಕಡತಗಳ ಗಾತ್ರ, ಈ ಗಣಕ ಕೋಶದ ಗರಿಷ್ಠ ಕಡತ ಮೀತಿಯಾನ್ನು ಮೀರುವಂತಿಲ್ಲ.",
     "Files are being scanned, please wait." : "ಕಡತಗಳನ್ನು ಪರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ, ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ.",
diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js
index 709e0faa0cb..87b7d0e655c 100644
--- a/apps/files/l10n/ko.js
+++ b/apps/files/l10n/ko.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
     "Actions" : "작업",
     "Download" : "다운로드",
+    "Rename" : "이름 바꾸기",
+    "Delete" : "삭제",
+    "Details" : "자세한 정보",
     "Select" : "선택",
     "Pending" : "대기 중",
     "Unable to determine date" : "날짜를 결정할 수 없음",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!",
     "No entries found in this folder" : "이 폴더에 항목 없음",
     "Select all" : "모두 선택",
-    "Delete" : "삭제",
     "Upload too large" : "업로드한 파일이 너무 큼",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
     "Files are being scanned, please wait." : "파일을 검색하고 있습니다. 기다려 주십시오.",
diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json
index e8f89a5c142..8a9dc1cf432 100644
--- a/apps/files/l10n/ko.json
+++ b/apps/files/l10n/ko.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
     "Actions" : "작업",
     "Download" : "다운로드",
+    "Rename" : "이름 바꾸기",
+    "Delete" : "삭제",
+    "Details" : "자세한 정보",
     "Select" : "선택",
     "Pending" : "대기 중",
     "Unable to determine date" : "날짜를 결정할 수 없음",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!",
     "No entries found in this folder" : "이 폴더에 항목 없음",
     "Select all" : "모두 선택",
-    "Delete" : "삭제",
     "Upload too large" : "업로드한 파일이 너무 큼",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
     "Files are being scanned, please wait." : "파일을 검색하고 있습니다. 기다려 주십시오.",
diff --git a/apps/files/l10n/lb.js b/apps/files/l10n/lb.js
index 513d802c1e4..047aac2dbb3 100644
--- a/apps/files/l10n/lb.js
+++ b/apps/files/l10n/lb.js
@@ -15,6 +15,9 @@ OC.L10N.register(
     "Upload cancelled." : "Upload ofgebrach.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
     "Download" : "Download",
+    "Rename" : "Ëmbenennen",
+    "Delete" : "Läschen",
+    "Details" : "Detailer",
     "Select" : "Auswielen",
     "Error" : "Fehler",
     "Name" : "Numm",
@@ -33,7 +36,6 @@ OC.L10N.register(
     "Cancel upload" : "Upload ofbriechen",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Select all" : "All auswielen",
-    "Delete" : "Läschen",
     "Upload too large" : "Upload ze grouss",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
     "Files are being scanned, please wait." : "Fichieren gi gescannt, war weg."
diff --git a/apps/files/l10n/lb.json b/apps/files/l10n/lb.json
index fb586a90991..f298444a35f 100644
--- a/apps/files/l10n/lb.json
+++ b/apps/files/l10n/lb.json
@@ -13,6 +13,9 @@
     "Upload cancelled." : "Upload ofgebrach.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
     "Download" : "Download",
+    "Rename" : "Ëmbenennen",
+    "Delete" : "Läschen",
+    "Details" : "Detailer",
     "Select" : "Auswielen",
     "Error" : "Fehler",
     "Name" : "Numm",
@@ -31,7 +34,6 @@
     "Cancel upload" : "Upload ofbriechen",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Select all" : "All auswielen",
-    "Delete" : "Läschen",
     "Upload too large" : "Upload ze grouss",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
     "Files are being scanned, please wait." : "Fichieren gi gescannt, war weg."
diff --git a/apps/files/l10n/lt_LT.js b/apps/files/l10n/lt_LT.js
index 26fb351f50d..063789aae5b 100644
--- a/apps/files/l10n/lt_LT.js
+++ b/apps/files/l10n/lt_LT.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
     "Actions" : "Veiksmai",
     "Download" : "Atsisiųsti",
+    "Rename" : "Pervadinti",
+    "Delete" : "Ištrinti",
+    "Details" : "Informacija",
     "Select" : "Pasirinkiti",
     "Pending" : "Laukiantis",
     "Unable to determine date" : "Nepavyksta nustatyti datos",
@@ -105,7 +108,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!",
     "No entries found in this folder" : "Nerasta įrašų šiame aplanke",
     "Select all" : "Pažymėti viską",
-    "Delete" : "Ištrinti",
     "Upload too large" : "Įkėlimui failas per didelis",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
     "Files are being scanned, please wait." : "Skenuojami failai, prašome palaukti.",
diff --git a/apps/files/l10n/lt_LT.json b/apps/files/l10n/lt_LT.json
index ee8fb0480c2..d7aa2cc9c35 100644
--- a/apps/files/l10n/lt_LT.json
+++ b/apps/files/l10n/lt_LT.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
     "Actions" : "Veiksmai",
     "Download" : "Atsisiųsti",
+    "Rename" : "Pervadinti",
+    "Delete" : "Ištrinti",
+    "Details" : "Informacija",
     "Select" : "Pasirinkiti",
     "Pending" : "Laukiantis",
     "Unable to determine date" : "Nepavyksta nustatyti datos",
@@ -103,7 +106,6 @@
     "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!",
     "No entries found in this folder" : "Nerasta įrašų šiame aplanke",
     "Select all" : "Pažymėti viską",
-    "Delete" : "Ištrinti",
     "Upload too large" : "Įkėlimui failas per didelis",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
     "Files are being scanned, please wait." : "Skenuojami failai, prašome palaukti.",
diff --git a/apps/files/l10n/lv.js b/apps/files/l10n/lv.js
index e86b2d335e7..fa5ddf4f402 100644
--- a/apps/files/l10n/lv.js
+++ b/apps/files/l10n/lv.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
     "Actions" : "Darbības",
     "Download" : "Lejupielādēt",
+    "Rename" : "Pārsaukt",
+    "Delete" : "Dzēst",
+    "Details" : "Detaļas",
     "Select" : "Norādīt",
     "Pending" : "Gaida savu kārtu",
     "Unable to determine date" : "Neizdevās noteikt datumu",
@@ -98,7 +101,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!",
     "No entries found in this folder" : "Šajā mapē nekas nav atrasts",
     "Select all" : "Atzīmēt visu",
-    "Delete" : "Dzēst",
     "Upload too large" : "Datne ir par lielu, lai to augšupielādētu",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
     "Files are being scanned, please wait." : "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json
index 7a5a53c1305..b164c88e381 100644
--- a/apps/files/l10n/lv.json
+++ b/apps/files/l10n/lv.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
     "Actions" : "Darbības",
     "Download" : "Lejupielādēt",
+    "Rename" : "Pārsaukt",
+    "Delete" : "Dzēst",
+    "Details" : "Detaļas",
     "Select" : "Norādīt",
     "Pending" : "Gaida savu kārtu",
     "Unable to determine date" : "Neizdevās noteikt datumu",
@@ -96,7 +99,6 @@
     "Upload some content or sync with your devices!" : "Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!",
     "No entries found in this folder" : "Šajā mapē nekas nav atrasts",
     "Select all" : "Atzīmēt visu",
-    "Delete" : "Dzēst",
     "Upload too large" : "Datne ir par lielu, lai to augšupielādētu",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
     "Files are being scanned, please wait." : "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
diff --git a/apps/files/l10n/mk.js b/apps/files/l10n/mk.js
index b9225ac6708..e6265c851e8 100644
--- a/apps/files/l10n/mk.js
+++ b/apps/files/l10n/mk.js
@@ -28,6 +28,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
     "Actions" : "Акции",
     "Download" : "Преземи",
+    "Rename" : "Преименувај",
+    "Delete" : "Избриши",
+    "Details" : "Детали:",
     "Select" : "Избери",
     "Pending" : "Чека",
     "Error moving file" : "Грешка при префрлање на датотека",
@@ -63,7 +66,6 @@ OC.L10N.register(
     "Settings" : "Подесувања",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "Откажи прикачување",
-    "Delete" : "Избриши",
     "Upload too large" : "Фајлот кој се вчитува е преголем",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
     "Files are being scanned, please wait." : "Се скенираат датотеки, ве молам почекајте."
diff --git a/apps/files/l10n/mk.json b/apps/files/l10n/mk.json
index e6ce76ecb45..0806f7d0966 100644
--- a/apps/files/l10n/mk.json
+++ b/apps/files/l10n/mk.json
@@ -26,6 +26,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
     "Actions" : "Акции",
     "Download" : "Преземи",
+    "Rename" : "Преименувај",
+    "Delete" : "Избриши",
+    "Details" : "Детали:",
     "Select" : "Избери",
     "Pending" : "Чека",
     "Error moving file" : "Грешка при префрлање на датотека",
@@ -61,7 +64,6 @@
     "Settings" : "Подесувања",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "Откажи прикачување",
-    "Delete" : "Избриши",
     "Upload too large" : "Фајлот кој се вчитува е преголем",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
     "Files are being scanned, please wait." : "Се скенираат датотеки, ве молам почекајте."
diff --git a/apps/files/l10n/ms_MY.js b/apps/files/l10n/ms_MY.js
index 0bbbe400b28..7ef2afeb84e 100644
--- a/apps/files/l10n/ms_MY.js
+++ b/apps/files/l10n/ms_MY.js
@@ -13,6 +13,8 @@ OC.L10N.register(
     "Close" : "Tutup",
     "Upload cancelled." : "Muatnaik dibatalkan.",
     "Download" : "Muat turun",
+    "Rename" : "Namakan",
+    "Delete" : "Padam",
     "Pending" : "Dalam proses",
     "Error" : "Ralat",
     "Name" : "Nama",
@@ -31,7 +33,6 @@ OC.L10N.register(
     "Save" : "Simpan",
     "Settings" : "Tetapan",
     "Cancel upload" : "Batal muat naik",
-    "Delete" : "Padam",
     "Upload too large" : "Muatnaik terlalu besar",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
     "Files are being scanned, please wait." : "Fail sedang diimbas, harap bersabar."
diff --git a/apps/files/l10n/ms_MY.json b/apps/files/l10n/ms_MY.json
index 071fab23194..aec2dd50949 100644
--- a/apps/files/l10n/ms_MY.json
+++ b/apps/files/l10n/ms_MY.json
@@ -11,6 +11,8 @@
     "Close" : "Tutup",
     "Upload cancelled." : "Muatnaik dibatalkan.",
     "Download" : "Muat turun",
+    "Rename" : "Namakan",
+    "Delete" : "Padam",
     "Pending" : "Dalam proses",
     "Error" : "Ralat",
     "Name" : "Nama",
@@ -29,7 +31,6 @@
     "Save" : "Simpan",
     "Settings" : "Tetapan",
     "Cancel upload" : "Batal muat naik",
-    "Delete" : "Padam",
     "Upload too large" : "Muatnaik terlalu besar",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
     "Files are being scanned, please wait." : "Fail sedang diimbas, harap bersabar."
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index c91f212cf23..3d27173708d 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
     "Actions" : "Handlinger",
     "Download" : "Last ned",
+    "Rename" : "Gi nytt navn",
+    "Delete" : "Slett",
+    "Details" : "Detaljer",
     "Select" : "Velg",
     "Pending" : "Ventende",
     "Unable to determine date" : "Kan ikke fastslå datoen",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!",
     "No entries found in this folder" : "Ingen oppføringer funnet i denne mappen",
     "Select all" : "Velg alle",
-    "Delete" : "Slett",
     "Upload too large" : "Filen er for stor",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å laste opp er for store til å laste opp til denne serveren.",
     "Files are being scanned, please wait." : "Skanner filer, vennligst vent.",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index cd476ef3bcf..a7e0cf33b83 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
     "Actions" : "Handlinger",
     "Download" : "Last ned",
+    "Rename" : "Gi nytt navn",
+    "Delete" : "Slett",
+    "Details" : "Detaljer",
     "Select" : "Velg",
     "Pending" : "Ventende",
     "Unable to determine date" : "Kan ikke fastslå datoen",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!",
     "No entries found in this folder" : "Ingen oppføringer funnet i denne mappen",
     "Select all" : "Velg alle",
-    "Delete" : "Slett",
     "Upload too large" : "Filen er for stor",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å laste opp er for store til å laste opp til denne serveren.",
     "Files are being scanned, please wait." : "Skanner filer, vennligst vent.",
diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js
index 3470d011dc6..c11318c2890 100644
--- a/apps/files/l10n/nl.js
+++ b/apps/files/l10n/nl.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
     "Actions" : "Acties",
     "Download" : "Downloaden",
+    "Rename" : "Naam wijzigen",
+    "Delete" : "Verwijderen",
+    "Details" : "Details",
     "Select" : "Selecteer",
     "Pending" : "In behandeling",
     "Unable to determine date" : "Kon datum niet vaststellen",
@@ -109,7 +112,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Upload bestanden of synchroniseer met uw apparaten!",
     "No entries found in this folder" : "Niets",
     "Select all" : "Alles selecteren",
-    "Delete" : "Verwijderen",
     "Upload too large" : "Upload is te groot",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
     "Files are being scanned, please wait." : "Bestanden worden gescand, even wachten.",
diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json
index 04c0b7916b5..1a80d1eb3f1 100644
--- a/apps/files/l10n/nl.json
+++ b/apps/files/l10n/nl.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
     "Actions" : "Acties",
     "Download" : "Downloaden",
+    "Rename" : "Naam wijzigen",
+    "Delete" : "Verwijderen",
+    "Details" : "Details",
     "Select" : "Selecteer",
     "Pending" : "In behandeling",
     "Unable to determine date" : "Kon datum niet vaststellen",
@@ -107,7 +110,6 @@
     "Upload some content or sync with your devices!" : "Upload bestanden of synchroniseer met uw apparaten!",
     "No entries found in this folder" : "Niets",
     "Select all" : "Alles selecteren",
-    "Delete" : "Verwijderen",
     "Upload too large" : "Upload is te groot",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
     "Files are being scanned, please wait." : "Bestanden worden gescand, even wachten.",
diff --git a/apps/files/l10n/nn_NO.js b/apps/files/l10n/nn_NO.js
index cc993f5ca6d..924670d596b 100644
--- a/apps/files/l10n/nn_NO.js
+++ b/apps/files/l10n/nn_NO.js
@@ -28,6 +28,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
     "Actions" : "Handlingar",
     "Download" : "Last ned",
+    "Rename" : "Endra namn",
+    "Delete" : "Slett",
+    "Details" : "Detaljar",
     "Pending" : "Under vegs",
     "Error moving file" : "Feil ved flytting av fil",
     "Error" : "Feil",
@@ -66,7 +69,6 @@ OC.L10N.register(
     "Settings" : "Innstillingar",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "Avbryt opplasting",
-    "Delete" : "Slett",
     "Upload too large" : "For stor opplasting",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
     "Files are being scanned, please wait." : "Skannar filer, ver venleg og vent."
diff --git a/apps/files/l10n/nn_NO.json b/apps/files/l10n/nn_NO.json
index 62d1cfb2c50..05e6f0a9d2d 100644
--- a/apps/files/l10n/nn_NO.json
+++ b/apps/files/l10n/nn_NO.json
@@ -26,6 +26,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
     "Actions" : "Handlingar",
     "Download" : "Last ned",
+    "Rename" : "Endra namn",
+    "Delete" : "Slett",
+    "Details" : "Detaljar",
     "Pending" : "Under vegs",
     "Error moving file" : "Feil ved flytting av fil",
     "Error" : "Feil",
@@ -64,7 +67,6 @@
     "Settings" : "Innstillingar",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "Avbryt opplasting",
-    "Delete" : "Slett",
     "Upload too large" : "For stor opplasting",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
     "Files are being scanned, please wait." : "Skannar filer, ver venleg og vent."
diff --git a/apps/files/l10n/oc.js b/apps/files/l10n/oc.js
index 75bceacac3b..30b51c8f5f8 100644
--- a/apps/files/l10n/oc.js
+++ b/apps/files/l10n/oc.js
@@ -38,6 +38,8 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Lo mandadís del fichièr es en cors. Quitar aquesta pagina ara anullarà lo mandadís del fichièr.",
     "Actions" : "Accions",
     "Download" : "Telecargar",
+    "Rename" : "Renomenar",
+    "Delete" : "Suprimir",
     "Select" : "Seleccionar",
     "Pending" : "En espèra",
     "Unable to determine date" : "Impossible de determinar la data",
@@ -101,7 +103,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Depausatz de contengut o sincronizatz vòstres aparelhs !",
     "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr",
     "Select all" : "Seleccionar tot",
-    "Delete" : "Suprimir",
     "Upload too large" : "Mandadís tròp voluminós",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los fichièrs qu'ensajatz de mandar depassan la talha maximala de mandadís permesa per aqueste servidor.",
     "Files are being scanned, please wait." : "Los fichièrs son en cors d'analisi, pacientatz.",
diff --git a/apps/files/l10n/oc.json b/apps/files/l10n/oc.json
index 20b690a2ed8..895400b3ae2 100644
--- a/apps/files/l10n/oc.json
+++ b/apps/files/l10n/oc.json
@@ -36,6 +36,8 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Lo mandadís del fichièr es en cors. Quitar aquesta pagina ara anullarà lo mandadís del fichièr.",
     "Actions" : "Accions",
     "Download" : "Telecargar",
+    "Rename" : "Renomenar",
+    "Delete" : "Suprimir",
     "Select" : "Seleccionar",
     "Pending" : "En espèra",
     "Unable to determine date" : "Impossible de determinar la data",
@@ -99,7 +101,6 @@
     "Upload some content or sync with your devices!" : "Depausatz de contengut o sincronizatz vòstres aparelhs !",
     "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr",
     "Select all" : "Seleccionar tot",
-    "Delete" : "Suprimir",
     "Upload too large" : "Mandadís tròp voluminós",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los fichièrs qu'ensajatz de mandar depassan la talha maximala de mandadís permesa per aqueste servidor.",
     "Files are being scanned, please wait." : "Los fichièrs son en cors d'analisi, pacientatz.",
diff --git a/apps/files/l10n/pa.js b/apps/files/l10n/pa.js
index c92f4473ccb..dfb7c392837 100644
--- a/apps/files/l10n/pa.js
+++ b/apps/files/l10n/pa.js
@@ -4,10 +4,12 @@ OC.L10N.register(
     "Unknown error" : "ਅਣਜਾਣ ਗਲਤੀ",
     "Files" : "ਫਾਇਲਾਂ",
     "Download" : "ਡਾਊਨਲੋਡ",
+    "Rename" : "ਨਾਂ ਬਦਲੋ",
+    "Delete" : "ਹਟਾਓ",
+    "Details" : "ਵੇਰਵ",
     "Error" : "ਗਲਤੀ",
     "Upload" : "ਅੱਪਲੋਡ",
     "Settings" : "ਸੈਟਿੰਗ",
-    "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ",
-    "Delete" : "ਹਟਾਓ"
+    "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/pa.json b/apps/files/l10n/pa.json
index 438a0cdb313..c1f4dae97fa 100644
--- a/apps/files/l10n/pa.json
+++ b/apps/files/l10n/pa.json
@@ -2,10 +2,12 @@
     "Unknown error" : "ਅਣਜਾਣ ਗਲਤੀ",
     "Files" : "ਫਾਇਲਾਂ",
     "Download" : "ਡਾਊਨਲੋਡ",
+    "Rename" : "ਨਾਂ ਬਦਲੋ",
+    "Delete" : "ਹਟਾਓ",
+    "Details" : "ਵੇਰਵ",
     "Error" : "ਗਲਤੀ",
     "Upload" : "ਅੱਪਲੋਡ",
     "Settings" : "ਸੈਟਿੰਗ",
-    "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ",
-    "Delete" : "ਹਟਾਓ"
+    "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js
index c64f9c97d60..5cba43675dd 100644
--- a/apps/files/l10n/pl.js
+++ b/apps/files/l10n/pl.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
     "Actions" : "Akcje",
     "Download" : "Pobierz",
+    "Rename" : "Zmień nazwę",
+    "Delete" : "Usuń",
+    "Details" : "Szczegóły",
     "Select" : "Wybierz",
     "Pending" : "Oczekujące",
     "Unable to determine date" : "Nie można ustalić daty",
@@ -97,7 +100,6 @@ OC.L10N.register(
     "Cancel upload" : "Anuluj wysyłanie",
     "No entries found in this folder" : "Brak wpisów w tym folderze",
     "Select all" : "Wybierz wszystko",
-    "Delete" : "Usuń",
     "Upload too large" : "Ładowany plik jest za duży",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
     "Files are being scanned, please wait." : "Skanowanie plików, proszę czekać.",
diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json
index d5a3c33e698..5b09f326134 100644
--- a/apps/files/l10n/pl.json
+++ b/apps/files/l10n/pl.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
     "Actions" : "Akcje",
     "Download" : "Pobierz",
+    "Rename" : "Zmień nazwę",
+    "Delete" : "Usuń",
+    "Details" : "Szczegóły",
     "Select" : "Wybierz",
     "Pending" : "Oczekujące",
     "Unable to determine date" : "Nie można ustalić daty",
@@ -95,7 +98,6 @@
     "Cancel upload" : "Anuluj wysyłanie",
     "No entries found in this folder" : "Brak wpisów w tym folderze",
     "Select all" : "Wybierz wszystko",
-    "Delete" : "Usuń",
     "Upload too large" : "Ładowany plik jest za duży",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
     "Files are being scanned, please wait." : "Skanowanie plików, proszę czekać.",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index 7f154cbbf5e..61c0f3e2e59 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
     "Actions" : "Ações",
     "Download" : "Baixar",
+    "Rename" : "Renomear",
+    "Delete" : "Excluir",
+    "Details" : "Detalhes",
     "Select" : "Selecionar",
     "Pending" : "Pendente",
     "Unable to determine date" : "Impossível determinar a data",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!",
     "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta",
     "Select all" : "Selecionar tudo",
-    "Delete" : "Excluir",
     "Upload too large" : "Arquivo muito grande para envio",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os arquivos que você está tentando enviar excedeu o tamanho máximo para arquivos no servidor.",
     "Files are being scanned, please wait." : "Arquivos sendo escaneados, por favor aguarde.",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index 81c76bb2b84..395976dbfdf 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
     "Actions" : "Ações",
     "Download" : "Baixar",
+    "Rename" : "Renomear",
+    "Delete" : "Excluir",
+    "Details" : "Detalhes",
     "Select" : "Selecionar",
     "Pending" : "Pendente",
     "Unable to determine date" : "Impossível determinar a data",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!",
     "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta",
     "Select all" : "Selecionar tudo",
-    "Delete" : "Excluir",
     "Upload too large" : "Arquivo muito grande para envio",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os arquivos que você está tentando enviar excedeu o tamanho máximo para arquivos no servidor.",
     "Files are being scanned, please wait." : "Arquivos sendo escaneados, por favor aguarde.",
diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js
index 92ce9bd6d10..b395fdd1cd9 100644
--- a/apps/files/l10n/pt_PT.js
+++ b/apps/files/l10n/pt_PT.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
     "Actions" : "Ações",
     "Download" : "Descarregar",
+    "Rename" : "Renomear",
+    "Delete" : "Apagar",
+    "Details" : "Detalhes",
     "Select" : "Selecionar",
     "Pending" : "Pendente",
     "Unable to determine date" : "Impossível determinar a data",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!",
     "No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
     "Select all" : "Seleccionar todos",
-    "Delete" : "Apagar",
     "Upload too large" : "Upload muito grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
     "Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.",
diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json
index 99718047020..afa8a67a5d7 100644
--- a/apps/files/l10n/pt_PT.json
+++ b/apps/files/l10n/pt_PT.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
     "Actions" : "Ações",
     "Download" : "Descarregar",
+    "Rename" : "Renomear",
+    "Delete" : "Apagar",
+    "Details" : "Detalhes",
     "Select" : "Selecionar",
     "Pending" : "Pendente",
     "Unable to determine date" : "Impossível determinar a data",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!",
     "No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
     "Select all" : "Seleccionar todos",
-    "Delete" : "Apagar",
     "Upload too large" : "Upload muito grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
     "Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.",
diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js
index 35753e97da8..83593b4ba8a 100644
--- a/apps/files/l10n/ro.js
+++ b/apps/files/l10n/ro.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
     "Actions" : "Acțiuni",
     "Download" : "Descarcă",
+    "Rename" : "Redenumește",
+    "Delete" : "Șterge",
+    "Details" : "Detalii",
     "Select" : "Alege",
     "Pending" : "În așteptare",
     "Error moving file." : "Eroare la mutarea fișierului.",
@@ -91,7 +94,6 @@ OC.L10N.register(
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>",
     "Cancel upload" : "Anulează încărcarea",
     "Select all" : "Selectează tot",
-    "Delete" : "Șterge",
     "Upload too large" : "Fișierul încărcat este prea mare",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.",
     "Files are being scanned, please wait." : "Fișierele sunt scanate, te rog așteaptă.",
diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json
index 22d66f8dbf0..a2544bba28d 100644
--- a/apps/files/l10n/ro.json
+++ b/apps/files/l10n/ro.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
     "Actions" : "Acțiuni",
     "Download" : "Descarcă",
+    "Rename" : "Redenumește",
+    "Delete" : "Șterge",
+    "Details" : "Detalii",
     "Select" : "Alege",
     "Pending" : "În așteptare",
     "Error moving file." : "Eroare la mutarea fișierului.",
@@ -89,7 +92,6 @@
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>",
     "Cancel upload" : "Anulează încărcarea",
     "Select all" : "Selectează tot",
-    "Delete" : "Șterge",
     "Upload too large" : "Fișierul încărcat este prea mare",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.",
     "Files are being scanned, please wait." : "Fișierele sunt scanate, te rog așteaptă.",
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index 962698709c3..60583d6baf1 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
     "Actions" : "Действия",
     "Download" : "Скачать",
+    "Rename" : "Переименовать",
+    "Delete" : "Удалить",
+    "Details" : "Подробно",
     "Select" : "Выбрать",
     "Pending" : "Ожидание",
     "Unable to determine date" : "Невозможно определить дату",
@@ -108,7 +111,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!",
     "No entries found in this folder" : "Ничего не найдено",
     "Select all" : "Выбрать все",
-    "Delete" : "Удалить",
     "Upload too large" : "Файл слишком велик",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.",
     "Files are being scanned, please wait." : "Идет сканирование файлов. Пожалуйста подождите.",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index 410ef1d9cbe..d15e181096f 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
     "Actions" : "Действия",
     "Download" : "Скачать",
+    "Rename" : "Переименовать",
+    "Delete" : "Удалить",
+    "Details" : "Подробно",
     "Select" : "Выбрать",
     "Pending" : "Ожидание",
     "Unable to determine date" : "Невозможно определить дату",
@@ -106,7 +109,6 @@
     "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!",
     "No entries found in this folder" : "Ничего не найдено",
     "Select all" : "Выбрать все",
-    "Delete" : "Удалить",
     "Upload too large" : "Файл слишком велик",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.",
     "Files are being scanned, please wait." : "Идет сканирование файлов. Пожалуйста подождите.",
diff --git a/apps/files/l10n/si_LK.js b/apps/files/l10n/si_LK.js
index ea63cda82dc..60cd10813d9 100644
--- a/apps/files/l10n/si_LK.js
+++ b/apps/files/l10n/si_LK.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "Upload cancelled." : "උඩුගත කිරීම අත් හරින්න ලදී",
     "File upload is in progress. Leaving the page now will cancel the upload." : "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
     "Download" : "බාන්න",
+    "Rename" : "නැවත නම් කරන්න",
+    "Delete" : "මකා දමන්න",
     "Select" : "තෝරන්න",
     "Error" : "දෝෂයක්",
     "Name" : "නම",
@@ -33,7 +35,6 @@ OC.L10N.register(
     "Save" : "සුරකින්න",
     "Settings" : "සිටුවම්",
     "Cancel upload" : "උඩුගත කිරීම අත් හරින්න",
-    "Delete" : "මකා දමන්න",
     "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
     "Files are being scanned, please wait." : "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
diff --git a/apps/files/l10n/si_LK.json b/apps/files/l10n/si_LK.json
index 6cfbe30ff4a..2f910f1d90b 100644
--- a/apps/files/l10n/si_LK.json
+++ b/apps/files/l10n/si_LK.json
@@ -12,6 +12,8 @@
     "Upload cancelled." : "උඩුගත කිරීම අත් හරින්න ලදී",
     "File upload is in progress. Leaving the page now will cancel the upload." : "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
     "Download" : "බාන්න",
+    "Rename" : "නැවත නම් කරන්න",
+    "Delete" : "මකා දමන්න",
     "Select" : "තෝරන්න",
     "Error" : "දෝෂයක්",
     "Name" : "නම",
@@ -31,7 +33,6 @@
     "Save" : "සුරකින්න",
     "Settings" : "සිටුවම්",
     "Cancel upload" : "උඩුගත කිරීම අත් හරින්න",
-    "Delete" : "මකා දමන්න",
     "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
     "Files are being scanned, please wait." : "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
diff --git a/apps/files/l10n/sk_SK.js b/apps/files/l10n/sk_SK.js
index ebe1973a9ed..e2fbf695f81 100644
--- a/apps/files/l10n/sk_SK.js
+++ b/apps/files/l10n/sk_SK.js
@@ -38,10 +38,14 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
     "Actions" : "Akcie",
     "Download" : "Sťahovanie",
+    "Rename" : "Premenovať",
+    "Delete" : "Zmazať",
+    "Details" : "Podrobnosti",
     "Select" : "Vybrať",
     "Pending" : "Čaká",
     "Unable to determine date" : "Nemožno určiť dátum",
     "This operation is forbidden" : "Táto operácia je zakázaná",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Priečinok je nedostupný, skontrolujte prosím logy, alebo kontaktujte správcu",
     "Error moving file." : "Chyba pri presune súboru.",
     "Error moving file" : "Chyba pri presúvaní súboru",
     "Error" : "Chyba",
@@ -62,18 +66,25 @@ OC.L10N.register(
     "New" : "Nový",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatné meno súboru.",
     "File name cannot be empty." : "Meno súboru nemôže byť prázdne",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "Úložisko používateľa {owner} je plné, súbory sa viac nedajú aktualizovať ani synchronizovať.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Úloisko používateľa {owner} je takmer plné ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["zodpovedá '{filter}'","zodpovedá '{filter}'","zodpovedá '{filter}'"],
+    "Path" : "Cesta",
+    "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtov"],
     "Favorited" : "Pridané k obľúbeným",
     "Favorite" : "Obľúbené",
+    "{newname} already exists" : "{newname} už existuje",
     "Upload" : "Nahrať",
     "Text file" : "Textový súbor",
+    "New text file.txt" : "Nový text file.txt",
     "Folder" : "Priečinok",
     "New folder" : "Nový priečinok",
     "An error occurred while trying to update the tags" : "Pri pokuse o aktualizáciu štítkov došlo k chybe",
     "A new file or folder has been <strong>created</strong>" : "Nový súbor alebo priečinok bol <strong>vytvorený</strong>",
     "A file or folder has been <strong>changed</strong>" : "Súbor alebo priečinok bol <strong>zmenený</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Obmedzte upozornenia na vytvorenie a zmeny na vaše <strong>obľúbené súbory</strong> <em>(Len streamy)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Súbor alebo priečinok bol <strong>odstránený</strong>",
     "A file or folder has been <strong>restored</strong>" : "Súbor alebo priečinok bol <strong>obnovený</strong>",
     "You created %1$s" : "Vytvorili ste %1$s",
@@ -91,7 +102,9 @@ OC.L10N.register(
     "File handling" : "Nastavenie správania sa k súborom",
     "Maximum upload size" : "Maximálna veľkosť odosielaného súboru",
     "max. possible: " : "najväčšie možné:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "S PHP-FPM môže trvať do 5 minút, kým sa nastavenie po uložení prejaví.",
     "Save" : "Uložiť",
+    "Can not be edited from here due to insufficient permissions." : "Úpravy nie sú možné z dôvodu nedostatočných oprávnení.",
     "Settings" : "Nastavenia",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>",
@@ -100,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!",
     "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené",
     "Select all" : "Vybrať všetko",
-    "Delete" : "Zmazať",
     "Upload too large" : "Nahrávanie je príliš veľké",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
     "Files are being scanned, please wait." : "Čakajte, súbory sú prehľadávané.",
diff --git a/apps/files/l10n/sk_SK.json b/apps/files/l10n/sk_SK.json
index ccd7a045699..e5748baa4c8 100644
--- a/apps/files/l10n/sk_SK.json
+++ b/apps/files/l10n/sk_SK.json
@@ -36,10 +36,14 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
     "Actions" : "Akcie",
     "Download" : "Sťahovanie",
+    "Rename" : "Premenovať",
+    "Delete" : "Zmazať",
+    "Details" : "Podrobnosti",
     "Select" : "Vybrať",
     "Pending" : "Čaká",
     "Unable to determine date" : "Nemožno určiť dátum",
     "This operation is forbidden" : "Táto operácia je zakázaná",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Priečinok je nedostupný, skontrolujte prosím logy, alebo kontaktujte správcu",
     "Error moving file." : "Chyba pri presune súboru.",
     "Error moving file" : "Chyba pri presúvaní súboru",
     "Error" : "Chyba",
@@ -60,18 +64,25 @@
     "New" : "Nový",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatné meno súboru.",
     "File name cannot be empty." : "Meno súboru nemôže byť prázdne",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "Úložisko používateľa {owner} je plné, súbory sa viac nedajú aktualizovať ani synchronizovať.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Úloisko používateľa {owner} je takmer plné ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["zodpovedá '{filter}'","zodpovedá '{filter}'","zodpovedá '{filter}'"],
+    "Path" : "Cesta",
+    "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtov"],
     "Favorited" : "Pridané k obľúbeným",
     "Favorite" : "Obľúbené",
+    "{newname} already exists" : "{newname} už existuje",
     "Upload" : "Nahrať",
     "Text file" : "Textový súbor",
+    "New text file.txt" : "Nový text file.txt",
     "Folder" : "Priečinok",
     "New folder" : "Nový priečinok",
     "An error occurred while trying to update the tags" : "Pri pokuse o aktualizáciu štítkov došlo k chybe",
     "A new file or folder has been <strong>created</strong>" : "Nový súbor alebo priečinok bol <strong>vytvorený</strong>",
     "A file or folder has been <strong>changed</strong>" : "Súbor alebo priečinok bol <strong>zmenený</strong>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Obmedzte upozornenia na vytvorenie a zmeny na vaše <strong>obľúbené súbory</strong> <em>(Len streamy)</em>",
     "A file or folder has been <strong>deleted</strong>" : "Súbor alebo priečinok bol <strong>odstránený</strong>",
     "A file or folder has been <strong>restored</strong>" : "Súbor alebo priečinok bol <strong>obnovený</strong>",
     "You created %1$s" : "Vytvorili ste %1$s",
@@ -89,7 +100,9 @@
     "File handling" : "Nastavenie správania sa k súborom",
     "Maximum upload size" : "Maximálna veľkosť odosielaného súboru",
     "max. possible: " : "najväčšie možné:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "S PHP-FPM môže trvať do 5 minút, kým sa nastavenie po uložení prejaví.",
     "Save" : "Uložiť",
+    "Can not be edited from here due to insufficient permissions." : "Úpravy nie sú možné z dôvodu nedostatočných oprávnení.",
     "Settings" : "Nastavenia",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>",
@@ -98,7 +111,6 @@
     "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!",
     "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené",
     "Select all" : "Vybrať všetko",
-    "Delete" : "Zmazať",
     "Upload too large" : "Nahrávanie je príliš veľké",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
     "Files are being scanned, please wait." : "Čakajte, súbory sú prehľadávané.",
diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js
index 2d296468d69..7ce39724a98 100644
--- a/apps/files/l10n/sl.js
+++ b/apps/files/l10n/sl.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
     "Actions" : "Dejanja",
     "Download" : "Prejmi",
+    "Rename" : "Preimenuj",
+    "Delete" : "Izbriši",
+    "Details" : "Podrobnosti",
     "Select" : "Izberi",
     "Pending" : "V čakanju ...",
     "Unable to determine date" : "Ni mogoče določiti datuma",
@@ -103,7 +106,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!",
     "No entries found in this folder" : "V tej mapi ni najdenih predmetov.",
     "Select all" : "izberi vse",
-    "Delete" : "Izbriši",
     "Upload too large" : "Prekoračenje omejitve velikosti",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
     "Files are being scanned, please wait." : "Poteka preučevanje datotek, počakajte ...",
diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json
index 0cb69f5f7a1..b4b28f95bf1 100644
--- a/apps/files/l10n/sl.json
+++ b/apps/files/l10n/sl.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
     "Actions" : "Dejanja",
     "Download" : "Prejmi",
+    "Rename" : "Preimenuj",
+    "Delete" : "Izbriši",
+    "Details" : "Podrobnosti",
     "Select" : "Izberi",
     "Pending" : "V čakanju ...",
     "Unable to determine date" : "Ni mogoče določiti datuma",
@@ -101,7 +104,6 @@
     "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!",
     "No entries found in this folder" : "V tej mapi ni najdenih predmetov.",
     "Select all" : "izberi vse",
-    "Delete" : "Izbriši",
     "Upload too large" : "Prekoračenje omejitve velikosti",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
     "Files are being scanned, please wait." : "Poteka preučevanje datotek, počakajte ...",
diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js
index 2b87c39d968..296efe6381d 100644
--- a/apps/files/l10n/sq.js
+++ b/apps/files/l10n/sq.js
@@ -36,6 +36,8 @@ OC.L10N.register(
     "Could not get result from server." : "Nuk mund të merret ndonjë rezultat nga serveri.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
     "Download" : "Shkarko",
+    "Rename" : "Riemëro",
+    "Delete" : "Fshi",
     "Pending" : "Në vijim",
     "Error moving file." : "Gabim në lëvizjen e skedarëve.",
     "Error moving file" : "Gabim lëvizjen dokumentave",
@@ -86,7 +88,6 @@ OC.L10N.register(
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\">qasje në skedarët tuaj me anë të WebDAV</a>",
     "Cancel upload" : "Anullo ngarkimin",
-    "Delete" : "Fshi",
     "Upload too large" : "Ngarkimi shumë i madh",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri.",
     "Files are being scanned, please wait." : "Skanerizimi i skedarit në proces. Ju lutem prisni.",
diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json
index 1e755ee80f6..993e38f4644 100644
--- a/apps/files/l10n/sq.json
+++ b/apps/files/l10n/sq.json
@@ -34,6 +34,8 @@
     "Could not get result from server." : "Nuk mund të merret ndonjë rezultat nga serveri.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
     "Download" : "Shkarko",
+    "Rename" : "Riemëro",
+    "Delete" : "Fshi",
     "Pending" : "Në vijim",
     "Error moving file." : "Gabim në lëvizjen e skedarëve.",
     "Error moving file" : "Gabim lëvizjen dokumentave",
@@ -84,7 +86,6 @@
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\">qasje në skedarët tuaj me anë të WebDAV</a>",
     "Cancel upload" : "Anullo ngarkimin",
-    "Delete" : "Fshi",
     "Upload too large" : "Ngarkimi shumë i madh",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri.",
     "Files are being scanned, please wait." : "Skanerizimi i skedarit në proces. Ju lutem prisni.",
diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js
index 597389e15da..c9b8fd3ac54 100644
--- a/apps/files/l10n/sr.js
+++ b/apps/files/l10n/sr.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање фајла је у току. Ако сада напустите страницу, отказаћете отпремање.",
     "Actions" : "Радње",
     "Download" : "Преузми",
+    "Rename" : "Преименуј",
+    "Delete" : "Обриши",
+    "Details" : "Подаци",
     "Select" : "Изабери",
     "Pending" : "На чекању",
     "Unable to determine date" : "Не могу да одредим датум",
@@ -105,7 +108,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!",
     "No entries found in this folder" : "Нема ничега у овој фасцикли",
     "Select all" : "Означи све",
-    "Delete" : "Обриши",
     "Upload too large" : "Отпремање је превелико",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Фајлови које желите да отпремите превазилазе ограничење отпремања на овом серверу.",
     "Files are being scanned, please wait." : "Скенирам фајлове, сачекајте.",
diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json
index ec2fcc101e6..8a1ed30cefe 100644
--- a/apps/files/l10n/sr.json
+++ b/apps/files/l10n/sr.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање фајла је у току. Ако сада напустите страницу, отказаћете отпремање.",
     "Actions" : "Радње",
     "Download" : "Преузми",
+    "Rename" : "Преименуј",
+    "Delete" : "Обриши",
+    "Details" : "Подаци",
     "Select" : "Изабери",
     "Pending" : "На чекању",
     "Unable to determine date" : "Не могу да одредим датум",
@@ -103,7 +106,6 @@
     "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!",
     "No entries found in this folder" : "Нема ничега у овој фасцикли",
     "Select all" : "Означи све",
-    "Delete" : "Обриши",
     "Upload too large" : "Отпремање је превелико",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Фајлови које желите да отпремите превазилазе ограничење отпремања на овом серверу.",
     "Files are being scanned, please wait." : "Скенирам фајлове, сачекајте.",
diff --git a/apps/files/l10n/sr@latin.js b/apps/files/l10n/sr@latin.js
index b00575619e9..9c7732e4e71 100644
--- a/apps/files/l10n/sr@latin.js
+++ b/apps/files/l10n/sr@latin.js
@@ -37,6 +37,9 @@ OC.L10N.register(
     "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.",
     "Download" : "Preuzmi",
+    "Rename" : "Preimenuj",
+    "Delete" : "Obriši",
+    "Details" : "Detaljnije",
     "Select" : "Izaberi",
     "Pending" : "Na čekanju",
     "Unable to determine date" : "Ne mogu da odredim datum",
@@ -100,7 +103,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!",
     "No entries found in this folder" : "Nema ničega u ovoj fascikli",
     "Select all" : "Označi sve",
-    "Delete" : "Obriši",
     "Upload too large" : "Otpremanje je preveliko",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da otpremite prevazilaze ograničenje otpremanja na ovom serveru.",
     "Files are being scanned, please wait." : "Skeniram fajlove, sačekajte.",
diff --git a/apps/files/l10n/sr@latin.json b/apps/files/l10n/sr@latin.json
index b6ffda5aa6b..0eb117e6026 100644
--- a/apps/files/l10n/sr@latin.json
+++ b/apps/files/l10n/sr@latin.json
@@ -35,6 +35,9 @@
     "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.",
     "Download" : "Preuzmi",
+    "Rename" : "Preimenuj",
+    "Delete" : "Obriši",
+    "Details" : "Detaljnije",
     "Select" : "Izaberi",
     "Pending" : "Na čekanju",
     "Unable to determine date" : "Ne mogu da odredim datum",
@@ -98,7 +101,6 @@
     "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!",
     "No entries found in this folder" : "Nema ničega u ovoj fascikli",
     "Select all" : "Označi sve",
-    "Delete" : "Obriši",
     "Upload too large" : "Otpremanje je preveliko",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da otpremite prevazilaze ograničenje otpremanja na ovom serveru.",
     "Files are being scanned, please wait." : "Skeniram fajlove, sačekajte.",
diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js
index 5f9a08404d7..a5dc7478f80 100644
--- a/apps/files/l10n/sv.js
+++ b/apps/files/l10n/sv.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
     "Actions" : "Åtgärder",
     "Download" : "Ladda ner",
+    "Rename" : "Byt namn",
+    "Delete" : "Radera",
+    "Details" : "Detaljer",
     "Select" : "Välj",
     "Pending" : "Väntar",
     "Unable to determine date" : "Misslyckades avgöra datum",
@@ -94,7 +97,6 @@ OC.L10N.register(
     "Cancel upload" : "Avbryt uppladdning",
     "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!",
     "Select all" : "Välj allt",
-    "Delete" : "Radera",
     "Upload too large" : "För stor uppladdning",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
     "Files are being scanned, please wait." : "Filer skannas, var god vänta",
diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json
index e6775948cf6..afcbb6100db 100644
--- a/apps/files/l10n/sv.json
+++ b/apps/files/l10n/sv.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
     "Actions" : "Åtgärder",
     "Download" : "Ladda ner",
+    "Rename" : "Byt namn",
+    "Delete" : "Radera",
+    "Details" : "Detaljer",
     "Select" : "Välj",
     "Pending" : "Väntar",
     "Unable to determine date" : "Misslyckades avgöra datum",
@@ -92,7 +95,6 @@
     "Cancel upload" : "Avbryt uppladdning",
     "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!",
     "Select all" : "Välj allt",
-    "Delete" : "Radera",
     "Upload too large" : "För stor uppladdning",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
     "Files are being scanned, please wait." : "Filer skannas, var god vänta",
diff --git a/apps/files/l10n/ta_IN.js b/apps/files/l10n/ta_IN.js
index c8453338084..85ed1ea3141 100644
--- a/apps/files/l10n/ta_IN.js
+++ b/apps/files/l10n/ta_IN.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "files",
     {
     "Files" : "கோப்புகள்",
+    "Details" : "விவரங்கள்",
     "Upload" : "பதிவேற்று",
     "New folder" : "புதிய கோப்புறை",
     "A new file or folder has been <strong>created</strong>" : "ஒரு புதிய கோப்புறை அல்லது ஆவணம் <strong> உருவாக்கப்பட்டுள்ளது.</strong>",
diff --git a/apps/files/l10n/ta_IN.json b/apps/files/l10n/ta_IN.json
index 392601a3756..bb7117bc62e 100644
--- a/apps/files/l10n/ta_IN.json
+++ b/apps/files/l10n/ta_IN.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Files" : "கோப்புகள்",
+    "Details" : "விவரங்கள்",
     "Upload" : "பதிவேற்று",
     "New folder" : "புதிய கோப்புறை",
     "A new file or folder has been <strong>created</strong>" : "ஒரு புதிய கோப்புறை அல்லது ஆவணம் <strong> உருவாக்கப்பட்டுள்ளது.</strong>",
diff --git a/apps/files/l10n/ta_LK.js b/apps/files/l10n/ta_LK.js
index 90a955e135b..de912eaea2e 100644
--- a/apps/files/l10n/ta_LK.js
+++ b/apps/files/l10n/ta_LK.js
@@ -16,6 +16,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
     "Actions" : "செயல்கள்",
     "Download" : "பதிவிறக்குக",
+    "Rename" : "பெயர்மாற்றம்",
+    "Delete" : "நீக்குக",
+    "Details" : "விவரங்கள்",
     "Select" : "தெரிக",
     "Pending" : "நிலுவையிலுள்ள",
     "Error" : "வழு",
@@ -34,7 +37,6 @@ OC.L10N.register(
     "Save" : "சேமிக்க ",
     "Settings" : "அமைப்புகள்",
     "Cancel upload" : "பதிவேற்றலை இரத்து செய்க",
-    "Delete" : "நீக்குக",
     "Upload too large" : "பதிவேற்றல் மிகப்பெரியது",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.",
     "Files are being scanned, please wait." : "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
diff --git a/apps/files/l10n/ta_LK.json b/apps/files/l10n/ta_LK.json
index 64220b86744..b14853b503e 100644
--- a/apps/files/l10n/ta_LK.json
+++ b/apps/files/l10n/ta_LK.json
@@ -14,6 +14,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
     "Actions" : "செயல்கள்",
     "Download" : "பதிவிறக்குக",
+    "Rename" : "பெயர்மாற்றம்",
+    "Delete" : "நீக்குக",
+    "Details" : "விவரங்கள்",
     "Select" : "தெரிக",
     "Pending" : "நிலுவையிலுள்ள",
     "Error" : "வழு",
@@ -32,7 +35,6 @@
     "Save" : "சேமிக்க ",
     "Settings" : "அமைப்புகள்",
     "Cancel upload" : "பதிவேற்றலை இரத்து செய்க",
-    "Delete" : "நீக்குக",
     "Upload too large" : "பதிவேற்றல் மிகப்பெரியது",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.",
     "Files are being scanned, please wait." : "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
diff --git a/apps/files/l10n/te.js b/apps/files/l10n/te.js
index 51f6b1c5291..9badfac3532 100644
--- a/apps/files/l10n/te.js
+++ b/apps/files/l10n/te.js
@@ -2,13 +2,13 @@ OC.L10N.register(
     "files",
     {
     "Close" : "మూసివేయి",
+    "Delete" : "తొలగించు",
     "Error" : "పొరపాటు",
     "Name" : "పేరు",
     "Size" : "పరిమాణం",
     "Folder" : "సంచయం",
     "New folder" : "కొత్త సంచయం",
     "Save" : "భద్రపరచు",
-    "Settings" : "అమరికలు",
-    "Delete" : "తొలగించు"
+    "Settings" : "అమరికలు"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/te.json b/apps/files/l10n/te.json
index fa7efa9d702..21d09484cd8 100644
--- a/apps/files/l10n/te.json
+++ b/apps/files/l10n/te.json
@@ -1,12 +1,12 @@
 { "translations": {
     "Close" : "మూసివేయి",
+    "Delete" : "తొలగించు",
     "Error" : "పొరపాటు",
     "Name" : "పేరు",
     "Size" : "పరిమాణం",
     "Folder" : "సంచయం",
     "New folder" : "కొత్త సంచయం",
     "Save" : "భద్రపరచు",
-    "Settings" : "అమరికలు",
-    "Delete" : "తొలగించు"
+    "Settings" : "అమరికలు"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js
index 2b092551a17..021179c6432 100644
--- a/apps/files/l10n/th_TH.js
+++ b/apps/files/l10n/th_TH.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
     "Actions" : "การกระทำ",
     "Download" : "ดาวน์โหลด",
+    "Rename" : "เปลี่ยนชื่อ",
+    "Delete" : "ลบ",
+    "Details" : "รายละเอียด",
     "Select" : "เลือก",
     "Pending" : "อยู่ระหว่างดำเนินการ",
     "Unable to determine date" : "ไม่สามารถกำหนดวัน",
@@ -110,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือประสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง",
     "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้",
     "Select all" : "เลือกทั้งหมด",
-    "Delete" : "ลบ",
     "Upload too large" : "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
     "Files are being scanned, please wait." : "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json
index 3125adc820f..6ce9bc4b9ed 100644
--- a/apps/files/l10n/th_TH.json
+++ b/apps/files/l10n/th_TH.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
     "Actions" : "การกระทำ",
     "Download" : "ดาวน์โหลด",
+    "Rename" : "เปลี่ยนชื่อ",
+    "Delete" : "ลบ",
+    "Details" : "รายละเอียด",
     "Select" : "เลือก",
     "Pending" : "อยู่ระหว่างดำเนินการ",
     "Unable to determine date" : "ไม่สามารถกำหนดวัน",
@@ -108,7 +111,6 @@
     "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือประสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง",
     "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้",
     "Select all" : "เลือกทั้งหมด",
-    "Delete" : "ลบ",
     "Upload too large" : "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
     "Files are being scanned, please wait." : "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
index 157280b696c..6b2f9a14dcf 100644
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
     "Actions" : "Eylemler",
     "Download" : "İndir",
+    "Rename" : "Yeniden adlandır",
+    "Delete" : "Sil",
+    "Details" : "Ayrıntılar",
     "Select" : "Seç",
     "Pending" : "Bekliyor",
     "Unable to determine date" : "Tarih tespit edilemedi",
@@ -108,7 +111,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!",
     "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı",
     "Select all" : "Tümünü seç",
-    "Delete" : "Sil",
     "Upload too large" : "Yükleme çok büyük",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yüklemeye çalıştığınız dosyalar bu sunucudaki azami yükleme boyutunu aşıyor.",
     "Files are being scanned, please wait." : "Dosyalar taranıyor, lütfen bekleyin.",
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
index 8a15f7ff315..9f59757f715 100644
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
     "Actions" : "Eylemler",
     "Download" : "İndir",
+    "Rename" : "Yeniden adlandır",
+    "Delete" : "Sil",
+    "Details" : "Ayrıntılar",
     "Select" : "Seç",
     "Pending" : "Bekliyor",
     "Unable to determine date" : "Tarih tespit edilemedi",
@@ -106,7 +109,6 @@
     "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!",
     "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı",
     "Select all" : "Tümünü seç",
-    "Delete" : "Sil",
     "Upload too large" : "Yükleme çok büyük",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yüklemeye çalıştığınız dosyalar bu sunucudaki azami yükleme boyutunu aşıyor.",
     "Files are being scanned, please wait." : "Dosyalar taranıyor, lütfen bekleyin.",
diff --git a/apps/files/l10n/ug.js b/apps/files/l10n/ug.js
index 8d6dabd50d7..4371e15067f 100644
--- a/apps/files/l10n/ug.js
+++ b/apps/files/l10n/ug.js
@@ -16,6 +16,8 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
     "Actions" : "مەشغۇلاتلار",
     "Download" : "چۈشۈر",
+    "Rename" : "ئات ئۆزگەرت",
+    "Delete" : "ئۆچۈر",
     "Pending" : "كۈتۈۋاتىدۇ",
     "Error" : "خاتالىق",
     "{new_name} already exists" : "{new_name} مەۋجۇت",
@@ -32,7 +34,6 @@ OC.L10N.register(
     "Settings" : "تەڭشەكلەر",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "يۈكلەشتىن ۋاز كەچ",
-    "Delete" : "ئۆچۈر",
     "Upload too large" : "يۈكلەندىغىنى بەك چوڭ"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files/l10n/ug.json b/apps/files/l10n/ug.json
index 86bd8391af2..f6a71d8bda6 100644
--- a/apps/files/l10n/ug.json
+++ b/apps/files/l10n/ug.json
@@ -14,6 +14,8 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
     "Actions" : "مەشغۇلاتلار",
     "Download" : "چۈشۈر",
+    "Rename" : "ئات ئۆزگەرت",
+    "Delete" : "ئۆچۈر",
     "Pending" : "كۈتۈۋاتىدۇ",
     "Error" : "خاتالىق",
     "{new_name} already exists" : "{new_name} مەۋجۇت",
@@ -30,7 +32,6 @@
     "Settings" : "تەڭشەكلەر",
     "WebDAV" : "WebDAV",
     "Cancel upload" : "يۈكلەشتىن ۋاز كەچ",
-    "Delete" : "ئۆچۈر",
     "Upload too large" : "يۈكلەندىغىنى بەك چوڭ"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js
index a06cc2f3d73..bf5b0f1d456 100644
--- a/apps/files/l10n/uk.js
+++ b/apps/files/l10n/uk.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується вивантаження файлу. Закриття цієї сторінки приведе до скасування вивантаження.",
     "Actions" : "Дії",
     "Download" : "Завантажити",
+    "Rename" : "Перейменувати",
+    "Delete" : "Видалити",
+    "Details" : "Деталі",
     "Select" : "Оберіть",
     "Pending" : "Очікування",
     "Unable to determine date" : "Неможливо визначити дату",
@@ -102,7 +105,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!",
     "No entries found in this folder" : "В цій теці нічого немає",
     "Select all" : "Вибрати всі",
-    "Delete" : "Видалити",
     "Upload too large" : "Файл занадто великий",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файли,що ви намагаєтесь вивантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
     "Files are being scanned, please wait." : "Файли перевіряються, зачекайте, будь-ласка.",
diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json
index 964ada95de1..28d307b55be 100644
--- a/apps/files/l10n/uk.json
+++ b/apps/files/l10n/uk.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується вивантаження файлу. Закриття цієї сторінки приведе до скасування вивантаження.",
     "Actions" : "Дії",
     "Download" : "Завантажити",
+    "Rename" : "Перейменувати",
+    "Delete" : "Видалити",
+    "Details" : "Деталі",
     "Select" : "Оберіть",
     "Pending" : "Очікування",
     "Unable to determine date" : "Неможливо визначити дату",
@@ -100,7 +103,6 @@
     "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!",
     "No entries found in this folder" : "В цій теці нічого немає",
     "Select all" : "Вибрати всі",
-    "Delete" : "Видалити",
     "Upload too large" : "Файл занадто великий",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файли,що ви намагаєтесь вивантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
     "Files are being scanned, please wait." : "Файли перевіряються, зачекайте, будь-ласка.",
diff --git a/apps/files/l10n/ur_PK.js b/apps/files/l10n/ur_PK.js
index d5e85bfe35c..2265e52d771 100644
--- a/apps/files/l10n/ur_PK.js
+++ b/apps/files/l10n/ur_PK.js
@@ -4,10 +4,10 @@ OC.L10N.register(
     "Unknown error" : "غیر معروف خرابی",
     "Close" : "بند ",
     "Download" : "ڈاؤن لوڈ،",
+    "Delete" : "حذف کریں",
     "Error" : "ایرر",
     "Name" : "اسم",
     "Save" : "حفظ",
-    "Settings" : "ترتیبات",
-    "Delete" : "حذف کریں"
+    "Settings" : "ترتیبات"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ur_PK.json b/apps/files/l10n/ur_PK.json
index 3da48310dfb..e8eb736811c 100644
--- a/apps/files/l10n/ur_PK.json
+++ b/apps/files/l10n/ur_PK.json
@@ -2,10 +2,10 @@
     "Unknown error" : "غیر معروف خرابی",
     "Close" : "بند ",
     "Download" : "ڈاؤن لوڈ،",
+    "Delete" : "حذف کریں",
     "Error" : "ایرر",
     "Name" : "اسم",
     "Save" : "حفظ",
-    "Settings" : "ترتیبات",
-    "Delete" : "حذف کریں"
+    "Settings" : "ترتیبات"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js
index 5e83c36abea..2c643e3cfb5 100644
--- a/apps/files/l10n/vi.js
+++ b/apps/files/l10n/vi.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
     "Actions" : "Actions",
     "Download" : "Tải về",
+    "Rename" : "Sửa tên",
+    "Delete" : "Xóa",
+    "Details" : "Chi tiết",
     "Select" : "Chọn",
     "Pending" : "Đang chờ",
     "Error moving file" : "Lỗi di chuyển tập tin",
@@ -69,7 +72,6 @@ OC.L10N.register(
     "Cancel upload" : "Hủy upload",
     "No entries found in this folder" : "Chưa có mục nào trong thư mục",
     "Select all" : "Chọn tất cả",
-    "Delete" : "Xóa",
     "Upload too large" : "Tập tin tải lên quá lớn",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
     "Files are being scanned, please wait." : "Tập tin đang được quét ,vui lòng chờ."
diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json
index 285c0e39240..ac7a1f3828e 100644
--- a/apps/files/l10n/vi.json
+++ b/apps/files/l10n/vi.json
@@ -31,6 +31,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
     "Actions" : "Actions",
     "Download" : "Tải về",
+    "Rename" : "Sửa tên",
+    "Delete" : "Xóa",
+    "Details" : "Chi tiết",
     "Select" : "Chọn",
     "Pending" : "Đang chờ",
     "Error moving file" : "Lỗi di chuyển tập tin",
@@ -67,7 +70,6 @@
     "Cancel upload" : "Hủy upload",
     "No entries found in this folder" : "Chưa có mục nào trong thư mục",
     "Select all" : "Chọn tất cả",
-    "Delete" : "Xóa",
     "Upload too large" : "Tập tin tải lên quá lớn",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
     "Files are being scanned, please wait." : "Tập tin đang được quét ,vui lòng chờ."
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
index 84b31368a14..a56d59e240e 100644
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。",
     "Actions" : "动作",
     "Download" : "下载",
+    "Rename" : "重命名",
+    "Delete" : "删除",
+    "Details" : "详细信息",
     "Select" : "选择",
     "Pending" : "等待",
     "Unable to determine date" : "无法确定日期",
@@ -72,8 +75,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n 字节"],
     "Favorited" : "已收藏",
     "Favorite" : "收藏",
+    "{newname} already exists" : "{newname} 已经存在",
     "Upload" : "上传",
     "Text file" : "文本文件",
+    "New text file.txt" : "创建文本文件 .txt",
     "Folder" : "文件夹",
     "New folder" : "增加文件夹",
     "An error occurred while trying to update the tags" : "更新标签时出错",
@@ -108,7 +113,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "上传一些内容或者与设备同步!",
     "No entries found in this folder" : "此文件夹中无项目",
     "Select all" : "全部选择",
-    "Delete" : "删除",
     "Upload too large" : "上传文件过大",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
     "Files are being scanned, please wait." : "文件正在被扫描，请稍候。",
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index 4d9a3737a98..c84450a095c 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。",
     "Actions" : "动作",
     "Download" : "下载",
+    "Rename" : "重命名",
+    "Delete" : "删除",
+    "Details" : "详细信息",
     "Select" : "选择",
     "Pending" : "等待",
     "Unable to determine date" : "无法确定日期",
@@ -70,8 +73,10 @@
     "_%n byte_::_%n bytes_" : ["%n 字节"],
     "Favorited" : "已收藏",
     "Favorite" : "收藏",
+    "{newname} already exists" : "{newname} 已经存在",
     "Upload" : "上传",
     "Text file" : "文本文件",
+    "New text file.txt" : "创建文本文件 .txt",
     "Folder" : "文件夹",
     "New folder" : "增加文件夹",
     "An error occurred while trying to update the tags" : "更新标签时出错",
@@ -106,7 +111,6 @@
     "Upload some content or sync with your devices!" : "上传一些内容或者与设备同步!",
     "No entries found in this folder" : "此文件夹中无项目",
     "Select all" : "全部选择",
-    "Delete" : "删除",
     "Upload too large" : "上传文件过大",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
     "Files are being scanned, please wait." : "文件正在被扫描，请稍候。",
diff --git a/apps/files/l10n/zh_HK.js b/apps/files/l10n/zh_HK.js
index 94f4397f23b..421ae5dc92a 100644
--- a/apps/files/l10n/zh_HK.js
+++ b/apps/files/l10n/zh_HK.js
@@ -7,6 +7,8 @@ OC.L10N.register(
     "Home" : "主頁",
     "Close" : "關閉",
     "Download" : "下載",
+    "Rename" : "重新命名",
+    "Delete" : "刪除",
     "Error" : "錯誤",
     "Name" : "名稱",
     "Size" : "大小",
@@ -27,7 +29,6 @@ OC.L10N.register(
     "Save" : "儲存",
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
-    "Cancel upload" : "取消上戴",
-    "Delete" : "刪除"
+    "Cancel upload" : "取消上戴"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files/l10n/zh_HK.json b/apps/files/l10n/zh_HK.json
index 63716aca559..3d1af1593bd 100644
--- a/apps/files/l10n/zh_HK.json
+++ b/apps/files/l10n/zh_HK.json
@@ -5,6 +5,8 @@
     "Home" : "主頁",
     "Close" : "關閉",
     "Download" : "下載",
+    "Rename" : "重新命名",
+    "Delete" : "刪除",
     "Error" : "錯誤",
     "Name" : "名稱",
     "Size" : "大小",
@@ -25,7 +27,6 @@
     "Save" : "儲存",
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
-    "Cancel upload" : "取消上戴",
-    "Delete" : "刪除"
+    "Cancel upload" : "取消上戴"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js
index 7c013533e2a..772cf083307 100644
--- a/apps/files/l10n/zh_TW.js
+++ b/apps/files/l10n/zh_TW.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳。",
     "Actions" : "動作",
     "Download" : "下載",
+    "Rename" : "重新命名",
+    "Delete" : "刪除",
+    "Details" : "詳細資料",
     "Select" : "選擇",
     "Pending" : "等候中",
     "Unable to determine date" : "無法確定日期",
@@ -103,7 +106,6 @@ OC.L10N.register(
     "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容",
     "No entries found in this folder" : "在此資料夾中沒有任何項目",
     "Select all" : "全選",
-    "Delete" : "刪除",
     "Upload too large" : "上傳過大",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您試圖上傳的檔案大小超過伺服器的限制。",
     "Files are being scanned, please wait." : "正在掃描檔案，請稍等。",
diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json
index 9d1aec9e4f2..4e1a38eccbd 100644
--- a/apps/files/l10n/zh_TW.json
+++ b/apps/files/l10n/zh_TW.json
@@ -36,6 +36,9 @@
     "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳。",
     "Actions" : "動作",
     "Download" : "下載",
+    "Rename" : "重新命名",
+    "Delete" : "刪除",
+    "Details" : "詳細資料",
     "Select" : "選擇",
     "Pending" : "等候中",
     "Unable to determine date" : "無法確定日期",
@@ -101,7 +104,6 @@
     "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容",
     "No entries found in this folder" : "在此資料夾中沒有任何項目",
     "Select all" : "全選",
-    "Delete" : "刪除",
     "Upload too large" : "上傳過大",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您試圖上傳的檔案大小超過伺服器的限制。",
     "Files are being scanned, please wait." : "正在掃描檔案，請稍等。",
diff --git a/apps/files_external/l10n/ast.js b/apps/files_external/l10n/ast.js
index b6084cc1545..21eba8c59d5 100644
--- a/apps/files_external/l10n/ast.js
+++ b/apps/files_external/l10n/ast.js
@@ -39,6 +39,7 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "Root" : "Raíz",
     "Share" : "Compartir",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
     "Username as share" : "Nome d'usuariu como Compartición",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
diff --git a/apps/files_external/l10n/ast.json b/apps/files_external/l10n/ast.json
index ccf882952ae..2464f44ca63 100644
--- a/apps/files_external/l10n/ast.json
+++ b/apps/files_external/l10n/ast.json
@@ -37,6 +37,7 @@
     "ownCloud" : "ownCloud",
     "Root" : "Raíz",
     "Share" : "Compartir",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
     "Username as share" : "Nome d'usuariu como Compartición",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
diff --git a/apps/files_external/l10n/az.js b/apps/files_external/l10n/az.js
index 9c86576c7fc..f51a743d874 100644
--- a/apps/files_external/l10n/az.js
+++ b/apps/files_external/l10n/az.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "Local" : "Yerli",
     "Location" : "Yerləşdiyiniz ünvan",
     "Share" : "Yayımla",
+    "SMB / CIFS using OC login" : "OC login istifadə edir SMB / CIFS",
     "Username as share" : "Paylaşım üçün istifadəçi adı",
     "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
     "<b>Note:</b> " : "<b>Qeyd:</b> ",
diff --git a/apps/files_external/l10n/az.json b/apps/files_external/l10n/az.json
index fa300deea8d..317b7948570 100644
--- a/apps/files_external/l10n/az.json
+++ b/apps/files_external/l10n/az.json
@@ -39,6 +39,7 @@
     "Local" : "Yerli",
     "Location" : "Yerləşdiyiniz ünvan",
     "Share" : "Yayımla",
+    "SMB / CIFS using OC login" : "OC login istifadə edir SMB / CIFS",
     "Username as share" : "Paylaşım üçün istifadəçi adı",
     "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
     "<b>Note:</b> " : "<b>Qeyd:</b> ",
diff --git a/apps/files_external/l10n/bg_BG.js b/apps/files_external/l10n/bg_BG.js
index 70eae9d1abd..8a416271bce 100644
--- a/apps/files_external/l10n/bg_BG.js
+++ b/apps/files_external/l10n/bg_BG.js
@@ -43,6 +43,7 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "Root" : "Root",
     "Share" : "Споделяне",
+    "SMB / CIFS using OC login" : "SMB / CIFS използвайки OC профил",
     "Username as share" : "Потребителско име като споделена папка",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Бележка:</b> ",
diff --git a/apps/files_external/l10n/bg_BG.json b/apps/files_external/l10n/bg_BG.json
index 731897d4a3a..c9191e6d402 100644
--- a/apps/files_external/l10n/bg_BG.json
+++ b/apps/files_external/l10n/bg_BG.json
@@ -41,6 +41,7 @@
     "ownCloud" : "ownCloud",
     "Root" : "Root",
     "Share" : "Споделяне",
+    "SMB / CIFS using OC login" : "SMB / CIFS използвайки OC профил",
     "Username as share" : "Потребителско име като споделена папка",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Бележка:</b> ",
diff --git a/apps/files_external/l10n/ca.js b/apps/files_external/l10n/ca.js
index 9c10f6d5c50..36ea0086c1f 100644
--- a/apps/files_external/l10n/ca.js
+++ b/apps/files_external/l10n/ca.js
@@ -48,7 +48,9 @@ OC.L10N.register(
     "Location" : "Ubicació",
     "ownCloud" : "ownCloud",
     "Root" : "Arrel",
+    "SFTP with secret key login" : "Inici de sessió SFTP amb clau secreta",
     "Share" : "Comparteix",
+    "SMB / CIFS using OC login" : "SMB / CIFS usant acreditació OC",
     "Username as share" : "Nom d'usuari per compartir",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
diff --git a/apps/files_external/l10n/ca.json b/apps/files_external/l10n/ca.json
index 123527688c4..ffbacca550f 100644
--- a/apps/files_external/l10n/ca.json
+++ b/apps/files_external/l10n/ca.json
@@ -46,7 +46,9 @@
     "Location" : "Ubicació",
     "ownCloud" : "ownCloud",
     "Root" : "Arrel",
+    "SFTP with secret key login" : "Inici de sessió SFTP amb clau secreta",
     "Share" : "Comparteix",
+    "SMB / CIFS using OC login" : "SMB / CIFS usant acreditació OC",
     "Username as share" : "Nom d'usuari per compartir",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
index 503d00893e9..f48cf407681 100644
--- a/apps/files_external/l10n/cs_CZ.js
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -66,8 +66,10 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Kořen",
+    "SFTP with secret key login" : "SFTP login s tajným klíčem",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Sdílet",
+    "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
     "Username as share" : "Uživatelské jméno jako sdílený adresář",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
index 74aa6cc82e3..d1f05174f47 100644
--- a/apps/files_external/l10n/cs_CZ.json
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -64,8 +64,10 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Kořen",
+    "SFTP with secret key login" : "SFTP login s tajným klíčem",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Sdílet",
+    "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
     "Username as share" : "Uživatelské jméno jako sdílený adresář",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js
index 435884aa11d..3d0c15e578d 100644
--- a/apps/files_external/l10n/da.js
+++ b/apps/files_external/l10n/da.js
@@ -75,11 +75,11 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP med det hemmelige nøgle login [DEPRECATED]",
+    "SFTP with secret key login" : "SFTP med hemmelig nøglelogin",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Del",
     "Domain" : "Domæne",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS der bruger OC login [DEPRECATED]",
+    "SMB / CIFS using OC login" : "SMB / CIFS med OC-login",
     "Username as share" : "Brugernavn som deling",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Tjenestenavn",
diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json
index 631fb196624..0c70ebcf77a 100644
--- a/apps/files_external/l10n/da.json
+++ b/apps/files_external/l10n/da.json
@@ -73,11 +73,11 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP med det hemmelige nøgle login [DEPRECATED]",
+    "SFTP with secret key login" : "SFTP med hemmelig nøglelogin",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Del",
     "Domain" : "Domæne",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS der bruger OC login [DEPRECATED]",
+    "SMB / CIFS using OC login" : "SMB / CIFS med OC-login",
     "Username as share" : "Brugernavn som deling",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Tjenestenavn",
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index fc0af67d3d7..bd4aa124ee1 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -49,7 +49,9 @@ OC.L10N.register(
     "Location" : "Ort",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
     "Share" : "Share",
+    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
     "Username as share" : "Benutzername als Freigabe",
     "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index 4242b817073..f09172d814c 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -47,7 +47,9 @@
     "Location" : "Ort",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
     "Share" : "Share",
+    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
     "Username as share" : "Benutzername als Freigabe",
     "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js
index 9d363aecbf6..db8c77aa35c 100644
--- a/apps/files_external/l10n/de_DE.js
+++ b/apps/files_external/l10n/de_DE.js
@@ -49,7 +49,9 @@ OC.L10N.register(
     "Location" : "Ort",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
     "Share" : "Share",
+    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
     "Username as share" : "Benutzername als Freigabe",
     "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json
index 62fe7b0803c..c3a254be26f 100644
--- a/apps/files_external/l10n/de_DE.json
+++ b/apps/files_external/l10n/de_DE.json
@@ -47,7 +47,9 @@
     "Location" : "Ort",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
     "Share" : "Share",
+    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
     "Username as share" : "Benutzername als Freigabe",
     "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js
index b311d615c32..4e62178830b 100644
--- a/apps/files_external/l10n/el.js
+++ b/apps/files_external/l10n/el.js
@@ -75,10 +75,11 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP με σύνδεση με κρυφό κλειδί [ΠΑΡΩΧΗΜΕΝΟ]",
+    "SFTP with secret key login" : "SFTP με σύνδεση με κρυφό κλειδί",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Διαμοιράστε",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC [ΠΑΡΩΧΗΜΕΝΟ]",
+    "Domain" : "Τομέας",
+    "SMB / CIFS using OC login" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
     "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
     "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
     "Service name" : "Όνομα υπηρεσίας",
diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json
index f42a610cc55..8aa6c987225 100644
--- a/apps/files_external/l10n/el.json
+++ b/apps/files_external/l10n/el.json
@@ -73,10 +73,11 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP με σύνδεση με κρυφό κλειδί [ΠΑΡΩΧΗΜΕΝΟ]",
+    "SFTP with secret key login" : "SFTP με σύνδεση με κρυφό κλειδί",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Διαμοιράστε",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC [ΠΑΡΩΧΗΜΕΝΟ]",
+    "Domain" : "Τομέας",
+    "SMB / CIFS using OC login" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
     "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
     "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
     "Service name" : "Όνομα υπηρεσίας",
diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js
index 8b1c0cdd328..444d0db1d52 100644
--- a/apps/files_external/l10n/en_GB.js
+++ b/apps/files_external/l10n/en_GB.js
@@ -49,7 +49,9 @@ OC.L10N.register(
     "Location" : "Location",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "SFTP with secret key login" : "SFTP with secret key login",
     "Share" : "Share",
+    "SMB / CIFS using OC login" : "SMB / CIFS using OC login",
     "Username as share" : "Username as share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json
index 78feab7a08f..8af92769bdf 100644
--- a/apps/files_external/l10n/en_GB.json
+++ b/apps/files_external/l10n/en_GB.json
@@ -47,7 +47,9 @@
     "Location" : "Location",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "SFTP with secret key login" : "SFTP with secret key login",
     "Share" : "Share",
+    "SMB / CIFS using OC login" : "SMB / CIFS using OC login",
     "Username as share" : "Username as share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
index 62d09425f72..3d9add9c2ec 100644
--- a/apps/files_external/l10n/es.js
+++ b/apps/files_external/l10n/es.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "Storage with id \"%i\" not found" : "No se ha encontrado almacenamiento con id \"%i\"",
     "Invalid mount point" : "Punto de montaje no válido",
     "Invalid storage backend \"%s\"" : "Motor de almacenamiento no válido «%s»",
+    "Not permitted to use authentication mechanism \"%s\"" : "No está permitido usar el mecanismo de autenticación \"%s\"",
     "Personal" : "Personal",
     "System" : "Sistema",
     "Grant access" : "Conceder acceso",
@@ -35,7 +36,7 @@ OC.L10N.register(
     "Client secret" : "Cliente secreto",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
-    "API key" : "clave API",
+    "API key" : "Clave API",
     "Username and password" : "Nombre de usuario y contraseña",
     "Session credentials" : "Credenciales de la sesión",
     "Public key" : "Clave pública",
@@ -60,10 +61,14 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Raíz",
+    "SFTP with secret key login" : "Inicio de sesión SFTP con clave secreta",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartir",
+    "Domain" : "Dominio",
+    "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC",
     "Username as share" : "Nombre de usuario como compartir",
     "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
+    "Service name" : "Nombre del servicio",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
index 6bcfca820f5..60ae72faf72 100644
--- a/apps/files_external/l10n/es.json
+++ b/apps/files_external/l10n/es.json
@@ -5,6 +5,7 @@
     "Storage with id \"%i\" not found" : "No se ha encontrado almacenamiento con id \"%i\"",
     "Invalid mount point" : "Punto de montaje no válido",
     "Invalid storage backend \"%s\"" : "Motor de almacenamiento no válido «%s»",
+    "Not permitted to use authentication mechanism \"%s\"" : "No está permitido usar el mecanismo de autenticación \"%s\"",
     "Personal" : "Personal",
     "System" : "Sistema",
     "Grant access" : "Conceder acceso",
@@ -33,7 +34,7 @@
     "Client secret" : "Cliente secreto",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
-    "API key" : "clave API",
+    "API key" : "Clave API",
     "Username and password" : "Nombre de usuario y contraseña",
     "Session credentials" : "Credenciales de la sesión",
     "Public key" : "Clave pública",
@@ -58,10 +59,14 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Raíz",
+    "SFTP with secret key login" : "Inicio de sesión SFTP con clave secreta",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartir",
+    "Domain" : "Dominio",
+    "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC",
     "Username as share" : "Nombre de usuario como compartir",
     "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
+    "Service name" : "Nombre del servicio",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
diff --git a/apps/files_external/l10n/et_EE.js b/apps/files_external/l10n/et_EE.js
index 50102a5d2eb..ecb40dbc003 100644
--- a/apps/files_external/l10n/et_EE.js
+++ b/apps/files_external/l10n/et_EE.js
@@ -49,7 +49,9 @@ OC.L10N.register(
     "Location" : "Asukoht",
     "ownCloud" : "ownCloud",
     "Root" : "Juur",
+    "SFTP with secret key login" : "SFTP koos salajase võtmega logimisega",
     "Share" : "Jaga",
+    "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
     "Username as share" : "Kasutajanimi kui jagamine",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Märkus:</b>",
diff --git a/apps/files_external/l10n/et_EE.json b/apps/files_external/l10n/et_EE.json
index d307bc9c214..3ab8610f6cc 100644
--- a/apps/files_external/l10n/et_EE.json
+++ b/apps/files_external/l10n/et_EE.json
@@ -47,7 +47,9 @@
     "Location" : "Asukoht",
     "ownCloud" : "ownCloud",
     "Root" : "Juur",
+    "SFTP with secret key login" : "SFTP koos salajase võtmega logimisega",
     "Share" : "Jaga",
+    "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
     "Username as share" : "Kasutajanimi kui jagamine",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Märkus:</b>",
diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js
index 199676d7269..fd31a4b6db3 100644
--- a/apps/files_external/l10n/eu.js
+++ b/apps/files_external/l10n/eu.js
@@ -38,6 +38,7 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "Root" : "Erroa",
     "Share" : "Partekatu",
+    "SMB / CIFS using OC login" : "SMB / CIFS saioa hasteko OC erabiliz",
     "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
     "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
     "<b>Note:</b> " : "<b>Oharra:</b>",
diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json
index f13311954f7..2270fa96d08 100644
--- a/apps/files_external/l10n/eu.json
+++ b/apps/files_external/l10n/eu.json
@@ -36,6 +36,7 @@
     "ownCloud" : "ownCloud",
     "Root" : "Erroa",
     "Share" : "Partekatu",
+    "SMB / CIFS using OC login" : "SMB / CIFS saioa hasteko OC erabiliz",
     "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
     "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
     "<b>Note:</b> " : "<b>Oharra:</b>",
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
index 92e93d9ed3a..610005fa925 100644
--- a/apps/files_external/l10n/fi_FI.js
+++ b/apps/files_external/l10n/fi_FI.js
@@ -58,6 +58,7 @@ OC.L10N.register(
     "SFTP" : "SFTP",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Jaa",
+    "SMB / CIFS using OC login" : "SMB / CIFS käyttäen OC-kirjautumista",
     "Username as share" : "Käyttäjänimi jakona",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Palvelun nimi",
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
index 6459b33a126..f8961048e2f 100644
--- a/apps/files_external/l10n/fi_FI.json
+++ b/apps/files_external/l10n/fi_FI.json
@@ -56,6 +56,7 @@
     "SFTP" : "SFTP",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Jaa",
+    "SMB / CIFS using OC login" : "SMB / CIFS käyttäen OC-kirjautumista",
     "Username as share" : "Käyttäjänimi jakona",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Palvelun nimi",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 87c7f63bfb5..f183bfeef57 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -41,11 +41,13 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
+    "OpenStack" : "OpenStack",
     "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
     "API key" : "Clé API",
     "Username and password" : "Nom d'utilisateur et mot de passe",
     "Session credentials" : "Informations d'identification de session",
+    "RSA public key" : "Clé publique RSA",
     "Public key" : "Clef publique",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -68,8 +70,11 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
+    "SFTP with secret key login" : "SFTP avec identification par clé",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Partage",
+    "Domain" : "Domaine",
+    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
     "Username as share" : "Nom d'utilisateur comme nom de partage",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Attention :</b>",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index dee041e3546..ed5c397f302 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -39,11 +39,13 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
+    "OpenStack" : "OpenStack",
     "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
     "API key" : "Clé API",
     "Username and password" : "Nom d'utilisateur et mot de passe",
     "Session credentials" : "Informations d'identification de session",
+    "RSA public key" : "Clé publique RSA",
     "Public key" : "Clef publique",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -66,8 +68,11 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
+    "SFTP with secret key login" : "SFTP avec identification par clé",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Partage",
+    "Domain" : "Domaine",
+    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
     "Username as share" : "Nom d'utilisateur comme nom de partage",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Attention :</b>",
diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js
index fc4d4ea4931..1fa5f41d64a 100644
--- a/apps/files_external/l10n/gl.js
+++ b/apps/files_external/l10n/gl.js
@@ -49,7 +49,9 @@ OC.L10N.register(
     "Location" : "Localización",
     "ownCloud" : "ownCloud",
     "Root" : "Root (raíz)",
+    "SFTP with secret key login" : "SFTP con chave secreta de acceso",
     "Share" : "Compartir",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
     "Username as share" : "Nome de usuario como compartición",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json
index 48bd2c62e9a..a4cacf44faf 100644
--- a/apps/files_external/l10n/gl.json
+++ b/apps/files_external/l10n/gl.json
@@ -47,7 +47,9 @@
     "Location" : "Localización",
     "ownCloud" : "ownCloud",
     "Root" : "Root (raíz)",
+    "SFTP with secret key login" : "SFTP con chave secreta de acceso",
     "Share" : "Compartir",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
     "Username as share" : "Nome de usuario como compartición",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
diff --git a/apps/files_external/l10n/hr.js b/apps/files_external/l10n/hr.js
index 7ab17521581..651470a58fe 100644
--- a/apps/files_external/l10n/hr.js
+++ b/apps/files_external/l10n/hr.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "ownCloud" : "OwnCloud",
     "Root" : "Korijen",
     "Share" : "Dijeljenje zhajedničkih resursa",
+    "SMB / CIFS using OC login" : "SMB / CIFS uz prijavu putem programa OC",
     "Username as share" : "Korisničko ime kao dijeljeni resurs",
     "OpenStack Object Storage" : "Prostor za pohranu.....",
     "<b>Note:</b> " : "<b>Bilješka:</b>",
diff --git a/apps/files_external/l10n/hr.json b/apps/files_external/l10n/hr.json
index 23188c55fea..80722b18ca4 100644
--- a/apps/files_external/l10n/hr.json
+++ b/apps/files_external/l10n/hr.json
@@ -34,6 +34,7 @@
     "ownCloud" : "OwnCloud",
     "Root" : "Korijen",
     "Share" : "Dijeljenje zhajedničkih resursa",
+    "SMB / CIFS using OC login" : "SMB / CIFS uz prijavu putem programa OC",
     "Username as share" : "Korisničko ime kao dijeljeni resurs",
     "OpenStack Object Storage" : "Prostor za pohranu.....",
     "<b>Note:</b> " : "<b>Bilješka:</b>",
diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js
index be0abf0bbae..e324a70e98e 100644
--- a/apps/files_external/l10n/id.js
+++ b/apps/files_external/l10n/id.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Invalid mount point" : "Mount point salah",
     "Objectstore forbidden" : "Objectstore terlarang",
     "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
+    "Not permitted to use backend \"%s\"" : "Tidak diizinkan menggunakan backend \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Tidak diizinkan menggunakan mekanisme otentikasi \"%s\"",
     "Unsatisfied backend parameters" : "Parameter backend tidak lengkap",
     "Unsatisfied authentication mechanism parameters" : "Parameter mekanisme otentikasi tidak lengkap",
     "Personal" : "Pribadi",
@@ -41,11 +43,16 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "ID Klien",
     "Client secret" : "Rahasia klien",
+    "OpenStack" : "OpenStack",
     "Username" : "Nama Pengguna",
     "Password" : "Sandi",
+    "Tenant name" : "Nama tenant",
+    "Identity endpoint URL" : "Identitas URL akhir",
+    "Rackspace" : "Rackspace",
     "API key" : "Kunci API",
     "Username and password" : "Nama pengguna dan sandi",
     "Session credentials" : "Kredensial sesi",
+    "RSA public key" : "Kunci publik RSA",
     "Public key" : "Kunci Public",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Keranjang",
@@ -68,10 +75,15 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
+    "SFTP with secret key login" : "SFTP dengan kunci rahasia masuk",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Bagikan",
+    "Domain" : "Domain",
+    "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login",
     "Username as share" : "Nama pengguna berbagi",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nama layanan",
+    "Request timeout (seconds)" : "Minta waktu habis (detik)",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json
index 6c80a01b970..83f81014b1e 100644
--- a/apps/files_external/l10n/id.json
+++ b/apps/files_external/l10n/id.json
@@ -10,6 +10,8 @@
     "Invalid mount point" : "Mount point salah",
     "Objectstore forbidden" : "Objectstore terlarang",
     "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
+    "Not permitted to use backend \"%s\"" : "Tidak diizinkan menggunakan backend \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Tidak diizinkan menggunakan mekanisme otentikasi \"%s\"",
     "Unsatisfied backend parameters" : "Parameter backend tidak lengkap",
     "Unsatisfied authentication mechanism parameters" : "Parameter mekanisme otentikasi tidak lengkap",
     "Personal" : "Pribadi",
@@ -39,11 +41,16 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "ID Klien",
     "Client secret" : "Rahasia klien",
+    "OpenStack" : "OpenStack",
     "Username" : "Nama Pengguna",
     "Password" : "Sandi",
+    "Tenant name" : "Nama tenant",
+    "Identity endpoint URL" : "Identitas URL akhir",
+    "Rackspace" : "Rackspace",
     "API key" : "Kunci API",
     "Username and password" : "Nama pengguna dan sandi",
     "Session credentials" : "Kredensial sesi",
+    "RSA public key" : "Kunci publik RSA",
     "Public key" : "Kunci Public",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Keranjang",
@@ -66,10 +73,15 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
+    "SFTP with secret key login" : "SFTP dengan kunci rahasia masuk",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Bagikan",
+    "Domain" : "Domain",
+    "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login",
     "Username as share" : "Nama pengguna berbagi",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nama layanan",
+    "Request timeout (seconds)" : "Minta waktu habis (detik)",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index 0844e90b903..c39e1764909 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -75,11 +75,11 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Radice",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP con accesso a chiave segreta [DEPRECATO]",
+    "SFTP with secret key login" : "SFTP con accesso a chiave segreta",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Condividi",
     "Domain" : "Dominio",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS utilizzando le credenziali di OC [DEPRECATO]",
+    "SMB / CIFS using OC login" : "SMB / CIFS utilizzando le credenziali di OC",
     "Username as share" : "Nome utente come condivisione",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Nome servizio",
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index cfe633bc328..ca3786bd3f5 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -73,11 +73,11 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Radice",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP con accesso a chiave segreta [DEPRECATO]",
+    "SFTP with secret key login" : "SFTP con accesso a chiave segreta",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Condividi",
     "Domain" : "Dominio",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS utilizzando le credenziali di OC [DEPRECATO]",
+    "SMB / CIFS using OC login" : "SMB / CIFS utilizzando le credenziali di OC",
     "Username as share" : "Nome utente come condivisione",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Nome servizio",
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
index f5a9720be2e..c74b55fcddd 100644
--- a/apps/files_external/l10n/ja.js
+++ b/apps/files_external/l10n/ja.js
@@ -49,7 +49,9 @@ OC.L10N.register(
     "Location" : "位置",
     "ownCloud" : "ownCloud",
     "Root" : "ルート",
+    "SFTP with secret key login" : "秘密鍵でSFTPログイン",
     "Share" : "共有",
+    "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS",
     "Username as share" : "共有名",
     "OpenStack Object Storage" : "OpenStack ObjectStorage",
     "<b>Note:</b> " : "<b>注意:</b> ",
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
index 951e86df8ca..50bfe5c5245 100644
--- a/apps/files_external/l10n/ja.json
+++ b/apps/files_external/l10n/ja.json
@@ -47,7 +47,9 @@
     "Location" : "位置",
     "ownCloud" : "ownCloud",
     "Root" : "ルート",
+    "SFTP with secret key login" : "秘密鍵でSFTPログイン",
     "Share" : "共有",
+    "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS",
     "Username as share" : "共有名",
     "OpenStack Object Storage" : "OpenStack ObjectStorage",
     "<b>Note:</b> " : "<b>注意:</b> ",
diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js
index 3bed24abe66..f27e885772e 100644
--- a/apps/files_external/l10n/ko.js
+++ b/apps/files_external/l10n/ko.js
@@ -68,8 +68,10 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "루트",
+    "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
     "SMB / CIFS" : "SMB/CIFS",
     "Share" : "공유",
+    "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS",
     "Username as share" : "사용자 이름으로 공유",
     "OpenStack Object Storage" : "OpenStack 객체 저장소",
     "<b>Note:</b> " : "<b>메모:</b>",
diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json
index 86cecf01329..ab804d58702 100644
--- a/apps/files_external/l10n/ko.json
+++ b/apps/files_external/l10n/ko.json
@@ -66,8 +66,10 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "루트",
+    "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
     "SMB / CIFS" : "SMB/CIFS",
     "Share" : "공유",
+    "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS",
     "Username as share" : "사용자 이름으로 공유",
     "OpenStack Object Storage" : "OpenStack 객체 저장소",
     "<b>Note:</b> " : "<b>메모:</b>",
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index ea912e4cf7a..2057f257adc 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -75,11 +75,11 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Rot",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP med hemmelig nøkkel for pålogging [FORELDET]",
+    "SFTP with secret key login" : "SFTP med hemmelig nøkkel for pålogging",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Delt ressurs",
     "Domain" : "Domene",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS med OC-pålogging [FORELDET]",
+    "SMB / CIFS using OC login" : "SMB / CIFS med OC-pålogging",
     "Username as share" : "Brukernavn som share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Tjenestenavn",
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index 800234a931a..36556fd9912 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -73,11 +73,11 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Rot",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP med hemmelig nøkkel for pålogging [FORELDET]",
+    "SFTP with secret key login" : "SFTP med hemmelig nøkkel for pålogging",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Delt ressurs",
     "Domain" : "Domene",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS med OC-pålogging [FORELDET]",
+    "SMB / CIFS using OC login" : "SMB / CIFS med OC-pålogging",
     "Username as share" : "Brukernavn som share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Tjenestenavn",
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index a40b2afa7e8..02661996d5e 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -75,11 +75,11 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP inlog met geheime sleutel [VEROUDERD]",
+    "SFTP with secret key login" : "SFTP met geheime sleutel inlog",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Share",
     "Domain" : "Domein",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS login met OC [VEROUDERD]",
+    "SMB / CIFS using OC login" : "SMB / CIFS via OC inlog",
     "Username as share" : "Gebruikersnaam als share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Servicenaam",
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index 52507dc4744..ef7f42b1f38 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -73,11 +73,11 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Root",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP inlog met geheime sleutel [VEROUDERD]",
+    "SFTP with secret key login" : "SFTP met geheime sleutel inlog",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Share",
     "Domain" : "Domein",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS login met OC [VEROUDERD]",
+    "SMB / CIFS using OC login" : "SMB / CIFS via OC inlog",
     "Username as share" : "Gebruikersnaam als share",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "Servicenaam",
diff --git a/apps/files_external/l10n/oc.js b/apps/files_external/l10n/oc.js
index d234d0c62c1..929d14347fc 100644
--- a/apps/files_external/l10n/oc.js
+++ b/apps/files_external/l10n/oc.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "Client secret" : "Secret client",
     "Username" : "Nom d'utilizaire",
     "Password" : "Senhal",
+    "API key" : "Clau API",
     "Public key" : "Clau publica",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -40,7 +41,9 @@ OC.L10N.register(
     "Local" : "Local",
     "Location" : "Emplaçament",
     "ownCloud" : "ownCloud",
+    "SFTP with secret key login" : "SFTP amb un identificant secret",
     "Share" : "Partejar",
+    "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC",
     "Username as share" : "Nom d'utilizaire coma nom de partiment",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Atencion :</b>",
diff --git a/apps/files_external/l10n/oc.json b/apps/files_external/l10n/oc.json
index 0dfa95426ca..84fef9ec53f 100644
--- a/apps/files_external/l10n/oc.json
+++ b/apps/files_external/l10n/oc.json
@@ -21,6 +21,7 @@
     "Client secret" : "Secret client",
     "Username" : "Nom d'utilizaire",
     "Password" : "Senhal",
+    "API key" : "Clau API",
     "Public key" : "Clau publica",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -38,7 +39,9 @@
     "Local" : "Local",
     "Location" : "Emplaçament",
     "ownCloud" : "ownCloud",
+    "SFTP with secret key login" : "SFTP amb un identificant secret",
     "Share" : "Partejar",
+    "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC",
     "Username as share" : "Nom d'utilizaire coma nom de partiment",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Atencion :</b>",
diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js
index 9fb70e71778..ac24a2b9006 100644
--- a/apps/files_external/l10n/pl.js
+++ b/apps/files_external/l10n/pl.js
@@ -49,7 +49,9 @@ OC.L10N.register(
     "Location" : "Lokalizacja",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "SFTP with secret key login" : "Logowanie tajnym kluczem do SFTP",
     "Share" : "Udostępnij",
+    "SMB / CIFS using OC login" : "SMB / CIFS przy użyciu loginu OC",
     "Username as share" : "Użytkownik jako zasób",
     "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
     "<b>Note:</b> " : "<b>Uwaga:</b> ",
diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json
index d7cd70b8c36..750e7384d68 100644
--- a/apps/files_external/l10n/pl.json
+++ b/apps/files_external/l10n/pl.json
@@ -47,7 +47,9 @@
     "Location" : "Lokalizacja",
     "ownCloud" : "ownCloud",
     "Root" : "Root",
+    "SFTP with secret key login" : "Logowanie tajnym kluczem do SFTP",
     "Share" : "Udostępnij",
+    "SMB / CIFS using OC login" : "SMB / CIFS przy użyciu loginu OC",
     "Username as share" : "Użytkownik jako zasób",
     "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
     "<b>Note:</b> " : "<b>Uwaga:</b> ",
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index 68b1c671c3c..3d392a688ee 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -75,11 +75,11 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Raiz",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP com chave secreta de login [DEPRECATED]",
+    "SFTP with secret key login" : "SFTP com chave secreta de login",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
     "Domain" : "Domínio",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS usando OC de login [DEPRECATED]",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
     "Username as share" : "Nome de usuário como compartilhado",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "Service name" : "Nome do serviço",
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index bb4c5b88a2d..9289ac7f388 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -73,11 +73,11 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Raiz",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP com chave secreta de login [DEPRECATED]",
+    "SFTP with secret key login" : "SFTP com chave secreta de login",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
     "Domain" : "Domínio",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS usando OC de login [DEPRECATED]",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
     "Username as share" : "Nome de usuário como compartilhado",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "Service name" : "Nome do serviço",
diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
index ba1d86a40d0..37a6d35471e 100644
--- a/apps/files_external/l10n/pt_PT.js
+++ b/apps/files_external/l10n/pt_PT.js
@@ -67,6 +67,7 @@ OC.L10N.register(
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
+    "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
     "Username as share" : "Nome de utilizador como partilha",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
index 24955db65f6..90c863334a5 100644
--- a/apps/files_external/l10n/pt_PT.json
+++ b/apps/files_external/l10n/pt_PT.json
@@ -65,6 +65,7 @@
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
+    "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
     "Username as share" : "Nome de utilizador como partilha",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js
index f76c5526bca..e4415e2e2b3 100644
--- a/apps/files_external/l10n/ru.js
+++ b/apps/files_external/l10n/ru.js
@@ -49,7 +49,9 @@ OC.L10N.register(
     "Location" : "Местоположение",
     "ownCloud" : "ownCloud",
     "Root" : "Корневой каталог",
+    "SFTP with secret key login" : "SFTP с помощью секретного ключа",
     "Share" : "Общий доступ",
+    "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
     "Username as share" : "Имя пользователя в качестве имени общего ресурса",
     "OpenStack Object Storage" : "Хранилище объектов OpenStack",
     "<b>Note:</b> " : "<b>Примечание:</b> ",
diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json
index 3428d05ef4b..1ea452f5408 100644
--- a/apps/files_external/l10n/ru.json
+++ b/apps/files_external/l10n/ru.json
@@ -47,7 +47,9 @@
     "Location" : "Местоположение",
     "ownCloud" : "ownCloud",
     "Root" : "Корневой каталог",
+    "SFTP with secret key login" : "SFTP с помощью секретного ключа",
     "Share" : "Общий доступ",
+    "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
     "Username as share" : "Имя пользователя в качестве имени общего ресурса",
     "OpenStack Object Storage" : "Хранилище объектов OpenStack",
     "<b>Note:</b> " : "<b>Примечание:</b> ",
diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js
index 87ea8c64bc5..2f9732961fb 100644
--- a/apps/files_external/l10n/sk_SK.js
+++ b/apps/files_external/l10n/sk_SK.js
@@ -1,30 +1,58 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Sťahovanie tokenov požiadavky zlyhalo. Overte prosím, či je aplikačný kľúč a heslo (secret) zadané správne.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Sťahovanie prístupových tokenov zlyhalo. Overte prosím, či je aplikačný kľúč a heslo (secret) zadané správne.",
+    "Please provide a valid app key and secret." : "Zadajte prosím platný aplikačný kľúč a heslo (secret).",
     "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s",
     "External storage" : "Externé úložisko",
+    "Storage with id \"%i\" not found" : "Úložisko s ID \"%i\" sa nenašlo",
+    "Invalid backend or authentication mechanism class" : "Neplatný backend, prípadne trieda mechanizmu autentifikácie",
     "Invalid mount point" : "Chybný prípojný bod",
+    "Objectstore forbidden" : "Objectstore je zakáazaný",
+    "Invalid storage backend \"%s\"" : "Neplatný backend úložiska \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Nie je povolené použiť backend \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Nie je povolené použiť autentifikačný mechanizmus \"%s\"",
+    "Unsatisfied backend parameters" : "Nedostatočné parametre backendu",
+    "Unsatisfied authentication mechanism parameters" : "Nedostatočné parametre autentifikačného mechanizmu",
     "Personal" : "Osobné",
     "System" : "Systém",
     "Grant access" : "Povoliť prístup",
     "Access granted" : "Prístup povolený",
+    "Error configuring OAuth1" : "Chyba konfigurovania OAuth1",
+    "Error configuring OAuth2" : "Chyba konfigurovania OAuth2",
     "Generate keys" : "Vytvoriť kľúče",
     "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
     "Enable encryption" : "Povoliť šifrovanie",
     "Enable previews" : "Povoliť náhľady",
+    "Check for changes" : "Zisťovať zmeny",
     "Never" : "Nikdy",
+    "Once every direct access" : "S každým priamym prístupom",
+    "Every time the filesystem is used" : "Vždy keď je použitý súborový systém",
     "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.",
     "(group)" : "(skupina)",
     "Saved" : "Uložené",
+    "Access key" : "Prístupový kľúč",
+    "Secret key" : "Tajný kľúč",
+    "Builtin" : "Vstavaný",
     "None" : "Žiadny",
+    "OAuth1" : "OAuth1",
     "App key" : "Kľúč aplikácie",
     "App secret" : "Heslo aplikácie",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Heslo klienta",
+    "OpenStack" : "OpenStack",
     "Username" : "Používateľské meno",
     "Password" : "Heslo",
+    "Tenant name" : "Meno nájomcu",
+    "Identity endpoint URL" : "Endpoint URL identita",
+    "Rackspace" : "Rackspace",
     "API key" : "API kľúč",
+    "Username and password" : "Meno a heslo",
+    "Session credentials" : "Pihlasovacie údaje sezóny",
+    "RSA public key" : "RSA verejný kľúč",
     "Public key" : "Verejný kľúč",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Sektor",
@@ -38,25 +66,35 @@ OC.L10N.register(
     "Remote subfolder" : "Vzdialený podpriečinok",
     "Secure https://" : "Zabezpečené https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "Hostiteľ",
     "Secure ftps://" : "Zabezpečené ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Lokálny",
     "Location" : "Umiestnenie",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Zdieľať",
+    "Domain" : "Doména",
+    "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia",
     "Username as share" : "Používateľské meno ako zdieľaný priečinok",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Názov služby",
+    "Request timeout (seconds)" : "Timeout požiadavky (s)",
     "<b>Note:</b> " : "<b>Poznámka:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované",
+    "You can add external storages in the personal settings" : "Externé úložisko je možné pridať v osobných nastaveniach",
     "Name" : "Názov",
     "Storage type" : "Typ úložiska",
     "Scope" : "Rozsah",
     "External Storage" : "Externé úložisko",
     "Folder name" : "Názov priečinka",
+    "Authentication" : "Autentifikácia",
     "Configuration" : "Nastavenia",
     "Available for" : "K dispozícii pre",
     "Advanced settings" : "Rozšírené nastavenia",
diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json
index 5e7f4d1fa94..b2b21ffe1bb 100644
--- a/apps/files_external/l10n/sk_SK.json
+++ b/apps/files_external/l10n/sk_SK.json
@@ -1,28 +1,56 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Sťahovanie tokenov požiadavky zlyhalo. Overte prosím, či je aplikačný kľúč a heslo (secret) zadané správne.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Sťahovanie prístupových tokenov zlyhalo. Overte prosím, či je aplikačný kľúč a heslo (secret) zadané správne.",
+    "Please provide a valid app key and secret." : "Zadajte prosím platný aplikačný kľúč a heslo (secret).",
     "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s",
     "External storage" : "Externé úložisko",
+    "Storage with id \"%i\" not found" : "Úložisko s ID \"%i\" sa nenašlo",
+    "Invalid backend or authentication mechanism class" : "Neplatný backend, prípadne trieda mechanizmu autentifikácie",
     "Invalid mount point" : "Chybný prípojný bod",
+    "Objectstore forbidden" : "Objectstore je zakáazaný",
+    "Invalid storage backend \"%s\"" : "Neplatný backend úložiska \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Nie je povolené použiť backend \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Nie je povolené použiť autentifikačný mechanizmus \"%s\"",
+    "Unsatisfied backend parameters" : "Nedostatočné parametre backendu",
+    "Unsatisfied authentication mechanism parameters" : "Nedostatočné parametre autentifikačného mechanizmu",
     "Personal" : "Osobné",
     "System" : "Systém",
     "Grant access" : "Povoliť prístup",
     "Access granted" : "Prístup povolený",
+    "Error configuring OAuth1" : "Chyba konfigurovania OAuth1",
+    "Error configuring OAuth2" : "Chyba konfigurovania OAuth2",
     "Generate keys" : "Vytvoriť kľúče",
     "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
     "Enable encryption" : "Povoliť šifrovanie",
     "Enable previews" : "Povoliť náhľady",
+    "Check for changes" : "Zisťovať zmeny",
     "Never" : "Nikdy",
+    "Once every direct access" : "S každým priamym prístupom",
+    "Every time the filesystem is used" : "Vždy keď je použitý súborový systém",
     "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.",
     "(group)" : "(skupina)",
     "Saved" : "Uložené",
+    "Access key" : "Prístupový kľúč",
+    "Secret key" : "Tajný kľúč",
+    "Builtin" : "Vstavaný",
     "None" : "Žiadny",
+    "OAuth1" : "OAuth1",
     "App key" : "Kľúč aplikácie",
     "App secret" : "Heslo aplikácie",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Client ID",
     "Client secret" : "Heslo klienta",
+    "OpenStack" : "OpenStack",
     "Username" : "Používateľské meno",
     "Password" : "Heslo",
+    "Tenant name" : "Meno nájomcu",
+    "Identity endpoint URL" : "Endpoint URL identita",
+    "Rackspace" : "Rackspace",
     "API key" : "API kľúč",
+    "Username and password" : "Meno a heslo",
+    "Session credentials" : "Pihlasovacie údaje sezóny",
+    "RSA public key" : "RSA verejný kľúč",
     "Public key" : "Verejný kľúč",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Sektor",
@@ -36,25 +64,35 @@
     "Remote subfolder" : "Vzdialený podpriečinok",
     "Secure https://" : "Zabezpečené https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "Hostiteľ",
     "Secure ftps://" : "Zabezpečené ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Lokálny",
     "Location" : "Umiestnenie",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Zdieľať",
+    "Domain" : "Doména",
+    "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia",
     "Username as share" : "Používateľské meno ako zdieľaný priečinok",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Názov služby",
+    "Request timeout (seconds)" : "Timeout požiadavky (s)",
     "<b>Note:</b> " : "<b>Poznámka:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "No external storage configured" : "Žiadne externé úložisko nie je nakonfigurované",
+    "You can add external storages in the personal settings" : "Externé úložisko je možné pridať v osobných nastaveniach",
     "Name" : "Názov",
     "Storage type" : "Typ úložiska",
     "Scope" : "Rozsah",
     "External Storage" : "Externé úložisko",
     "Folder name" : "Názov priečinka",
+    "Authentication" : "Autentifikácia",
     "Configuration" : "Nastavenia",
     "Available for" : "K dispozícii pre",
     "Advanced settings" : "Rozšírené nastavenia",
diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js
index b4c9cc00275..c971920298a 100644
--- a/apps/files_external/l10n/sl.js
+++ b/apps/files_external/l10n/sl.js
@@ -49,7 +49,9 @@ OC.L10N.register(
     "Location" : "Mesto",
     "ownCloud" : "ownCloud",
     "Root" : "Koren",
+    "SFTP with secret key login" : "Prijava preko protokola SFTP z geslom",
     "Share" : "Souporaba",
+    "SMB / CIFS using OC login" : "SMB / CIFS z uporabo prijave OC",
     "Username as share" : "Uporabniško ime za souporabo",
     "OpenStack Object Storage" : "Shramba predmeta OpenStack",
     "<b>Note:</b> " : "<b>Opomba:</b> ",
diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json
index 56b64fb17cc..1a8df6097d8 100644
--- a/apps/files_external/l10n/sl.json
+++ b/apps/files_external/l10n/sl.json
@@ -47,7 +47,9 @@
     "Location" : "Mesto",
     "ownCloud" : "ownCloud",
     "Root" : "Koren",
+    "SFTP with secret key login" : "Prijava preko protokola SFTP z geslom",
     "Share" : "Souporaba",
+    "SMB / CIFS using OC login" : "SMB / CIFS z uporabo prijave OC",
     "Username as share" : "Uporabniško ime za souporabo",
     "OpenStack Object Storage" : "Shramba predmeta OpenStack",
     "<b>Note:</b> " : "<b>Opomba:</b> ",
diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js
index ddc5878f1f5..633bfbcb423 100644
--- a/apps/files_external/l10n/sr.js
+++ b/apps/files_external/l10n/sr.js
@@ -48,7 +48,9 @@ OC.L10N.register(
     "Local" : "локална",
     "Location" : "Локација",
     "ownCloud" : "оунКлауд",
+    "SFTP with secret key login" : "СФТП са пријавом помоћу тајног кључа",
     "Share" : "Дели",
+    "SMB / CIFS using OC login" : "СМБ/ЦИФС користећи оунКлауд пријаву",
     "Username as share" : "Корисничко име као дељење",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Напомена:</b> ",
diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json
index bc7dc4de21a..820bec758df 100644
--- a/apps/files_external/l10n/sr.json
+++ b/apps/files_external/l10n/sr.json
@@ -46,7 +46,9 @@
     "Local" : "локална",
     "Location" : "Локација",
     "ownCloud" : "оунКлауд",
+    "SFTP with secret key login" : "СФТП са пријавом помоћу тајног кључа",
     "Share" : "Дели",
+    "SMB / CIFS using OC login" : "СМБ/ЦИФС користећи оунКлауд пријаву",
     "Username as share" : "Корисничко име као дељење",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Напомена:</b> ",
diff --git a/apps/files_external/l10n/sr@latin.js b/apps/files_external/l10n/sr@latin.js
index 64301b4a026..0d1c69f4b75 100644
--- a/apps/files_external/l10n/sr@latin.js
+++ b/apps/files_external/l10n/sr@latin.js
@@ -34,6 +34,7 @@ OC.L10N.register(
     "Location" : "Lokacija",
     "Root" : "Koren",
     "Share" : "Podeli",
+    "SMB / CIFS using OC login" : "SMB / CIFS koji koristi OC prijavljivanje",
     "Username as share" : "Korisničko ime i deljeni direktorijum",
     "OpenStack Object Storage" : "OpenStack skladište objekata",
     "<b>Note:</b> " : "<b>Obratite pažnju:</b>",
diff --git a/apps/files_external/l10n/sr@latin.json b/apps/files_external/l10n/sr@latin.json
index 72fc20844bd..747a9f1082d 100644
--- a/apps/files_external/l10n/sr@latin.json
+++ b/apps/files_external/l10n/sr@latin.json
@@ -32,6 +32,7 @@
     "Location" : "Lokacija",
     "Root" : "Koren",
     "Share" : "Podeli",
+    "SMB / CIFS using OC login" : "SMB / CIFS koji koristi OC prijavljivanje",
     "Username as share" : "Korisničko ime i deljeni direktorijum",
     "OpenStack Object Storage" : "OpenStack skladište objekata",
     "<b>Note:</b> " : "<b>Obratite pažnju:</b>",
diff --git a/apps/files_external/l10n/sv.js b/apps/files_external/l10n/sv.js
index 08175a56562..2defbf76c8c 100644
--- a/apps/files_external/l10n/sv.js
+++ b/apps/files_external/l10n/sv.js
@@ -39,6 +39,7 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "Root" : "Root",
     "Share" : "Dela",
+    "SMB / CIFS using OC login" : "SMB / CIFS använder OC inloggning",
     "Username as share" : "Användarnamn till utdelning",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b> OBS: </ b>",
diff --git a/apps/files_external/l10n/sv.json b/apps/files_external/l10n/sv.json
index c44ad337ab3..ec8b7ef37fb 100644
--- a/apps/files_external/l10n/sv.json
+++ b/apps/files_external/l10n/sv.json
@@ -37,6 +37,7 @@
     "ownCloud" : "ownCloud",
     "Root" : "Root",
     "Share" : "Dela",
+    "SMB / CIFS using OC login" : "SMB / CIFS använder OC inloggning",
     "Username as share" : "Användarnamn till utdelning",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b> OBS: </ b>",
diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js
index 89308e5889c..9879265a709 100644
--- a/apps/files_external/l10n/th_TH.js
+++ b/apps/files_external/l10n/th_TH.js
@@ -75,11 +75,11 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "รูท",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP กับรหัสลับเข้าสู่ระบบ [ยกเลิก]",
+    "SFTP with secret key login" : "SFTP กับคีย์ลับสำหรับเข้าสู่ระบบ",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "แชร์",
     "Domain" : "โดเมน",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS กำลังใช้ OC เข้าสู่ระบบ [ยกเลิก]",
+    "SMB / CIFS using OC login" : "SMB/CIFS กำลังใช้ OC เข้าสู่ระบบ",
     "Username as share" : "ชื่อผู้ใช้ที่แชร์",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "ชื่อบริการ",
diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json
index 5b167001e4e..8c00efd7bb2 100644
--- a/apps/files_external/l10n/th_TH.json
+++ b/apps/files_external/l10n/th_TH.json
@@ -73,11 +73,11 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "รูท",
-    "SFTP with secret key login [DEPRECATED]" : "SFTP กับรหัสลับเข้าสู่ระบบ [ยกเลิก]",
+    "SFTP with secret key login" : "SFTP กับคีย์ลับสำหรับเข้าสู่ระบบ",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "แชร์",
     "Domain" : "โดเมน",
-    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS กำลังใช้ OC เข้าสู่ระบบ [ยกเลิก]",
+    "SMB / CIFS using OC login" : "SMB/CIFS กำลังใช้ OC เข้าสู่ระบบ",
     "Username as share" : "ชื่อผู้ใช้ที่แชร์",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "Service name" : "ชื่อบริการ",
diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js
index 652bc611866..b0fed7b5657 100644
--- a/apps/files_external/l10n/tr.js
+++ b/apps/files_external/l10n/tr.js
@@ -68,8 +68,10 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Kök",
+    "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Paylaş",
+    "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
     "Username as share" : "Paylaşım olarak kullanıcı adı",
     "OpenStack Object Storage" : "OpenStack Nesne Depolama",
     "<b>Note:</b> " : "<b>Not:</b> ",
diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json
index 328ecab466f..2a7d69832f8 100644
--- a/apps/files_external/l10n/tr.json
+++ b/apps/files_external/l10n/tr.json
@@ -66,8 +66,10 @@
     "ownCloud" : "ownCloud",
     "SFTP" : "SFTP",
     "Root" : "Kök",
+    "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Paylaş",
+    "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
     "Username as share" : "Paylaşım olarak kullanıcı adı",
     "OpenStack Object Storage" : "OpenStack Nesne Depolama",
     "<b>Note:</b> " : "<b>Not:</b> ",
diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js
index 024d4fcf982..68b1787346a 100644
--- a/apps/files_external/l10n/uk.js
+++ b/apps/files_external/l10n/uk.js
@@ -45,6 +45,7 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "Root" : "Батьківський каталог",
     "Share" : "Поділитися",
+    "SMB / CIFS using OC login" : "SMB / CIFS з використанням логіна OC",
     "Username as share" : "Ім'я для відкритого доступу",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Примітка:</b>",
diff --git a/apps/files_external/l10n/uk.json b/apps/files_external/l10n/uk.json
index fe5c43a8f39..5765a30dc59 100644
--- a/apps/files_external/l10n/uk.json
+++ b/apps/files_external/l10n/uk.json
@@ -43,6 +43,7 @@
     "ownCloud" : "ownCloud",
     "Root" : "Батьківський каталог",
     "Share" : "Поділитися",
+    "SMB / CIFS using OC login" : "SMB / CIFS з використанням логіна OC",
     "Username as share" : "Ім'я для відкритого доступу",
     "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Примітка:</b>",
diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js
index 535d945b028..3ba25300d95 100644
--- a/apps/files_external/l10n/zh_CN.js
+++ b/apps/files_external/l10n/zh_CN.js
@@ -30,6 +30,7 @@ OC.L10N.register(
     "ownCloud" : "ownCloud",
     "Root" : "根路径",
     "Share" : "共享",
+    "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息",
     "OpenStack Object Storage" : "OpenStack 对象存储",
     "<b>Note:</b> " : "<b>注意：</b>",
     "Name" : "名称",
diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json
index ac75d680c7e..94301573ab9 100644
--- a/apps/files_external/l10n/zh_CN.json
+++ b/apps/files_external/l10n/zh_CN.json
@@ -28,6 +28,7 @@
     "ownCloud" : "ownCloud",
     "Root" : "根路径",
     "Share" : "共享",
+    "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息",
     "OpenStack Object Storage" : "OpenStack 对象存储",
     "<b>Note:</b> " : "<b>注意：</b>",
     "Name" : "名称",
diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js
index 403aaa87696..b295a3aa7dc 100644
--- a/apps/files_sharing/l10n/ca.js
+++ b/apps/files_sharing/l10n/ca.js
@@ -3,10 +3,12 @@ OC.L10N.register(
     {
     "Server to server sharing is not enabled on this server" : "La compartició entre servidors no està activada en aquest servidor",
     "Invalid or untrusted SSL certificate" : "El certificat SSL és invàlid o no és fiable",
+    "Storage not valid" : "Emmagatzemament no valit",
     "Couldn't add remote share" : "No s'ha pogut afegir una compartició remota",
     "Shared with you" : "Us han compartit",
     "Shared with others" : "Heu compartit",
     "Shared by link" : "Compartit amb enllaç",
+    "No shared links" : "no hi ha enllaços compartits",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voleu afegir la compartició remota {nom} des de {owner}@{remote}?",
     "Remote share" : "Compartició remota",
     "Remote share password" : "Contrasenya de compartició remota",
diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json
index c0aa500d2a6..e5ce33561a5 100644
--- a/apps/files_sharing/l10n/ca.json
+++ b/apps/files_sharing/l10n/ca.json
@@ -1,10 +1,12 @@
 { "translations": {
     "Server to server sharing is not enabled on this server" : "La compartició entre servidors no està activada en aquest servidor",
     "Invalid or untrusted SSL certificate" : "El certificat SSL és invàlid o no és fiable",
+    "Storage not valid" : "Emmagatzemament no valit",
     "Couldn't add remote share" : "No s'ha pogut afegir una compartició remota",
     "Shared with you" : "Us han compartit",
     "Shared with others" : "Heu compartit",
     "Shared by link" : "Compartit amb enllaç",
+    "No shared links" : "no hi ha enllaços compartits",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voleu afegir la compartició remota {nom} des de {owner}@{remote}?",
     "Remote share" : "Compartició remota",
     "Remote share password" : "Contrasenya de compartició remota",
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 18ba9bd0d31..6f71bdc2832 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -10,7 +10,7 @@ OC.L10N.register(
     "Shared with you" : "Διαμοιρασμένο με εσάς",
     "Shared with others" : "Διαμοιρασμένο με άλλους",
     "Shared by link" : "Διαμοιρασμένο μέσω συνδέσμου",
-    "Nothing shared with you yet" : "Δεν έχει διαμοιραστεί κάτι με εσάς ακόμα",
+    "Nothing shared with you yet" : "Κανένα αρχείο δεν έχει διαμοιραστεί ακόμα με εσάς.",
     "Files and folders others share with you will show up here" : "Τα αρχεία και οι φάκελοι που άλλοι διαμοιράζονται με εσάς θα εμφανιστούν εδώ",
     "Nothing shared yet" : "Δεν έχει διαμοιραστεί τίποτα μέχρι στιγμής",
     "Files and folders you share will show up here" : "Τα αρχεία και οι φάκελοι που διαμοιράζεστε θα εμφανιστούν εδώ",
@@ -38,9 +38,13 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Το κοινόχρηστο διαμοιρασμένο αρχείο %1$s ελήφθη",
     "You shared %1$s with %2$s" : "Διαμοιραστήκατε το %1$s με %2$s",
     "You shared %1$s with group %2$s" : "Διαμοιραστήκατε %1$s με την ομάδα %2$s",
+    "%2$s shared %1$s with %3$s" : "Ο %2$s διαμοιράστηκε το %1$s με %3$s",
+    "%2$s shared %1$s with group %3$s" : "Ο %2$s διαμοιράστηκε το %1$s με την ομάδα %3$s",
+    "%2$s shared %1$s via link" : "Ο %2$s διαμοιράστηκε το %1$s μέσω συνδέσμου",
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
+    "You received %2$s as a remote share from %1$s" : "Λάβατε το %2$s ως απομακρυσμένο διαμοιρασμό από %1$s",
     "Accept" : "Αποδοχή",
     "Decline" : "Απόρριψη",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index f8e42195d0d..c1bdc039f9d 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -8,7 +8,7 @@
     "Shared with you" : "Διαμοιρασμένο με εσάς",
     "Shared with others" : "Διαμοιρασμένο με άλλους",
     "Shared by link" : "Διαμοιρασμένο μέσω συνδέσμου",
-    "Nothing shared with you yet" : "Δεν έχει διαμοιραστεί κάτι με εσάς ακόμα",
+    "Nothing shared with you yet" : "Κανένα αρχείο δεν έχει διαμοιραστεί ακόμα με εσάς.",
     "Files and folders others share with you will show up here" : "Τα αρχεία και οι φάκελοι που άλλοι διαμοιράζονται με εσάς θα εμφανιστούν εδώ",
     "Nothing shared yet" : "Δεν έχει διαμοιραστεί τίποτα μέχρι στιγμής",
     "Files and folders you share will show up here" : "Τα αρχεία και οι φάκελοι που διαμοιράζεστε θα εμφανιστούν εδώ",
@@ -36,9 +36,13 @@
     "Public shared file %1$s was downloaded" : "Το κοινόχρηστο διαμοιρασμένο αρχείο %1$s ελήφθη",
     "You shared %1$s with %2$s" : "Διαμοιραστήκατε το %1$s με %2$s",
     "You shared %1$s with group %2$s" : "Διαμοιραστήκατε %1$s με την ομάδα %2$s",
+    "%2$s shared %1$s with %3$s" : "Ο %2$s διαμοιράστηκε το %1$s με %3$s",
+    "%2$s shared %1$s with group %3$s" : "Ο %2$s διαμοιράστηκε το %1$s με την ομάδα %3$s",
+    "%2$s shared %1$s via link" : "Ο %2$s διαμοιράστηκε το %1$s μέσω συνδέσμου",
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
+    "You received %2$s as a remote share from %1$s" : "Λάβατε το %2$s ως απομακρυσμένο διαμοιρασμό από %1$s",
     "Accept" : "Αποδοχή",
     "Decline" : "Απόρριψη",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index ca1e8c430db..037855d6d99 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -42,6 +42,7 @@ OC.L10N.register(
     "You shared %1$s via link" : "Ha compartido %1$s vía enlace",
     "Shares" : "Compartidos",
     "Accept" : "Aceptar",
+    "Decline" : "Denegar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud",
     "This share is password-protected" : "Este elemento compartido está protegido por contraseña",
@@ -67,7 +68,7 @@ OC.L10N.register(
     "Federated Cloud" : "Nube Federada",
     "Your Federated Cloud ID:" : "Su ID Nube Federada:",
     "Share it:" : "Compartir:",
-    "Add to your website" : "Añadir a su Website",
+    "Add to your website" : "Añadir a su sitio web",
     "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index 4b300e1227f..c0da82abdd6 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -40,6 +40,7 @@
     "You shared %1$s via link" : "Ha compartido %1$s vía enlace",
     "Shares" : "Compartidos",
     "Accept" : "Aceptar",
+    "Decline" : "Denegar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud",
     "This share is password-protected" : "Este elemento compartido está protegido por contraseña",
@@ -65,7 +66,7 @@
     "Federated Cloud" : "Nube Federada",
     "Your Federated Cloud ID:" : "Su ID Nube Federada:",
     "Share it:" : "Compartir:",
-    "Add to your website" : "Añadir a su Website",
+    "Add to your website" : "Añadir a su sitio web",
     "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 3942d18de03..382bc1e69e5 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -38,9 +38,12 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Le fichier public %1$s a été téléchargé",
     "You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s",
     "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s partagé %1$s avec %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Shares" : "Partages",
+    "You received %2$s as a remote share from %1$s" : "Vous avez reçu %2$s en tant que partage distant par %1$s",
     "Accept" : "Accepter",
     "Decline" : "Refuser",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 75b645ef259..7766b016f3b 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -36,9 +36,12 @@
     "Public shared file %1$s was downloaded" : "Le fichier public %1$s a été téléchargé",
     "You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s",
     "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s partagé %1$s avec %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Shares" : "Partages",
+    "You received %2$s as a remote share from %1$s" : "Vous avez reçu %2$s en tant que partage distant par %1$s",
     "Accept" : "Accepter",
     "Decline" : "Refuser",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index 3895a028be8..7b85e236b44 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -38,9 +38,13 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Nyilvánosan megosztott fálj %1$s le lett töltve",
     "You shared %1$s with %2$s" : "%1$s-t megosztottam ővele: %2$s",
     "You shared %1$s with group %2$s" : "%1$s-t megosztottam ezzel a csoporttal: %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s megosztotta ezt: %1$s, ővele: %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s megosztotta ezt: %1$s, ezzel a csoporttal: %3$s",
+    "%2$s shared %1$s via link" : "%2$s megosztotta ezt: %1$s, hivatkozással",
     "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
     "Shares" : "Megosztások",
+    "You received %2$s as a remote share from %1$s" : "Kaptál egy távoli megosztást: %2$s, innen: %1$s",
     "Accept" : "Elfogadás",
     "Decline" : "Elutasítás",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s",
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index e9037d232b0..c749a5add97 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -36,9 +36,13 @@
     "Public shared file %1$s was downloaded" : "Nyilvánosan megosztott fálj %1$s le lett töltve",
     "You shared %1$s with %2$s" : "%1$s-t megosztottam ővele: %2$s",
     "You shared %1$s with group %2$s" : "%1$s-t megosztottam ezzel a csoporttal: %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s megosztotta ezt: %1$s, ővele: %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s megosztotta ezt: %1$s, ezzel a csoporttal: %3$s",
+    "%2$s shared %1$s via link" : "%2$s megosztotta ezt: %1$s, hivatkozással",
     "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
     "Shares" : "Megosztások",
+    "You received %2$s as a remote share from %1$s" : "Kaptál egy távoli megosztást: %2$s, innen: %1$s",
     "Accept" : "Elfogadás",
     "Decline" : "Elutasítás",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s",
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index d39d9e763f1..4486cd80545 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -38,9 +38,13 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Berkas berbagi publik %1$s telah diunduh",
     "You shared %1$s with %2$s" : "Anda membagikan %1$s dengan %2$s",
     "You shared %1$s with group %2$s" : "Anda membagikan %1$s dengan grup %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s berbagi %1$s kepada %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s berbagi %1$s kepada grup %3$s",
+    "%2$s shared %1$s via link" : "%2$s berbagi %1$s via tautan",
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
     "Shares" : "Dibagikan",
+    "You received %2$s as a remote share from %1$s" : "Anda menerima %2$s sebagai berbagi remote dari %1$s",
     "Accept" : "Terima",
     "Decline" : "Tolak",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index 35b22b53346..f9805231bcd 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -36,9 +36,13 @@
     "Public shared file %1$s was downloaded" : "Berkas berbagi publik %1$s telah diunduh",
     "You shared %1$s with %2$s" : "Anda membagikan %1$s dengan %2$s",
     "You shared %1$s with group %2$s" : "Anda membagikan %1$s dengan grup %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s berbagi %1$s kepada %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s berbagi %1$s kepada grup %3$s",
+    "%2$s shared %1$s via link" : "%2$s berbagi %1$s via tautan",
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
     "Shares" : "Dibagikan",
+    "You received %2$s as a remote share from %1$s" : "Anda menerima %2$s sebagai berbagi remote dari %1$s",
     "Accept" : "Terima",
     "Decline" : "Tolak",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
diff --git a/apps/files_sharing/l10n/oc.js b/apps/files_sharing/l10n/oc.js
index 51378911814..b554192fafc 100644
--- a/apps/files_sharing/l10n/oc.js
+++ b/apps/files_sharing/l10n/oc.js
@@ -1,12 +1,78 @@
 OC.L10N.register(
     "files_sharing",
     {
-    "Cancel" : "Annula",
+    "Server to server sharing is not enabled on this server" : "Lo partiment de servidor a servidor es pas activat sus aqueste servidor",
+    "The mountpoint name contains invalid characters." : "Lo nom del punt de montatge conten de caractèrs invalids.",
+    "Invalid or untrusted SSL certificate" : "Certificat SSL invalid o pas fisable",
+    "Could not authenticate to remote share, password might be wrong" : "Impossible de s'autentificar al partiment distant : lo senhal es probablament incorrècte",
+    "Storage not valid" : "Supòrt d'emmagazinatge invalid",
+    "Couldn't add remote share" : "Impossible d'apondre lo partiment distant",
+    "Shared with you" : "Partejats amb vos",
+    "Shared with others" : "Partejats amb d'autres",
+    "Shared by link" : "Partejats per ligam",
+    "Nothing shared with you yet" : "Cap de fichièr es pas partejat amb vos pel moment",
+    "Files and folders others share with you will show up here" : "Los fichièrs e dorsièrs partejats amb vos apareisseràn aicí",
+    "Nothing shared yet" : "Res es pas partejat pel moment",
+    "Files and folders you share will show up here" : "Los fichièrs e dorsièrs que partejatz apareisseràn aicí",
+    "No shared links" : "Pas cap de partiment per ligam",
+    "Files and folders you share by link will show up here" : "Los fichièrs e dorsièrs que partejatz per ligam apareisseràn aicí",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Volètz apondre lo partiment distant {name} de {owner}@{remote} ?",
+    "Remote share" : "Partiment distant",
+    "Remote share password" : "Senhal del partiment distant",
+    "Cancel" : "Anullar",
+    "Add remote share" : "Apondre un partiment distant",
+    "You can upload into this folder" : "Podètz mandar dins aqueste dorsièr",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Cap d'installacion ownCloud (7 o superior) pas trobada sus {remote}",
+    "Invalid ownCloud url" : "URL ownCloud invalida",
+    "Shared by" : "Partejat per",
     "Sharing" : "Partiment",
+    "A file or folder has been <strong>shared</strong>" : "Un fichièr o un repertòri es estat <strong>partejat</strong>",
+    "A file or folder was shared from <strong>another server</strong>" : "Un fichièr o un repertòri es estat partejat depuis <strong>un autre servidor</strong>",
+    "A public shared file or folder was <strong>downloaded</strong>" : "Un fichièr o un repertòri partejat publicament es estat <strong>telecargat</strong>",
+    "You received a new remote share %2$s from %1$s" : "L'utilizaire %1$s a partejat la ressorsa distanta %2$s amb vos",
+    "You received a new remote share from %s" : "Avètz recebut un partiment distant de %s",
+    "%1$s accepted remote share %2$s" : "%1$s a acceptat lo partiment distant %2$s",
+    "%1$s declined remote share %2$s" : "%1$s a refusat lo partiment distant %2$s",
+    "%1$s unshared %2$s from you" : "%1$s a daissat de partejar %2$s amb vos",
+    "Public shared folder %1$s was downloaded" : "Lo dorsièr public %1$s es estat telecargat",
+    "Public shared file %1$s was downloaded" : "Lo fichièr public %1$s es estat telecargat",
+    "You shared %1$s with %2$s" : "Avètz partejat %1$s amb %2$s",
+    "You shared %1$s with group %2$s" : "Avètz partejat %1$s amb lo grop %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s partejat %1$s amb %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s partejat %1$s amb lo grop %3$s",
+    "%2$s shared %1$s with you" : "%2$s a partejat %1$s amb vos",
+    "You shared %1$s via link" : "Avètz partejat %1$s per ligam public",
+    "Shares" : "Partiments",
+    "You received %2$s as a remote share from %1$s" : "Avètz recebut %2$s en tant que partiment distant per %1$s",
+    "Accept" : "Acceptar",
+    "Decline" : "Refusar",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud",
+    "This share is password-protected" : "Aqueste partiment es protegit per un senhal",
+    "The password is wrong. Try again." : "Lo senhal es incorrècte. Ensajatz tornamai.",
     "Password" : "Senhal",
     "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr",
     "Name" : "Nom",
-    "Download" : "Avalcarga",
-    "Open documentation" : "Veire la documentacion"
+    "Share time" : "Data de partiment",
+    "Sorry, this link doesn’t seem to work anymore." : "O planhèm, mas sembla qu'aqueste ligam fonciona pas mai.",
+    "Reasons might be:" : "Las rasons pòdon èsser :",
+    "the item was removed" : "l'element es estat suprimit",
+    "the link expired" : "lo ligam a expirat",
+    "sharing is disabled" : "lo partiment es desactivat",
+    "For more info, please ask the person who sent this link." : "Per mai d'informacions, contactatz la persona qu'a mandat aqueste ligam.",
+    "Add to your ownCloud" : "Apondre a vòstre ownCloud",
+    "Download" : "Telecargar",
+    "Download %s" : "Telecargar %s",
+    "Direct link" : "Ligam dirècte",
+    "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "Open documentation" : "Veire la documentacion",
+    "Allow users on this server to send shares to other servers" : "Autorizar los utilizaires d'aqueste servidor a mandar de partiments cap a d'autres servidors",
+    "Allow users on this server to receive shares from other servers" : "Autorizar los utilizaires d'aqueste servidor a recebre de partiments d'autres servidors",
+    "Federated Cloud" : "Federated Cloud",
+    "Your Federated Cloud ID:" : "Vòstre identificant Federated Cloud :",
+    "Share it:" : "Partejar :",
+    "Add to your website" : "Apondre a vòstre site web",
+    "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud",
+    "HTML Code:" : "Còde HTML :"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/oc.json b/apps/files_sharing/l10n/oc.json
index 1dc1272a31f..326d804a055 100644
--- a/apps/files_sharing/l10n/oc.json
+++ b/apps/files_sharing/l10n/oc.json
@@ -1,10 +1,76 @@
 { "translations": {
-    "Cancel" : "Annula",
+    "Server to server sharing is not enabled on this server" : "Lo partiment de servidor a servidor es pas activat sus aqueste servidor",
+    "The mountpoint name contains invalid characters." : "Lo nom del punt de montatge conten de caractèrs invalids.",
+    "Invalid or untrusted SSL certificate" : "Certificat SSL invalid o pas fisable",
+    "Could not authenticate to remote share, password might be wrong" : "Impossible de s'autentificar al partiment distant : lo senhal es probablament incorrècte",
+    "Storage not valid" : "Supòrt d'emmagazinatge invalid",
+    "Couldn't add remote share" : "Impossible d'apondre lo partiment distant",
+    "Shared with you" : "Partejats amb vos",
+    "Shared with others" : "Partejats amb d'autres",
+    "Shared by link" : "Partejats per ligam",
+    "Nothing shared with you yet" : "Cap de fichièr es pas partejat amb vos pel moment",
+    "Files and folders others share with you will show up here" : "Los fichièrs e dorsièrs partejats amb vos apareisseràn aicí",
+    "Nothing shared yet" : "Res es pas partejat pel moment",
+    "Files and folders you share will show up here" : "Los fichièrs e dorsièrs que partejatz apareisseràn aicí",
+    "No shared links" : "Pas cap de partiment per ligam",
+    "Files and folders you share by link will show up here" : "Los fichièrs e dorsièrs que partejatz per ligam apareisseràn aicí",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Volètz apondre lo partiment distant {name} de {owner}@{remote} ?",
+    "Remote share" : "Partiment distant",
+    "Remote share password" : "Senhal del partiment distant",
+    "Cancel" : "Anullar",
+    "Add remote share" : "Apondre un partiment distant",
+    "You can upload into this folder" : "Podètz mandar dins aqueste dorsièr",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Cap d'installacion ownCloud (7 o superior) pas trobada sus {remote}",
+    "Invalid ownCloud url" : "URL ownCloud invalida",
+    "Shared by" : "Partejat per",
     "Sharing" : "Partiment",
+    "A file or folder has been <strong>shared</strong>" : "Un fichièr o un repertòri es estat <strong>partejat</strong>",
+    "A file or folder was shared from <strong>another server</strong>" : "Un fichièr o un repertòri es estat partejat depuis <strong>un autre servidor</strong>",
+    "A public shared file or folder was <strong>downloaded</strong>" : "Un fichièr o un repertòri partejat publicament es estat <strong>telecargat</strong>",
+    "You received a new remote share %2$s from %1$s" : "L'utilizaire %1$s a partejat la ressorsa distanta %2$s amb vos",
+    "You received a new remote share from %s" : "Avètz recebut un partiment distant de %s",
+    "%1$s accepted remote share %2$s" : "%1$s a acceptat lo partiment distant %2$s",
+    "%1$s declined remote share %2$s" : "%1$s a refusat lo partiment distant %2$s",
+    "%1$s unshared %2$s from you" : "%1$s a daissat de partejar %2$s amb vos",
+    "Public shared folder %1$s was downloaded" : "Lo dorsièr public %1$s es estat telecargat",
+    "Public shared file %1$s was downloaded" : "Lo fichièr public %1$s es estat telecargat",
+    "You shared %1$s with %2$s" : "Avètz partejat %1$s amb %2$s",
+    "You shared %1$s with group %2$s" : "Avètz partejat %1$s amb lo grop %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s partejat %1$s amb %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s partejat %1$s amb lo grop %3$s",
+    "%2$s shared %1$s with you" : "%2$s a partejat %1$s amb vos",
+    "You shared %1$s via link" : "Avètz partejat %1$s per ligam public",
+    "Shares" : "Partiments",
+    "You received %2$s as a remote share from %1$s" : "Avètz recebut %2$s en tant que partiment distant per %1$s",
+    "Accept" : "Acceptar",
+    "Decline" : "Refusar",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Partejatz amb ieu gràcias a mon identificant Federated Cloud #owncloud",
+    "This share is password-protected" : "Aqueste partiment es protegit per un senhal",
+    "The password is wrong. Try again." : "Lo senhal es incorrècte. Ensajatz tornamai.",
     "Password" : "Senhal",
     "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr",
     "Name" : "Nom",
-    "Download" : "Avalcarga",
-    "Open documentation" : "Veire la documentacion"
+    "Share time" : "Data de partiment",
+    "Sorry, this link doesn’t seem to work anymore." : "O planhèm, mas sembla qu'aqueste ligam fonciona pas mai.",
+    "Reasons might be:" : "Las rasons pòdon èsser :",
+    "the item was removed" : "l'element es estat suprimit",
+    "the link expired" : "lo ligam a expirat",
+    "sharing is disabled" : "lo partiment es desactivat",
+    "For more info, please ask the person who sent this link." : "Per mai d'informacions, contactatz la persona qu'a mandat aqueste ligam.",
+    "Add to your ownCloud" : "Apondre a vòstre ownCloud",
+    "Download" : "Telecargar",
+    "Download %s" : "Telecargar %s",
+    "Direct link" : "Ligam dirècte",
+    "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "Open documentation" : "Veire la documentacion",
+    "Allow users on this server to send shares to other servers" : "Autorizar los utilizaires d'aqueste servidor a mandar de partiments cap a d'autres servidors",
+    "Allow users on this server to receive shares from other servers" : "Autorizar los utilizaires d'aqueste servidor a recebre de partiments d'autres servidors",
+    "Federated Cloud" : "Federated Cloud",
+    "Your Federated Cloud ID:" : "Vòstre identificant Federated Cloud :",
+    "Share it:" : "Partejar :",
+    "Add to your website" : "Apondre a vòstre site web",
+    "Share with me via ownCloud" : "Partejatz amb ieu via ownCloud",
+    "HTML Code:" : "Còde HTML :"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js
index 4d596987963..1f109b739e5 100644
--- a/apps/files_sharing/l10n/sk_SK.js
+++ b/apps/files_sharing/l10n/sk_SK.js
@@ -38,9 +38,13 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Verejne zdieľaný súbor %1$s bol stiahnutý",
     "You shared %1$s with %2$s" : "Bol zdieľaný %1$s s %2$s",
     "You shared %1$s with group %2$s" : "Bol zdieľaný %1$s so skupinou %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s zdieľané %1$s s %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s zdieľané %1$s so skupinou %3$s",
+    "%2$s shared %1$s via link" : "%2$s zdieľané %1$s pomocou linky",
     "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s",
     "You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu",
     "Shares" : "Zdieľanie",
+    "You received %2$s as a remote share from %1$s" : "Dostali ste %2$s, ako vzdialené zdieľanie od %1$s",
     "Accept" : "Schváliť",
     "Decline" : "Odmietnuť",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s",
diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json
index e8468d1500e..dab3d4105c4 100644
--- a/apps/files_sharing/l10n/sk_SK.json
+++ b/apps/files_sharing/l10n/sk_SK.json
@@ -36,9 +36,13 @@
     "Public shared file %1$s was downloaded" : "Verejne zdieľaný súbor %1$s bol stiahnutý",
     "You shared %1$s with %2$s" : "Bol zdieľaný %1$s s %2$s",
     "You shared %1$s with group %2$s" : "Bol zdieľaný %1$s so skupinou %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s zdieľané %1$s s %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s zdieľané %1$s so skupinou %3$s",
+    "%2$s shared %1$s via link" : "%2$s zdieľané %1$s pomocou linky",
     "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s",
     "You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu",
     "Shares" : "Zdieľanie",
+    "You received %2$s as a remote share from %1$s" : "Dostali ste %2$s, ako vzdialené zdieľanie od %1$s",
     "Accept" : "Schváliť",
     "Decline" : "Odmietnuť",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s",
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
index 07aa56dfe18..c5b644cf254 100644
--- a/apps/files_sharing/l10n/th_TH.js
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "ไฟล์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด",
     "You shared %1$s with %2$s" : "คุณแชร์ %1$s กับ %2$s",
     "You shared %1$s with group %2$s" : "คุณแชร์ %1$s กับกลุ่ม %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s ได้แชร์ %1$s กับ %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s ได้แชร์ %1$s กับกลุ่ม %3$s",
+    "%2$s shared %1$s via link" : "%2$s ได้แชร์ %1$s ผ่านลิงค์",
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
index 3edd0d18ab1..4ff45e2734e 100644
--- a/apps/files_sharing/l10n/th_TH.json
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -36,6 +36,9 @@
     "Public shared file %1$s was downloaded" : "ไฟล์สาธารณะ %1$s ที่แชร์ถูกดาวน์โหลด",
     "You shared %1$s with %2$s" : "คุณแชร์ %1$s กับ %2$s",
     "You shared %1$s with group %2$s" : "คุณแชร์ %1$s กับกลุ่ม %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s ได้แชร์ %1$s กับ %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s ได้แชร์ %1$s กับกลุ่ม %3$s",
+    "%2$s shared %1$s via link" : "%2$s ได้แชร์ %1$s ผ่านลิงค์",
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
diff --git a/apps/files_trashbin/l10n/oc.js b/apps/files_trashbin/l10n/oc.js
index f8846950f59..390ccaea050 100644
--- a/apps/files_trashbin/l10n/oc.js
+++ b/apps/files_trashbin/l10n/oc.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Couldn't restore %s" : "Impossible de restablir %s",
     "Deleted files" : "Fichièrs suprimits",
     "Restore" : "Restablir",
+    "Delete" : "Suprimir",
     "Delete permanently" : "Suprimir de faiçon definitiva",
     "Error" : "Error",
     "restored" : "restablit",
@@ -13,7 +14,6 @@ OC.L10N.register(
     "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr",
     "Select all" : "Seleccionar tot",
     "Name" : "Nom",
-    "Deleted" : "Escafat",
-    "Delete" : "Suprimir"
+    "Deleted" : "Escafat"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_trashbin/l10n/oc.json b/apps/files_trashbin/l10n/oc.json
index 60bb205efe2..e2add0b3cdb 100644
--- a/apps/files_trashbin/l10n/oc.json
+++ b/apps/files_trashbin/l10n/oc.json
@@ -3,6 +3,7 @@
     "Couldn't restore %s" : "Impossible de restablir %s",
     "Deleted files" : "Fichièrs suprimits",
     "Restore" : "Restablir",
+    "Delete" : "Suprimir",
     "Delete permanently" : "Suprimir de faiçon definitiva",
     "Error" : "Error",
     "restored" : "restablit",
@@ -11,7 +12,6 @@
     "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr",
     "Select all" : "Seleccionar tot",
     "Name" : "Nom",
-    "Deleted" : "Escafat",
-    "Delete" : "Suprimir"
+    "Deleted" : "Escafat"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/oc.js b/apps/user_ldap/l10n/oc.js
index 695647833cd..450e1403c8c 100644
--- a/apps/user_ldap/l10n/oc.js
+++ b/apps/user_ldap/l10n/oc.js
@@ -1,14 +1,158 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Failed to clear the mappings." : "Error al moment de la supression de las associacions.",
+    "Failed to delete the server configuration" : "Fracàs de la supression de la configuracion del servidor",
+    "The configuration is invalid: anonymous bind is not allowed." : "La configuracion es pas valida : lo ligam anonim es pas autorizat.",
+    "The configuration is valid and the connection could be established!" : "La configuracion es valida e la connexion pòt èsser establida !",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuracion es valable, mas lo bind a fracassat. Verificatz los paramètres del servidor ainsi que vos identificants de connexion.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configuracion es pas valable. Consultatz les logs per mai de detalhs.",
+    "No action specified" : "Aucune action especificada",
+    "No configuration specified" : "Aucune configuration especificada",
+    "No data specified" : "Aucune donada especificada",
+    " Could not set configuration %s" : "Impossible de especificar la configuracion %s",
+    "Action does not exist" : "L'action n'existe pas",
+    "The Base DN appears to be wrong" : "Lo DN de base es erroné",
+    "Configuration incorrect" : "Configuracion incorrecte",
+    "Configuration incomplete" : "Configuracion incomplète",
+    "Configuration OK" : "Configuracion OK",
+    "Select groups" : "Seleccionnez los gropes",
+    "Select object classes" : "Seleccionar les classes d'objècte",
+    "Please check the credentials, they seem to be wrong." : "Verificatz vos informations d'identification",
+    "Please specify the port, it could not be auto-detected." : "Veuillez especificar lo pòrt, il n'a pu èsser detectat automaticament",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Lo DN de base n'a pu èsser detectat automaticament. Verificatz les informations d'identification, l'hôte e lo pòrt.",
+    "Could not detect Base DN, please enter it manually." : "Impossible de detectar lo DN de base, veuillez lo especificar manualament",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
+    "No object found in the given Base DN. Please revise." : "Aucun objècte trobat dins lo DN de base especificat. Veuillez lo verificar.",
+    "More than 1.000 directory entries available." : "I a plus de 1000 entradas de repertòri disponibles.",
+    " entries available within the provided Base DN" : "entradas disponibles dins lo DN de base especificat",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Una error es survenue. Verificatz lo DN de base, ainsi que los paramètres de connexion e les informations d'identification",
+    "Do you really want to delete the current Server Configuration?" : "Sètz segur que volètz escafar la configuracion servidor actuala ?",
+    "Confirm Deletion" : "Confirmer la supression",
+    "Mappings cleared successfully!" : "Associations suprimidas amb succès !",
+    "Error while clearing the mappings." : "Error al moment de la supression des associations.",
+    "Anonymous bind is not allowed. Please provide a User DN and Password." : "Lo ligam anonim es pas autorizat. Mercé de provesir lo DN d'un utilizaire e un senhal.",
+    "LDAP Operations error. Anonymous bind might not be allowed." : "Error LDAP. La connexion anonyme al servidor n'est probablement pas acceptada.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "La salvament a fracassat. Verificatz que la banca de donadas es opérationnelle. Rechargez avant de contunhar.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Changer de mode activera las requèstas LDAP automatiques. Selon la taille de votre annuaire LDAP, cela pòt prendre del temps. Volètz toujours changer de mode ?",
+    "Mode switch" : "Changer de mode",
+    "Select attributes" : "Seleccionar los atributs",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilizaire introuvable. Verificatz los atributs de login e lo nom d'utilizaire. Filtre effectif (à copier-coller per valider en ligne de commande):<br/>",
+    "User found and settings verified." : "Utilizaire trobat e paramètres verificats.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres verificats, mas seul lo premier utilizaire pourra se connecter. Utilizatz plutôt un filtre mens restrictif.",
+    "An unspecified error occurred. Please check the settings and the log." : "Una error desconeguda s'es produsida. Verificatz los paramètres e lo log.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Lo filtre de recèrca es pas valide, probablement a cause de problèmas de syntaxe tels que des parenthèses manquantes. Veuillez lo corriger.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Una error s'es produsida al moment de la connexion al LDAP / AD. Verificatz l'hôte, lo pòrt e les informations d'identification.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "La chaîne %uid es manquante. Aquesta chaîne es remplacée per l'identificant de connexion al moment des requèstas LDAP / AD.",
+    "Please provide a login name to test against" : "Veuillez indiquer un identificant de connexion amb lequel tester.",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Los gropes son desactivats perque lo servidor LDAP / AD pren pas en carga memberOf.",
+    "_%s group found_::_%s groups found_" : ["%s grop trobat","%s gropes trobats"],
+    "_%s user found_::_%s users found_" : ["%s utilizaire trobat","%s utilizaires trobats"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de detectar l'atribut que conten lo nom d'afichatge des utilizaires. Indicatz-lo vos-meteis dins los paramètres ldap avançats.",
+    "Could not find the desired feature" : "Impossible de trobar la foncion desirada",
+    "Invalid Host" : "Òste invalid",
     "Server" : "Servidor",
-    "Users" : "Usancièrs",
-    "Groups" : "Grops",
+    "Users" : "Utilizaires",
+    "Login Attributes" : "Atributs de login",
+    "Groups" : "Gropes",
+    "Test Configuration" : "Testar la configuracion",
     "Help" : "Ajuda",
+    "Groups meeting these criteria are available in %s:" : "Los gropes que respèctan aquestes critèris son disponibles dins %s :",
+    "Only these object classes:" : "Solament aquestas classes d'objèctes :",
+    "Only from these groups:" : "Solament dins aquestes gropes :",
+    "Search groups" : "Cercar dins los gropes",
+    "Available groups" : "Gropes disponibles",
+    "Selected groups" : "Gropes seleccionats",
+    "Edit LDAP Query" : "Modificar la requèsta LDAP",
+    "LDAP Filter:" : "Filtre LDAP :",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Lo filtre spécifie quels gropes LDAP ont accès a l'instància %s.",
+    "Verify settings and count groups" : "Verificar los paramètres e compter los gropes",
+    "When logging in, %s will find the user based on the following attributes:" : "Au login, %s cercarà l'utilizaire sus base de ces attributs :",
+    "LDAP / AD Username:" : "Nom d'utilizaire LDAP / AD :",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Autorizar lo login amb lo nom d'utilizaire LDAP / AD (uid o samaccountname, la détection es automatique). ",
+    "LDAP / AD Email Address:" : "Adresse mail LDAP / AD :",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Autorizar lo login amb una adreça mail. Mail e mailPrimaryAddress son autorizats.",
+    "Other Attributes:" : "Autres attributs :",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit lo filtre a aplicar al moment d'una tentative de connexion. %%uid remplace lo nom d'utilizaire. Exemple : \"uid=%%uid\"",
+    "Test Loginname" : "Loginname de tèst",
+    "Verify settings" : "Testar los paramètres",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servidor :",
+    "Add a new and blank configuration" : "Apondre una novèla configuracion verge",
+    "Copy current configuration into new directory binding" : "Copiar la configuracion actuala cap a una novèla",
+    "Delete the current configuration" : "Suprimir la configuracion actuala",
     "Host" : "Òste",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podètz omettre lo protocòl, levat se avètz besonh de SSL. Dins aqueste cas, prefixatz amb ldaps://",
     "Port" : "Pòrt",
+    "Detect Port" : "Detectar lo pòrt",
+    "User DN" : "DN Utilizaire",
+    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN de l'utilizaire client per lequel la liaison deu se faire, per exemple uid=agent,dc=example,dc=com. Per un accès anonyme, laisser lo DN e lo senhal vides.",
     "Password" : "Senhal",
+    "For anonymous access, leave DN and Password empty." : "Per un accès anonyme, laisser lo DN utilizaire e lo senhal vides.",
+    "One Base DN per line" : "Un DN de base per linha",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Podètz especificar les DN de base de vos utilizaires e gropes via l'onglet Avançat",
+    "Detect Base DN" : "Detectar lo DN de base",
+    "Test Base DN" : "Testar lo DN de base",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Évite las requèstas LDAP automaticas. Mieux per las installacions de grande ampleur, mas demande des coneissenças en LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Sasir los filtres LDAP manualament (recomandat per les annuaires de grande ampleur)",
+    "Limit %s access to users meeting these criteria:" : "Limiter l'accès a %s als utilizaires respectant ces critèris :",
+    "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Les classes d'objèctes fréquentes per los utilizaires son : organizationalPerson, person, user e inetOrgPerson. Se sètz pas segur de la classe a utiliser, demandez a l'administrator de l'annuaire.",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Lo filtre spécifie quels utilizaires LDAP auront accès a l'instància %s.",
+    "Verify settings and count users" : "Verificar los paramètres e compter los utilizaires",
+    "Saving" : "Enregistrament...",
+    "Back" : "Retorn",
     "Continue" : "Contunhar",
-    "Advanced" : "Avançat"
+    "LDAP" : "LDAP",
+    "Expert" : "Expèrt",
+    "Advanced" : "Avançat",
+    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap e user_webdavauth son incompatibles. Des dysfoncionaments pòdon survenir. Contactez vòstre administrator sistèma per qu'il en désactive une.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Atencion :</b> Lo module php LDAP es pas installat, per conséquent aquesta extension ne pourra fonctionner. Contactatz vòstre administrator sistèma afin qu'il l'installe.",
+    "Connection Settings" : "Paramètres de connexion",
+    "Configuration Active" : "Configuracion active",
+    "When unchecked, this configuration will be skipped." : "Quand non cochée, la configuracion serà ignorada.",
+    "Backup (Replica) Host" : "Servidor de backup (replica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Fournir un servidor de backup opcional.  Il deu s'agir d'una replica del servidor LDAP/AD principal.",
+    "Backup (Replica) Port" : "Pòrt del servidor de backup (replica)",
+    "Disable Main Server" : "Desactivar lo servidor principal",
+    "Only connect to the replica server." : "Se connecter unicament a la replica",
+    "Turn off SSL certificate validation." : "Desactivar la validacion des certificats SSL",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recomandat, a utiliser a des fins de tests unicament. Se la connexion ne fonctionne qu'amb aquesta option, importez lo certificat SSL del servidor LDAP dins lo servidor %s.",
+    "Cache Time-To-Live" : "Durada de vie de l'escondedor (TTL)",
+    "in seconds. A change empties the cache." : "en segondas. Tot cambiament vide l'escondedor.",
+    "Directory Settings" : "Paramètres del repertòri",
+    "User Display Name Field" : "Camp \"nom d'afichatge\" de l'utilizaire",
+    "The LDAP attribute to use to generate the user's display name." : "L'atribut LDAP utilizat per generar lo nom d'afichatge de l'utilizaire.",
+    "Base User Tree" : "DN raiç de l'arbre utilizaires",
+    "One User Base DN per line" : "Un DN de base utilizaire per linha",
+    "User Search Attributes" : "Atributs de recèrca utilizaires",
+    "Optional; one attribute per line" : "Opcional, un atribut per linha",
+    "Group Display Name Field" : "Camp \"nom d'afichatge\" del grop",
+    "The LDAP attribute to use to generate the groups's display name." : "L'atribut LDAP utilizat per generar lo nom d'afichatge del grop.",
+    "Base Group Tree" : "DN raiç de l'arbre gropes",
+    "One Group Base DN per line" : "Un DN de base grop per linha",
+    "Group Search Attributes" : "Atributs de recèrca des gropes",
+    "Group-Member association" : "Association grop-membre",
+    "Nested Groups" : "Gropes imbriqués",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Se activat, los gropes contenant d'autres gropes son pris en charge (fonctionne unicament se l'atribut membre del grop conten des DNs).",
+    "Paging chunksize" : "Paging chunksize",
+    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize utilizada per les recherches LDAP paginées qui pòdon retourner des résultats per lots coma una énumération d'utilizaires o de gropes. (Configurar a 0 per desactivar les recherches LDAP paginées)",
+    "Special Attributes" : "Atributs spéciaux",
+    "Quota Field" : "Camp del quota",
+    "Quota Default" : "Quota per defaut",
+    "in bytes" : "en octets",
+    "Email Field" : "Camp Email",
+    "User Home Folder Naming Rule" : "Règla de nommage del repertòri utilizaire",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide per user name (defaut). Podètz tanben especificar un atribut LDAP / AD.",
+    "Internal Username" : "Nom d'utilizaire interne",
+    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Per defaut lo nom d'utilizaire interne serà créé a partir de l'atribut UUID. Ceci permet d'assurer que lo nom d'utilizaire es unique e que les caractèrs ne nécessitent pas de conversion. Lo nom d'utilizaire interne deu contenir unicament les caractèrs seguents : [ a-zA-Z0-9_.@- ]. Les autres caractèrs son remplacés per lor correspondance ASCII o simplement omis. En cas de collision, un nombre es ajouté/incrémenté. Lo nom d'utilizaire interne es utilizat per identifier l'utilizaire al sein del sistèma. C'est tanben lo nom per defaut del repertòri utilizaire dins ownCloud. Il fait tanben partie de certains URL de services, per exemple per tous les services *DAV. Lo comportement per defaut pòt èsser modificat a l'aide de ce paramètre. Per obtenir un comportement similaire aux versions precedentas a ownCloud 5, saisir lo nom d'utilizaire a afichar dins lo camp seguent. Laisser a blanc per lo comportement per defaut. Les modifications prendront effet solament per les nouveaux (ajoutés) utilizaires LDAP.",
+    "Internal Username Attribute:" : "Nom d'utilizaire interne :",
+    "Override UUID detection" : "Passer outre la détection des UUID",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Per defaut, l'atribut UUID es automaticament  detectat. Aqueste attribut es utilizat per identifier los utilizaires e gropes de façon fiable. Un nom d'utilizaire interne basé sus l'UUID serà automaticament créé, sauf s'il es especificat autrement çaisús. Podètz modificar ce comportement e définir l'atribut de votre choix. Vos cal alors vous assurer que l'atribut de votre choix pòt èsser recuperat per los utilizaires ainsi que per los gropes e qu'il soit unique. Laisser a blanc per lo comportement per defaut. Les modifications seront effectives unicament per les nouveaux (ajoutés) utilizaires e gropes LDAP.",
+    "UUID Attribute for Users:" : "Atribut UUID per les Utilizaires :",
+    "UUID Attribute for Groups:" : "Atribut UUID per los Gropes :",
+    "Username-LDAP User Mapping" : "Association Nom d'utilizaire-Utilizaire LDAP",
+    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Les noms d'utilizaires son utilizats per lo stockage e l'assignation de (meta) donadas. Per identifier e reconéisser précisément los utilizaires, cada utilizaire LDAP aura un nom interne spécifique. Cela requerís l'associacion d'un nom d'utilizaire ownCloud a un nom d'utilizaire LDAP. Lo nom d'utilizaire créé es associat a l'atribut UUID de l'utilizaire LDAP. Per ailleurs, lo DN es mémorisé en cache per limiter les interactions LDAP mas il es pas utilizat per l'identification. Se lo DN es modificat, ces modifications seront retrobadas. Seul lo nom interne a ownCloud es utilizat al sein del produit. Suprimir les associations creara des orphelins e l'action affectera totas les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mas unicament sus des environaments de tests e d'expérimentations.",
+    "Clear Username-LDAP User Mapping" : "Suprimir l'associacion utilizaire interne-utilizaire LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Suprimir l'associacion nom de grop-grop LDAP"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/user_ldap/l10n/oc.json b/apps/user_ldap/l10n/oc.json
index dc6fb8b6270..e39a43a6594 100644
--- a/apps/user_ldap/l10n/oc.json
+++ b/apps/user_ldap/l10n/oc.json
@@ -1,12 +1,156 @@
 { "translations": {
+    "Failed to clear the mappings." : "Error al moment de la supression de las associacions.",
+    "Failed to delete the server configuration" : "Fracàs de la supression de la configuracion del servidor",
+    "The configuration is invalid: anonymous bind is not allowed." : "La configuracion es pas valida : lo ligam anonim es pas autorizat.",
+    "The configuration is valid and the connection could be established!" : "La configuracion es valida e la connexion pòt èsser establida !",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuracion es valable, mas lo bind a fracassat. Verificatz los paramètres del servidor ainsi que vos identificants de connexion.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configuracion es pas valable. Consultatz les logs per mai de detalhs.",
+    "No action specified" : "Aucune action especificada",
+    "No configuration specified" : "Aucune configuration especificada",
+    "No data specified" : "Aucune donada especificada",
+    " Could not set configuration %s" : "Impossible de especificar la configuracion %s",
+    "Action does not exist" : "L'action n'existe pas",
+    "The Base DN appears to be wrong" : "Lo DN de base es erroné",
+    "Configuration incorrect" : "Configuracion incorrecte",
+    "Configuration incomplete" : "Configuracion incomplète",
+    "Configuration OK" : "Configuracion OK",
+    "Select groups" : "Seleccionnez los gropes",
+    "Select object classes" : "Seleccionar les classes d'objècte",
+    "Please check the credentials, they seem to be wrong." : "Verificatz vos informations d'identification",
+    "Please specify the port, it could not be auto-detected." : "Veuillez especificar lo pòrt, il n'a pu èsser detectat automaticament",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Lo DN de base n'a pu èsser detectat automaticament. Verificatz les informations d'identification, l'hôte e lo pòrt.",
+    "Could not detect Base DN, please enter it manually." : "Impossible de detectar lo DN de base, veuillez lo especificar manualament",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
+    "No object found in the given Base DN. Please revise." : "Aucun objècte trobat dins lo DN de base especificat. Veuillez lo verificar.",
+    "More than 1.000 directory entries available." : "I a plus de 1000 entradas de repertòri disponibles.",
+    " entries available within the provided Base DN" : "entradas disponibles dins lo DN de base especificat",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Una error es survenue. Verificatz lo DN de base, ainsi que los paramètres de connexion e les informations d'identification",
+    "Do you really want to delete the current Server Configuration?" : "Sètz segur que volètz escafar la configuracion servidor actuala ?",
+    "Confirm Deletion" : "Confirmer la supression",
+    "Mappings cleared successfully!" : "Associations suprimidas amb succès !",
+    "Error while clearing the mappings." : "Error al moment de la supression des associations.",
+    "Anonymous bind is not allowed. Please provide a User DN and Password." : "Lo ligam anonim es pas autorizat. Mercé de provesir lo DN d'un utilizaire e un senhal.",
+    "LDAP Operations error. Anonymous bind might not be allowed." : "Error LDAP. La connexion anonyme al servidor n'est probablement pas acceptada.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "La salvament a fracassat. Verificatz que la banca de donadas es opérationnelle. Rechargez avant de contunhar.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Changer de mode activera las requèstas LDAP automatiques. Selon la taille de votre annuaire LDAP, cela pòt prendre del temps. Volètz toujours changer de mode ?",
+    "Mode switch" : "Changer de mode",
+    "Select attributes" : "Seleccionar los atributs",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilizaire introuvable. Verificatz los atributs de login e lo nom d'utilizaire. Filtre effectif (à copier-coller per valider en ligne de commande):<br/>",
+    "User found and settings verified." : "Utilizaire trobat e paramètres verificats.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres verificats, mas seul lo premier utilizaire pourra se connecter. Utilizatz plutôt un filtre mens restrictif.",
+    "An unspecified error occurred. Please check the settings and the log." : "Una error desconeguda s'es produsida. Verificatz los paramètres e lo log.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Lo filtre de recèrca es pas valide, probablement a cause de problèmas de syntaxe tels que des parenthèses manquantes. Veuillez lo corriger.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Una error s'es produsida al moment de la connexion al LDAP / AD. Verificatz l'hôte, lo pòrt e les informations d'identification.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "La chaîne %uid es manquante. Aquesta chaîne es remplacée per l'identificant de connexion al moment des requèstas LDAP / AD.",
+    "Please provide a login name to test against" : "Veuillez indiquer un identificant de connexion amb lequel tester.",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Los gropes son desactivats perque lo servidor LDAP / AD pren pas en carga memberOf.",
+    "_%s group found_::_%s groups found_" : ["%s grop trobat","%s gropes trobats"],
+    "_%s user found_::_%s users found_" : ["%s utilizaire trobat","%s utilizaires trobats"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de detectar l'atribut que conten lo nom d'afichatge des utilizaires. Indicatz-lo vos-meteis dins los paramètres ldap avançats.",
+    "Could not find the desired feature" : "Impossible de trobar la foncion desirada",
+    "Invalid Host" : "Òste invalid",
     "Server" : "Servidor",
-    "Users" : "Usancièrs",
-    "Groups" : "Grops",
+    "Users" : "Utilizaires",
+    "Login Attributes" : "Atributs de login",
+    "Groups" : "Gropes",
+    "Test Configuration" : "Testar la configuracion",
     "Help" : "Ajuda",
+    "Groups meeting these criteria are available in %s:" : "Los gropes que respèctan aquestes critèris son disponibles dins %s :",
+    "Only these object classes:" : "Solament aquestas classes d'objèctes :",
+    "Only from these groups:" : "Solament dins aquestes gropes :",
+    "Search groups" : "Cercar dins los gropes",
+    "Available groups" : "Gropes disponibles",
+    "Selected groups" : "Gropes seleccionats",
+    "Edit LDAP Query" : "Modificar la requèsta LDAP",
+    "LDAP Filter:" : "Filtre LDAP :",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Lo filtre spécifie quels gropes LDAP ont accès a l'instància %s.",
+    "Verify settings and count groups" : "Verificar los paramètres e compter los gropes",
+    "When logging in, %s will find the user based on the following attributes:" : "Au login, %s cercarà l'utilizaire sus base de ces attributs :",
+    "LDAP / AD Username:" : "Nom d'utilizaire LDAP / AD :",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Autorizar lo login amb lo nom d'utilizaire LDAP / AD (uid o samaccountname, la détection es automatique). ",
+    "LDAP / AD Email Address:" : "Adresse mail LDAP / AD :",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Autorizar lo login amb una adreça mail. Mail e mailPrimaryAddress son autorizats.",
+    "Other Attributes:" : "Autres attributs :",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit lo filtre a aplicar al moment d'una tentative de connexion. %%uid remplace lo nom d'utilizaire. Exemple : \"uid=%%uid\"",
+    "Test Loginname" : "Loginname de tèst",
+    "Verify settings" : "Testar los paramètres",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servidor :",
+    "Add a new and blank configuration" : "Apondre una novèla configuracion verge",
+    "Copy current configuration into new directory binding" : "Copiar la configuracion actuala cap a una novèla",
+    "Delete the current configuration" : "Suprimir la configuracion actuala",
     "Host" : "Òste",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podètz omettre lo protocòl, levat se avètz besonh de SSL. Dins aqueste cas, prefixatz amb ldaps://",
     "Port" : "Pòrt",
+    "Detect Port" : "Detectar lo pòrt",
+    "User DN" : "DN Utilizaire",
+    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN de l'utilizaire client per lequel la liaison deu se faire, per exemple uid=agent,dc=example,dc=com. Per un accès anonyme, laisser lo DN e lo senhal vides.",
     "Password" : "Senhal",
+    "For anonymous access, leave DN and Password empty." : "Per un accès anonyme, laisser lo DN utilizaire e lo senhal vides.",
+    "One Base DN per line" : "Un DN de base per linha",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Podètz especificar les DN de base de vos utilizaires e gropes via l'onglet Avançat",
+    "Detect Base DN" : "Detectar lo DN de base",
+    "Test Base DN" : "Testar lo DN de base",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Évite las requèstas LDAP automaticas. Mieux per las installacions de grande ampleur, mas demande des coneissenças en LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Sasir los filtres LDAP manualament (recomandat per les annuaires de grande ampleur)",
+    "Limit %s access to users meeting these criteria:" : "Limiter l'accès a %s als utilizaires respectant ces critèris :",
+    "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Les classes d'objèctes fréquentes per los utilizaires son : organizationalPerson, person, user e inetOrgPerson. Se sètz pas segur de la classe a utiliser, demandez a l'administrator de l'annuaire.",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Lo filtre spécifie quels utilizaires LDAP auront accès a l'instància %s.",
+    "Verify settings and count users" : "Verificar los paramètres e compter los utilizaires",
+    "Saving" : "Enregistrament...",
+    "Back" : "Retorn",
     "Continue" : "Contunhar",
-    "Advanced" : "Avançat"
+    "LDAP" : "LDAP",
+    "Expert" : "Expèrt",
+    "Advanced" : "Avançat",
+    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap e user_webdavauth son incompatibles. Des dysfoncionaments pòdon survenir. Contactez vòstre administrator sistèma per qu'il en désactive une.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Atencion :</b> Lo module php LDAP es pas installat, per conséquent aquesta extension ne pourra fonctionner. Contactatz vòstre administrator sistèma afin qu'il l'installe.",
+    "Connection Settings" : "Paramètres de connexion",
+    "Configuration Active" : "Configuracion active",
+    "When unchecked, this configuration will be skipped." : "Quand non cochée, la configuracion serà ignorada.",
+    "Backup (Replica) Host" : "Servidor de backup (replica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Fournir un servidor de backup opcional.  Il deu s'agir d'una replica del servidor LDAP/AD principal.",
+    "Backup (Replica) Port" : "Pòrt del servidor de backup (replica)",
+    "Disable Main Server" : "Desactivar lo servidor principal",
+    "Only connect to the replica server." : "Se connecter unicament a la replica",
+    "Turn off SSL certificate validation." : "Desactivar la validacion des certificats SSL",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recomandat, a utiliser a des fins de tests unicament. Se la connexion ne fonctionne qu'amb aquesta option, importez lo certificat SSL del servidor LDAP dins lo servidor %s.",
+    "Cache Time-To-Live" : "Durada de vie de l'escondedor (TTL)",
+    "in seconds. A change empties the cache." : "en segondas. Tot cambiament vide l'escondedor.",
+    "Directory Settings" : "Paramètres del repertòri",
+    "User Display Name Field" : "Camp \"nom d'afichatge\" de l'utilizaire",
+    "The LDAP attribute to use to generate the user's display name." : "L'atribut LDAP utilizat per generar lo nom d'afichatge de l'utilizaire.",
+    "Base User Tree" : "DN raiç de l'arbre utilizaires",
+    "One User Base DN per line" : "Un DN de base utilizaire per linha",
+    "User Search Attributes" : "Atributs de recèrca utilizaires",
+    "Optional; one attribute per line" : "Opcional, un atribut per linha",
+    "Group Display Name Field" : "Camp \"nom d'afichatge\" del grop",
+    "The LDAP attribute to use to generate the groups's display name." : "L'atribut LDAP utilizat per generar lo nom d'afichatge del grop.",
+    "Base Group Tree" : "DN raiç de l'arbre gropes",
+    "One Group Base DN per line" : "Un DN de base grop per linha",
+    "Group Search Attributes" : "Atributs de recèrca des gropes",
+    "Group-Member association" : "Association grop-membre",
+    "Nested Groups" : "Gropes imbriqués",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Se activat, los gropes contenant d'autres gropes son pris en charge (fonctionne unicament se l'atribut membre del grop conten des DNs).",
+    "Paging chunksize" : "Paging chunksize",
+    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize utilizada per les recherches LDAP paginées qui pòdon retourner des résultats per lots coma una énumération d'utilizaires o de gropes. (Configurar a 0 per desactivar les recherches LDAP paginées)",
+    "Special Attributes" : "Atributs spéciaux",
+    "Quota Field" : "Camp del quota",
+    "Quota Default" : "Quota per defaut",
+    "in bytes" : "en octets",
+    "Email Field" : "Camp Email",
+    "User Home Folder Naming Rule" : "Règla de nommage del repertòri utilizaire",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide per user name (defaut). Podètz tanben especificar un atribut LDAP / AD.",
+    "Internal Username" : "Nom d'utilizaire interne",
+    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Per defaut lo nom d'utilizaire interne serà créé a partir de l'atribut UUID. Ceci permet d'assurer que lo nom d'utilizaire es unique e que les caractèrs ne nécessitent pas de conversion. Lo nom d'utilizaire interne deu contenir unicament les caractèrs seguents : [ a-zA-Z0-9_.@- ]. Les autres caractèrs son remplacés per lor correspondance ASCII o simplement omis. En cas de collision, un nombre es ajouté/incrémenté. Lo nom d'utilizaire interne es utilizat per identifier l'utilizaire al sein del sistèma. C'est tanben lo nom per defaut del repertòri utilizaire dins ownCloud. Il fait tanben partie de certains URL de services, per exemple per tous les services *DAV. Lo comportement per defaut pòt èsser modificat a l'aide de ce paramètre. Per obtenir un comportement similaire aux versions precedentas a ownCloud 5, saisir lo nom d'utilizaire a afichar dins lo camp seguent. Laisser a blanc per lo comportement per defaut. Les modifications prendront effet solament per les nouveaux (ajoutés) utilizaires LDAP.",
+    "Internal Username Attribute:" : "Nom d'utilizaire interne :",
+    "Override UUID detection" : "Passer outre la détection des UUID",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Per defaut, l'atribut UUID es automaticament  detectat. Aqueste attribut es utilizat per identifier los utilizaires e gropes de façon fiable. Un nom d'utilizaire interne basé sus l'UUID serà automaticament créé, sauf s'il es especificat autrement çaisús. Podètz modificar ce comportement e définir l'atribut de votre choix. Vos cal alors vous assurer que l'atribut de votre choix pòt èsser recuperat per los utilizaires ainsi que per los gropes e qu'il soit unique. Laisser a blanc per lo comportement per defaut. Les modifications seront effectives unicament per les nouveaux (ajoutés) utilizaires e gropes LDAP.",
+    "UUID Attribute for Users:" : "Atribut UUID per les Utilizaires :",
+    "UUID Attribute for Groups:" : "Atribut UUID per los Gropes :",
+    "Username-LDAP User Mapping" : "Association Nom d'utilizaire-Utilizaire LDAP",
+    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Les noms d'utilizaires son utilizats per lo stockage e l'assignation de (meta) donadas. Per identifier e reconéisser précisément los utilizaires, cada utilizaire LDAP aura un nom interne spécifique. Cela requerís l'associacion d'un nom d'utilizaire ownCloud a un nom d'utilizaire LDAP. Lo nom d'utilizaire créé es associat a l'atribut UUID de l'utilizaire LDAP. Per ailleurs, lo DN es mémorisé en cache per limiter les interactions LDAP mas il es pas utilizat per l'identification. Se lo DN es modificat, ces modifications seront retrobadas. Seul lo nom interne a ownCloud es utilizat al sein del produit. Suprimir les associations creara des orphelins e l'action affectera totas les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mas unicament sus des environaments de tests e d'expérimentations.",
+    "Clear Username-LDAP User Mapping" : "Suprimir l'associacion utilizaire interne-utilizaire LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Suprimir l'associacion nom de grop-grop LDAP"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/zh_CN.js b/apps/user_ldap/l10n/zh_CN.js
index 15d0154921b..eae37fb3a19 100644
--- a/apps/user_ldap/l10n/zh_CN.js
+++ b/apps/user_ldap/l10n/zh_CN.js
@@ -3,9 +3,21 @@ OC.L10N.register(
     {
     "Failed to clear the mappings." : "清除映射失败。",
     "Failed to delete the server configuration" : "未能删除服务器配置",
+    "The configuration is invalid: anonymous bind is not allowed." : "配置无效：不允许匿名绑定。",
     "The configuration is valid and the connection could be established!" : "配置有效，能够建立连接！",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "配置有效但绑定失败。请检查服务器设置和认证信息。",
+    "The configuration is invalid. Please have a look at the logs for further details." : "配置无效。更多细节请查看 ownCloud 日志。",
+    "No action specified" : "未指定操作",
+    "No configuration specified" : "未指定配置文件",
+    "No data specified" : "未指定数据",
+    " Could not set configuration %s" : " 无法设定配置文件 %s",
+    "Action does not exist" : "操作不存在",
+    "The Base DN appears to be wrong" : "Base DN似乎错了",
+    "Configuration incorrect" : "配置错误",
+    "Configuration incomplete" : "配置未完成",
+    "Configuration OK" : "配置完成",
     "Select groups" : "选择分组",
+    "Could not detect Base DN, please enter it manually." : "无法探测Base DN，请手动输入。",
     "Do you really want to delete the current Server Configuration?" : "您真的想要删除当前服务器配置吗？",
     "Confirm Deletion" : "确认删除",
     "Invalid Host" : "无效的主机",
diff --git a/apps/user_ldap/l10n/zh_CN.json b/apps/user_ldap/l10n/zh_CN.json
index 18c87aa6c6f..8234f24247d 100644
--- a/apps/user_ldap/l10n/zh_CN.json
+++ b/apps/user_ldap/l10n/zh_CN.json
@@ -1,9 +1,21 @@
 { "translations": {
     "Failed to clear the mappings." : "清除映射失败。",
     "Failed to delete the server configuration" : "未能删除服务器配置",
+    "The configuration is invalid: anonymous bind is not allowed." : "配置无效：不允许匿名绑定。",
     "The configuration is valid and the connection could be established!" : "配置有效，能够建立连接！",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "配置有效但绑定失败。请检查服务器设置和认证信息。",
+    "The configuration is invalid. Please have a look at the logs for further details." : "配置无效。更多细节请查看 ownCloud 日志。",
+    "No action specified" : "未指定操作",
+    "No configuration specified" : "未指定配置文件",
+    "No data specified" : "未指定数据",
+    " Could not set configuration %s" : " 无法设定配置文件 %s",
+    "Action does not exist" : "操作不存在",
+    "The Base DN appears to be wrong" : "Base DN似乎错了",
+    "Configuration incorrect" : "配置错误",
+    "Configuration incomplete" : "配置未完成",
+    "Configuration OK" : "配置完成",
     "Select groups" : "选择分组",
+    "Could not detect Base DN, please enter it manually." : "无法探测Base DN，请手动输入。",
     "Do you really want to delete the current Server Configuration?" : "您真的想要删除当前服务器配置吗？",
     "Confirm Deletion" : "确认删除",
     "Invalid Host" : "无效的主机",
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
index dd8610428f2..f5ddc0f5b2d 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -152,7 +152,6 @@ OC.L10N.register(
     "New Password" : "Нова Парола",
     "Reset password" : "Възстановяване на паролата",
     "Searching other places" : "Търсене в други места",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} резултат от търсене в други места","{count} резултати от търсене в други места"],
     "Personal" : "Лични",
     "Users" : "Потребители",
     "Apps" : "Приложения",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index 91a9704f7ef..b20cbe83466 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -150,7 +150,6 @@
     "New Password" : "Нова Парола",
     "Reset password" : "Възстановяване на паролата",
     "Searching other places" : "Търсене в други места",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} резултат от търсене в други места","{count} резултати от търсене в други места"],
     "Personal" : "Лични",
     "Users" : "Потребители",
     "Apps" : "Приложения",
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index 4fdce762dc5..1efc17de4ba 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -177,8 +177,6 @@ OC.L10N.register(
     "New Password" : "Contrasenya nova",
     "Reset password" : "Reinicialitza la contrasenya",
     "Searching other places" : "Buscant altres ubicacions",
-    "No search results in other places" : "No hi ha resultats de cerques a altres llocs",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultat de cerca en altres ubicacions","{count} resultats de cerca en altres ubicacions"],
     "Personal" : "Personal",
     "Users" : "Usuaris",
     "Apps" : "Aplicacions",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index 4d147db52f4..409ff636604 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -175,8 +175,6 @@
     "New Password" : "Contrasenya nova",
     "Reset password" : "Reinicialitza la contrasenya",
     "Searching other places" : "Buscant altres ubicacions",
-    "No search results in other places" : "No hi ha resultats de cerques a altres llocs",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultat de cerca en altres ubicacions","{count} resultats de cerca en altres ubicacions"],
     "Personal" : "Personal",
     "Users" : "Usuaris",
     "Apps" : "Aplicacions",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index ac1d9631c53..bcbc2527dec 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -179,8 +179,6 @@ OC.L10N.register(
     "New Password" : "Nové heslo",
     "Reset password" : "Obnovit heslo",
     "Searching other places" : "Prohledávání ostatních umístění",
-    "No search results in other places" : "Žádné nálezy v ostatních umístěních",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} nález v ostatních umístěních","{count} nálezy v ostatních umístěních","{count} nálezů v ostatních umístěních"],
     "Personal" : "Osobní",
     "Users" : "Uživatelé",
     "Apps" : "Aplikace",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 78c0e61d0b8..f384b772679 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -177,8 +177,6 @@
     "New Password" : "Nové heslo",
     "Reset password" : "Obnovit heslo",
     "Searching other places" : "Prohledávání ostatních umístění",
-    "No search results in other places" : "Žádné nálezy v ostatních umístěních",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} nález v ostatních umístěních","{count} nálezy v ostatních umístěních","{count} nálezů v ostatních umístěních"],
     "Personal" : "Osobní",
     "Users" : "Uživatelé",
     "Apps" : "Aplikace",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index 5461275fb8e..4e689973872 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -182,8 +182,8 @@ OC.L10N.register(
     "New Password" : "Ny adgangskode",
     "Reset password" : "Nulstil kodeord",
     "Searching other places" : "Søger på andre steder",
-    "No search results in other places" : "Ingen søgeresultater fra andre steder",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} søgeresultat fra andre steder","{count} søgeresultater fra andre steder"],
+    "No search results in other folders" : "Søgning gav ingen resultater in andre mapper",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} søgeresultat fundet i andre mapper","{count} søgeresultater fundet i andre mapper"],
     "Personal" : "Personligt",
     "Users" : "Brugere",
     "Apps" : "Apps",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index adf9fb314d5..639f387af15 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -180,8 +180,8 @@
     "New Password" : "Ny adgangskode",
     "Reset password" : "Nulstil kodeord",
     "Searching other places" : "Søger på andre steder",
-    "No search results in other places" : "Ingen søgeresultater fra andre steder",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} søgeresultat fra andre steder","{count} søgeresultater fra andre steder"],
+    "No search results in other folders" : "Søgning gav ingen resultater in andre mapper",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} søgeresultat fundet i andre mapper","{count} søgeresultater fundet i andre mapper"],
     "Personal" : "Personligt",
     "Users" : "Brugere",
     "Apps" : "Apps",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 3b307547244..1ae859bef7e 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -169,8 +169,6 @@ OC.L10N.register(
     "New Password" : "Neues Passwort",
     "Reset password" : "Passwort zurücksetzen",
     "Searching other places" : "Andere Orte durchsuchen",
-    "No search results in other places" : "Keine Suchergebnisse an anderen Orten",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} Suchergebnis in den anderen Orten","{count} Suchergebnisse in den anderen Orten"],
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
     "Apps" : "Apps",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 4784f7f1979..21af9345710 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -167,8 +167,6 @@
     "New Password" : "Neues Passwort",
     "Reset password" : "Passwort zurücksetzen",
     "Searching other places" : "Andere Orte durchsuchen",
-    "No search results in other places" : "Keine Suchergebnisse an anderen Orten",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} Suchergebnis in den anderen Orten","{count} Suchergebnisse in den anderen Orten"],
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
     "Apps" : "Apps",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 369936d0c92..6c689263cab 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -177,8 +177,6 @@ OC.L10N.register(
     "New Password" : "Neues Passwort",
     "Reset password" : "Passwort zurücksetzen",
     "Searching other places" : "Andere Orte durchsuchen",
-    "No search results in other places" : "Keine Suchergebnisse an anderen Orten",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} Suchergebnis in den anderen Orten","{count} Suchergebnisse in den anderen Orten"],
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
     "Apps" : "Apps",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 8f0d3fa8465..0b4b703f753 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -175,8 +175,6 @@
     "New Password" : "Neues Passwort",
     "Reset password" : "Passwort zurücksetzen",
     "Searching other places" : "Andere Orte durchsuchen",
-    "No search results in other places" : "Keine Suchergebnisse an anderen Orten",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} Suchergebnis in den anderen Orten","{count} Suchergebnisse in den anderen Orten"],
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
     "Apps" : "Apps",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 3b739d06b52..59490289bfd 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "αλλαγή",
     "delete" : "διαγραφή",
     "access control" : "έλεγχος πρόσβασης",
+    "Share details could not be loaded for this item." : "Αδυναμία φόρτωσης λεπτομερειών διαμοιρασμού για αυτό το αντικείμενο.",
     "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά",
     "Share" : "Διαμοιρασμός",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud",
     "Share with users or groups …" : "Διαμοιρασμός με χρήστες ή ομάδες ...",
     "Share with users, groups or remote users …" : "Διαμοιρασμός με χρήστες, ομάδες ή απομακρυσμένους χρήστες ...",
     "Warning" : "Προειδοποίηση",
+    "Error while sending notification" : "Σφάλμα κατά την αποστολή ειδοποίησης",
     "The object type is not specified." : "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
     "Enter new" : "Εισαγωγή νέου",
     "Delete" : "Διαγραφή",
@@ -180,8 +182,6 @@ OC.L10N.register(
     "New Password" : "Νέος Κωδικός",
     "Reset password" : "Επαναφορά συνθηματικού",
     "Searching other places" : "Έρευνα σε άλλα σημεία.",
-    "No search results in other places" : "Δεν υπάρχουν αποτελέσματα αναζήτησης σε άλλες τοποθεσίες",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} αποτελέσματα έρευνας σε άλλα σημεία","{count} αποτελέσματα έρευνας σε άλλα σημεία"],
     "Personal" : "Προσωπικά",
     "Users" : "Χρήστες",
     "Apps" : "Εφαρμογές",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 9900d8f568c..66f177d11b6 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -143,12 +143,14 @@
     "change" : "αλλαγή",
     "delete" : "διαγραφή",
     "access control" : "έλεγχος πρόσβασης",
+    "Share details could not be loaded for this item." : "Αδυναμία φόρτωσης λεπτομερειών διαμοιρασμού για αυτό το αντικείμενο.",
     "An error occured. Please try again" : "Ένα σφάλμα προέκυψε. Παρακαλώ προσπαθήστε ξανά",
     "Share" : "Διαμοιρασμός",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud",
     "Share with users or groups …" : "Διαμοιρασμός με χρήστες ή ομάδες ...",
     "Share with users, groups or remote users …" : "Διαμοιρασμός με χρήστες, ομάδες ή απομακρυσμένους χρήστες ...",
     "Warning" : "Προειδοποίηση",
+    "Error while sending notification" : "Σφάλμα κατά την αποστολή ειδοποίησης",
     "The object type is not specified." : "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
     "Enter new" : "Εισαγωγή νέου",
     "Delete" : "Διαγραφή",
@@ -178,8 +180,6 @@
     "New Password" : "Νέος Κωδικός",
     "Reset password" : "Επαναφορά συνθηματικού",
     "Searching other places" : "Έρευνα σε άλλα σημεία.",
-    "No search results in other places" : "Δεν υπάρχουν αποτελέσματα αναζήτησης σε άλλες τοποθεσίες",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} αποτελέσματα έρευνας σε άλλα σημεία","{count} αποτελέσματα έρευνας σε άλλα σημεία"],
     "Personal" : "Προσωπικά",
     "Users" : "Χρήστες",
     "Apps" : "Εφαρμογές",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index ced4272c1d8..7303eb2584a 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -162,8 +162,6 @@ OC.L10N.register(
     "New Password" : "New Password",
     "Reset password" : "Reset password",
     "Searching other places" : "Searching other places",
-    "No search results in other places" : "No search results in other places",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} search result in other places","{count} search results in other places"],
     "Personal" : "Personal",
     "Users" : "Users",
     "Apps" : "Apps",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index 7bea74e4359..f2a5cf6e5ba 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -160,8 +160,6 @@
     "New Password" : "New Password",
     "Reset password" : "Reset password",
     "Searching other places" : "Searching other places",
-    "No search results in other places" : "No search results in other places",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} search result in other places","{count} search results in other places"],
     "Personal" : "Personal",
     "Users" : "Users",
     "Apps" : "Apps",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index ea606905e7d..1b026297565 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "cambio",
     "delete" : "eliminar",
     "access control" : "control de acceso",
+    "Share details could not be loaded for this item." : "No se han podido cargar los detalles de compartición para este elemento.",
     "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.",
     "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
     "Share with users or groups …" : "Compartir con usuarios o grupos ...",
     "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos...",
     "Warning" : "Precaución",
+    "Error while sending notification" : "Error mientras se enviaba la notificación",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Enter new" : "Ingresar nueva",
     "Delete" : "Eliminar",
@@ -180,8 +182,6 @@ OC.L10N.register(
     "New Password" : "Contraseña nueva",
     "Reset password" : "Restablecer contraseña",
     "Searching other places" : "Buscando en otros lugares",
-    "No search results in other places" : "Sin resultados de búsqueda en otros sitios",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado de búsqueda en otros lugares","{count} resultados de búsqueda en otros lugares"],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index ec5b80a3e82..a4f5ba0cf5c 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -143,12 +143,14 @@
     "change" : "cambio",
     "delete" : "eliminar",
     "access control" : "control de acceso",
+    "Share details could not be loaded for this item." : "No se han podido cargar los detalles de compartición para este elemento.",
     "An error occured. Please try again" : "Un error ocurrió. Por favor reinténtelo nuevamente.",
     "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
     "Share with users or groups …" : "Compartir con usuarios o grupos ...",
     "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos...",
     "Warning" : "Precaución",
+    "Error while sending notification" : "Error mientras se enviaba la notificación",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Enter new" : "Ingresar nueva",
     "Delete" : "Eliminar",
@@ -178,8 +180,6 @@
     "New Password" : "Contraseña nueva",
     "Reset password" : "Restablecer contraseña",
     "Searching other places" : "Buscando en otros lugares",
-    "No search results in other places" : "Sin resultados de búsqueda en otros sitios",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado de búsqueda en otros lugares","{count} resultados de búsqueda en otros lugares"],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 1c49deff6ca..18840c05923 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -165,8 +165,6 @@ OC.L10N.register(
     "New Password" : "Uus parool",
     "Reset password" : "Nulli parool",
     "Searching other places" : "Otsi teistest kohtadest",
-    "No search results in other places" : "Teistest kohtadest otsimine ei andnud tulemusi",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} otsingutulemus teistest kohtadest","{count} otsingutulemust teistest kohtadest"],
     "Personal" : "Isiklik",
     "Users" : "Kasutajad",
     "Apps" : "Rakendused",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 9e11b84d86e..e11a103480c 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -163,8 +163,6 @@
     "New Password" : "Uus parool",
     "Reset password" : "Nulli parool",
     "Searching other places" : "Otsi teistest kohtadest",
-    "No search results in other places" : "Teistest kohtadest otsimine ei andnud tulemusi",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} otsingutulemus teistest kohtadest","{count} otsingutulemust teistest kohtadest"],
     "Personal" : "Isiklik",
     "Users" : "Kasutajad",
     "Apps" : "Rakendused",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index a0d4650a4ae..baed46b43a9 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -145,7 +145,6 @@ OC.L10N.register(
     "New Password" : "Pasahitz Berria",
     "Reset password" : "Berrezarri pasahitza",
     "Searching other places" : "Beste lekuak bilatzen",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["Bilaketa emaitza {count} beste lekuetan","{count} emaitza lortu dira beste lekuetan"],
     "Personal" : "Pertsonala",
     "Users" : "Erabiltzaileak",
     "Apps" : "Aplikazioak",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index e4ccdd8584c..62f2d1ad502 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -143,7 +143,6 @@
     "New Password" : "Pasahitz Berria",
     "Reset password" : "Berrezarri pasahitza",
     "Searching other places" : "Beste lekuak bilatzen",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["Bilaketa emaitza {count} beste lekuetan","{count} emaitza lortu dira beste lekuetan"],
     "Personal" : "Pertsonala",
     "Users" : "Erabiltzaileak",
     "Apps" : "Aplikazioak",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 826305c9b5a..a2ea55857c7 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -182,8 +182,8 @@ OC.L10N.register(
     "New Password" : "Uusi salasana",
     "Reset password" : "Palauta salasana",
     "Searching other places" : "Etsitään muista paikoista",
-    "No search results in other places" : "Ei hakutuloksia muista paikoista",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} hakutulos muualla","{count} hakutulosta muualla"],
+    "No search results in other folders" : "Ei hakutuloksia muissa kansioissa",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} hakutulos muussa kansiossa","{count} hakutulosta muissa kansioissa"],
     "Personal" : "Henkilökohtainen",
     "Users" : "Käyttäjät",
     "Apps" : "Sovellukset",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index c8a37ae2ef1..4d74b0dd393 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -180,8 +180,8 @@
     "New Password" : "Uusi salasana",
     "Reset password" : "Palauta salasana",
     "Searching other places" : "Etsitään muista paikoista",
-    "No search results in other places" : "Ei hakutuloksia muista paikoista",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} hakutulos muualla","{count} hakutulosta muualla"],
+    "No search results in other folders" : "Ei hakutuloksia muissa kansioissa",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} hakutulos muussa kansiossa","{count} hakutulosta muissa kansioissa"],
     "Personal" : "Henkilökohtainen",
     "Users" : "Käyttäjät",
     "Apps" : "Sovellukset",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 3335924e5e1..1ab890bc421 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "modification",
     "delete" : "supprimer",
     "access control" : "contrôle d'accès",
+    "Share details could not be loaded for this item." : "Les informations de partage n'ont pu être chargées pour cet élément.",
     "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer",
     "Share" : "Partager",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partagez avec des personnes sur d'autres ownClouds en utilisant la syntaxe utilisateur@exemple.com/owncloud",
     "Share with users or groups …" : "Partager avec des utilisateurs ou groupes...",
     "Share with users, groups or remote users …" : "Partager avec des utilisateurs, groupes, ou utilisateurs distants",
     "Warning" : "Attention",
+    "Error while sending notification" : "Erreur lors de l'envoi de la notification",
     "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
     "Enter new" : "Saisir un nouveau",
     "Delete" : "Supprimer",
@@ -180,8 +182,6 @@ OC.L10N.register(
     "New Password" : "Nouveau mot de passe",
     "Reset password" : "Réinitialiser le mot de passe",
     "Searching other places" : "Recherche en cours dans d'autres emplacements",
-    "No search results in other places" : "Aucun résultat dans d'autres emplacements",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} résultat dans d'autres emplacements","{count} résultats dans d'autres emplacements"],
     "Personal" : "Personnel",
     "Users" : "Utilisateurs",
     "Apps" : "Applications",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 225146cfb73..d56e5545a04 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -143,12 +143,14 @@
     "change" : "modification",
     "delete" : "supprimer",
     "access control" : "contrôle d'accès",
+    "Share details could not be loaded for this item." : "Les informations de partage n'ont pu être chargées pour cet élément.",
     "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer",
     "Share" : "Partager",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partagez avec des personnes sur d'autres ownClouds en utilisant la syntaxe utilisateur@exemple.com/owncloud",
     "Share with users or groups …" : "Partager avec des utilisateurs ou groupes...",
     "Share with users, groups or remote users …" : "Partager avec des utilisateurs, groupes, ou utilisateurs distants",
     "Warning" : "Attention",
+    "Error while sending notification" : "Erreur lors de l'envoi de la notification",
     "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
     "Enter new" : "Saisir un nouveau",
     "Delete" : "Supprimer",
@@ -178,8 +180,6 @@
     "New Password" : "Nouveau mot de passe",
     "Reset password" : "Réinitialiser le mot de passe",
     "Searching other places" : "Recherche en cours dans d'autres emplacements",
-    "No search results in other places" : "Aucun résultat dans d'autres emplacements",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} résultat dans d'autres emplacements","{count} résultats dans d'autres emplacements"],
     "Personal" : "Personnel",
     "Users" : "Utilisateurs",
     "Apps" : "Applications",
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index 8cff0f073d6..a2a93323a84 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -175,8 +175,6 @@ OC.L10N.register(
     "New Password" : "Novo contrasinal",
     "Reset password" : "Restabelecer o contrasinal",
     "Searching other places" : "Buscando noutros lugares",
-    "No search results in other places" : "Sen resultados na busca noutros lugares",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado na busca noutros lugares","{count} resultados na busca noutros lugares"],
     "Personal" : "Persoal",
     "Users" : "Usuarios",
     "Apps" : "Aplicacións",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index 9ce7bf5c34b..a0e5980563c 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -173,8 +173,6 @@
     "New Password" : "Novo contrasinal",
     "Reset password" : "Restabelecer o contrasinal",
     "Searching other places" : "Buscando noutros lugares",
-    "No search results in other places" : "Sen resultados na busca noutros lugares",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado na busca noutros lugares","{count} resultados na busca noutros lugares"],
     "Personal" : "Persoal",
     "Users" : "Usuarios",
     "Apps" : "Aplicacións",
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index f891532b283..28891885e96 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -145,7 +145,6 @@ OC.L10N.register(
     "New Password" : "Nova lozinka",
     "Reset password" : "Resetirajte lozinku",
     "Searching other places" : "Pretraživanje drugih lokacija",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["Pronađen {count} rezultat na drugim lokacijama","Pronađeno {count} rezultata na drugim lokacijama","Pronađeno {count} rezultata na drugim lokacijama"],
     "Personal" : "Osobno",
     "Users" : "Korisnici",
     "Apps" : "Aplikacije",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index 3b4404dacb5..eb234559d2e 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -143,7 +143,6 @@
     "New Password" : "Nova lozinka",
     "Reset password" : "Resetirajte lozinku",
     "Searching other places" : "Pretraživanje drugih lokacija",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["Pronađen {count} rezultat na drugim lokacijama","Pronađeno {count} rezultata na drugim lokacijama","Pronađeno {count} rezultata na drugim lokacijama"],
     "Personal" : "Osobno",
     "Users" : "Korisnici",
     "Apps" : "Aplikacije",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 3f2a73d0c99..91859d31998 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -150,6 +150,7 @@ OC.L10N.register(
     "Share with users or groups …" : "Megosztás felhasználókkal vagy csoportokkal ...",
     "Share with users, groups or remote users …" : "Megosztás felhasználókkal, csoportokkal vagy távoli felhasználókkal ...",
     "Warning" : "Figyelmeztetés",
+    "Error while sending notification" : "Hiba történt az értesítő küldése közben",
     "The object type is not specified." : "Az objektum típusa nincs megadva.",
     "Enter new" : "Új beírása",
     "Delete" : "Törlés",
@@ -179,8 +180,6 @@ OC.L10N.register(
     "New Password" : "Új jelszó",
     "Reset password" : "Jelszó-visszaállítás",
     "Searching other places" : "Keresés más helyeken",
-    "No search results in other places" : "Nem talált semmit más helyeken.",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} keresési eredmény más helyeken","{count} keresési eredmény más helyeken"],
     "Personal" : "Személyes",
     "Users" : "Felhasználók",
     "Apps" : "Alkalmazások",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 0f5376c947a..48bd6dc8f92 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -148,6 +148,7 @@
     "Share with users or groups …" : "Megosztás felhasználókkal vagy csoportokkal ...",
     "Share with users, groups or remote users …" : "Megosztás felhasználókkal, csoportokkal vagy távoli felhasználókkal ...",
     "Warning" : "Figyelmeztetés",
+    "Error while sending notification" : "Hiba történt az értesítő küldése közben",
     "The object type is not specified." : "Az objektum típusa nincs megadva.",
     "Enter new" : "Új beírása",
     "Delete" : "Törlés",
@@ -177,8 +178,6 @@
     "New Password" : "Új jelszó",
     "Reset password" : "Jelszó-visszaállítás",
     "Searching other places" : "Keresés más helyeken",
-    "No search results in other places" : "Nem talált semmit más helyeken.",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} keresési eredmény más helyeken","{count} keresési eredmény más helyeken"],
     "Personal" : "Személyes",
     "Users" : "Felhasználók",
     "Apps" : "Alkalmazások",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index c722b4a7b7e..cb922fc1a25 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "ubah",
     "delete" : "hapus",
     "access control" : "kontrol akses",
+    "Share details could not be loaded for this item." : "Rincian berbagi tidak dapat dimuat untuk item ini.",
     "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali",
     "Share" : "Bagikan",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud",
     "Share with users or groups …" : "Bagikan dengan pengguna atau grup ...",
     "Share with users, groups or remote users …" : "Bagikan dengan pengguna, grup atau pengguna remote ...",
     "Warning" : "Peringatan",
+    "Error while sending notification" : "Kesalahan ketika mengirim notifikasi",
     "The object type is not specified." : "Tipe objek tidak ditentukan.",
     "Enter new" : "Masukkan baru",
     "Delete" : "Hapus",
@@ -180,8 +182,6 @@ OC.L10N.register(
     "New Password" : "Sandi Baru",
     "Reset password" : "Setel ulang sandi",
     "Searching other places" : "Mencari tempat lainnya",
-    "No search results in other places" : "Tidak ada hasil pencarian di tempat lain",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} hasil pencarian di tempat lain"],
     "Personal" : "Pribadi",
     "Users" : "Pengguna",
     "Apps" : "Aplikasi",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index ecc2c2b0f6e..4e05c85b22c 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -143,12 +143,14 @@
     "change" : "ubah",
     "delete" : "hapus",
     "access control" : "kontrol akses",
+    "Share details could not be loaded for this item." : "Rincian berbagi tidak dapat dimuat untuk item ini.",
     "An error occured. Please try again" : "Terjadi masalah. Mohon coba kembali",
     "Share" : "Bagikan",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud",
     "Share with users or groups …" : "Bagikan dengan pengguna atau grup ...",
     "Share with users, groups or remote users …" : "Bagikan dengan pengguna, grup atau pengguna remote ...",
     "Warning" : "Peringatan",
+    "Error while sending notification" : "Kesalahan ketika mengirim notifikasi",
     "The object type is not specified." : "Tipe objek tidak ditentukan.",
     "Enter new" : "Masukkan baru",
     "Delete" : "Hapus",
@@ -178,8 +180,6 @@
     "New Password" : "Sandi Baru",
     "Reset password" : "Setel ulang sandi",
     "Searching other places" : "Mencari tempat lainnya",
-    "No search results in other places" : "Tidak ada hasil pencarian di tempat lain",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} hasil pencarian di tempat lain"],
     "Personal" : "Pribadi",
     "Users" : "Pengguna",
     "Apps" : "Aplikasi",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 5dcb543b1e4..12027856d2d 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -145,12 +145,14 @@ OC.L10N.register(
     "change" : "breyta",
     "delete" : "eyða",
     "access control" : "aðgangsstýring",
+    "Share details could not be loaded for this item." : "Ekki tókst að finna sameiginlegar upplýsingar.",
     "An error occured. Please try again" : "Villa kom upp. Vinsamlegast reyndu aftur",
     "Share" : "Deila",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Deila með fólk í öðrum ownClouds með skipuninni username@example.com/owncloud",
     "Share with users or groups …" : "Deila með notendum eða hópum ...",
     "Share with users, groups or remote users …" : "Deila með notendum, hópa eða ytri notendum ...",
     "Warning" : "Aðvörun",
+    "Error while sending notification" : "Villa við að senda tilkynningu",
     "The object type is not specified." : "Tegund ekki tilgreind",
     "Enter new" : "Sláðu inn nýtt",
     "Delete" : "Eyða",
@@ -180,8 +182,6 @@ OC.L10N.register(
     "New Password" : "Nýtt Lykilorð",
     "Reset password" : "Endursetja lykilorð",
     "Searching other places" : "Leitað á öðrum stöðum",
-    "No search results in other places" : "Engar leitarniðurstöður á öðrum stöðum",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} Leitarniðurstaða á öðrum stöðum","{count} Leitarniðurstöður á öðrum stöðum"],
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Apps" : "Forrit",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index f1238959ebf..fe7dd9fd64a 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -143,12 +143,14 @@
     "change" : "breyta",
     "delete" : "eyða",
     "access control" : "aðgangsstýring",
+    "Share details could not be loaded for this item." : "Ekki tókst að finna sameiginlegar upplýsingar.",
     "An error occured. Please try again" : "Villa kom upp. Vinsamlegast reyndu aftur",
     "Share" : "Deila",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Deila með fólk í öðrum ownClouds með skipuninni username@example.com/owncloud",
     "Share with users or groups …" : "Deila með notendum eða hópum ...",
     "Share with users, groups or remote users …" : "Deila með notendum, hópa eða ytri notendum ...",
     "Warning" : "Aðvörun",
+    "Error while sending notification" : "Villa við að senda tilkynningu",
     "The object type is not specified." : "Tegund ekki tilgreind",
     "Enter new" : "Sláðu inn nýtt",
     "Delete" : "Eyða",
@@ -178,8 +180,6 @@
     "New Password" : "Nýtt Lykilorð",
     "Reset password" : "Endursetja lykilorð",
     "Searching other places" : "Leitað á öðrum stöðum",
-    "No search results in other places" : "Engar leitarniðurstöður á öðrum stöðum",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} Leitarniðurstaða á öðrum stöðum","{count} Leitarniðurstöður á öðrum stöðum"],
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Apps" : "Forrit",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 48fdf0e9b0c..b031dfe9ab5 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -182,8 +182,8 @@ OC.L10N.register(
     "New Password" : "Nuova password",
     "Reset password" : "Ripristina la password",
     "Searching other places" : "Ricerca in altre posizioni",
-    "No search results in other places" : "Nessun risultato di ricerca in altre posizioni",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} risultato di ricerca in altre posizioni","{count} risultati di ricerca in altre posizioni"],
+    "No search results in other folders" : "Nessun risultato di ricerca in altre cartelle",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} risultato di ricerca in altre cartelle","{count} risultati di ricerca in altre cartelle"],
     "Personal" : "Personale",
     "Users" : "Utenti",
     "Apps" : "Applicazioni",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index bedb6b8aa66..380c31b8ecb 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -180,8 +180,8 @@
     "New Password" : "Nuova password",
     "Reset password" : "Ripristina la password",
     "Searching other places" : "Ricerca in altre posizioni",
-    "No search results in other places" : "Nessun risultato di ricerca in altre posizioni",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} risultato di ricerca in altre posizioni","{count} risultati di ricerca in altre posizioni"],
+    "No search results in other folders" : "Nessun risultato di ricerca in altre cartelle",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} risultato di ricerca in altre cartelle","{count} risultati di ricerca in altre cartelle"],
     "Personal" : "Personale",
     "Users" : "Utenti",
     "Apps" : "Applicazioni",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 53bfc2ebc65..295e0142814 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -177,8 +177,6 @@ OC.L10N.register(
     "New Password" : "新しいパスワード",
     "Reset password" : "パスワードをリセット",
     "Searching other places" : "他の場所の検索",
-    "No search results in other places" : "その他の場所の検索結果はありません",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["その他の場所 の検索件数 {count}"],
     "Personal" : "個人",
     "Users" : "ユーザー",
     "Apps" : "アプリ",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index a0591f119f9..20b86544225 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -175,8 +175,6 @@
     "New Password" : "新しいパスワード",
     "Reset password" : "パスワードをリセット",
     "Searching other places" : "他の場所の検索",
-    "No search results in other places" : "その他の場所の検索結果はありません",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["その他の場所 の検索件数 {count}"],
     "Personal" : "個人",
     "Users" : "ユーザー",
     "Apps" : "アプリ",
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index c6ebf5e502f..28f79d1bb79 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -180,8 +180,6 @@ OC.L10N.register(
     "New Password" : "새 암호",
     "Reset password" : "암호 재설정",
     "Searching other places" : "다른 장소 찾는 중",
-    "No search results in other places" : "다른 장소의 검색 결과 없음",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["다른 장소 검색 결과 {count}개"],
     "Personal" : "개인",
     "Users" : "사용자",
     "Apps" : "앱",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index 5bbb99e89dd..adf31bb5a9d 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -178,8 +178,6 @@
     "New Password" : "새 암호",
     "Reset password" : "암호 재설정",
     "Searching other places" : "다른 장소 찾는 중",
-    "No search results in other places" : "다른 장소의 검색 결과 없음",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["다른 장소 검색 결과 {count}개"],
     "Personal" : "개인",
     "Users" : "사용자",
     "Apps" : "앱",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index 13f133dbaf4..dc22e3f3030 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -182,8 +182,6 @@ OC.L10N.register(
     "New Password" : "Nytt passord",
     "Reset password" : "Tilbakestill passord",
     "Searching other places" : "Søker andre steder",
-    "No search results in other places" : "Ingen søkeresultater på andre steder",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} søkeresultat fra andre steder","{count} søkeresultater fra andre steder"],
     "Personal" : "Personlig",
     "Users" : "Brukere",
     "Apps" : "Apper",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index beb7a53e57b..0f6363831b7 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -180,8 +180,6 @@
     "New Password" : "Nytt passord",
     "Reset password" : "Tilbakestill passord",
     "Searching other places" : "Søker andre steder",
-    "No search results in other places" : "Ingen søkeresultater på andre steder",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} søkeresultat fra andre steder","{count} søkeresultater fra andre steder"],
     "Personal" : "Personlig",
     "Users" : "Brukere",
     "Apps" : "Apper",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 0b12185cae4..a18d79596b5 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -182,8 +182,8 @@ OC.L10N.register(
     "New Password" : "Nieuw wachtwoord",
     "Reset password" : "Reset wachtwoord",
     "Searching other places" : "Zoeken op andere plaatsen",
-    "No search results in other places" : "Geen zoekresultaten op andere plaatsen",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} zoekresultaat op andere plaatsen","{count} zoekresultaten op andere plaatsen"],
+    "No search results in other folders" : "Geen zoekresultaten in andere mappen",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} zoekresultaat in een andere map","{count} zoekresultaten in andere mappen"],
     "Personal" : "Persoonlijk",
     "Users" : "Gebruikers",
     "Apps" : "Apps",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index 7a9765d8c3a..fc221886e41 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -180,8 +180,8 @@
     "New Password" : "Nieuw wachtwoord",
     "Reset password" : "Reset wachtwoord",
     "Searching other places" : "Zoeken op andere plaatsen",
-    "No search results in other places" : "Geen zoekresultaten op andere plaatsen",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} zoekresultaat op andere plaatsen","{count} zoekresultaten op andere plaatsen"],
+    "No search results in other folders" : "Geen zoekresultaten in andere mappen",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} zoekresultaat in een andere map","{count} zoekresultaten in andere mappen"],
     "Personal" : "Persoonlijk",
     "Users" : "Gebruikers",
     "Apps" : "Apps",
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index 07cd7897afd..ae8bbf09986 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -162,7 +162,6 @@ OC.L10N.register(
     "New Password" : "Senhal novèl",
     "Reset password" : "Reïnicializar lo senhal",
     "Searching other places" : "Recèrca en cors dins d'autres emplaçaments",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultat dins d'autres emplaçaments","{count} resultats dins d'autres emplaçaments"],
     "Personal" : "Personal",
     "Users" : "Utilizaires",
     "Apps" : "Aplicacions",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index a67f4970175..7f5aaaff4e1 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -160,7 +160,6 @@
     "New Password" : "Senhal novèl",
     "Reset password" : "Reïnicializar lo senhal",
     "Searching other places" : "Recèrca en cors dins d'autres emplaçaments",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultat dins d'autres emplaçaments","{count} resultats dins d'autres emplaçaments"],
     "Personal" : "Personal",
     "Users" : "Utilizaires",
     "Apps" : "Aplicacions",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index ca6b56ae0a1..e61218e465e 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -182,8 +182,8 @@ OC.L10N.register(
     "New Password" : "Nova Senha",
     "Reset password" : "Redefinir senha",
     "Searching other places" : "Pesquisando em outros lugares",
-    "No search results in other places" : "Nenhum resultado de pesquisa em outros lugares",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultados da pesquisa em outros lugares","{count} resultados da pesquisa em outros lugares"],
+    "No search results in other folders" : "Nenhum resultado de pesquisa em outras pastas",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} resultado da pesquisa em outras pastas","{count} resultados da pesquisa em outras pastas"],
     "Personal" : "Pessoal",
     "Users" : "Usuários",
     "Apps" : "Aplicações",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 7441ad571eb..b11ed053b63 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -180,8 +180,8 @@
     "New Password" : "Nova Senha",
     "Reset password" : "Redefinir senha",
     "Searching other places" : "Pesquisando em outros lugares",
-    "No search results in other places" : "Nenhum resultado de pesquisa em outros lugares",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultados da pesquisa em outros lugares","{count} resultados da pesquisa em outros lugares"],
+    "No search results in other folders" : "Nenhum resultado de pesquisa em outras pastas",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} resultado da pesquisa em outras pastas","{count} resultados da pesquisa em outras pastas"],
     "Personal" : "Pessoal",
     "Users" : "Usuários",
     "Apps" : "Aplicações",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index 0db31437384..c47731d17fa 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -178,8 +178,6 @@ OC.L10N.register(
     "New Password" : "Nova palavra-passe",
     "Reset password" : "Repor palavra-passe",
     "Searching other places" : "A pesquisar noutros lugares",
-    "No search results in other places" : "Nenhuns resultados em outros locais",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado de pesquisa noutros lugares","{count} resultados de pesquisa noutros lugares"],
     "Personal" : "Pessoal",
     "Users" : "Utilizadores",
     "Apps" : "Apps",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 64b67ce8856..fdafd1c3c01 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -176,8 +176,6 @@
     "New Password" : "Nova palavra-passe",
     "Reset password" : "Repor palavra-passe",
     "Searching other places" : "A pesquisar noutros lugares",
-    "No search results in other places" : "Nenhuns resultados em outros locais",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado de pesquisa noutros lugares","{count} resultados de pesquisa noutros lugares"],
     "Personal" : "Pessoal",
     "Users" : "Utilizadores",
     "Apps" : "Apps",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 40019986dcc..a5159a8d9a2 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -170,8 +170,6 @@ OC.L10N.register(
     "New Password" : "Новый пароль",
     "Reset password" : "Сбросить пароль",
     "Searching other places" : "Идет поиск в других местах",
-    "No search results in other places" : "В других местах ничего не найдено",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} результат поиска в других местах","{count} результата поиска в других местах","{count} результатов поиска в других местах","{count} результатов поиска в других местах"],
     "Personal" : "Личное",
     "Users" : "Пользователи",
     "Apps" : "Приложения",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 25c4313bd17..8be25ffe06d 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -168,8 +168,6 @@
     "New Password" : "Новый пароль",
     "Reset password" : "Сбросить пароль",
     "Searching other places" : "Идет поиск в других местах",
-    "No search results in other places" : "В других местах ничего не найдено",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} результат поиска в других местах","{count} результата поиска в других местах","{count} результатов поиска в других местах","{count} результатов поиска в других местах"],
     "Personal" : "Личное",
     "Users" : "Пользователи",
     "Apps" : "Приложения",
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 075694831e2..2d0305196bc 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -166,8 +166,6 @@ OC.L10N.register(
     "New Password" : "Nové heslo",
     "Reset password" : "Obnovenie hesla",
     "Searching other places" : "Prehľadanie ostatných umiestnení",
-    "No search results in other places" : "Žiadne výsledky z prehľadávania v ostatných umiestneniach",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} výsledok v ostatných umiestneniach","{count} výsledky v ostatných umiestneniach","{count} výsledkov v ostatných umiestneniach"],
     "Personal" : "Osobné",
     "Users" : "Používatelia",
     "Apps" : "Aplikácie",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index c9ab6cfacc3..14205e73457 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -164,8 +164,6 @@
     "New Password" : "Nové heslo",
     "Reset password" : "Obnovenie hesla",
     "Searching other places" : "Prehľadanie ostatných umiestnení",
-    "No search results in other places" : "Žiadne výsledky z prehľadávania v ostatných umiestneniach",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} výsledok v ostatných umiestneniach","{count} výsledky v ostatných umiestneniach","{count} výsledkov v ostatných umiestneniach"],
     "Personal" : "Osobné",
     "Users" : "Používatelia",
     "Apps" : "Aplikácie",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index 820b32ad61e..7676beecc5b 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -165,8 +165,6 @@ OC.L10N.register(
     "New Password" : "Нова лозинка",
     "Reset password" : "Ресетуј лозинку",
     "Searching other places" : "Претражујем остала места",
-    "No search results in other places" : "Нема резултата претраге на другим местима",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} резултат претраге на осталим местима","{count} резултата претраге на осталим местима","{count} резултата претраге на осталим местима"],
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Апликације",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index 2607a8ba79b..f06c58773bb 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -163,8 +163,6 @@
     "New Password" : "Нова лозинка",
     "Reset password" : "Ресетуј лозинку",
     "Searching other places" : "Претражујем остала места",
-    "No search results in other places" : "Нема резултата претраге на другим местима",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} резултат претраге на осталим местима","{count} резултата претраге на осталим местима","{count} резултата претраге на осталим местима"],
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Апликације",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index e2d5edf3f5d..8ef863b4a59 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -145,7 +145,6 @@ OC.L10N.register(
     "New password" : "Nytt lösenord",
     "New Password" : "Nytt lösenord",
     "Reset password" : "Återställ lösenordet",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} sökresultat på andra platser","{count} sökresultat på andra platser"],
     "Personal" : "Personligt",
     "Users" : "Användare",
     "Apps" : "Program",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index c25a4afc5e7..5e425406a42 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -143,7 +143,6 @@
     "New password" : "Nytt lösenord",
     "New Password" : "Nytt lösenord",
     "Reset password" : "Återställ lösenordet",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} sökresultat på andra platser","{count} sökresultat på andra platser"],
     "Personal" : "Personligt",
     "Users" : "Användare",
     "Apps" : "Program",
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index 3ed34bc336d..a7398d8eaef 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -182,8 +182,8 @@ OC.L10N.register(
     "New Password" : "รหัสผ่านใหม่",
     "Reset password" : "เปลี่ยนรหัสผ่านใหม่",
     "Searching other places" : "กำลังค้นหาสถานที่อื่นๆ",
-    "No search results in other places" : "ไม่มีผลการค้นหาในสถานที่อื่นๆ",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} ผลการค้นหาในสถานที่อื่นๆ"],
+    "No search results in other folders" : "ไม่พบผลลัพธ์การค้นหาในโฟลเดอร์อื่นๆ",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["ค้นหาพบ {count} ผลลัพธ์ในโฟลเดอร์อื่นๆ"],
     "Personal" : "ส่วนตัว",
     "Users" : "ผู้ใช้งาน",
     "Apps" : "แอปฯ",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index ecf02c36b4b..9ff015ea8b9 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -180,8 +180,8 @@
     "New Password" : "รหัสผ่านใหม่",
     "Reset password" : "เปลี่ยนรหัสผ่านใหม่",
     "Searching other places" : "กำลังค้นหาสถานที่อื่นๆ",
-    "No search results in other places" : "ไม่มีผลการค้นหาในสถานที่อื่นๆ",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} ผลการค้นหาในสถานที่อื่นๆ"],
+    "No search results in other folders" : "ไม่พบผลลัพธ์การค้นหาในโฟลเดอร์อื่นๆ",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["ค้นหาพบ {count} ผลลัพธ์ในโฟลเดอร์อื่นๆ"],
     "Personal" : "ส่วนตัว",
     "Users" : "ผู้ใช้งาน",
     "Apps" : "แอปฯ",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index 075c7470f4e..b0dcc1953ba 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -180,8 +180,6 @@ OC.L10N.register(
     "New Password" : "Yeni Parola",
     "Reset password" : "Parolayı sıfırla",
     "Searching other places" : "Diğer konumlarda aranıyor",
-    "No search results in other places" : "Diğer konumlarda arama sonucu yok",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["Diğer konumlarda {count} arama sonucu","Diğer konumlarda {count} arama sonucu"],
     "Personal" : "Kişisel",
     "Users" : "Kullanıcılar",
     "Apps" : "Uygulamalar",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index 9aa0942c957..30d443795ec 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -178,8 +178,6 @@
     "New Password" : "Yeni Parola",
     "Reset password" : "Parolayı sıfırla",
     "Searching other places" : "Diğer konumlarda aranıyor",
-    "No search results in other places" : "Diğer konumlarda arama sonucu yok",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["Diğer konumlarda {count} arama sonucu","Diğer konumlarda {count} arama sonucu"],
     "Personal" : "Kişisel",
     "Users" : "Kullanıcılar",
     "Apps" : "Uygulamalar",
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index f5c6ad86d9e..09952d200f7 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -2,8 +2,10 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Неможливо надіслати листа наступним користувачам: %s ",
+    "Preparing update" : "Підготовка до оновлення",
     "Turned on maintenance mode" : "Увімкнено режим технічного обслуговування",
     "Turned off maintenance mode" : "Вимкнено режим технічного обслуговування",
+    "Maintenance mode is kept active" : "Режим обслуговування залишається активним",
     "Updated database" : "Базу даних оновлено",
     "Checked database schema update" : "Перевірено оновлення схеми бази даних",
     "Checked database schema update for apps" : "Перевірено оновлення схеми бази даних для додатків",
@@ -11,6 +13,9 @@ OC.L10N.register(
     "Repair warning: " : "Попередження відновлення:",
     "Repair error: " : "Помилка відновлення:",
     "Following incompatible apps have been disabled: %s" : "Наступні несумісні додатки були вимкнені: %s",
+    "Following apps have been disabled: %s" : "Наступні додатки були вимкнені: %s",
+    "Already up to date" : "Актуально",
+    "File is too big" : "Файл занадто великий",
     "Invalid file provided" : "Надано невірний файл",
     "No image or file provided" : "Зображення або файлу не надано",
     "Unknown filetype" : "Невідомий тип файлу",
@@ -26,13 +31,20 @@ OC.L10N.register(
     "Thursday" : "Четвер",
     "Friday" : "П'ятниця",
     "Saturday" : "Субота",
-    "Sun." : "Нед.",
+    "Sun." : "Нд.",
     "Mon." : "Пн.",
     "Tue." : "Вт.",
     "Wed." : "Ср.",
     "Thu." : "Чт.",
     "Fri." : "Пт.",
     "Sat." : "Сб.",
+    "Su" : "Нд.",
+    "Mo" : "Пн.",
+    "Tu" : "Вт.",
+    "We" : "Ср.",
+    "Th" : "Чт.",
+    "Fr" : "Пт.",
+    "Sa" : "Сб.",
     "January" : "Січень",
     "February" : "Лютий",
     "March" : "Березень",
@@ -92,6 +104,7 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш каталог даних і ваші файли можливо доступні з інтернету. .htaccess файл не працює. Ми наполегливо рекомендуємо вам налаштувати ваш веб сервер таким чином, щоб каталог даних більше не був доступний або перемістіть каталог даних за межі кореня веб сервера.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Кеш пам'яті не налаштований. Задля покращення продуктивності, будь ласка, налаштуйте memcache, якщо є можливість. Додаткову інформацію шукайте у нашій <a href=\"{docLink}\">документації</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom не доступний для читання PHP, що вкрай небажано з міркувань безпеки. Додаткову інформацію шукайте у нашій <a href=\"{docLink}\">документації</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ваша версія PHP ({version}) більше <a href=\"{phpLink}\">не підтримується</a>. Ми рекомендуємо вам оновити версію PHP щоб отримати кращу продуктивність та оновлення безпеки.",
     "Error occurred while checking server setup" : "При перевірці налаштувань серверу сталася помилка",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP заголовок \"{header}\" не налаштований як \"{expected}\". Це потенційний ризик для безпеки чи приватності і ми радимо виправити це налаштування.",
     "Shared" : "Опубліковано",
@@ -135,6 +148,7 @@ OC.L10N.register(
     "Share with users or groups …" : "Поширити серед користувачів або груп ...",
     "Share with users, groups or remote users …" : "Поширити серед локальних чи віддалених користувачів або груп ...",
     "Warning" : "Попередження",
+    "Error while sending notification" : "Помилка при надсиланні повідомлення",
     "The object type is not specified." : "Не визначено тип об'єкту.",
     "Enter new" : "Введіть новий",
     "Delete" : "Видалити",
@@ -152,8 +166,10 @@ OC.L10N.register(
     "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.",
     "Please reload the page." : "Будь ласка, перезавантажте сторінку.",
     "The update was unsuccessful. " : "Оновлення завершилось невдачею.",
+    "The update was successful. There were warnings." : "Оновлення виконалось успішно, але були попередження.",
     "The update was successful. Redirecting you to ownCloud now." : "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
     "Couldn't reset password because the token is invalid" : "Неможливо скинути пароль, бо маркер є недійсним",
+    "Couldn't reset password because the token is expired" : "Неможливо скинути пароль, бо маркер застарів",
     "Couldn't send reset email. Please make sure your username is correct." : "Не вдалося відправити скидання паролю. Будь ласка, переконайтеся, що ваше ім'я користувача є правильним.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.",
     "%s password reset" : "%s скидання паролю",
@@ -162,7 +178,8 @@ OC.L10N.register(
     "New Password" : "Новий пароль",
     "Reset password" : "Скинути пароль",
     "Searching other places" : "Йде пошук в інших місцях",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} результат пошуку в інших місцях","{count} результатів пошуку в інших місцях","{count} результати пошуку в інших місцях"],
+    "No search results in other folders" : "В інших теках нічого не знайдено",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} результат пошуку в інших теках","{count} результатів пошуку в інших теках","{count} результатів пошуку в інших теках"],
     "Personal" : "Особисте",
     "Users" : "Користувачі",
     "Apps" : "Додатки",
@@ -227,6 +244,7 @@ OC.L10N.register(
     "An internal error occured." : "Виникла внутрішня помилка.",
     "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.",
     "Log in" : "Увійти",
+    "Wrong password. Reset it?" : "Невірний пароль. Скинути його?",
     "remember" : "запам'ятати",
     "Alternative Logins" : "Альтернативні імена користувача",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто повідомляємо вам, що %s поділився »%s« з вами.<br><a href=\"%s\">Перегляньте!</a><br><br>",
@@ -238,6 +256,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходиться в файлі config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
     "Add \"%s\" as trusted domain" : "Додати \"%s\" як довірений домен",
+    "App update required" : "Додаток потребує оновлення",
+    "%s will be updated to version %s" : "%s буде оновлено до версії %s",
+    "These apps will be updated:" : "Ці додатки будуть оновлені:",
+    "These incompatible apps will be disabled:" : "Ці несумісні додатки будуть вимкнені:",
     "The theme %s has been disabled." : "Тему %s було вимкнено.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продовженням переконайтеся, що ви зробили резервну копію бази даних, каталогу конфігурації та каталогу з даними.",
     "Start update" : "Почати оновлення",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index 1c12acf311e..c46e55138bf 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -1,7 +1,9 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Неможливо надіслати листа наступним користувачам: %s ",
+    "Preparing update" : "Підготовка до оновлення",
     "Turned on maintenance mode" : "Увімкнено режим технічного обслуговування",
     "Turned off maintenance mode" : "Вимкнено режим технічного обслуговування",
+    "Maintenance mode is kept active" : "Режим обслуговування залишається активним",
     "Updated database" : "Базу даних оновлено",
     "Checked database schema update" : "Перевірено оновлення схеми бази даних",
     "Checked database schema update for apps" : "Перевірено оновлення схеми бази даних для додатків",
@@ -9,6 +11,9 @@
     "Repair warning: " : "Попередження відновлення:",
     "Repair error: " : "Помилка відновлення:",
     "Following incompatible apps have been disabled: %s" : "Наступні несумісні додатки були вимкнені: %s",
+    "Following apps have been disabled: %s" : "Наступні додатки були вимкнені: %s",
+    "Already up to date" : "Актуально",
+    "File is too big" : "Файл занадто великий",
     "Invalid file provided" : "Надано невірний файл",
     "No image or file provided" : "Зображення або файлу не надано",
     "Unknown filetype" : "Невідомий тип файлу",
@@ -24,13 +29,20 @@
     "Thursday" : "Четвер",
     "Friday" : "П'ятниця",
     "Saturday" : "Субота",
-    "Sun." : "Нед.",
+    "Sun." : "Нд.",
     "Mon." : "Пн.",
     "Tue." : "Вт.",
     "Wed." : "Ср.",
     "Thu." : "Чт.",
     "Fri." : "Пт.",
     "Sat." : "Сб.",
+    "Su" : "Нд.",
+    "Mo" : "Пн.",
+    "Tu" : "Вт.",
+    "We" : "Ср.",
+    "Th" : "Чт.",
+    "Fr" : "Пт.",
+    "Sa" : "Сб.",
     "January" : "Січень",
     "February" : "Лютий",
     "March" : "Березень",
@@ -90,6 +102,7 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш каталог даних і ваші файли можливо доступні з інтернету. .htaccess файл не працює. Ми наполегливо рекомендуємо вам налаштувати ваш веб сервер таким чином, щоб каталог даних більше не був доступний або перемістіть каталог даних за межі кореня веб сервера.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Кеш пам'яті не налаштований. Задля покращення продуктивності, будь ласка, налаштуйте memcache, якщо є можливість. Додаткову інформацію шукайте у нашій <a href=\"{docLink}\">документації</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom не доступний для читання PHP, що вкрай небажано з міркувань безпеки. Додаткову інформацію шукайте у нашій <a href=\"{docLink}\">документації</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ваша версія PHP ({version}) більше <a href=\"{phpLink}\">не підтримується</a>. Ми рекомендуємо вам оновити версію PHP щоб отримати кращу продуктивність та оновлення безпеки.",
     "Error occurred while checking server setup" : "При перевірці налаштувань серверу сталася помилка",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP заголовок \"{header}\" не налаштований як \"{expected}\". Це потенційний ризик для безпеки чи приватності і ми радимо виправити це налаштування.",
     "Shared" : "Опубліковано",
@@ -133,6 +146,7 @@
     "Share with users or groups …" : "Поширити серед користувачів або груп ...",
     "Share with users, groups or remote users …" : "Поширити серед локальних чи віддалених користувачів або груп ...",
     "Warning" : "Попередження",
+    "Error while sending notification" : "Помилка при надсиланні повідомлення",
     "The object type is not specified." : "Не визначено тип об'єкту.",
     "Enter new" : "Введіть новий",
     "Delete" : "Видалити",
@@ -150,8 +164,10 @@
     "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.",
     "Please reload the page." : "Будь ласка, перезавантажте сторінку.",
     "The update was unsuccessful. " : "Оновлення завершилось невдачею.",
+    "The update was successful. There were warnings." : "Оновлення виконалось успішно, але були попередження.",
     "The update was successful. Redirecting you to ownCloud now." : "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
     "Couldn't reset password because the token is invalid" : "Неможливо скинути пароль, бо маркер є недійсним",
+    "Couldn't reset password because the token is expired" : "Неможливо скинути пароль, бо маркер застарів",
     "Couldn't send reset email. Please make sure your username is correct." : "Не вдалося відправити скидання паролю. Будь ласка, переконайтеся, що ваше ім'я користувача є правильним.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.",
     "%s password reset" : "%s скидання паролю",
@@ -160,7 +176,8 @@
     "New Password" : "Новий пароль",
     "Reset password" : "Скинути пароль",
     "Searching other places" : "Йде пошук в інших місцях",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} результат пошуку в інших місцях","{count} результатів пошуку в інших місцях","{count} результати пошуку в інших місцях"],
+    "No search results in other folders" : "В інших теках нічого не знайдено",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} результат пошуку в інших теках","{count} результатів пошуку в інших теках","{count} результатів пошуку в інших теках"],
     "Personal" : "Особисте",
     "Users" : "Користувачі",
     "Apps" : "Додатки",
@@ -225,6 +242,7 @@
     "An internal error occured." : "Виникла внутрішня помилка.",
     "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.",
     "Log in" : "Увійти",
+    "Wrong password. Reset it?" : "Невірний пароль. Скинути його?",
     "remember" : "запам'ятати",
     "Alternative Logins" : "Альтернативні імена користувача",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто повідомляємо вам, що %s поділився »%s« з вами.<br><a href=\"%s\">Перегляньте!</a><br><br>",
@@ -236,6 +254,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходиться в файлі config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
     "Add \"%s\" as trusted domain" : "Додати \"%s\" як довірений домен",
+    "App update required" : "Додаток потребує оновлення",
+    "%s will be updated to version %s" : "%s буде оновлено до версії %s",
+    "These apps will be updated:" : "Ці додатки будуть оновлені:",
+    "These incompatible apps will be disabled:" : "Ці несумісні додатки будуть вимкнені:",
     "The theme %s has been disabled." : "Тему %s було вимкнено.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продовженням переконайтеся, що ви зробили резервну копію бази даних, каталогу конфігурації та каталогу з даними.",
     "Start update" : "Почати оновлення",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 8b4a199c02c..ab377c9eb06 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -180,8 +180,6 @@ OC.L10N.register(
     "New Password" : "新密码",
     "Reset password" : "重置密码",
     "Searching other places" : "搜索其他地方",
-    "No search results in other places" : "在其他地方没有搜索结果",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["在其他地方有 {count} 个搜索结果"],
     "Personal" : "个人",
     "Users" : "用户",
     "Apps" : "应用",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 23d3fc19366..d16c744d51f 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -178,8 +178,6 @@
     "New Password" : "新密码",
     "Reset password" : "重置密码",
     "Searching other places" : "搜索其他地方",
-    "No search results in other places" : "在其他地方没有搜索结果",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["在其他地方有 {count} 个搜索结果"],
     "Personal" : "个人",
     "Users" : "用户",
     "Apps" : "应用",
diff --git a/lib/l10n/af_ZA.js b/lib/l10n/af_ZA.js
index 05dad16ea68..fbd3c49ad44 100644
--- a/lib/l10n/af_ZA.js
+++ b/lib/l10n/af_ZA.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "today" : "vandag",
     "seconds ago" : "sekondes gelede",
     "web services under your control" : "webdienste onder jou beheer",
-    "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate."
+    "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
+    "Apps" : "Toepassings"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/af_ZA.json b/lib/l10n/af_ZA.json
index dcf24d58fd6..a17cac172e7 100644
--- a/lib/l10n/af_ZA.json
+++ b/lib/l10n/af_ZA.json
@@ -8,6 +8,7 @@
     "today" : "vandag",
     "seconds ago" : "sekondes gelede",
     "web services under your control" : "webdienste onder jou beheer",
-    "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate."
+    "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
+    "Apps" : "Toepassings"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ar.js b/lib/l10n/ar.js
index 9ec243672e1..e4cc5ca2131 100644
--- a/lib/l10n/ar.js
+++ b/lib/l10n/ar.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Set an admin password." : "اعداد كلمة مرور للمدير",
     "%s shared »%s« with you" : "%s شارك »%s« معك",
     "Could not find category \"%s\"" : "تعذر العثور على المجلد \"%s\"",
+    "Apps" : "التطبيقات",
     "A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
     "A valid password must be provided" : "يجب ادخال كلمة مرور صحيحة"
 },
diff --git a/lib/l10n/ar.json b/lib/l10n/ar.json
index 06d47dc255a..2e6a83fd969 100644
--- a/lib/l10n/ar.json
+++ b/lib/l10n/ar.json
@@ -35,6 +35,7 @@
     "Set an admin password." : "اعداد كلمة مرور للمدير",
     "%s shared »%s« with you" : "%s شارك »%s« معك",
     "Could not find category \"%s\"" : "تعذر العثور على المجلد \"%s\"",
+    "Apps" : "التطبيقات",
     "A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
     "A valid password must be provided" : "يجب ادخال كلمة مرور صحيحة"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
diff --git a/lib/l10n/ast.js b/lib/l10n/ast.js
index 3fb120b255b..0cb8e5b8cea 100644
--- a/lib/l10n/ast.js
+++ b/lib/l10n/ast.js
@@ -82,6 +82,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Compartir %s falló porque'l motor compartíu pa %s podría nun atopar el so orixe",
     "Sharing %s failed, because the file could not be found in the file cache" : "Compartir %s falló, yá que'l ficheru nun pudo atopase na caché de ficheru",
     "Could not find category \"%s\"" : "Nun pudo alcontrase la estaya \"%s.\"",
+    "Apps" : "Aplicaciones",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Namái tan permitíos los siguientes caráuteres nun nome d'usuariu: \"a-z\", \"A-Z\", \"0-9\", y \"_.@-\"",
     "A valid username must be provided" : "Tien d'apurrise un nome d'usuariu válidu",
     "A valid password must be provided" : "Tien d'apurrise una contraseña válida",
diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json
index f51d08ad731..f0337d043ed 100644
--- a/lib/l10n/ast.json
+++ b/lib/l10n/ast.json
@@ -80,6 +80,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Compartir %s falló porque'l motor compartíu pa %s podría nun atopar el so orixe",
     "Sharing %s failed, because the file could not be found in the file cache" : "Compartir %s falló, yá que'l ficheru nun pudo atopase na caché de ficheru",
     "Could not find category \"%s\"" : "Nun pudo alcontrase la estaya \"%s.\"",
+    "Apps" : "Aplicaciones",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Namái tan permitíos los siguientes caráuteres nun nome d'usuariu: \"a-z\", \"A-Z\", \"0-9\", y \"_.@-\"",
     "A valid username must be provided" : "Tien d'apurrise un nome d'usuariu válidu",
     "A valid password must be provided" : "Tien d'apurrise una contraseña válida",
diff --git a/lib/l10n/bg_BG.js b/lib/l10n/bg_BG.js
index a02d35061ef..2130ba8dec3 100644
--- a/lib/l10n/bg_BG.js
+++ b/lib/l10n/bg_BG.js
@@ -92,6 +92,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Неуспешно споделяне на %s, защото не е открит първоизточникът на %s, за да бъде споделяне по сървъра.",
     "Sharing %s failed, because the file could not be found in the file cache" : "Неуспешно споделяне на %s, защото файлът не може да бъде намерен в кеша.",
     "Could not find category \"%s\"" : "Невъзможно откриване на категорията \"%s\".",
+    "Apps" : "Приложения",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Само следните символи са разрешени в потребителското име: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\".",
     "A valid username must be provided" : "Валидно потребителско име трябва да бъде зададено.",
     "A valid password must be provided" : "Валидна парола трябва да бъде зададена.",
diff --git a/lib/l10n/bg_BG.json b/lib/l10n/bg_BG.json
index 3b9b899e53f..3567c069218 100644
--- a/lib/l10n/bg_BG.json
+++ b/lib/l10n/bg_BG.json
@@ -90,6 +90,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Неуспешно споделяне на %s, защото не е открит първоизточникът на %s, за да бъде споделяне по сървъра.",
     "Sharing %s failed, because the file could not be found in the file cache" : "Неуспешно споделяне на %s, защото файлът не може да бъде намерен в кеша.",
     "Could not find category \"%s\"" : "Невъзможно откриване на категорията \"%s\".",
+    "Apps" : "Приложения",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Само следните символи са разрешени в потребителското име: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\".",
     "A valid username must be provided" : "Валидно потребителско име трябва да бъде зададено.",
     "A valid password must be provided" : "Валидна парола трябва да бъде зададена.",
diff --git a/lib/l10n/bn_BD.js b/lib/l10n/bn_BD.js
index 3ebf53a2240..f9a899ba5df 100644
--- a/lib/l10n/bn_BD.js
+++ b/lib/l10n/bn_BD.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Unknown user" : "অপরিচিত ব্যবহারকারী",
     "%s shared »%s« with you" : "%s আপনার সাথে »%s« ভাগাভাগি করেছে",
     "Sharing %s failed, because the file does not exist" : "%s ভাগাভাগি ব্যার্থ, কারণ ফাইলটি নেই",
-    "You are not allowed to share %s" : "আপনি %s ভাগাভাগি করতে পারবেননা"
+    "You are not allowed to share %s" : "আপনি %s ভাগাভাগি করতে পারবেননা",
+    "Apps" : "অ্যাপ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/bn_BD.json b/lib/l10n/bn_BD.json
index 47e4311939a..2c384053014 100644
--- a/lib/l10n/bn_BD.json
+++ b/lib/l10n/bn_BD.json
@@ -31,6 +31,7 @@
     "Unknown user" : "অপরিচিত ব্যবহারকারী",
     "%s shared »%s« with you" : "%s আপনার সাথে »%s« ভাগাভাগি করেছে",
     "Sharing %s failed, because the file does not exist" : "%s ভাগাভাগি ব্যার্থ, কারণ ফাইলটি নেই",
-    "You are not allowed to share %s" : "আপনি %s ভাগাভাগি করতে পারবেননা"
+    "You are not allowed to share %s" : "আপনি %s ভাগাভাগি করতে পারবেননা",
+    "Apps" : "অ্যাপ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/bs.js b/lib/l10n/bs.js
index 004d5cd2aac..b4fccf12d5d 100644
--- a/lib/l10n/bs.js
+++ b/lib/l10n/bs.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "Authentication error" : "Grešna autentifikacije",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba. Korištenje na vlastiti rizik!",
     "For the best results, please consider using a GNU/Linux server instead." : "Umjesto toga, za najbolje rezultate, molimo razmislite o mogućnosti korištenje GNU/Linux servera.",
+    "Apps" : "Aplikacije",
     "A valid username must be provided" : "Nužno je navesti valjano korisničko ime",
     "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemorisanja kao što je Zend OPcache ili eAccelerator."
diff --git a/lib/l10n/bs.json b/lib/l10n/bs.json
index f4da9911f97..e9514de8275 100644
--- a/lib/l10n/bs.json
+++ b/lib/l10n/bs.json
@@ -9,6 +9,7 @@
     "Authentication error" : "Grešna autentifikacije",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba. Korištenje na vlastiti rizik!",
     "For the best results, please consider using a GNU/Linux server instead." : "Umjesto toga, za najbolje rezultate, molimo razmislite o mogućnosti korištenje GNU/Linux servera.",
+    "Apps" : "Aplikacije",
     "A valid username must be provided" : "Nužno je navesti valjano korisničko ime",
     "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemorisanja kao što je Zend OPcache ili eAccelerator."
diff --git a/lib/l10n/ca.js b/lib/l10n/ca.js
index 1a2b29e088b..30e011b3036 100644
--- a/lib/l10n/ca.js
+++ b/lib/l10n/ca.js
@@ -80,6 +80,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Ha fallat en compartir %s, perquè el rerefons de compartir per %s no pot trobar la seva font",
     "Sharing %s failed, because the file could not be found in the file cache" : "Ha fallat en compartir %s, perquè el fitxer no s'ha trobat en el fitxer cau",
     "Could not find category \"%s\"" : "No s'ha trobat la categoria \"%s\"",
+    "Apps" : "Aplicacions",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Només els caràcters següents estan permesos en el nom d'usuari: \"a-z\", \"A-Z\", \"0-9\" i \"_.@-\"",
     "A valid username must be provided" : "Heu de facilitar un nom d'usuari vàlid",
     "A valid password must be provided" : "Heu de facilitar una contrasenya vàlida",
diff --git a/lib/l10n/ca.json b/lib/l10n/ca.json
index 2fac46f86a0..3cfbae48e43 100644
--- a/lib/l10n/ca.json
+++ b/lib/l10n/ca.json
@@ -78,6 +78,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Ha fallat en compartir %s, perquè el rerefons de compartir per %s no pot trobar la seva font",
     "Sharing %s failed, because the file could not be found in the file cache" : "Ha fallat en compartir %s, perquè el fitxer no s'ha trobat en el fitxer cau",
     "Could not find category \"%s\"" : "No s'ha trobat la categoria \"%s\"",
+    "Apps" : "Aplicacions",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Només els caràcters següents estan permesos en el nom d'usuari: \"a-z\", \"A-Z\", \"0-9\" i \"_.@-\"",
     "A valid username must be provided" : "Heu de facilitar un nom d'usuari vàlid",
     "A valid password must be provided" : "Heu de facilitar una contrasenya vàlida",
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js
index 65ff43b4f23..344e36688c2 100644
--- a/lib/l10n/cs_CZ.js
+++ b/lib/l10n/cs_CZ.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Sdílení položky %s selhalo, protože úložiště sdílení %s nenalezla zdroj",
     "Sharing %s failed, because the file could not be found in the file cache" : "Sdílení položky %s selhalo, protože soubor nebyl nalezen ve vyrovnávací paměti",
     "Could not find category \"%s\"" : "Nelze nalézt kategorii \"%s\"",
+    "Apps" : "Aplikace",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Pouze následující znaky jsou povoleny v uživatelském jménu: \"a-z\", \"A-Z\", \"0-9\" a \"_.@-\"",
     "A valid username must be provided" : "Musíte zadat platné uživatelské jméno",
     "A valid password must be provided" : "Musíte zadat platné heslo",
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json
index 501210dd0f8..949bb0aa2f6 100644
--- a/lib/l10n/cs_CZ.json
+++ b/lib/l10n/cs_CZ.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Sdílení položky %s selhalo, protože úložiště sdílení %s nenalezla zdroj",
     "Sharing %s failed, because the file could not be found in the file cache" : "Sdílení položky %s selhalo, protože soubor nebyl nalezen ve vyrovnávací paměti",
     "Could not find category \"%s\"" : "Nelze nalézt kategorii \"%s\"",
+    "Apps" : "Aplikace",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Pouze následující znaky jsou povoleny v uživatelském jménu: \"a-z\", \"A-Z\", \"0-9\" a \"_.@-\"",
     "A valid username must be provided" : "Musíte zadat platné uživatelské jméno",
     "A valid password must be provided" : "Musíte zadat platné heslo",
diff --git a/lib/l10n/cy_GB.js b/lib/l10n/cy_GB.js
index 851e37b43ae..fde170d5994 100644
--- a/lib/l10n/cy_GB.js
+++ b/lib/l10n/cy_GB.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "PostgreSQL username and/or password not valid" : "Enw a/neu gyfrinair PostgreSQL annilys",
     "Set an admin username." : "Creu enw defnyddiwr i'r gweinyddwr.",
     "Set an admin password." : "Gosod cyfrinair y gweinyddwr.",
-    "Could not find category \"%s\"" : "Methu canfod categori \"%s\""
+    "Could not find category \"%s\"" : "Methu canfod categori \"%s\"",
+    "Apps" : "Pecynnau"
 },
 "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/lib/l10n/cy_GB.json b/lib/l10n/cy_GB.json
index 2088b3c2f9d..48422c82c56 100644
--- a/lib/l10n/cy_GB.json
+++ b/lib/l10n/cy_GB.json
@@ -23,6 +23,7 @@
     "PostgreSQL username and/or password not valid" : "Enw a/neu gyfrinair PostgreSQL annilys",
     "Set an admin username." : "Creu enw defnyddiwr i'r gweinyddwr.",
     "Set an admin password." : "Gosod cyfrinair y gweinyddwr.",
-    "Could not find category \"%s\"" : "Methu canfod categori \"%s\""
+    "Could not find category \"%s\"" : "Methu canfod categori \"%s\"",
+    "Apps" : "Pecynnau"
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index 285e9ac55d1..147006e1a19 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Deling af %s mislykkedes, fordi back-enden ikke kunne finde kilden til %s",
     "Sharing %s failed, because the file could not be found in the file cache" : "Deling af %s mislykkedes, fordi filen ikke kunne findes i fil-cachen",
     "Could not find category \"%s\"" : "Kunne ikke finde kategorien \"%s\"",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Det er kun tilladt at benytte følgene karakterer i et brugernavn \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Et gyldigt brugernavn skal angives",
     "A valid password must be provided" : "En gyldig adgangskode skal angives",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index 1b9ed304596..46d4c446945 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Deling af %s mislykkedes, fordi back-enden ikke kunne finde kilden til %s",
     "Sharing %s failed, because the file could not be found in the file cache" : "Deling af %s mislykkedes, fordi filen ikke kunne findes i fil-cachen",
     "Could not find category \"%s\"" : "Kunne ikke finde kategorien \"%s\"",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Det er kun tilladt at benytte følgene karakterer i et brugernavn \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Et gyldigt brugernavn skal angives",
     "A valid password must be provided" : "En gyldig adgangskode skal angives",
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index f4341e53b4d..9bb0ecab0ca 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte",
     "Sharing %s failed, because the file could not be found in the file cache" : "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte",
     "Could not find category \"%s\"" : "Die Kategorie „%s“ konnte nicht gefunden werden",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Folgende Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“ und „_.@-“",
     "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
     "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index 18dbd51317e..eccfbe94469 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -108,6 +108,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte",
     "Sharing %s failed, because the file could not be found in the file cache" : "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte",
     "Could not find category \"%s\"" : "Die Kategorie „%s“ konnte nicht gefunden werden",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Folgende Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“ und „_.@-“",
     "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
     "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index 9eda034348f..41e20324a15 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte",
     "Sharing %s failed, because the file could not be found in the file cache" : "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte",
     "Could not find category \"%s\"" : "Die Kategorie „%s“ konnte nicht gefunden werden",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Folgende Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“ und „_.@-“",
     "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
     "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index 9a9b4341a56..fa64ef0f144 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -108,6 +108,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Freigabe von %s fehlgeschlagen, da das Freigabe-Backend für %s nicht in dieser Quelle gefunden werden konnte",
     "Sharing %s failed, because the file could not be found in the file cache" : "Freigabe von %s fehlgeschlagen, da die Datei im Datei-Cache nicht gefunden werden konnte",
     "Could not find category \"%s\"" : "Die Kategorie „%s“ konnte nicht gefunden werden",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Folgende Zeichen sind im Benutzernamen erlaubt: „a-z“, „A-Z“, „0-9“ und „_.@-“",
     "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
     "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
diff --git a/lib/l10n/el.js b/lib/l10n/el.js
index ee9ad8efd42..bfe49afdcc4 100644
--- a/lib/l10n/el.js
+++ b/lib/l10n/el.js
@@ -109,6 +109,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν ήταν δυνατό να εντοπίσει την πηγή το σύστημα διαμοιρασμού για το %s ",
     "Sharing %s failed, because the file could not be found in the file cache" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αρχείο δεν βρέθηκε στην προσωρινή αποθήκευση αρχείων",
     "Could not find category \"%s\"" : "Αδυναμία εύρεσης κατηγορίας \"%s\"",
+    "Apps" : "Εφαρμογές",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Μόνο οι παρακάτων χαρακτήρες επιτρέπονται σε ένα όνομα χρήστη: \"a-z\", \"A-Z\", \"0-9\" και \"_.@-\"",
     "A valid username must be provided" : "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
     "A valid password must be provided" : "Πρέπει να δοθεί έγκυρο συνθηματικό",
diff --git a/lib/l10n/el.json b/lib/l10n/el.json
index d0235598f7e..1a9f884d322 100644
--- a/lib/l10n/el.json
+++ b/lib/l10n/el.json
@@ -107,6 +107,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν ήταν δυνατό να εντοπίσει την πηγή το σύστημα διαμοιρασμού για το %s ",
     "Sharing %s failed, because the file could not be found in the file cache" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αρχείο δεν βρέθηκε στην προσωρινή αποθήκευση αρχείων",
     "Could not find category \"%s\"" : "Αδυναμία εύρεσης κατηγορίας \"%s\"",
+    "Apps" : "Εφαρμογές",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Μόνο οι παρακάτων χαρακτήρες επιτρέπονται σε ένα όνομα χρήστη: \"a-z\", \"A-Z\", \"0-9\" και \"_.@-\"",
     "A valid username must be provided" : "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
     "A valid password must be provided" : "Πρέπει να δοθεί έγκυρο συνθηματικό",
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
index 0e252700f5a..c6f2c724a69 100644
--- a/lib/l10n/en_GB.js
+++ b/lib/l10n/en_GB.js
@@ -106,6 +106,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Sharing %s failed, because the sharing backend for %s could not find its source",
     "Sharing %s failed, because the file could not be found in the file cache" : "Sharing %s failed, because the file could not be found in the file cache",
     "Could not find category \"%s\"" : "Could not find category \"%s\"",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "A valid username must be provided",
     "A valid password must be provided" : "A valid password must be provided",
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
index 9c57df59762..0d26da686f5 100644
--- a/lib/l10n/en_GB.json
+++ b/lib/l10n/en_GB.json
@@ -104,6 +104,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Sharing %s failed, because the sharing backend for %s could not find its source",
     "Sharing %s failed, because the file could not be found in the file cache" : "Sharing %s failed, because the file could not be found in the file cache",
     "Could not find category \"%s\"" : "Could not find category \"%s\"",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "A valid username must be provided",
     "A valid password must be provided" : "A valid password must be provided",
diff --git a/lib/l10n/eo.js b/lib/l10n/eo.js
index df94b174599..08c656fc70a 100644
--- a/lib/l10n/eo.js
+++ b/lib/l10n/eo.js
@@ -58,6 +58,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s is the original sharer" : "Kunhavigo de %s malsukcesis, ĉar la uzanto %s estas la origina kunhaviginto",
     "Sharing %s failed, because resharing is not allowed" : "Kunhavigo de %s malsukcesis, ĉar rekunhavigo ne permesatas",
     "Could not find category \"%s\"" : "Ne troviĝis kategorio “%s”",
+    "Apps" : "Aplikaĵoj",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Nur la jenaj signoj permesatas en uzantonomo: «a-z», «A-Z», «0-9» kaj «_.@-»",
     "A valid username must be provided" : "Valida uzantonomo devas proviziĝi",
     "A valid password must be provided" : "Valida pasvorto devas proviziĝi",
diff --git a/lib/l10n/eo.json b/lib/l10n/eo.json
index 8140c421d57..c43e3c7f8fd 100644
--- a/lib/l10n/eo.json
+++ b/lib/l10n/eo.json
@@ -56,6 +56,7 @@
     "Sharing %s failed, because the user %s is the original sharer" : "Kunhavigo de %s malsukcesis, ĉar la uzanto %s estas la origina kunhaviginto",
     "Sharing %s failed, because resharing is not allowed" : "Kunhavigo de %s malsukcesis, ĉar rekunhavigo ne permesatas",
     "Could not find category \"%s\"" : "Ne troviĝis kategorio “%s”",
+    "Apps" : "Aplikaĵoj",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Nur la jenaj signoj permesatas en uzantonomo: «a-z», «A-Z», «0-9» kaj «_.@-»",
     "A valid username must be provided" : "Valida uzantonomo devas proviziĝi",
     "A valid password must be provided" : "Valida pasvorto devas proviziĝi",
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index 3f1d751fc1e..21360d673f4 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Se ha fallado al compartir %s porque el motor compartido para %s podría no encontrar su origen",
     "Sharing %s failed, because the file could not be found in the file cache" : "Se ha fallado al compartir %s, ya que el archivo no pudo ser encontrado en el cache de archivo",
     "Could not find category \"%s\"" : "No puede encontrar la categoría \"%s\"",
+    "Apps" : "Aplicaciones",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Solo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
     "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index 75b8060b819..185b178baa8 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Se ha fallado al compartir %s porque el motor compartido para %s podría no encontrar su origen",
     "Sharing %s failed, because the file could not be found in the file cache" : "Se ha fallado al compartir %s, ya que el archivo no pudo ser encontrado en el cache de archivo",
     "Could not find category \"%s\"" : "No puede encontrar la categoría \"%s\"",
+    "Apps" : "Aplicaciones",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Solo los siguientes caracteres están permitidos en un nombre de usuario: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
     "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
diff --git a/lib/l10n/es_AR.js b/lib/l10n/es_AR.js
index 572933980cb..58c5f473851 100644
--- a/lib/l10n/es_AR.js
+++ b/lib/l10n/es_AR.js
@@ -46,6 +46,7 @@ OC.L10N.register(
     "Set an admin password." : "Configurar una contraseña de administrador.",
     "%s shared »%s« with you" : "%s compartió \"%s\" con vos",
     "Could not find category \"%s\"" : "No fue posible encontrar la categoría \"%s\"",
+    "Apps" : "Apps",
     "A valid username must be provided" : "Debe ingresar un nombre de usuario válido",
     "A valid password must be provided" : "Debe ingresar una contraseña válida"
 },
diff --git a/lib/l10n/es_AR.json b/lib/l10n/es_AR.json
index 9a459d7117d..605aecb1ab1 100644
--- a/lib/l10n/es_AR.json
+++ b/lib/l10n/es_AR.json
@@ -44,6 +44,7 @@
     "Set an admin password." : "Configurar una contraseña de administrador.",
     "%s shared »%s« with you" : "%s compartió \"%s\" con vos",
     "Could not find category \"%s\"" : "No fue posible encontrar la categoría \"%s\"",
+    "Apps" : "Apps",
     "A valid username must be provided" : "Debe ingresar un nombre de usuario válido",
     "A valid password must be provided" : "Debe ingresar una contraseña válida"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/lib/l10n/es_MX.js b/lib/l10n/es_MX.js
index 253b5fce3ab..b9cbf96c7af 100644
--- a/lib/l10n/es_MX.js
+++ b/lib/l10n/es_MX.js
@@ -52,6 +52,7 @@ OC.L10N.register(
     "Set an admin password." : "Configurar la contraseña del administrador.",
     "%s shared »%s« with you" : "%s ha compartido  »%s« contigo",
     "Could not find category \"%s\"" : "No puede encontrar la categoria \"%s\"",
+    "Apps" : "Aplicaciones",
     "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
     "A valid password must be provided" : "Se debe proporcionar una contraseña válida"
 },
diff --git a/lib/l10n/es_MX.json b/lib/l10n/es_MX.json
index 0bd876d2e70..53db7b10151 100644
--- a/lib/l10n/es_MX.json
+++ b/lib/l10n/es_MX.json
@@ -50,6 +50,7 @@
     "Set an admin password." : "Configurar la contraseña del administrador.",
     "%s shared »%s« with you" : "%s ha compartido  »%s« contigo",
     "Could not find category \"%s\"" : "No puede encontrar la categoria \"%s\"",
+    "Apps" : "Aplicaciones",
     "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
     "A valid password must be provided" : "Se debe proporcionar una contraseña válida"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js
index 9ab86b3a415..c821776dfe9 100644
--- a/lib/l10n/et_EE.js
+++ b/lib/l10n/et_EE.js
@@ -93,6 +93,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s jagamine ebaõnnestus, kuna jagamise tagarakend ei suutnud leida %s jaoks lähteallikat",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s jagamine ebaõnnestus, kuna faili ei suudetud leida failide puhvrist",
     "Could not find category \"%s\"" : "Ei leia kategooriat \"%s\"",
+    "Apps" : "Rakendused",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Kasutajanimes on lubatud ainult järgnevad tähemärgid: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\"",
     "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus",
     "A valid password must be provided" : "Sisesta nõuetele vastav parool",
diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json
index acbb36fe431..9ab7cd7e2ac 100644
--- a/lib/l10n/et_EE.json
+++ b/lib/l10n/et_EE.json
@@ -91,6 +91,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s jagamine ebaõnnestus, kuna jagamise tagarakend ei suutnud leida %s jaoks lähteallikat",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s jagamine ebaõnnestus, kuna faili ei suudetud leida failide puhvrist",
     "Could not find category \"%s\"" : "Ei leia kategooriat \"%s\"",
+    "Apps" : "Rakendused",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Kasutajanimes on lubatud ainult järgnevad tähemärgid: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\"",
     "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus",
     "A valid password must be provided" : "Sisesta nõuetele vastav parool",
diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js
index 6bf5d8f0315..b15c4796026 100644
--- a/lib/l10n/eu.js
+++ b/lib/l10n/eu.js
@@ -94,6 +94,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s elkarbanatzeak huts egin du, %sren elkarbanaketa motorrak bere iturria aurkitu ezin duelako",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s elkarbanatzeak huts egin du, fitxategia katxean aurkitu ez delako",
     "Could not find category \"%s\"" : "Ezin da \"%s\" kategoria aurkitu",
+    "Apps" : "Aplikazioak",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Bakarrik hurrengo karaketerak onartzen dira erabiltzaile izenean: \"a-z\", \"A-Z\", \"0-9\", eta \"_.@-\"",
     "A valid username must be provided" : "Baliozko erabiltzaile izena eman behar da",
     "A valid password must be provided" : "Baliozko pasahitza eman behar da",
diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json
index 2f9c4033615..a95d3d5cdcf 100644
--- a/lib/l10n/eu.json
+++ b/lib/l10n/eu.json
@@ -92,6 +92,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s elkarbanatzeak huts egin du, %sren elkarbanaketa motorrak bere iturria aurkitu ezin duelako",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s elkarbanatzeak huts egin du, fitxategia katxean aurkitu ez delako",
     "Could not find category \"%s\"" : "Ezin da \"%s\" kategoria aurkitu",
+    "Apps" : "Aplikazioak",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Bakarrik hurrengo karaketerak onartzen dira erabiltzaile izenean: \"a-z\", \"A-Z\", \"0-9\", eta \"_.@-\"",
     "A valid username must be provided" : "Baliozko erabiltzaile izena eman behar da",
     "A valid password must be provided" : "Baliozko pasahitza eman behar da",
diff --git a/lib/l10n/fa.js b/lib/l10n/fa.js
index 8e3a0c6071f..70e368549d5 100644
--- a/lib/l10n/fa.js
+++ b/lib/l10n/fa.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Set an admin password." : "یک رمزعبور برای مدیر تنظیم نمایید.",
     "%s shared »%s« with you" : "%s به اشتراک گذاشته شده است »%s« توسط شما",
     "Could not find category \"%s\"" : "دسته بندی %s یافت نشد",
+    "Apps" : "  برنامه ها",
     "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
     "A valid password must be provided" : "رمز عبور صحیح باید وارد شود"
 },
diff --git a/lib/l10n/fa.json b/lib/l10n/fa.json
index f434f6517af..45ed8d33832 100644
--- a/lib/l10n/fa.json
+++ b/lib/l10n/fa.json
@@ -31,6 +31,7 @@
     "Set an admin password." : "یک رمزعبور برای مدیر تنظیم نمایید.",
     "%s shared »%s« with you" : "%s به اشتراک گذاشته شده است »%s« توسط شما",
     "Could not find category \"%s\"" : "دسته بندی %s یافت نشد",
+    "Apps" : "  برنامه ها",
     "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
     "A valid password must be provided" : "رمز عبور صحیح باید وارد شود"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js
index 6960162e0ab..58f52023cf0 100644
--- a/lib/l10n/fi_FI.js
+++ b/lib/l10n/fi_FI.js
@@ -97,6 +97,7 @@ OC.L10N.register(
     "Sharing %s failed, because resharing is not allowed" : "Kohteen %s jakaminen epäonnistui, koska jakaminen uudelleen ei ole sallittu",
     "Sharing %s failed, because the file could not be found in the file cache" : "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei löytynyt tiedostovälimuistista",
     "Could not find category \"%s\"" : "Luokkaa \"%s\" ei löytynyt",
+    "Apps" : "Sovellukset",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Vain seuraavat merkit ovat sallittuja käyttäjätunnuksessa: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\"",
     "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
     "A valid password must be provided" : "Anna kelvollinen salasana",
diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json
index 7d23189b358..be0eed2a4ba 100644
--- a/lib/l10n/fi_FI.json
+++ b/lib/l10n/fi_FI.json
@@ -95,6 +95,7 @@
     "Sharing %s failed, because resharing is not allowed" : "Kohteen %s jakaminen epäonnistui, koska jakaminen uudelleen ei ole sallittu",
     "Sharing %s failed, because the file could not be found in the file cache" : "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei löytynyt tiedostovälimuistista",
     "Could not find category \"%s\"" : "Luokkaa \"%s\" ei löytynyt",
+    "Apps" : "Sovellukset",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Vain seuraavat merkit ovat sallittuja käyttäjätunnuksessa: \"a-z\", \"A-Z\", \"0-9\" ja \"_.@-\"",
     "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
     "A valid password must be provided" : "Anna kelvollinen salasana",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index d0abd693e0c..a4692c268b4 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -111,6 +111,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Le partage de %s a échoué car la source n'a pas été trouvée pour le partage %s.",
     "Sharing %s failed, because the file could not be found in the file cache" : "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache.",
     "Could not find category \"%s\"" : "Impossible de trouver la catégorie \"%s\"",
+    "Apps" : "Applications",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", et \"_.@-\"",
     "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi",
     "A valid password must be provided" : "Un mot de passe valide doit être saisi",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index d0a90797df9..5ee807080cf 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -109,6 +109,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Le partage de %s a échoué car la source n'a pas été trouvée pour le partage %s.",
     "Sharing %s failed, because the file could not be found in the file cache" : "Le partage de %s a échoué car le fichier n'a pas été trouvé dans les fichiers mis en cache.",
     "Could not find category \"%s\"" : "Impossible de trouver la catégorie \"%s\"",
+    "Apps" : "Applications",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Seuls les caractères suivants sont autorisés dans un nom d'utilisateur : \"a-z\", \"A-Z\", \"0-9\", et \"_.@-\"",
     "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi",
     "A valid password must be provided" : "Un mot de passe valide doit être saisi",
diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js
index bc2afd3f6e5..d3b8952a47b 100644
--- a/lib/l10n/gl.js
+++ b/lib/l10n/gl.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Fallou a compartición de %s, a infraestrutura de compartición para %s non foi quen de atopar a orixe",
     "Sharing %s failed, because the file could not be found in the file cache" : "Fallou a compartición de %s, non foi posíbel atopar o ficheiro na caché de ficheiros",
     "Could not find category \"%s\"" : "Non foi posíbel atopar a categoría «%s»",
+    "Apps" : "Aplicacións",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Só se permiten os seguintes caracteres no nome de usuario: «a-z», «A-Z», «0-9», e «_.@-»",
     "A valid username must be provided" : "Debe fornecer un nome de usuario",
     "A valid password must be provided" : "Debe fornecer un contrasinal",
diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json
index 9607f9fad18..f88b07d3671 100644
--- a/lib/l10n/gl.json
+++ b/lib/l10n/gl.json
@@ -108,6 +108,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Fallou a compartición de %s, a infraestrutura de compartición para %s non foi quen de atopar a orixe",
     "Sharing %s failed, because the file could not be found in the file cache" : "Fallou a compartición de %s, non foi posíbel atopar o ficheiro na caché de ficheiros",
     "Could not find category \"%s\"" : "Non foi posíbel atopar a categoría «%s»",
+    "Apps" : "Aplicacións",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Só se permiten os seguintes caracteres no nome de usuario: «a-z», «A-Z», «0-9», e «_.@-»",
     "A valid username must be provided" : "Debe fornecer un nome de usuario",
     "A valid password must be provided" : "Debe fornecer un contrasinal",
diff --git a/lib/l10n/he.js b/lib/l10n/he.js
index 33a67415541..66acae5b804 100644
--- a/lib/l10n/he.js
+++ b/lib/l10n/he.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Token expired. Please reload page." : "פג תוקף. נא לטעון שוב את הדף.",
     "%s shared »%s« with you" : "%s שיתף/שיתפה איתך את »%s«",
     "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“",
+    "Apps" : "יישומים",
     "A valid username must be provided" : "יש לספק שם משתמש תקני",
     "A valid password must be provided" : "יש לספק ססמה תקנית"
 },
diff --git a/lib/l10n/he.json b/lib/l10n/he.json
index a66c1f252c8..55df638cb11 100644
--- a/lib/l10n/he.json
+++ b/lib/l10n/he.json
@@ -14,6 +14,7 @@
     "Token expired. Please reload page." : "פג תוקף. נא לטעון שוב את הדף.",
     "%s shared »%s« with you" : "%s שיתף/שיתפה איתך את »%s«",
     "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“",
+    "Apps" : "יישומים",
     "A valid username must be provided" : "יש לספק שם משתמש תקני",
     "A valid password must be provided" : "יש לספק ססמה תקנית"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/lib/l10n/hi.js b/lib/l10n/hi.js
index fced66d581c..78defefb3b2 100644
--- a/lib/l10n/hi.js
+++ b/lib/l10n/hi.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Help" : "सहयोग",
     "Personal" : "यक्तिगत",
-    "Users" : "उपयोगकर्ता"
+    "Users" : "उपयोगकर्ता",
+    "Apps" : "Apps"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/hi.json b/lib/l10n/hi.json
index 8a77c13a367..90409d07975 100644
--- a/lib/l10n/hi.json
+++ b/lib/l10n/hi.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Help" : "सहयोग",
     "Personal" : "यक्तिगत",
-    "Users" : "उपयोगकर्ता"
+    "Users" : "उपयोगकर्ता",
+    "Apps" : "Apps"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/hr.js b/lib/l10n/hr.js
index 16ac6ff2821..6c012a8502b 100644
--- a/lib/l10n/hr.js
+++ b/lib/l10n/hr.js
@@ -87,6 +87,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Dijeljenje %s nije uspjelo jer pozadina za %s nije mogla pronaći svoj izvor",
     "Sharing %s failed, because the file could not be found in the file cache" : "Dijeljenje %s nije uspjelo jer u predmemoriji datoteke datoteka nije nađena.",
     "Could not find category \"%s\"" : "Kategorija \"%s\" nije nađena",
+    "Apps" : "Aplikacije",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Samo su sljedeći znakovi dopušteni u korisničkom imenu: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Nužno je navesti ispravno korisničko ime",
     "A valid password must be provided" : "Nužno je navesti ispravnu lozinku",
diff --git a/lib/l10n/hr.json b/lib/l10n/hr.json
index 291e59261ba..50935c14742 100644
--- a/lib/l10n/hr.json
+++ b/lib/l10n/hr.json
@@ -85,6 +85,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Dijeljenje %s nije uspjelo jer pozadina za %s nije mogla pronaći svoj izvor",
     "Sharing %s failed, because the file could not be found in the file cache" : "Dijeljenje %s nije uspjelo jer u predmemoriji datoteke datoteka nije nađena.",
     "Could not find category \"%s\"" : "Kategorija \"%s\" nije nađena",
+    "Apps" : "Aplikacije",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Samo su sljedeći znakovi dopušteni u korisničkom imenu: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Nužno je navesti ispravno korisničko ime",
     "A valid password must be provided" : "Nužno je navesti ispravnu lozinku",
diff --git a/lib/l10n/hu_HU.js b/lib/l10n/hu_HU.js
index e7287ccd5a1..9835654f736 100644
--- a/lib/l10n/hu_HU.js
+++ b/lib/l10n/hu_HU.js
@@ -95,6 +95,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s megosztása nem sikerült, mert %s megosztási alrendszere nem találja",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s megosztása nem sikerült, mert a fájl nem található a gyorsítótárban",
     "Could not find category \"%s\"" : "Ez a kategória nem található: \"%s\"",
+    "Apps" : "Alkalmazások",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "A felhasználónévben csak a következő karakterek fordulhatnak elő: \"a-z\", \"A-Z\", \"0-9\", és \"_.@-\"",
     "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
     "A valid password must be provided" : "Érvényes jelszót kell megadnia",
diff --git a/lib/l10n/hu_HU.json b/lib/l10n/hu_HU.json
index 8620c13e2ac..a01979d295e 100644
--- a/lib/l10n/hu_HU.json
+++ b/lib/l10n/hu_HU.json
@@ -93,6 +93,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s megosztása nem sikerült, mert %s megosztási alrendszere nem találja",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s megosztása nem sikerült, mert a fájl nem található a gyorsítótárban",
     "Could not find category \"%s\"" : "Ez a kategória nem található: \"%s\"",
+    "Apps" : "Alkalmazások",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "A felhasználónévben csak a következő karakterek fordulhatnak elő: \"a-z\", \"A-Z\", \"0-9\", és \"_.@-\"",
     "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
     "A valid password must be provided" : "Érvényes jelszót kell megadnia",
diff --git a/lib/l10n/ia.js b/lib/l10n/ia.js
index f24e9b44828..d251c690053 100644
--- a/lib/l10n/ia.js
+++ b/lib/l10n/ia.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "last year" : "ultime anno",
     "seconds ago" : "secundas passate",
     "web services under your control" : "servicios web sub tu controlo",
-    "For the best results, please consider using a GNU/Linux server instead." : "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux."
+    "For the best results, please consider using a GNU/Linux server instead." : "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.",
+    "Apps" : "Applicationes"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ia.json b/lib/l10n/ia.json
index 21b6e68af21..e642869a055 100644
--- a/lib/l10n/ia.json
+++ b/lib/l10n/ia.json
@@ -11,6 +11,7 @@
     "last year" : "ultime anno",
     "seconds ago" : "secundas passate",
     "web services under your control" : "servicios web sub tu controlo",
-    "For the best results, please consider using a GNU/Linux server instead." : "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux."
+    "For the best results, please consider using a GNU/Linux server instead." : "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.",
+    "Apps" : "Applicationes"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
index 0de6a4124fb..7298ed8d13c 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Berbagi %s gagal, karena backend berbagi untuk %s tidak menemukan sumbernya",
     "Sharing %s failed, because the file could not be found in the file cache" : "Gagal berbagi %s, karena berkas tidak ditemukan di berkas cache",
     "Could not find category \"%s\"" : "Tidak menemukan kategori \"%s\"",
+    "Apps" : "Aplikasi",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Hanya karakter berikut yang diizinkan dalam nama pengguna: \"a-z\", \"A-Z\", \"0-9\", dan \"_.@-\"",
     "A valid username must be provided" : "Tuliskan nama pengguna yang valid",
     "A valid password must be provided" : "Tuliskan sandi yang valid",
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index e1b3a9f93b0..b44f23d776d 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Berbagi %s gagal, karena backend berbagi untuk %s tidak menemukan sumbernya",
     "Sharing %s failed, because the file could not be found in the file cache" : "Gagal berbagi %s, karena berkas tidak ditemukan di berkas cache",
     "Could not find category \"%s\"" : "Tidak menemukan kategori \"%s\"",
+    "Apps" : "Aplikasi",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Hanya karakter berikut yang diizinkan dalam nama pengguna: \"a-z\", \"A-Z\", \"0-9\", dan \"_.@-\"",
     "A valid username must be provided" : "Tuliskan nama pengguna yang valid",
     "A valid password must be provided" : "Tuliskan sandi yang valid",
diff --git a/lib/l10n/is.js b/lib/l10n/is.js
index 7661ee829fb..d2c3602e070 100644
--- a/lib/l10n/is.js
+++ b/lib/l10n/is.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Application is not enabled" : "Forrit ekki virkt",
     "Authentication error" : "Villa við auðkenningu",
     "Token expired. Please reload page." : "Auðkenning útrunnin. Vinsamlegast skráðu þig aftur inn.",
-    "Could not find category \"%s\"" : "Fann ekki flokkinn \"%s\""
+    "Could not find category \"%s\"" : "Fann ekki flokkinn \"%s\"",
+    "Apps" : "Forrit"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/lib/l10n/is.json b/lib/l10n/is.json
index 81fec382eb3..100409a868b 100644
--- a/lib/l10n/is.json
+++ b/lib/l10n/is.json
@@ -14,6 +14,7 @@
     "Application is not enabled" : "Forrit ekki virkt",
     "Authentication error" : "Villa við auðkenningu",
     "Token expired. Please reload page." : "Auðkenning útrunnin. Vinsamlegast skráðu þig aftur inn.",
-    "Could not find category \"%s\"" : "Fann ekki flokkinn \"%s\""
+    "Could not find category \"%s\"" : "Fann ekki flokkinn \"%s\"",
+    "Apps" : "Forrit"
 },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
index d0cf725013b..229c210b604 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Condivisione di %s non riuscita, poiché il motore di condivisione per %s non riesce a trovare la sua fonte",
     "Sharing %s failed, because the file could not be found in the file cache" : "Condivisione di %s non riuscita, poiché il file non è stato trovato nella cache",
     "Could not find category \"%s\"" : "Impossibile trovare la categoria \"%s\"",
+    "Apps" : "Applicazioni",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Solo i seguenti caratteri sono ammessi in un nome utente: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
     "A valid username must be provided" : "Deve essere fornito un nome utente valido",
     "A valid password must be provided" : "Deve essere fornita una password valida",
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index 81038c0e425..3e8a489b6a4 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Condivisione di %s non riuscita, poiché il motore di condivisione per %s non riesce a trovare la sua fonte",
     "Sharing %s failed, because the file could not be found in the file cache" : "Condivisione di %s non riuscita, poiché il file non è stato trovato nella cache",
     "Could not find category \"%s\"" : "Impossibile trovare la categoria \"%s\"",
+    "Apps" : "Applicazioni",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Solo i seguenti caratteri sono ammessi in un nome utente: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
     "A valid username must be provided" : "Deve essere fornito un nome utente valido",
     "A valid password must be provided" : "Deve essere fornita una password valida",
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index 20ad385491c..9154d1fbc4a 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s の共有に失敗しました。%s のバックエンド共有に必要なソースが見つかりませんでした。",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s の共有に失敗しました。ファイルキャッシュにファイルがありませんでした。",
     "Could not find category \"%s\"" : "カテゴリ \"%s\" が見つかりませんでした",
+    "Apps" : "アプリ",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "ユーザー名で利用できる文字列は、次のものです： \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "有効なユーザー名を指定する必要があります",
     "A valid password must be provided" : "有効なパスワードを指定する必要があります",
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index 0bb7269a52e..f88b11ad17e 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -108,6 +108,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s の共有に失敗しました。%s のバックエンド共有に必要なソースが見つかりませんでした。",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s の共有に失敗しました。ファイルキャッシュにファイルがありませんでした。",
     "Could not find category \"%s\"" : "カテゴリ \"%s\" が見つかりませんでした",
+    "Apps" : "アプリ",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "ユーザー名で利用できる文字列は、次のものです： \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "有効なユーザー名を指定する必要があります",
     "A valid password must be provided" : "有効なパスワードを指定する必要があります",
diff --git a/lib/l10n/ka_GE.js b/lib/l10n/ka_GE.js
index 1259cf83dbb..17833d8e0e3 100644
--- a/lib/l10n/ka_GE.js
+++ b/lib/l10n/ka_GE.js
@@ -26,6 +26,7 @@ OC.L10N.register(
     "Set an admin username." : "დააყენეთ ადმინისტრატორის სახელი.",
     "Set an admin password." : "დააყენეთ ადმინისტრატორის პაროლი.",
     "Could not find category \"%s\"" : "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა",
+    "Apps" : "აპლიკაციები",
     "A valid username must be provided" : "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
     "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი"
 },
diff --git a/lib/l10n/ka_GE.json b/lib/l10n/ka_GE.json
index d32642f460b..3a776d12a8c 100644
--- a/lib/l10n/ka_GE.json
+++ b/lib/l10n/ka_GE.json
@@ -24,6 +24,7 @@
     "Set an admin username." : "დააყენეთ ადმინისტრატორის სახელი.",
     "Set an admin password." : "დააყენეთ ადმინისტრატორის პაროლი.",
     "Could not find category \"%s\"" : "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა",
+    "Apps" : "აპლიკაციები",
     "A valid username must be provided" : "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
     "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/lib/l10n/km.js b/lib/l10n/km.js
index ad68233cf62..f6ba8acf62e 100644
--- a/lib/l10n/km.js
+++ b/lib/l10n/km.js
@@ -31,6 +31,7 @@ OC.L10N.register(
     "Set an admin username." : "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្រង។",
     "Set an admin password." : "កំណត់​ពាក្យ​សម្ងាត់​អ្នក​គ្រប់គ្រង។",
     "Could not find category \"%s\"" : "រក​មិន​ឃើញ​ចំណាត់​ក្រុម \"%s\"",
+    "Apps" : "កម្មវិធី",
     "A valid username must be provided" : "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
     "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
 },
diff --git a/lib/l10n/km.json b/lib/l10n/km.json
index 9133d012c1e..b5cbf81af33 100644
--- a/lib/l10n/km.json
+++ b/lib/l10n/km.json
@@ -29,6 +29,7 @@
     "Set an admin username." : "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្រង។",
     "Set an admin password." : "កំណត់​ពាក្យ​សម្ងាត់​អ្នក​គ្រប់គ្រង។",
     "Could not find category \"%s\"" : "រក​មិន​ឃើញ​ចំណាត់​ក្រុម \"%s\"",
+    "Apps" : "កម្មវិធី",
     "A valid username must be provided" : "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
     "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/lib/l10n/kn.js b/lib/l10n/kn.js
index 45814e840b7..52e00891931 100644
--- a/lib/l10n/kn.js
+++ b/lib/l10n/kn.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Unknown filetype" : "ಅಪರಿಚಿತ ಕಡತ ಮಾದರಿ",
     "Invalid image" : "ಅಸಾಮರ್ಥ್ಯ ಚಿತ್ರ",
     "Authentication error" : "ದೃಢೀಕರಣ ದೋಷ",
+    "Apps" : "ಕಾರ್ಯಕ್ರಮಗಳು",
     "A valid username must be provided" : "ಮಾನ್ಯ ಬಳಕೆದಾರ ಹೆಸರು ಒದಗಿಸಬೇಕಾಗುತ್ತದೆ",
     "A valid password must be provided" : "ಸರಿಯಾದ ಬಳಕೆದಾರ ಗುಪ್ತಪದ ಒದಗಿಸಬೇಕಾಗಿದೆ"
 },
diff --git a/lib/l10n/kn.json b/lib/l10n/kn.json
index b7e51f7911b..9260fa8731b 100644
--- a/lib/l10n/kn.json
+++ b/lib/l10n/kn.json
@@ -7,6 +7,7 @@
     "Unknown filetype" : "ಅಪರಿಚಿತ ಕಡತ ಮಾದರಿ",
     "Invalid image" : "ಅಸಾಮರ್ಥ್ಯ ಚಿತ್ರ",
     "Authentication error" : "ದೃಢೀಕರಣ ದೋಷ",
+    "Apps" : "ಕಾರ್ಯಕ್ರಮಗಳು",
     "A valid username must be provided" : "ಮಾನ್ಯ ಬಳಕೆದಾರ ಹೆಸರು ಒದಗಿಸಬೇಕಾಗುತ್ತದೆ",
     "A valid password must be provided" : "ಸರಿಯಾದ ಬಳಕೆದಾರ ಗುಪ್ತಪದ ಒದಗಿಸಬೇಕಾಗಿದೆ"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js
index bb143bdd527..f67ca37b5e0 100644
--- a/lib/l10n/ko.js
+++ b/lib/l10n/ko.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s을(를) 공유할 수 없습니다. %s의 공유 백엔드에서 원본 파일을 찾을 수 없습니다",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s을(를) 공유할 수 없습니다. 파일 캐시에서 찾을 수 없습니다",
     "Could not find category \"%s\"" : "분류 \"%s\"을(를) 찾을 수 없습니다.",
+    "Apps" : "앱",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "사용자 이름에는 다음과 같은 문자만 사용할 수 있습니다: \"a-z\", \"A-Z\", \"0-9\", \"_.@-\"",
     "A valid username must be provided" : "올바른 사용자 이름을 입력해야 합니다",
     "A valid password must be provided" : "올바른 암호를 입력해야 합니다",
diff --git a/lib/l10n/ko.json b/lib/l10n/ko.json
index 8fea07402ca..bf8069bf2d3 100644
--- a/lib/l10n/ko.json
+++ b/lib/l10n/ko.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s을(를) 공유할 수 없습니다. %s의 공유 백엔드에서 원본 파일을 찾을 수 없습니다",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s을(를) 공유할 수 없습니다. 파일 캐시에서 찾을 수 없습니다",
     "Could not find category \"%s\"" : "분류 \"%s\"을(를) 찾을 수 없습니다.",
+    "Apps" : "앱",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "사용자 이름에는 다음과 같은 문자만 사용할 수 있습니다: \"a-z\", \"A-Z\", \"0-9\", \"_.@-\"",
     "A valid username must be provided" : "올바른 사용자 이름을 입력해야 합니다",
     "A valid password must be provided" : "올바른 암호를 입력해야 합니다",
diff --git a/lib/l10n/ku_IQ.js b/lib/l10n/ku_IQ.js
index b4c0566c13f..74bda86a316 100644
--- a/lib/l10n/ku_IQ.js
+++ b/lib/l10n/ku_IQ.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Help" : "یارمەتی",
     "Users" : "به‌كارهێنه‌ر",
     "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
-    "web services under your control" : "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
+    "web services under your control" : "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
+    "Apps" : "به‌رنامه‌كان"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ku_IQ.json b/lib/l10n/ku_IQ.json
index 119c33253f5..456018c1e54 100644
--- a/lib/l10n/ku_IQ.json
+++ b/lib/l10n/ku_IQ.json
@@ -2,6 +2,7 @@
     "Help" : "یارمەتی",
     "Users" : "به‌كارهێنه‌ر",
     "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
-    "web services under your control" : "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
+    "web services under your control" : "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
+    "Apps" : "به‌رنامه‌كان"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/lb.js b/lib/l10n/lb.js
index 0c884f98eea..3d7ae1a5aff 100644
--- a/lib/l10n/lb.js
+++ b/lib/l10n/lb.js
@@ -24,6 +24,7 @@ OC.L10N.register(
     "web services under your control" : "Web-Servicer ënnert denger Kontroll",
     "Authentication error" : "Authentifikatioun's Fehler",
     "%s shared »%s« with you" : "Den/D' %s huet »%s« mat dir gedeelt",
+    "Apps" : "Applikatiounen",
     "Data directory (%s) is invalid" : "Daten-Dossier (%s) ass ongëlteg"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/lb.json b/lib/l10n/lb.json
index 08057c7de24..8cd223acd9b 100644
--- a/lib/l10n/lb.json
+++ b/lib/l10n/lb.json
@@ -22,6 +22,7 @@
     "web services under your control" : "Web-Servicer ënnert denger Kontroll",
     "Authentication error" : "Authentifikatioun's Fehler",
     "%s shared »%s« with you" : "Den/D' %s huet »%s« mat dir gedeelt",
+    "Apps" : "Applikatiounen",
     "Data directory (%s) is invalid" : "Daten-Dossier (%s) ass ongëlteg"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/lt_LT.js b/lib/l10n/lt_LT.js
index e37141e9bef..47c5e4adba5 100644
--- a/lib/l10n/lt_LT.js
+++ b/lib/l10n/lt_LT.js
@@ -46,6 +46,7 @@ OC.L10N.register(
     "Set an admin password." : "Nustatyti administratoriaus slaptažodį.",
     "%s shared »%s« with you" : "%s pasidalino »%s« su tavimi",
     "Could not find category \"%s\"" : "Nepavyko rasti kategorijos „%s“",
+    "Apps" : "Programos",
     "A valid username must be provided" : "Vartotojo vardas turi būti tinkamas",
     "A valid password must be provided" : "Slaptažodis turi būti tinkamas"
 },
diff --git a/lib/l10n/lt_LT.json b/lib/l10n/lt_LT.json
index c823af258cd..ab7eabe5d22 100644
--- a/lib/l10n/lt_LT.json
+++ b/lib/l10n/lt_LT.json
@@ -44,6 +44,7 @@
     "Set an admin password." : "Nustatyti administratoriaus slaptažodį.",
     "%s shared »%s« with you" : "%s pasidalino »%s« su tavimi",
     "Could not find category \"%s\"" : "Nepavyko rasti kategorijos „%s“",
+    "Apps" : "Programos",
     "A valid username must be provided" : "Vartotojo vardas turi būti tinkamas",
     "A valid password must be provided" : "Slaptažodis turi būti tinkamas"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/lib/l10n/lv.js b/lib/l10n/lv.js
index 5505d0cd7cc..df984f830a8 100644
--- a/lib/l10n/lv.js
+++ b/lib/l10n/lv.js
@@ -31,6 +31,7 @@ OC.L10N.register(
     "Set an admin password." : "Iestatiet administratora paroli.",
     "%s shared »%s« with you" : "%s kopīgots »%s« ar jums",
     "Could not find category \"%s\"" : "Nevarēja atrast kategoriju “%s”",
+    "Apps" : "Lietotnes",
     "A valid username must be provided" : "Jānorāda derīgs lietotājvārds",
     "A valid password must be provided" : "Jānorāda derīga parole",
     "The username is already being used" : "Šāds lietotājvārds jau tiek izmantots"
diff --git a/lib/l10n/lv.json b/lib/l10n/lv.json
index 13b38a73a2c..0e0f2b072f1 100644
--- a/lib/l10n/lv.json
+++ b/lib/l10n/lv.json
@@ -29,6 +29,7 @@
     "Set an admin password." : "Iestatiet administratora paroli.",
     "%s shared »%s« with you" : "%s kopīgots »%s« ar jums",
     "Could not find category \"%s\"" : "Nevarēja atrast kategoriju “%s”",
+    "Apps" : "Lietotnes",
     "A valid username must be provided" : "Jānorāda derīgs lietotājvārds",
     "A valid password must be provided" : "Jānorāda derīga parole",
     "The username is already being used" : "Šāds lietotājvārds jau tiek izmantots"
diff --git a/lib/l10n/mk.js b/lib/l10n/mk.js
index 197a25c2172..881388b4eac 100644
--- a/lib/l10n/mk.js
+++ b/lib/l10n/mk.js
@@ -29,6 +29,7 @@ OC.L10N.register(
     "Set an admin password." : "Постави администраторска лозинка.",
     "%s shared »%s« with you" : "%s споделено »%s« со вас",
     "Could not find category \"%s\"" : "Не можам да најдам категорија „%s“",
+    "Apps" : "Аппликации",
     "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ",
     "A valid password must be provided" : "Мора да се обезбеди валидна лозинка",
     "The username is already being used" : "Корисничкото име е веќе во употреба"
diff --git a/lib/l10n/mk.json b/lib/l10n/mk.json
index 2b396044a21..7dbfab7f01f 100644
--- a/lib/l10n/mk.json
+++ b/lib/l10n/mk.json
@@ -27,6 +27,7 @@
     "Set an admin password." : "Постави администраторска лозинка.",
     "%s shared »%s« with you" : "%s споделено »%s« со вас",
     "Could not find category \"%s\"" : "Не можам да најдам категорија „%s“",
+    "Apps" : "Аппликации",
     "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ",
     "A valid password must be provided" : "Мора да се обезбеди валидна лозинка",
     "The username is already being used" : "Корисничкото име е веќе во употреба"
diff --git a/lib/l10n/ms_MY.js b/lib/l10n/ms_MY.js
index e6a3fbb1edc..8f73b0f78ab 100644
--- a/lib/l10n/ms_MY.js
+++ b/lib/l10n/ms_MY.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "Users" : "Pengguna",
     "Admin" : "Admin",
     "web services under your control" : "Perkhidmatan web di bawah kawalan anda",
-    "Authentication error" : "Ralat pengesahan"
+    "Authentication error" : "Ralat pengesahan",
+    "Apps" : "Aplikasi"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/ms_MY.json b/lib/l10n/ms_MY.json
index 6abf66423ee..f0c3fc7f936 100644
--- a/lib/l10n/ms_MY.json
+++ b/lib/l10n/ms_MY.json
@@ -4,6 +4,7 @@
     "Users" : "Pengguna",
     "Admin" : "Admin",
     "web services under your control" : "Perkhidmatan web di bawah kawalan anda",
-    "Authentication error" : "Ralat pengesahan"
+    "Authentication error" : "Ralat pengesahan",
+    "Apps" : "Aplikasi"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/my_MM.js b/lib/l10n/my_MM.js
index b20399c6d56..02dbac8d038 100644
--- a/lib/l10n/my_MM.js
+++ b/lib/l10n/my_MM.js
@@ -11,6 +11,7 @@ OC.L10N.register(
     "seconds ago" : "စက္ကန့်အနည်းငယ်က",
     "web services under your control" : "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
     "Authentication error" : "ခွင့်ပြုချက်မအောင်မြင်",
-    "Could not find category \"%s\"" : "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ"
+    "Could not find category \"%s\"" : "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ",
+    "Apps" : "Apps"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/my_MM.json b/lib/l10n/my_MM.json
index 0a4d0370a36..c04d1b0f0a6 100644
--- a/lib/l10n/my_MM.json
+++ b/lib/l10n/my_MM.json
@@ -9,6 +9,7 @@
     "seconds ago" : "စက္ကန့်အနည်းငယ်က",
     "web services under your control" : "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
     "Authentication error" : "ခွင့်ပြုချက်မအောင်မြင်",
-    "Could not find category \"%s\"" : "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ"
+    "Could not find category \"%s\"" : "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ",
+    "Apps" : "Apps"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js
index af629c5ef34..e8d2de3c1cf 100644
--- a/lib/l10n/nb_NO.js
+++ b/lib/l10n/nb_NO.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Deling av %s feilet, fordi delings-serveren for %s ikke kunne finne kilden",
     "Sharing %s failed, because the file could not be found in the file cache" : "Deling av %s feilet, fordi filen ikke ble funnet i fil-mellomlageret",
     "Could not find category \"%s\"" : "Kunne ikke finne kategori \"%s\"",
+    "Apps" : "Apper",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Bare disse tegnene tillates i et brukernavn: \"a-z\", \"A-Z\", \"0-9\" og \"_.@-\"",
     "A valid username must be provided" : "Oppgi et gyldig brukernavn",
     "A valid password must be provided" : "Oppgi et gyldig passord",
diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json
index 29f9e7f1365..2edd6a933ea 100644
--- a/lib/l10n/nb_NO.json
+++ b/lib/l10n/nb_NO.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Deling av %s feilet, fordi delings-serveren for %s ikke kunne finne kilden",
     "Sharing %s failed, because the file could not be found in the file cache" : "Deling av %s feilet, fordi filen ikke ble funnet i fil-mellomlageret",
     "Could not find category \"%s\"" : "Kunne ikke finne kategori \"%s\"",
+    "Apps" : "Apper",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Bare disse tegnene tillates i et brukernavn: \"a-z\", \"A-Z\", \"0-9\" og \"_.@-\"",
     "A valid username must be provided" : "Oppgi et gyldig brukernavn",
     "A valid password must be provided" : "Oppgi et gyldig passord",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 5abae786d34..eee35c9ca6c 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Delen van %s is mislukt, omdat de share-backend voor %s de bron niet kon vinden",
     "Sharing %s failed, because the file could not be found in the file cache" : "Delen van %s is mislukt, omdat het bestand niet in de bestandscache kon worden gevonden",
     "Could not find category \"%s\"" : "Kon categorie \"%s\" niet vinden",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Alleen de volgende tekens zijn toegestaan in een gebruikersnaam: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
     "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 4e4eaf8b52a..be3e0fe73bd 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Delen van %s is mislukt, omdat de share-backend voor %s de bron niet kon vinden",
     "Sharing %s failed, because the file could not be found in the file cache" : "Delen van %s is mislukt, omdat het bestand niet in de bestandscache kon worden gevonden",
     "Could not find category \"%s\"" : "Kon categorie \"%s\" niet vinden",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Alleen de volgende tekens zijn toegestaan in een gebruikersnaam: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
     "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven",
diff --git a/lib/l10n/nn_NO.js b/lib/l10n/nn_NO.js
index 9761935c435..c0675f2574a 100644
--- a/lib/l10n/nn_NO.js
+++ b/lib/l10n/nn_NO.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "web services under your control" : "Vev tjenester under din kontroll",
     "Authentication error" : "Feil i autentisering",
     "%s shared »%s« with you" : "%s delte «%s» med deg",
+    "Apps" : "Program",
     "A valid username must be provided" : "Du må oppgje eit gyldig brukarnamn",
     "A valid password must be provided" : "Du må oppgje eit gyldig passord"
 },
diff --git a/lib/l10n/nn_NO.json b/lib/l10n/nn_NO.json
index f1186cb1056..52b7dd52041 100644
--- a/lib/l10n/nn_NO.json
+++ b/lib/l10n/nn_NO.json
@@ -13,6 +13,7 @@
     "web services under your control" : "Vev tjenester under din kontroll",
     "Authentication error" : "Feil i autentisering",
     "%s shared »%s« with you" : "%s delte «%s» med deg",
+    "Apps" : "Program",
     "A valid username must be provided" : "Du må oppgje eit gyldig brukarnamn",
     "A valid password must be provided" : "Du må oppgje eit gyldig passord"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/lib/l10n/oc.js b/lib/l10n/oc.js
index 871b25ebfe5..c61eaae5f22 100644
--- a/lib/l10n/oc.js
+++ b/lib/l10n/oc.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "seconds ago" : "segonda a",
     "web services under your control" : "Services web jos ton contraròtle",
     "Authentication error" : "Error d'autentificacion",
+    "Apps" : "Aplicacions",
     "A valid username must be provided" : "Un nom d'utilizaire valid deu èsser picat",
     "A valid password must be provided" : "Un senhal valid deu èsser picat",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La rason es probablament l'utilizacion d'un escondedor / accelerador tal coma Zend OPcache o eAccelerator."
diff --git a/lib/l10n/oc.json b/lib/l10n/oc.json
index b892cf9c38a..ea9f41c419d 100644
--- a/lib/l10n/oc.json
+++ b/lib/l10n/oc.json
@@ -12,6 +12,7 @@
     "seconds ago" : "segonda a",
     "web services under your control" : "Services web jos ton contraròtle",
     "Authentication error" : "Error d'autentificacion",
+    "Apps" : "Aplicacions",
     "A valid username must be provided" : "Un nom d'utilizaire valid deu èsser picat",
     "A valid password must be provided" : "Un senhal valid deu èsser picat",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La rason es probablament l'utilizacion d'un escondedor / accelerador tal coma Zend OPcache o eAccelerator."
diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js
index 611a0b4c6f1..9eff16519e2 100644
--- a/lib/l10n/pl.js
+++ b/lib/l10n/pl.js
@@ -91,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Współdzielenie %s nie powiodło się, ponieważ zaplecze współdzielenia dla %s nie mogło znaleźć jego źródła",
     "Sharing %s failed, because the file could not be found in the file cache" : "Współdzielenie %s nie powiodło się, ponieważ plik nie może zostać odnaleziony w buforze plików",
     "Could not find category \"%s\"" : "Nie można odnaleźć kategorii \"%s\"",
+    "Apps" : "Aplikacje",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "W nazwach użytkowników dozwolone są wyłącznie następujące znaki: \"a-z\", \"A-Z\", \"0-9\", oraz \"_.@-\"",
     "A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika",
     "A valid password must be provided" : "Należy podać prawidłowe hasło",
diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json
index 2e96f414a66..a9db4e4f50c 100644
--- a/lib/l10n/pl.json
+++ b/lib/l10n/pl.json
@@ -89,6 +89,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Współdzielenie %s nie powiodło się, ponieważ zaplecze współdzielenia dla %s nie mogło znaleźć jego źródła",
     "Sharing %s failed, because the file could not be found in the file cache" : "Współdzielenie %s nie powiodło się, ponieważ plik nie może zostać odnaleziony w buforze plików",
     "Could not find category \"%s\"" : "Nie można odnaleźć kategorii \"%s\"",
+    "Apps" : "Aplikacje",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "W nazwach użytkowników dozwolone są wyłącznie następujące znaki: \"a-z\", \"A-Z\", \"0-9\", oraz \"_.@-\"",
     "A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika",
     "A valid password must be provided" : "Należy podać prawidłowe hasło",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index 402a7cbc51a..5289b4f8002 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Compartilhamento %s falhou, porque a infra-estrutura de compartilhamento para %s não conseguiu encontrar a sua fonte",
     "Sharing %s failed, because the file could not be found in the file cache" : "Compartilhamento %s falhou, porque o arquivo não pôde ser encontrado no cache de arquivos",
     "Could not find category \"%s\"" : "Impossível localizar categoria \"%s\"",
+    "Apps" : "Aplicações",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Somente os seguintes caracteres são permitidos no nome do usuário: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
     "A valid username must be provided" : "Forneça um nome de usuário válido",
     "A valid password must be provided" : "Forneça uma senha válida",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index 255272b8cb8..62a6d86b09e 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Compartilhamento %s falhou, porque a infra-estrutura de compartilhamento para %s não conseguiu encontrar a sua fonte",
     "Sharing %s failed, because the file could not be found in the file cache" : "Compartilhamento %s falhou, porque o arquivo não pôde ser encontrado no cache de arquivos",
     "Could not find category \"%s\"" : "Impossível localizar categoria \"%s\"",
+    "Apps" : "Aplicações",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Somente os seguintes caracteres são permitidos no nome do usuário: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
     "A valid username must be provided" : "Forneça um nome de usuário válido",
     "A valid password must be provided" : "Forneça uma senha válida",
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js
index 0f0e116128c..8c54fc8c055 100644
--- a/lib/l10n/pt_PT.js
+++ b/lib/l10n/pt_PT.js
@@ -107,6 +107,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "A partilha %s falhou porque a partilha da interface para %s não conseguiu encontrar a sua fonte",
     "Sharing %s failed, because the file could not be found in the file cache" : "A partilha %s falhou, devido ao ficheiro não poder ser encontrado na cache de ficheiros",
     "Could not find category \"%s\"" : "Não foi encontrado a categoria \"%s\"",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Apenas os seguintes caracteres são permitidos no nome de utilizador: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
     "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
     "A valid password must be provided" : "Uma password válida deve ser fornecida",
diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json
index 9c00021b599..4afe9ab3130 100644
--- a/lib/l10n/pt_PT.json
+++ b/lib/l10n/pt_PT.json
@@ -105,6 +105,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "A partilha %s falhou porque a partilha da interface para %s não conseguiu encontrar a sua fonte",
     "Sharing %s failed, because the file could not be found in the file cache" : "A partilha %s falhou, devido ao ficheiro não poder ser encontrado na cache de ficheiros",
     "Could not find category \"%s\"" : "Não foi encontrado a categoria \"%s\"",
+    "Apps" : "Apps",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Apenas os seguintes caracteres são permitidos no nome de utilizador: \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
     "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
     "A valid password must be provided" : "Uma password válida deve ser fornecida",
diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js
index ba7d11cdfb1..1c4b407a4ca 100644
--- a/lib/l10n/ro.js
+++ b/lib/l10n/ro.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "You are not allowed to share %s" : "Nu există permisiunea de partajare %s",
     "Share type %s is not valid for %s" : "Tipul partajării %s nu este valid pentru %s",
     "Could not find category \"%s\"" : "Cloud nu a gasit categoria \"%s\"",
+    "Apps" : "Aplicații",
     "A valid username must be provided" : "Trebuie să furnizaţi un nume de utilizator valid",
     "A valid password must be provided" : "Trebuie să furnizaţi o parolă validă",
     "The username is already being used" : "Numele de utilizator este deja folosit",
diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json
index 8e85455c50c..bafd2a85598 100644
--- a/lib/l10n/ro.json
+++ b/lib/l10n/ro.json
@@ -39,6 +39,7 @@
     "You are not allowed to share %s" : "Nu există permisiunea de partajare %s",
     "Share type %s is not valid for %s" : "Tipul partajării %s nu este valid pentru %s",
     "Could not find category \"%s\"" : "Cloud nu a gasit categoria \"%s\"",
+    "Apps" : "Aplicații",
     "A valid username must be provided" : "Trebuie să furnizaţi un nume de utilizator valid",
     "A valid password must be provided" : "Trebuie să furnizaţi o parolă validă",
     "The username is already being used" : "Numele de utilizator este deja folosit",
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index 16331c5cd76..215bd4f0ebb 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Не удалось поделиться %s, бэкенд общего доступа не нашел путь до %s",
     "Sharing %s failed, because the file could not be found in the file cache" : "Не удалось поделиться %s, элемент не найден в файловом кеше.",
     "Could not find category \"%s\"" : "Категория \"%s\"  не найдена",
+    "Apps" : "Приложения",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Только следующие символы допускаются в имени пользователя: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"",
     "A valid username must be provided" : "Укажите правильное имя пользователя",
     "A valid password must be provided" : "Укажите правильный пароль",
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index c295748adab..a0120518dfa 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -108,6 +108,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Не удалось поделиться %s, бэкенд общего доступа не нашел путь до %s",
     "Sharing %s failed, because the file could not be found in the file cache" : "Не удалось поделиться %s, элемент не найден в файловом кеше.",
     "Could not find category \"%s\"" : "Категория \"%s\"  не найдена",
+    "Apps" : "Приложения",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Только следующие символы допускаются в имени пользователя: \"a-z\", \"A-Z\", \"0-9\", и \"_.@-\"",
     "A valid username must be provided" : "Укажите правильное имя пользователя",
     "A valid password must be provided" : "Укажите правильный пароль",
diff --git a/lib/l10n/si_LK.js b/lib/l10n/si_LK.js
index abdce2df7c4..09ee34c2e5d 100644
--- a/lib/l10n/si_LK.js
+++ b/lib/l10n/si_LK.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "web services under your control" : "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
     "Application is not enabled" : "යෙදුම සක්‍රිය කර නොමැත",
     "Authentication error" : "සත්‍යාපන දෝෂයක්",
-    "Token expired. Please reload page." : "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න"
+    "Token expired. Please reload page." : "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න",
+    "Apps" : "යෙදුම්"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/si_LK.json b/lib/l10n/si_LK.json
index 5a201d40e95..d34a5216d8f 100644
--- a/lib/l10n/si_LK.json
+++ b/lib/l10n/si_LK.json
@@ -11,6 +11,7 @@
     "web services under your control" : "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
     "Application is not enabled" : "යෙදුම සක්‍රිය කර නොමැත",
     "Authentication error" : "සත්‍යාපන දෝෂයක්",
-    "Token expired. Please reload page." : "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න"
+    "Token expired. Please reload page." : "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න",
+    "Apps" : "යෙදුම්"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk_SK.js
index 49fabed436f..394379a0659 100644
--- a/lib/l10n/sk_SK.js
+++ b/lib/l10n/sk_SK.js
@@ -16,11 +16,14 @@ OC.L10N.register(
     "Library %s with a version lower than %s is required - available version %s." : "Požadovaná je knižnica %s v nižšej verzii ako %s - dostupná verzia %s.",
     "Following platforms are supported: %s" : "Podporované sú nasledovné systémy: %s",
     "ownCloud %s or higher is required." : "Požadovaná verzia ownCloudu %s alebo vyššia.",
+    "ownCloud %s or lower is required." : "Požadovaná verzia ownCloudu %s alebo nižšia.",
     "Help" : "Pomoc",
     "Personal" : "Osobné",
     "Users" : "Používatelia",
     "Admin" : "Administrátor",
     "Recommended" : "Odporúčané",
+    "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Aplikáciu \"%s\" nie je možné inštalovať, pretože nie je kompatibilná s touto verziou ownCloudu.",
+    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Aplikáciu \"%s\" nie je možné inštalovať, pretože nie sú splnené nasledovné závislosti: %s",
     "No app name specified" : "Nešpecifikované meno aplikácie",
     "Unknown filetype" : "Neznámy typ súboru",
     "Invalid image" : "Chybný obrázok",
@@ -35,12 +38,18 @@ OC.L10N.register(
     "_%n minute ago_::_%n minutes ago_" : ["pred %n minútou","pred %n minútami","pred %n minútami"],
     "seconds ago" : "pred sekundami",
     "web services under your control" : "webové služby pod Vašou kontrolou",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul s ID: %s neexistuje. Povoľte ho prosím vo vašom nastavení aplikácií alebo konaktujte správcu.",
     "Empty filename is not allowed" : "Prázdny názov súboru nie je povolený",
+    "Dot files are not allowed" : "Názov súboru začínajúci bodkou nie je povolený.",
+    "4-byte characters are not supported in file names" : "V názve súbou nie sú podporované 4-bajtové znaky.",
+    "File name is a reserved word" : "Názov súboru je rezervované slovo.",
     "File name contains at least one invalid character" : "Názov súboru obsahuje nepovolené znaky.",
     "File name is too long" : "Meno súboru je veľmi dlhé.",
+    "File is currently busy, please try again later" : "Súbor sa práve používa, skúste prosím neskôr",
     "Can't read file" : "Nemožno čítať súbor.",
     "App directory already exists" : "Aplikačný priečinok už existuje",
     "Can't create app folder. Please fix permissions. %s" : "Nemožno vytvoriť aplikačný priečinok. Prosím upravte povolenia. %s",
+    "Archive does not contain a directory named %s" : "Archív neobsahuje priečinok zvaný %s",
     "No source specified when installing app" : "Nešpecifikovaný zdroj pri inštalácii aplikácie",
     "No href specified when installing app from http" : "Nešpecifikovaný atribút \"href\" pri inštalácii aplikácie pomocou protokolu \"http\"",
     "No path specified when installing app from local file" : "Nešpecifikovaná cesta pri inštalácii aplikácie z lokálneho súboru",
@@ -82,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Zdieľanie %s zlyhalo, pretože používateľ %s neexistuje",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Zdieľanie %s zlyhalo, pretože používateľ %s nie je členom žiadnej skupiny spoločnej s používateľom %s",
     "Sharing %s failed, because this item is already shared with %s" : "Zdieľanie %s zlyhalo, pretože táto položka už je zdieľaná s %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Zdieľanie %s zlyhalo, položka je už zdieľaná s používateľom %s",
     "Sharing %s failed, because the group %s does not exist" : "Zdieľanie %s zlyhalo, pretože skupina %s neexistuje",
     "Sharing %s failed, because %s is not a member of the group %s" : "Zdieľanie %s zlyhalo, pretože %s nie je členom skupiny %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Musíte zadať heslo ak chcete vytvoriť verejný odkaz, lebo iba odkazy chránené heslom sú povolené",
@@ -92,6 +102,7 @@ OC.L10N.register(
     "Setting permissions for %s failed, because the item was not found" : "Nastavenie povolení pre %s zlyhalo, pretože položka sa nenašla",
     "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nie je možné nastaviť dátum konca platnosti. Zdieľania nemôžu skončiť neskôr ako %s po zdieľaní.",
     "Cannot set expiration date. Expiration date is in the past" : "Nie je možné nastaviť dátum konca platnosti. Dátum konca platnosti je v minulosti.",
+    "Cannot clear expiration date. Shares are required to have an expiration date." : "Nemožno vymazať čas expirácie. Pri zdieľaní je čas expirácie vyžadovaný.",
     "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Backend zdieľania %s musí implementovať rozhranie OCP\\Share_Backend",
     "Sharing backend %s not found" : "Backend zdieľania %s nebol nájdený",
     "Sharing backend for %s not found" : "Backend zdieľania pre %s nebol nájdený",
@@ -101,12 +112,14 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Zdieľanie %s zlyhalo, backend zdieľania nenašiel zdrojový %s",
     "Sharing %s failed, because the file could not be found in the file cache" : "Zdieľanie %s zlyhalo, pretože súbor sa nenašiel vo vyrovnávacej pamäti súborov",
     "Could not find category \"%s\"" : "Nemožno nájsť danú kategóriu \"%s\"",
+    "Apps" : "Aplikácie",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "V mene používateľa sú povolené len nasledovné znaky: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Musíte zadať platné používateľské meno",
     "A valid password must be provided" : "Musíte zadať platné heslo",
     "The username is already being used" : "Meno používateľa je už použité",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Ovládače databázy (sqlite, mysql, alebo postgresql) nie sú nainštalované.",
     "Microsoft Windows Platform is not supported" : "Microsoft Windows platforma nieje podporovaná",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Beh ownCloud servera na platforme Microsoft Windows nie je podporovaný. Navrhujeme použitie Linux server na virtuálnom počítači, pokiaľ nie je k dispozícii priamo server. Linux distribúcie a tiež aj ľahko použiteľné obrazy (image) virtuálnych počítačov nájdete na <a href=\"%s\">%s</a>. Pár tipov pre migráciu existujúcich inštalácii na Linux a migračné skripty nájdete v <a href=\"%s\">našej dokumentácii</a>.",
     "Cannot write into \"config\" directory" : "Nie je možné zapisovať do priečinka \"config\"",
     "Cannot write into \"apps\" directory" : "Nie je možné zapisovať do priečinka \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Toto je zvyčajne možné opraviť tým, že %s udelíte webovému serveru oprávnenie na zápis do priečinka aplikácií %s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.",
@@ -119,6 +132,9 @@ OC.L10N.register(
     "PHP module %s not installed." : "PHP modul %s nie je nainštalovaný.",
     "PHP setting \"%s\" is not set to \"%s\"." : "Voľba PHP „%s“ nie je nastavená na „%s“.",
     "Adjusting this setting in php.ini will make ownCloud run again" : "Zmenou tejto voľby v php.ini znovu uvediete váš ownCloud do prevádzky",
+    "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload je nastavený na \"%s\", namiesto predpokladanej hodnoty \"0\"",
+    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Oprava problému spočíva v nastavení <code>mbstring.func_overload</code> na <code>0</code> vo vašom php.ini",
+    "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky vloženej dokumentácie. To zneprístupní niekoľko základných aplikácií.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.",
     "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly boli nainštalované, ale stále sa tvária, že chýbajú?",
     "Please ask your server administrator to restart the web server." : "Prosím, požiadajte administrátora vášho servera o reštartovanie webového servera.",
@@ -128,6 +144,8 @@ OC.L10N.register(
     "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Prosím, uistite sa, že máte PostgreSQL >= 9 alebo sa pozrite do protokolu, kde nájdete podrobnejšie informácie o chybe",
     "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Prosím, zmeňte oprávnenia na 0770, aby tento priečinok nemohli ostatní používatelia otvoriť.",
     "Data directory (%s) is readable by other users" : "Priečinok dát (%s) je prístupný na čítanie ostatným používateľom",
+    "Data directory (%s) must be an absolute path" : "Priečinok dát (%s) musí byť zadaný ako absolútna cesta",
+    "Check the value of \"datadirectory\" in your configuration" : "Skontrolujte hodnotu \"datadirectory\" vo vašej konfigurácii",
     "Data directory (%s) is invalid" : "Priečinok dát (%s) je neplatný",
     "Please check that the data directory contains a file \".ocdata\" in its root." : "Prosím, skontrolujte, či priečinok dát obsahuje súbor \".ocdata\".",
     "Could not obtain lock type %d on \"%s\"." : "Nepodarilo sa získať zámok typu %d na „%s“."
diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk_SK.json
index 4eea36cda2f..180d3683d61 100644
--- a/lib/l10n/sk_SK.json
+++ b/lib/l10n/sk_SK.json
@@ -14,11 +14,14 @@
     "Library %s with a version lower than %s is required - available version %s." : "Požadovaná je knižnica %s v nižšej verzii ako %s - dostupná verzia %s.",
     "Following platforms are supported: %s" : "Podporované sú nasledovné systémy: %s",
     "ownCloud %s or higher is required." : "Požadovaná verzia ownCloudu %s alebo vyššia.",
+    "ownCloud %s or lower is required." : "Požadovaná verzia ownCloudu %s alebo nižšia.",
     "Help" : "Pomoc",
     "Personal" : "Osobné",
     "Users" : "Používatelia",
     "Admin" : "Administrátor",
     "Recommended" : "Odporúčané",
+    "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "Aplikáciu \"%s\" nie je možné inštalovať, pretože nie je kompatibilná s touto verziou ownCloudu.",
+    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "Aplikáciu \"%s\" nie je možné inštalovať, pretože nie sú splnené nasledovné závislosti: %s",
     "No app name specified" : "Nešpecifikované meno aplikácie",
     "Unknown filetype" : "Neznámy typ súboru",
     "Invalid image" : "Chybný obrázok",
@@ -33,12 +36,18 @@
     "_%n minute ago_::_%n minutes ago_" : ["pred %n minútou","pred %n minútami","pred %n minútami"],
     "seconds ago" : "pred sekundami",
     "web services under your control" : "webové služby pod Vašou kontrolou",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Modul s ID: %s neexistuje. Povoľte ho prosím vo vašom nastavení aplikácií alebo konaktujte správcu.",
     "Empty filename is not allowed" : "Prázdny názov súboru nie je povolený",
+    "Dot files are not allowed" : "Názov súboru začínajúci bodkou nie je povolený.",
+    "4-byte characters are not supported in file names" : "V názve súbou nie sú podporované 4-bajtové znaky.",
+    "File name is a reserved word" : "Názov súboru je rezervované slovo.",
     "File name contains at least one invalid character" : "Názov súboru obsahuje nepovolené znaky.",
     "File name is too long" : "Meno súboru je veľmi dlhé.",
+    "File is currently busy, please try again later" : "Súbor sa práve používa, skúste prosím neskôr",
     "Can't read file" : "Nemožno čítať súbor.",
     "App directory already exists" : "Aplikačný priečinok už existuje",
     "Can't create app folder. Please fix permissions. %s" : "Nemožno vytvoriť aplikačný priečinok. Prosím upravte povolenia. %s",
+    "Archive does not contain a directory named %s" : "Archív neobsahuje priečinok zvaný %s",
     "No source specified when installing app" : "Nešpecifikovaný zdroj pri inštalácii aplikácie",
     "No href specified when installing app from http" : "Nešpecifikovaný atribút \"href\" pri inštalácii aplikácie pomocou protokolu \"http\"",
     "No path specified when installing app from local file" : "Nešpecifikovaná cesta pri inštalácii aplikácie z lokálneho súboru",
@@ -80,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Zdieľanie %s zlyhalo, pretože používateľ %s neexistuje",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Zdieľanie %s zlyhalo, pretože používateľ %s nie je členom žiadnej skupiny spoločnej s používateľom %s",
     "Sharing %s failed, because this item is already shared with %s" : "Zdieľanie %s zlyhalo, pretože táto položka už je zdieľaná s %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Zdieľanie %s zlyhalo, položka je už zdieľaná s používateľom %s",
     "Sharing %s failed, because the group %s does not exist" : "Zdieľanie %s zlyhalo, pretože skupina %s neexistuje",
     "Sharing %s failed, because %s is not a member of the group %s" : "Zdieľanie %s zlyhalo, pretože %s nie je členom skupiny %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Musíte zadať heslo ak chcete vytvoriť verejný odkaz, lebo iba odkazy chránené heslom sú povolené",
@@ -90,6 +100,7 @@
     "Setting permissions for %s failed, because the item was not found" : "Nastavenie povolení pre %s zlyhalo, pretože položka sa nenašla",
     "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nie je možné nastaviť dátum konca platnosti. Zdieľania nemôžu skončiť neskôr ako %s po zdieľaní.",
     "Cannot set expiration date. Expiration date is in the past" : "Nie je možné nastaviť dátum konca platnosti. Dátum konca platnosti je v minulosti.",
+    "Cannot clear expiration date. Shares are required to have an expiration date." : "Nemožno vymazať čas expirácie. Pri zdieľaní je čas expirácie vyžadovaný.",
     "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Backend zdieľania %s musí implementovať rozhranie OCP\\Share_Backend",
     "Sharing backend %s not found" : "Backend zdieľania %s nebol nájdený",
     "Sharing backend for %s not found" : "Backend zdieľania pre %s nebol nájdený",
@@ -99,12 +110,14 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Zdieľanie %s zlyhalo, backend zdieľania nenašiel zdrojový %s",
     "Sharing %s failed, because the file could not be found in the file cache" : "Zdieľanie %s zlyhalo, pretože súbor sa nenašiel vo vyrovnávacej pamäti súborov",
     "Could not find category \"%s\"" : "Nemožno nájsť danú kategóriu \"%s\"",
+    "Apps" : "Aplikácie",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "V mene používateľa sú povolené len nasledovné znaky: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Musíte zadať platné používateľské meno",
     "A valid password must be provided" : "Musíte zadať platné heslo",
     "The username is already being used" : "Meno používateľa je už použité",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Ovládače databázy (sqlite, mysql, alebo postgresql) nie sú nainštalované.",
     "Microsoft Windows Platform is not supported" : "Microsoft Windows platforma nieje podporovaná",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Beh ownCloud servera na platforme Microsoft Windows nie je podporovaný. Navrhujeme použitie Linux server na virtuálnom počítači, pokiaľ nie je k dispozícii priamo server. Linux distribúcie a tiež aj ľahko použiteľné obrazy (image) virtuálnych počítačov nájdete na <a href=\"%s\">%s</a>. Pár tipov pre migráciu existujúcich inštalácii na Linux a migračné skripty nájdete v <a href=\"%s\">našej dokumentácii</a>.",
     "Cannot write into \"config\" directory" : "Nie je možné zapisovať do priečinka \"config\"",
     "Cannot write into \"apps\" directory" : "Nie je možné zapisovať do priečinka \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Toto je zvyčajne možné opraviť tým, že %s udelíte webovému serveru oprávnenie na zápis do priečinka aplikácií %s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.",
@@ -117,6 +130,9 @@
     "PHP module %s not installed." : "PHP modul %s nie je nainštalovaný.",
     "PHP setting \"%s\" is not set to \"%s\"." : "Voľba PHP „%s“ nie je nastavená na „%s“.",
     "Adjusting this setting in php.ini will make ownCloud run again" : "Zmenou tejto voľby v php.ini znovu uvediete váš ownCloud do prevádzky",
+    "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload je nastavený na \"%s\", namiesto predpokladanej hodnoty \"0\"",
+    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Oprava problému spočíva v nastavení <code>mbstring.func_overload</code> na <code>0</code> vo vašom php.ini",
+    "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je zjavne nastavené, aby odstraňovalo bloky vloženej dokumentácie. To zneprístupní niekoľko základných aplikácií.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.",
     "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly boli nainštalované, ale stále sa tvária, že chýbajú?",
     "Please ask your server administrator to restart the web server." : "Prosím, požiadajte administrátora vášho servera o reštartovanie webového servera.",
@@ -126,6 +142,8 @@
     "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Prosím, uistite sa, že máte PostgreSQL >= 9 alebo sa pozrite do protokolu, kde nájdete podrobnejšie informácie o chybe",
     "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Prosím, zmeňte oprávnenia na 0770, aby tento priečinok nemohli ostatní používatelia otvoriť.",
     "Data directory (%s) is readable by other users" : "Priečinok dát (%s) je prístupný na čítanie ostatným používateľom",
+    "Data directory (%s) must be an absolute path" : "Priečinok dát (%s) musí byť zadaný ako absolútna cesta",
+    "Check the value of \"datadirectory\" in your configuration" : "Skontrolujte hodnotu \"datadirectory\" vo vašej konfigurácii",
     "Data directory (%s) is invalid" : "Priečinok dát (%s) je neplatný",
     "Please check that the data directory contains a file \".ocdata\" in its root." : "Prosím, skontrolujte, či priečinok dát obsahuje súbor \".ocdata\".",
     "Could not obtain lock type %d on \"%s\"." : "Nepodarilo sa získať zámok typu %d na „%s“."
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
index 48df48d71c6..3cf4e005765 100644
--- a/lib/l10n/sl.js
+++ b/lib/l10n/sl.js
@@ -100,6 +100,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Nastavljanje souporabe %s je spodletelo, ker ozadnji program %s ne upravlja z viri.",
     "Sharing %s failed, because the file could not be found in the file cache" : "Nastavljanje souporabe %s je spodletelo, ker v predpomnilniku zahtevana datoteka ne obstaja.",
     "Could not find category \"%s\"" : "Kategorije \"%s\" ni mogoče najti.",
+    "Apps" : "Programi",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "V uporabniškem imenu je dovoljeno uporabiti le znake: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
     "A valid password must be provided" : "Navedeno mora biti veljavno geslo",
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
index 8507e1194d9..58d9199aaf8 100644
--- a/lib/l10n/sl.json
+++ b/lib/l10n/sl.json
@@ -98,6 +98,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Nastavljanje souporabe %s je spodletelo, ker ozadnji program %s ne upravlja z viri.",
     "Sharing %s failed, because the file could not be found in the file cache" : "Nastavljanje souporabe %s je spodletelo, ker v predpomnilniku zahtevana datoteka ne obstaja.",
     "Could not find category \"%s\"" : "Kategorije \"%s\" ni mogoče najti.",
+    "Apps" : "Programi",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "V uporabniškem imenu je dovoljeno uporabiti le znake: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"",
     "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
     "A valid password must be provided" : "Navedeno mora biti veljavno geslo",
diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js
index fbf1b58beee..80db3f87c50 100644
--- a/lib/l10n/sq.js
+++ b/lib/l10n/sq.js
@@ -32,6 +32,7 @@ OC.L10N.register(
     "Set an admin password." : "Cakto kodin e administratorit.",
     "%s shared »%s« with you" : "%s ndau »%s« me ju",
     "Could not find category \"%s\"" : "Kategoria \"%s\" nuk u gjet",
+    "Apps" : "App",
     "A valid username must be provided" : "Duhet të jepni një emër të vlefshëm përdoruesi",
     "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm"
 },
diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json
index b0a23493d40..1fc2cb01c58 100644
--- a/lib/l10n/sq.json
+++ b/lib/l10n/sq.json
@@ -30,6 +30,7 @@
     "Set an admin password." : "Cakto kodin e administratorit.",
     "%s shared »%s« with you" : "%s ndau »%s« me ju",
     "Could not find category \"%s\"" : "Kategoria \"%s\" nuk u gjet",
+    "Apps" : "App",
     "A valid username must be provided" : "Duhet të jepni një emër të vlefshëm përdoruesi",
     "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js
index 286856622c7..670a705364c 100644
--- a/lib/l10n/sr.js
+++ b/lib/l10n/sr.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Дељење %s није успело зато што позадина дељења за %s није могла да нађе извор",
     "Sharing %s failed, because the file could not be found in the file cache" : "Дељење %s није успело зато што фајл није нађен у кешу фајлова",
     "Could not find category \"%s\"" : "Не могу да пронађем категорију „%s“.",
+    "Apps" : "Апликације",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Само су следећи знакови дозвољени за корисничко име: „a-z“, „A-Z“, „0-9“ и „_.@-“",
     "A valid username must be provided" : "Морате унети исправно корисничко име",
     "A valid password must be provided" : "Морате унети исправну лозинку",
diff --git a/lib/l10n/sr.json b/lib/l10n/sr.json
index 2e76f5e9000..8b4bcf3ab04 100644
--- a/lib/l10n/sr.json
+++ b/lib/l10n/sr.json
@@ -108,6 +108,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Дељење %s није успело зато што позадина дељења за %s није могла да нађе извор",
     "Sharing %s failed, because the file could not be found in the file cache" : "Дељење %s није успело зато што фајл није нађен у кешу фајлова",
     "Could not find category \"%s\"" : "Не могу да пронађем категорију „%s“.",
+    "Apps" : "Апликације",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Само су следећи знакови дозвољени за корисничко име: „a-z“, „A-Z“, „0-9“ и „_.@-“",
     "A valid username must be provided" : "Морате унети исправно корисничко име",
     "A valid password must be provided" : "Морате унети исправну лозинку",
diff --git a/lib/l10n/sr@latin.js b/lib/l10n/sr@latin.js
index e677404bf23..a8c4c261a09 100644
--- a/lib/l10n/sr@latin.js
+++ b/lib/l10n/sr@latin.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "seconds ago" : "Pre par sekundi",
     "Authentication error" : "Greška pri autentifikaciji",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s neće raditi kako treba na ovoj platformi. Koristite na sopstvenu odgovornost.",
-    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate uzmite u obzir korišćenje GNU/Linux servera."
+    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate uzmite u obzir korišćenje GNU/Linux servera.",
+    "Apps" : "Programi"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/lib/l10n/sr@latin.json b/lib/l10n/sr@latin.json
index 3e2d9659ef5..a85ebf5d92c 100644
--- a/lib/l10n/sr@latin.json
+++ b/lib/l10n/sr@latin.json
@@ -12,6 +12,7 @@
     "seconds ago" : "Pre par sekundi",
     "Authentication error" : "Greška pri autentifikaciji",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s neće raditi kako treba na ovoj platformi. Koristite na sopstvenu odgovornost.",
-    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate uzmite u obzir korišćenje GNU/Linux servera."
+    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate uzmite u obzir korišćenje GNU/Linux servera.",
+    "Apps" : "Programi"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js
index c3b2d0655df..930f19c0d7e 100644
--- a/lib/l10n/sv.js
+++ b/lib/l10n/sv.js
@@ -93,6 +93,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Delning %s misslyckades därför att delningsgränsnittet för %s inte kunde hitta sin källa",
     "Sharing %s failed, because the file could not be found in the file cache" : "Delning %s misslyckades därför att filen inte kunde hittas i filcachen",
     "Could not find category \"%s\"" : "Kunde inte hitta kategorin \"%s\"",
+    "Apps" : "Program",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Endast följande tecken är tillåtna i ett användarnamn: \"az\", \"AZ\", \"0-9\", och \"_ @ -.\"",
     "A valid username must be provided" : "Ett giltigt användarnamn måste anges",
     "A valid password must be provided" : "Ett giltigt lösenord måste anges",
diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json
index 5b53e335a79..6748c72487d 100644
--- a/lib/l10n/sv.json
+++ b/lib/l10n/sv.json
@@ -91,6 +91,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Delning %s misslyckades därför att delningsgränsnittet för %s inte kunde hitta sin källa",
     "Sharing %s failed, because the file could not be found in the file cache" : "Delning %s misslyckades därför att filen inte kunde hittas i filcachen",
     "Could not find category \"%s\"" : "Kunde inte hitta kategorin \"%s\"",
+    "Apps" : "Program",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Endast följande tecken är tillåtna i ett användarnamn: \"az\", \"AZ\", \"0-9\", och \"_ @ -.\"",
     "A valid username must be provided" : "Ett giltigt användarnamn måste anges",
     "A valid password must be provided" : "Ett giltigt lösenord måste anges",
diff --git a/lib/l10n/ta_LK.js b/lib/l10n/ta_LK.js
index e318c7b9f67..2cbe4d00305 100644
--- a/lib/l10n/ta_LK.js
+++ b/lib/l10n/ta_LK.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "Application is not enabled" : "செயலி இயலுமைப்படுத்தப்படவில்லை",
     "Authentication error" : "அத்தாட்சிப்படுத்தலில் வழு",
     "Token expired. Please reload page." : "அடையாளவில்லை காலாவதியாகிவிட்டது. தயவுசெய்து பக்கத்தை மீள் ஏற்றுக.",
-    "Could not find category \"%s\"" : "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை"
+    "Could not find category \"%s\"" : "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை",
+    "Apps" : "செயலிகள்"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ta_LK.json b/lib/l10n/ta_LK.json
index 70bd5c7f965..25e06c38de8 100644
--- a/lib/l10n/ta_LK.json
+++ b/lib/l10n/ta_LK.json
@@ -12,6 +12,7 @@
     "Application is not enabled" : "செயலி இயலுமைப்படுத்தப்படவில்லை",
     "Authentication error" : "அத்தாட்சிப்படுத்தலில் வழு",
     "Token expired. Please reload page." : "அடையாளவில்லை காலாவதியாகிவிட்டது. தயவுசெய்து பக்கத்தை மீள் ஏற்றுக.",
-    "Could not find category \"%s\"" : "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை"
+    "Could not find category \"%s\"" : "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை",
+    "Apps" : "செயலிகள்"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/th_TH.js b/lib/l10n/th_TH.js
index 6092f348cb5..c5168588a99 100644
--- a/lib/l10n/th_TH.js
+++ b/lib/l10n/th_TH.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "การแชร์ %s ล้มเหลวเพราะการแชร์แบ็กเอนด์สำหรับ %s ไม่สามารถหาแหล่งที่มา",
     "Sharing %s failed, because the file could not be found in the file cache" : "การแชร์ %s ล้มเหลวเพราะไม่พบไฟล์ในแคชไฟล์",
     "Could not find category \"%s\"" : "ไม่พบหมวดหมู่ \"%s\"",
+    "Apps" : "แอปฯ",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "ตัวอักษรที่อนุญาตให้ใช้ในชื่อผู้ใช้: \"a-z\", \"A-Z\", \"0-9\"  และ \"_.@-\"",
     "A valid username must be provided" : "จะต้องระบุชื่อผู้ใช้ที่ถูกต้อง",
     "A valid password must be provided" : "รหัสผ่านที่ถูกต้องจะต้องให้",
diff --git a/lib/l10n/th_TH.json b/lib/l10n/th_TH.json
index a872236a70d..55563b4fc16 100644
--- a/lib/l10n/th_TH.json
+++ b/lib/l10n/th_TH.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "การแชร์ %s ล้มเหลวเพราะการแชร์แบ็กเอนด์สำหรับ %s ไม่สามารถหาแหล่งที่มา",
     "Sharing %s failed, because the file could not be found in the file cache" : "การแชร์ %s ล้มเหลวเพราะไม่พบไฟล์ในแคชไฟล์",
     "Could not find category \"%s\"" : "ไม่พบหมวดหมู่ \"%s\"",
+    "Apps" : "แอปฯ",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "ตัวอักษรที่อนุญาตให้ใช้ในชื่อผู้ใช้: \"a-z\", \"A-Z\", \"0-9\"  และ \"_.@-\"",
     "A valid username must be provided" : "จะต้องระบุชื่อผู้ใช้ที่ถูกต้อง",
     "A valid password must be provided" : "รหัสผ่านที่ถูกต้องจะต้องให้",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index 93f2908a69f..69f35cc33cc 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -112,6 +112,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s paylaşımı, %s için arka ucun kaynağını bulamamasından dolayı başarısız oldu",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s paylaşımı, dosyanın dosya önbelleğinde bulunamamasınndan dolayı başarısız oldu",
     "Could not find category \"%s\"" : "\"%s\" kategorisi bulunamadı",
+    "Apps" : "Uygulamalar",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Kullanıcı adında sadece bu karakterlere izin verilmektedir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-\"",
     "A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
     "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index bb3cd291e64..24980e4d58f 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -110,6 +110,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "%s paylaşımı, %s için arka ucun kaynağını bulamamasından dolayı başarısız oldu",
     "Sharing %s failed, because the file could not be found in the file cache" : "%s paylaşımı, dosyanın dosya önbelleğinde bulunamamasınndan dolayı başarısız oldu",
     "Could not find category \"%s\"" : "\"%s\" kategorisi bulunamadı",
+    "Apps" : "Uygulamalar",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Kullanıcı adında sadece bu karakterlere izin verilmektedir: \"a-z\", \"A-Z\", \"0-9\", ve \"_.@-\"",
     "A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
     "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
diff --git a/lib/l10n/ug.js b/lib/l10n/ug.js
index aaa90377419..f497ed3fbb9 100644
--- a/lib/l10n/ug.js
+++ b/lib/l10n/ug.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "today" : "بۈگۈن",
     "yesterday" : "تۈنۈگۈن",
     "Authentication error" : "سالاھىيەت دەلىللەش خاتالىقى",
+    "Apps" : "ئەپلەر",
     "A valid username must be provided" : "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
     "A valid password must be provided" : "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
 },
diff --git a/lib/l10n/ug.json b/lib/l10n/ug.json
index 4521f615d62..b847810b2c4 100644
--- a/lib/l10n/ug.json
+++ b/lib/l10n/ug.json
@@ -5,6 +5,7 @@
     "today" : "بۈگۈن",
     "yesterday" : "تۈنۈگۈن",
     "Authentication error" : "سالاھىيەت دەلىللەش خاتالىقى",
+    "Apps" : "ئەپلەر",
     "A valid username must be provided" : "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
     "A valid password must be provided" : "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
index 7c90934c71f..3da12b1391f 100644
--- a/lib/l10n/uk.js
+++ b/lib/l10n/uk.js
@@ -103,6 +103,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Не вдалося поділитися %s, backend загального доступу не знайшов шлях до %s",
     "Sharing %s failed, because the file could not be found in the file cache" : "Не вдалося поділитися %s, елемент не знайдено у файловому кеші.",
     "Could not find category \"%s\"" : "Не вдалося знайти категорію \"%s\"",
+    "Apps" : "Додатки",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Тільки такі символи допускаються в імені користувача: \"az\", \"AZ\", \"0-9\", і \"_.@ -\"",
     "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
     "A valid password must be provided" : "Потрібно задати вірний пароль",
diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json
index f0ca3a30641..7b2ca8deef4 100644
--- a/lib/l10n/uk.json
+++ b/lib/l10n/uk.json
@@ -101,6 +101,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "Не вдалося поділитися %s, backend загального доступу не знайшов шлях до %s",
     "Sharing %s failed, because the file could not be found in the file cache" : "Не вдалося поділитися %s, елемент не знайдено у файловому кеші.",
     "Could not find category \"%s\"" : "Не вдалося знайти категорію \"%s\"",
+    "Apps" : "Додатки",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Тільки такі символи допускаються в імені користувача: \"az\", \"AZ\", \"0-9\", і \"_.@ -\"",
     "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
     "A valid password must be provided" : "Потрібно задати вірний пароль",
diff --git a/lib/l10n/ur_PK.js b/lib/l10n/ur_PK.js
index ab5a44ff204..ddf4e058521 100644
--- a/lib/l10n/ur_PK.js
+++ b/lib/l10n/ur_PK.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "last month" : "پچھلے مہنیے",
     "last year" : "پچھلے سال",
     "seconds ago" : "سیکنڈز پہلے",
-    "web services under your control" : "آپ کے اختیار میں ویب سروسیز"
+    "web services under your control" : "آپ کے اختیار میں ویب سروسیز",
+    "Apps" : "ایپز"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ur_PK.json b/lib/l10n/ur_PK.json
index f81ea27ae01..424c62aed86 100644
--- a/lib/l10n/ur_PK.json
+++ b/lib/l10n/ur_PK.json
@@ -10,6 +10,7 @@
     "last month" : "پچھلے مہنیے",
     "last year" : "پچھلے سال",
     "seconds ago" : "سیکنڈز پہلے",
-    "web services under your control" : "آپ کے اختیار میں ویب سروسیز"
+    "web services under your control" : "آپ کے اختیار میں ویب سروسیز",
+    "Apps" : "ایپز"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/vi.js b/lib/l10n/vi.js
index e467f4383c4..7f53b88bade 100644
--- a/lib/l10n/vi.js
+++ b/lib/l10n/vi.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "Authentication error" : "Lỗi xác thực",
     "Token expired. Please reload page." : "Mã Token đã hết hạn. Hãy tải lại trang.",
     "%s shared »%s« with you" : "%s đã chia sẻ »%s« với bạn",
-    "Could not find category \"%s\"" : "không thể tìm thấy mục \"%s\""
+    "Could not find category \"%s\"" : "không thể tìm thấy mục \"%s\"",
+    "Apps" : "Ứng dụng"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/vi.json b/lib/l10n/vi.json
index f3dd43a290a..bcff243c440 100644
--- a/lib/l10n/vi.json
+++ b/lib/l10n/vi.json
@@ -20,6 +20,7 @@
     "Authentication error" : "Lỗi xác thực",
     "Token expired. Please reload page." : "Mã Token đã hết hạn. Hãy tải lại trang.",
     "%s shared »%s« with you" : "%s đã chia sẻ »%s« với bạn",
-    "Could not find category \"%s\"" : "không thể tìm thấy mục \"%s\""
+    "Could not find category \"%s\"" : "không thể tìm thấy mục \"%s\"",
+    "Apps" : "Ứng dụng"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js
index 4e4ad0478c1..cd684b3446d 100644
--- a/lib/l10n/zh_CN.js
+++ b/lib/l10n/zh_CN.js
@@ -73,6 +73,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "共享 %s 失败，因为 %s 使用的共享后端未找到它的来源",
     "Sharing %s failed, because the file could not be found in the file cache" : "共享 %s 失败，因为未在文件缓存中找到文件。",
     "Could not find category \"%s\"" : "无法找到分类 \"%s\"",
+    "Apps" : "应用",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "用户名只允许使用以下字符：“a-z”，“A-Z”，“0-9”，和“_.@-”",
     "A valid username must be provided" : "必须提供合法的用户名",
     "A valid password must be provided" : "必须提供合法的密码",
diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json
index 097f7d4d54a..1d2736d701d 100644
--- a/lib/l10n/zh_CN.json
+++ b/lib/l10n/zh_CN.json
@@ -71,6 +71,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "共享 %s 失败，因为 %s 使用的共享后端未找到它的来源",
     "Sharing %s failed, because the file could not be found in the file cache" : "共享 %s 失败，因为未在文件缓存中找到文件。",
     "Could not find category \"%s\"" : "无法找到分类 \"%s\"",
+    "Apps" : "应用",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "用户名只允许使用以下字符：“a-z”，“A-Z”，“0-9”，和“_.@-”",
     "A valid username must be provided" : "必须提供合法的用户名",
     "A valid password must be provided" : "必须提供合法的密码",
diff --git a/lib/l10n/zh_HK.js b/lib/l10n/zh_HK.js
index f1a4857e44d..be7b201b756 100644
--- a/lib/l10n/zh_HK.js
+++ b/lib/l10n/zh_HK.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "last year" : "上年",
     "_%n hour ago_::_%n hours ago_" : ["%n 小時前"],
     "_%n minute ago_::_%n minutes ago_" : ["%n 分鐘前"],
-    "seconds ago" : "秒前"
+    "seconds ago" : "秒前",
+    "Apps" : "軟件"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/zh_HK.json b/lib/l10n/zh_HK.json
index e355ca30a41..dbd3df86703 100644
--- a/lib/l10n/zh_HK.json
+++ b/lib/l10n/zh_HK.json
@@ -11,6 +11,7 @@
     "last year" : "上年",
     "_%n hour ago_::_%n hours ago_" : ["%n 小時前"],
     "_%n minute ago_::_%n minutes ago_" : ["%n 分鐘前"],
-    "seconds ago" : "秒前"
+    "seconds ago" : "秒前",
+    "Apps" : "軟件"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js
index 3e761604d77..b1f6ec4ee4e 100644
--- a/lib/l10n/zh_TW.js
+++ b/lib/l10n/zh_TW.js
@@ -82,6 +82,7 @@ OC.L10N.register(
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "分享 %s 失敗，因為 %s 的分享後端找不到它的來源",
     "Sharing %s failed, because the file could not be found in the file cache" : "分享 %s 失敗，因為在快取中找不到該檔案",
     "Could not find category \"%s\"" : "找不到分類：\"%s\"",
+    "Apps" : "應用程式",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "使用者名稱當中只能包含下列字元：\"a-z\", \"A-Z\", \"0-9\", 和 \"_.@-\"",
     "A valid username must be provided" : "必須提供一個有效的用戶名",
     "A valid password must be provided" : "一定要提供一個有效的密碼",
diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json
index 2e0de903735..856dbef916e 100644
--- a/lib/l10n/zh_TW.json
+++ b/lib/l10n/zh_TW.json
@@ -80,6 +80,7 @@
     "Sharing %s failed, because the sharing backend for %s could not find its source" : "分享 %s 失敗，因為 %s 的分享後端找不到它的來源",
     "Sharing %s failed, because the file could not be found in the file cache" : "分享 %s 失敗，因為在快取中找不到該檔案",
     "Could not find category \"%s\"" : "找不到分類：\"%s\"",
+    "Apps" : "應用程式",
     "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "使用者名稱當中只能包含下列字元：\"a-z\", \"A-Z\", \"0-9\", 和 \"_.@-\"",
     "A valid username must be provided" : "必須提供一個有效的用戶名",
     "A valid password must be provided" : "一定要提供一個有效的密碼",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 61b012de4f7..8bb3be30fca 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -149,6 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Tillader brugere at sende mailnotifikationer for delte filer til andre brugere",
     "Exclude groups from sharing" : "Ekskluder grupper fra at dele",
     "These groups will still be able to receive shares, but not to initiate them." : "Disse grupper vil stadig kunne modtage delefiler, men ikke skabe dem.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Tillad autofuldførelse af brugernavnet i delings dialogboksen. Hvis funktion er deaktiveret skal det fulde brugernavn indtastes.",
     "Last cron job execution: %s." : "Seneste udførsel af cronjob: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Seneste udførsel af cronjob: %s. Der er vist noget galt.",
     "Cron was not executed yet!" : "Cron har ikke kørt endnu!",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 2f18fedf629..90896f0ab28 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -147,6 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "Tillader brugere at sende mailnotifikationer for delte filer til andre brugere",
     "Exclude groups from sharing" : "Ekskluder grupper fra at dele",
     "These groups will still be able to receive shares, but not to initiate them." : "Disse grupper vil stadig kunne modtage delefiler, men ikke skabe dem.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Tillad autofuldførelse af brugernavnet i delings dialogboksen. Hvis funktion er deaktiveret skal det fulde brugernavn indtastes.",
     "Last cron job execution: %s." : "Seneste udførsel af cronjob: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Seneste udførsel af cronjob: %s. Der er vist noget galt.",
     "Cron was not executed yet!" : "Cron har ikke kørt endnu!",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index c670d7abb59..a7db9452562 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -140,6 +140,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Salli käyttäjien lähettää muille käyttäjille sähköpostitse ilmoitus jaetuista tiedostoista",
     "Exclude groups from sharing" : "Kiellä ryhmiä jakamasta",
     "These groups will still be able to receive shares, but not to initiate them." : "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Salli käyttäjätunnuksen automaattinen täydentäminen jakamisikkunnassa. Jos tämä asetus on pois käytöstä, tulee käyttäjätunnus kirjoittaa kokonaan itse.",
     "Last cron job execution: %s." : "Viimeisin cron-työn suoritus: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Viimeisin cron-työn suoritus: %s. Jokin vaikuttaa menneen pieleen.",
     "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 01b79449331..9705353642b 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -138,6 +138,7 @@
     "Allow users to send mail notification for shared files to other users" : "Salli käyttäjien lähettää muille käyttäjille sähköpostitse ilmoitus jaetuista tiedostoista",
     "Exclude groups from sharing" : "Kiellä ryhmiä jakamasta",
     "These groups will still be able to receive shares, but not to initiate them." : "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Salli käyttäjätunnuksen automaattinen täydentäminen jakamisikkunnassa. Jos tämä asetus on pois käytöstä, tulee käyttäjätunnus kirjoittaa kokonaan itse.",
     "Last cron job execution: %s." : "Viimeisin cron-työn suoritus: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Viimeisin cron-työn suoritus: %s. Jokin vaikuttaa menneen pieleen.",
     "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 83b7d5f76d8..b11e361f921 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -118,17 +118,20 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php ne semble pas être configuré de manière à récupérer les valeurs des variables d’environnement. Le test de la commande getenv(\"PATH\") retourne seulement une réponse vide. ",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez vérifier <a target=\"_blank\" href=\"%s\">la documentation d'installation ↗</a> concernant les instructions de configuration de php ainsi que la configuration de votre serveur, en particulier dans le cas où vous utilisez php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé, cela peut conduire à des conflits d'accès. Activer 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
     "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux n'ont pu être configurés avec prise en charge d'UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nous vous recommandons d'installer sur votre système les paquets nécessaires à la prise en charge de l'un des paramètres régionaux suivants : %s",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers utilise la base de données comme moteur de verrouillage, pour de meilleures performances il est recommandé de configurer le memcache pour le verrouillage. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>,  et cherchez des erreurs ou avertissements dans  <a href=\"#log-section\">les logs</a>.",
     "All checks passed." : "Tous les tests ont réussi.",
     "Open documentation" : "Voir la documentation",
@@ -146,6 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Autoriser les utilisateurs à envoyer des notifications de partage par e-mail",
     "Exclude groups from sharing" : "Empêcher certains groupes de partager",
     "These groups will still be able to receive shares, but not to initiate them." : "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Autoriser la complétion du nom d'utilisateur dans les champs de partage. Sinon le nom complet d'utilisateur doit être indiqué.",
     "Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
     "Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
     "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 3cf724abc26..327801cf0e9 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -116,17 +116,20 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php ne semble pas être configuré de manière à récupérer les valeurs des variables d’environnement. Le test de la commande getenv(\"PATH\") retourne seulement une réponse vide. ",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez vérifier <a target=\"_blank\" href=\"%s\">la documentation d'installation ↗</a> concernant les instructions de configuration de php ainsi que la configuration de votre serveur, en particulier dans le cas où vous utilisez php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé, cela peut conduire à des conflits d'accès. Activer 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
     "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux n'ont pu être configurés avec prise en charge d'UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nous vous recommandons d'installer sur votre système les paquets nécessaires à la prise en charge de l'un des paramètres régionaux suivants : %s",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers utilise la base de données comme moteur de verrouillage, pour de meilleures performances il est recommandé de configurer le memcache pour le verrouillage. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>,  et cherchez des erreurs ou avertissements dans  <a href=\"#log-section\">les logs</a>.",
     "All checks passed." : "Tous les tests ont réussi.",
     "Open documentation" : "Voir la documentation",
@@ -144,6 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "Autoriser les utilisateurs à envoyer des notifications de partage par e-mail",
     "Exclude groups from sharing" : "Empêcher certains groupes de partager",
     "These groups will still be able to receive shares, but not to initiate them." : "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Autoriser la complétion du nom d'utilisateur dans les champs de partage. Sinon le nom complet d'utilisateur doit être indiqué.",
     "Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
     "Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
     "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 4279a8d41ca..7081214d89d 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -149,6 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Consenti agli utenti di inviare email di notifica per i file condivisi con altri utenti",
     "Exclude groups from sharing" : "Escludi gruppi dalla condivisione",
     "These groups will still be able to receive shares, but not to initiate them." : "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Consenti il completamento del nome utente nella finestra di condivisione. Se è disabilitata, è necessario digitare il nome utente completo.",
     "Last cron job execution: %s." : "Ultima esecuzione di cron: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Ultima esecuzione di cron: %s. Potrebbe esserci un problema.",
     "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 416d5706280..70325f7071a 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -147,6 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "Consenti agli utenti di inviare email di notifica per i file condivisi con altri utenti",
     "Exclude groups from sharing" : "Escludi gruppi dalla condivisione",
     "These groups will still be able to receive shares, but not to initiate them." : "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Consenti il completamento del nome utente nella finestra di condivisione. Se è disabilitata, è necessario digitare il nome utente completo.",
     "Last cron job execution: %s." : "Ultima esecuzione di cron: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Ultima esecuzione di cron: %s. Potrebbe esserci un problema.",
     "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index d2026810359..650879510dc 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -149,6 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Sta gebruikers toe om e-mailnotificaties aan andere gebruikers te versturen voor gedeelde bestanden",
     "Exclude groups from sharing" : "Sluit groepen uit van delen",
     "These groups will still be able to receive shares, but not to initiate them." : "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Sta auto-aanvullen van gebruikersnaam toe in de Delen-dialoog. Als dit is uitgeschakeld, moet de gebruikersnaam volledig worden ingevuld.",
     "Last cron job execution: %s." : "Laatst uitgevoerde cronjob: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Laatst uitgevoerde cronjob: %s. Er lijkt iets fout gegaan.",
     "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 42c1dacf922..faf920b43ef 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -147,6 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "Sta gebruikers toe om e-mailnotificaties aan andere gebruikers te versturen voor gedeelde bestanden",
     "Exclude groups from sharing" : "Sluit groepen uit van delen",
     "These groups will still be able to receive shares, but not to initiate them." : "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Sta auto-aanvullen van gebruikersnaam toe in de Delen-dialoog. Als dit is uitgeschakeld, moet de gebruikersnaam volledig worden ingevuld.",
     "Last cron job execution: %s." : "Laatst uitgevoerde cronjob: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Laatst uitgevoerde cronjob: %s. Er lijkt iets fout gegaan.",
     "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
index c4e745e368e..3fce61d224b 100644
--- a/settings/l10n/oc.js
+++ b/settings/l10n/oc.js
@@ -28,6 +28,7 @@ OC.L10N.register(
     "Unable to change password" : "Impossible de modificar lo senhal",
     "Enabled" : "Activadas",
     "Not enabled" : "Desactivadas",
+    "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "A problem occurred, please check your log files (Error: %s)" : "Una error s'es produsida, verificatz vòstres fichièrs de log (Error: %s)",
     "Migration Completed" : "Migracion acabada",
     "Group already exists." : "Aqueste grop existís ja.",
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
index 9a2d5a5bc2d..b1df1e9bd24 100644
--- a/settings/l10n/oc.json
+++ b/settings/l10n/oc.json
@@ -26,6 +26,7 @@
     "Unable to change password" : "Impossible de modificar lo senhal",
     "Enabled" : "Activadas",
     "Not enabled" : "Desactivadas",
+    "Federated Cloud Sharing" : "Federated Cloud Sharing",
     "A problem occurred, please check your log files (Error: %s)" : "Una error s'es produsida, verificatz vòstres fichièrs de log (Error: %s)",
     "Migration Completed" : "Migracion acabada",
     "Group already exists." : "Aqueste grop existís ja.",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 3819e70d5ac..f4bbc350a93 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -149,6 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Permitir aos usuários enviar notificação de email de arquivos compartilhados para outros usuários",
     "Exclude groups from sharing" : "Excluir grupos de compartilhamento",
     "These groups will still be able to receive shares, but not to initiate them." : "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Permitir autocompletar nome de usuário no diálogo de compartilhamento. Se isto estiver desativado o nome de usuário completo precisa ser inserido.",
     "Last cron job execution: %s." : "Última execução do trabalho cron: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Última execução do trabalho cron: %s. Algo parece errado.",
     "Cron was not executed yet!" : "Cron não foi executado ainda!",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index bba1b4b5847..f27256b828f 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -147,6 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "Permitir aos usuários enviar notificação de email de arquivos compartilhados para outros usuários",
     "Exclude groups from sharing" : "Excluir grupos de compartilhamento",
     "These groups will still be able to receive shares, but not to initiate them." : "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Permitir autocompletar nome de usuário no diálogo de compartilhamento. Se isto estiver desativado o nome de usuário completo precisa ser inserido.",
     "Last cron job execution: %s." : "Última execução do trabalho cron: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Última execução do trabalho cron: %s. Algo parece errado.",
     "Cron was not executed yet!" : "Cron não foi executado ainda!",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index d2d08df164c..2a89154dafc 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -4,7 +4,7 @@ OC.L10N.register(
     "Redis" : "Redis",
     "Security & setup warnings" : "Попередження безпеки та налаштування",
     "Sharing" : "Спільний доступ",
-    "Server-side encryption" : "Серверне шіфрування",
+    "Server-side encryption" : "Шифрування на сервері",
     "External Storage" : "Зовнішні сховища",
     "Cron" : "Планувальник Cron",
     "Email server" : "Сервер електронної пошти",
@@ -12,35 +12,37 @@ OC.L10N.register(
     "Tips & tricks" : "Поради і трюки",
     "Updates" : "Оновлення",
     "Authentication error" : "Помилка автентифікації",
-    "Your full name has been changed." : "Ваше ім'я було змінене",
-    "Unable to change full name" : "Неможливо змінити ім'я",
+    "Your full name has been changed." : "Ваше повне ім'я було змінено",
+    "Unable to change full name" : "Неможливо змінити повне ім'я",
     "Couldn't remove app." : "Неможливо видалити додаток.",
-    "Language changed" : "Мова змінена",
+    "Language changed" : "Мову змінено",
     "Invalid request" : "Некоректний запит",
     "Admins can't remove themself from the admin group" : "Адміністратор не може видалити себе з групи адміністраторів",
     "Unable to add user to group %s" : "Не вдалося додати користувача у групу %s",
     "Unable to remove user from group %s" : "Не вдалося видалити користувача із групи %s",
-    "Couldn't update app." : "Не вдалося оновити програму. ",
+    "Couldn't update app." : "Не вдалося оновити додаток. ",
     "Wrong password" : "Невірний пароль",
-    "No user supplied" : "Користувач не знайдений",
-    "Please provide an admin recovery password, otherwise all user data will be lost" : "Будь ласка введіть пароль адміністратора для відновлення, інакше всі дані будуть втрачені",
-    "Wrong admin recovery password. Please check the password and try again." : "Невірний пароль адміністратора для відновлення.  Будь ласка, перевірте пароль та спробуйте ще раз.",
-    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Використовуваний механізм не підтримує зміну паролів, але користувальницький ключ шифрування був успішно змінено",
+    "No user supplied" : "Користувача не вказано",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Будь ласка введіть пароль відновлення адміністратора, інакше всі дані будуть втрачені",
+    "Wrong admin recovery password. Please check the password and try again." : "Невірний пароль відновлення адміністратора.  Будь ласка, перевірте пароль та спробуйте ще раз.",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Backend не підтримує зміну паролів, але користувацький ключ шифрування було успішно змінено",
     "Unable to change password" : "Неможливо змінити пароль",
     "Enabled" : "Увімкнено",
     "Not enabled" : "Вимкнено",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "встановлення та оновлення додатків через магазин додатків або Об’єднання хмарних сховищ",
     "Federated Cloud Sharing" : "Об’єднання хмарних сховищ",
-    "A problem occurred, please check your log files (Error: %s)" : "Виникла проблема, будь ласка, перевірте свої журнальні файли (Помилка:%s)",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL використовує застарілу версію %s (%s). Будь ласка, поновіть вашу операційну систему або функції, такі як %s не працюватимуть надійно.",
+    "A problem occurred, please check your log files (Error: %s)" : "Виникла проблема, будь ласка, перевірте свої файли журналів (Помилка: %s)",
     "Migration Completed" : "Міграцію завершено",
     "Group already exists." : "Група вже існує.",
     "Unable to add group." : "Неможливо додати групу.",
     "Unable to delete group." : "Неможливо видалити групу.",
-    "log-level out of allowed range" : "Перевищений розмір файлу-журналу",
-    "Saved" : "Збереженно",
-    "test email settings" : "перевірити налаштування електронної пошти",
-    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Під час відправки email сталася помилка. Будь ласка перевірте налаштування. (Помилка:%s)",
-    "Email sent" : "Ел. пошта надіслана",
-    "You need to set your user email before being able to send test emails." : "Перед надсиланням тестових повідомлень ви повинні вказати свою електронну адресу.",
+    "log-level out of allowed range" : "рівень протоколювання перевищує дозволені межі",
+    "Saved" : "Збережено",
+    "test email settings" : "тест налаштувань електронної пошти",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Під час надсилання email сталася помилка. Будь ласка перевірте налаштування. (Помилка: %s)",
+    "Email sent" : "Лист надіслано",
+    "You need to set your user email before being able to send test emails." : "Перед надсиланням тестових листів ви повинні вказати свою email адресу.",
     "Invalid mail address" : "Неправильна email адреса",
     "A user with that name already exists." : "Користувач з таким іменем вже існує.",
     "Unable to create user." : "Неможливо створити користувача.",
@@ -56,22 +58,25 @@ OC.L10N.register(
     "Migration started …" : "Міграцію розпочато ...",
     "Sending..." : "Надсилання...",
     "Official" : "Офіційні",
+    "Approved" : "Схвалені",
     "Experimental" : "Експериментальні",
     "All" : "Всі",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Офіційні застосунки розроблені спільнотою ownCloud. Вони реалізують основні можливості ownCloud і готові до використання в продакшні.",
-    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Схвалені застосунки розроблені довіреними розробниками і пройшли незалежну перевірку безпеки. Їх активно супроводжують у репозиторії з відкритим кодом, а їх розробники стежать, щоб вони були стабільні й прийнятні для повсякденного використання.",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Офіційні додатки розроблені спільнотою ownCloud. Вони реалізують основні можливості ownCloud і готові до використання в продакшені.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Схвалені додатки розроблені довіреними розробниками і пройшли незалежну перевірку безпеки. Їх активно супроводжують у репозиторії з відкритим кодом, а їх розробники стежать, щоб вони були стабільні й прийнятні для повсякденного використання.",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ця програма не перевірена на вразливості безпеки і є новою або нестабільною. Встановлюйте її на власний ризик.",
     "Update to %s" : "Оновити до %s",
     "Please wait...." : "Зачекайте, будь ласка...",
-    "Error while disabling app" : "Помилка відключення додатка",
+    "Error while disabling app" : "Помилка вимикання додатка",
     "Disable" : "Вимкнути",
-    "Enable" : "Включити",
-    "Error while enabling app" : "Помилка підключення додатка",
+    "Enable" : "Увімкнути",
+    "Error while enabling app" : "Помилка вмикання додатка",
     "Updating...." : "Оновлюється...",
-    "Error while updating app" : "Помилка при оновленні програми",
+    "Error while updating app" : "Помилка при оновленні додатку",
     "Updated" : "Оновлено",
     "Uninstalling ...." : "Видалення...",
     "Error while uninstalling app" : "Помилка видалення додатка",
     "Uninstall" : "Видалити",
+    "An error occurred: {message}" : "Сталася помилка: {message}",
     "Select a profile picture" : "Обрати зображення облікового запису",
     "Very weak password" : "Дуже слабкий пароль",
     "Weak password" : "Слабкий пароль",
@@ -95,11 +100,11 @@ OC.L10N.register(
     "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
     "Error creating user" : "Помилка при створенні користувача",
     "A valid password must be provided" : "Потрібно задати вірний пароль",
-    "A valid email must be provided" : "Вкажіть дійсний e-mail",
+    "A valid email must be provided" : "Вкажіть дійсний email",
     "__language_name__" : "__language_name__",
-    "Sync clients" : "Синхронізація клієнтів",
+    "Sync clients" : "Клієнти синхронізації",
     "Personal info" : "Особиста інформація",
-    "SSL root certificates" : "SSL кореневі сертифікати",
+    "SSL root certificates" : "Кореневі SSL сертифікати",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
     "Info, warnings, errors and fatal issues" : "Інформаційні, попередження, помилки та критичні проблеми",
     "Warnings, errors and fatal issues" : "Попередження, помилки та критичні проблеми",
@@ -121,6 +126,7 @@ OC.L10N.register(
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Пропонуємо встановити необхідні пакети для вашої системи для підтримки однієї з наступних мов %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію \"overwrite.cli.url\" файлу config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не вдалося запустити завдання планувальника через CLI. Відбулися наступні технічні помилки:",
+    "All checks passed." : "Всі перевірки пройдено.",
     "Open documentation" : "Відкрити документацію",
     "Allow apps to use the Share API" : "Дозволити програмам використовувати API спільного доступу",
     "Allow users to share via link" : "Дозволити користувачам ділитися через посилання",
@@ -130,58 +136,60 @@ OC.L10N.register(
     "Set default expiration date" : "Встановити термін дії за замовчуванням",
     "Expire after " : "Скінчиться через",
     "days" : "днів",
-    "Enforce expiration date" : "Термін дії обов'язково",
+    "Enforce expiration date" : "Термін дії обов'язковий",
     "Allow resharing" : "Дозволити перевідкривати спільний доступ",
     "Restrict users to only share with users in their groups" : "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
     "Allow users to send mail notification for shared files to other users" : "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
     "Exclude groups from sharing" : "Виключити групи зі спільного доступу",
     "These groups will still be able to receive shares, but not to initiate them." : "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
-    "Last cron job execution: %s." : "Останне виконане Cron завдання: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Останне виконане Cron завдання: %s. Щось здається неправильним.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Дозволи автодоповнення імені користувача в діалозі спільного доступу. Якщо вимкнено - треба буде вводити повне ім’я користувача.",
+    "Last cron job execution: %s." : "Останнє виконане Cron завдання: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Останнє виконане Cron завдання: %s. Щось здається неправильним.",
     "Cron was not executed yet!" : "Cron-задачі ще не запускалися!",
     "Execute one task with each page loaded" : "Виконати одне завдання для кожної завантаженої сторінки ",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зареєстрований в службі webcron та буде викликатися кожні 15 хвилин через HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Використовувати системний cron для виклику cron.php кожні 15 хвилин.",
-    "Enable server-side encryption" : "Увімкнути серверне шіфрування",
+    "Enable server-side encryption" : "Увімкнути шифрування на сервері",
     "Enable encryption" : "Увімкнути шифрування",
     "Select default encryption module:" : "Обрати модуль шифрування за замовчуванням:",
     "Start migration" : "Розпочати міграцію",
     "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
-    "Send mode" : "Надіслати повідомлення",
+    "Send mode" : "Режим надсилання",
     "Encryption" : "Шифрування",
     "From address" : "Адреса відправника",
     "mail" : "пошта",
-    "Authentication method" : "Метод перевірки автентифікації",
+    "Authentication method" : "Спосіб аутентифікації",
     "Authentication required" : "Потрібна аутентифікація",
     "Server address" : "Адреса сервера",
     "Port" : "Порт",
     "Credentials" : "Облікові дані",
     "SMTP Username" : "Ім'я користувача SMTP",
     "SMTP Password" : "Пароль SMTP",
-    "Store credentials" : "Зберігання облікових даних",
-    "Test email settings" : "Перевірити налаштування електронної пошти",
+    "Store credentials" : "Зберігати облікові дані",
+    "Test email settings" : "Тестувати налаштування електронної пошти",
     "Send email" : "Надіслати листа",
     "Log level" : "Рівень протоколювання",
     "Download logfile" : "Завантажити файл журналу",
     "More" : "Більше",
     "Less" : "Менше",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Журнал-файл - більше 100 МБ. Його скачування може зайняти деякий час!",
-    "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В якості бази даних використовується SQLite. Для великих установок ми рекомендуємо переключитися на інший тип серверу баз даних.",
-    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особливо викликає сумнів використання SQLite при синхронізації файлів з використанням клієнта для ПК.",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Файл журналу - більше 100 МБ. Його завантаження може зайняти деякий час!",
+    "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В якості бази даних використовується SQLite. Для великих установок ми рекомендуємо перейти на інший тип серверу баз даних.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особливо сумнівне використання SQLite при синхронізації файлів з використанням клієнта для ПК.",
     "How to do backups" : "Як робити резервне копіювання",
-    "Advanced monitoring" : "Просунутий моніторинг",
+    "Advanced monitoring" : "Розширений моніторинг",
     "Performance tuning" : "Налаштування продуктивності",
-    "Improving the config.php" : "Покращення ",
+    "Improving the config.php" : "Покращення  config.php",
     "Theming" : "Оформлення",
     "Hardening and security guidance" : "Інструктування з безпеки та захисту",
     "Version" : "Версія",
     "Developer documentation" : "Документація для розробників",
-    "Experimental applications ahead" : "Спершу експериментальні застосунки",
-    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Експериментальні застосунки не перевірені на наявність проблем безпеки, нові або нестабільні і в процесі активної розробки. Встановлення їх може спричинити втрату даних або дірки в безпеці.",
+    "Experimental applications ahead" : "Спершу експериментальні додатки",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Експериментальні додатки не перевірені на наявність проблем безпеки, нові або нестабільні і в процесі активної розробки. Встановлення їх може спричинити втрату даних або дірки в безпеці.",
     "by" : "по",
     "licensed" : "Ліцензовано",
     "Documentation:" : "Документація:",
     "User documentation" : "Користувацька документація",
+    "Admin documentation" : "Документація адміністратора",
     "Show description …" : "Показати деталі ...",
     "Hide description …" : "Сховати деталі ...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Ця програма не може бути встановлено, так як наступні залежності не будуть виконані:",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index 8105eb7e379..de302d28aee 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -2,7 +2,7 @@
     "Redis" : "Redis",
     "Security & setup warnings" : "Попередження безпеки та налаштування",
     "Sharing" : "Спільний доступ",
-    "Server-side encryption" : "Серверне шіфрування",
+    "Server-side encryption" : "Шифрування на сервері",
     "External Storage" : "Зовнішні сховища",
     "Cron" : "Планувальник Cron",
     "Email server" : "Сервер електронної пошти",
@@ -10,35 +10,37 @@
     "Tips & tricks" : "Поради і трюки",
     "Updates" : "Оновлення",
     "Authentication error" : "Помилка автентифікації",
-    "Your full name has been changed." : "Ваше ім'я було змінене",
-    "Unable to change full name" : "Неможливо змінити ім'я",
+    "Your full name has been changed." : "Ваше повне ім'я було змінено",
+    "Unable to change full name" : "Неможливо змінити повне ім'я",
     "Couldn't remove app." : "Неможливо видалити додаток.",
-    "Language changed" : "Мова змінена",
+    "Language changed" : "Мову змінено",
     "Invalid request" : "Некоректний запит",
     "Admins can't remove themself from the admin group" : "Адміністратор не може видалити себе з групи адміністраторів",
     "Unable to add user to group %s" : "Не вдалося додати користувача у групу %s",
     "Unable to remove user from group %s" : "Не вдалося видалити користувача із групи %s",
-    "Couldn't update app." : "Не вдалося оновити програму. ",
+    "Couldn't update app." : "Не вдалося оновити додаток. ",
     "Wrong password" : "Невірний пароль",
-    "No user supplied" : "Користувач не знайдений",
-    "Please provide an admin recovery password, otherwise all user data will be lost" : "Будь ласка введіть пароль адміністратора для відновлення, інакше всі дані будуть втрачені",
-    "Wrong admin recovery password. Please check the password and try again." : "Невірний пароль адміністратора для відновлення.  Будь ласка, перевірте пароль та спробуйте ще раз.",
-    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Використовуваний механізм не підтримує зміну паролів, але користувальницький ключ шифрування був успішно змінено",
+    "No user supplied" : "Користувача не вказано",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Будь ласка введіть пароль відновлення адміністратора, інакше всі дані будуть втрачені",
+    "Wrong admin recovery password. Please check the password and try again." : "Невірний пароль відновлення адміністратора.  Будь ласка, перевірте пароль та спробуйте ще раз.",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "Backend не підтримує зміну паролів, але користувацький ключ шифрування було успішно змінено",
     "Unable to change password" : "Неможливо змінити пароль",
     "Enabled" : "Увімкнено",
     "Not enabled" : "Вимкнено",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "встановлення та оновлення додатків через магазин додатків або Об’єднання хмарних сховищ",
     "Federated Cloud Sharing" : "Об’єднання хмарних сховищ",
-    "A problem occurred, please check your log files (Error: %s)" : "Виникла проблема, будь ласка, перевірте свої журнальні файли (Помилка:%s)",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL використовує застарілу версію %s (%s). Будь ласка, поновіть вашу операційну систему або функції, такі як %s не працюватимуть надійно.",
+    "A problem occurred, please check your log files (Error: %s)" : "Виникла проблема, будь ласка, перевірте свої файли журналів (Помилка: %s)",
     "Migration Completed" : "Міграцію завершено",
     "Group already exists." : "Група вже існує.",
     "Unable to add group." : "Неможливо додати групу.",
     "Unable to delete group." : "Неможливо видалити групу.",
-    "log-level out of allowed range" : "Перевищений розмір файлу-журналу",
-    "Saved" : "Збереженно",
-    "test email settings" : "перевірити налаштування електронної пошти",
-    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Під час відправки email сталася помилка. Будь ласка перевірте налаштування. (Помилка:%s)",
-    "Email sent" : "Ел. пошта надіслана",
-    "You need to set your user email before being able to send test emails." : "Перед надсиланням тестових повідомлень ви повинні вказати свою електронну адресу.",
+    "log-level out of allowed range" : "рівень протоколювання перевищує дозволені межі",
+    "Saved" : "Збережено",
+    "test email settings" : "тест налаштувань електронної пошти",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Під час надсилання email сталася помилка. Будь ласка перевірте налаштування. (Помилка: %s)",
+    "Email sent" : "Лист надіслано",
+    "You need to set your user email before being able to send test emails." : "Перед надсиланням тестових листів ви повинні вказати свою email адресу.",
     "Invalid mail address" : "Неправильна email адреса",
     "A user with that name already exists." : "Користувач з таким іменем вже існує.",
     "Unable to create user." : "Неможливо створити користувача.",
@@ -54,22 +56,25 @@
     "Migration started …" : "Міграцію розпочато ...",
     "Sending..." : "Надсилання...",
     "Official" : "Офіційні",
+    "Approved" : "Схвалені",
     "Experimental" : "Експериментальні",
     "All" : "Всі",
-    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Офіційні застосунки розроблені спільнотою ownCloud. Вони реалізують основні можливості ownCloud і готові до використання в продакшні.",
-    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Схвалені застосунки розроблені довіреними розробниками і пройшли незалежну перевірку безпеки. Їх активно супроводжують у репозиторії з відкритим кодом, а їх розробники стежать, щоб вони були стабільні й прийнятні для повсякденного використання.",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Офіційні додатки розроблені спільнотою ownCloud. Вони реалізують основні можливості ownCloud і готові до використання в продакшені.",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Схвалені додатки розроблені довіреними розробниками і пройшли незалежну перевірку безпеки. Їх активно супроводжують у репозиторії з відкритим кодом, а їх розробники стежать, щоб вони були стабільні й прийнятні для повсякденного використання.",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ця програма не перевірена на вразливості безпеки і є новою або нестабільною. Встановлюйте її на власний ризик.",
     "Update to %s" : "Оновити до %s",
     "Please wait...." : "Зачекайте, будь ласка...",
-    "Error while disabling app" : "Помилка відключення додатка",
+    "Error while disabling app" : "Помилка вимикання додатка",
     "Disable" : "Вимкнути",
-    "Enable" : "Включити",
-    "Error while enabling app" : "Помилка підключення додатка",
+    "Enable" : "Увімкнути",
+    "Error while enabling app" : "Помилка вмикання додатка",
     "Updating...." : "Оновлюється...",
-    "Error while updating app" : "Помилка при оновленні програми",
+    "Error while updating app" : "Помилка при оновленні додатку",
     "Updated" : "Оновлено",
     "Uninstalling ...." : "Видалення...",
     "Error while uninstalling app" : "Помилка видалення додатка",
     "Uninstall" : "Видалити",
+    "An error occurred: {message}" : "Сталася помилка: {message}",
     "Select a profile picture" : "Обрати зображення облікового запису",
     "Very weak password" : "Дуже слабкий пароль",
     "Weak password" : "Слабкий пароль",
@@ -93,11 +98,11 @@
     "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
     "Error creating user" : "Помилка при створенні користувача",
     "A valid password must be provided" : "Потрібно задати вірний пароль",
-    "A valid email must be provided" : "Вкажіть дійсний e-mail",
+    "A valid email must be provided" : "Вкажіть дійсний email",
     "__language_name__" : "__language_name__",
-    "Sync clients" : "Синхронізація клієнтів",
+    "Sync clients" : "Клієнти синхронізації",
     "Personal info" : "Особиста інформація",
-    "SSL root certificates" : "SSL кореневі сертифікати",
+    "SSL root certificates" : "Кореневі SSL сертифікати",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
     "Info, warnings, errors and fatal issues" : "Інформаційні, попередження, помилки та критичні проблеми",
     "Warnings, errors and fatal issues" : "Попередження, помилки та критичні проблеми",
@@ -119,6 +124,7 @@
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Пропонуємо встановити необхідні пакети для вашої системи для підтримки однієї з наступних мов %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію \"overwrite.cli.url\" файлу config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не вдалося запустити завдання планувальника через CLI. Відбулися наступні технічні помилки:",
+    "All checks passed." : "Всі перевірки пройдено.",
     "Open documentation" : "Відкрити документацію",
     "Allow apps to use the Share API" : "Дозволити програмам використовувати API спільного доступу",
     "Allow users to share via link" : "Дозволити користувачам ділитися через посилання",
@@ -128,58 +134,60 @@
     "Set default expiration date" : "Встановити термін дії за замовчуванням",
     "Expire after " : "Скінчиться через",
     "days" : "днів",
-    "Enforce expiration date" : "Термін дії обов'язково",
+    "Enforce expiration date" : "Термін дії обов'язковий",
     "Allow resharing" : "Дозволити перевідкривати спільний доступ",
     "Restrict users to only share with users in their groups" : "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
     "Allow users to send mail notification for shared files to other users" : "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
     "Exclude groups from sharing" : "Виключити групи зі спільного доступу",
     "These groups will still be able to receive shares, but not to initiate them." : "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
-    "Last cron job execution: %s." : "Останне виконане Cron завдання: %s.",
-    "Last cron job execution: %s. Something seems wrong." : "Останне виконане Cron завдання: %s. Щось здається неправильним.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Дозволи автодоповнення імені користувача в діалозі спільного доступу. Якщо вимкнено - треба буде вводити повне ім’я користувача.",
+    "Last cron job execution: %s." : "Останнє виконане Cron завдання: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Останнє виконане Cron завдання: %s. Щось здається неправильним.",
     "Cron was not executed yet!" : "Cron-задачі ще не запускалися!",
     "Execute one task with each page loaded" : "Виконати одне завдання для кожної завантаженої сторінки ",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зареєстрований в службі webcron та буде викликатися кожні 15 хвилин через HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Використовувати системний cron для виклику cron.php кожні 15 хвилин.",
-    "Enable server-side encryption" : "Увімкнути серверне шіфрування",
+    "Enable server-side encryption" : "Увімкнути шифрування на сервері",
     "Enable encryption" : "Увімкнути шифрування",
     "Select default encryption module:" : "Обрати модуль шифрування за замовчуванням:",
     "Start migration" : "Розпочати міграцію",
     "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
-    "Send mode" : "Надіслати повідомлення",
+    "Send mode" : "Режим надсилання",
     "Encryption" : "Шифрування",
     "From address" : "Адреса відправника",
     "mail" : "пошта",
-    "Authentication method" : "Метод перевірки автентифікації",
+    "Authentication method" : "Спосіб аутентифікації",
     "Authentication required" : "Потрібна аутентифікація",
     "Server address" : "Адреса сервера",
     "Port" : "Порт",
     "Credentials" : "Облікові дані",
     "SMTP Username" : "Ім'я користувача SMTP",
     "SMTP Password" : "Пароль SMTP",
-    "Store credentials" : "Зберігання облікових даних",
-    "Test email settings" : "Перевірити налаштування електронної пошти",
+    "Store credentials" : "Зберігати облікові дані",
+    "Test email settings" : "Тестувати налаштування електронної пошти",
     "Send email" : "Надіслати листа",
     "Log level" : "Рівень протоколювання",
     "Download logfile" : "Завантажити файл журналу",
     "More" : "Більше",
     "Less" : "Менше",
-    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Журнал-файл - більше 100 МБ. Його скачування може зайняти деякий час!",
-    "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В якості бази даних використовується SQLite. Для великих установок ми рекомендуємо переключитися на інший тип серверу баз даних.",
-    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особливо викликає сумнів використання SQLite при синхронізації файлів з використанням клієнта для ПК.",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Файл журналу - більше 100 МБ. Його завантаження може зайняти деякий час!",
+    "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В якості бази даних використовується SQLite. Для великих установок ми рекомендуємо перейти на інший тип серверу баз даних.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особливо сумнівне використання SQLite при синхронізації файлів з використанням клієнта для ПК.",
     "How to do backups" : "Як робити резервне копіювання",
-    "Advanced monitoring" : "Просунутий моніторинг",
+    "Advanced monitoring" : "Розширений моніторинг",
     "Performance tuning" : "Налаштування продуктивності",
-    "Improving the config.php" : "Покращення ",
+    "Improving the config.php" : "Покращення  config.php",
     "Theming" : "Оформлення",
     "Hardening and security guidance" : "Інструктування з безпеки та захисту",
     "Version" : "Версія",
     "Developer documentation" : "Документація для розробників",
-    "Experimental applications ahead" : "Спершу експериментальні застосунки",
-    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Експериментальні застосунки не перевірені на наявність проблем безпеки, нові або нестабільні і в процесі активної розробки. Встановлення їх може спричинити втрату даних або дірки в безпеці.",
+    "Experimental applications ahead" : "Спершу експериментальні додатки",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "Експериментальні додатки не перевірені на наявність проблем безпеки, нові або нестабільні і в процесі активної розробки. Встановлення їх може спричинити втрату даних або дірки в безпеці.",
     "by" : "по",
     "licensed" : "Ліцензовано",
     "Documentation:" : "Документація:",
     "User documentation" : "Користувацька документація",
+    "Admin documentation" : "Документація адміністратора",
     "Show description …" : "Показати деталі ...",
     "Hide description …" : "Сховати деталі ...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Ця програма не може бути встановлено, так як наступні залежності не будуть виконані:",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 992d70465e3..2b6205f2f4c 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -118,17 +118,20 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 似乎没有设置好查询的系统环境变量。 用 getenv(\\\"PATH\\\") 测试只返回一个空值。",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "请检查PHP配置说明和服务器的 PHP 配置的 <a target=\"_blank\" href=\"%s\">安装文档 ↗</a>，使用 PHP-FPM 时尤其如此。",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "只读配置已启用。这样可防止通过 WEB 接口设置一些配置。此外，每次更新后该文件需要手动设置为可写。",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "你的服务器是运行于 Microsoft Windows 系统。我们强烈推荐使用 Linux 系统以获得最佳的用户体验。比如中文文件夹和文件名支持。",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s 下版本 %2$s 已安装。基于稳定和性能的原因，我们强烈建议更新至 %1$s 版本。",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "事务文件锁定被禁用，这可能会导致竞争条件问题。在config.php 中启用“filelocking.enabled”可以避免这些问题。请参阅<a target=\"_blank\" href=\"%s\">文档↗</a>了解详情。",
     "System locale can not be set to a one which supports UTF-8." : "系统语系无法设置为支持 UTF-8 的语系。",
     "This means that there might be problems with certain characters in file names." : "这意味着一些文件名中的特定字符可能有问题。",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "我们强烈建议安装在系统上所需的软件包支持以下区域设置之一： %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你不是安装在网域根目录而且又使用系统定时计划任务，那么可以导致 URL 链接生成问题。为了避免这些问题，请在你的 Config.php 文件中设置 \\\"overwrite.cli.url\\\" 选项为 webroot 安装根目录 (建议: \\\"%s\\\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "由于下面的错误，无法通过 CLI 执行定时计划任务:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "事务文件锁定正在使用的数据库作为锁定后端，为获得最佳的性能建议配置的 memcache 用来锁定。请参阅<a target=\"_blank\" href=\"%s\">文档↗</a>了解详情。",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "请点击检查 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 安装向导 ↗</a>, 点击 <a href=\\\"#log-section\\\"> 日志 </a>查看详细错误和警告。",
     "All checks passed." : "所有检查已通过。",
     "Open documentation" : "打开文档",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 97eae6702a7..e67cba96e37 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -116,17 +116,20 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 似乎没有设置好查询的系统环境变量。 用 getenv(\\\"PATH\\\") 测试只返回一个空值。",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "请检查PHP配置说明和服务器的 PHP 配置的 <a target=\"_blank\" href=\"%s\">安装文档 ↗</a>，使用 PHP-FPM 时尤其如此。",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "只读配置已启用。这样可防止通过 WEB 接口设置一些配置。此外，每次更新后该文件需要手动设置为可写。",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "你的服务器是运行于 Microsoft Windows 系统。我们强烈推荐使用 Linux 系统以获得最佳的用户体验。比如中文文件夹和文件名支持。",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s 下版本 %2$s 已安装。基于稳定和性能的原因，我们强烈建议更新至 %1$s 版本。",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "事务文件锁定被禁用，这可能会导致竞争条件问题。在config.php 中启用“filelocking.enabled”可以避免这些问题。请参阅<a target=\"_blank\" href=\"%s\">文档↗</a>了解详情。",
     "System locale can not be set to a one which supports UTF-8." : "系统语系无法设置为支持 UTF-8 的语系。",
     "This means that there might be problems with certain characters in file names." : "这意味着一些文件名中的特定字符可能有问题。",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "我们强烈建议安装在系统上所需的软件包支持以下区域设置之一： %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你不是安装在网域根目录而且又使用系统定时计划任务，那么可以导致 URL 链接生成问题。为了避免这些问题，请在你的 Config.php 文件中设置 \\\"overwrite.cli.url\\\" 选项为 webroot 安装根目录 (建议: \\\"%s\\\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "由于下面的错误，无法通过 CLI 执行定时计划任务:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "事务文件锁定正在使用的数据库作为锁定后端，为获得最佳的性能建议配置的 memcache 用来锁定。请参阅<a target=\"_blank\" href=\"%s\">文档↗</a>了解详情。",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "请点击检查 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 安装向导 ↗</a>, 点击 <a href=\\\"#log-section\\\"> 日志 </a>查看详细错误和警告。",
     "All checks passed." : "所有检查已通过。",
     "Open documentation" : "打开文档",
-- 
GitLab


From f35b6833ff2f702db75999bfd9343e7bc2fc7f2c Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 28 Sep 2015 11:19:49 +0200
Subject: [PATCH 535/783] Fix order of actions in the files actions menu

---
 apps/files/js/fileactions.js               |  4 +++
 apps/files/js/fileactionsmenu.js           |  8 +++++
 apps/files/js/filelist.js                  |  1 +
 apps/files/tests/js/fileactionsmenuSpec.js | 37 ++++++++++++++++++++++
 4 files changed, 50 insertions(+)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index d3904f2f6d3..bde0b094b87 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -141,6 +141,7 @@
 				name: name,
 				displayName: action.displayName,
 				mime: mime,
+				order: action.order || 0,
 				icon: action.icon,
 				permissions: action.permissions,
 				type: action.type || FileActions.TYPE_DROPDOWN
@@ -565,6 +566,7 @@
 			this.registerAction({
 				name: 'Download',
 				displayName: t('files', 'Download'),
+				order: -20,
 				mime: 'all',
 				permissions: OC.PERMISSION_READ,
 				icon: function () {
@@ -596,6 +598,7 @@
 				name: 'Rename',
 				displayName: t('files', 'Rename'),
 				mime: 'all',
+				order: -30,
 				permissions: OC.PERMISSION_UPDATE,
 				icon: function() {
 					return OC.imagePath('core', 'actions/rename');
@@ -617,6 +620,7 @@
 				name: 'Delete',
 				displayName: t('files', 'Delete'),
 				mime: 'all',
+				order: 1000,
 				// permission is READ because we show a hint instead if there is no permission
 				permissions: OC.PERMISSION_DELETE,
 				icon: function() {
diff --git a/apps/files/js/fileactionsmenu.js b/apps/files/js/fileactionsmenu.js
index 5ab0e42f93e..67cbb48c965 100644
--- a/apps/files/js/fileactionsmenu.js
+++ b/apps/files/js/fileactionsmenu.js
@@ -100,6 +100,14 @@
 					(!defaultAction || actionSpec.name !== defaultAction.name)
 				);
 			});
+			items = items.sort(function(actionA, actionB) {
+				var orderA = actionA.order || 0;
+				var orderB = actionB.order || 0;
+				if (orderB === orderA) {
+					return OC.Util.naturalSortCompare(actionA.displayName, actionB.displayName);
+				}
+				return orderA - orderB;
+			});
 			items = _.map(items, function(item) {
 				item.nameLowerCase = item.name.toLowerCase();
 				return item;
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 8eaae74d3c3..e4a7aadd600 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -302,6 +302,7 @@
 					name: 'Details',
 					displayName: t('files', 'Details'),
 					mime: 'all',
+					order: -50,
 					icon: OC.imagePath('core', 'actions/details'),
 					permissions: OC.PERMISSION_READ,
 					actionHandler: function(fileName, context) {
diff --git a/apps/files/tests/js/fileactionsmenuSpec.js b/apps/files/tests/js/fileactionsmenuSpec.js
index 0cfd12a2d04..dee542458b6 100644
--- a/apps/files/tests/js/fileactionsmenuSpec.js
+++ b/apps/files/tests/js/fileactionsmenuSpec.js
@@ -152,6 +152,43 @@ describe('OCA.Files.FileActionsMenu tests', function() {
 			expect(menu.$el.find('a[data-action=Match]').length).toEqual(1);
 			expect(menu.$el.find('a[data-action=NoMatch]').length).toEqual(0);
 		});
+		it('sorts by order attribute, then name', function() {
+			fileActions.registerAction({
+				name: 'Baction',
+				displayName: 'Baction',
+				order: 2,
+				mime: 'text/plain',
+				permissions: OC.PERMISSION_ALL
+			});
+			fileActions.registerAction({
+				name: 'Zaction',
+				displayName: 'Zaction',
+				order: 1,
+				mime: 'text/plain',
+				permissions: OC.PERMISSION_ALL
+			});
+			fileActions.registerAction({
+				name: 'Yaction',
+				displayName: 'Yaction',
+				mime: 'text/plain',
+				permissions: OC.PERMISSION_ALL
+			});
+			fileActions.registerAction({
+				name: 'Waction',
+				displayName: 'Waction',
+				mime: 'text/plain',
+				permissions: OC.PERMISSION_ALL
+			});
+
+			menu.render();
+			var zactionIndex = menu.$el.find('a[data-action=Zaction]').closest('li').index();
+			var bactionIndex = menu.$el.find('a[data-action=Baction]').closest('li').index();
+			expect(zactionIndex).toBeLessThan(bactionIndex);
+
+			var wactionIndex = menu.$el.find('a[data-action=Waction]').closest('li').index();
+			var yactionIndex = menu.$el.find('a[data-action=Yaction]').closest('li').index();
+			expect(wactionIndex).toBeLessThan(yactionIndex);
+		});
 	});
 
 	describe('action handler', function() {
-- 
GitLab


From fe32beb85d11e7a02e336f0f686f09fe4fe5bacd Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 23 Sep 2015 18:59:21 +0300
Subject: [PATCH 536/783] Add submodule dependency

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 3cd7b7048e3..090119a31aa 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 3cd7b7048e33e0076c1f94cf2ed721934e0c4977
+Subproject commit 090119a31aa7a669becf1549a5d44fe2f129292f
-- 
GitLab


From e3b95e8473679c2f65abc84c07d121ea66059aee Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 23 Sep 2015 19:00:15 +0300
Subject: [PATCH 537/783] Introduce streamer

---
 lib/private/files.php    | 96 ++++++++++++++--------------------------
 lib/private/streamer.php | 87 ++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 63 deletions(-)
 create mode 100644 lib/private/streamer.php

diff --git a/lib/private/files.php b/lib/private/files.php
index 658e708e5de..638d148adc4 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -57,20 +57,15 @@ class OC_Files {
 	/**
 	 * @param string $filename
 	 * @param string $name
-	 * @param bool $zip
 	 */
-	private static function sendHeaders($filename, $name, $zip = false) {
+	private static function sendHeaders($filename, $name) {
 		OC_Response::setContentDispositionHeader($name, 'attachment');
 		header('Content-Transfer-Encoding: binary');
 		OC_Response::disableCaching();
-		if ($zip) {
-			header('Content-Type: application/zip');
-		} else {
-			$filesize = \OC\Files\Filesystem::filesize($filename);
-			header('Content-Type: '.\OC_Helper::getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename)));
-			if ($filesize > -1) {
-				OC_Response::setContentLengthHeader($filesize);
-			}
+		$filesize = \OC\Files\Filesystem::filesize($filename);
+		header('Content-Type: '.\OC_Helper::getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename)));
+		if ($filesize > -1) {
+			OC_Response::setContentLengthHeader($filesize);
 		}
 	}
 
@@ -79,9 +74,9 @@ class OC_Files {
 	 *
 	 * @param string $dir
 	 * @param string $files ; separated list of files to download
-	 * @param boolean $only_header ; boolean to only send header of the request
+	 * @param boolean $onlyHeader ; boolean to only send header of the request
 	 */
-	public static function get($dir, $files, $only_header = false) {
+	public static function get($dir, $files, $onlyHeader = false) {
 		$view = \OC\Files\Filesystem::getView();
 
 		if (is_array($files) && count($files) === 1) {
@@ -89,45 +84,48 @@ class OC_Files {
 		}
 
 		if (is_array($files)) {
-			$get_type = self::ZIP_FILES;
+			$getType = self::ZIP_FILES;
 			$basename = basename($dir);
 			if ($basename) {
-				$name = $basename . '.zip';
+				$name = $basename;
 			} else {
-				$name = 'download.zip';
+				$name = 'download';
 			}
 
 			$filename = $dir . '/' . $name;
 		} else {
 			$filename = $dir . '/' . $files;
 			if (\OC\Files\Filesystem::is_dir($dir . '/' . $files)) {
-				$get_type = self::ZIP_DIR;
+				$getType = self::ZIP_DIR;
 				// downloading root ?
 				if ($files === '') {
-					$name = 'download.zip';
+					$name = 'download';
 				} else {
-					$name = $files . '.zip';
+					$name = $files;
 				}
 
 			} else {
-				$get_type = self::FILE;
+				$getType = self::FILE;
 				$name = $files;
 			}
 		}
 
-		if ($get_type === self::FILE) {
-			$zip = false;
+		if ($getType === self::FILE) {
+			$streamer = false;
 		} else {
-			$zip = new ZipStreamer\ZipStreamer();
+			$streamer = new OC_Streamer();
 		}
 		OC_Util::obEnd();
 
 		try {
-			if ($get_type === self::FILE) {
+			if ($getType === self::FILE) {
 				$view->lockFile($filename, ILockingProvider::LOCK_SHARED);
 			}
-			if ($zip or \OC\Files\Filesystem::isReadable($filename)) {
-				self::sendHeaders($filename, $name, $zip);
+			
+			if ($streamer) {
+				$streamer->sendHeaders($name);
+			} elseif (\OC\Files\Filesystem::isReadable($filename)) {
+				self::sendHeaders($filename, $name);
 			} elseif (!\OC\Files\Filesystem::file_exists($filename)) {
 				header("HTTP/1.0 404 Not Found");
 				$tmpl = new OC_Template('', '404', 'guest');
@@ -137,33 +135,34 @@ class OC_Files {
 				header("HTTP/1.0 403 Forbidden");
 				die('403 Forbidden');
 			}
-			if ($only_header) {
+			if ($onlyHeader) {
 				return;
 			}
-			if ($zip) {
+			if ($streamer) {
 				$executionTime = intval(ini_get('max_execution_time'));
 				set_time_limit(0);
-				if ($get_type === self::ZIP_FILES) {
+				if ($getType === self::ZIP_FILES) {
 					foreach ($files as $file) {
 						$file = $dir . '/' . $file;
 						if (\OC\Files\Filesystem::is_file($file)) {
+							$fileSize = \OC\Files\Filesystem::filesize($file);
 							$fh = \OC\Files\Filesystem::fopen($file, 'r');
-							$zip->addFileFromStream($fh, basename($file));
+							$streamer->addFileFromStream($fh, basename($file), $fileSize);
 							fclose($fh);
 						} elseif (\OC\Files\Filesystem::is_dir($file)) {
-							self::zipAddDir($file, $zip);
+							$streamer->addDirRecoursive($file);
 						}
 					}
-				} elseif ($get_type === self::ZIP_DIR) {
+				} elseif ($getType === self::ZIP_DIR) {
 					$file = $dir . '/' . $files;
-					self::zipAddDir($file, $zip);
+					$streamer->addDirRecoursive($file);
 				}
-				$zip->finalize();
+				$streamer->finalize();
 				set_time_limit($executionTime);
 			} else {
 				\OC\Files\Filesystem::readfile($filename);
 			}
-			if ($get_type === self::FILE) {
+			if ($getType === self::FILE) {
 				$view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
 			}
 		} catch (\OCP\Lock\LockedException $ex) {
@@ -177,35 +176,6 @@ class OC_Files {
 		}
 	}
 
-	/**
-	 * @param string $dir
-	 * @param ZipStreamer $zip
-	 * @param string $internalDir
-	 */
-	public static function zipAddDir($dir, ZipStreamer $zip, $internalDir='') {
-		$dirname=basename($dir);
-		$rootDir = $internalDir.$dirname;
-		if (!empty($rootDir)) {
-			$zip->addEmptyDir($rootDir);
-		}
-		$internalDir.=$dirname.='/';
-		// prevent absolute dirs
-		$internalDir = ltrim($internalDir, '/');
-
-		$files=\OC\Files\Filesystem::getDirectoryContent($dir);
-		foreach($files as $file) {
-			$filename=$file['name'];
-			$file=$dir.'/'.$filename;
-			if(\OC\Files\Filesystem::is_file($file)) {
-				$fh = \OC\Files\Filesystem::fopen($file, 'r');
-				$zip->addFileFromStream($fh, $internalDir.$filename);
-				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
-				self::zipAddDir($file, $zip, $internalDir);
-			}
-		}
-	}
-
 	/**
 	 * set the maximum upload size limit for apache hosts using .htaccess
 	 *
diff --git a/lib/private/streamer.php b/lib/private/streamer.php
new file mode 100644
index 00000000000..7377f31f37b
--- /dev/null
+++ b/lib/private/streamer.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+use \ZipStreamer\ZipStreamer;
+use DeepDiver1975\TarStreamer\TarStreamer;
+
+class OC_Streamer {
+
+	private $streamerInstance;
+	private $extension;
+	
+	public function __construct(){
+		if (0) {
+			$this->streamerInstance = new ZipStreamer();
+		} else {
+			$this->streamerInstance = new TarStreamer();
+		}
+	}
+	
+	public function sendHeaders($name){
+		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
+		return $this->streamerInstance->sendHeaders($name . $extension);
+	}
+	
+	/**
+	 * @param string $dir
+	 * @param string $internalDir
+	 */
+	public function addDirRecoursive($dir, $internalDir='') {
+		$dirname = basename($dir);
+		$rootDir = $internalDir . $dirname;
+		if (!empty($rootDir)) {
+			$this->streamerInstance->addEmptyDir($rootDir);
+		}
+		$internalDir.= $dirname .= '/';
+		// prevent absolute dirs
+		$internalDir = ltrim($internalDir, '/');
+
+		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
+		foreach($files as $file) {
+			$filename = $file['name'];
+			$file = $dir . '/' . $filename;
+			if(\OC\Files\Filesystem::is_file($file)) {
+				$filesize = \OC\Files\Filesystem::filesize($file);
+				$fh = \OC\Files\Filesystem::fopen($file, 'r');
+				$this->streamerInstance->addFileFromStream($fh, $internalDir . $filename, $filesize);
+				fclose($fh);
+			}elseif(\OC\Files\Filesystem::is_dir($file)) {
+				$this->addDirRecoursive($file, $internalDir);
+			}
+		}
+	}
+	
+	public function addFileFromStream($fd, $internalName, $size){
+		if ($this->streamerInstance instanceof ZipStreamer) {
+			return $this->streamerInstance->addFileFromStream($fd, $internalName);
+		} else {
+			return $this->streamerInstance->addFileFromStream($fd, $internalName, $size);
+		}
+	}
+	
+	public function addEmptyDir($dirName){
+		return $this->streamerInstance->addEmptyDir($dirName);
+	}
+	
+	public function finalize(){
+		return $this->streamerInstance->finalize();
+	}
+}
-- 
GitLab


From 74d879d039146259f77b67126dcee9f8aa8f8f75 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Thu, 24 Sep 2015 00:04:33 +0300
Subject: [PATCH 538/783] Add PHpdoc

---
 lib/private/streamer.php | 46 ++++++++++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/lib/private/streamer.php b/lib/private/streamer.php
index 7377f31f37b..aec5fb922ee 100644
--- a/lib/private/streamer.php
+++ b/lib/private/streamer.php
@@ -23,24 +23,38 @@ use \ZipStreamer\ZipStreamer;
 use DeepDiver1975\TarStreamer\TarStreamer;
 
 class OC_Streamer {
+	// array of regexp. Matching user agents will get tar instead of zip
+	private $preferTarFor = [ '/macintosh|mac os x/i' ];
 
+	// streamer instance
 	private $streamerInstance;
+	
+	/** @var string*/
 	private $extension;
 	
 	public function __construct(){
-		if (0) {
-			$this->streamerInstance = new ZipStreamer();
-		} else {
+		/** @var \OCP\IRequest */
+		$request = \OC::$server->getRequest();
+		
+		if ($request->isUserAgent($this->preferTar)) {
 			$this->streamerInstance = new TarStreamer();
+		} else {
+			$this->streamerInstance = new ZipStreamer();
 		}
 	}
 	
+	/**
+	 * Send HTTP headers
+	 * @param string name 
+	 * @return bool
+	 */
 	public function sendHeaders($name){
 		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
 		return $this->streamerInstance->sendHeaders($name . $extension);
 	}
 	
 	/**
+	 * Stream directory recursively
 	 * @param string $dir
 	 * @param string $internalDir
 	 */
@@ -69,18 +83,38 @@ class OC_Streamer {
 		}
 	}
 	
-	public function addFileFromStream($fd, $internalName, $size){
+	/**
+	 * Add a file to the archive at the specified location and file name.
+	 *
+	 * @param string $stream      Stream to read data from
+	 * @param string $internalName    Filepath and name to be used in the archive.
+	 * @param int $size           Filesize
+	 * @return bool $success
+	 */
+	public function addFileFromStream($stream, $internalName, $size){
 		if ($this->streamerInstance instanceof ZipStreamer) {
-			return $this->streamerInstance->addFileFromStream($fd, $internalName);
+			return $this->streamerInstance->addFileFromStream($stream, $internalName);
 		} else {
-			return $this->streamerInstance->addFileFromStream($fd, $internalName, $size);
+			return $this->streamerInstance->addFileFromStream($stream, $internalName, $size);
 		}
 	}
 	
+	/**
+	 * Add an empty directory entry to the archive.
+	 *
+	 * @param string $directoryPath  Directory Path and name to be added to the archive.
+	 * @return bool $success
+	 */
 	public function addEmptyDir($dirName){
 		return $this->streamerInstance->addEmptyDir($dirName);
 	}
 	
+	/**
+	 * Close the archive.
+	 * A closed archive can no longer have new files added to it. After
+	 * closing, the file is completely written to the output stream.
+	 * @return bool $success
+	 */
 	public function finalize(){
 		return $this->streamerInstance->finalize();
 	}
-- 
GitLab


From 28df7be3192560b1b3616b98a5a1f057410ebab0 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Thu, 24 Sep 2015 01:08:42 +0300
Subject: [PATCH 539/783] Add namespace. Fix broken zip

---
 lib/private/files.php    |  3 ++-
 lib/private/streamer.php | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/private/files.php b/lib/private/files.php
index 638d148adc4..21b3cd1d409 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -41,6 +41,7 @@
  */
 
 use OC\Lock\NoopLockingProvider;
+use OC\Streamer;
 use OCP\Lock\ILockingProvider;
 
 /**
@@ -113,7 +114,7 @@ class OC_Files {
 		if ($getType === self::FILE) {
 			$streamer = false;
 		} else {
-			$streamer = new OC_Streamer();
+			$streamer = new Streamer();
 		}
 		OC_Util::obEnd();
 
diff --git a/lib/private/streamer.php b/lib/private/streamer.php
index aec5fb922ee..b530961afd2 100644
--- a/lib/private/streamer.php
+++ b/lib/private/streamer.php
@@ -19,10 +19,12 @@
  *
  */
 
-use \ZipStreamer\ZipStreamer;
+namespace OC;
+
+use ZipStreamer\ZipStreamer;
 use DeepDiver1975\TarStreamer\TarStreamer;
 
-class OC_Streamer {
+class Streamer {
 	// array of regexp. Matching user agents will get tar instead of zip
 	private $preferTarFor = [ '/macintosh|mac os x/i' ];
 
@@ -36,7 +38,7 @@ class OC_Streamer {
 		/** @var \OCP\IRequest */
 		$request = \OC::$server->getRequest();
 		
-		if ($request->isUserAgent($this->preferTar)) {
+		if ($request->isUserAgent($this->preferTarFor)) {
 			$this->streamerInstance = new TarStreamer();
 		} else {
 			$this->streamerInstance = new ZipStreamer();
@@ -75,7 +77,7 @@ class OC_Streamer {
 			if(\OC\Files\Filesystem::is_file($file)) {
 				$filesize = \OC\Files\Filesystem::filesize($file);
 				$fh = \OC\Files\Filesystem::fopen($file, 'r');
-				$this->streamerInstance->addFileFromStream($fh, $internalDir . $filename, $filesize);
+				$this->addFileFromStream($fh, $internalDir . $filename, $filesize);
 				fclose($fh);
 			}elseif(\OC\Files\Filesystem::is_dir($file)) {
 				$this->addDirRecoursive($file, $internalDir);
-- 
GitLab


From 027fb4e3fe44f3ca075c96258afe55438f98dd6c Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Thu, 24 Sep 2015 18:23:10 +0300
Subject: [PATCH 540/783] More corrections

---
 lib/private/files.php    |  4 ++--
 lib/private/streamer.php | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/private/files.php b/lib/private/files.php
index 21b3cd1d409..86ebf40cc57 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -151,12 +151,12 @@ class OC_Files {
 							$streamer->addFileFromStream($fh, basename($file), $fileSize);
 							fclose($fh);
 						} elseif (\OC\Files\Filesystem::is_dir($file)) {
-							$streamer->addDirRecoursive($file);
+							$streamer->addDirRecursive($file);
 						}
 					}
 				} elseif ($getType === self::ZIP_DIR) {
 					$file = $dir . '/' . $files;
-					$streamer->addDirRecoursive($file);
+					$streamer->addDirRecursive($file);
 				}
 				$streamer->finalize();
 				set_time_limit($executionTime);
diff --git a/lib/private/streamer.php b/lib/private/streamer.php
index b530961afd2..2502807330b 100644
--- a/lib/private/streamer.php
+++ b/lib/private/streamer.php
@@ -31,9 +31,6 @@ class Streamer {
 	// streamer instance
 	private $streamerInstance;
 	
-	/** @var string*/
-	private $extension;
-	
 	public function __construct(){
 		/** @var \OCP\IRequest */
 		$request = \OC::$server->getRequest();
@@ -47,12 +44,11 @@ class Streamer {
 	
 	/**
 	 * Send HTTP headers
-	 * @param string name 
-	 * @return bool
+	 * @param string $name 
 	 */
 	public function sendHeaders($name){
 		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
-		return $this->streamerInstance->sendHeaders($name . $extension);
+		$this->streamerInstance->sendHeaders($name . $extension);
 	}
 	
 	/**
@@ -60,13 +56,13 @@ class Streamer {
 	 * @param string $dir
 	 * @param string $internalDir
 	 */
-	public function addDirRecoursive($dir, $internalDir='') {
+	public function addDirRecursive($dir, $internalDir='') {
 		$dirname = basename($dir);
 		$rootDir = $internalDir . $dirname;
 		if (!empty($rootDir)) {
 			$this->streamerInstance->addEmptyDir($rootDir);
 		}
-		$internalDir.= $dirname .= '/';
+		$internalDir .= $dirname . '/';
 		// prevent absolute dirs
 		$internalDir = ltrim($internalDir, '/');
 
@@ -80,7 +76,7 @@ class Streamer {
 				$this->addFileFromStream($fh, $internalDir . $filename, $filesize);
 				fclose($fh);
 			}elseif(\OC\Files\Filesystem::is_dir($file)) {
-				$this->addDirRecoursive($file, $internalDir);
+				$this->addDirRecursive($file, $internalDir);
 			}
 		}
 	}
-- 
GitLab


From 057994f4aa7d60428c4c097798b0fa12863c1d76 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Thu, 24 Sep 2015 22:31:05 +0300
Subject: [PATCH 541/783] Uniform behavour for tar and zip

---
 lib/private/streamer.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/private/streamer.php b/lib/private/streamer.php
index 2502807330b..48a926f42f8 100644
--- a/lib/private/streamer.php
+++ b/lib/private/streamer.php
@@ -48,7 +48,12 @@ class Streamer {
 	 */
 	public function sendHeaders($name){
 		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
-		$this->streamerInstance->sendHeaders($name . $extension);
+		$fullName = $name . $extension;
+		// ZipStreamer does not escape name in Content-Disposition atm
+		if ($this->streamerInstance instanceof ZipStreamer) {
+			$fullName = rawurlencode($fullName);
+		}
+		$this->streamerInstance->sendHeaders($fullName);
 	}
 	
 	/**
-- 
GitLab


From 65124b48dd89040bd67e9621670e8b41075d4d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 25 Sep 2015 23:33:06 +0200
Subject: [PATCH 542/783] Adding ownCloud/TarStreamer

---
 3rdparty                 | 2 +-
 lib/private/streamer.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/3rdparty b/3rdparty
index 090119a31aa..196b069e77c 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 090119a31aa7a669becf1549a5d44fe2f129292f
+Subproject commit 196b069e77cd9996a91d1f336137feaf3258fab6
diff --git a/lib/private/streamer.php b/lib/private/streamer.php
index 48a926f42f8..6f0a70e2388 100644
--- a/lib/private/streamer.php
+++ b/lib/private/streamer.php
@@ -21,8 +21,8 @@
 
 namespace OC;
 
+use ownCloud\TarStreamer\TarStreamer;
 use ZipStreamer\ZipStreamer;
-use DeepDiver1975\TarStreamer\TarStreamer;
 
 class Streamer {
 	// array of regexp. Matching user agents will get tar instead of zip
-- 
GitLab


From 745a40d6eb0854c053cba641e77303076c7ab362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 28 Sep 2015 11:51:41 +0200
Subject: [PATCH 543/783] Updating TarStreamer to v0.1-beta3

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 196b069e77c..bd6f8d4b089 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 196b069e77cd9996a91d1f336137feaf3258fab6
+Subproject commit bd6f8d4b0897db2f1bd91c343fd150b95f3d32ef
-- 
GitLab


From b4998e7d299a3a7727878f95df41343e3b5ed426 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 13 Jul 2015 17:39:07 +0200
Subject: [PATCH 544/783] Allow public auth to recognize sesssion

When a public link password has been input, its auth is stored in the
session.
This fix makes it possible to recognize the session when using public
webdav from the files UI.
---
 apps/files_sharing/lib/connector/publicauth.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/connector/publicauth.php b/apps/files_sharing/lib/connector/publicauth.php
index b1c269867f5..9d1bf391560 100644
--- a/apps/files_sharing/lib/connector/publicauth.php
+++ b/apps/files_sharing/lib/connector/publicauth.php
@@ -82,10 +82,13 @@ class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
 
 					}
 					return true;
+				} else if (\OC::$server->getSession()->exists('public_link_authenticated')
+					&& \OC::$server->getSession()->get('public_link_authenticated') === $linkItem['id']) {
+					return true;
 				} else {
 					return false;
 				}
-			} elseif ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_REMOTE) {
+			} else if ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_REMOTE) {
 				return true;
 			} else {
 				return false;
-- 
GitLab


From 832e5f99a576e004a419038101db0efa6d126b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 28 Sep 2015 12:13:20 +0200
Subject: [PATCH 545/783] Updating submodule

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index bd6f8d4b089..5ce8de19b67 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit bd6f8d4b0897db2f1bd91c343fd150b95f3d32ef
+Subproject commit 5ce8de19b67296cc03957d4483ae8ddacc1d4f82
-- 
GitLab


From 5e4a52d3c259e77065dbb5f0766b0d08f2e1babb Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 28 Sep 2015 12:30:12 +0200
Subject: [PATCH 546/783] Fix tabs order in files sidebar

---
 apps/files/js/detailsview.js              |  8 ++++++++
 apps/files/js/detailtabview.js            |  6 +++++-
 apps/files/tests/js/detailsviewSpec.js    | 15 +++++++++++++++
 apps/files_sharing/js/share.js            |  2 +-
 apps/files_versions/js/filesplugin.js     |  2 +-
 apps/files_versions/js/versionstabview.js |  1 +
 6 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index b01f9cea610..bad4be4ceef 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -132,6 +132,14 @@
 				closeLabel: t('files', 'Close')
 			};
 
+			this._tabViews = this._tabViews.sort(function(tabA, tabB) {
+				var orderA = tabA.order || 0;
+				var orderB = tabB.order || 0;
+				if (orderA === orderB) {
+					return OC.Util.naturalSortCompare(tabA.getLabel(), tabB.getLabel());
+				}
+				return orderA - orderB;
+			});
 			if (this._tabViews.length > 1) {
 				// only render headers if there is more than one available
 				templateVars.tabHeaders = _.map(this._tabViews, function(tabView, i) {
diff --git a/apps/files/js/detailtabview.js b/apps/files/js/detailtabview.js
index 449047cf252..d885e47b15e 100644
--- a/apps/files/js/detailtabview.js
+++ b/apps/files/js/detailtabview.js
@@ -29,11 +29,15 @@
 
 		_template: null,
 
-		initialize: function() {
+		initialize: function(options) {
+			options = options || {};
 			if (!this.id) {
 				this.id = 'detailTabView' + DetailTabView._TAB_COUNT;
 				DetailTabView._TAB_COUNT++;
 			}
+			if (options.order) {
+				this.order = options.order || 0;
+			}
 		},
 
 		/**
diff --git a/apps/files/tests/js/detailsviewSpec.js b/apps/files/tests/js/detailsviewSpec.js
index 852f8b04293..f02e419434f 100644
--- a/apps/files/tests/js/detailsviewSpec.js
+++ b/apps/files/tests/js/detailsviewSpec.js
@@ -153,5 +153,20 @@ describe('OCA.Files.DetailsView tests', function() {
 
 			expect(detailsView.$el.find('.tabHeader').length).toEqual(0);
 		});
+		it('sorts by order and then label', function() {
+			detailsView.remove();
+			detailsView = new OCA.Files.DetailsView();
+			detailsView.addTabView(new OCA.Files.DetailTabView({id: 'abc', order: 20}));
+			detailsView.addTabView(new OCA.Files.DetailTabView({id: 'def', order: 10}));
+			detailsView.addTabView(new OCA.Files.DetailTabView({id: 'jkl'}));
+			detailsView.addTabView(new OCA.Files.DetailTabView({id: 'ghi'}));
+			detailsView.render();
+
+			var tabs = detailsView.$el.find('.tabHeader').map(function() {
+				return $(this).attr('data-tabid');
+			}).toArray(); 
+
+			expect(tabs).toEqual(['ghi', 'jkl', 'def', 'abc']);
+		});
 	});
 });
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 5290dfbb7d1..66e4f9dc273 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -111,7 +111,7 @@
 				}
 			});
 
-			var shareTab = new OCA.Sharing.ShareTabView('shareTabView');
+			var shareTab = new OCA.Sharing.ShareTabView('shareTabView', {order: -20});
 			// detect changes and change the matching list entry
 			shareTab.on('sharesChanged', function(shareModel) {
 				var fileInfoModel = shareModel.fileInfoModel;
diff --git a/apps/files_versions/js/filesplugin.js b/apps/files_versions/js/filesplugin.js
index 42075ce6462..a9457c522d6 100644
--- a/apps/files_versions/js/filesplugin.js
+++ b/apps/files_versions/js/filesplugin.js
@@ -25,7 +25,7 @@
 				return;
 			}
 
-			fileList.registerTabView(new OCA.Versions.VersionsTabView('versionsTabView'));
+			fileList.registerTabView(new OCA.Versions.VersionsTabView('versionsTabView', {order: -10}));
 		}
 	};
 })();
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js
index f6a6f037988..6dab8014229 100644
--- a/apps/files_versions/js/versionstabview.js
+++ b/apps/files_versions/js/versionstabview.js
@@ -44,6 +44,7 @@
 		},
 
 		initialize: function() {
+			OCA.Files.DetailTabView.prototype.initialize.apply(this, arguments);
 			this.collection = new OCA.Versions.VersionCollection();
 			this.collection.on('request', this._onRequest, this);
 			this.collection.on('sync', this._onEndRequest, this);
-- 
GitLab


From 24ee83db30c2c0bc15ba79f1ece4cfad30526693 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Mon, 28 Sep 2015 13:45:24 +0200
Subject: [PATCH 547/783] fix checkbox in trashbin

---
 apps/files_trashbin/templates/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 0c0f955cf40..b5c1c622156 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -23,7 +23,7 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<input type="checkbox" id="select_all_trash" class="select-all"/>
+					<input type="checkbox" id="select_all_trash" class="select-all checkbox"/>
 					<label for="select_all_trash">
 						<span class="hidden-visually"><?php p($l->t('Select all'))?></span>
 					</label>
-- 
GitLab


From a8fb0038e9d34ddd6f39747ac57fc2701fe550d3 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 25 Sep 2015 13:23:39 +0200
Subject: [PATCH 548/783] Hide sidebar tab headers conditionally

Added canDisplay() in DetailsTabView that should return false if the tab
header of this tab must be hidden
---
 apps/files/js/detailsview.js              | 53 ++++++++++++---
 apps/files/js/detailtabview.js            | 11 ++++
 apps/files/tests/js/detailsviewSpec.js    | 78 ++++++++++++++++++++---
 apps/files_versions/js/versionstabview.js | 12 ++++
 4 files changed, 136 insertions(+), 18 deletions(-)

diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index bad4be4ceef..f04adcf1292 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -140,16 +140,14 @@
 				}
 				return orderA - orderB;
 			});
-			if (this._tabViews.length > 1) {
-				// only render headers if there is more than one available
-				templateVars.tabHeaders = _.map(this._tabViews, function(tabView, i) {
-					return {
-						tabId: tabView.id,
-						tabIndex: i,
-						label: tabView.getLabel()
-					};
-				});
-			}
+
+			templateVars.tabHeaders = _.map(this._tabViews, function(tabView, i) {
+				return {
+					tabId: tabView.id,
+					tabIndex: i,
+					label: tabView.getLabel()
+				};
+			});
 
 			this.$el.html(this.template(templateVars));
 
@@ -166,6 +164,8 @@
 
 			this.selectTab(this._currentTabId);
 
+			this._updateTabVisibilities();
+
 			this._dirty = false;
 		},
 
@@ -224,6 +224,8 @@
 
 			if (this._dirty) {
 				this.render();
+			} else {
+				this._updateTabVisibilities();
 			}
 
 			if (this._currentTabId) {
@@ -240,6 +242,37 @@
 			});
 		},
 
+		/**
+		 * Update tab headers based on the current model
+		 */
+		_updateTabVisibilities: function() {
+			// update tab header visibilities
+			var self = this;
+			var deselect = false;
+			var countVisible = 0;
+			var $tabHeaders = this.$el.find('.tabHeaders li');
+			_.each(this._tabViews, function(tabView) {
+				var isVisible = tabView.canDisplay(self.model);
+				if (isVisible) {
+					countVisible += 1;
+				}
+				if (!isVisible && self._currentTabId === tabView.id) {
+					deselect = true;
+				}
+				$tabHeaders.filterAttr('data-tabid', tabView.id).toggleClass('hidden', !isVisible);
+			});
+
+			// hide the whole container if there is only one tab
+			this.$el.find('.tabHeaders').toggleClass('hidden', countVisible <= 1);
+
+			if (deselect) {
+				// select the first visible tab instead
+				var visibleTabId = this.$el.find('.tabHeader:not(.hidden):first').attr('data-tabid');
+				this.selectTab(visibleTabId);
+			}
+
+		},
+
 		/**
 		 * Returns the file info.
 		 *
diff --git a/apps/files/js/detailtabview.js b/apps/files/js/detailtabview.js
index d885e47b15e..0bd34a88188 100644
--- a/apps/files/js/detailtabview.js
+++ b/apps/files/js/detailtabview.js
@@ -95,6 +95,17 @@
 		 */
 		nextPage: function() {
 			// load the next page, if applicable
+		},
+
+		/**
+		 * Returns whether the current tab is able to display
+		 * the given file info, for example based on mime type.
+		 *
+		 * @param {OCA.Files.FileInfoModel} fileInfo file info model
+		 * @return {bool} whether to display this tab
+		 */
+		canDisplay: function(fileInfo) {
+			return true;
 		}
 	});
 	DetailTabView._TAB_COUNT = 0;
diff --git a/apps/files/tests/js/detailsviewSpec.js b/apps/files/tests/js/detailsviewSpec.js
index f02e419434f..26a16b31530 100644
--- a/apps/files/tests/js/detailsviewSpec.js
+++ b/apps/files/tests/js/detailsviewSpec.js
@@ -144,14 +144,76 @@ describe('OCA.Files.DetailsView tests', function() {
 			expect(detailsView.$el.find('.tab').eq(0).hasClass('hidden')).toEqual(true);
 			expect(detailsView.$el.find('.tab').eq(1).hasClass('hidden')).toEqual(false);
 		});
-		it('does not render tab headers when only one tab exists', function() {
-			detailsView.remove();
-			detailsView = new OCA.Files.DetailsView();
-			testView = new OCA.Files.DetailTabView({id: 'test1'});
-			detailsView.addTabView(testView);
-			detailsView.render();
-
-			expect(detailsView.$el.find('.tabHeader').length).toEqual(0);
+		describe('tab visibility', function() {
+			beforeEach(function() {
+				detailsView.remove();
+				detailsView = new OCA.Files.DetailsView();
+			});
+			it('does not display tab headers when only one tab exists', function() {
+				testView = new OCA.Files.DetailTabView({id: 'test1'});
+				detailsView.addTabView(testView);
+				detailsView.render();
+
+				expect(detailsView.$el.find('.tabHeaders').hasClass('hidden')).toEqual(true);
+				expect(detailsView.$el.find('.tabHeader').length).toEqual(1);
+			});
+			it('does not display tab that do not pass visibility check', function() {
+				testView = new OCA.Files.DetailTabView({id: 'test1'});
+				testView.canDisplay = sinon.stub().returns(false);
+				testView2 = new OCA.Files.DetailTabView({id: 'test2'});
+				var testView3 = new OCA.Files.DetailTabView({id: 'test3'});
+				detailsView.addTabView(testView);
+				detailsView.addTabView(testView2);
+				detailsView.addTabView(testView3);
+
+				var fileInfo = {id: 5, name: 'test.txt'};
+				detailsView.setFileInfo(fileInfo);
+
+				expect(testView.canDisplay.calledOnce).toEqual(true);
+				expect(testView.canDisplay.calledWith(fileInfo)).toEqual(true);
+
+				expect(detailsView.$el.find('.tabHeaders').hasClass('hidden')).toEqual(false);
+				expect(detailsView.$el.find('.tabHeader[data-tabid=test1]').hasClass('hidden')).toEqual(true);
+				expect(detailsView.$el.find('.tabHeader[data-tabid=test2]').hasClass('hidden')).toEqual(false);
+				expect(detailsView.$el.find('.tabHeader[data-tabid=test3]').hasClass('hidden')).toEqual(false);
+			});
+			it('does not show tab headers if only one header is visible due to visibility check', function() {
+				testView = new OCA.Files.DetailTabView({id: 'test1'});
+				testView.canDisplay = sinon.stub().returns(false);
+				testView2 = new OCA.Files.DetailTabView({id: 'test2'});
+				detailsView.addTabView(testView);
+				detailsView.addTabView(testView2);
+
+				var fileInfo = {id: 5, name: 'test.txt'};
+				detailsView.setFileInfo(fileInfo);
+
+				expect(testView.canDisplay.calledOnce).toEqual(true);
+				expect(testView.canDisplay.calledWith(fileInfo)).toEqual(true);
+
+				expect(detailsView.$el.find('.tabHeaders').hasClass('hidden')).toEqual(true);
+				expect(detailsView.$el.find('.tabHeader[data-tabid=test1]').hasClass('hidden')).toEqual(true);
+				expect(detailsView.$el.find('.tabHeader[data-tabid=test2]').hasClass('hidden')).toEqual(false);
+			});
+			it('deselects the current tab if a model update does not pass the visibility check', function() {
+				testView = new OCA.Files.DetailTabView({id: 'test1'});
+				testView.canDisplay = function(fileInfo) {
+					return fileInfo.mimetype !== 'httpd/unix-directory';
+				};
+				testView2 = new OCA.Files.DetailTabView({id: 'test2'});
+				detailsView.addTabView(testView);
+				detailsView.addTabView(testView2);
+
+				var fileInfo = {id: 5, name: 'test.txt', mimetype: 'text/plain'};
+				detailsView.setFileInfo(fileInfo);
+
+				expect(detailsView.$el.find('.tabHeader[data-tabid=test1]').hasClass('selected')).toEqual(true);
+				expect(detailsView.$el.find('.tabHeader[data-tabid=test2]').hasClass('selected')).toEqual(false);
+
+				detailsView.setFileInfo({id: 10, name: 'folder', mimetype: 'httpd/unix-directory'});
+
+				expect(detailsView.$el.find('.tabHeader[data-tabid=test1]').hasClass('selected')).toEqual(false);
+				expect(detailsView.$el.find('.tabHeader[data-tabid=test2]').hasClass('selected')).toEqual(true);
+			});
 		});
 		it('sorts by order and then label', function() {
 			detailsView.remove();
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js
index 6dab8014229..55f24868196 100644
--- a/apps/files_versions/js/versionstabview.js
+++ b/apps/files_versions/js/versionstabview.js
@@ -189,6 +189,18 @@
 			this.$el.find('.has-tooltip').tooltip();
 			this.$versionsContainer = this.$el.find('ul.versions');
 			this.delegateEvents();
+		},
+
+		/**
+		 * Returns true for files, false for folders.
+		 *
+		 * @return {bool} true for files, false for folders
+		 */
+		canDisplay: function(fileInfo) {
+			if (!fileInfo) {
+				return false;
+			}
+			return !fileInfo.isDirectory();
 		}
 	});
 
-- 
GitLab


From f9acf4627e2c85150f1c0001d4df4ade41cbb458 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 25 Sep 2015 12:23:28 +0200
Subject: [PATCH 549/783] Fix sidebar interaction

- Clicking a file row or selecting it will open the sidebar.
- When sidebar is open, its contents update with the last selection.
- Dragging doesn't open the sidebar but does update its contents if it was
open already.
- Switching folders closes the sidebar.
- Close sidebar when highlighted file got deleted/removed from list
---
 apps/files/js/filelist.js           | 53 ++++++++++++++++++-----------
 apps/files/js/files.js              | 21 +++++-------
 apps/files/tests/js/filelistSpec.js | 42 ++++++++++++++++++++---
 3 files changed, 79 insertions(+), 37 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e4a7aadd600..82d510f900d 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -239,13 +239,6 @@
 
 			this.updateSearch();
 
-			this.$el.on('click', function(event) {
-				var $target = $(event.target);
-				// click outside file row ?
-				if (!$target.closest('tbody').length && !$target.closest('#app-sidebar').length) {
-					self._updateDetailsView(null);
-				}
-			});
 			this.$fileList.on('click','td.filename>a.name', _.bind(this._onClickFile, this));
 			this.$fileList.on('change', 'td.filename>.selectCheckBox', _.bind(this._onClickFileCheckbox, this));
 			this.$el.on('urlChanged', _.bind(this._onUrlChanged, this));
@@ -278,6 +271,9 @@
 			if (this._newButton) {
 				this._newButton.remove();
 			}
+			if (this._detailsView) {
+				this._detailsView.remove();
+			}
 			// TODO: also unregister other event handlers
 			this.fileActions.off('registerAction', this._onFileActionsUpdated);
 			this.fileActions.off('setDefault', this._onFileActionsUpdated);
@@ -307,7 +303,6 @@
 					permissions: OC.PERMISSION_READ,
 					actionHandler: function(fileName, context) {
 						self._updateDetailsView(fileName);
-						OC.Apps.showAppSidebar(self._detailsView.$el);
 					}
 				});
 			}
@@ -408,9 +403,14 @@
 					this._currentFileModel.off();
 				}
 				this._currentFileModel = null;
+				OC.Apps.hideAppSidebar(this._detailsView.$el);
 				return;
 			}
 
+			if (this._detailsView.$el.hasClass('disappear')) {
+				OC.Apps.showAppSidebar(this._detailsView.$el);
+			}
+
 			var $tr = this.findFileEl(fileName);
 			var model = this.getModelForFile($tr);
 
@@ -453,10 +453,10 @@
 		 * Selected/deselects the given file element and updated
 		 * the internal selection cache.
 		 *
-		 * @param $tr single file row element
-		 * @param state true to select, false to deselect
+		 * @param {Object} $tr single file row element
+		 * @param {bool} state true to select, false to deselect
 		 */
-		_selectFileEl: function($tr, state) {
+		_selectFileEl: function($tr, state, showDetailsView) {
 			var $checkbox = $tr.find('td.filename>.selectCheckBox');
 			var oldData = !!this._selectedFiles[$tr.data('id')];
 			var data;
@@ -475,11 +475,8 @@
 				delete this._selectedFiles[$tr.data('id')];
 				this._selectionSummary.remove(data);
 			}
-			if (this._selectionSummary.getTotal() === 1) {
+			if (this._detailsView && this._selectionSummary.getTotal() === 1 && !this._detailsView.$el.hasClass('disappear')) {
 				this._updateDetailsView(_.values(this._selectedFiles)[0].name);
-			} else {
-				// show nothing when multiple files are selected
-				this._updateDetailsView(null);
 			}
 			this.$el.find('.select-all').prop('checked', this._selectionSummary.getTotal() === this.files.length);
 		},
@@ -489,6 +486,9 @@
 		 */
 		_onClickFile: function(event) {
 			var $tr = $(event.target).closest('tr');
+			if ($tr.hasClass('dragging')) {
+				return;
+			}
 			if (this._allowSelection && (event.ctrlKey || event.shiftKey)) {
 				event.preventDefault();
 				if (event.shiftKey) {
@@ -552,9 +552,13 @@
 		 */
 		_onClickFileCheckbox: function(e) {
 			var $tr = $(e.target).closest('tr');
-			this._selectFileEl($tr, !$tr.hasClass('selected'));
+			var state = !$tr.hasClass('selected');
+			this._selectFileEl($tr, state);
 			this._lastChecked = $tr;
 			this.updateSelectionSummary();
+			if (state) {
+				this._updateDetailsView($tr.attr('data-file'));
+			}
 		},
 
 		/**
@@ -1305,8 +1309,10 @@
 					sortdirection: this._sortDirection
 				}
 			});
-			// close sidebar
-			this._updateDetailsView(null);
+			if (this._detailsView) {
+				// close sidebar
+				this._updateDetailsView(null);
+			}
 			var callBack = this.reloadCallback.bind(this);
 			return this._reloadCall.then(callBack, callBack);
 		},
@@ -1513,11 +1519,12 @@
 		remove: function(name, options){
 			options = options || {};
 			var fileEl = this.findFileEl(name);
+			var fileId = fileEl.data('id');
 			var index = fileEl.index();
 			if (!fileEl.length) {
 				return null;
 			}
-			if (this._selectedFiles[fileEl.data('id')]) {
+			if (this._selectedFiles[fileId]) {
 				// remove from selection first
 				this._selectFileEl(fileEl, false);
 				this.updateSelectionSummary();
@@ -1527,6 +1534,14 @@
 				fileEl.find('td.filename').draggable('destroy');
 			}
 			this.files.splice(index, 1);
+			if (this._currentFileModel && this._currentFileModel.get('id') === fileId) {
+				// Note: in the future we should call destroy() directly on the model
+				// and the model will take care of the deletion.
+				// Here we only trigger the event to notify listeners that
+				// the file was removed.
+				this._currentFileModel.trigger('destroy');
+				this._updateDetailsView(null);
+			}
 			fileEl.remove();
 			// TODO: improve performance on batch update
 			this.isEmpty = !this.files.length;
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 4fdc9eb2110..9ab7609cc40 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -356,7 +356,7 @@ var createDragShadow = function(event) {
 	var isDragSelected = $(event.target).parents('tr').find('td input:first').prop('checked');
 	if (!isDragSelected) {
 		//select dragged file
-		FileList._selectFileEl($(event.target).parents('tr:first'), true);
+		FileList._selectFileEl($(event.target).parents('tr:first'), true, false);
 	}
 
 	// do not show drag shadow for too many files
@@ -365,7 +365,7 @@ var createDragShadow = function(event) {
 
 	if (!isDragSelected && selectedFiles.length === 1) {
 		//revert the selection
-		FileList._selectFileEl($(event.target).parents('tr:first'), false);
+		FileList._selectFileEl($(event.target).parents('tr:first'), false, false);
 	}
 
 	// build dragshadow
@@ -413,22 +413,17 @@ var dragOptions={
 	cursor: 'move',
 	start: function(event, ui){
 		var $selectedFiles = $('td.filename input:checkbox:checked');
-		if($selectedFiles.length > 1){
-			$selectedFiles.parents('tr').fadeTo(250, 0.2);
-		}
-		else{
-			$(this).fadeTo(250, 0.2);
+		if (!$selectedFiles.length) {
+			$selectedFiles = $(this);
 		}
+		$selectedFiles.closest('tr').fadeTo(250, 0.2).addClass('dragging');
 	},
 	stop: function(event, ui) {
 		var $selectedFiles = $('td.filename input:checkbox:checked');
-		if($selectedFiles.length > 1){
-			$selectedFiles.parents('tr').fadeTo(250, 1);
-		}
-		else{
-			$(this).fadeTo(250, 1);
+		if (!$selectedFiles.length) {
+			$selectedFiles = $(this);
 		}
-		$('#fileList tr td.filename').addClass('ui-draggable');
+		$selectedFiles.closest('tr').fadeTo(250, 1).removeClass('dragging');
 	}
 };
 // sane browsers support using the distance option
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index c05e7c37214..b3d85cf08fa 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -135,6 +135,9 @@ describe('OCA.Files.FileList tests', function() {
 	});
 	afterEach(function() {
 		testFiles = undefined;
+		if (fileList) {
+			fileList.destroy();
+		}
 		fileList = undefined;
 
 		notificationStub.restore();
@@ -1881,8 +1884,9 @@ describe('OCA.Files.FileList tests', function() {
 	describe('Details sidebar', function() {
 		beforeEach(function() {
 			fileList.setFiles(testFiles);
+			fileList.showDetailsView('Two.jpg');
 		});
-		it('Clicking on a file row will trigger file action if no details view configured', function() {
+		it('triggers file action when clicking on row if no details view configured', function() {
 			fileList._detailsView = null;
 			var updateDetailsViewStub = sinon.stub(fileList, '_updateDetailsView');
 			var actionStub = sinon.stub();
@@ -1904,7 +1908,7 @@ describe('OCA.Files.FileList tests', function() {
 			expect(updateDetailsViewStub.notCalled).toEqual(true);
 			updateDetailsViewStub.restore();
 		});
-		it('Clicking on a file row will trigger details sidebar', function() {
+		it('highlights current file when clicked and updates sidebar', function() {
 			fileList.fileActions.setDefault('text/plain', 'Test');
 			var $tr = fileList.findFileEl('One.txt');
 			$tr.find('td.filename>a.name').click();
@@ -1912,14 +1916,34 @@ describe('OCA.Files.FileList tests', function() {
 
 			expect(fileList._detailsView.getFileInfo().id).toEqual(1);
 		});
-		it('Clicking outside to deselect a file row will trigger details sidebar', function() {
+		it('keeps the last highlighted file when clicking outside', function() {
 			var $tr = fileList.findFileEl('One.txt');
 			$tr.find('td.filename>a.name').click();
 
 			fileList.$el.find('tfoot').click();
 
-			expect($tr.hasClass('highlighted')).toEqual(false);
-			expect(fileList._detailsView.getFileInfo()).toEqual(null);
+			expect($tr.hasClass('highlighted')).toEqual(true);
+			expect(fileList._detailsView.getFileInfo().id).toEqual(1);
+		});
+		it('keeps the last highlighted file when unselecting file using checkbox', function() {
+			var $tr = fileList.findFileEl('One.txt');
+			$tr.find('input:checkbox').click();
+			expect($tr.hasClass('highlighted')).toEqual(true);
+			$tr.find('input:checkbox').click();
+
+			expect($tr.hasClass('highlighted')).toEqual(true);
+			expect(fileList._detailsView.getFileInfo().id).toEqual(1);
+		});
+		it('closes sidebar whenever the currently highlighted file was removed from the list', function() {
+			var $tr = fileList.findFileEl('One.txt');
+			$tr.find('td.filename>a.name').click();
+			expect($tr.hasClass('highlighted')).toEqual(true);
+
+			expect(fileList._detailsView.getFileInfo().id).toEqual(1);
+
+			expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
+			fileList.remove('One.txt');
+			expect($('#app-sidebar').hasClass('disappear')).toEqual(true);
 		});
 		it('returns the currently selected model instance when calling getModelForFile', function() {
 			var $tr = fileList.findFileEl('One.txt');
@@ -1935,6 +1959,14 @@ describe('OCA.Files.FileList tests', function() {
 			var model3 = fileList.getModelForFile($tr);
 			expect(model3).toEqual(model1);
 		});
+		it('closes the sidebar when switching folders', function() {
+			var $tr = fileList.findFileEl('One.txt');
+			$tr.find('td.filename>a.name').click();
+
+			expect($('#app-sidebar').hasClass('disappear')).toEqual(false);
+			fileList.changeDirectory('/another');
+			expect($('#app-sidebar').hasClass('disappear')).toEqual(true);
+		});
 	});
 	describe('File actions', function() {
 		it('Clicking on a file name will trigger default action', function() {
-- 
GitLab


From a823a79f12dde467a48b0366821a505ed66ecd66 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 28 Sep 2015 15:57:57 +0200
Subject: [PATCH 550/783] Show loading spinner for first fetch of shares

Whenever the sidebar first loads shares, show a spinner instead of an
empty content
---
 core/js/sharedialogview.js | 31 ++++++++++++++++++++++++++-----
 core/js/shareitemmodel.js  |  2 ++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 57743118f28..ee31ed33132 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -14,7 +14,7 @@
 	}
 
 	var TEMPLATE_BASE =
-		'<div class="resharerInfoView"></div>' +
+		'<div class="resharerInfoView subView"></div>' +
 		'{{#if isSharingAllowed}}' +
 		'<label for="shareWith" class="hidden-visually">{{shareLabel}}</label>' +
 		'<div class="oneline">' +
@@ -23,10 +23,10 @@
 		'{{{remoteShareInfo}}}' +
 		'</div>' +
 		'{{/if}}' +
-		'<div class="shareeListView"></div>' +
-		'<div class="linkShareView"></div>' +
-		'<div class="expirationView"></div>'
-		;
+		'<div class="shareeListView subView"></div>' +
+		'<div class="linkShareView subView"></div>' +
+		'<div class="expirationView subView"></div>' +
+		'<div class="loading hidden" style="height: 50px"></div>';
 
 	var TEMPLATE_REMOTE_SHARE_INFO =
 		'<a target="_blank" class="icon-info svg shareWithRemoteInfo hasTooltip" href="{{docLink}}" ' +
@@ -87,6 +87,9 @@
 				view.render();
 			});
 
+			this.model.on('request', this._onRequest, this);
+			this.model.on('sync', this._onEndRequest, this);
+
 			var subViewOptions = {
 				model: this.model,
 				configModel: this.configModel
@@ -161,6 +164,24 @@
 			this.model.addShare(s.item.value);
 		},
 
+		_toggleLoading: function(state) {
+			this._loading = state;
+			this.$el.find('.subView').toggleClass('hidden', state);
+			this.$el.find('.loading').toggleClass('hidden', !state);
+		},
+
+		_onRequest: function() {
+			// only show the loading spinner for the first request (for now)
+			if (!this._loadingOnce) {
+				this._toggleLoading(true);
+				this._loadingOnce = true;
+			}
+		},
+
+		_onEndRequest: function() {
+			this._toggleLoading(false);
+		},
+
 		render: function() {
 			var baseTemplate = this._getTemplate('base', TEMPLATE_BASE);
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index 13396670aae..328d291b778 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -624,7 +624,9 @@
 
 		fetch: function() {
 			var model = this;
+			this.trigger('request', this);
 			OC.Share.loadItem(this.get('itemType'), this.get('itemSource'), function(data) {
+				model.trigger('sync', 'GET', this);
 				model.set(model.parse(data));
 			});
 		},
-- 
GitLab


From d47d240a357e3f7861b432b971a0ba96b31f20ca Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 28 Sep 2015 16:23:33 +0200
Subject: [PATCH 551/783] Still show share link when recipient but no share
 permission

This makes it possible for the recipient to still trigger the sidebar
and share tab to see information about the share.

In the case where the file is not shared and no permissions exists, no
action icon will be displayed.
---
 apps/files_sharing/js/share.js           | 30 ++++++++----------------
 apps/files_sharing/tests/js/shareSpec.js | 13 +++-------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 66e4f9dc273..30a803f3207 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -103,11 +103,20 @@
 				name: 'Share',
 				displayName: '',
 				mime: 'all',
-				permissions: OC.PERMISSION_SHARE,
+				permissions: OC.PERMISSION_ALL,
 				icon: OC.imagePath('core', 'actions/share'),
 				type: OCA.Files.FileActions.TYPE_INLINE,
 				actionHandler: function(fileName) {
 					fileList.showDetailsView(fileName, 'shareTabView');
+				},
+				render: function(actionSpec, isDefault, context) {
+					var permissions = parseInt(context.$file.attr('data-permissions'), 10);
+					// if no share permissions but share owner exists, still show the link
+					if ((permissions & OC.PERMISSION_SHARE) !== 0 || context.$file.attr('data-share-owner')) {
+						return fileActions._defaultRenderAction.call(fileActions, actionSpec, isDefault, context);
+					}
+					// don't render anything
+					return null;
 				}
 			});
 
@@ -157,26 +166,7 @@
 			// if the statuses are loaded already, use them for the icon
 			// (needed when scrolling to the next page)
 			if (hasUserShares || hasLinkShare || $tr.attr('data-share-recipients') || $tr.attr('data-share-owner')) {
-				var permissions = $tr.data('permissions');
 				OC.Share.markFileAsShared($tr, true, hasLinkShare);
-				if ((permissions & OC.PERMISSION_SHARE) === 0 && $tr.attr('data-share-owner')) {
-					// if no share action exists because the admin disabled sharing for this user
-					// we create a share notification action to inform the user about files
-					// shared with him otherwise we just update the existing share action.
-					// TODO: make this work like/with OC.Share.markFileAsShared()
-					$tr.find('.fileactions .action-share-notification').remove();
-					var shareNotification = '<a class="action action-share-notification permanent"' +
-							' data-action="Share-Notification" href="#" original-title="">' +
-							' <img class="svg" src="' + OC.imagePath('core', 'actions/share') + '"></img>';
-					$tr.find('.fileactions').append(function() {
-						var shareBy = escapeHTML($tr.attr('data-share-owner'));
-						var $result = $(shareNotification + '<span> ' + shareBy + '</span></span>');
-						$result.on('click', function() {
-							return false;
-						});
-						return $result;
-					});
-				}
 				return true;
 			}
 			return false;
diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js
index 96a96f1b814..fd8e36d71ad 100644
--- a/apps/files_sharing/tests/js/shareSpec.js
+++ b/apps/files_sharing/tests/js/shareSpec.js
@@ -179,7 +179,7 @@ describe('OCA.Sharing.Util tests', function() {
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
 			expect($action.find('img').length).toEqual(1);
 		});
-		it('shows static share text when file shared with user that has no share permission', function() {
+		it('shows share action when shared with user who has no share permission', function() {
 			var $action, $tr;
 			fileList.setFiles([{
 				id: 1,
@@ -193,14 +193,9 @@ describe('OCA.Sharing.Util tests', function() {
 				shareOwner: 'User One'
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
-			expect($tr.find('.action-share').length).toEqual(0);
-			$action = $tr.find('.action-share-notification');
-			expect($action.find('>span').text().trim()).toEqual('User One');
-			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
-			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
-			expect($action.find('img').length).toEqual(1);
+			expect($tr.find('.action-share').length).toEqual(1);
 		});
-		it('do not show static share text when share exists but neither permission nor owner is available', function() {
+		it('do not show share action when share exists but neither permission nor owner is available', function() {
 			var $action, $tr;
 			fileList.setFiles([{
 				id: 1,
@@ -214,8 +209,6 @@ describe('OCA.Sharing.Util tests', function() {
 			}]);
 			$tr = fileList.$el.find('tbody tr:first');
 			expect($tr.find('.action-share').length).toEqual(0);
-			$action = $tr.find('.action-share-notification');
-			expect($action.length).toEqual(0);
 		});
 	});
 	describe('Share action', function() {
-- 
GitLab


From 1e5a41f008b20326453f08c15ab581ec8a7b0e3d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 28 Sep 2015 17:16:49 +0200
Subject: [PATCH 552/783] Add hook connector to connect view and node hooks

---
 lib/private/files/node/hookconnector.php | 151 +++++++++++++++++++
 tests/lib/files/node/hookconnector.php   | 177 +++++++++++++++++++++++
 2 files changed, 328 insertions(+)
 create mode 100644 lib/private/files/node/hookconnector.php
 create mode 100644 tests/lib/files/node/hookconnector.php

diff --git a/lib/private/files/node/hookconnector.php b/lib/private/files/node/hookconnector.php
new file mode 100644
index 00000000000..c42a329d319
--- /dev/null
+++ b/lib/private/files/node/hookconnector.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Files\Node;
+
+use OC\Files\Filesystem;
+use OC\Files\View;
+use OCP\Files\FileInfo;
+use OCP\Util;
+
+class HookConnector {
+	/**
+	 * @var Root
+	 */
+	private $root;
+
+	/**
+	 * @var View
+	 */
+	private $view;
+
+	/**
+	 * HookConnector constructor.
+	 *
+	 * @param Root $root
+	 * @param View $view
+	 */
+	public function __construct(Root $root, View $view) {
+		$this->root = $root;
+		$this->view = $view;
+	}
+
+	public function viewToNode() {
+		Util::connectHook('OC_Filesystem', 'write', $this, 'write');
+		Util::connectHook('OC_Filesystem', 'post_write', $this, 'postWrite');
+
+		Util::connectHook('OC_Filesystem', 'create', $this, 'create');
+		Util::connectHook('OC_Filesystem', 'post_create', $this, 'postCreate');
+
+		Util::connectHook('OC_Filesystem', 'delete', $this, 'delete');
+		Util::connectHook('OC_Filesystem', 'post_delete', $this, 'postDelete');
+
+		Util::connectHook('OC_Filesystem', 'rename', $this, 'rename');
+		Util::connectHook('OC_Filesystem', 'post_rename', $this, 'postRename');
+
+		Util::connectHook('OC_Filesystem', 'copy', $this, 'copy');
+		Util::connectHook('OC_Filesystem', 'post_copy', $this, 'postCopy');
+
+		Util::connectHook('OC_Filesystem', 'touch', $this, 'touch');
+		Util::connectHook('OC_Filesystem', 'post_touch', $this, 'postTouch');
+	}
+
+	public function write($arguments) {
+		$node = $this->getNodeForPath($arguments['path']);
+		$this->root->emit('\OC\Files', 'preWrite', [$node]);
+	}
+
+	public function postWrite($arguments) {
+		$node = $this->getNodeForPath($arguments['path']);
+		$this->root->emit('\OC\Files', 'postWrite', [$node]);
+	}
+
+	public function create($arguments) {
+		$node = $this->getNodeForPath($arguments['path']);
+		$this->root->emit('\OC\Files', 'preCreate', [$node]);
+	}
+
+	public function postCreate($arguments) {
+		$node = $this->getNodeForPath($arguments['path']);
+		$this->root->emit('\OC\Files', 'postCreate', [$node]);
+	}
+
+	public function delete($arguments) {
+		$node = $this->getNodeForPath($arguments['path']);
+		$this->root->emit('\OC\Files', 'preDelete', [$node]);
+	}
+
+	public function postDelete($arguments) {
+		$node = $this->getNodeForPath($arguments['path']);
+		$this->root->emit('\OC\Files', 'postDelete', [$node]);
+	}
+
+	public function touch($arguments) {
+		$node = $this->getNodeForPath($arguments['path']);
+		$this->root->emit('\OC\Files', 'preTouch', [$node]);
+	}
+
+	public function postTouch($arguments) {
+		$node = $this->getNodeForPath($arguments['path']);
+		$this->root->emit('\OC\Files', 'postTouch', [$node]);
+	}
+
+	public function rename($arguments) {
+		$source = $this->getNodeForPath($arguments['oldpath']);
+		$target = $this->getNodeForPath($arguments['newpath']);
+		$this->root->emit('\OC\Files', 'preRename', [$source, $target]);
+	}
+
+	public function postRename($arguments) {
+		$source = $this->getNodeForPath($arguments['oldpath']);
+		$target = $this->getNodeForPath($arguments['newpath']);
+		$this->root->emit('\OC\Files', 'postRename', [$source, $target]);
+	}
+
+	public function copy($arguments) {
+		$source = $this->getNodeForPath($arguments['oldpath']);
+		$target = $this->getNodeForPath($arguments['newpath']);
+		$this->root->emit('\OC\Files', 'preCopy', [$source, $target]);
+	}
+
+	public function postCopy($arguments) {
+		$source = $this->getNodeForPath($arguments['oldpath']);
+		$target = $this->getNodeForPath($arguments['newpath']);
+		$this->root->emit('\OC\Files', 'postCopy', [$source, $target]);
+	}
+
+	private function getNodeForPath($path) {
+		$info = Filesystem::getView()->getFileInfo($path);
+		if (!$info) {
+			$fullPath = Filesystem::getView()->getAbsolutePath($path);
+			if (Filesystem::is_dir($path)) {
+				return new NonExistingFolder($this->root, $this->view, $fullPath);
+			} else {
+				return new NonExistingFile($this->root, $this->view, $fullPath);
+			}
+		}
+		if ($info->getType() === FileInfo::TYPE_FILE) {
+			return new File($this->root, $this->view, $info->getPath(), $info);
+		} else {
+			return new Folder($this->root, $this->view, $info->getPath(), $info);
+		}
+	}
+}
diff --git a/tests/lib/files/node/hookconnector.php b/tests/lib/files/node/hookconnector.php
new file mode 100644
index 00000000000..ea506313beb
--- /dev/null
+++ b/tests/lib/files/node/hookconnector.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\Files\Node;
+
+use OC\Connector\Sabre\File;
+use OC\Files\Filesystem;
+use OC\Files\Node\Root;
+use OC\Files\Storage\Temporary;
+use OC\Files\View;
+use OCP\Files\Node;
+use Test\TestCase;
+use Test\Traits\MountProviderTrait;
+use Test\Traits\UserTrait;
+
+class HookConnector extends TestCase {
+	use UserTrait;
+	use MountProviderTrait;
+
+	/**
+	 * @var View
+	 */
+	private $view;
+
+	/**
+	 * @var Root
+	 */
+	private $root;
+
+	/**
+	 * @var string
+	 */
+	private $userId;
+
+	public function setUp() {
+		parent::setUp();
+		$this->userId = $this->getUniqueID();
+		$this->createUser($this->userId, 'pass');
+		$this->registerMount($this->userId, new Temporary(), '/' . $this->userId . '/files/');
+		\OC_Util::setupFS($this->userId);
+		$this->view = new View();
+		$this->root = new Root(Filesystem::getMountManager(), $this->view, \OC::$server->getUserManager()->get($this->userId));
+	}
+
+	public function tearDown() {
+		parent::tearDown();
+		\OC_Hook::clear('OC_Filesystem');
+		\OC_Util::tearDownFS();
+	}
+
+	public function viewToNodeProvider() {
+		return [
+			[function () {
+				Filesystem::file_put_contents('test.txt', 'asd');
+			}, 'preWrite'],
+			[function () {
+				Filesystem::file_put_contents('test.txt', 'asd');
+			}, 'postWrite'],
+			[function () {
+				Filesystem::file_put_contents('test.txt', 'asd');
+			}, 'preCreate'],
+			[function () {
+				Filesystem::file_put_contents('test.txt', 'asd');
+			}, 'postCreate'],
+			[function () {
+				Filesystem::mkdir('test.txt');
+			}, 'preCreate'],
+			[function () {
+				Filesystem::mkdir('test.txt');
+			}, 'postCreate'],
+			[function () {
+				Filesystem::touch('test.txt');
+			}, 'preTouch'],
+			[function () {
+				Filesystem::touch('test.txt');
+			}, 'postTouch'],
+			[function () {
+				Filesystem::touch('test.txt');
+			}, 'preCreate'],
+			[function () {
+				Filesystem::touch('test.txt');
+			}, 'postCreate'],
+			[function () {
+				Filesystem::file_put_contents('test.txt', 'asd');
+				Filesystem::unlink('test.txt');
+			}, 'preDelete'],
+			[function () {
+				Filesystem::file_put_contents('test.txt', 'asd');
+				Filesystem::unlink('test.txt');
+			}, 'postDelete'],
+			[function () {
+				Filesystem::mkdir('test.txt');
+				Filesystem::rmdir('test.txt');
+			}, 'preDelete'],
+			[function () {
+				Filesystem::mkdir('test.txt');
+				Filesystem::rmdir('test.txt');
+			}, 'postDelete'],
+		];
+	}
+
+	/**
+	 * @param callable $operation
+	 * @param string $expectedHook
+	 * @dataProvider viewToNodeProvider
+	 */
+	public function testViewToNode(callable $operation, $expectedHook) {
+		$connector = new \OC\Files\Node\HookConnector($this->root, $this->view);
+		$connector->viewToNode();
+		$hookCalled = false;
+		/** @var Node $hookNode */
+		$hookNode = null;
+
+		$this->root->listen('\OC\Files', $expectedHook, function ($node) use (&$hookNode, &$hookCalled) {
+			$hookCalled = true;
+			$hookNode = $node;
+		});
+
+		$operation();
+
+		$this->assertTrue($hookCalled);
+		$this->assertEquals('/' . $this->userId . '/files/test.txt', $hookNode->getPath());
+	}
+
+	public function viewToNodeProviderCopyRename() {
+		return [
+			[function () {
+				Filesystem::file_put_contents('source', 'asd');
+				Filesystem::rename('source', 'target');
+			}, 'preRename'],
+			[function () {
+				Filesystem::file_put_contents('source', 'asd');
+				Filesystem::rename('source', 'target');
+			}, 'postRename'],
+			[function () {
+				Filesystem::file_put_contents('source', 'asd');
+				Filesystem::copy('source', 'target');
+			}, 'preCopy'],
+			[function () {
+				Filesystem::file_put_contents('source', 'asd');
+				Filesystem::copy('source', 'target');
+			}, 'postCopy'],
+		];
+	}
+
+	/**
+	 * @param callable $operation
+	 * @param string $expectedHook
+	 * @dataProvider viewToNodeProviderCopyRename
+	 */
+	public function testViewToNodeCopyRename(callable $operation, $expectedHook) {
+		$connector = new \OC\Files\Node\HookConnector($this->root, $this->view);
+		$connector->viewToNode();
+		$hookCalled = false;
+		/** @var Node $hookSourceNode */
+		$hookSourceNode = null;
+		/** @var Node $hookTargetNode */
+		$hookTargetNode = null;
+
+		$this->root->listen('\OC\Files', $expectedHook, function ($sourceNode, $targetNode) use (&$hookCalled, &$hookSourceNode, &$hookTargetNode) {
+			$hookCalled = true;
+			$hookSourceNode = $sourceNode;
+			$hookTargetNode = $targetNode;
+		});
+
+		$operation();
+
+		$this->assertTrue($hookCalled);
+		$this->assertEquals('/' . $this->userId . '/files/source', $hookSourceNode->getPath());
+		$this->assertEquals('/' . $this->userId . '/files/target', $hookTargetNode->getPath());
+	}
+}
-- 
GitLab


From 00020535f9adecb0b6e8ce0cfc1feb88af0d59a2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 28 Sep 2015 17:17:44 +0200
Subject: [PATCH 553/783] pass view hooks trough to the node hooks

---
 lib/private/server.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/private/server.php b/lib/private/server.php
index 26eb99927fc..9055f092800 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -46,6 +46,7 @@ use OC\Diagnostics\EventLogger;
 use OC\Diagnostics\NullEventLogger;
 use OC\Diagnostics\NullQueryLogger;
 use OC\Diagnostics\QueryLogger;
+use OC\Files\Node\HookConnector;
 use OC\Files\Node\Root;
 use OC\Files\View;
 use OC\Http\Client\ClientService;
@@ -144,7 +145,10 @@ class Server extends SimpleContainer implements IServerContainer {
 			$user = $userManager->get($user);
 			$manager = \OC\Files\Filesystem::getMountManager();
 			$view = new View();
-			return new Root($manager, $view, $user);
+			$root = new Root($manager, $view, $user);
+			$connector = new HookConnector($root, $view);
+			$connector->viewToNode();
+			return $root;
 		});
 		$this->registerService('UserManager', function (Server $c) {
 			$config = $c->getConfig();
-- 
GitLab


From e21a0258879f41c1e7c710b50a8c55aed8a45f44 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 28 Sep 2015 17:20:44 +0200
Subject: [PATCH 554/783] remove unused use

---
 tests/lib/files/node/hookconnector.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/lib/files/node/hookconnector.php b/tests/lib/files/node/hookconnector.php
index ea506313beb..10566cf5fb1 100644
--- a/tests/lib/files/node/hookconnector.php
+++ b/tests/lib/files/node/hookconnector.php
@@ -8,7 +8,6 @@
 
 namespace Test\Files\Node;
 
-use OC\Connector\Sabre\File;
 use OC\Files\Filesystem;
 use OC\Files\Node\Root;
 use OC\Files\Storage\Temporary;
-- 
GitLab


From cc8efaa037fdf186f413beadd1ed1ab49d2f6756 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 28 Sep 2015 17:50:11 +0200
Subject: [PATCH 555/783] Show conflict dialog before upload when possible

When uploading files, first check if the files exist in the current file
list. For the ones that do, show a conflict dialog.
For the rest, upload directly.

If the upload operation detects a conflict on the server side, it will
also continue populating the conflict dialog.

From now on, server side conflict can only occur if someone concurrently
uploaded a file into the same folder but the current user hasn't
refreshed the list yet.
---
 apps/files/js/file-upload.js | 65 +++++++++++++++++++++++++-----------
 apps/files/js/filelist.js    | 21 ++++++++++--
 2 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 17f0f777169..03330ad7c5d 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -18,7 +18,7 @@
  *    - TODO music upload button
  */
 
-/* global Files, FileList, jQuery, oc_requesttoken, humanFileSize, getUniqueName */
+/* global jQuery, oc_requesttoken, humanFileSize */
 
 /**
  * Function that will allow us to know if Ajax uploads are supported
@@ -139,6 +139,9 @@ OC.Upload = {
 		if (data.data) {
 			data.data.append('resolution', 'replace');
 		} else {
+			if (!data.formData) {
+				data.formData = [];
+			}
 			data.formData.push({name:'resolution', value:'replace'}); //hack for ie8
 		}
 		data.submit();
@@ -152,6 +155,9 @@ OC.Upload = {
 		if (data.data) {
 			data.data.append('resolution', 'autorename');
 		} else {
+			if (!data.formData) {
+				data.formData = [];
+			}
 			data.formData.push({name:'resolution', value:'autorename'}); //hack for ie8
 		}
 		data.submit();
@@ -164,8 +170,9 @@ OC.Upload = {
 		}
 	},
 	/**
-	 * TODO checks the list of existing files prior to uploading and shows a simple dialog to choose
+	 * checks the list of existing files prior to uploading and shows a simple dialog to choose
 	 * skip all, replace all or choose which files to keep
+	 *
 	 * @param {array} selection of files to upload
 	 * @param {object} callbacks - object with several callback methods
 	 * @param {function} callbacks.onNoConflicts
@@ -175,14 +182,34 @@ OC.Upload = {
 	 * @param {function} callbacks.onCancel
 	 */
 	checkExistingFiles: function (selection, callbacks) {
-		/*
-		$.each(selection.uploads, function(i, upload) {
-			var $row = OCA.Files.App.fileList.findFileEl(upload.files[0].name);
-			if ($row) {
-				// TODO check filelist before uploading and show dialog on conflicts, use callbacks
+		var fileList = OCA.Files.App.fileList;
+		var conflicts = [];
+		// only keep non-conflicting uploads
+		selection.uploads = _.filter(selection.uploads, function(upload) {
+			var fileInfo = fileList.findFile(upload.files[0].name);
+			if (fileInfo) {
+				conflicts.push([
+					// original
+					_.extend(fileInfo, {
+						directory: fileInfo.directory || fileInfo.path || fileList.getCurrentDirectory()
+					}),
+					// replacement (File object)
+					upload
+				]);
+				return false;
 			}
+			return true;
 		});
-		*/
+		if (conflicts.length) {
+			_.each(conflicts, function(conflictData) {
+				OC.dialogs.fileexists(conflictData[1], conflictData[0], conflictData[1].files[0], OC.Upload);
+			});
+		}
+
+		// upload non-conflicting files
+		// note: when reaching the server they might still meet conflicts
+		// if the folder was concurrently modified, these will get added
+		// to the already visible dialog, if applicable
 		callbacks.onNoConflicts(selection);
 	},
 
@@ -368,18 +395,18 @@ OC.Upload = {
 				},
 				submit: function(e, data) {
 					OC.Upload.rememberUpload(data);
-					if ( ! data.formData ) {
-						var fileDirectory = '';
-						if(typeof data.files[0].relativePath !== 'undefined') {
-							fileDirectory = data.files[0].relativePath;
-						}
-						// noone set update parameters, we set the minimum
-						data.formData = {
-							requesttoken: oc_requesttoken,
-							dir: data.targetDir || FileList.getCurrentDirectory(),
-							file_directory: fileDirectory
-						};
+					if (!data.formData) {
+						data.formData = [];
+					}
+
+					var fileDirectory = '';
+					if(typeof data.files[0].relativePath !== 'undefined') {
+						fileDirectory = data.files[0].relativePath;
 					}
+					// FIXME: prevent re-adding the same
+					data.formData.push({name: 'requesttoken', value: oc_requesttoken});
+					data.formData.push({name: 'dir', value: data.targetDir || FileList.getCurrentDirectory()});
+					data.formData.push({name: 'file_directory', value: fileDirectory});
 				},
 				fail: function(e, data) {
 					OC.Upload.log('fail', e, data);
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e4a7aadd600..1b069530e69 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -719,8 +719,23 @@
 			return true;
 		},
 		/**
-		 * Returns the tr element for a given file name
-		 * @param fileName file name
+		 * Returns the file info for the given file name from the internal collection.
+		 *
+		 * @param {string} fileName file name
+		 * @return {OCA.Files.FileInfo} file info or null if it was not found
+		 *
+		 * @since 8.2
+		 */
+		findFile: function(fileName) {
+			return _.find(this.files, function(aFile) {
+				return (aFile.name === fileName);
+			}) || null;
+		},
+		/**
+		 * Returns the tr element for a given file name, but only if it was already rendered.
+		 *
+		 * @param {string} fileName file name
+		 * @return {Object} jQuery object of the matching row
 		 */
 		findFileEl: function(fileName){
 			// use filterAttr to avoid escaping issues
@@ -1877,7 +1892,7 @@
 		 * @return {bool} true if the file exists in the list, false otherwise
 		 */
 		inList:function(file) {
-			return this.findFileEl(file).length;
+			return this.findFile(file);
 		},
 
 		/**
-- 
GitLab


From 71dabc6c133b8fdbe26b697de6f9be0f605b6224 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 28 Sep 2015 18:37:40 +0200
Subject: [PATCH 556/783] Consider both hash params and query when parsing URL

---
 core/js/js.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index b5971bfc579..397fea8e3c5 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1773,9 +1773,7 @@ OC.Util.History = {
 			params = OC.parseQueryString(this._decodeQuery(query));
 		}
 		// else read from query attributes
-		if (!params) {
-			params = OC.parseQueryString(this._decodeQuery(location.search));
-		}
+		params = _.extend(params || {}, OC.parseQueryString(this._decodeQuery(location.search)));
 		return params || {};
 	},
 
-- 
GitLab


From 0dde79b75ba3baaf5bd18a839b112072f4bd8b0c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 28 Sep 2015 18:38:57 +0200
Subject: [PATCH 557/783] memberOf resembles a DN as well and is actively used

---
 apps/user_ldap/lib/access.php   |  4 +++-
 apps/user_ldap/tests/access.php | 34 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index fe9eefb3116..2a605a2a0f0 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -215,7 +215,9 @@ class Access extends LDAPUtility implements user\IUserTools {
 		$resemblingAttributes = array(
 			'dn',
 			'uniquemember',
-			'member'
+			'member',
+			// memberOf is an "operational" attribute, without a definition in any RFC
+			'memberof'
 		);
 		return in_array($attr, $resemblingAttributes);
 	}
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php
index 5bf1a65bd51..cb6dbf0cd5d 100644
--- a/apps/user_ldap/tests/access.php
+++ b/apps/user_ldap/tests/access.php
@@ -260,4 +260,38 @@ class Test_Access extends \Test\TestCase {
 
 		$access->batchApplyUserAttributes($data);
 	}
+
+	public function dNAttributeProvider() {
+		// corresponds to Access::resemblesDN()
+		return array(
+			'dn' => array('dn'),
+			'uniqueMember' => array('uniquemember'),
+			'member' => array('member'),
+			'memberOf' => array('memberof')
+		);
+	}
+
+	/**
+	 * @dataProvider dNAttributeProvider
+	 */
+	public function testSanitizeDN($attribute) {
+		list($lw, $con, $um) = $this->getConnectorAndLdapMock();
+
+
+		$dnFromServer = 'cn=Mixed Cases,ou=Are Sufficient To,ou=Test,dc=example,dc=org';
+
+		$lw->expects($this->any())
+			->method('isResource')
+			->will($this->returnValue(true));
+
+		$lw->expects($this->any())
+			->method('getAttributes')
+			->will($this->returnValue(array(
+				$attribute => array('count' => 1, $dnFromServer)
+			)));
+
+		$access = new Access($con, $lw, $um);
+		$values = $access->readAttribute('uid=whoever,dc=example,dc=org', $attribute);
+		$this->assertSame($values[0], strtolower($dnFromServer));
+	}
 }
-- 
GitLab


From d40867d8551b3ce9630a107617df64780f744e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 28 Sep 2015 22:51:43 +0200
Subject: [PATCH 558/783] Suer JSqueezeFilter instead of JSMinFilter

---
 lib/private/templatelayout.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index ae3c1093b20..30f75761d05 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -38,7 +38,7 @@ use Assetic\AssetWriter;
 use Assetic\Filter\CssImportFilter;
 use Assetic\Filter\CssMinFilter;
 use Assetic\Filter\CssRewriteFilter;
-use Assetic\Filter\JSMinFilter;
+use Assetic\Filter\JSqueezeFilter;
 use OC\Assetic\SeparatorFilter; // waiting on upstream
 
 /**
@@ -225,7 +225,7 @@ class OC_TemplateLayout extends OC_Template {
 					), $root, $file);
 				}
 				return new FileAsset($root . '/' . $file, array(
-					new JSMinFilter(),
+					new JSqueezeFilter(),
 					new SeparatorFilter(';')
 				), $root, $file);
 			}, $jsFiles);
-- 
GitLab


From 766b69a0c8c99757c89cb567f77b90a531010087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 28 Sep 2015 22:52:45 +0200
Subject: [PATCH 559/783] User upstream class SeparatorFilter

---
 lib/private/assetic/separatorfilter.php | 57 -------------------------
 lib/private/templatelayout.php          |  2 +-
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 lib/private/assetic/separatorfilter.php

diff --git a/lib/private/assetic/separatorfilter.php b/lib/private/assetic/separatorfilter.php
deleted file mode 100644
index ee6d5c11c20..00000000000
--- a/lib/private/assetic/separatorfilter.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OC\Assetic;
-
-use Assetic\Filter\FilterInterface;
-use Assetic\Asset\AssetInterface;
-
-/**
- * Inserts a separator between assets to prevent merge failures
- * e.g. missing semicolon at the end of a JS file
- */
-class SeparatorFilter implements FilterInterface
-{
-    /**
-     * @var string
-     */
-    private $separator;
-
-    /**
-     * Constructor.
-     *
-     * @param string $separator Separator to use between assets
-     */
-    public function __construct($separator = ';')
-    {
-        $this->separator = $separator;
-    }
-
-    public function filterLoad(AssetInterface $asset)
-    {
-    }
-
-    public function filterDump(AssetInterface $asset)
-    {
-        $asset->setContent($asset->getContent() . $this->separator);
-    }
-}
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 30f75761d05..43c83dea815 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -39,7 +39,7 @@ use Assetic\Filter\CssImportFilter;
 use Assetic\Filter\CssMinFilter;
 use Assetic\Filter\CssRewriteFilter;
 use Assetic\Filter\JSqueezeFilter;
-use OC\Assetic\SeparatorFilter; // waiting on upstream
+use Assetic\Filter\SeparatorFilter;
 
 /**
  * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
-- 
GitLab


From c4bac1655db175e9a7bfe6ea9a3415dbd05e7a52 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Mon, 28 Sep 2015 23:21:26 +0200
Subject: [PATCH 560/783] Fix CSP for images for legacy apps Fixes #19425

---
 lib/private/response.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/response.php b/lib/private/response.php
index f1a429463f2..14ee92972a9 100644
--- a/lib/private/response.php
+++ b/lib/private/response.php
@@ -247,7 +247,7 @@ class OC_Response {
 			. 'script-src \'self\' \'unsafe-eval\'; '
 			. 'style-src \'self\' \'unsafe-inline\'; '
 			. 'frame-src *; '
-			. 'img-src *; '
+			. 'img-src * data:; '
 			. 'font-src \'self\' data:; '
 			. 'media-src *; ' 
 			. 'connect-src *';
-- 
GitLab


From aa3596a410a59c4e3010ba6b8fd832de96636d94 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 29 Sep 2015 01:55:02 -0400
Subject: [PATCH 561/783] [tx-robot] updated from transifex

---
 apps/files/l10n/oc.js               | 1 +
 apps/files/l10n/oc.json             | 1 +
 apps/files_external/l10n/cs_CZ.js   | 3 +++
 apps/files_external/l10n/cs_CZ.json | 3 +++
 apps/files_sharing/l10n/cs_CZ.js    | 3 +++
 apps/files_sharing/l10n/cs_CZ.json  | 3 +++
 core/l10n/cs_CZ.js                  | 2 ++
 core/l10n/cs_CZ.json                | 2 ++
 core/l10n/el.js                     | 2 ++
 core/l10n/el.json                   | 2 ++
 lib/l10n/oc.js                      | 1 +
 lib/l10n/oc.json                    | 1 +
 settings/l10n/el.js                 | 1 +
 settings/l10n/el.json               | 1 +
 settings/l10n/fr.js                 | 4 ++--
 settings/l10n/fr.json               | 4 ++--
 settings/l10n/th_TH.js              | 1 +
 settings/l10n/th_TH.json            | 1 +
 18 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/apps/files/l10n/oc.js b/apps/files/l10n/oc.js
index 30b51c8f5f8..bd44479b285 100644
--- a/apps/files/l10n/oc.js
+++ b/apps/files/l10n/oc.js
@@ -40,6 +40,7 @@ OC.L10N.register(
     "Download" : "Telecargar",
     "Rename" : "Renomenar",
     "Delete" : "Suprimir",
+    "Details" : "Detalhs",
     "Select" : "Seleccionar",
     "Pending" : "En espèra",
     "Unable to determine date" : "Impossible de determinar la data",
diff --git a/apps/files/l10n/oc.json b/apps/files/l10n/oc.json
index 895400b3ae2..89843ea85c2 100644
--- a/apps/files/l10n/oc.json
+++ b/apps/files/l10n/oc.json
@@ -38,6 +38,7 @@
     "Download" : "Telecargar",
     "Rename" : "Renomenar",
     "Delete" : "Suprimir",
+    "Details" : "Detalhs",
     "Select" : "Seleccionar",
     "Pending" : "En espèra",
     "Unable to determine date" : "Impossible de determinar la data",
diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
index f48cf407681..59b3f9b148c 100644
--- a/apps/files_external/l10n/cs_CZ.js
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Saved" : "Uloženo",
     "Access key" : "Přístupový klíč",
     "Secret key" : "Tajný klíč",
+    "Builtin" : "Zabudované",
     "None" : "Žádné",
     "OAuth1" : "OAuth1",
     "App key" : "Klíč aplikace",
@@ -69,9 +70,11 @@ OC.L10N.register(
     "SFTP with secret key login" : "SFTP login s tajným klíčem",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Sdílet",
+    "Domain" : "Doména",
     "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
     "Username as share" : "Uživatelské jméno jako sdílený adresář",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Request timeout (seconds)" : "Čas vypršení požadavku (sekundy)",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
index d1f05174f47..08837e76a83 100644
--- a/apps/files_external/l10n/cs_CZ.json
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -28,6 +28,7 @@
     "Saved" : "Uloženo",
     "Access key" : "Přístupový klíč",
     "Secret key" : "Tajný klíč",
+    "Builtin" : "Zabudované",
     "None" : "Žádné",
     "OAuth1" : "OAuth1",
     "App key" : "Klíč aplikace",
@@ -67,9 +68,11 @@
     "SFTP with secret key login" : "SFTP login s tajným klíčem",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Sdílet",
+    "Domain" : "Doména",
     "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
     "Username as share" : "Uživatelské jméno jako sdílený adresář",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Request timeout (seconds)" : "Čas vypršení požadavku (sekundy)",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index f6b43cf4fa3..be924134ae2 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -38,6 +38,9 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Byl stažen veřejně sdílený soubor %1$s ",
     "You shared %1$s with %2$s" : "Sdílíte %1$s s %2$s",
     "You shared %1$s with group %2$s" : "Sdílíte %1$s se skupinou %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s nasdílel(a) %1$s s %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s nasdílel(a) %1$s se skupinou %3$s",
+    "%2$s shared %1$s via link" : "%2$s nasdílel(a) %1$s jako odkaz",
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
     "Shares" : "Sdílení",
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index f5822c627ae..a889bbc1235 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -36,6 +36,9 @@
     "Public shared file %1$s was downloaded" : "Byl stažen veřejně sdílený soubor %1$s ",
     "You shared %1$s with %2$s" : "Sdílíte %1$s s %2$s",
     "You shared %1$s with group %2$s" : "Sdílíte %1$s se skupinou %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s nasdílel(a) %1$s s %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s nasdílel(a) %1$s se skupinou %3$s",
+    "%2$s shared %1$s via link" : "%2$s nasdílel(a) %1$s jako odkaz",
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
     "Shares" : "Sdílení",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index bcbc2527dec..6661318154b 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -150,6 +150,7 @@ OC.L10N.register(
     "Share with users or groups …" : "Sdílet s uživateli nebo skupinami",
     "Share with users, groups or remote users …" : "Sdílet s uživateli, skupinami nebo vzdálenými uživateli",
     "Warning" : "Varování",
+    "Error while sending notification" : "Chyba při odesílání upozornění",
     "The object type is not specified." : "Není určen typ objektu.",
     "Enter new" : "Zadat nový",
     "Delete" : "Smazat",
@@ -179,6 +180,7 @@ OC.L10N.register(
     "New Password" : "Nové heslo",
     "Reset password" : "Obnovit heslo",
     "Searching other places" : "Prohledávání ostatních umístění",
+    "No search results in other folders" : "V ostatních adresářích nebylo nic nalezeno",
     "Personal" : "Osobní",
     "Users" : "Uživatelé",
     "Apps" : "Aplikace",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index f384b772679..bb7e050231c 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -148,6 +148,7 @@
     "Share with users or groups …" : "Sdílet s uživateli nebo skupinami",
     "Share with users, groups or remote users …" : "Sdílet s uživateli, skupinami nebo vzdálenými uživateli",
     "Warning" : "Varování",
+    "Error while sending notification" : "Chyba při odesílání upozornění",
     "The object type is not specified." : "Není určen typ objektu.",
     "Enter new" : "Zadat nový",
     "Delete" : "Smazat",
@@ -177,6 +178,7 @@
     "New Password" : "Nové heslo",
     "Reset password" : "Obnovit heslo",
     "Searching other places" : "Prohledávání ostatních umístění",
+    "No search results in other folders" : "V ostatních adresářích nebylo nic nalezeno",
     "Personal" : "Osobní",
     "Users" : "Uživatelé",
     "Apps" : "Aplikace",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 59490289bfd..79f6725e776 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -182,6 +182,8 @@ OC.L10N.register(
     "New Password" : "Νέος Κωδικός",
     "Reset password" : "Επαναφορά συνθηματικού",
     "Searching other places" : "Έρευνα σε άλλα σημεία.",
+    "No search results in other folders" : "Δεν υπάρχουν αποτελέσματα αναζήτησης σε άλλους φακέλους",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} αποτέλεσμα αναζήτησης σε άλλο φάκελο","{count} αποτελέσματα αναζήτησης σε άλλους φακέλους"],
     "Personal" : "Προσωπικά",
     "Users" : "Χρήστες",
     "Apps" : "Εφαρμογές",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 66f177d11b6..3fb2fbae8a5 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -180,6 +180,8 @@
     "New Password" : "Νέος Κωδικός",
     "Reset password" : "Επαναφορά συνθηματικού",
     "Searching other places" : "Έρευνα σε άλλα σημεία.",
+    "No search results in other folders" : "Δεν υπάρχουν αποτελέσματα αναζήτησης σε άλλους φακέλους",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} αποτέλεσμα αναζήτησης σε άλλο φάκελο","{count} αποτελέσματα αναζήτησης σε άλλους φακέλους"],
     "Personal" : "Προσωπικά",
     "Users" : "Χρήστες",
     "Apps" : "Εφαρμογές",
diff --git a/lib/l10n/oc.js b/lib/l10n/oc.js
index c61eaae5f22..2e6bfe56fe6 100644
--- a/lib/l10n/oc.js
+++ b/lib/l10n/oc.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "last year" : "an passat",
     "seconds ago" : "segonda a",
     "web services under your control" : "Services web jos ton contraròtle",
+    "File name contains at least one invalid character" : "Lo nom de fichièr conten al mens un caractèr invalid",
     "Authentication error" : "Error d'autentificacion",
     "Apps" : "Aplicacions",
     "A valid username must be provided" : "Un nom d'utilizaire valid deu èsser picat",
diff --git a/lib/l10n/oc.json b/lib/l10n/oc.json
index ea9f41c419d..3ac8367f556 100644
--- a/lib/l10n/oc.json
+++ b/lib/l10n/oc.json
@@ -11,6 +11,7 @@
     "last year" : "an passat",
     "seconds ago" : "segonda a",
     "web services under your control" : "Services web jos ton contraròtle",
+    "File name contains at least one invalid character" : "Lo nom de fichièr conten al mens un caractèr invalid",
     "Authentication error" : "Error d'autentificacion",
     "Apps" : "Aplicacions",
     "A valid username must be provided" : "Un nom d'utilizaire valid deu èsser picat",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index e1ca38deeee..363758011e1 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -149,6 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Να επιτρέπεται η αποστολή ειδοποιήσεων σε άλλους χρήστες, μέσω αλληλογραφίας για κοινόχρηστα αρχεία",
     "Exclude groups from sharing" : "Εξαίρεση ομάδων από τον διαμοιρασμό",
     "These groups will still be able to receive shares, but not to initiate them." : "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Να επιτρέπεται η χρήση αυτόματης συμπλήρωσης στο διάλογο διαμοιρασμού. Αν αυτό είναι απενεργοποιημένο θα πρέπει να εισαχθεί το πλήρες όνομα χρήστη.",
     "Last cron job execution: %s." : "Τελευταία εκτέλεση cron job: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Τελευταία εκτέλεση cron job: %s. Κάτι πήγε στραβά.",
     "Cron was not executed yet!" : "Η διεργασία cron δεν έχει εκτελεστεί ακόμα!",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 92873fb1675..12d2436fc92 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -147,6 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "Να επιτρέπεται η αποστολή ειδοποιήσεων σε άλλους χρήστες, μέσω αλληλογραφίας για κοινόχρηστα αρχεία",
     "Exclude groups from sharing" : "Εξαίρεση ομάδων από τον διαμοιρασμό",
     "These groups will still be able to receive shares, but not to initiate them." : "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Να επιτρέπεται η χρήση αυτόματης συμπλήρωσης στο διάλογο διαμοιρασμού. Αν αυτό είναι απενεργοποιημένο θα πρέπει να εισαχθεί το πλήρες όνομα χρήστη.",
     "Last cron job execution: %s." : "Τελευταία εκτέλεση cron job: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Τελευταία εκτέλεση cron job: %s. Κάτι πήγε στραβά.",
     "Cron was not executed yet!" : "Η διεργασία cron δεν έχει εκτελεστεί ακόμα!",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index b11e361f921..a7c389aab1e 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -125,7 +125,7 @@ OC.L10N.register(
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.",
-    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé, cela peut conduire à des conflits d'accès. Activer 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé, cela peut conduire à des conflits en cas d'accès concurrents. Activez 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
     "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux n'ont pu être configurés avec prise en charge d'UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nous vous recommandons d'installer sur votre système les paquets nécessaires à la prise en charge de l'un des paramètres régionaux suivants : %s",
@@ -149,7 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Autoriser les utilisateurs à envoyer des notifications de partage par e-mail",
     "Exclude groups from sharing" : "Empêcher certains groupes de partager",
     "These groups will still be able to receive shares, but not to initiate them." : "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
-    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Autoriser la complétion du nom d'utilisateur dans les champs de partage. Sinon le nom complet d'utilisateur doit être indiqué.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Autoriser la complétion du nom d'utilisateur dans la fenêtre de partage. Sinon le nom complet d'utilisateur doit être indiqué.",
     "Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
     "Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
     "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 327801cf0e9..81011944298 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -123,7 +123,7 @@
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.",
-    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé, cela peut conduire à des conflits d'accès. Activer 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé, cela peut conduire à des conflits en cas d'accès concurrents. Activez 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
     "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux n'ont pu être configurés avec prise en charge d'UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nous vous recommandons d'installer sur votre système les paquets nécessaires à la prise en charge de l'un des paramètres régionaux suivants : %s",
@@ -147,7 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "Autoriser les utilisateurs à envoyer des notifications de partage par e-mail",
     "Exclude groups from sharing" : "Empêcher certains groupes de partager",
     "These groups will still be able to receive shares, but not to initiate them." : "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
-    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Autoriser la complétion du nom d'utilisateur dans les champs de partage. Sinon le nom complet d'utilisateur doit être indiqué.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Autoriser la complétion du nom d'utilisateur dans la fenêtre de partage. Sinon le nom complet d'utilisateur doit être indiqué.",
     "Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
     "Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
     "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index 62f0164c787..5757116f68d 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -149,6 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "อนุญาตให้ผู้ใช้ส่งการแจ้งเตือนอีเมลสำหรับไฟล์ที่แชร์กับผู้ใช้อื่นๆ",
     "Exclude groups from sharing" : "ไม่รวมกลุ่มที่แชร์",
     "These groups will still be able to receive shares, but not to initiate them." : "กลุ่มนี้จะยังคงสามารถได้รับการแชร์ แต่พวกเขาจะไม่รู้จักมัน",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "อนุญาตให้เติมชื่อผู้ใช้ในกล่องตอบโต้อัตโนมัติ ถ้านี้ถูกปิดใช้งานชื่อผู้ใช้จะต้องกรอกเอง",
     "Last cron job execution: %s." : "การดำเนินการ cron job ล่าสุด: %s",
     "Last cron job execution: %s. Something seems wrong." : "การดำเนินการ cron job ล่าสุด: %s ดูเหมือนมีบางสิ่งไม่ถูกต้อง",
     "Cron was not executed yet!" : "Cron ไม่ได้ถูกดำเนินการ!",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index 92670ee82d8..b2ef07d5e29 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -147,6 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "อนุญาตให้ผู้ใช้ส่งการแจ้งเตือนอีเมลสำหรับไฟล์ที่แชร์กับผู้ใช้อื่นๆ",
     "Exclude groups from sharing" : "ไม่รวมกลุ่มที่แชร์",
     "These groups will still be able to receive shares, but not to initiate them." : "กลุ่มนี้จะยังคงสามารถได้รับการแชร์ แต่พวกเขาจะไม่รู้จักมัน",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "อนุญาตให้เติมชื่อผู้ใช้ในกล่องตอบโต้อัตโนมัติ ถ้านี้ถูกปิดใช้งานชื่อผู้ใช้จะต้องกรอกเอง",
     "Last cron job execution: %s." : "การดำเนินการ cron job ล่าสุด: %s",
     "Last cron job execution: %s. Something seems wrong." : "การดำเนินการ cron job ล่าสุด: %s ดูเหมือนมีบางสิ่งไม่ถูกต้อง",
     "Cron was not executed yet!" : "Cron ไม่ได้ถูกดำเนินการ!",
-- 
GitLab


From 7940a3fb659221580fb2f5663048718fe67e4d02 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Tue, 29 Sep 2015 12:17:47 +0545
Subject: [PATCH 562/783] Session closed exception wording

and a small comment typo
---
 lib/private/session/cryptowrapper.php | 2 +-
 lib/private/session/internal.php      | 2 +-
 lib/private/session/memory.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/private/session/cryptowrapper.php b/lib/private/session/cryptowrapper.php
index 261514d683e..70c1dab7404 100644
--- a/lib/private/session/cryptowrapper.php
+++ b/lib/private/session/cryptowrapper.php
@@ -39,7 +39,7 @@ use OCP\Security\ISecureRandom;
  * it as an additional small security obfuscation layer to comply with compliance
  * guidelines.
  *
- * TODO: Remove this in a future relase with an approach such as
+ * TODO: Remove this in a future release with an approach such as
  * https://github.com/owncloud/core/pull/17866
  *
  * @package OC\Session
diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php
index 8ee21272104..e10999ec48f 100644
--- a/lib/private/session/internal.php
+++ b/lib/private/session/internal.php
@@ -106,7 +106,7 @@ class Internal extends Session {
 
 	private function validateSession() {
 		if ($this->sessionClosed) {
-			throw new \Exception('Session has been closed - no further changes to the session as allowed');
+			throw new \Exception('Session has been closed - no further changes to the session are allowed');
 		}
 	}
 }
diff --git a/lib/private/session/memory.php b/lib/private/session/memory.php
index 1cae62e44d3..0fc9165c7cd 100644
--- a/lib/private/session/memory.php
+++ b/lib/private/session/memory.php
@@ -93,7 +93,7 @@ class Memory extends Session {
 	 */
 	private function validateSession() {
 		if ($this->sessionClosed) {
-			throw new \Exception('Session has been closed - no further changes to the session as allowed');
+			throw new \Exception('Session has been closed - no further changes to the session are allowed');
 		}
 	}
 }
-- 
GitLab


From f41a38ba1510e65be675834aefe5b57368b119dd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 25 Sep 2015 16:00:05 +0200
Subject: [PATCH 563/783] Cover both width and height for the sidebar preview

---
 apps/files/js/mainfileinfodetailview.js |  6 ++-
 lib/private/preview.php                 | 50 +++++++++++++------------
 tests/lib/preview.php                   | 41 ++++++++++++++++++++
 3 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 82cca0d0fb3..c15b1fb2d63 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -140,7 +140,8 @@
 		},
 
 		loadPreview: function(path, mime, etag, $iconDiv, $container, isImage) {
-			var maxImageHeight = ($container.parent().width() + 50) / (16/9); // 30px for negative margin
+			var maxImageWidth  = $container.parent().width() + 50;  // 50px for negative margins
+			var maxImageHeight = maxImageWidth / (16/9);
 			var smallPreviewSize = 75;
 
 			var isLandscape = function(img) {
@@ -164,8 +165,9 @@
 				mime: mime,
 				etag: etag,
 				y: isImage ? maxImageHeight : smallPreviewSize,
-				x: isImage ? 99999 /* only limit on y */ : smallPreviewSize,
+				x: isImage ? maxImageWidth : smallPreviewSize,
 				a: isImage ? 1 : null,
+				mode: isImage ? 'cover' : null,
 				callback: function (previewUrl, img) {
 					$iconDiv.previewImg = previewUrl;
 
diff --git a/lib/private/preview.php b/lib/private/preview.php
index de964b72df2..cd92f15b921 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -837,14 +837,6 @@ class Preview {
 		$askedWidth = $this->getMaxX();
 		$askedHeight = $this->getMaxY();
 
-		/**
-		 * Phase 1: If required, adjust boundaries to keep aspect ratio
-		 */
-		if ($this->keepAspect) {
-			list($askedWidth, $askedHeight) =
-				$this->applyAspectRatio($askedWidth, $askedHeight, $previewWidth, $previewHeight);
-		}
-
 		if ($this->mode === self::MODE_COVER) {
 			list($scaleWidth, $scaleHeight) =
 				$this->applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight);
@@ -853,6 +845,14 @@ class Preview {
 			$scaleHeight = $askedHeight;
 		}
 
+		/**
+		 * Phase 1: If required, adjust boundaries to keep aspect ratio
+		 */
+		if ($this->keepAspect) {
+			list($scaleWidth, $scaleHeight) =
+				$this->applyAspectRatio($scaleWidth, $scaleHeight, $previewWidth, $previewHeight);
+		}
+
 		/**
 		 * Phase 2: Resizes preview to try and match requirements.
 		 * Takes the scaling ratio into consideration
@@ -870,26 +870,30 @@ class Preview {
 
 		/**
 		 * Phase 3: We're still not there yet, so we're clipping and filling
-		 * to match the asked dimensions
+		 * to match the asked dimensions if we're not asked to keep aspect ratio
 		 */
-		// It turns out the scaled preview is now too big, so we crop the image
-		if ($newPreviewWidth >= $askedWidth && $newPreviewHeight >= $askedHeight) {
-			$this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight);
-			$this->storePreview($fileId, $askedWidth, $askedHeight);
 
-			return;
-		}
+		if (!$this->keepAspect) {
+			// It turns out the scaled preview is now too big, so we crop the image
+			if ($newPreviewWidth >= $askedWidth && $newPreviewHeight >= $askedHeight) {
+				$this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight);
+				$this->storePreview($fileId, $askedWidth, $askedHeight);
 
-		// At least one dimension of the scaled preview is too small,
-		// so we fill the space with a transparent background
-		if (($newPreviewWidth < $askedWidth || $newPreviewHeight < $askedHeight)) {
-			$this->cropAndFill(
-				$image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight
-			);
-			$this->storePreview($fileId, $askedWidth, $askedHeight);
+				return;
+			}
 
-			return;
+			// At least one dimension of the scaled preview is too small,
+			// so we fill the space with a transparent background
+			if (($newPreviewWidth < $askedWidth || $newPreviewHeight < $askedHeight)) {
+				$this->cropAndFill(
+					$image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight
+				);
+				$this->storePreview($fileId, $askedWidth, $askedHeight);
+
+				return;
+			}
 		}
+
 		// The preview is smaller, but we can't touch it
 		$this->storePreview($fileId, $newPreviewWidth, $newPreviewHeight);
 	}
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index 9e118014bac..a135ed40d0a 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -874,4 +874,45 @@ class Preview extends TestCase {
 
 		return [(int)$askedWidth, (int)$askedHeight];
 	}
+
+	public function testKeepAspectRatio() {
+		$originalWidth = 1680;
+		$originalHeight = 1050;
+		$originalAspectRation = $originalWidth / $originalHeight;
+
+		$preview = new \OC\Preview(
+			self::TEST_PREVIEW_USER1, 'files/', 'testimage.jpg',
+			150,
+			150
+		);
+		$preview->setKeepAspect(true);
+		$image = $preview->getPreview();
+
+		$aspectRatio = $image->width() / $image->height();
+		$this->assertEquals(round($originalAspectRation, 2), round($aspectRatio, 2));
+
+		$this->assertLessThanOrEqual(150, $image->width());
+		$this->assertLessThanOrEqual(150, $image->height());
+	}
+
+	public function testKeepAspectRatioCover() {
+		$originalWidth = 1680;
+		$originalHeight = 1050;
+		$originalAspectRation = $originalWidth / $originalHeight;
+
+		$preview = new \OC\Preview(
+			self::TEST_PREVIEW_USER1, 'files/', 'testimage.jpg',
+			150,
+			150
+		);
+		$preview->setKeepAspect(true);
+		$preview->setMode(\OC\Preview::MODE_COVER);
+		$image = $preview->getPreview();
+
+		$aspectRatio = $image->width() / $image->height();
+		$this->assertEquals(round($originalAspectRation, 2), round($aspectRatio, 2));
+
+		$this->assertGreaterThanOrEqual(150, $image->width());
+		$this->assertGreaterThanOrEqual(150, $image->height());
+	}
 }
-- 
GitLab


From 222a4bd4ac7c3d0ce76564a3f0cad9237d121b87 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 25 Sep 2015 16:58:56 +0200
Subject: [PATCH 564/783] Scale portrait images correctly

---
 apps/files/css/detailsView.css          | 2 +-
 apps/files/js/mainfileinfodetailview.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index faa26678562..f1522c5f775 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -40,7 +40,7 @@
 	height: auto;
 }
 
-#app-sidebar .image.landscape .thumbnail::before {
+#app-sidebar .image .thumbnail::before {
 	content: '';
 	display: block;
 	padding-bottom: 56.25%; /* sets height of .thumbnail to 9/16 of the width */
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index c15b1fb2d63..7f2528737d5 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -186,7 +186,7 @@
 					// when we dont have a preview we show the mime icon in the error handler
 					$iconDiv.css({
 						'background-image': 'url("' + previewUrl + '")',
-						height: (isLandscape(img) && targetHeight > smallPreviewSize)? 'auto': targetHeight
+						height: (targetHeight > smallPreviewSize)? 'auto': targetHeight
 					});
 				}.bind(this),
 				error: function () {
-- 
GitLab


From a40a2b0d64299bc2114c2700a32014110826205f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 28 Sep 2015 14:04:43 +0200
Subject: [PATCH 565/783] improve handling of small images

---
 apps/files/js/mainfileinfodetailview.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 7f2528737d5..a74534e68e7 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -148,6 +148,10 @@
 				return img.width > (img.height * 1.2);
 			};
 
+			var isSmall = function(img) {
+				return (img.width * 1.1) < (maxImageWidth * window.devicePixelRatio);
+			};
+
 			var getTargetHeight = function(img) {
 				if(isImage) {
 					var targetHeight = img.height / window.devicePixelRatio;
@@ -178,7 +182,7 @@
 					$iconDiv.removeClass('icon-loading icon-32');
 					var targetHeight = getTargetHeight(img);
 					if (this.model.isImage() && targetHeight > smallPreviewSize) {
-						$container.addClass(isLandscape(img)? 'landscape': 'portrait');
+						$container.addClass((isLandscape(img) && !isSmall(img))? 'landscape': 'portrait');
 						$container.addClass('image');
 					}
 
@@ -186,7 +190,8 @@
 					// when we dont have a preview we show the mime icon in the error handler
 					$iconDiv.css({
 						'background-image': 'url("' + previewUrl + '")',
-						height: (targetHeight > smallPreviewSize)? 'auto': targetHeight
+						height: (targetHeight > smallPreviewSize)? 'auto': targetHeight,
+						'max-height': isSmall(img)? targetHeight: null
 					});
 				}.bind(this),
 				error: function () {
-- 
GitLab


From fbe296df17f4d97fde4b7148198cde11c29fb8b7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 28 Sep 2015 14:14:18 +0200
Subject: [PATCH 566/783] adjust aspect ratio of preview size when for aspect
 ratios > 16/9

---
 apps/files/css/detailsView.css          |  2 +-
 apps/files/js/mainfileinfodetailview.js | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index f1522c5f775..485c20e6865 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -40,7 +40,7 @@
 	height: auto;
 }
 
-#app-sidebar .image .thumbnail::before {
+#app-sidebar .image .thumbnail .stretcher {
 	content: '';
 	display: block;
 	padding-bottom: 56.25%; /* sets height of .thumbnail to 9/16 of the width */
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index a74534e68e7..39a00d0a5a5 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -10,7 +10,7 @@
 
 (function() {
 	var TEMPLATE =
-		'<div class="thumbnailContainer"><a href="#" class="thumbnail action-default"></a></div>' +
+		'<div class="thumbnailContainer"><a href="#" class="thumbnail action-default"><div class="stretcher"/></a></div>' +
 		'<div class="file-details-container">' +
 		'<div class="fileName"><h3 title="{{name}}" class="ellipsis">{{name}}</h3></div>' +
 		'	<div class="file-details ellipsis">' +
@@ -164,6 +164,15 @@
 				}
 			};
 
+			var getTargetRatio = function(img){
+				var ratio = img.width / img.height;
+				if (ratio > 16/9) {
+					return ratio;
+				} else {
+					return 16/9;
+				}
+			};
+
 			this._fileList.lazyLoadPreview({
 				path: path,
 				mime: mime,
@@ -193,6 +202,11 @@
 						height: (targetHeight > smallPreviewSize)? 'auto': targetHeight,
 						'max-height': isSmall(img)? targetHeight: null
 					});
+
+					var targetRatio = getTargetRatio(img);
+					$iconDiv.find('.stretcher').css({
+						'padding-bottom': (100 / targetRatio) + '%'
+					});
 				}.bind(this),
 				error: function () {
 					$iconDiv.removeClass('icon-loading icon-32');
-- 
GitLab


From 4cc0f5bf8e06c87cc125e0b593dd672fedd15ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 28 Sep 2015 22:54:20 +0200
Subject: [PATCH 567/783] Update 3rdparty submodule

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 5ce8de19b67..e2a142cf866 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 5ce8de19b67296cc03957d4483ae8ddacc1d4f82
+Subproject commit e2a142cf866b30318c0bd71a78e9aa659deccadf
-- 
GitLab


From d52361b09b3960d962f59b03a7aa178b45efa5b1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 29 Sep 2015 13:24:33 +0200
Subject: [PATCH 568/783] Disable sorting when multiselect is enabled in file
 list

---
 apps/files/css/files.css            |  3 +++
 apps/files/js/filelist.js           |  3 +++
 apps/files/tests/js/filelistSpec.js | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 5b1cd48fd49..d5ac9233239 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -190,6 +190,9 @@ table th .sort-indicator {
 .multiselect .sort-indicator {
 	visibility: hidden;
 }
+.multiselect .sort, .multiselect .sort span {
+	cursor: default;
+}
 table th:hover .sort-indicator.hidden,
 table th:focus .sort-indicator.hidden {
 	visibility: visible;
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 4b1b38d783c..060269c220f 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -623,6 +623,9 @@
 		 * Event handler when clicking on a table header
 		 */
 		_onClickHeader: function(e) {
+			if (this.$table.hasClass('multiselect')) {
+				return;
+			}
 			var $target = $(e.target);
 			var sort;
 			if (!$target.is('a')) {
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index c05e7c37214..31e5c410270 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2156,6 +2156,25 @@ describe('OCA.Files.FileList tests', function() {
 			expect(fileList.files.length).toEqual(5);
 			expect(fileList.$fileList.find('tr').length).toEqual(5);
 		});
+		it('does not sort when clicking on header whenever multiselect is enabled', function() {
+			var sortStub = sinon.stub(OCA.Files.FileList.prototype, 'setSort');
+
+			fileList.setFiles(testFiles);
+			fileList.findFileEl('One.txt').find('input:checkbox:first').click();
+
+			fileList.$el.find('.column-size .columntitle').click();
+
+			expect(sortStub.notCalled).toEqual(true);
+
+			// can sort again after deselecting
+			fileList.findFileEl('One.txt').find('input:checkbox:first').click();
+
+			fileList.$el.find('.column-size .columntitle').click();
+
+			expect(sortStub.calledOnce).toEqual(true);
+
+			sortStub.restore();
+		});
 	});
 	describe('create file', function() {
 		var deferredCreate;
-- 
GitLab


From 631303c1e74cb10a63fa46f99e3111067ec2f010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 6 Aug 2015 15:44:24 +0200
Subject: [PATCH 569/783] First integration tests for provisioning api

---
 build/integration/composer.json                |  6 ++++++
 build/integration/config/behat.yml             | 17 +++++++++++++++++
 .../features/provisioning-v1.feature           |  9 +++++++++
 .../features/provisioning-v2.feature           |  9 +++++++++
 build/integration/run.sh                       | 18 ++++++++++++++++++
 5 files changed, 59 insertions(+)
 create mode 100644 build/integration/composer.json
 create mode 100644 build/integration/config/behat.yml
 create mode 100644 build/integration/features/provisioning-v1.feature
 create mode 100644 build/integration/features/provisioning-v2.feature
 create mode 100755 build/integration/run.sh

diff --git a/build/integration/composer.json b/build/integration/composer.json
new file mode 100644
index 00000000000..f77ddba9bcd
--- /dev/null
+++ b/build/integration/composer.json
@@ -0,0 +1,6 @@
+{
+  "require-dev": {
+    "guzzlehttp/guzzle": "~5.0",
+    "behat/behat": "2.4.*@stable"
+  }
+}
diff --git a/build/integration/config/behat.yml b/build/integration/config/behat.yml
new file mode 100644
index 00000000000..78a228a5c1e
--- /dev/null
+++ b/build/integration/config/behat.yml
@@ -0,0 +1,17 @@
+default:
+    paths:
+        features: ../features
+        bootstrap: %behat.paths.features%/bootstrap
+
+    context:
+      parameters:
+        baseUrl:  http://localhost:8080/ocs/
+        admin:
+          - admin
+          - admin
+
+ci:
+    formatter:
+        name:       junit
+        parameters:
+          output_path: ./output
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
new file mode 100644
index 00000000000..dd574186b56
--- /dev/null
+++ b/build/integration/features/provisioning-v1.feature
@@ -0,0 +1,9 @@
+Feature: provisioning
+  Background:
+    Given using api version "1"
+
+  Scenario: Getting an not existing user
+    Given As an "admin"
+    When sending "GET" to "/cloud/users/test"
+    Then the status code should be "200"
+
diff --git a/build/integration/features/provisioning-v2.feature b/build/integration/features/provisioning-v2.feature
new file mode 100644
index 00000000000..72ceed5d6a5
--- /dev/null
+++ b/build/integration/features/provisioning-v2.feature
@@ -0,0 +1,9 @@
+Feature: provisioning
+  Background:
+    Given using api version "2"
+
+  Scenario: Getting an not existing user
+    Given As an "admin"
+    When sending "GET" to "/cloud/users/test"
+    Then the status code should be "404"
+
diff --git a/build/integration/run.sh b/build/integration/run.sh
new file mode 100755
index 00000000000..40afbe85b9b
--- /dev/null
+++ b/build/integration/run.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+composer install
+
+# TODO: avoid port collision on jenkins - use $EXECUTOR_NUMBER
+if [ -z "$EXECUTOR_NUMBER" ]; then
+    EXECUTOR_NUMBER=0
+fi
+PORT=$((8080 + $EXECUTOR_NUMBER))
+echo $PORT
+php -S localhost:$PORT -t ../.. &
+PHPPID=$!
+echo $PHPPID
+
+export BEHAT_PARAMS="context[parameters][base_url]=http://localhost:$PORT/ocs"
+vendor/bin/behat
+
+kill $PHPPID
-- 
GitLab


From d26aab7e05cde33265fe857b92a1d0faa80ea6d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 6 Aug 2015 15:47:21 +0200
Subject: [PATCH 570/783] Adding missing files

---
 build/integration/.gitignore                  |  3 +
 .../features/bootstrap/FeatureContext.php     | 91 +++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 build/integration/.gitignore
 create mode 100644 build/integration/features/bootstrap/FeatureContext.php

diff --git a/build/integration/.gitignore b/build/integration/.gitignore
new file mode 100644
index 00000000000..18b981bf7ed
--- /dev/null
+++ b/build/integration/.gitignore
@@ -0,0 +1,3 @@
+vendor
+output
+composer.lock
diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
new file mode 100644
index 00000000000..e1185debbc5
--- /dev/null
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -0,0 +1,91 @@
+<?php
+
+use Behat\Behat\Context\BehatContext;
+use GuzzleHttp\Client;
+use GuzzleHttp\Message\ResponseInterface;
+
+//
+// Require 3rd-party libraries here:
+//
+//   require_once 'PHPUnit/Autoload.php';
+//   require_once 'PHPUnit/Framework/Assert/Functions.php';
+//
+
+/**
+ * Features context.
+ */
+class FeatureContext extends BehatContext {
+
+    /** @var string */
+    private $baseUrl = '';
+
+    /** @var ResponseInterface */
+    private $response = null;
+
+	/** @var string */
+	private $currentUser = '';
+
+	/** @var int */
+	private $apiVersion = 1;
+
+    /**
+     * Initializes context.
+     * Every scenario gets it's own context object.
+     *
+     * @param array $parameters context parameters (set them up through behat.yml)
+     */
+    public function __construct(array $parameters) {
+
+        // Initialize your context here
+		$this->baseUrl = $parameters['baseUrl'];
+		$this->adminUser = $parameters['admin'];
+    }
+
+    /**
+     * @When /^sending "([^"]*)" to "([^"]*)"$/
+     */
+    public function sendingTo($verb, $url) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php" . $url;
+        $client = new Client();
+        // TODO: get admin user from config
+        $options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		}
+
+		try {
+			$this->response = $client->send($client->createRequest($verb, $fullUrl, $options));
+		} catch (\GuzzleHttp\Exception\ClientException $ex) {
+			$this->response = $ex->getResponse();
+		}
+    }
+
+    /**
+     * @Then /^the status code should be "([^"]*)"$/
+     */
+    public function theStatusCodeShouldBe($statusCode) {
+        PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^As an "([^"]*)"$/
+     */
+    public function asAn($user) {
+		$this->currentUser = $user;
+    }
+
+	/**
+	 * @Given /^using api version "([^"]*)"$/
+	 */
+	public function usingApiVersion($version) {
+		$this->apiVersion = $version;
+	}
+
+	/**
+	 * @Given /^user "([^"]*)" exists$/
+	 */
+	public function userExists($user) {
+		throw new \Behat\Behat\Exception\PendingException();
+	}
+
+}
-- 
GitLab


From 6749071667491ce51af585e9e39667d3ee40cefd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 6 Aug 2015 16:41:46 +0200
Subject: [PATCH 571/783] Adding phpunit for the assertions

---
 build/integration/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/integration/composer.json b/build/integration/composer.json
index f77ddba9bcd..98b2f294c7a 100644
--- a/build/integration/composer.json
+++ b/build/integration/composer.json
@@ -1,5 +1,6 @@
 {
   "require-dev": {
+    "phpunit/phpunit": "~4.6",
     "guzzlehttp/guzzle": "~5.0",
     "behat/behat": "2.4.*@stable"
   }
-- 
GitLab


From cb6e1b115d9b564910e7237fea1de855daec4647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 6 Aug 2015 16:46:06 +0200
Subject: [PATCH 572/783] require autoload.php

---
 build/integration/features/bootstrap/FeatureContext.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index e1185debbc5..6dab7100f22 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -4,12 +4,7 @@ use Behat\Behat\Context\BehatContext;
 use GuzzleHttp\Client;
 use GuzzleHttp\Message\ResponseInterface;
 
-//
-// Require 3rd-party libraries here:
-//
-//   require_once 'PHPUnit/Autoload.php';
-//   require_once 'PHPUnit/Framework/Assert/Functions.php';
-//
+require __DIR__ . '/../../vendor/autoload.php';
 
 /**
  * Features context.
-- 
GitLab


From 925aa6c0f51aac3f9a256aee431c708f33230f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 6 Aug 2015 17:16:24 +0200
Subject: [PATCH 573/783] Test user creation

---
 .../features/bootstrap/FeatureContext.php     | 140 ++++++++++++------
 .../features/provisioning-v1.feature          |  15 ++
 2 files changed, 110 insertions(+), 45 deletions(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index 6dab7100f22..527e0c9ba08 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -11,11 +11,11 @@ require __DIR__ . '/../../vendor/autoload.php';
  */
 class FeatureContext extends BehatContext {
 
-    /** @var string */
-    private $baseUrl = '';
+	/** @var string */
+	private $baseUrl = '';
 
-    /** @var ResponseInterface */
-    private $response = null;
+	/** @var ResponseInterface */
+	private $response = null;
 
 	/** @var string */
 	private $currentUser = '';
@@ -23,51 +23,39 @@ class FeatureContext extends BehatContext {
 	/** @var int */
 	private $apiVersion = 1;
 
-    /**
-     * Initializes context.
-     * Every scenario gets it's own context object.
-     *
-     * @param array $parameters context parameters (set them up through behat.yml)
-     */
-    public function __construct(array $parameters) {
+	/**
+	 * Initializes context.
+	 * Every scenario gets it's own context object.
+	 *
+	 * @param array $parameters context parameters (set them up through behat.yml)
+	 */
+	public function __construct(array $parameters) {
 
-        // Initialize your context here
+		// Initialize your context here
 		$this->baseUrl = $parameters['baseUrl'];
 		$this->adminUser = $parameters['admin'];
-    }
-
-    /**
-     * @When /^sending "([^"]*)" to "([^"]*)"$/
-     */
-    public function sendingTo($verb, $url) {
-        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php" . $url;
-        $client = new Client();
-        // TODO: get admin user from config
-        $options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
+	}
 
-		try {
-			$this->response = $client->send($client->createRequest($verb, $fullUrl, $options));
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-		}
-    }
-
-    /**
-     * @Then /^the status code should be "([^"]*)"$/
-     */
-    public function theStatusCodeShouldBe($statusCode) {
-        PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode());
-    }
-
-    /**
-     * @Given /^As an "([^"]*)"$/
-     */
-    public function asAn($user) {
+	/**
+	 * @When /^sending "([^"]*)" to "([^"]*)"$/
+	 */
+	public function sendingTo($verb, $url) {
+		$this->sendingToWith($verb, $url, null);
+	}
+
+	/**
+	 * @Then /^the status code should be "([^"]*)"$/
+	 */
+	public function theStatusCodeShouldBe($statusCode) {
+		PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode());
+	}
+
+	/**
+	 * @Given /^As an "([^"]*)"$/
+	 */
+	public function asAn($user) {
 		$this->currentUser = $user;
-    }
+	}
 
 	/**
 	 * @Given /^using api version "([^"]*)"$/
@@ -80,7 +68,69 @@ class FeatureContext extends BehatContext {
 	 * @Given /^user "([^"]*)" exists$/
 	 */
 	public function userExists($user) {
-		throw new \Behat\Behat\Exception\PendingException();
+		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
+		$client = new Client();
+		$options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		}
+
+		$this->response = $client->get($fullUrl, $options);
+		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
+	}
+
+	/**
+	 * @Given /^user "([^"]*)" does not exist$/
+	 */
+	public function userDoesNotExist($user) {
+		try {
+			$this->userExists($user);
+		} catch (\GuzzleHttp\Exception\ClientException $ex) {
+			PHPUnit_Framework_Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+		}
+	}
+
+	/**
+	 * @When /^creating the user "([^"]*)r"$/
+	 */
+	public function creatingTheUser($user) {
+		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
+		$client = new Client();
+		$options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		}
+
+		$this->response = $client->post($fullUrl, [
+			'form_params' => [
+				'userid' => $user,
+				'password' => '123456'
+			]
+		]);
+		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
+	}
+
+	/**
+	 * @When /^sending "([^"]*)" to "([^"]*)" with$/
+	 * @param \Behat\Gherkin\Node\TableNode|null $formData
+	 */
+	public function sendingToWith($verb, $url, $body) {
+		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php" . $url;
+		$client = new Client();
+		$options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		}
+		if ($body instanceof \Behat\Gherkin\Node\TableNode) {
+			$fd = $body->getRowsHash();
+			$options['body'] = $fd;
+		}
+
+		try {
+			$this->response = $client->send($client->createRequest($verb, $fullUrl, $options));
+		} catch (\GuzzleHttp\Exception\ClientException $ex) {
+			$this->response = $ex->getResponse();
+		}
 	}
 
 }
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index dd574186b56..aa3b31260e7 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -7,3 +7,18 @@ Feature: provisioning
     When sending "GET" to "/cloud/users/test"
     Then the status code should be "200"
 
+  Scenario: Listing all users
+    Given As an "admin"
+    When sending "GET" to "/cloud/users"
+    Then the status code should be "200"
+
+  Scenario: Create a user
+    Given As an "admin"
+    And user "brand-new-user" does not exist
+    When sending "POST" to "/cloud/users" with
+      | userid | brand-new-user |
+      | password | 123456 |
+
+    Then the status code should be "200"
+    And user "brand-new-user" exists
+
-- 
GitLab


From db0a8aa795710d94f88f3c036983992792dd4191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 6 Aug 2015 17:29:39 +0200
Subject: [PATCH 574/783] Use fixed port for now

---
 build/integration/run.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/integration/run.sh b/build/integration/run.sh
index 40afbe85b9b..baf31b411c4 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -3,16 +3,17 @@
 composer install
 
 # TODO: avoid port collision on jenkins - use $EXECUTOR_NUMBER
-if [ -z "$EXECUTOR_NUMBER" ]; then
-    EXECUTOR_NUMBER=0
-fi
-PORT=$((8080 + $EXECUTOR_NUMBER))
+#if [ -z "$EXECUTOR_NUMBER" ]; then
+#    EXECUTOR_NUMBER=0
+#fi
+#PORT=$((8080 + $EXECUTOR_NUMBER))
+PORT=8080
 echo $PORT
 php -S localhost:$PORT -t ../.. &
 PHPPID=$!
 echo $PHPPID
 
-export BEHAT_PARAMS="context[parameters][base_url]=http://localhost:$PORT/ocs"
+#export BEHAT_PARAMS="context[parameters][base_url]=http://localhost:$PORT/ocs"
 vendor/bin/behat
 
 kill $PHPPID
-- 
GitLab


From 933121c66f65ee4a3ac8b0741741b1445b50afa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 6 Aug 2015 17:35:59 +0200
Subject: [PATCH 575/783] Use ci profile

---
 build/integration/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/integration/run.sh b/build/integration/run.sh
index baf31b411c4..df33d85fc74 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -14,6 +14,6 @@ PHPPID=$!
 echo $PHPPID
 
 #export BEHAT_PARAMS="context[parameters][base_url]=http://localhost:$PORT/ocs"
-vendor/bin/behat
+vendor/bin/behat --profile ci
 
 kill $PHPPID
-- 
GitLab


From 2d1f509acf6bab68d4b1f092a0f4b8fc8da5e125 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 29 Sep 2015 10:54:43 +0000
Subject: [PATCH 576/783] added delete user test

---
 build/integration/features/provisioning-v1.feature | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index aa3b31260e7..9e3d2df50bb 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -22,3 +22,11 @@ Feature: provisioning
     Then the status code should be "200"
     And user "brand-new-user" exists
 
+
+  Scenario: Delete a user
+    Given As an "admin"
+    And user "brand-new-user" exists
+    When sending "POST" to "/cloud/users" with
+      | userid | brand-new-user |
+    Then the status code should be "200"
+    And user "brand-new-user" does not exist
-- 
GitLab


From e3a98e4959c36432b1e8250afc03708e10a32cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 29 Sep 2015 13:56:56 +0200
Subject: [PATCH 577/783] Support different server ports - defined by
 EXECUTOR_NUMBER

---
 build/integration/config/behat.yml                   |  4 ++--
 .../features/bootstrap/FeatureContext.php            |  6 ++++++
 build/integration/run.sh                             | 12 ++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build/integration/config/behat.yml b/build/integration/config/behat.yml
index 78a228a5c1e..01ca0d18790 100644
--- a/build/integration/config/behat.yml
+++ b/build/integration/config/behat.yml
@@ -12,6 +12,6 @@ default:
 
 ci:
     formatter:
-        name:       junit
+        name:       pretty,junit
         parameters:
-          output_path: ./output
+          output_path: null,./output
diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index 527e0c9ba08..b7a04e1ca76 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -34,6 +34,12 @@ class FeatureContext extends BehatContext {
 		// Initialize your context here
 		$this->baseUrl = $parameters['baseUrl'];
 		$this->adminUser = $parameters['admin'];
+
+		// in case of ci deployment we take the server url from the environment
+		$testServerUrl = getenv('TEST_SERVER_URL');
+		if ($testServerUrl !== false) {
+			$this->baseUrl = $testServerUrl;
+		}
 	}
 
 	/**
diff --git a/build/integration/run.sh b/build/integration/run.sh
index df33d85fc74..08f10b86c5f 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -3,17 +3,17 @@
 composer install
 
 # TODO: avoid port collision on jenkins - use $EXECUTOR_NUMBER
-#if [ -z "$EXECUTOR_NUMBER" ]; then
-#    EXECUTOR_NUMBER=0
-#fi
-#PORT=$((8080 + $EXECUTOR_NUMBER))
-PORT=8080
+if [ -z "$EXECUTOR_NUMBER" ]; then
+    EXECUTOR_NUMBER=0
+fi
+PORT=$((8080 + $EXECUTOR_NUMBER))
+#PORT=8080
 echo $PORT
 php -S localhost:$PORT -t ../.. &
 PHPPID=$!
 echo $PHPPID
 
-#export BEHAT_PARAMS="context[parameters][base_url]=http://localhost:$PORT/ocs"
+export TEST_SERVER_URL="http://localhost:$PORT/ocs/"
 vendor/bin/behat --profile ci
 
 kill $PHPPID
-- 
GitLab


From f886f0683d55e05c4ca87cc07e3d282b9990ec05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 29 Sep 2015 13:31:25 +0200
Subject: [PATCH 578/783] Update sabre/dav to 2.1.7

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index e2a142cf866..1914e923a45 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit e2a142cf866b30318c0bd71a78e9aa659deccadf
+Subproject commit 1914e923a4589e619b930e1ca587041d6fd3a1f3
-- 
GitLab


From e735a9915cec6a26f7f6d89100fef383c563fd0d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 29 Sep 2015 14:18:12 +0200
Subject: [PATCH 579/783] Add blob: scheme to default CSP policy

Fixes https://github.com/owncloud/core/issues/19438
---
 lib/private/response.php                      |   2 +-
 .../http/contentsecuritypolicy.php            |   1 +
 .../controller/ControllerTest.php             |   2 +-
 .../http/ContentSecurityPolicyTest.php        | 106 +++++++++---------
 .../appframework/http/DataResponseTest.php    |   2 +-
 tests/lib/appframework/http/ResponseTest.php  |   2 +-
 6 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/lib/private/response.php b/lib/private/response.php
index 14ee92972a9..2cd1d990e51 100644
--- a/lib/private/response.php
+++ b/lib/private/response.php
@@ -247,7 +247,7 @@ class OC_Response {
 			. 'script-src \'self\' \'unsafe-eval\'; '
 			. 'style-src \'self\' \'unsafe-inline\'; '
 			. 'frame-src *; '
-			. 'img-src * data:; '
+			. 'img-src * data: blob:; '
 			. 'font-src \'self\' data:; '
 			. 'media-src *; ' 
 			. 'connect-src *';
diff --git a/lib/public/appframework/http/contentsecuritypolicy.php b/lib/public/appframework/http/contentsecuritypolicy.php
index ee36f7aac17..07c76f2969c 100644
--- a/lib/public/appframework/http/contentsecuritypolicy.php
+++ b/lib/public/appframework/http/contentsecuritypolicy.php
@@ -64,6 +64,7 @@ class ContentSecurityPolicy {
 	private $allowedImageDomains = [
 		'\'self\'',
 		'data:',
+		'blob:',
 	];
 	/** @var array Domains to which connections can be done */
 	private $allowedConnectDomains = [
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
index 243014a91a7..c847525c263 100644
--- a/tests/lib/appframework/controller/ControllerTest.php
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -178,7 +178,7 @@ class ControllerTest extends \Test\TestCase {
 			'test' => 'something',
 			'Cache-Control' => 'no-cache, must-revalidate',
 			'Content-Type' => 'application/json; charset=utf-8',
-			'Content-Security-Policy' => "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'",
+			'Content-Security-Policy' => "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'",
 		];
 
 		$response = $this->controller->customDataResponse(array('hi'));
diff --git a/tests/lib/appframework/http/ContentSecurityPolicyTest.php b/tests/lib/appframework/http/ContentSecurityPolicyTest.php
index 082c032a420..6d9c6d7b8d9 100644
--- a/tests/lib/appframework/http/ContentSecurityPolicyTest.php
+++ b/tests/lib/appframework/http/ContentSecurityPolicyTest.php
@@ -28,19 +28,19 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDefault() {
-		$defaultPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$defaultPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 		$this->assertSame($defaultPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyScriptDomainValid() {
-		$expectedPolicy = "default-src 'none';script-src 'self' www.owncloud.com 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' www.owncloud.com 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.owncloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyScriptDomainValidMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' www.owncloud.com www.owncloud.org 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' www.owncloud.com www.owncloud.org 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.owncloud.org');
@@ -48,7 +48,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowScriptDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowScriptDomain('www.owncloud.com');
@@ -56,7 +56,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowScriptDomainMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' www.owncloud.com 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' www.owncloud.com 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowScriptDomain('www.owncloud.org');
@@ -64,7 +64,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowScriptDomainMultipleStacked() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowScriptDomain('www.owncloud.org')->disallowScriptDomain('www.owncloud.com');
@@ -72,14 +72,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyScriptAllowInline() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-inline' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-inline' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->allowInlineScript(true);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyScriptAllowInlineWithDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' www.owncloud.com 'unsafe-inline' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' www.owncloud.com 'unsafe-inline' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedScriptDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->allowInlineScript(true);
@@ -87,7 +87,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyScriptDisallowInlineAndEval() {
-		$expectedPolicy = "default-src 'none';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->allowInlineScript(false);
 		$this->contentSecurityPolicy->allowEvalScript(false);
@@ -95,14 +95,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyStyleDomainValid() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' www.owncloud.com 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' www.owncloud.com 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.owncloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyStyleDomainValidMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' www.owncloud.com www.owncloud.org 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' www.owncloud.com www.owncloud.org 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.owncloud.org');
@@ -110,7 +110,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowStyleDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowStyleDomain('www.owncloud.com');
@@ -118,7 +118,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowStyleDomainMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' www.owncloud.com 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' www.owncloud.com 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowStyleDomain('www.owncloud.org');
@@ -126,7 +126,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowStyleDomainMultipleStacked() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowStyleDomain('www.owncloud.org')->disallowStyleDomain('www.owncloud.com');
@@ -134,35 +134,35 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyStyleAllowInline() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->allowInlineStyle(true);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyStyleAllowInlineWithDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' www.owncloud.com 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' www.owncloud.com 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedStyleDomain('www.owncloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyStyleDisallowInline() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->allowInlineStyle(false);
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyImageDomainValid() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: www.owncloud.com;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob: www.owncloud.com;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.owncloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyImageDomainValidMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: www.owncloud.com www.owncloud.org;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob: www.owncloud.com www.owncloud.org;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.owncloud.org');
@@ -170,7 +170,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowImageDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowImageDomain('www.owncloud.com');
@@ -178,7 +178,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowImageDomainMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: www.owncloud.com;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob: www.owncloud.com;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowImageDomain('www.owncloud.org');
@@ -186,7 +186,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowImageDomainMultipleStakes() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedImageDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowImageDomain('www.owncloud.org')->disallowImageDomain('www.owncloud.com');
@@ -194,14 +194,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyFontDomainValid() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self' www.owncloud.com;connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' www.owncloud.com;connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.owncloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyFontDomainValidMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self' www.owncloud.com www.owncloud.org;connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' www.owncloud.com www.owncloud.org;connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.owncloud.org');
@@ -209,7 +209,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowFontDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowFontDomain('www.owncloud.com');
@@ -217,7 +217,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowFontDomainMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self' www.owncloud.com;connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self' www.owncloud.com;connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowFontDomain('www.owncloud.org');
@@ -225,7 +225,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowFontDomainMultipleStakes() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFontDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowFontDomain('www.owncloud.org')->disallowFontDomain('www.owncloud.com');
@@ -233,14 +233,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyConnectDomainValid() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self' www.owncloud.com;media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self' www.owncloud.com;media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.owncloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyConnectDomainValidMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self' www.owncloud.com www.owncloud.org;media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self' www.owncloud.com www.owncloud.org;media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.owncloud.org');
@@ -248,7 +248,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowConnectDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowConnectDomain('www.owncloud.com');
@@ -256,7 +256,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowConnectDomainMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self' www.owncloud.com;media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self' www.owncloud.com;media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowConnectDomain('www.owncloud.org');
@@ -264,7 +264,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowConnectDomainMultipleStakes() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedConnectDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowConnectDomain('www.owncloud.org')->disallowConnectDomain('www.owncloud.com');
@@ -272,14 +272,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyMediaDomainValid() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self' www.owncloud.com";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self' www.owncloud.com";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.owncloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyMediaDomainValidMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self' www.owncloud.com www.owncloud.org";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self' www.owncloud.com www.owncloud.org";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.owncloud.org');
@@ -287,7 +287,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowMediaDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowMediaDomain('www.owncloud.com');
@@ -295,7 +295,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowMediaDomainMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self' www.owncloud.com";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self' www.owncloud.com";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowMediaDomain('www.owncloud.org');
@@ -303,7 +303,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowMediaDomainMultipleStakes() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedMediaDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowMediaDomain('www.owncloud.org')->disallowMediaDomain('www.owncloud.com');
@@ -311,14 +311,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyObjectDomainValid() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self';object-src www.owncloud.com";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self';object-src www.owncloud.com";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.owncloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyObjectDomainValidMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self';object-src www.owncloud.com www.owncloud.org";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self';object-src www.owncloud.com www.owncloud.org";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.owncloud.org');
@@ -326,7 +326,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowObjectDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowObjectDomain('www.owncloud.com');
@@ -334,7 +334,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowObjectDomainMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self';object-src www.owncloud.com";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self';object-src www.owncloud.com";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowObjectDomain('www.owncloud.org');
@@ -342,7 +342,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowObjectDomainMultipleStakes() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedObjectDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowObjectDomain('www.owncloud.org')->disallowObjectDomain('www.owncloud.com');
@@ -350,14 +350,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetAllowedFrameDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self';frame-src www.owncloud.com";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self';frame-src www.owncloud.com";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.owncloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyFrameDomainValidMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self';frame-src www.owncloud.com www.owncloud.org";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self';frame-src www.owncloud.com www.owncloud.org";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.owncloud.org');
@@ -365,7 +365,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowFrameDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowFrameDomain('www.owncloud.com');
@@ -373,7 +373,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowFrameDomainMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self';frame-src www.owncloud.com";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self';frame-src www.owncloud.com";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowFrameDomain('www.owncloud.org');
@@ -381,7 +381,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowFrameDomainMultipleStakes() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedFrameDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowFrameDomain('www.owncloud.org')->disallowFrameDomain('www.owncloud.com');
@@ -389,14 +389,14 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetAllowedChildSrcDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self';child-src child.owncloud.com";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self';child-src child.owncloud.com";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('child.owncloud.com');
 		$this->assertSame($expectedPolicy, $this->contentSecurityPolicy->buildPolicy());
 	}
 
 	public function testGetPolicyChildSrcValidMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self';child-src child.owncloud.com child.owncloud.org";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self';child-src child.owncloud.com child.owncloud.org";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('child.owncloud.com');
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('child.owncloud.org');
@@ -404,7 +404,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowChildSrcDomain() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowChildSrcDomain('www.owncloud.com');
@@ -412,7 +412,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowChildSrcDomainMultiple() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self';child-src www.owncloud.com";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self';child-src www.owncloud.com";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowChildSrcDomain('www.owncloud.org');
@@ -420,7 +420,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testGetPolicyDisallowChildSrcDomainMultipleStakes() {
-		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expectedPolicy = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->contentSecurityPolicy->addAllowedChildSrcDomain('www.owncloud.com');
 		$this->contentSecurityPolicy->disallowChildSrcDomain('www.owncloud.org')->disallowChildSrcDomain('www.owncloud.com');
@@ -428,7 +428,7 @@ class ContentSecurityPolicyTest extends \Test\TestCase {
 	}
 
 	public function testConfigureStacked() {
-		$expectedPolicy = "default-src 'none';script-src 'self' script.owncloud.org;style-src 'self' style.owncloud.org;img-src 'self' data: img.owncloud.org;font-src 'self' font.owncloud.org;connect-src 'self' connect.owncloud.org;media-src 'self' media.owncloud.org;object-src objects.owncloud.org;frame-src frame.owncloud.org;child-src child.owncloud.org";
+		$expectedPolicy = "default-src 'none';script-src 'self' script.owncloud.org;style-src 'self' style.owncloud.org;img-src 'self' data: blob: img.owncloud.org;font-src 'self' font.owncloud.org;connect-src 'self' connect.owncloud.org;media-src 'self' media.owncloud.org;object-src objects.owncloud.org;frame-src frame.owncloud.org;child-src child.owncloud.org";
 
 		$this->contentSecurityPolicy->allowInlineStyle(false)
 			->allowEvalScript(false)
diff --git a/tests/lib/appframework/http/DataResponseTest.php b/tests/lib/appframework/http/DataResponseTest.php
index 2b7817c28e9..e3d5689d54c 100644
--- a/tests/lib/appframework/http/DataResponseTest.php
+++ b/tests/lib/appframework/http/DataResponseTest.php
@@ -68,7 +68,7 @@ class DataResponseTest extends \Test\TestCase {
 
 		$expectedHeaders = [
 			'Cache-Control' => 'no-cache, must-revalidate',
-			'Content-Security-Policy' => "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'",
+			'Content-Security-Policy' => "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'",
 		];
 		$expectedHeaders = array_merge($expectedHeaders, $headers);
 
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
index 61dd95e5948..f845f02d984 100644
--- a/tests/lib/appframework/http/ResponseTest.php
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -58,7 +58,7 @@ class ResponseTest extends \Test\TestCase {
 
 		$this->childResponse->setHeaders($expected);
 		$headers = $this->childResponse->getHeaders();
-		$expected['Content-Security-Policy'] = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data:;font-src 'self';connect-src 'self';media-src 'self'";
+		$expected['Content-Security-Policy'] = "default-src 'none';script-src 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src 'self';connect-src 'self';media-src 'self'";
 
 		$this->assertEquals($expected, $headers);
 	}
-- 
GitLab


From 5acb38b5b324a76d757074402da69f428712efd6 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 29 Sep 2015 14:35:32 +0200
Subject: [PATCH 580/783] [upgrade] switch to debug logging on upgrade

* resets afterwards
* adds output about the previous log level
---
 core/ajax/update.php     |  6 ++++++
 core/command/upgrade.php |  6 ++++++
 lib/private/updater.php  | 16 ++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/core/ajax/update.php b/core/ajax/update.php
index a693deeb9cf..ff18d2bc04b 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -88,6 +88,12 @@ if (OC::checkUpgrade(false)) {
 		$eventSource->close();
 		OC_Config::setValue('maintenance', false);
 	});
+	$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Set log level to debug - current level: "%s"', [ $logLevelName ]));
+	});
+	$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Reset log level to  "%s"', [ $logLevelName ]));
+	});
 
 	try {
 		$updater->upgrade();
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index 44e0b66c17c..fa160d9a1c0 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -177,6 +177,12 @@ class Upgrade extends Command {
 			$updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) {
 				$output->writeln("<error>$message</error>");
 			});
+			$updater->listen('\OC\Updater', 'setDebugLogLevel', function ($logLevel, $logLevelName) use($output) {
+				$output->writeln("<info>Set log level to debug - current level: '$logLevelName'</info>");
+			});
+			$updater->listen('\OC\Updater', 'resetLogLevel', function ($logLevel, $logLevelName) use($output) {
+				$output->writeln("<info>Reset log level to '$logLevelName'</info>");
+			});
 
 			if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
 				$updater->listen('\OC\Updater', 'repairInfo', function ($message) use($output) {
diff --git a/lib/private/updater.php b/lib/private/updater.php
index b33180c3425..8aa8b0703d7 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -32,6 +32,7 @@
 
 namespace OC;
 
+use OC\Core\Command\Log\Manage;
 use OC\Hooks\BasicEmitter;
 use OC_App;
 use OC_Installer;
@@ -69,6 +70,14 @@ class Updater extends BasicEmitter {
 	/** @var bool */
 	private $skip3rdPartyAppsDisable;
 
+	private $logLevelNames = [
+		0 => 'Debug',
+		1 => 'Info',
+		2 => 'Warning',
+		3 => 'Error',
+		4 => 'Fatal',
+	];
+
 	/**
 	 * @param HTTPHelper $httpHelper
 	 * @param IConfig $config
@@ -177,6 +186,10 @@ class Updater extends BasicEmitter {
 	 * @return bool true if the operation succeeded, false otherwise
 	 */
 	public function upgrade() {
+		$logLevel = $this->config->getSystemValue('loglevel', \OCP\Util::WARN);
+		$this->emit('\OC\Updater', 'setDebugLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
+		$this->config->setSystemValue('loglevel', \OCP\Util::DEBUG);
+
 		$wasMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
 
 		if(!$wasMaintenanceModeEnabled) {
@@ -208,6 +221,9 @@ class Updater extends BasicEmitter {
 			$this->emit('\OC\Updater', 'maintenanceActive');
 		}
 
+		$this->emit('\OC\Updater', 'resetLogLevel', [ $logLevel, $this->logLevelNames[$logLevel] ]);
+		$this->config->setSystemValue('loglevel', $logLevel);
+
 		return $success;
 	}
 
-- 
GitLab


From 1015ca72c3efdc24a4985735d5e481356f7fb19f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 29 Sep 2015 14:38:29 +0200
Subject: [PATCH 581/783] Prevent sort indicator hover to bypass multiselect
 restriction

---
 apps/files/css/files.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index d5ac9233239..928eb0c778e 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -187,7 +187,9 @@ table th .sort-indicator {
 	opacity: .3;
 }
 .sort-indicator.hidden,
-.multiselect .sort-indicator {
+.multiselect .sort-indicator,
+table.multiselect th:hover .sort-indicator.hidden,
+table.multiselect th:focus .sort-indicator.hidden {
 	visibility: hidden;
 }
 .multiselect .sort, .multiselect .sort span {
-- 
GitLab


From 8def1383c8bfaad55cf7917af275b23977236323 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 29 Sep 2015 15:30:01 +0200
Subject: [PATCH 582/783] Fix share link password error

- only allow submitting the password once, single request
- display error in tooltip
---
 core/js/sharedialoglinkshareview.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index cb9325231dd..3d8fb461461 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -144,17 +144,33 @@
 		},
 
 		onPasswordEntered: function() {
-			var password = this.$el.find('#linkPassText').val();
+			var self = this;
+			var $loading = this.$el.find('#linkPass .icon-loading-small');
+			if (!$loading.hasClass('hidden')) {
+				// still in process
+				return;
+			}
+			var $input = this.$el.find('#linkPassText');
+			$input.removeClass('error');
+			var password = $input.val();
 			if(password === '') {
 				return;
 			}
 
-			this.$el.find('#linkPass .icon-loading-small')
+			$loading
 				.removeClass('hidden')
 				.addClass('inlineblock');
 
 			this.model.setPassword(password);
-			this.model.saveLinkShare();
+			this.model.saveLinkShare({}, {
+				error: function(model, msg) {
+					$loading.removeClass('inlineblock').addClass('hidden');
+					$input.addClass('error');
+					$input.attr('title', msg);
+					$input.tooltip({placement: 'bottom', trigger: 'manual'});
+					$input.tooltip('show');
+				}
+			});
 		},
 
 		onAllowPublicUploadChange: function() {
-- 
GitLab


From fbe43e6a267389aebacd08b0d3965ee29f7b0c4c Mon Sep 17 00:00:00 2001
From: Individual IT Services <info@individual-it.net>
Date: Thu, 10 Sep 2015 10:05:07 +0545
Subject: [PATCH 583/783] cache result of \OCP\Util::needUpgrade()

reduce calls of \OCP\Util::needUpgrade()
where \OCP\Util::needUpgrade() is called we can call as well
self::checkUpgrade and use the cached result
In line 877 the call way unnecessary anyway because of the first part of
the if statement

move caching to \OCP\Util::needUpgrade

renaming variable

fixing testNeedUpgradeCore()

cache result of checkUpgrade() in self::$needUpgrade

reduce calls of \OCP\Util::needUpgrade()
where \OCP\Util::needUpgrade() is called we can call as well
self::checkUpgrade and use the cached result
In line 877 the call way unnecessary anyway because of the first part of
the if statement

move caching to \OCP\Util::needUpgrade

renaming variable

fixing testNeedUpgradeCore()

fix typo in variable name

deleting tabs
---
 lib/base.php        | 11 +++++------
 lib/public/util.php |  6 +++++-
 tests/lib/util.php  |  2 ++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 32b90cad1fa..889801f9653 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -237,7 +237,7 @@ class OC {
 		// Check if config is writable
 		$configFileWritable = is_writable($configFilePath);
 		if (!$configFileWritable && !OC_Helper::isReadOnlyConfigEnabled()
-			|| !$configFileWritable && \OCP\Util::needUpgrade()) {
+			|| !$configFileWritable && self::checkUpgrade(false)) {
 			if (self::$CLI) {
 				echo $l->t('Cannot write into "config" directory!')."\n";
 				echo $l->t('This can usually be fixed by giving the webserver write access to the config directory')."\n";
@@ -678,7 +678,7 @@ class OC {
 	 */
 	public static function registerCacheHooks() {
 		//don't try to do this before we are properly setup
-		if (\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
+		if (\OC::$server->getSystemConfig()->getValue('installed', false) && !self::checkUpgrade(false)) {
 
 			// NOTE: This will be replaced to use OCP
 			$userSession = self::$server->getUserSession();
@@ -714,7 +714,7 @@ class OC {
 	 */
 	public static function registerLogRotate() {
 		$systemConfig = \OC::$server->getSystemConfig();
-		if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
+		if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !self::checkUpgrade(false)) {
 			//don't try to do this before we are properly setup
 			//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
 			\OCP\BackgroundJob::registerJob('OC\Log\Rotate', $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/owncloud.log'));
@@ -807,8 +807,7 @@ class OC {
 
 		// Load minimum set of apps
 		if (!self::checkUpgrade(false)
-			&& !$systemConfig->getValue('maintenance', false)
-			&& !\OCP\Util::needUpgrade()) {
+			&& !$systemConfig->getValue('maintenance', false)) {
 			// For logged-in users: Load everything
 			if(OC_User::isLoggedIn()) {
 				OC_App::loadApps();
@@ -821,7 +820,7 @@ class OC {
 
 		if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
 			try {
-				if (!$systemConfig->getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
+				if (!$systemConfig->getValue('maintenance', false) && !self::checkUpgrade(false)) {
 					OC_App::loadApps(array('filesystem', 'logging'));
 					OC_App::loadApps();
 				}
diff --git a/lib/public/util.php b/lib/public/util.php
index 652df5192cf..1ba091d1952 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -654,6 +654,7 @@ class Util {
 		return \OC_Util::isDefaultExpireDateEnforced();
 	}
 
+	protected static $needUpgradeCache = null;
 
 	/**
 	 * Checks whether the current version needs upgrade.
@@ -662,6 +663,9 @@ class Util {
 	 * @since 7.0.0
 	 */
 	public static function needUpgrade() {
-		return \OC_Util::needUpgrade(\OC::$server->getConfig());
+		if (!isset(self::$needUpgradeCache)) {
+			self::$needUpgradeCache=\OC_Util::needUpgrade(\OC::$server->getConfig());
+		}		
+		return self::$needUpgradeCache;
 	}
 }
diff --git a/tests/lib/util.php b/tests/lib/util.php
index b9b8062653e..49579b3b6bd 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -406,11 +406,13 @@ class Test_Util extends \Test\TestCase {
 
 		OC_Config::setValue('version', '7.0.0.0');
 		\OC::$server->getSession()->set('OC_Version', array(7, 0, 0, 1));
+		self::invokePrivate(new \OCP\Util, 'needUpgradeCache', array(null));
 
 		$this->assertTrue(\OCP\Util::needUpgrade());
 
 		OC_Config::setValue('version', $oldConfigVersion);
 		$oldSessionVersion = \OC::$server->getSession()->set('OC_Version', $oldSessionVersion);
+		self::invokePrivate(new \OCP\Util, 'needUpgradeCache', array(null));
 
 		$this->assertFalse(\OCP\Util::needUpgrade());
 	}
-- 
GitLab


From a1c419dc71b51457a384a496079b15fec1985078 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Tue, 29 Sep 2015 16:32:43 +0200
Subject: [PATCH 584/783] Use Hermite resampling for comparator canvas previews

---
 core/js/oc-dialogs.js | 93 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 85 insertions(+), 8 deletions(-)

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 38b91be9d2e..c38250c79c6 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -342,11 +342,12 @@ var OCdialogs = {
 
 		var crop = function(img) {
 			var canvas = document.createElement('canvas'),
-				width = img.width,
-				height = img.height,
-				x, y, size;
+					targetSize = 96,
+					width = img.width,
+					height = img.height,
+					x, y, size;
 
-			// calculate the width and height, constraining the proportions
+			// Calculate the width and height, constraining the proportions
 			if (width > height) {
 				y = 0;
 				x = (width - height) / 2;
@@ -356,14 +357,90 @@ var OCdialogs = {
 			}
 			size = Math.min(width, height);
 
-			// resize the canvas and draw the image data into it
-			canvas.width = 64;
-			canvas.height = 64;
+			// Set canvas size to the cropped area
+			canvas.width = size;
+			canvas.height = size;
 			var ctx = canvas.getContext("2d");
-			ctx.drawImage(img, x, y, size, size, 0, 0, 64, 64);
+			ctx.drawImage(img, x, y, size, size, 0, 0, size, size);
+
+			// Resize the canvas to match the destination (right size uses 96px)
+			resampleHermite(canvas, size, size, targetSize, targetSize);
+
 			return canvas.toDataURL("image/png", 0.7);
 		};
 
+		/**
+		 * Fast image resize/resample using Hermite filter with JavaScript.
+		 *
+		 * @author: ViliusL
+		 *
+		 * @param {*} canvas
+		 * @param {number} W
+		 * @param {number} H
+		 * @param {number} W2
+		 * @param {number} H2
+		 */
+		var resampleHermite = function (canvas, W, H, W2, H2) {
+			W2 = Math.round(W2);
+			H2 = Math.round(H2);
+			var img = canvas.getContext("2d").getImageData(0, 0, W, H);
+			var img2 = canvas.getContext("2d").getImageData(0, 0, W2, H2);
+			var data = img.data;
+			var data2 = img2.data;
+			var ratio_w = W / W2;
+			var ratio_h = H / H2;
+			var ratio_w_half = Math.ceil(ratio_w / 2);
+			var ratio_h_half = Math.ceil(ratio_h / 2);
+
+			for (var j = 0; j < H2; j++) {
+				for (var i = 0; i < W2; i++) {
+					var x2 = (i + j * W2) * 4;
+					var weight = 0;
+					var weights = 0;
+					var weights_alpha = 0;
+					var gx_r = 0;
+					var gx_g = 0;
+					var gx_b = 0;
+					var gx_a = 0;
+					var center_y = (j + 0.5) * ratio_h;
+					for (var yy = Math.floor(j * ratio_h); yy < (j + 1) * ratio_h; yy++) {
+						var dy = Math.abs(center_y - (yy + 0.5)) / ratio_h_half;
+						var center_x = (i + 0.5) * ratio_w;
+						var w0 = dy * dy; //pre-calc part of w
+						for (var xx = Math.floor(i * ratio_w); xx < (i + 1) * ratio_w; xx++) {
+							var dx = Math.abs(center_x - (xx + 0.5)) / ratio_w_half;
+							var w = Math.sqrt(w0 + dx * dx);
+							if (w >= -1 && w <= 1) {
+								//hermite filter
+								weight = 2 * w * w * w - 3 * w * w + 1;
+								if (weight > 0) {
+									dx = 4 * (xx + yy * W);
+									//alpha
+									gx_a += weight * data[dx + 3];
+									weights_alpha += weight;
+									//colors
+									if (data[dx + 3] < 255)
+										weight = weight * data[dx + 3] / 250;
+									gx_r += weight * data[dx];
+									gx_g += weight * data[dx + 1];
+									gx_b += weight * data[dx + 2];
+									weights += weight;
+								}
+							}
+						}
+					}
+					data2[x2] = gx_r / weights;
+					data2[x2 + 1] = gx_g / weights;
+					data2[x2 + 2] = gx_b / weights;
+					data2[x2 + 3] = gx_a / weights_alpha;
+				}
+			}
+			canvas.getContext("2d").clearRect(0, 0, Math.max(W, W2), Math.max(H, H2));
+			canvas.width = W2;
+			canvas.height = H2;
+			canvas.getContext("2d").putImageData(img2, 0, 0);
+		};
+
 		var addConflict = function($conflicts, original, replacement) {
 
 			var $conflict = $conflicts.find('.template').clone().removeClass('template').addClass('conflict');
-- 
GitLab


From e826108b6c68a0993cde670124f70b84b24db61a Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 29 Sep 2015 16:57:14 +0200
Subject: [PATCH 585/783] Fix IE8 login logo

Added 175px logo to make it have the same size.
It's only used for IE8.
---
 core/css/header.css          |   4 ++++
 core/img/logo-icon-175px.png | Bin 0 -> 3821 bytes
 2 files changed, 4 insertions(+)
 create mode 100644 core/img/logo-icon-175px.png

diff --git a/core/css/header.css b/core/css/header.css
index 369750251c4..b25823411f0 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -69,6 +69,10 @@
 	opacity: 1;
 }
 
+.ie8 #header .logo {
+	background-image: url(../img/logo-icon-175px.png);
+}
+
 #header .logo {
 	background-image: url(../img/logo-icon.svg);
 	background-repeat: no-repeat;
diff --git a/core/img/logo-icon-175px.png b/core/img/logo-icon-175px.png
new file mode 100644
index 0000000000000000000000000000000000000000..dca833b70260e82ac8899b4445cbc2f2255ab068
GIT binary patch
literal 3821
zcmV<J4ifQ+P)<h;3K|Lk000e1NJLTq006H5003YJ1^@s6Yb+uZ00004b3#c}2nYxW
zd<bNS00009a7bBm001Wu001Wu0Y)yf{Qv*}8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H14r)n6K~#90?VWq{Tvc_)zdJ8U2nZno5~Lt4gitC_A0Wu1AYf`K
z(jr;{R9Z?DP%2hffNd?St<_Z^tD=Eb3e`nHG@?RD5C!TAF+37dAOV3&B*BD70!he|
zJU;#7oXZS9XMQvH&N=taOwMPmtaJ05bN1Qy&YpA6W1oGbL?V$$Boc{4B9TZW5{X12
zkx2A1R<#1X3~->NLnIv_X^f;%k~T|PC26swrzFiYv(1$$nMh;+M*!1-Wwggy;77p6
zfe}^fpV$roP6Xz(X|T;$3VaqAUiJMXwgZ4YfEgVc?LZa+M^=4ri9QB6miD^`dD#qH
zTJ=39`VioBU}Gf1t>=1RXw~<d=o5fbe9KrCH&lJki9P^$FR;Eu!_7!th@7N(-a3Gt
zBrTBi+Z9y5MbdF*Hm8ERdy>93Uf_L_J|^k+B<&#yNy{WXBx#13Egq2nT1kIhww`r7
zE$L7*d$U3v5>)~m1^m3lYkDj29bk7~W+LVGbDME-)z2?c5x~X3mNpG#6E)+#IhHl%
zWI3=y)z2|eGQgEN4P}NeH->Vi#oFbQRX@vKU`W*pgaVi>>8hN?e&o|LB)uc7Mjdfh
z)e7_iePO)7FiF=a-~Axzr~djQ!IkQa<AHAaF?A(<VZ4$~m2_avGB29ha=;`V6G5j=
z7%AxkRV&f$^o#L+tU#Hkd^%pzt^suk#qUZIFxB^iHvumL4+A#==K>R|R<cTlRjoiE
zjwn!OiBI<nsYpOFy<YO^2uZv9e;<%^uB2_i|490}q&v-QTiHrhNx!tbdlo3O#;5NL
zsYpO}@#$-W<QXFAcu7Byv;a6hx>j98&l|7rvlf{b-RRS9-QAGg)5bw_)p(Dj`*2=r
zqax|lRrI{^ni-N_DNuBzPge$1rx|M`y)J1}jxulfbmyFPO_lT@uvgA<Jx9Ovc^{M1
zXz=ocq`8vjOL|h$3OOTMrP{pitATXbBx$y!hb1kP8xSrrvsLw({1n(2Nt67)LnNJ`
z-|Ty5-Gw59$-^Yg0gg4Z7YdY5lm&2p-Rjh{z!kvnv{`l+U|YeJu#LbiIRD=rJG_Sj
zfJ=ZyUiR7k?_Vsa8^HeoyLF;hH`5nhWx!}jcT2iK((Pup)&G5%r1wfXQf?l2AGv|h
zFuB(EBs1FvERu9kjw+YSEsFf7nXRbPV<)*e<HICPlyj}zP125X+u~oBw9c1*M$U`u
zK}idJ_a~F{A-Pt232=*~DY+iV+qqBvK0A<+C=1|d++66Y7A@0ZKL2%Xwq&mZms2+&
z0><KY1ka(kSK2GUw}2CXAp`E^`hqg+`Fz>mK_Vx>M}WCGzSK*6xl`N7dk5YF&6hbC
z*JXG!w<!(I3&7`i`w!$3xCM%$tYtf2(CAu#3BV5ue5sH6^22~7P4cY9_dk8!y@Bsi
zyr0}IFXL9%hWL8N;{1<`lJ?1U8^Fo9*KSb`@p3L}@Y!PEVE?({22^i!P*)Ki&UEm4
z{4K?PI2)*Yb0jJTH_Onj<9Rb~_Of;bUL9aGnWOqRU{;6qbi#Vzyt?~73+L;Qm%pj%
zyGqo78zhBzb#DPOCzvVzZ}Wj&{NE<w`k~#xbbO2l;KSs1pns^!?<}FW1~6L#8pSN!
zGP8iIfwBJja9~BidO|P*@9T^EvE}&zZw0#5m!to|wS;RU7{#Xt)bk$P)L1w2U1|fl
zFXb$IVm05~b`EY<U_o$GaID5pPXYT7FGg7?uB&@4x8^8!QFY&7SbEL3;UY<gMw0z?
zGh2^~q5C~KC-rXTLf{cI`?jRd%DG1F(IDS8NsHuysr*XPqorw>Z~!|2D`PZaxR9eG
zd_C7jsv`z#anaecaX`j8;CA3o>Ek|b&-gX~Uy$^#k;I>5W<LQAm-KV>maFJ&NynNQ
zxM{y%O8Tamz2(G?^YNG@=kvRpoPWn~No(cYNuQDPuUIoscp?D6Gm%=aSzi87;IT+`
z#OBW%Jg;%M6}lhe7ARV=1$YGbGHrU~CE5TtWfhB~eH~L;=ImaUQtS5Y3*10^2HT8n
zIHNzV(l5RRUGaJZb^}fW{t-6~bU!c;$Tn8SimULDna#${@m?OOjxu<cq^$MbN7DH!
zwlyllB%LJb0pL#H-5u)JUjQS3bAbD3zThyy=e@s!R%9^#%FCY|Nq(99!rzPG9P&f*
z29Too07Gznv862@*h_U~I&r*d#zy=|oX)(px``wF{ag`A{xk;o8&^rGir}Vo9+Gsu
z+^cRdUhrjhl{7AbIzKbB)xge@{y2jCD#%*L|BfX8VoBfX76UF#3E&L53G(;1StQ%I
z7;6vKET0~y+D_tLXR=S9R4rIZXwH)KZ;@o@q7>r=E|heeq|rHwWyYJQOdjU?w4VZX
z><8@Y_ru*Ev7QTosS)M3MRel@{z5JsQQo?;QzB!8xZf=4aev)!hxr}l(<dU=GY#)b
zS`|@^7dS?4M{kjpylh!>bvTXQVzHTR#7&XqjV{^kO!Vo~k?Yw((scg}D<PWk`hnK1
zD(?I<#-}SJZ4IJSjVutycu6}2mR&WO@jhEZT}Mkgy@Yxi60_y~XGxue96A6PYG#`h
z{)<@V(;@--x}D4$u8c5Nl5}NNt#1_L^;2T!cPM6*r2YN%<AY@^z&fAC8VpuR_9iLI
z$>tDM6r4L&%X?WM*@ye|-T<=d$s#Xy6r!n187)cvjkUR?I?ryMB|O267q@Eli9q7A
z#e=)$oT@{S8Eu}ZjlIG~$$81Cyv+uuRMB;a(enO@!cF?042(3hS0v30BvYzIUR)bc
zX19=qMjfs4{Iz$Nba2aDfr(+f9}XyMM@eV;>uCYywi9){SIO?F>>U)pUvhm>UMokn
z&XS8ufScr2jOG-Ozh2Tjxk>w#az|KYt<wu~{lejmi}obX`LyiAzbCfN5|*IGi;GeF
zTOno2g&sZ4%<jOQ%lnAhdt*E*=~_uYG_wtjGML$B;CWT>;3M*kPY)=$-tp2~W1chR
zBD$}XJGf?cv+tl2LbtqoD^5S_YG9U`%?GAQx@3^NugUE){!SM278f@+JNbRMq+d&V
z%s<e1>M!G+=hL$LpxG4No|3*f;Is9>U6TI6%wn(n6$5yGBtKGsfAV#Vz{L@3#FN0@
zb^4qP%%pKxq^Um7Uq;ck8eXRs4(f@L>%PO+d*C2>HUs~H*RfMV57>ez)r8A{6V2>R
zNvBC#JmB+%l8!U8rNExRy^`*ca}#WI6zWHPdY@cBxF2}H%(mhJ1eV?MW{V<&Ew>Mo
zTLbtZe$QPegf`xoQ%^%B{THy0nJtr>)p*f=_L`(q&1@yk)9DdOt->0efSZQ<m7Ifo
zKX98*C#(Fh2HC+h?f75+k)&^QT48A8eL1kafsB*%6JUawJui3i<pN2Uo7wZe#kpIq
z@7;<~s`>JMJBqgDvP#lj{<@0&X4yb-|3P!rI1f0jlL~_xubI87_;aWGOZq9Wmzn)q
z&a>%8|JjXlyJy?wGd{gl?y!?y=0Cif=es2RK?U_^{wI@il=%uSAW9)(EK-ya3u}_3
zM}ZHT**brs&oPot$tmX#frEUcnCn{R?p`)Zy4qiVPI1Q`jaV&r7M|o9lXjUX>DZ!`
z#xULoBFJpSc)8<BvyT5~2Fu(8laxgZpQhejahq;t%YiYHKHV~Rc<%87#XaOttIxry
zMJtVAyfakZ=>0h}d(#{6<d(S`GX>bs$M)*Qz$42gec4}Ms%o6;Z}I8r%0EynJS!61
zc+KpWa>3uqV3AMXt>SC>BP31t*Eh-q+Uq4QHnTOrL`hYgx3*YrN>VB|P%M1JRxE$s
zuSJqOkZiX=r?GTT0?ziQM4qYM=|0?OX5YiPBYs2GoM8V|Gur|jDL4C*mn}srj%B<v
z<(z0@6S8}94Y0dEX!=tMzi%!y3*-i8l3Ol6p#mKiO1jBkUr|uTvesD|6UBJFPr-$X
z@5!G{h%XNyYpkU21Me`iyX5>Mx|PL}K5Awga506yQh^TJBwgU0n@&`1#WFAR1L_nG
z;L<?r=FRwDU(X2KnGzwmh1$tLmj{v=lBK}@UcY^*?(B@KybdFQr#g^xcykM?5M0E<
z+k-r+#%!T>URua{uBf|*sdRo&VJH^i9glE_9{!>tJ?^CD0MzcG<Bgb02iu3D1|9L;
zhjS$TI8qfuC7t1~uMa49eRg4HH^}X!D{CuxGwzafw3#jS|6ikOUb(X+ebUeCPLXs$
zK{?wbeKB)e?OJfJ_1gmc;v4ZewKK_P29WnG@Ed#Za0h1pEP(vHYyiGMgBA*R6v4lj
zsLP$yj{BNK{u4Os`BHq#3k0qU@p+1!ncIppd>!L~7dw!%fm$^7X7_L|apDCxVkT{z
z4*^_6XNJ^@t-w{(`QhT8#We-xT|<Roq6z~XM7T)jt8hPv;dSy41C|$%wE<`=PA~9I
z;7Z<p&~`{30CH_)#XZ-#5p-FIKewYvz30*X5o50c=j6Gst^_z9xQAkcp(ViI;ZJ36
zAbW3MP7Zm`QDD>y><D~{!H*_rmle3dPrLDp8|h=f$8iI@PI(?TSZ%pE6&MTrJ@9lB
zSx?}OnccbQy>%tPUcd#w_kqPUJ_vdP@E~pr$;q^_jl_SEr~7iv4C`s!>G6$rTI9Wt
zJ%K;N^+D(3&T$xwCBVJ7AK{1EF_Ij*7;p@5Gw^Z?J?dG7o3%NGg070d1mJ^S#*sj@
zlSI3&-vR6(w^4GmTuiYQX4cUT4O|QTJ}-BqT-5N#{4R=U;0}b@Mebfk$!)n`CFvzI
zTQ^wQfI67m;em(Bxsr~P+u1wR>+_0SAj8Kc%{Q}dUs+5f5{X12kw_#Gi9{liNF)-8
jL?V$$Boc|l_Qn4L+OP%GbTqD500000NkvXXu0mjfFyCo@

literal 0
HcmV?d00001

-- 
GitLab


From a4ceb5fafe273d4902b0651eb72466c51d30350e Mon Sep 17 00:00:00 2001
From: RealRancor <Fisch.666@gmx.de>
Date: Mon, 21 Sep 2015 09:37:19 +0200
Subject: [PATCH 586/783] Path to mount.json needs to be absolute in
 config.sample.php

---
 config/config.sample.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index e0c486d75c1..534d03a8af6 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1063,8 +1063,9 @@ $CONFIG = array(
 
 /**
  * Where ``mount.json`` file should be stored, defaults to ``data/mount.json``
+ * in the ownCloud directory.
  */
-'mount_file' => 'data/mount.json',
+'mount_file' => '/var/www/owncloud/data/mount.json',
 
 /**
  * When ``true``, prevent ownCloud from changing the cache due to changes in the
-- 
GitLab


From c3dfa3ccada2d9f0b5c7d6e1cc855bec784e541b Mon Sep 17 00:00:00 2001
From: RealRancor <Fisch.666@gmx.de>
Date: Thu, 20 Aug 2015 11:24:28 +0200
Subject: [PATCH 587/783] Fix .htaccess: php_value should be integer

---
 .htaccess | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index 35c478860d5..392b9b41559 100644
--- a/.htaccess
+++ b/.htaccess
@@ -28,7 +28,7 @@
   php_value mbstring.func_overload 0
   php_value always_populate_raw_post_data -1
   php_value default_charset 'UTF-8'
-  php_value output_buffering off
+  php_value output_buffering 0
   <IfModule mod_env.c>
     SetEnv htaccessWorking true
   </IfModule>
-- 
GitLab


From a5ad5bf29bdba3aae34473a7fd5114f2ae750be9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 29 Sep 2015 17:10:08 +0200
Subject: [PATCH 588/783] Fix preview caching

---
 lib/private/preview.php | 44 ++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index cd92f15b921..1127048b7fd 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -838,19 +838,16 @@ class Preview {
 		$askedHeight = $this->getMaxY();
 
 		if ($this->mode === self::MODE_COVER) {
-			list($scaleWidth, $scaleHeight) =
+			list($askedWidth, $askedHeight) =
 				$this->applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight);
-		} else {
-			$scaleWidth = $askedWidth;
-			$scaleHeight = $askedHeight;
 		}
 
 		/**
 		 * Phase 1: If required, adjust boundaries to keep aspect ratio
 		 */
 		if ($this->keepAspect) {
-			list($scaleWidth, $scaleHeight) =
-				$this->applyAspectRatio($scaleWidth, $scaleHeight, $previewWidth, $previewHeight);
+			list($askedWidth, $askedHeight) =
+				$this->applyAspectRatio($askedWidth, $askedHeight, $previewWidth, $previewHeight);
 		}
 
 		/**
@@ -858,7 +855,7 @@ class Preview {
 		 * Takes the scaling ratio into consideration
 		 */
 		list($newPreviewWidth, $newPreviewHeight) = $this->scale(
-			$image, $scaleWidth, $scaleHeight, $previewWidth, $previewHeight
+			$image, $askedWidth, $askedHeight, $previewWidth, $previewHeight
 		);
 
 		// The preview has been resized and should now have the asked dimensions
@@ -870,28 +867,25 @@ class Preview {
 
 		/**
 		 * Phase 3: We're still not there yet, so we're clipping and filling
-		 * to match the asked dimensions if we're not asked to keep aspect ratio
+		 * to match the asked dimensions
 		 */
+		// It turns out the scaled preview is now too big, so we crop the image
+		if ($newPreviewWidth >= $askedWidth && $newPreviewHeight >= $askedHeight) {
+			$this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight);
+			$this->storePreview($fileId, $askedWidth, $askedHeight);
 
-		if (!$this->keepAspect) {
-			// It turns out the scaled preview is now too big, so we crop the image
-			if ($newPreviewWidth >= $askedWidth && $newPreviewHeight >= $askedHeight) {
-				$this->crop($image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight);
-				$this->storePreview($fileId, $askedWidth, $askedHeight);
-
-				return;
-			}
+			return;
+		}
 
-			// At least one dimension of the scaled preview is too small,
-			// so we fill the space with a transparent background
-			if (($newPreviewWidth < $askedWidth || $newPreviewHeight < $askedHeight)) {
-				$this->cropAndFill(
-					$image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight
-				);
-				$this->storePreview($fileId, $askedWidth, $askedHeight);
+		// At least one dimension of the scaled preview is too small,
+		// so we fill the space with a transparent background
+		if (($newPreviewWidth < $askedWidth || $newPreviewHeight < $askedHeight)) {
+			$this->cropAndFill(
+				$image, $askedWidth, $askedHeight, $newPreviewWidth, $newPreviewHeight
+			);
+			$this->storePreview($fileId, $askedWidth, $askedHeight);
 
-				return;
-			}
+			return;
 		}
 
 		// The preview is smaller, but we can't touch it
-- 
GitLab


From bf2a8760940c5aa5d24bfd2b0d73540b7b2c0a77 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 29 Sep 2015 17:13:10 +0200
Subject: [PATCH 589/783] Fix login arrow in login page

---
 core/css/styles.css      | 9 +++++++++
 core/templates/login.php | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index d952a33c24a..2dda994ec24 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -602,6 +602,11 @@ input[name='password-clone'] {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
 	opacity: .3;
 }
+/* for whatever unexplained reason */
+.ie8 #password {
+	width: 271px !important;
+	min-width: auto !important;
+}
 #adminpass-icon, #password-icon {
 	top: 17px;
 }
@@ -849,6 +854,10 @@ label.infield {
 #body-login input[type="submit"] {
 	padding: 10px 20px; /* larger log in and installation buttons */
 }
+.ie8 #body-login input[type="submit"] {
+	padding: 10px 5px;
+	margin-top: 3px;
+}
 #remember_login {
 	margin: 18px 5px 0 16px !important;
 	vertical-align: text-bottom;
diff --git a/core/templates/login.php b/core/templates/login.php
index db77f63bbd0..6751d92f656 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -55,7 +55,7 @@ script('core', [
 				autocomplete="on" autocapitalize="off" autocorrect="off" required>
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
-			<input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
+			<input type="submit" id="submit" class="login primary icon-confirm svg" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
 		</p>
 
 		<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
-- 
GitLab


From fb66a5f604b3319227992acf789d7cb3ad3b1802 Mon Sep 17 00:00:00 2001
From: RealRancor <Fisch.666@gmx.de>
Date: Tue, 29 Sep 2015 17:49:37 +0200
Subject: [PATCH 590/783] Also set output_buffering in .user.ini to 0

---
 .user.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.user.ini b/.user.ini
index 66bf6484fe2..68ef3e8672c 100644
--- a/.user.ini
+++ b/.user.ini
@@ -4,4 +4,4 @@ memory_limit=512M
 mbstring.func_overload=0
 always_populate_raw_post_data=-1
 default_charset='UTF-8'
-output_buffering=off
\ No newline at end of file
+output_buffering=0
-- 
GitLab


From 00623b1c73eccc4a30e21af0d35a2dd496653507 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 29 Sep 2015 18:11:47 +0200
Subject: [PATCH 591/783] [IE8] Rescale PNG icons to 32x32

---
 core/img/filetypes/application-pdf.png       | Bin 1022 -> 892 bytes
 core/img/filetypes/application.png           | Bin 614 -> 805 bytes
 core/img/filetypes/audio.png                 | Bin 781 -> 640 bytes
 core/img/filetypes/file.png                  | Bin 251 -> 306 bytes
 core/img/filetypes/folder-drag-accept.png    | Bin 188 -> 283 bytes
 core/img/filetypes/folder-external.png       | Bin 549 -> 595 bytes
 core/img/filetypes/folder-public.png         | Bin 602 -> 693 bytes
 core/img/filetypes/folder-shared.png         | Bin 726 -> 655 bytes
 core/img/filetypes/folder-starred.png        | Bin 683 -> 655 bytes
 core/img/filetypes/folder.png                | Bin 215 -> 276 bytes
 core/img/filetypes/image.png                 | Bin 394 -> 486 bytes
 core/img/filetypes/package-x-generic.png     | Bin 210 -> 302 bytes
 core/img/filetypes/text-calendar.png         | Bin 572 -> 570 bytes
 core/img/filetypes/text-code.png             | Bin 314 -> 591 bytes
 core/img/filetypes/text-vcard.png            | Bin 1098 -> 889 bytes
 core/img/filetypes/text.png                  | Bin 270 -> 382 bytes
 core/img/filetypes/video.png                 | Bin 239 -> 318 bytes
 core/img/filetypes/x-office-document.png     | Bin 270 -> 380 bytes
 core/img/filetypes/x-office-presentation.png | Bin 179 -> 259 bytes
 core/img/filetypes/x-office-spreadsheet.png  | Bin 266 -> 362 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png
index 4029f8aead1ad736c65389dcdad02d8aa4b0a0db..c215094eaa777c8d06bd2197399065e7f4b812fe 100644
GIT binary patch
literal 892
zcmV-?1B3jDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10{KZqK~z|U<&{rp9CZ}OKkqj?JDW|LNUJ@_rVutsRYDO>)f$Qc
zHElpbA}nI?AbP3AQ#}~;BI3oHAcBfQZc^%>q|w$aR!WJ7QWQ0$X>Do`78DOQq$bT~
zXXfi6HAtG>O*U&3{ldWTc<=i@^WOaU!T(*hGBDk@|7+l$4Z0rl8VgS}51m@5l<HQA
zZLB$f=#6HA6O*~FE!6<jN?k!QIDWCGr{SLh0N7`NPX3hJzpd5)=b|WiTNL^k&_wxE
zbrg!^r}`h>UONEe4QFAK=Y{u4?(H>H-0PG0a=O2JM{NM4Z}8%spsf)9y0#j2BRg3W
z0MBF2q$@GH;2dRtvK4CAilbi@Kpa{o9R*W$$;R)6WvlVn5P*!mw~vm_Hyu5CU1HCs
z10Wv!^VMMI<^wp5FSAJRYy==tO_4$y{;s>bKArN~=C4QZ)~9(1xV0Lubx*+HOzY^_
zWIFBo&GhE(e12ZibAUDlAcnU9OdQ12d8x1a`PPyAhoFOqinrfNt#%!k`;sf(ErnKH
z4fe#w>18Hqpk*X~<cI!8?(|}>SEj1~GPlK~`++_n36LEgbM}{Mt!o0pUTGdWwGf*I
zZ-jmZj$rJV%;l18pL{Wu9T|H)3X`A7ybB2zAJ6&?1J3kVDbMu)Ottu1hb}(elQHZ(
zQfKz=y_uHbv4OyEd@r>)x9i8=1G@m)>gs-RQX-1ov(t;$UNbG8EoHja6`b%q9d7<8
zfBy2*U8!&;^?)OOD8@Ps?f^13yabE`pMoYlkIONN;>ZmeJOekcpwcnCChSlYCr7fw
z$9|v8<&x3N>{&zY!fvKtg4nn87*VtoS|x8;C0AfDhjhS2;pv21c+x;YarQ-^y#n;Q
zRB{4>!BD9Q-z&Ud@Ee}G)ca_M;N@C2FAGq#@B<$@B)w1{&2A5!`xppn4N!6gz7mK0
zDDkaucZD%$fTmhEFAD&?TJ*!;%=G!+)w~kGrs!V@FuqExHj;g1Ro<HaUHt)JS`<lO
STtf>00000<MNUMnLSTZE=bK~z

literal 1022
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_V4N4=6XFWw{s*FlhX0|V`yCw4
zq#57#^n4r|deP18YN*2vKR+P%Zm7%s0EdU(-j74wuLnBc^!2?H=ypHU>p_tF4L{eL
zK0fz?yzU2h-0*d~73^|5!1Hdf>)k-F`@wFv0$qSA@A`Y)3v|B|;C462<6eOKEq}M$
zfgX4K-R=Ydm3iFrcfaN5c00i1j-NYF@oj$(kV=1#yC61Dr8}7PxEtVc*WdkifcqVP
zcOU~O3siQ;-vgrl4$wfLR3JnRP!MF)9iW*3K<z-Q-GSx+NuYHgdw~p)Ua%Sv3F1N&
z0NGGkkVS5Hfh5RSu)Q$$U9cL6Ibii510fnAc0qMP)MJn!FQ6l^3Fv|#Wpi%}hyY`#
zvn0qbn1PXrnT3^|lbeT^k6%DgNLWNnLQ+avUO`bwSyfF#Q%6_d*woD2(#qP#*3QAv
z$=%b-$Jak3G%_kSE-@)BJu5e_xU{^os=B7Ov8kh{Z{p;s(`U?@J!jthg^Lz1TfS=T
z#?3o+?>l(x_?e5BE?>EN{nowv4<9{#_TuHM*Kgl_`1tATw;w-${r>a!-_6F8z*NN8
z=IP=XQo(rk^vn5Ng)#>|o<E~^dQCHL_S;*k?QbSE-(go|S3IS=uqeQz@6Mu`KmT2~
zc^JC)S@izOYtKJEKYO4oe9A0#&NITg-!&XN=gkjk(DT!D&|k~Iys*Li;=+j7Tf1|<
zvQ*zZX!r8PtX94|tTi1Lmu~t-vxnx?OWN-`qAM%1F!A>O-3{q07qD1{d6rvM@CH6}
zV#pV<kYw^;+9A&t!yeblxV&+7;(@4yTc+%xGg@vxdtfu=`o>S2HGhaEUeb?Jv2mWz
zzU4%r#U&%=%{srdF5Tgh)>d1<qWSaocZ)Ok4MZc2HoiP^S?<97p3lIP{9LmAf9yp^
zMm-PZ?XU0e-5pR_l2)>kE9!DV-fw{e5pOPt960mP`}Q%@5APTnWPP8_uN4-2|8Zks
zLuGlB<LgHp0@XiUZ~Y3X3s~W)u;TotTgO&<2QWT(%kn#Tf}rz<;x=1-w;PXUHf>&0
zxqseMQ$tqm9fIjQRE{O|9Obz$T>PQv`JtWaNjyAKB@evr-{G6^R{M@l^DX%=N0#0_
U?0F^?m`oTvUHx3vIVCg!0Df}ZPyhe`

diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png
index 9be7361d1b60940cf171886800c7878039a87705..d9db3b9114ccad32c2f06b064e21976cd9a2b021 100644
GIT binary patch
literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10-{MoK~z|U?N+gF6G0Gt!(I4-Yaqe?gG6-cV~GMx>Cn+(?OI7e
zDw2XkBBa7aq}z=tso+WykU#<2l##z6ijy=rKY;Hv6j?|1d3SSX(UB*)@XqYKce}GQ
z1Ki?&2Tij{YyF6s_W{h9r2!Gug%ID$#=0|&0A{X^kORPsSu2h3CI_X|D*&}12$q}8
zW<N=i;PUda!pviSL{v$VBxp1mS*O#9vMl=q;804r<BRXTf;f&hiRiWY+a;n8%)AER
zo@2`efOi0%1DFQ@X5MPGTAQT>m@j|p6IcT4u9NWPK<yuqdt*5Tq-pvLK-Uwr2jIZ`
zdLF-S5CqFEqc;bXQZI3Jr+H!_g!oEC3;@hbdwYA20cd8P%lWTKDchw5BuNtV`~6b@
z_eaUIEL&VzS-G(7(OS;}ILe7QkD{pBXf(1y0!)#q5>bVjH*)4DQpztb(Et#~ah-@h
zkC6~<GxI4kpR`)7?_L2)sXrJmGDGx)5Y^$ayTHt(weA6!wU`G|%DbZrwj{KX1Hkc3
z<N#oNjveNS*kwv_;l9Dlg?()T1`gkaB7vEih-krKo`^ls3y7%hNWur^sU7$PXszqW
z-T!D3PVl(`*`6U0odH-BLY&+7?C$Q)g<*J<6X1P@&Kxis#)^=6-$!vA*GI2|nMo=2
z)ItsbZ5KJ<IRVpBf53FLiH$^O%skBYhZf=?x@nr$R##Vl+l<b6!1Qw~IdFX%`Lb)n
zd>Dow0W8^!zGrw?Ab3$YV>ty#DR-E8Yh<YlU=3G8hYRP%=emnB^OkQa@)ja9$!q}l
zm8NM;O4*L0s6s^B7WX$%6jh~^?H~x20Q>~7?wf{yDW_tk)C&Ne+;US&`MzwdX{X{7
jj90aRt;pQs7DezEoqHeO!r>G=00000NkvXXu0mjftBq$(

literal 614
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sD*}8%T!Hle|Nk2r8YWGeG=Kj5
znKNfjnKEVi^y$;4O`AG(>WmpPAY33DC;|jP5g;3=03rfc36Vt;hX}&;LbyN@q6<O-
zxex>4vRE1auBcc6-D+ME<QL4q$i&VeC$FHSqN-+XW9#DT78@6zl#-g3k(rg<+0{K|
z#?0As7A;=3{NUlE$IhNRfA{{w&)<LjTeb2^Dgy(fnWu|mNCo5DtNG!Z3?$e-R8M|x
zxLHW`e~O!<XNRlgqpyGWN6JK4C+wbHQS<Ws+p@XF+irVXSzpWTb9#4iq0^K@m)Uo9
z>VIQC<iG39KVAV2DK|;4$S0FH8hoeU=RcCaBJw!H^dH|juU&6doNyp1mBZ%HA#;`^
z!V%{u@wo7)?tNWqwf86cl!yrvcg=qrvG(-Ku)Cs?yjTBeU&;$Pq&k^nso_<hz^;t>
z;%$jv_r34^eCn0;rlg&gyDjU^tV~=eUbL$D+Tu3vjAsYdIrE--x4z-BQi4^GeAMgy
zv~{La&us16(LOuiEYH%Vr6%j@`;Q&4s}Wv#&UiEb{EF5|_rA+6-@l=6`(O4iO1zBn
zVs)>DGUAPECa#^S^mz59tD!q(LPCH3KVZbSLP0L9%HErO%4POFuk^EB+^v4I{omU6
V<D&1KFkmDwc)I$ztaD0e0svv)D+~Yt

diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png
index 4eb8ab78e3f523464cc8b604eb65b8adbbb242b4..3d52756341acdc897f1abf5ba55306153cb905da 100644
GIT binary patch
literal 640
zcmV-`0)PF9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10sTotK~z|U?Uu1?6JZ#}pZEJtQ)~t`bP)#^uZu--&`C!rO4pmL
zi^xGPQ-+R$L#J#<P7+1Zt&qt<@E_==2-Paif~bLr3VKH%-{VjNCB5{%yQW>t12^2q
z`##T)m-mhj_}?YdGz-IUL2JFJlyXVB04@Sp1aN`mS`Y+}$9tT-A&o|3zFaQ5#u!&b
zMgi`>=QIG2Ol!Rhpg2GjMGurx4@sUU36Xrm6A_(uZVezJ>m(O)rCLbksI5#p+!~<W
zZlAENJraNd`UPMMz~DFlz5sYZ@(}>f7;~xD>z%1qt2Y4r&T7v683KTayfen!cO2)v
z@B4p>cpM6V<hLLQUL7WQq@&t_8Ndu+24Jm1|AB)PMbQ-iw*Z_1Fn4SKola*ij^j3f
zdwKc}1ZXy!*R|Fw!{P93mQj)Li2z|3mK?`<3Sf1@^=cgSszrFJQR)&pj`IY-YG(4t
zM5$$qvYr({tJS)U{G*)DDiD#ERshDB+gWBLzmJ)3XSBSH<9NdgfaJL>01?^R`(CM3
zo|F7Ip?pVcy;85&V=Dlq)Q61x&!tjnWAB0Ic>|KmBC-kK2X+^38^BtUB-ec3|1`;L
z-{rpB?VjxS`>#nZrPO~l#@wmZYHu<it+j6gp63mcB)JLT8GxVIz1QuC$hy{gX`10P
a0l;6@exwSa7DXHY0000<MNUMnLSTZ)GZzv7

literal 781
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_V6+JE32_B-|NsBr(9p1I)vB2@
zX9CGdlP1ldKfk-Xd+OAwK=za=Q-I|3>C<P=o;`W;WFQ+zPMbCjC=MZk+!-@w0J%W*
zKmZg3DuytC;t)1a7Qz6Ma0L)GKrVy<=K|FL0h%C?3lV`x0ZE`n2!OERvJgQC7p4T=
z3N%?XWpFMY#ut?jY{0NfFA4GsW?*DuW@TgN;O5~I78Mhhl2KGrQ`gqjH?p#^cX0Fc
z^6~W#4v&b5O-@bA&Mzn|DzB|?Xm0Q7pE!Buthw_StXQ>r?Yi|Fw(s1vd;ftW$4;F-
zfA#w9I}aW{efIpt`wyQ!fBpXB*Y7`n|9MRaXaz=_tfz}(NCo5D)0xIji4yG}cTefi
ziQL3-^W-E~3$aM0ZlO&bVuk<i|CgSzbM`r#=Myg%-!nM-rMmKLOi2Bly9YmfyXl-a
zHS3kcy#9I1x;1`(xw!t$zW|rr6|IpCt6q1dmlzyXWLsvJlFR42>+C_^+0LKi`EO?D
z7G`*6YAj8Dt!Tf!^_Fv%+5@F!78ytW6=(4DF03~$EM9H5<z0QFCZDe7fvgX0!ZWK2
zEgGI0{9;MtVczxBAhyXQ$MK4Lnr-EY!=fy^!ln8?Bzrg(_@(8_3%n_?ZcFfya#QFk
zh!#Ah=b5G`_2k;WwyquSa%ze@iUp+g8=hXDqw-la@j~;|Tf4vaI2A3PysG2S1|O}M
rc8%(p3Z{K4Pk+Dj_~e}SSLe(v^Az_gKCdqU#tnm~tDnm{r-UW|8*GOx

diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
index 3bd7463cfc9d5b8b2253b5b930358e04cc8cce17..74add13f2760e194a8145532201f6bdc478ea9ed 100644
GIT binary patch
literal 306
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0xPJzX3_
zB3j>GGUQ@%<YB$wvh0dm&Yq?O<!w#o8@`AY&rakxBXh`2#BsxgbHCTL%-mS8I@K{H
zwrNIu+lS9x41cOOSbn&7-&?cWZ)t~h+P$c3`S)e)XC1FUE<JusqPXB3uRU9hVYbVi
z;}Y&bpEQJqhCUZK6v4&Nu_NV~u%NFC&;|RwG-Eq5w3t>HpSF}&Weo6|+0Aro5d*7+
t10z>J1Cz*t2D1Zek5^xp+g)$se{H5I`;W?nuYpcy@O1TaS?83{1OOSjY?A;0

literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s_5nU2u0Z<#|NjjQ4b!JjpE`Bw
zv}w~IB#;3IKq)vIjq#G@^fjOnA|*k7!3>N{5ed14bsgQ)XU>{EXYuzxfB&sIyx|j2
zKHSsAF{I+w+bcVH4=4z*2KKzat#i44Z5~6)-vdGi{r+9zJX;q0^5y9RE2g$7Er^qI
zb(rVEu$e0&<iIMXZ5mAHG??^6Bh;B>ED9bRICx%R<@bB`t+ETR#tHo^l2R^QwF77c
NgQu&X%Q~loCIFqrYvlj{

diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png
index 80ab53b72b932da93c16afcceaa2bced2ed1a4a1..1124a02982f6673167ecaaea22c89cedf0788205 100644
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0vBJY5_^
zB3hFZBv_SY4Gu{xJi7Utv4Mewz?B0(_7{fwS21suInZ)MEyI$TnfdVl|2<z7T{l~0
zJY-nJsI2U4xmCt-8uN;m98XL>%nv&3!N4B&eVL_^L4W|02ot+RGiz*GX}*;5E(ue{
zDi8h;jvlLoD~yZzBuWpgV0M!=c*S6GAcOzH&eRqerk?f}Y1+z%9e3R{<zlmCU`SM!
WIXL&*<4B+z89ZJ6T-G@yGywp7QCVgH

literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s(g8jpu0T4hWM)Xwtgzx)A;mMn
z<gCzQ5PH7v!$zPqM@f)hFhfJfq$yLU|K9DGXbu$f@N{tusbGA2WwmGngUI0v$JuB7
zRd+jd@Pbsx<Mn4vHpkjT+chc(?}=7U;0SWmGPo?pG=(Y8z>O6M>KkiPyuvGIIUP4y
Z&uzAyf9{5wBsrj&44$rjF6*2UngBwYK2rby

diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png
index 5262d72e627c1772da547ccbd75b8e8be34abddd..dd8343d245aeafc38967572f5ea6654ecc5e2973 100644
GIT binary patch
literal 595
zcmV-Z0<8UsP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10nkZAK~z|U?Ug-C98na8pL0juAbuc10{H_%z}8Acn@AvP;|2mD
z#6Z>}NWf798^=mP*CLI&+ojU1MMwf^LUhyGCN>fh5I>q&xb5s5i`|vQs59=2U&I$K
z+{4`a-she<a|Ukpze`G!xSd)BI(;{YPQITVbfN+<Wpm%d0aRt8e>gRL5deWD!dO%g
z6#+yEQC<TY*6bWw%On$B5F!I1)mfTc6~K|IBJfxN-9Pb($}@!8hyY{{^ha4-1KI(!
zVBCk9nb&*Acf{><FX)*7fnR~8RvTXah38cb7KSw-ND^qptIj@slfD=HG8F(U&Ar^h
zm`}#Ize+<<8$e)vw`u$Dg#w%=g@p(8JI~h~$E{?4s3H_)Dl?ZDUn$0qhTg{NYhv?)
z%r7Ss>p?uiWZ)n#`mPl8IE%G))ptHBGT_12C-y=|5R)(&XfQ}NKAP&r=x=iJ8KE86
z1e#UN7ep;Tldv^#7mshak_FlU5H=C-aq;_)`58pfh?<JyNO@QOSiW~J=%%$|*#>Pq
zYlW)((-9*9=pRY<WoBRX_^ops$86;8CxZUl0|SWahq#^cUH3B=)Ulu|uYv0XAm1<T
hR3Uq5XWi=B>k!a+gHoPn<|zOG002ovPDHLkV1ng%`Ii6y

literal 549
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s=L38~T!AzL!~cechP1Sqp$)4N
z8s__z%?&M|8Bj1ks$yDb;hezADWSRZf(m8^mCX(<nH^p<D-@`paAs)n?BK!~Kn1}i
zGee4Ig_X<-E1DHjG&8Jdc4#q>0VHRK0U5=!fLx$#XfaR=kO9&NR1Xvn11bi}g4iGi
zNTdX)5yS{7o*h~Q(hk&u4S|fpik4J`#{fO#QWE4B%)rRR%ErOVFCZu+EGj9ZsHU!K
zY+`0^<q{kk6C0P7k(FOwQP<Gk(bqp|@|3C5XUv+rVCnMB+fJRoaQ)_^x9>lG`Tghb
zLaWzdK=TfIx;TbZ+<JRuJKv!I9=F8H!d370e!us-_5a`boE;*Z5*@aRD(4=&jn=vO
zr9U$M;m$VIfCirjd&QVLSe7saF{Z83W(f#tc;DoAG3O9-d&|xvciauQU-q90mkHKc
zP<hEM_<_uG2CqXo4<|M5Y<5Y=Q5Vd({UUJLAr@aFt(bu4jZ^#IO<l)ORmpeYmVXHI
z2KF+YhTIKZ)f0ISFk46l_Zv0Nl>2A<;9FXJ(J`F^9*d_ld4Kf%&lYeg+%kpBbV2=|
YypxI!#|}h$+y_Osr>mdKI;Vst0OMflYXATM

diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png
index 17c3ee2a8d91633c1c03e47e46b69bc5ef006e1c..3da67f85f79d13ac9674a3e364bc140adeaf6447 100644
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10y0TNK~z|U?UqeQ6mb~FfA7qGOp8k&hal<P2YU|*Duw9a*}W76
zVXm+ugbH?YXFVD2dJ#8J(t~tyJbUS2wsffb645d8;2{t-cV}_l4mz??;H<lALO!RL
z8RmU{Jn#P<{&1%MUE&wX;n`K7^T-cGvrD;tyIBB6O?{*}fU0DAhGr*P0T5Usj5Z76
zSOCq0s67MPXtO%>&dH~`pn(J$RHtA3D}X~a3!nt@AmWzKW12TmUIT$f+BkqxWVhPk
z<on+4m~kT!`}WnDN<BlFZ#{rgq+IQG3Ip58;n}gUS^ZJkYG1Q$+weqltp%tt?-`jJ
z2eRyM)$P*mmAK_r)>{W4e6BSY)u%OYv(C%@&59N62+}HaEPy?4$d4W6e#9*&-0-<q
z7<$3UrN)!#nKnF`3eu{+1e7AM1))#L^h_I&0e-%j9^AszNtEl!^h_I8cm+r_7vNy#
zz=mh)Ri}{N0a*p@dOWfiqa6AUT*eBoAlwPsHYh;JpE<%8!(;T(;B*{_0oldelO3Yf
zTR^-Xa|n0_M0mbb7})L^n#-WtjVNx!x~sy%vOjZVvL0h!ff6Vi=EsLG3KvB*<3Cf8
zh2>n|*x}5Tn=J!~Li;sqV-xrQctGYi^EzX%8$kBF5!<%CM11`oA-&|}4`Of79D?5m
z6lLBM%~@_`y<$Z>WPi^Ct=iw@<WmB{e?)@NYaqRD#6rB|+Wx82bRUrSC*~@wotW2|
bPQ88s^MTex41ua600000NkvXXu0mjfV1zgF

literal 602
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sdjotzT!AzL!~f8RRi3$%LJRwR
z8)n9qEDFt<>Q^>5tY}tf@$8VInW06q!-|0j$e0BZESVirJTt6hW@z!OuwoDwC>R1n
zB|!G95THmgkPB1~WY2^s01AcyWx*zZ*gytIb~acLqy?xftYkJ&J5U^?3~UI31c}c^
zaAC5Gc$)%&&bKQG@(X5QWMk*#;^yHE4hap9j87;jEo*3OZfWc2?(Lf}anh8j)27du
zIcM&?`3n{<TDE-E*8MkbJ$~}^#j7`O-~ImkPhb4rLIws#K2I0NkcwMxubd1z6d>Yy
zvDd_`q?3`w(bZ8f;DFi!mUI8>#W+%r78TuJopeI-z3I;8(}jJzy}y)C<lMG*{)PXh
zx(~FUfZ&cN*Mv1bvRawU;GgZkkv-#S!{m&&Tuk3q&s2DOdT~};&Knk|1$rx)n5CEO
zo%iq*W6ZyAS_f~iy^Xb>e5K*fA(r^o`F4vIS1-`zUK6)qh2|W+YJn3>51*TUS;{?Q
zkKidL#rNw2rc_<{$&uQ~@asP7j8`&h+K~%bORg#g$)20G>444l{r`P<AGoPWI7Hrl
z`^&-XM%m&m<qZ7+zSZmk=_f<lmTob3_!Y)%*;J~_{p7Zszk-~}aqjo)3o|DC*msKE
eePW5_xm@WmZ6#*r^>@WVX~fgj&t;ucLK6T@2niGb

diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png
index be5e59cbf28d20d4a7d4a3d8c3cfdad8bd479d6e..d24e1d7af4edddfe4a9edc3b4d091b8af510243c 100644
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10t`t+K~z|U?UuW16j2n$zwgdI8iPa|3&B1rHiBTa`42>AHbezc
zaW{%s>|hkcc(n?+D<Or%*%Wrl&I*E!jqDox*r=6td^Hw9)Y+M1p{tuH?##|j44AJv
zXD;WQ-+i4sz^49pv1>T4*8))J8$h|<sFt-U0M%pnEe-%8yk=Lt>9qieEfSYZK@0?7
z5~BAENZMox)b?woQ6R+%q*S46{40Q;G6=vYD&$D+>*uW^G65in6O}PkeK`m-_QRQz
zAAk6F>`Hxvlnea=4XuE*dWwHf%xE!AWLkh%B*u0Ry*cz75?F|nAjuZA1$a*2Ab?>3
zZtNLax~H{{4!iTaimrDKB9BAidu4GPA}5Ri2vKcTOBcJI<M^uS7sF_>zSDNSD@1fk
zfE>t4MF0}NrNr8TY{2R-kFvbuZKmjYvsNgt2}}UU#jZFAz?VF-y?$nU-U6@<SowX;
z0IZH^t+fIGt+jfj%byyx(s3Z#OVS50a2rqX7RU>diz0FW;0KCKHExw#05DdW+ZQRT
zObPFcm3_ykGcLlbf199RD={I!AJrDcspicy&sGmO6>lEI>3#rd`#^z_EZA=S?&<*n
z7vdx^(g_JUa`f`;;T4G~`{Tr#dJDD$LFR$u&Ycg!{8CPJjtS)KdIA8zD4<?utsv2r
p*hv2a@eYj<5l`2x)}}VRz5&leuh0hkz&ro|002ovPDHLkV1h0I76t$S

literal 726
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_U=$DV32_B-8yXryLsvO8G^C}?
z3~gAI&@ex=urD-gs$bdM=-f#G1@ogSriB*H2`rf&Q8X{Kd}es*%;3@);YG7T%jSj`
z%nmM`6<Rnmq;z&z(ag}2*<mHKLW^gI70(I*q9PzUJG5waXvxgb;#pzEGl8-pKsCiP
zLyKks*+4B}U@4$Rpkkn|P@oi09Hf0Fhzk@4k{~ItUZ5c*vw=n-5YQPAE}Q{Y4>AX#
z49JFYLCSELfKWdxux$!3h!|o@g8YIRn3!2u**G|Pc=-ebg~Vj#lvUN#HMMnZ9i3cU
z-93GR!lPp2Qws`<%4-`MTRJ+sdM8bpI&J!#c?*}VTD^Yrj-9*qA31UA%-PFVu3o=!
z_x^*2Z{B_Q`04A<-+%u8Ynmzf85k8po-U3d6^zLWLOo26J0wyT_y#Zs*k)QKU1*e3
z<X!TrLow8yXQfqA2aBMa0k6wzg-~antEMdx(iSe07aZ)B*U*%8+tOB`xM7XeMX4CY
zO*TieIxe)F*yJX>RPj=ffR?s%4{u<Y(uR}+PkZB=n^!d@&ghl!h`4stFD~Y$eEo)3
z4L{x}IGvg~qvLZ@6PKrjp!nrw0*ra?Nt4?wT^i0$j^M4!5fF4!l~)p;Z>c@uJkJpy
zt$jz9hVlEFzD|gZTcFXM)v$KXibeW?D@|QyOQ&#qOgcPy#}<(#M>(fXRWbX>y2>GC
z=HiU0dy)^e9^52#Bt5X4alw)p3C>oB6|MVhyBO}CTFMdB?X{Uh>FR6)0d_Y=h9gDm
V^4f(B&jMqC!PC{xWt~$(697p@FQ)(i

diff --git a/core/img/filetypes/folder-starred.png b/core/img/filetypes/folder-starred.png
index b083a9d2d11f43ae961f02a180c82de3148f4c93..4b847bf69ea9912e7e1753fcca3124a23d8860c3 100644
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10t`t+K~z|U?Uuc3Q&AYkfA48kN<<Kf*hL4yLBz>Fpt_4-lAC|P
zMqPy71|m2lZdGjKWc8*{7Y7?+Hx-x04|M4u6u-I!bjf1C#gE?eI@FX1wz=otSOxn`
z@8LY}^E{mMp38-8{O^!Xk(~$@fzh4~qF3gxpDXt(fa$7xngggxDdPu|e<DC+h*0cT
zh*$yo8KQdzG^v;a8nvnX2}p1PKVg9|M&D?sNE+ZF=z}BzgNf`#X9P8>a_VmcXwuyK
zNC6JCo4~<1B1vAsOs(dHwVD@-=$*JaaRYq)PB_<DtQs>*ykYEp1p;>wmaWycG4jcZ
zwsloLE>teGI-L90#y;fy;E0OdZy6Xi=spX>f*u9QB?_Q$(uVd%y>fnOGv2-F{0gwr
zS*HutW1^hxr61)AMvO6yOrd%@0v7<!57I{U1rY`_>I|erb-^p#E^kg#@d`mvg?S(q
zMc8EsMO8|kAEY-TWc(nb%A|{~^D79IcN^`gu<WYm8lY9LjJ@f$ESJmc8uh9Cd!Y53
zzWxMIXn-g{&JPY}C#sKMe;!#%kKa1J#t;R4?xN}RDK@Z}9iJYOfmG2dmw;U$7$Yw;
ze)Xn&`F2^wJQLM34w}(n(LI>mZ&jtVX1<O=5xvOJj#sGN>7wa$0)kxaK{*tG^9z#x
p4<trc0C~D)uELWo^V-Hgj~|eFr=pDHpT+<H002ovPDHLkV1g2H9tQvb

literal 683
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-se*%0$T!AzL!~cechP1Sqp@n_1
zC5u9{rbg#Z3N4=*RWU8Ja86+5l*r<lk@>SjOQ(hwP6vty70(GTof%#*JG^KHh*3N%
zv}8tT;jEC7*<nR9LyBjG6wL|)iWC9Gf$W)~MYBVSW``AnrHW^UmCOVx04fUwsRW7x
z*)zc;P!~uLq#h&)<jw|hi)VsJ5F5e;s{v~Vnh#b0Qv<XSq8O?YtR5tY9c_PGHWTRk
z;F2J}U<O7eR!(jnK7K(VVG(f&X*qdiO?@L%OM3@LPaj{uz|iox_}t=#j=l*KCrz0;
zea51t%T}&hy>|2VW5>^&zi{>1%{zA=Jbd){`HMH7zJB}u^Y@>>|2S->0K=b=+tbA{
zq=ND7mFxaYjsnL&-e0)lMxaiDei2v15xo^Ry4Q7|`Tu|ajIWK>9PiG2sJTDgTkWTc
z`OK7wDr=H7;{;=-d8n`0J%KsO5d;tAL~@>}YB0T`%x_^E)^unQ-yPN+p^do-?#y<^
z2WA8|IGeB2Ixt82dFzAcfA?{P7ZiO?`jenP|1{s?#S7p333?j;VQ;HkZcSy~$|+9a
zjvJreeV8L4yY&3drR&uNvRApuENGA15?wL*&O(vK2`UM?Os5we?sZRCqRCLYBZ#@+
zDr>^^-lFi{rr*<86GT1Qr>!V8;ac-~!OVlFjQ@V!)#)jBB~5ST-J>PVto?0CwKj$g
lE8`Qk`af+9xKVq;>lf>xH|2Jpt0#gJou{jx%Q~loCIICoF|+^x

diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png
index 1dbb1154100103bab8096a60a0dc98dfd198c195..e811e9cdfdcb70ba397a52797ce8aff7616af1bb 100644
GIT binary patch
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0u$JzX3_
zB3hFZBv_SY4Gu{xbluEnXkc_h=+cM(_Q{85?YrWZW!cc#*x0ym;ljpFiPMr2Kp^?w
zyhY^fy5*~wJy@@lutf4LSf(r?DWMQp@OAT*crRXMMwy7av!9(f;NZv+!0{%br?H4Z
zrpGGb3gcoviP8frnB8OzUNr==ABZ~oA7~u^#f$ftOSWW-@DwpHm>rM{lzbH^1ausO
Mr>mdKI;Vst0Mcn$6#xJL

literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sx&b~Ru0WcB;eSIzLs-eokfK?k
z#k0bSXN3UC5)c~=3GA5E4OGro666=mz{u3lF=5j589#ph`u#^%&Feo<#@o}yF{Fa=
z?djcuEde~t4*RV?yT95W!z9#pB<xhi=U%nwgUjnh*gP`-{Fs)Nu&Qw-TbgXvjH3r)
rc?$}DcoY;!BwQBT{xs#ZVe8kJL;PM_=TFa713A#s)z4*}Q$iB}0(4NI

diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png
index 0feaecf2830a7e7c1e6e3723aeccc26eb6e7e4a7..8ff5e6c119fda8354bd7ab90ea3ed8345d20e00a 100644
GIT binary patch
literal 486
zcmV<C0U7>@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10b@x-K~z|U?Uubx!!Q&^KU;_;8J(FG!NQ9mwrqvWegN93RIngr
z&Gid(%g8gp%!@dCg@i5x35xRPq(r6?J(G29`8)D;tN=&;JE9sGW8MK=dCGm!THgSG
ztQCEQ1Hg4PIBCvktwpmoC&m~??d0XaS}(Ltpd!!n)1oMzn0Wz!0c@30>o|@-ya-rp
z9|7FgN=s`k0IcQ|7;3?7N9}ITaF+mg)INO*Y?}pUZq<HE?;TJ|t;?P-DxoNf9=r*Z
zw|#{fE*%jiLWpy%b!)F)fw{=C>{1Ak0SJg_*PP$$AtIuUG3ME|E=|)wN|^%)06+-Q
zYT;x7BHEN2EnN~}7-j%2hSp3HsD)SbN)S=P%!zBy(E=Uey%M#)I~gS~5Z;n#_T7c^
zD;N>}BSAzvDdib65B7buz=UuB-?yB(>jm$pw*^zf_oa0L<sXYT{``;VpakAL=DvE&
cI&$EA0a%}P))ildR{#J207*qoM6N<$f;+^+s{jB1

literal 394
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-su>n3Iu0Xo4uW#nencdypQ>ILr
zI(6!_Y15`ppAKO_NT3Li0Tcu>AZ!SOAnBMefe&bbTuG2$FaswSw{}8CeM4hY$Fv#q
zmmfWL{OYaSciw*a_T%TDzr}H4D}XBZdAc};RNQ)d@hw+VfIv%Pf2Qo#H^G~??EHV4
zCp&S%4GG1L1>ffz@V6g*GXI8H)byo|(nrp*DY#GIsAXJ|dV9O;1jniaH|$m{II?*~
z(=~_1P4^CzzT;LG6=4h0;;8O<+r;K3ID21Y>-j$~_snA7#CKI@g9TGZzQdYj_f2)!
zT@sXvEE;~dKVam0aF2z*fbqMCY0Uv!S3day|B0n`59T$o?_qiux#l7ByT2Set~<8y
o-8kRGnAF_ZtI<~a$^SLqj4#PcWp{1+5A+Fxr>mdKI;Vst03`&pD*ylh

diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png
index 287a1f18869ec927ce48a1a70d005f09953e97b4..68117e0d0701d9917a8af13f98f1aa3a9d1c31a9 100644
GIT binary patch
literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0wkJzX3_
zB3hFZBv=<GEMa!5nY8feW+_PtiB}q%9{m5mE423I*&R=2W@cI*VeRR&nr8QZo!tE*
zj@2d;r(IwF&No}>=)DP(Zu<88|9}0E?jb=T2}K9q(?IPK>tt{5i9da-f9Ax-gL03U
z-Y7N-G4b*8>MWYSv~F^iB<F+kukM+Ir7)^VMY)Mclpa{Y>?UjQsv(fQ$10(~@_~c%
rVR<&TV~<U?@Mo{i5b0@}$jiXH#^m-PrS0c{&Svm*^>bP0l+XkKOdo98

literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sx&b~Ru0YzMp&_(kRcO)7(BfGj
zR5CjZ!YBfBA#5;Nrqinh)WBB~<QL4q!d6|^*fMGU*Pnm>{@b_YqAyU!&C|s(q=ND7
zX-lpH3_M2;oUQ%+|Gcj_liLonHCesCo=<B~`xp6uzv*A(N>gqSE2(GK<pT!}Jjkxd
kDtK|f&i&%nlcn!i7o9aVQBiqt8)zbfr>mdKI;Vst0D<vSw*UYD

diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png
index ff3ced625311665d81557d2669bb13e93167dd9e..f21c3a9951d2e7188a5c2980fa63463f268b5afe 100644
GIT binary patch
literal 570
zcmV-A0>%A_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10k=s+K~z|U?Uyl6!ax{?-|w#a2RunsHjM)gy6LE+vk7rfHv=I|
zZf;G`_y?d3u5Ls}2M0&~0)uW!3?UGMx)^$VE|wH&Nvo(a_MN_7`+o0p*K3*s{<|pX
zhGkisM0Co`1R#^k<u0Q%4(k^qdf3dI1TY8SG)j0B|0sZ@r=G1;Dl#HKDE}ycAJM=b
zD3wYJL{v~p?X+60R{(u#rIhh;EJ%LODy58eyM3m$HuL%XjXU07fpWP#PefG!+h3bg
zu$Vb5gs2va#l;~2t@ROr1OPM|jTr!SkN2U|=_rJleF(pjQXUTh09bbm!!UN4ISb&P
zi0VR!{cg9r7bZN6pP4uO0H!^)DTG+jTCX{dv)b$RmH-sO0)+5SxnG45&|s38Po$J5
z5kf!Z|Mkx>2Jqbj&1Q4LG)-rmLCj3HZ9DidY2Ot{rBXc3Z~!18-=4qz3Sxj5AO?s5
zya3N`QLEJg&kLW``}x4tOFEs_z~H~&8o(9+Boc|PWm#hdux;CWdF2-U6%axk0(cy2
zs=pqklm|lq*=+V!2(b#_0>INZ1V0hcIWsS3GMT$?=>JFc2AJlu%{fz>SO5S307*qo
IM6N<$f;U9yc>n+a

literal 572
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sX99deT!C~$L&K_7t0qmFG=Kj5
zzP`T6lP6D~K7H!csWWHJgfJlFv}x0Tf<ORd00B@CNW!^bF$4jTg(!fqkx7U;xLzOw
zt{!0o%nD=?{OkishcbcwaV`n+3ua(pW9Q(Ml9rWo_wezJO32F2%_}G@Dz9m7ZR_al
z>h9_5pRo7f;Uh<n9Y1yY?78z7FJF1|_{q~}&tJZJ_x{7j&tJd)W~mC*02+74)5S5Q
zg7NKzlR-{~0&Wl04pxe_SF?(y_b#wFzi8g~di7+<3-@N+i*VJv|H=Q{veXGXkA2O(
ze7k(5u<6^~F+z85msdV^KDy_B(Sz*bz3og(-@M&?TKSUswS{L`S<{6l?FiOke126#
zhsnCgu|)l~MpnG1BSX|Cw=J6N8d>?vAI!`+c6EK8*&mgzd-40_-(^NETFGv*H+)~y
zi;8OP1uJ4%+3F2BdV6Y10=(P|dD;&C=a5@_u)D^J<y)9>Sz{R2Gs7sa#_Z%vE4_@W
rl789i)#g21ak_uk!e^-tdzs&GKAAV?!6$#9KN&n-{an^LB{Ts5F)kXo

diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png
index 5505102f60ebc0d295ca836a253027d1977033e0..69744e499e6edae39545353f6ebfebb0bb3fdfcd 100644
GIT binary patch
literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10nAB6K~z|U?Up}J+dvq`pZDTGvqwU(u_RKyL=mdQgo-NVX0kwJ
zqRbsLb`I9X11QXngs3`ILbQB|NMT@u2rGLavHW%@262t!KM7O)jPE_Z=l9;(=L0fj
z`rk!yOiHOT5q+Ibr}bvD`83blZnszS`Mk}{-%QgSM9nRt43=e;09-NizF`>OyWQ@G
zFt6h{D~4h8n0cR>uWj3|ECisGDhnZg1K4;j?Tp9cbH{O3W`&PNqYD7L06;`*zVBZu
zrOK%Qg3bY~YeRSae&5sm)oOJL;8rWIN3F!ncfhi&k`Uq-UONwT;=1l(tJU&nJ;%({
z>2!_(9BK83TrRg=uh;vL0BOV1Lc9T3G&~K&3&66%lS0sYgeQTZ_X>{-G4C9RbxOt&
z5rxhbwFRfH>mDq!1-5Nl%xr4)*DVN&%Z7*(4#fWq6G6lc{|8_h5J|#k0xSZNG&~d_
z4Mdu7V9wvL(P-QN*ak4vhBhjdilO^^y<VP~H?{JRh(3me&jkPg(=-RZ?{5LPe=hwj
z6bfIYloQ=6rJNLt#XSH&fWMs!AwEUjiXv}B!AcO(ndf<*Yqi>Am{&?U@jS0eL}yW*
dXUdc*&>#NogdH4}#;yPW002ovPDHLkV1j4t|84*P

literal 314
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sHUT~%u0VR#s#OgQ4U;BK>hJHL
zHf`FJDO09TpFVZ!R3ID30Fpoe<U&LsTnM>reoh)tzi>&AUoZnR3!i|XaQ%##vlgyc
zdF=SfGv_3Vs^x&vvpiiKLn>~)y>gnb$v}iHaZ8wpe#i5__ph=}(3)K0b3<^~ALIM$
zEYJQk`*_LpKi|(ut7_%nfBs%jb#%h&+MY#UHVV9O53J(&BKUUCmdhV}uKuf=v;1)G
zthOB6)~_Phf+PGBZCk&Iym4I+-Wcb~*l*9+@>SrHvj>0TUhe-sQ28%)EWftAJM%*^
mx=>4V*HgoHL7VsM?%`MFPz?8edsY?bN(N6?KbLh*2~7ZI=8H=J

diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png
index 77ac138fe1c3cd727961d15dd0525c246d4fefa4..087eadaabd123e5e7ecd60b6c0351be96313060b 100644
GIT binary patch
literal 889
zcmV-<1BU#GP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10`^HnK~z|U?Uzr897Pnyf3IsM0nsR!6^XidP>%*g1QSqCUObqi
zQS>6x+cS&E9&!p{hzF5HlB_#5J=YKvCxRyxkDB1Y1T~P=gZLkew3Aga>Mm>d=VfMT
zlAfL(c2*DiPSy3*``)jryQ{0=|M-`~reV_UcI%Svm$XMxvbMH%eqmwZ&us^gWN{of
zB^?1~a?)?Wu_Q@eY_(c{m3ahP0f^)H6-lpNRUF_3;K<C(OixnjBum9!ueW1$b@kpf
zO?TI7wF_YwUK(occ6*<hogL=^Jk@A4UK=HjT!Buf^FY7fU&*rUoSD6wrs;Q`PUq#}
zjLhtb3dI2qmWhP`OG`_;B)tXPmFuoaI^?~N2G_S$C=PJP!~nHgZ9lN5NHeo%2F+h9
z0$iCGK+>*J31(IwG{33{@a4n+W#*E;9)NsW5#W=F0oK>oF9Pc$ay|ygvg|xi`i=vb
z*@qJY40f@j1=6J~%enx~X7fj2aZLTwQ51bNF#tdmMK4KuC)XuOkI&D~UmkWONpjfC
zULRqx;+%VK4B%)0GgA-*XL4OXG@H$H`7y0lE34P*^FVfWewwBS!!R8CrW9@@?RNWC
zGkX%41MVJr0;hpEilPt9OvCZs`)`5SoW({IMLY9jDgnfCyjRj;Ne6&hN#5tcqI2$)
zq(`zWI|ba5(*->1oO>e-!#^qkc<&DYZvt){buO*|*O%zONIL19>(0&1eO5Fe{|r1f
zVR6P32e`@1p3kyu#e4tW^78USWdNmn_7vjLAPC;~-k<FCdOL~$W($(GBcAT}`-h4E
zwtEHgvH6wF11ti`KLl{|H2{r9<EV4)cHlutFPPa0Nj>0g;HPO;m$V5`=}_vuKMU-i
zBEuJrM&ll+ekh&x1G;<Is0y&9({n*=e#R>qJLeuYvtz)|TP(Z^91ntE^L9@3W76$*
z>l+&z_YDm8n%SL_W`P@loxpX#@4y;x+04F|^bK$kIFlsFg>gSB|GoGdVS^MiG*5vO
P00000NkvXXu0mjf=ai3E

literal 1098
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBgK_VB8bn6XFWw{{R2Kp`l^bs#QR8
z=FFKu#-vG;`uh5S?C$RFsZ*!UojVuE?(grPHf`FJDN}&#>C>mro;@2V1!Myi1Ifvg
zCj-eDGiCr40F?oyfNFpY2niGiionHzYJgmbO1KnIB}5mTgs6ub0yhw16hu9;8i+WW
zdWdO2L5Mh94TJ%gg^NRMfpZ}magkV+K}^7<1tN~D2CE_XwL@gLuligLjK9exL4Lsu
zj7-cdtZeL@T--do`~rf)B4Xkak}`6N%BpJWnmT%h#wMl~R@Qco&MvNQ-afv8LBS!R
zkukA}=^2?>**W<Ig+;~HHFfokEv@aHUEO^XCrz0#d+z+jOO~!!y>{LDO`ErD-?@A5
z{zFHO9y@;W)S2@aE?vHQ?Z&O!ckkVQ@bK}IXU|`}eEsI#`wySKeEs(Q$IoBC|NPsX
za^M{>nXU44aSW+oe0%<S{N(_NV;|YMM4Fkmmv%JmXjic4>F9_KEYRR{WifB+VwTyV
zyLD~Y{Q4Uvi_f04^z18-`>^-_-t*5}6WTVe{oHXggwywP^=6%_^jE6c_b(gUNPi59
zk0>*5j3|GR?v#1%<HtW=_I~4H(AKQroceU~mb+^htu&&zBF}Q~s%i)pF?HV7JugSL
zFX#%#&CF?Qnmq%xtTK*;an-3QS|6Dt8sTtILd5LiXJtm8i|>U*UcId3NtjT_zVK7S
zIz0yK7nA3)PrZ^}zCdakx6W<mt;gcG?1}7Hw2HCnoYEQLD65AnWS2j7Q$6(M@+Gct
ze%aLmNrB%*bp5}dYsxjx-7g%lGEZ9P!q>gm?RHJv=EIs2`djVg_vhDU-P)G;zWr=a
zQjft3gR`5$?|v27V&J!KKc`*n6@x8|s?S$E^^%RbzVdmZP@iB{R^wx3)6xSUr_Sm-
zxbas~Thy-yhTG;yR7^{ovzlYZ?w*Nl0#^=rEatd%&LdxN%lwH(|95?mnRM-9$M5IU
z9Tq-(@>eExz5aG-j>$3g56*0L7na}mbml)3!?NA)Kb$-IqyH~!O`*FDqpR^tV4`C1
MboFyt=akR{00gQw1^@s6

diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png
index 5fca7cb69d785617a9ef7fa74ffde4c5c6ca591f..d6bec70cf43e2deacb8b42f2f9201693a7329922 100644
GIT binary patch
literal 382
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0w&JzX3_
zB3j=D8}c<d2;A8lkd^#g+-J)M^NpLgeBo3P`NPJ+X>;gUMskwlO8t+F5=_|()hZg6
z%M`5eDX*^HUR-R<@SpDqci&@~&J3+m%|}*Ui>7AI5)agW%)ROG`*Iyq-`i2suKu3k
z&^kl;(XsD;_h~UPFl;v9`9AMCZ<myj+=krQm$DBV7}>5rFrS^l;fQc@&cfHfX5L>N
z&B(Chr&izN=GVKN>->df&s7I{_DoW_$#_5|Hpiury(7cN#XtU*Mx%{}y26(OyEQdl
zPyMDHkjPcEFs8B3AyreO>4fv!@CDun&kIlRYh2@gYrVsCCQ+6qspqU65wEA$$*+rP
W3u#_8y<Zm?3=E#GelF{r5}E*>^^pny

literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s_5nU2u0Z<#|NjjQ4O78j+O%mv
zdiwO~Kn5J3apB@Xh7xa^7SIThk|4ie21cgHgxtdVj_&C*XU(3o`1_x~|2}+PWCE1W
z@^o<wsbGA2(VOdl0#D1s8{c=Ep8I?L*4Bgxkt-kU|IcC^l&jyf&yZIntj>$+M(a!#
z4sOndsjN466708F3q6qVXs{ML@qL4XEawHb2|E@w{BUMZ3K977@Ww+e#@zW=m1p-K
gSbAc~@+-Ia&$=bP58pHOJJ41JPgg&ebxsLQ0Jc|jS^xk5

diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png
index 308e81cca831fc2674d4660884ce7babd312ccba..7cc1ecdc46a0e9cb0b0d1653b6a75450e79a101c 100644
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0w!JzX3_
zB3j>0Gvs126mY$-CwJoBu|r{dj_+@om&BK}`s|^oYL(m=j@=5gc!Uq`(Nbyr?~&%T
z;N$y}%LmT9J7A^pUFRjk1@*~+4;g-EZkV;+<JGg`c{6S{KY8-oyxKW~NuGPg&5X3&
zSxg7mc2smfiD_Kz;mNzBqe3KcVn@1oN@qy^;iJJZ2Y4+!ce!z=uvT-3uukXL!SbAg
z=Rn}42ZDdLHY{12{=wy|Sq@XTRK?$$hdlffc+T{m$@*jAZ+Xi8+Lu{w$v|%~c)I$z
JtaD0e0ss(idSL(n

literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sS^+*Gu0VPk7)+l&9Y{}|Iu*jj
zB(G~PHw3EYEeY}qX0UfjpEhIpfg^9f{`vdkcB=+ZBHh!)F{Fa=?d9Ek4FMd@iATCM
zzWt5AzO*yjGv)F9{STjr%s#@Gaaa2w^Tuw5B6$PF1O{$>rUn;w6;THz=1EEl6B#`P
zC!A<lBHmJNXSL_^<3rZR!{>b8`KNRd^AirCB+m`qO6Ie-#9e<Sd$6xQJrigpgQu&X
J%Q~loCIAsqU*G@$

diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png
index d9c5b890583a874cb2fd6606aa46dd594c223d3d..3bc2f08d1f9d7c848152864c94407d9232f3b877 100644
GIT binary patch
literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0vNJzX3_
zB3hFZBwjWM#vUlXx_UED50BdviC^;@3ze0>w|{sWx5}P#W$K|vDqTA55+Co+f2jSR
zuRU~qg-1EV*9K;B<-=zCd)HU8pJL?sFDa2z|Nqzi^R-vq6=SjtE+2Rm{(s`n+s;P~
zt~_9V@oS-;<?&C?`+q;vSZV$u$b^^CA|b`#*Wpt&7i!;TdzNU5IaO`^)nOB!Vfgp=
z{>hDvj{K2R>=YXqcJciGzt}}{uWSP&+Z{%h%M2TLHr&}_^uxKKYA1uW#0LS1QiiKV
zjCu|lyuAMeB+jxPzQ-u?oXP9*i3j|R7h@di+5e<lcp2aRXDpMNkg_Cm3ZE?lL;7aV
V^yBG0k-$J;@O1TaS?83{1OU}ml@9;_

literal 270
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s_5nU2u0WdM|Nn-D{~l{zd#rlp
zx%w4|vHCTT;RzyNd#-uux%#EY>Q`QCUU@;qLCPTLLp0A(pa~)+L4Lsuj7*UUxrOx|
z-P32znmuRn_dkFCefYe{1Sp^7>Eakt!T9!~H`f6Lo|cC<zV9|Y_xJp*tqBt%S3cPP
zpT#&RSHEYUA+JbSofp%M)|o6E+?)+lS#R(p*l)2GdLZG^U@dmy`vwPD&I@c4b}VZ6
z;mn>CBJkzmjfYx{x%00o&+b34^u&_oS8nm2bxV97zGv!pkjFe-{an^LB{Ts5hRb&r

diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png
index 5b3733b712129c817568a8eb4c8ff8cea174e033..644fb852009e9a6d057d23cd0ab14fc8d02e6c04 100644
GIT binary patch
literal 259
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0uwo-U3d
z5v|Dy60FLy28Sf%mmQs-o{(U$VDi%0KQ@c~GByAL#m>t|i`dxM+WzzK>@zSEwre$E
z`7l9VgZ;q470eMASXnlS86^dK=zd6y`ct3suc7_G3T8K1gI5iK>^)Wti}f7zS7-9F
u*{}e`Dr63vI8e|MH|^5pb%6#y7#U`~=9jPJ$$JcR3xlVtpUXO@geCw>5>i?K

literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I<N|y`T!Hk5>2V*X#ebNZ03uP*
zkBUEnKoy)NL4Lsu>C<K`fBW^%-(U6Xl7WKOo-U3d7N?UFB<3`vs;SLTW0>;bfRdpx
zgT}#5-=sqd(++(3vf{{vNfJSveX_G%7z3Ji3I*5fI;5a0&hUCN!(KZ>H8!9z44$rj
JF6*2UngII(LOlQg

diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png
index 5a20026ebdd597b545aef1135805450124412e12..8f79c32fe01e201d5c5e458327628b0c31d4712d 100644
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0w|JzX3_
zB3hFZBwjWM#wJ{g+rOEIhsRB1*6z-!FM}%<J#Lh55iv>>TzsX74G8w%|6jS?|E~Ng
z=RW2Y%>Rt7HvId&Gxw62|GvgT29_H|n>N0iyIDCTV}Z<p5A!D;e4_vQysh!~-(5T%
z%n~3VDZwN8-%w^&rG|%4Y+vhyXC}{mH7rws*8ab7q>yn&6&stIZ`=L)azg`y7fPou
ztFk0COnkWi-2eY8BImE;JHW<vhmqwngA!k-u(~MEKY;~tdI$K}Y*^f64Q6q>6(3x|
t3?|r?GWT7&uy1is4^N2ap2O@63>Er*tv0Ubn}J?t@O1TaS?83{1OPesgeU+2

literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sHUT~%u0Z<#e})Di*zYiNpZ~0V
zen4{O9=}<8{b%m;o3+mu$ey{^cjjIo8z_i^`uE;Y0O}Vm3GxeOU}R#6O3Ewlm@;GL
zyv0j?{Q3LOH*?Nrpmdg}i(^Q|t+!V!`3@-XxCAOxpJ1B#`@U%`mx0vIPK`g>=KdU!
zn_h1d?tK@?Cb{;K3e%SAG^VVL0s-5D4zPO64rhAf$XUS4^ds%%UuW)3;Y=;}7+<Cz
t_@8h<EWO(}pot}@a<8(e=B~JE#@LAgwYQIbxeT<G!PC{xWt~$(695?hX}tgd

-- 
GitLab


From dbb669246898c2a8bee22624df3a8816df8a0fcd Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 29 Sep 2015 18:15:15 +0200
Subject: [PATCH 592/783] [IE8] Fix filetype icon sizes

Added hack that uses a "filter" CSS with explicit URL to fix the "New"
menu by scaling down icons and also fix the folder/filetype icon in the sidebar
by scaling it up.
---
 apps/files/js/mainfileinfodetailview.js |  2 ++
 apps/files/js/newfilemenu.js            |  1 +
 core/js/js.js                           | 40 +++++++++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 82cca0d0fb3..bdec9c08509 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -131,6 +131,7 @@
 				} else {
 					// TODO: special icons / shared / external
 					$iconDiv.css('background-image', 'url("' + OC.MimeType.getIconUrl('dir') + '")');
+					OC.Util.scaleFixForIE8($iconDiv);
 				}
 				this.$el.find('[title]').tooltip({placement: 'bottom'});
 			} else {
@@ -193,6 +194,7 @@
 					$iconDiv.css({
 						'background-image': 'url("' + $iconDiv.previewImg + '")'
 					});
+					OC.Util.scaleFixForIE8($iconDiv);
 				}.bind(this)
 			});
 		}
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
index 4c021e6b873..10ddf706d74 100644
--- a/apps/files/js/newfilemenu.js
+++ b/apps/files/js/newfilemenu.js
@@ -210,6 +210,7 @@
 					fileType: 'folder'
 				}]
 			}));
+			OC.Util.scaleFixForIE8(this.$('.svg'));
 		},
 
 		/**
diff --git a/core/js/js.js b/core/js/js.js
index 397fea8e3c5..e40141ac617 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1596,6 +1596,46 @@ OC.Util = {
 		});
 	},
 
+	/**
+	 * Fix image scaling for IE8, since background-size is not supported.
+	 *
+	 * This scales the image to the element's actual size, the URL is
+	 * taken from the "background-image" CSS attribute.
+	 *
+	 * @param {Object} $el image element
+	 */
+	scaleFixForIE8: function($el) {
+		if (!this.isIE8()) {
+			return;
+		}
+		var self = this;
+		$($el).each(function() {
+			var url = $(this).css('background-image');
+			var r = url.match(/url\(['"]?([^'")]*)['"]?\)/);
+			if (!r) {
+				return;
+			}
+			url = r[1];
+			url = self.replaceSVGIcon(url);
+			// TODO: escape
+			url = url.replace(/'/g, '%27');
+			$(this).css({
+				'filter': 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\'' + url + '\', sizingMethod=\'scale\')',
+				'background-image': ''
+			});
+		});
+		return $el;
+	},
+
+	/**
+	 * Returns whether this is IE8
+	 *
+	 * @return {bool} true if this is IE8, false otherwise
+	 */
+	isIE8: function() {
+		return $('html').hasClass('ie8');
+	},
+
 	/**
 	 * Remove the time component from a given date
 	 *
-- 
GitLab


From 97bfc20ac874416dc1de509abc46799da49ba58c Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 29 Sep 2015 18:27:42 +0200
Subject: [PATCH 593/783] [IE8] Fix popover menu borders for IE8

- fixes "New" menu
- fixes file actions menu
---
 apps/files/css/files.css | 3 +++
 core/css/apps.css        | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index c0701fb18b8..24f7a3e5a98 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -574,6 +574,9 @@ a.action > img {
 #fileList .popovermenu {
 	margin-right: 21px;
 }
+.ie8 #fileList .popovermenu {
+	margin-top: -10px;
+}
 
 .ie8 #fileList a.action img,
 #fileList tr:hover a.action,
diff --git a/core/css/apps.css b/core/css/apps.css
index 23e0c519d00..3122a2b48a1 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -308,6 +308,13 @@
 	-o-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 	filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 }
+.ie8 .bubble {
+	border: 1px solid #eee;
+	margin-top: 18px;
+}
+.ie8 .bubble:after {
+	display: none;
+}
 /* miraculous border arrow stuff */
 .bubble:after,
 #app-navigation .app-navigation-entry-menu:after {
-- 
GitLab


From 9ea05c898e200a0a3d90ae9f8495950085ea65a9 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Wed, 30 Sep 2015 01:50:15 +0200
Subject: [PATCH 594/783] Always send a postScanFile event when done scanning a
 file postScanFile is important when scanning external storage as it indicates
 when the file is ready to be used

---
 lib/private/files/cache/scanner.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index fb60ee5aa53..bfdab16b645 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -186,9 +186,9 @@ class Scanner extends BasicEmitter {
 				}
 				if (!empty($newData)) {
 					$data['fileid'] = $this->addToCache($file, $newData, $fileId);
-					$this->emit('\OC\Files\Cache\Scanner', 'postScanFile', array($file, $this->storageId));
-					\OC_Hook::emit('\OC\Files\Cache\Scanner', 'post_scan_file', array('path' => $file, 'storage' => $this->storageId));
 				}
+				$this->emit('\OC\Files\Cache\Scanner', 'postScanFile', array($file, $this->storageId));
+				\OC_Hook::emit('\OC\Files\Cache\Scanner', 'post_scan_file', array('path' => $file, 'storage' => $this->storageId));
 			} else {
 				$this->removeFromCache($file);
 			}
-- 
GitLab


From cc64c09ee531e3fe2aebecaeae236e9140df0eb1 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Wed, 30 Sep 2015 01:53:49 +0200
Subject: [PATCH 595/783] Make postScanFile and postScanFolder available to
 OC\Files\Utils\Scanner

---
 lib/private/files/utils/scanner.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php
index c70f4beb31d..558a1fba028 100644
--- a/lib/private/files/utils/scanner.php
+++ b/lib/private/files/utils/scanner.php
@@ -99,7 +99,12 @@ class Scanner extends PublicEmitter {
 		$scanner->listen('\OC\Files\Cache\Scanner', 'scanFolder', function ($path) use ($mount, $emitter) {
 			$emitter->emit('\OC\Files\Utils\Scanner', 'scanFolder', array($mount->getMountPoint() . $path));
 		});
-
+		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFile', function ($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFile', array($mount->getMountPoint() . $path));
+		});
+		$scanner->listen('\OC\Files\Cache\Scanner', 'postScanFolder', function ($path) use ($mount, $emitter) {
+			$emitter->emit('\OC\Files\Utils\Scanner', 'postScanFolder', array($mount->getMountPoint() . $path));
+		});
 		// propagate etag and mtimes when files are changed or removed
 		$propagator = $this->propagator;
 		$propagatorListener = function ($path) use ($mount, $propagator) {
-- 
GitLab


From 41129aff80a343dd316201d200c73105b7b6abb5 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 30 Sep 2015 01:55:43 -0400
Subject: [PATCH 596/783] [tx-robot] updated from transifex

---
 core/l10n/es.js          | 1 +
 core/l10n/es.json        | 1 +
 settings/l10n/es_AR.js   | 3 +++
 settings/l10n/es_AR.json | 3 +++
 4 files changed, 8 insertions(+)

diff --git a/core/l10n/es.js b/core/l10n/es.js
index 1b026297565..a35f8464325 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -182,6 +182,7 @@ OC.L10N.register(
     "New Password" : "Contraseña nueva",
     "Reset password" : "Restablecer contraseña",
     "Searching other places" : "Buscando en otros lugares",
+    "No search results in other folders" : "Ningún resultado de búsqueda en otras carpetas",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index a4f5ba0cf5c..2a1d8b79a28 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -180,6 +180,7 @@
     "New Password" : "Contraseña nueva",
     "Reset password" : "Restablecer contraseña",
     "Searching other places" : "Buscando en otros lugares",
+    "No search results in other folders" : "Ningún resultado de búsqueda en otras carpetas",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js
index fa4a506fab0..122422aac97 100644
--- a/settings/l10n/es_AR.js
+++ b/settings/l10n/es_AR.js
@@ -94,6 +94,9 @@ OC.L10N.register(
     "Cheers!" : "¡Saludos!",
     "Forum" : "Foro",
     "Get the apps to sync your files" : "Obtené Apps para sincronizar tus archivos",
+    "Desktop client" : "Cliente de escritorio",
+    "Android app" : "App para Android",
+    "iOS app" : "App para iOS",
     "Show First Run Wizard again" : "Mostrar de nuevo el asistente de primera ejecución",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usás <strong>%s</strong>  de los <strong>%s</strong> disponibles",
     "Password" : "Contraseña",
diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json
index e8098e575c5..72e593031b8 100644
--- a/settings/l10n/es_AR.json
+++ b/settings/l10n/es_AR.json
@@ -92,6 +92,9 @@
     "Cheers!" : "¡Saludos!",
     "Forum" : "Foro",
     "Get the apps to sync your files" : "Obtené Apps para sincronizar tus archivos",
+    "Desktop client" : "Cliente de escritorio",
+    "Android app" : "App para Android",
+    "iOS app" : "App para iOS",
     "Show First Run Wizard again" : "Mostrar de nuevo el asistente de primera ejecución",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usás <strong>%s</strong>  de los <strong>%s</strong> disponibles",
     "Password" : "Contraseña",
-- 
GitLab


From 1ec2499a0a7d8c7d2248743db9611c3bdde9f4b7 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 30 Sep 2015 09:59:23 +0200
Subject: [PATCH 597/783] move IE8 fixes to fixes.css

---
 core/css/fixes.css  | 13 +++++++++++++
 core/css/header.css |  4 ----
 core/css/styles.css |  9 ---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/css/fixes.css b/core/css/fixes.css
index 7ef44ba6909..54852eb9beb 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -38,6 +38,10 @@ select {
 	background-image: url('../img/actions/settings.png');
 }
 
+/* IE8 needs PNG image for header logo */
+.ie8 #header .logo {
+	background-image: url(../img/logo-icon-175px.png);
+}
 
 /* IE8 needs background to be set to same color to make transparency look good. */
 .lte9 #body-login form input[type="text"] {
@@ -51,6 +55,15 @@ select {
 	border-bottom: 1px solid lightgrey;
 	background-color: white; /* don't change background on hover */
 }
+.ie8 #body-login input[type="submit"] {
+	padding: 10px 5px;
+	margin-top: 3px;
+}
+/* for whatever unexplained reason */
+.ie8 #password {
+	width: 271px !important;
+	min-width: auto !important;
+}
 
 /* disable opacity of info text on gradient
    since we cannot set a good backround color to use the filter&background hack as with the input labels */
diff --git a/core/css/header.css b/core/css/header.css
index b25823411f0..369750251c4 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -69,10 +69,6 @@
 	opacity: 1;
 }
 
-.ie8 #header .logo {
-	background-image: url(../img/logo-icon-175px.png);
-}
-
 #header .logo {
 	background-image: url(../img/logo-icon.svg);
 	background-repeat: no-repeat;
diff --git a/core/css/styles.css b/core/css/styles.css
index 2dda994ec24..d952a33c24a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -602,11 +602,6 @@ input[name='password-clone'] {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
 	opacity: .3;
 }
-/* for whatever unexplained reason */
-.ie8 #password {
-	width: 271px !important;
-	min-width: auto !important;
-}
 #adminpass-icon, #password-icon {
 	top: 17px;
 }
@@ -854,10 +849,6 @@ label.infield {
 #body-login input[type="submit"] {
 	padding: 10px 20px; /* larger log in and installation buttons */
 }
-.ie8 #body-login input[type="submit"] {
-	padding: 10px 5px;
-	margin-top: 3px;
-}
 #remember_login {
 	margin: 18px 5px 0 16px !important;
 	vertical-align: text-bottom;
-- 
GitLab


From d8351156005750fe6c62823ebc7e0d4c1b29e298 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 30 Sep 2015 10:44:59 +0200
Subject: [PATCH 598/783] Keep opacity in current item in newFileMenu

Whenever the input field appears, the menu item should keep its opacity
instead of reacting on hover.
---
 apps/files/css/files.css     | 4 ++++
 apps/files/js/newfilemenu.js | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index c0701fb18b8..675d4499c55 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -746,6 +746,10 @@ table.dragshadow td.size {
 	margin: 0;
 }
 
+.newFileMenu.popovermenu a.menuitem.active {
+	opacity: 1;
+}
+
 .newFileMenu.bubble:after {
 	left: 75px;
 	right: auto;
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
index 4c021e6b873..b07999821d5 100644
--- a/apps/files/js/newfilemenu.js
+++ b/apps/files/js/newfilemenu.js
@@ -84,6 +84,8 @@
 				OC.hideMenus();
 			} else {
 				event.preventDefault();
+				this.$el.find('.menuitem.active').removeClass('active');
+				$target.addClass('active');
 				this._promptFileName($target);
 			}
 		},
-- 
GitLab


From 1051a3c6f5891e703a15225e12bbb9417755a860 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 30 Sep 2015 10:49:48 +0200
Subject: [PATCH 599/783] Change small thumbnails to 32 px

* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
---
 apps/files/js/filelist.js                 | 4 ++--
 apps/files/templates/list.php             | 2 +-
 apps/files_sharing/ajax/publicpreview.php | 4 ++--
 apps/files_sharing/js/public.js           | 4 ++--
 apps/files_trashbin/lib/trashbin.php      | 2 +-
 core/ajax/preview.php                     | 4 ++--
 lib/private/helper.php                    | 4 ++--
 lib/private/preview/txt.php               | 2 +-
 tests/lib/preview.php                     | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index b4cc71e2d3b..16aa643d11b 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1408,10 +1408,10 @@
 		generatePreviewUrl: function(urlSpec) {
 			urlSpec = urlSpec || {};
 			if (!urlSpec.x) {
-				urlSpec.x = this.$table.data('preview-x') || 36;
+				urlSpec.x = this.$table.data('preview-x') || 32;
 			}
 			if (!urlSpec.y) {
-				urlSpec.y = this.$table.data('preview-y') || 36;
+				urlSpec.y = this.$table.data('preview-y') || 32;
 			}
 			urlSpec.x *= window.devicePixelRatio;
 			urlSpec.y *= window.devicePixelRatio;
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index bbbce8473de..7ebf80ee8b2 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -51,7 +51,7 @@
 	<p></p>
 </div>
 
-<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="36" data-preview-y="36">
+<table id="filestable" data-allow-public-upload="<?php p($_['publicUploadEnabled'])?>" data-preview-x="32" data-preview-y="32">
 	<thead>
 		<tr>
 			<th id='headerName' class="hidden column-name">
diff --git a/apps/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php
index 6ddd4786c2a..69894bb8da5 100644
--- a/apps/files_sharing/ajax/publicpreview.php
+++ b/apps/files_sharing/ajax/publicpreview.php
@@ -28,8 +28,8 @@ OCP\JSON::checkAppEnabled('files_sharing');
 \OC_User::setIncognitoMode(true);
 
 $file = array_key_exists('file', $_GET) ? (string) $_GET['file'] : '';
-$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '36';
-$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '36';
+$maxX = array_key_exists('x', $_GET) ? (int) $_GET['x'] : '32';
+$maxY = array_key_exists('y', $_GET) ? (int) $_GET['y'] : '32';
 $scalingUp = array_key_exists('scalingup', $_GET) ? (bool) $_GET['scalingup'] : true;
 $token = array_key_exists('t', $_GET) ? (string) $_GET['t'] : '';
 $keepAspect = array_key_exists('a', $_GET) ? true : false;
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 6a6095317af..1c3d4b9ac32 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -161,10 +161,10 @@ OCA.Sharing.PublicApp = {
 			this.fileList.generatePreviewUrl = function (urlSpec) {
 				urlSpec = urlSpec || {};
 				if (!urlSpec.x) {
-					urlSpec.x = 36;
+					urlSpec.x = 32;
 				}
 				if (!urlSpec.y) {
-					urlSpec.y = 36;
+					urlSpec.y = 32;
 				}
 				urlSpec.x *= window.devicePixelRatio;
 				urlSpec.y *= window.devicePixelRatio;
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 2a9df94988d..840fd4fa146 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -908,6 +908,6 @@ class Trashbin {
 	 * @return string
 	 */
 	public static function preview_icon($path) {
-		return \OCP\Util::linkToRoute('core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => $path));
+		return \OCP\Util::linkToRoute('core_ajax_trashbin_preview', array('x' => 32, 'y' => 32, 'file' => $path));
 	}
 }
diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index baa0ed4ec61..c8bc05453ed 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -26,8 +26,8 @@
 \OC::$server->getSession()->close();
 
 $file = array_key_exists('file', $_GET) ? (string)$_GET['file'] : '';
-$maxX = array_key_exists('x', $_GET) ? (int)$_GET['x'] : '36';
-$maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '36';
+$maxX = array_key_exists('x', $_GET) ? (int)$_GET['x'] : '32';
+$maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '32';
 $scalingUp = array_key_exists('scalingup', $_GET) ? (bool)$_GET['scalingup'] : true;
 $keepAspect = array_key_exists('a', $_GET) ? true : false;
 $always = array_key_exists('forceIcon', $_GET) ? (bool)$_GET['forceIcon'] : true;
diff --git a/lib/private/helper.php b/lib/private/helper.php
index b8e4b451835..dcd263daa24 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -193,11 +193,11 @@ class OC_Helper {
 	 * Returns the path to the preview of the file.
 	 */
 	public static function previewIcon($path) {
-		return self::linkToRoute( 'core_ajax_preview', array('x' => 36, 'y' => 36, 'file' => $path ));
+		return self::linkToRoute( 'core_ajax_preview', array('x' => 32, 'y' => 32, 'file' => $path ));
 	}
 
 	public static function publicPreviewIcon( $path, $token ) {
-		return self::linkToRoute( 'core_ajax_public_preview', array('x' => 36, 'y' => 36, 'file' => $path, 't' => $token));
+		return self::linkToRoute( 'core_ajax_public_preview', array('x' => 32, 'y' => 32, 'file' => $path, 't' => $token));
 	}
 
 	/**
diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php
index 0bba570a8c9..2fdc86d9546 100644
--- a/lib/private/preview/txt.php
+++ b/lib/private/preview/txt.php
@@ -53,7 +53,7 @@ class TXT extends Provider {
 
 		$lines = preg_split("/\r\n|\n|\r/", $content);
 
-		$fontSize = ($maxX) ? (int) ((5 / 36) * $maxX) : 5; //5px
+		$fontSize = ($maxX) ? (int) ((5 / 32) * $maxX) : 5; //5px
 		$lineSize = ceil($fontSize * 1.25);
 
 		$image = imagecreate($maxX, $maxY);
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index 9e118014bac..de1669cbf85 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -534,10 +534,10 @@ class Preview extends TestCase {
 		// Small thumbnails are always cropped
 		$this->keepAspect = false;
 		// Smaller previews should be based on the previous, larger preview, with the correct aspect ratio
-		$this->createThumbnailFromBiggerCachedPreview($fileId, 36, 36);
+		$this->createThumbnailFromBiggerCachedPreview($fileId, 32, 32);
 
 		// 2nd cache query should indicate that we have a cached copy of the exact dimension
-		$this->getCachedSmallThumbnail($fileId, 36, 36);
+		$this->getCachedSmallThumbnail($fileId, 32, 32);
 
 		// We create a preview in order to be able to delete the cache
 		$preview = $this->createPreview(rand(), rand());
-- 
GitLab


From 22e724e8292315f600b57a30716e26c1f1c04f66 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 30 Sep 2015 13:32:20 +0200
Subject: [PATCH 600/783] Only intercept exceptions of type "NotFoundException"
 instead of any Exception

The sharing backend may throw another exception for example when the activity app encounters a problem. Previously this just triggered a 404 error page and the exception got not logged at all. With this change such exceptions get not intercepted and regularly handled as exceptions so that we have meaningful log data. Also the user will be shown a window informing him that an error happened.

Helps to debug cases such as https://github.com/owncloud/core/issues/19465
---
 .../lib/controllers/sharecontroller.php       | 10 ++--
 .../lib/middleware/sharingcheckmiddleware.php | 21 +++++--
 .../middleware/sharingcheckmiddleware.php     | 55 ++++++++++++++++++-
 3 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index ecf3ee853ee..28feb3110b4 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -46,6 +46,7 @@ use OCA\Files_Sharing\Helper;
 use OCP\User;
 use OCP\Util;
 use OCA\Files_Sharing\Activity;
+use \OCP\Files\NotFoundException;
 
 /**
  * Class ShareController
@@ -148,6 +149,7 @@ class ShareController extends Controller {
 	 * @param string $token
 	 * @param string $path
 	 * @return TemplateResponse|RedirectResponse
+	 * @throws NotFoundException
 	 */
 	public function showShare($token, $path = '') {
 		\OC_User::setIncognitoMode(true);
@@ -171,7 +173,7 @@ class ShareController extends Controller {
 			$getPath = Filesystem::normalizePath($path);
 			$originalSharePath .= $path;
 		} else {
-			throw new OCP\Files\NotFoundException();
+			throw new NotFoundException();
 		}
 
 		$file = basename($originalSharePath);
@@ -303,7 +305,7 @@ class ShareController extends Controller {
 	/**
 	 * @param string $token
 	 * @return string Resolved file path of the token
-	 * @throws \Exception In case share could not get properly resolved
+	 * @throws NotFoundException In case share could not get properly resolved
 	 */
 	private function getPath($token) {
 		$linkItem = Share::getShareByToken($token, false);
@@ -312,7 +314,7 @@ class ShareController extends Controller {
 			$rootLinkItem = Share::resolveReShare($linkItem);
 			if (isset($rootLinkItem['uid_owner'])) {
 				if(!$this->userManager->userExists($rootLinkItem['uid_owner'])) {
-					throw new \Exception('Owner of the share does not exist anymore');
+					throw new NotFoundException('Owner of the share does not exist anymore');
 				}
 				OC_Util::tearDownFS();
 				OC_Util::setupFS($rootLinkItem['uid_owner']);
@@ -324,6 +326,6 @@ class ShareController extends Controller {
 			}
 		}
 
-		throw new \Exception('No file found belonging to file.');
+		throw new NotFoundException('No file found belonging to file.');
 	}
 }
diff --git a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
index 1c29b1da736..61dfd914d0b 100644
--- a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
@@ -27,6 +27,7 @@ use OCP\App\IAppManager;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Middleware;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Files\NotFoundException;
 use OCP\IConfig;
 
 /**
@@ -58,22 +59,32 @@ class SharingCheckMiddleware extends Middleware {
 
 	/**
 	 * Check if sharing is enabled before the controllers is executed
+	 *
+	 * @param \OCP\AppFramework\Controller $controller
+	 * @param string $methodName
+	 * @throws NotFoundException
 	 */
 	public function beforeController($controller, $methodName) {
 		if(!$this->isSharingEnabled()) {
-			throw new \Exception('Sharing is disabled.');
+			throw new NotFoundException('Sharing is disabled.');
 		}
 	}
 
 	/**
-	 * Return 404 page in case of an exception
+	 * Return 404 page in case of a not found exception
+	 *
 	 * @param \OCP\AppFramework\Controller $controller
 	 * @param string $methodName
 	 * @param \Exception $exception
-	 * @return TemplateResponse
+	 * @return NotFoundResponse
+	 * @throws \Exception
 	 */
-	public function afterException($controller, $methodName, \Exception $exception){
-		return new NotFoundResponse();
+	public function afterException($controller, $methodName, \Exception $exception) {
+		if(is_a($exception, '\OCP\Files\NotFoundException')) {
+			return new NotFoundResponse();
+		}
+
+		throw $exception;
 	}
 
 	/**
diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
index 58f4b841339..3171d45d331 100644
--- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
@@ -23,7 +23,8 @@
  */
 
 namespace OCA\Files_Sharing\Middleware;
-
+use OCP\AppFramework\Http\NotFoundResponse;
+use OCP\Files\NotFoundException;
 
 /**
  * @package OCA\Files_Sharing\Middleware\SharingCheckMiddleware
@@ -36,12 +37,16 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 	private $appManager;
 	/** @var SharingCheckMiddleware */
 	private $sharingCheckMiddleware;
+	/** @var \OCP\AppFramework\Controller */
+	private $controllerMock;
 
 	protected function setUp() {
 		$this->config = $this->getMockBuilder('\OCP\IConfig')
 			->disableOriginalConstructor()->getMock();
 		$this->appManager = $this->getMockBuilder('\OCP\App\IAppManager')
 			->disableOriginalConstructor()->getMock();
+		$this->controllerMock = $this->getMockBuilder('\OCP\AppFramework\Controller')
+			->disableOriginalConstructor()->getMock();
 
 		$this->sharingCheckMiddleware = new SharingCheckMiddleware('files_sharing', $this->config, $this->appManager);
 	}
@@ -116,4 +121,52 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
 	}
 
+	public function testBeforeControllerWithSharingEnabled() {
+		$this->appManager
+			->expects($this->once())
+			->method('isEnabledForUser')
+			->with('files_sharing')
+			->will($this->returnValue(true));
+
+		$this->config
+			->expects($this->at(0))
+			->method('getAppValue')
+			->with('core', 'shareapi_enabled', 'yes')
+			->will($this->returnValue('yes'));
+
+		$this->config
+			->expects($this->at(1))
+			->method('getAppValue')
+			->with('core', 'shareapi_allow_links', 'yes')
+			->will($this->returnValue('yes'));
+
+		$this->sharingCheckMiddleware->beforeController($this->controllerMock, 'myMethod');
+	}
+
+	/**
+	 * @expectedException \OCP\Files\NotFoundException
+	 * @expectedExceptionMessage Sharing is disabled.
+	 */
+	public function testBeforeControllerWithSharingDisabled() {
+		$this->appManager
+			->expects($this->once())
+			->method('isEnabledForUser')
+			->with('files_sharing')
+			->will($this->returnValue(false));
+
+		$this->sharingCheckMiddleware->beforeController($this->controllerMock, 'myMethod');
+	}
+
+	/**
+	 * @expectedException \Exception
+	 * @expectedExceptionMessage My Exception message
+	 */
+	public function testAfterExceptionWithRegularException() {
+		$this->sharingCheckMiddleware->afterException($this->controllerMock, 'myMethod', new \Exception('My Exception message'));
+	}
+
+	public function testAfterExceptionWithNotFoundException() {
+		$this->assertEquals(new NotFoundResponse(), $this->sharingCheckMiddleware->afterException($this->controllerMock, 'myMethod', new NotFoundException('My Exception message')));
+	}
+
 }
-- 
GitLab


From 08fd4b38f895a5e9a91cdc476103c26be68dda80 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Mon, 28 Sep 2015 20:44:33 +0200
Subject: [PATCH 601/783] Do noy allow empty urls to be submitted in "add to
 your owncloud"

Fixes #19382
---
 apps/files_sharing/js/public.js         | 8 ++++++++
 apps/files_sharing/templates/public.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 6a6095317af..41333f1a089 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -228,6 +228,14 @@ OCA.Sharing.PublicApp = {
 			OCA.Sharing.PublicApp._saveToOwnCloud(remote, token, owner, name, isProtected);
 		});
 
+		$('#remote_address').on("change keyup paste", function() {
+			if ($(this).val() === '') {
+				$('#save-button-confirm').prop('disabled', true);
+			} else {
+				$('#save-button-confirm').prop('disabled', false);
+			}
+		});
+
 		$('#save #save-button').click(function () {
 			$(this).hide();
 			$('.save-form').css('display', 'inline');
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index cde28c80fc4..06d797c3c6f 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -76,7 +76,7 @@ $thumbSize = 1024;
 					<button id="save-button"><?php p($l->t('Add to your ownCloud')) ?></button>
 					<form class="save-form hidden" action="#">
 						<input type="text" id="remote_address" placeholder="example.com/owncloud"/>
-						<button id="save-button-confirm" class="icon-confirm svg"></button>
+						<button id="save-button-confirm" class="icon-confirm svg" disabled></button>
 					</form>
 				</span>
 				<?php } ?>
-- 
GitLab


From def76bed2a9fbaa9a3440bfb7d1684cd9a6f9db0 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 30 Sep 2015 14:03:51 +0200
Subject: [PATCH 602/783] [IE8] opacity for active newFileMenu items

---
 apps/files/css/files.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 675d4499c55..6e0e7208e5b 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -748,6 +748,8 @@ table.dragshadow td.size {
 
 .newFileMenu.popovermenu a.menuitem.active {
 	opacity: 1;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter: alpha(opacity=100);
 }
 
 .newFileMenu.bubble:after {
-- 
GitLab


From a2817372ad89b11ef382845540068b016286d046 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 30 Sep 2015 14:07:59 +0200
Subject: [PATCH 603/783] Clean temp files used for thumbnail generation

---
 lib/private/preview/image.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index f9c27e690f6..fd90b15eb0c 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -46,12 +46,16 @@ abstract class Image extends Provider {
 
 		$image = new \OC_Image();
 
-		if ($fileInfo['encrypted'] === true) {
+		$useTempFile = $fileInfo->isEncrypted() || !$fileInfo->getStorage()->isLocal();
+		if ($useTempFile) {
 			$fileName = $fileview->toTmpFile($path);
 		} else {
 			$fileName = $fileview->getLocalFile($path);
 		}
 		$image->loadFromFile($fileName);
+		if ($useTempFile) {
+			unlink($fileName);
+		}
 		$image->fixOrientation();
 		if ($image->valid()) {
 			$image->scaleDownToFit($maxX, $maxY);
-- 
GitLab


From 42eb2149ad94a0a937e3a2ee09ce44be443c30f6 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 30 Sep 2015 14:51:29 +0200
Subject: [PATCH 604/783] Optipng IE8 logo

---
 core/img/logo-icon-175px.png | Bin 3821 -> 2946 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/core/img/logo-icon-175px.png b/core/img/logo-icon-175px.png
index dca833b70260e82ac8899b4445cbc2f2255ab068..67e764986706785b5ddfcbb83e5251da97b9a760 100644
GIT binary patch
literal 2946
zcmeH}`9BkmAIGN|n;E$$DR+*B<XmLdT+6YBFura%LK4*!ALX1Y)|Q(wQ{--_M597J
znd8G~xyo6~wNLTU!Pn#aZ+t(`$K(BaJ>EaQUyt_>FA~nl7AA5;1ONcQ?Cmi418+JQ
zKQQn>z4>Dr0KlOwoP(?N!Mgu1|0eK%lR%@@$Kr#h{}GFKasdb&0t$kJguxIIs3=TK
z{IG<il(dYj99;g0!coOz$CZ>-RMpfqPH1Xr>zqXB>gk^{IBjTTY+`DLJY#Ng))Hlf
zK8LZkv9+_uo_BC`a>iZ2ySTbtbocNiczOTF$Jft4ATTKSQb=f6_~nSms4LM|W3I)<
zUB5w$zjZqy@sFfCcau|6)6z3Cv$At?@8yy2Q>YIL3X6(MO3TVCXq8p;YDUe&N40g2
z>l+%Inp;|*FxxwxK6~EzqO1F5Pw%VOZ~FQN-VXlxZiqcRGCKCx_ylKi>OJ?v^vvws
z{KroVi%ZKZtDnE{zOJorY;N)Y{`P%)=bzmlKY#t+Q&)=R0sz7`_82QyxcpjAf;S~q
zKzMWRns7QQv&!er>4B-&J4WX=K}JJGW)Tnc%<z4#v}`^@?KC2=gjzf%IHUHk#xxE(
zryqxuiDPKd9_>mZMP+=^#IDXcUm)?>%6j?AI?>5&>g>+%-k}55_R*{V>^!Jus5!6m
zNXvQwL}lL0@0fbAA#QUrGuCWWYKTKG3DxO1UR-OHO2Hc`42>1W4BAap?UL%M>J1Ig
zbe#|Dk1#xqcuBW#`#t)t+-Z*=y}jH~fofA{ZcxM=>-Uv822msQYch&Ar5t&VK%U!b
zzLRZZJIW=#;8MxFuT#2@jnonU>h~D6k(S6%<gtfgmqb{Ws~)v-#qZ8bYb8bB7r|7$
zt*;z#62y}PUq7i@9jKc^J>{BZ*0TWGTM|C=34InXIV=WNlMk`MlVmc2x}?s{qtP<f
z<Wt4iUo!rN=fB_K{YqEK($6zkpFSCqJgiSq=|{4H+gtlc<FyjXk!@#J(U+He)n86O
zF{&eiM2p%#nLkd*I3?XFE$B{C9cDwUx;Pq{)TSJMDx+fP-2&!?BXq7UHOstp!-T+6
zy=}u~zw+JSDBZi1dZi6G60<mMl+N~kM%)YHjJe+e1BA?T+n7u*;3UaAuB5FTEyA0L
z?-vd&xY?W;FnLjY0$|6W%12XITHpI=`1q9};%Ps*SniKK*m1wx5{PM7%6Y-PGL`)_
zTY<~dMc~-!&?;utO&B+lmTLI4ck?oH1ZrP@z2!_wkvio@^_k6bl1gyAVYev|!JrSt
z@iUIC-56;c(_-n!NE4wsx}zAKw5W__lZMfyTgX=LtdKv$uETR8U*sEK2YZZ*eKc8}
z($K?{OtDte`zDrj)ztv2#4K#YxS#G&TIB`e(T9{XXTjRl23jn+h)v{?iC8Q)ZC#UE
zoYHRDoVK<2MZ9;kkRa=VZ4^8IXle$RePSc{#bSD&aTYmEdD?Di8){d<6KBzFzbX8E
z)**9kQY2?Vl<_rb8$OX?)waFm8C)M|`Xdp1tUDT;i7|A0R(~#<Ade_)6<Y8QJA))H
z%r>d&SKwQf7x87aaEw=x^SttiBR4Q82lbUfsfAln`O2k?2D1Am&2X#0lP5fXM4j@}
zA2^Z8I*Q$OO%|4nr+m+)!5Bf6ZdwyqD`zZ$-UEcY_X>G}D=DAh))VY=PqFq|(X)oC
zLk64Iu#o<Tu6l5uCgK?TM;S@QYlJGP?KQ7Ck!2&vpvEO%6S{aILL7<fl?PkmyFhSj
z`JW(D`j8C4R7?*TxrSCM%e#Xcl!u0#e8{*(D6MK3-hv|iEx9i2jzi;6qcN-|=PynO
z-0sBDbh%*I-T2Q;*<=qcAw?p#*NjGv*%O`kg$;{5{mq7J_vSECS(qTTBn`poJTP95
z57dbaqKTJ9gA*x}!0-lo!&^93;ou6X_K#Nwv+fWILUo)Ei{Tb$yMs4|D<H$zx(>l%
z-0X20xrrp{gSn#0Q!Ja$A?&*932adc#9q4JulY5mfK9~@T3<OC(C`UzXry&+_3H1g
zmIq%fa)K!xkTTD;*)(08Mm9N7d`5yZ@EI&R=fe))Ds-5L3cE_?w<}S0+z{hv5*TYB
zdTt&>HjCVv(&Y?dnn~f2cV;of3f1hm_AfNl4Q!`uic^8-G-O7^W2M|g>_S6JMy2BM
z1v8Ep1jKdedyk4Wl@<Q2ZVV?0*2O*sbyq36<P8YXD^aI{OTPeoVFqFCu!bmnne(O;
za1H#bVoGTan7dY8+S|=SWfndU5OC9ivTT_P?XqTu3L^bv&Bw0k-=)1k`vG+=@IA}1
zT-eQV%o9fRS9__Y(xi3cH`++$Ty5$0UNrY_9S8b=k7o0|m~K=EVesy<5>+9KEyG;6
zE8MC@76;kj*#@FDR1#Rb2Ct+1wZ>v=)wac3Q|Txzn*n#wnf#t%fGY}|EwsKBW8RVz
z&`HBIVX<E6Z05F}o*FJ6DgbV(R_wDArKeh=^WRgp5wSNyBO8)#JYp?Xs65TvKAE(m
zMF6L(poP@s398A)%YZE*BzaOIk{{+=Bdf*CL!jiF$|%z5A)$fDq?Icp-41`CI&-go
z-LYbl0{R4S*p70%Q)qM9MRq)$(4WAhM?6Rh=Ta%u&&j$=OntdQ$Z2g&|D%T*N6?;v
z>rw$t7uef}$BA8~<ZLK2skty93-o9-POo96{3FCXj;az&#|>}H@F@J@5PyzQiDZoG
z)j3K4r}Hc%9QHnpX4hkG5guzkAhgn}{ORWh3md}od`Tf_@02;=+2IWma&5WdQqKKr
zUOf;+pAWZ3Uxx<^%Zg1_<?1gd<r_Jji0>H;l)9Mc(n|n!F2gocVE%sb5(?Ao41SV_
z-`t}_foPvBT2#+HR_5OB)TEDSS~jaOL1-s&Os+M>=M;3G-+_2+S<bbEn*5KBef511
YA!cuhh_nwp=oJ8aYbQ)2+VAdv0U`JOdH?_b

literal 3821
zcmV<J4ifQ+P)<h;3K|Lk000e1NJLTq006H5003YJ1^@s6Yb+uZ00004b3#c}2nYxW
zd<bNS00009a7bBm001Wu001Wu0Y)yf{Qv*}8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H14r)n6K~#90?VWq{Tvc_)zdJ8U2nZno5~Lt4gitC_A0Wu1AYf`K
z(jr;{R9Z?DP%2hffNd?St<_Z^tD=Eb3e`nHG@?RD5C!TAF+37dAOV3&B*BD70!he|
zJU;#7oXZS9XMQvH&N=taOwMPmtaJ05bN1Qy&YpA6W1oGbL?V$$Boc{4B9TZW5{X12
zkx2A1R<#1X3~->NLnIv_X^f;%k~T|PC26swrzFiYv(1$$nMh;+M*!1-Wwggy;77p6
zfe}^fpV$roP6Xz(X|T;$3VaqAUiJMXwgZ4YfEgVc?LZa+M^=4ri9QB6miD^`dD#qH
zTJ=39`VioBU}Gf1t>=1RXw~<d=o5fbe9KrCH&lJki9P^$FR;Eu!_7!th@7N(-a3Gt
zBrTBi+Z9y5MbdF*Hm8ERdy>93Uf_L_J|^k+B<&#yNy{WXBx#13Egq2nT1kIhww`r7
zE$L7*d$U3v5>)~m1^m3lYkDj29bk7~W+LVGbDME-)z2?c5x~X3mNpG#6E)+#IhHl%
zWI3=y)z2|eGQgEN4P}NeH->Vi#oFbQRX@vKU`W*pgaVi>>8hN?e&o|LB)uc7Mjdfh
z)e7_iePO)7FiF=a-~Axzr~djQ!IkQa<AHAaF?A(<VZ4$~m2_avGB29ha=;`V6G5j=
z7%AxkRV&f$^o#L+tU#Hkd^%pzt^suk#qUZIFxB^iHvumL4+A#==K>R|R<cTlRjoiE
zjwn!OiBI<nsYpOFy<YO^2uZv9e;<%^uB2_i|490}q&v-QTiHrhNx!tbdlo3O#;5NL
zsYpO}@#$-W<QXFAcu7Byv;a6hx>j98&l|7rvlf{b-RRS9-QAGg)5bw_)p(Dj`*2=r
zqax|lRrI{^ni-N_DNuBzPge$1rx|M`y)J1}jxulfbmyFPO_lT@uvgA<Jx9Ovc^{M1
zXz=ocq`8vjOL|h$3OOTMrP{pitATXbBx$y!hb1kP8xSrrvsLw({1n(2Nt67)LnNJ`
z-|Ty5-Gw59$-^Yg0gg4Z7YdY5lm&2p-Rjh{z!kvnv{`l+U|YeJu#LbiIRD=rJG_Sj
zfJ=ZyUiR7k?_Vsa8^HeoyLF;hH`5nhWx!}jcT2iK((Pup)&G5%r1wfXQf?l2AGv|h
zFuB(EBs1FvERu9kjw+YSEsFf7nXRbPV<)*e<HICPlyj}zP125X+u~oBw9c1*M$U`u
zK}idJ_a~F{A-Pt232=*~DY+iV+qqBvK0A<+C=1|d++66Y7A@0ZKL2%Xwq&mZms2+&
z0><KY1ka(kSK2GUw}2CXAp`E^`hqg+`Fz>mK_Vx>M}WCGzSK*6xl`N7dk5YF&6hbC
z*JXG!w<!(I3&7`i`w!$3xCM%$tYtf2(CAu#3BV5ue5sH6^22~7P4cY9_dk8!y@Bsi
zyr0}IFXL9%hWL8N;{1<`lJ?1U8^Fo9*KSb`@p3L}@Y!PEVE?({22^i!P*)Ki&UEm4
z{4K?PI2)*Yb0jJTH_Onj<9Rb~_Of;bUL9aGnWOqRU{;6qbi#Vzyt?~73+L;Qm%pj%
zyGqo78zhBzb#DPOCzvVzZ}Wj&{NE<w`k~#xbbO2l;KSs1pns^!?<}FW1~6L#8pSN!
zGP8iIfwBJja9~BidO|P*@9T^EvE}&zZw0#5m!to|wS;RU7{#Xt)bk$P)L1w2U1|fl
zFXb$IVm05~b`EY<U_o$GaID5pPXYT7FGg7?uB&@4x8^8!QFY&7SbEL3;UY<gMw0z?
zGh2^~q5C~KC-rXTLf{cI`?jRd%DG1F(IDS8NsHuysr*XPqorw>Z~!|2D`PZaxR9eG
zd_C7jsv`z#anaecaX`j8;CA3o>Ek|b&-gX~Uy$^#k;I>5W<LQAm-KV>maFJ&NynNQ
zxM{y%O8Tamz2(G?^YNG@=kvRpoPWn~No(cYNuQDPuUIoscp?D6Gm%=aSzi87;IT+`
z#OBW%Jg;%M6}lhe7ARV=1$YGbGHrU~CE5TtWfhB~eH~L;=ImaUQtS5Y3*10^2HT8n
zIHNzV(l5RRUGaJZb^}fW{t-6~bU!c;$Tn8SimULDna#${@m?OOjxu<cq^$MbN7DH!
zwlyllB%LJb0pL#H-5u)JUjQS3bAbD3zThyy=e@s!R%9^#%FCY|Nq(99!rzPG9P&f*
z29Too07Gznv862@*h_U~I&r*d#zy=|oX)(px``wF{ag`A{xk;o8&^rGir}Vo9+Gsu
z+^cRdUhrjhl{7AbIzKbB)xge@{y2jCD#%*L|BfX8VoBfX76UF#3E&L53G(;1StQ%I
z7;6vKET0~y+D_tLXR=S9R4rIZXwH)KZ;@o@q7>r=E|heeq|rHwWyYJQOdjU?w4VZX
z><8@Y_ru*Ev7QTosS)M3MRel@{z5JsQQo?;QzB!8xZf=4aev)!hxr}l(<dU=GY#)b
zS`|@^7dS?4M{kjpylh!>bvTXQVzHTR#7&XqjV{^kO!Vo~k?Yw((scg}D<PWk`hnK1
zD(?I<#-}SJZ4IJSjVutycu6}2mR&WO@jhEZT}Mkgy@Yxi60_y~XGxue96A6PYG#`h
z{)<@V(;@--x}D4$u8c5Nl5}NNt#1_L^;2T!cPM6*r2YN%<AY@^z&fAC8VpuR_9iLI
z$>tDM6r4L&%X?WM*@ye|-T<=d$s#Xy6r!n187)cvjkUR?I?ryMB|O267q@Eli9q7A
z#e=)$oT@{S8Eu}ZjlIG~$$81Cyv+uuRMB;a(enO@!cF?042(3hS0v30BvYzIUR)bc
zX19=qMjfs4{Iz$Nba2aDfr(+f9}XyMM@eV;>uCYywi9){SIO?F>>U)pUvhm>UMokn
z&XS8ufScr2jOG-Ozh2Tjxk>w#az|KYt<wu~{lejmi}obX`LyiAzbCfN5|*IGi;GeF
zTOno2g&sZ4%<jOQ%lnAhdt*E*=~_uYG_wtjGML$B;CWT>;3M*kPY)=$-tp2~W1chR
zBD$}XJGf?cv+tl2LbtqoD^5S_YG9U`%?GAQx@3^NugUE){!SM278f@+JNbRMq+d&V
z%s<e1>M!G+=hL$LpxG4No|3*f;Is9>U6TI6%wn(n6$5yGBtKGsfAV#Vz{L@3#FN0@
zb^4qP%%pKxq^Um7Uq;ck8eXRs4(f@L>%PO+d*C2>HUs~H*RfMV57>ez)r8A{6V2>R
zNvBC#JmB+%l8!U8rNExRy^`*ca}#WI6zWHPdY@cBxF2}H%(mhJ1eV?MW{V<&Ew>Mo
zTLbtZe$QPegf`xoQ%^%B{THy0nJtr>)p*f=_L`(q&1@yk)9DdOt->0efSZQ<m7Ifo
zKX98*C#(Fh2HC+h?f75+k)&^QT48A8eL1kafsB*%6JUawJui3i<pN2Uo7wZe#kpIq
z@7;<~s`>JMJBqgDvP#lj{<@0&X4yb-|3P!rI1f0jlL~_xubI87_;aWGOZq9Wmzn)q
z&a>%8|JjXlyJy?wGd{gl?y!?y=0Cif=es2RK?U_^{wI@il=%uSAW9)(EK-ya3u}_3
zM}ZHT**brs&oPot$tmX#frEUcnCn{R?p`)Zy4qiVPI1Q`jaV&r7M|o9lXjUX>DZ!`
z#xULoBFJpSc)8<BvyT5~2Fu(8laxgZpQhejahq;t%YiYHKHV~Rc<%87#XaOttIxry
zMJtVAyfakZ=>0h}d(#{6<d(S`GX>bs$M)*Qz$42gec4}Ms%o6;Z}I8r%0EynJS!61
zc+KpWa>3uqV3AMXt>SC>BP31t*Eh-q+Uq4QHnTOrL`hYgx3*YrN>VB|P%M1JRxE$s
zuSJqOkZiX=r?GTT0?ziQM4qYM=|0?OX5YiPBYs2GoM8V|Gur|jDL4C*mn}srj%B<v
z<(z0@6S8}94Y0dEX!=tMzi%!y3*-i8l3Ol6p#mKiO1jBkUr|uTvesD|6UBJFPr-$X
z@5!G{h%XNyYpkU21Me`iyX5>Mx|PL}K5Awga506yQh^TJBwgU0n@&`1#WFAR1L_nG
z;L<?r=FRwDU(X2KnGzwmh1$tLmj{v=lBK}@UcY^*?(B@KybdFQr#g^xcykM?5M0E<
z+k-r+#%!T>URua{uBf|*sdRo&VJH^i9glE_9{!>tJ?^CD0MzcG<Bgb02iu3D1|9L;
zhjS$TI8qfuC7t1~uMa49eRg4HH^}X!D{CuxGwzafw3#jS|6ikOUb(X+ebUeCPLXs$
zK{?wbeKB)e?OJfJ_1gmc;v4ZewKK_P29WnG@Ed#Za0h1pEP(vHYyiGMgBA*R6v4lj
zsLP$yj{BNK{u4Os`BHq#3k0qU@p+1!ncIppd>!L~7dw!%fm$^7X7_L|apDCxVkT{z
z4*^_6XNJ^@t-w{(`QhT8#We-xT|<Roq6z~XM7T)jt8hPv;dSy41C|$%wE<`=PA~9I
z;7Z<p&~`{30CH_)#XZ-#5p-FIKewYvz30*X5o50c=j6Gst^_z9xQAkcp(ViI;ZJ36
zAbW3MP7Zm`QDD>y><D~{!H*_rmle3dPrLDp8|h=f$8iI@PI(?TSZ%pE6&MTrJ@9lB
zSx?}OnccbQy>%tPUcd#w_kqPUJ_vdP@E~pr$;q^_jl_SEr~7iv4C`s!>G6$rTI9Wt
zJ%K;N^+D(3&T$xwCBVJ7AK{1EF_Ij*7;p@5Gw^Z?J?dG7o3%NGg070d1mJ^S#*sj@
zlSI3&-vR6(w^4GmTuiYQX4cUT4O|QTJ}-BqT-5N#{4R=U;0}b@Mebfk$!)n`CFvzI
zTQ^wQfI67m;em(Bxsr~P+u1wR>+_0SAj8Kc%{Q}dUs+5f5{X12kw_#Gi9{liNF)-8
jL?V$$Boc|l_Qn4L+OP%GbTqD500000NkvXXu0mjfFyCo@

-- 
GitLab


From 2d1214d21d32c18d9aa6cada30f92a32bd809cdf Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 30 Sep 2015 15:28:28 +0200
Subject: [PATCH 605/783] adjust style of disabled button

---
 apps/files_sharing/css/public.css | 10 ++++++++++
 apps/files_sharing/js/public.js   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index a5cf57d0ac5..2b7e84c987d 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -134,9 +134,19 @@ thead {
 	margin: 2px 0 !important;
 }
 
+#save-button-confirm:disabled,
+#save-button-confirm:disabled:hover,
+#save-button-confirm:disabled:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
+	filter: alpha(opacity=20);
+	opacity: .2;
+	cursor: default;
+}
+
 #save-button-confirm:hover,
 #save-button-confirm:focus {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	filter: alpha(opacity=100);
 	opacity: 1;
+	cursor: pointer;
 }
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 41333f1a089..2ba1a92af3a 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -228,7 +228,7 @@ OCA.Sharing.PublicApp = {
 			OCA.Sharing.PublicApp._saveToOwnCloud(remote, token, owner, name, isProtected);
 		});
 
-		$('#remote_address').on("change keyup paste", function() {
+		$('#remote_address').on("keyup paste", function() {
 			if ($(this).val() === '') {
 				$('#save-button-confirm').prop('disabled', true);
 			} else {
-- 
GitLab


From 5a2b30d78f1a5cb1879a453a9ac43cd5fa1de90c Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 30 Sep 2015 16:49:16 +0200
Subject: [PATCH 606/783] cache found l10n per app and not globally

* fixes: if the first call to this is with an app that has no translations
  all future call will get a list with only english in there - even
  if their l10n holds more translations
---
 lib/private/l10n.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 168011cfcec..ad02ba88526 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -503,8 +503,9 @@ class OC_L10N implements \OCP\IL10N {
 	 * @return array an array of available languages
 	 */
 	public static function findAvailableLanguages($app=null) {
-		if(!empty(self::$availableLanguages)) {
-			return self::$availableLanguages;
+		// also works with null as key
+		if(isset(self::$availableLanguages[$app]) && !empty(self::$availableLanguages[$app])) {
+			return self::$availableLanguages[$app];
 		}
 		$available=array('en');//english is always available
 		$dir = self::findI18nDir($app);
@@ -518,7 +519,7 @@ class OC_L10N implements \OCP\IL10N {
 			}
 		}
 
-		self::$availableLanguages = $available;
+		self::$availableLanguages[$app] = $available;
 		return $available;
 	}
 
-- 
GitLab


From 73819c4f0542bf3e4e270725ce091acf5702b52f Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 30 Sep 2015 17:29:54 +0200
Subject: [PATCH 607/783] Fix l10n on master

* $app isn't useful for this case
* kill it with :fire:
---
 lib/private/l10n.php | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 168011cfcec..79c44f7f3bd 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -102,16 +102,11 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @param $app
 	 * @return string
 	 */
-	public static function setLanguageFromRequest($app = null) {
+	public static function setLanguageFromRequest() {
 		if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-			if (is_array($app)) {
-				$available = $app;
-			} else {
-				$available = self::findAvailableLanguages($app);
-			}
+			$available = self::findAvailableLanguages();
 
 			// E.g. make sure that 'de' is before 'de_DE'.
 			sort($available);
@@ -122,17 +117,13 @@ class OC_L10N implements \OCP\IL10N {
 				$preferred_language = str_replace('-', '_', $preferred_language);
 				foreach ($available as $available_language) {
 					if ($preferred_language === strtolower($available_language)) {
-						if (!is_array($app)) {
-							self::$language = $available_language;
-						}
+						self::$language = $available_language;
 						return $available_language;
 					}
 				}
 				foreach ($available as $available_language) {
 					if (substr($preferred_language, 0, 2) === $available_language) {
-						if (!is_array($app)) {
-							self::$language = $available_language;
-						}
+						self::$language = $available_language;
 						return $available_language;
 					}
 				}
@@ -469,7 +460,7 @@ class OC_L10N implements \OCP\IL10N {
 			return $default_language;
 		}
 
-		$lang = self::setLanguageFromRequest($app);
+		$lang = self::setLanguageFromRequest();
 		if($userId && !$config->getUserValue($userId, 'core', 'lang')) {
 			$config->setUserValue($userId, 'core', 'lang', $lang);
 		}
-- 
GitLab


From 509096ca151850d5925c6de9747dbfbd22f929ba Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 30 Sep 2015 17:31:37 +0200
Subject: [PATCH 608/783] [IE8] Make checkbox on login page look less out of
 place

---
 core/css/styles.css | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index d952a33c24a..be53580283d 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -159,6 +159,9 @@ textarea:hover, textarea:focus, textarea:active {
 	opacity: 1;
 }
 
+.ie8 input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
+.ie8 input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }
+
 /* ie8 doesn't support :checked */
 html:not(.ie8) input[type="checkbox"].checkbox {
 	margin:0;
@@ -656,6 +659,14 @@ label.infield {
 	padding-left: 28px;
 	vertical-align: middle;
 }
+html.ie8 #body-login form input[type="checkbox"]+label {
+	margin-left: -28px;
+	margin-top: -3px;
+	vertical-align: auto;
+}
+html.ie8 #body-login form input[type="checkbox"] {
+	margin-top: 5px;
+}
 #body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
 #body-login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
 
@@ -851,7 +862,6 @@ label.infield {
 }
 #remember_login {
 	margin: 18px 5px 0 16px !important;
-	vertical-align: text-bottom;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
 	opacity: .7;
 }
-- 
GitLab


From 287fbdf77aa0ef3971abd524774733be8bd70aee Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 30 Sep 2015 17:38:35 +0200
Subject: [PATCH 609/783] [IE8] Fix file list checkboxes

---
 apps/files/css/files.css | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 1d4d0774482..b86aee89674 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -422,20 +422,37 @@ table td.filename .uploadtext {
 }
 
 /* File checkboxes */
-#fileList tr td.filename>.selectCheckBox + label:before {
+html:not(.ie8) #fileList tr td.filename>.selectCheckBox + label:before {
 	opacity: 0;
 	position: absolute;
 	bottom: 4px;
 	right: 0;
 	z-index: 10;
 }
+html.ie8 #fileList tr td.filename>.selectCheckBox {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+	filter: alpha(opacity=0);
+	opacity: 0;
+	float: left;
+	top: 0;
+	margin: 32px 0 4px 32px; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/
+}
 
 /* Show checkbox when hovering, checked, or selected */
-#fileList tr:hover td.filename>.selectCheckBox + label:before,
-#fileList tr:focus td.filename>.selectCheckBox + label:before,
-#fileList tr td.filename>.selectCheckBox:checked + label:before,
-#fileList tr.selected td.filename>.selectCheckBox + label:before {
+html.ie8 #fileList tr:hover td.filename>.selectCheckBox,
+html.ie8 #fileList tr:focus td.filename>.selectCheckBox,
+html.ie8 #fileList tr td.filename>.selectCheckBox:checked,
+html.ie8 #fileList tr.selected td.filename>.selectCheckBox,
+html:not(.ie8) #fileList tr:hover td.filename>.selectCheckBox + label:before,
+html:not(.ie8) #fileList tr:focus td.filename>.selectCheckBox + label:before,
+html:not(.ie8) #fileList tr td.filename>.selectCheckBox:checked + label:before,
+html:not(.ie8) #fileList tr.selected td.filename>.selectCheckBox + label:before {
 	opacity: 1;
+}
+html.ie8 #fileList tr:hover td.filename>.selectCheckBox,
+html.ie8 #fileList tr:focus td.filename>.selectCheckBox,
+html.ie8 #fileList tr td.filename>.selectCheckBox[checked=checked],
+html.ie8 #fileList tr.selected td.filename>.selectCheckBox {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	filter: alpha(opacity=100);
 }
@@ -458,6 +475,7 @@ table td.filename .uploadtext {
 .select-all + label {
 	top: 0;
 }
+.ie8 .select-all,
 .select-all + label:before {
 	position: absolute;
 	top: 18px;
-- 
GitLab


From 4e1923816cc244cf2cb3e2c6fab8a5a668ed2b80 Mon Sep 17 00:00:00 2001
From: Carla Schroder <carla@owncloud.com>
Date: Wed, 30 Sep 2015 08:50:32 -0700
Subject: [PATCH 610/783] Markup fixes to trash bin section

---
 config/config.sample.php | 53 +++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index e0c486d75c1..cf4b25b0674 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -417,19 +417,21 @@ $CONFIG = array(
  *
  * Available values:
  *
- * * ``auto``      default setting. keeps files and folders in the trash bin
- *                 for 30 days and automatically deletes anytime after that
- *                 if space is needed (note: files may not be deleted if space
- *                 is not needed).
- * * ``D, auto``   keeps files and folders in the trash bin for D+ days,
- *                 delete anytime if space needed (note: files may not be deleted
- *                 if space is not needed)
- * * ``auto, D``   delete all files in the trash bin that are older than D days
- *                 automatically, delete other files anytime if space needed
- * * ``D1, D2``    keep files and folders the in trash bin for at least D1 days
- *                 and delete when exceeds D2 days
- * * ``disabled``  trash bin auto clean disabled, files and folders will be
- *                 kept forever
+ * * ``auto``      
+ *     default setting. keeps files and folders in the trash bin for 30 days 
+ *     and automatically deletes anytime after that if space is needed (note: 
+ *     files may not be deleted if space is not needed).
+ * * ``D, auto``   
+ *     keeps files and folders in the trash bin for D+ days, delete anytime if 
+ *     space needed (note: files may not be deleted if space is not needed)
+ * * ``auto, D``   
+ *     delete all files in the trash bin that are older than D days   
+ *     automatically, delete other files anytime if space needed
+ * * ``D1, D2``    
+ *     keep files and folders the in trash bin for at least D1 days and 
+ *     delete when exceeds D2 days
+ * * ``disabled``  
+ *     trash bin auto clean disabled, files and folders will be kept forever
  */
 'trashbin_retention_obligation' => 'auto',
 
@@ -448,19 +450,24 @@ $CONFIG = array(
  * ownCloud 8.1 and before.
  *
  * Available values:
- *   ``auto``      default setting. Automatically expire versions according to
- *                 expire rules. Please refer to Files_versions online documentation 
- *                 for more info.
- *   ``D, auto``   keep versions at least for D days, apply expire rules to all
- *                 versions that are older than D days
- * * ``auto, D``   delete all versions that are older than D days automatically,
- *                 delete other versions according to expire rules
- * * ``D1, D2``    keep versions for at least D1 days and delete when exceeds D2 days
- *   ``disabled``  versions auto clean disabled, versions will be kept forever
+ *
+ * * ``auto``      
+ *     default setting. Automatically expire versions according to expire 
+ *     rules. Please refer to Files_versions online documentation for more 
+ *     info.
+ * * ``D, auto``   
+ *     keep versions at least for D days, apply expire rules to all versions 
+ *     that are older than D days
+ * * ``auto, D``   
+ *     delete all versions that are older than D days automatically, delete 
+ *     other versions according to expire rules
+ * * ``D1, D2``    
+ *     keep versions for at least D1 days and delete when exceeds D2 days
+ * * ``disabled``  
+ *     versions auto clean disabled, versions will be kept forever
  */
 'versions_retention_obligation' => 'auto',
 
-
 /**
  * ownCloud Verifications
  *
-- 
GitLab


From 1f385fba0485b9f615305caec1d95bb29be3fffd Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 30 Sep 2015 17:58:03 +0200
Subject: [PATCH 611/783] [settings] make it less static

---
 settings/admin.php    | 2 +-
 settings/personal.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index c8bf1d32749..31c9b8c1376 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -37,7 +37,7 @@ OC_Util::checkAdminUser();
 OC_App::setActiveNavigationEntry("admin");
 
 $template = new OC_Template('settings', 'admin', 'user');
-$l = OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
 
 $showLog = (\OC::$server->getConfig()->getSystemValue('log_type', 'owncloud') === 'owncloud');
 $numEntriesToLoad = 3;
diff --git a/settings/personal.php b/settings/personal.php
index 0cfdc9ed371..26e730d8089 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -148,7 +148,7 @@ sort($groups2);
 $tmpl->assign('groups', $groups2);
 
 // add hardcoded forms from the template
-$l = OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
 $formsAndMore = [];
 $formsAndMore[]= ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')];
 $formsAndMore[]= ['anchor' => 'passwordform', 'section-name' => $l->t('Personal info')];
-- 
GitLab


From 50874de1cae27907ec17f481dd5e1117cc3bdc78 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 1 Oct 2015 01:54:55 -0400
Subject: [PATCH 612/783] [tx-robot] updated from transifex

---
 apps/files/l10n/oc.js               |  1 +
 apps/files/l10n/oc.json             |  1 +
 apps/files_external/l10n/et_EE.js   | 10 ++++++++++
 apps/files_external/l10n/et_EE.json | 10 ++++++++++
 apps/files_sharing/l10n/oc.js       |  1 +
 apps/files_sharing/l10n/oc.json     |  1 +
 core/l10n/da.js                     |  2 ++
 core/l10n/da.json                   |  2 ++
 core/l10n/fi_FI.js                  |  2 ++
 core/l10n/fi_FI.json                |  2 ++
 core/l10n/it.js                     |  2 ++
 core/l10n/it.json                   |  2 ++
 core/l10n/nl.js                     |  2 ++
 core/l10n/nl.json                   |  2 ++
 settings/l10n/oc.js                 |  5 +++++
 settings/l10n/oc.json               |  5 +++++
 16 files changed, 50 insertions(+)

diff --git a/apps/files/l10n/oc.js b/apps/files/l10n/oc.js
index bd44479b285..6e82e5c5dff 100644
--- a/apps/files/l10n/oc.js
+++ b/apps/files/l10n/oc.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Favorite" : "Favorit",
     "Upload" : "Cargament",
     "Text file" : "Fichièr tèxte",
+    "New text file.txt" : "Novèl fichièr tèxte .txt",
     "Folder" : "Dorsièr",
     "New folder" : "Novèl dorsièr",
     "An error occurred while trying to update the tags" : "Una error s'es produsida al moment de la mesa a jorn de las etiquetas",
diff --git a/apps/files/l10n/oc.json b/apps/files/l10n/oc.json
index 89843ea85c2..b75d26a5ad3 100644
--- a/apps/files/l10n/oc.json
+++ b/apps/files/l10n/oc.json
@@ -69,6 +69,7 @@
     "Favorite" : "Favorit",
     "Upload" : "Cargament",
     "Text file" : "Fichièr tèxte",
+    "New text file.txt" : "Novèl fichièr tèxte .txt",
     "Folder" : "Dorsièr",
     "New folder" : "Novèl dorsièr",
     "An error occurred while trying to update the tags" : "Una error s'es produsida al moment de la mesa a jorn de las etiquetas",
diff --git a/apps/files_external/l10n/et_EE.js b/apps/files_external/l10n/et_EE.js
index ecb40dbc003..69ddf1a9ab2 100644
--- a/apps/files_external/l10n/et_EE.js
+++ b/apps/files_external/l10n/et_EE.js
@@ -22,11 +22,14 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
     "(group)" : "(grupp)",
     "Saved" : "Salvestatud",
+    "Builtin" : "Sisseehitatud",
     "None" : "Pole",
+    "OAuth1" : "OAuth1",
     "App key" : "Rakenduse võti",
     "App secret" : "Rakenduse salasõna",
     "Client ID" : "Kliendi ID",
     "Client secret" : "Kliendi salasõna",
+    "OpenStack" : "OpenStack",
     "Username" : "Kasutajanimi",
     "Password" : "Parool",
     "API key" : "API võti",
@@ -43,17 +46,23 @@ OC.L10N.register(
     "Remote subfolder" : "Mujahl olev alamkaust",
     "Secure https://" : "Turvaline https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "Host",
     "Secure ftps://" : "Turvaline ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Kohalik",
     "Location" : "Asukoht",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Juur",
     "SFTP with secret key login" : "SFTP koos salajase võtmega logimisega",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Jaga",
+    "Domain" : "Domeen",
     "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
     "Username as share" : "Kasutajanimi kui jagamine",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Teenuse nimi",
     "<b>Note:</b> " : "<b>Märkus:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
@@ -65,6 +74,7 @@ OC.L10N.register(
     "Scope" : "Skoop",
     "External Storage" : "Väline salvestuskoht",
     "Folder name" : "Kausta nimi",
+    "Authentication" : "Autentimine",
     "Configuration" : "Seadistamine",
     "Available for" : "Saadaval",
     "Advanced settings" : "Lisavalikud",
diff --git a/apps/files_external/l10n/et_EE.json b/apps/files_external/l10n/et_EE.json
index 3ab8610f6cc..3538ef2e7ad 100644
--- a/apps/files_external/l10n/et_EE.json
+++ b/apps/files_external/l10n/et_EE.json
@@ -20,11 +20,14 @@
     "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
     "(group)" : "(grupp)",
     "Saved" : "Salvestatud",
+    "Builtin" : "Sisseehitatud",
     "None" : "Pole",
+    "OAuth1" : "OAuth1",
     "App key" : "Rakenduse võti",
     "App secret" : "Rakenduse salasõna",
     "Client ID" : "Kliendi ID",
     "Client secret" : "Kliendi salasõna",
+    "OpenStack" : "OpenStack",
     "Username" : "Kasutajanimi",
     "Password" : "Parool",
     "API key" : "API võti",
@@ -41,17 +44,23 @@
     "Remote subfolder" : "Mujahl olev alamkaust",
     "Secure https://" : "Turvaline https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "Host",
     "Secure ftps://" : "Turvaline ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Kohalik",
     "Location" : "Asukoht",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Juur",
     "SFTP with secret key login" : "SFTP koos salajase võtmega logimisega",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Jaga",
+    "Domain" : "Domeen",
     "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
     "Username as share" : "Kasutajanimi kui jagamine",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Teenuse nimi",
     "<b>Note:</b> " : "<b>Märkus:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
@@ -63,6 +72,7 @@
     "Scope" : "Skoop",
     "External Storage" : "Väline salvestuskoht",
     "Folder name" : "Kausta nimi",
+    "Authentication" : "Autentimine",
     "Configuration" : "Seadistamine",
     "Available for" : "Saadaval",
     "Advanced settings" : "Lisavalikud",
diff --git a/apps/files_sharing/l10n/oc.js b/apps/files_sharing/l10n/oc.js
index b554192fafc..54924e11121 100644
--- a/apps/files_sharing/l10n/oc.js
+++ b/apps/files_sharing/l10n/oc.js
@@ -40,6 +40,7 @@ OC.L10N.register(
     "You shared %1$s with group %2$s" : "Avètz partejat %1$s amb lo grop %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s partejat %1$s amb %3$s",
     "%2$s shared %1$s with group %3$s" : "%2$s partejat %1$s amb lo grop %3$s",
+    "%2$s shared %1$s via link" : "%2$s a partejat %1$s per ligam public",
     "%2$s shared %1$s with you" : "%2$s a partejat %1$s amb vos",
     "You shared %1$s via link" : "Avètz partejat %1$s per ligam public",
     "Shares" : "Partiments",
diff --git a/apps/files_sharing/l10n/oc.json b/apps/files_sharing/l10n/oc.json
index 326d804a055..2194f0aa1d2 100644
--- a/apps/files_sharing/l10n/oc.json
+++ b/apps/files_sharing/l10n/oc.json
@@ -38,6 +38,7 @@
     "You shared %1$s with group %2$s" : "Avètz partejat %1$s amb lo grop %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s partejat %1$s amb %3$s",
     "%2$s shared %1$s with group %3$s" : "%2$s partejat %1$s amb lo grop %3$s",
+    "%2$s shared %1$s via link" : "%2$s a partejat %1$s per ligam public",
     "%2$s shared %1$s with you" : "%2$s a partejat %1$s amb vos",
     "You shared %1$s via link" : "Avètz partejat %1$s per ligam public",
     "Shares" : "Partiments",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index 4e689973872..f7dcb9c6836 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Opdaterede \"%s\" til %s",
     "Repair warning: " : "Reparationsadvarsel:",
     "Repair error: " : "Reparationsfejl:",
+    "Set log level to debug - current level: \"%s\"" : "Sæt log niveau til fejlfinding - nuværende niveau: \"%s\"",
+    "Reset log level to  \"%s\"" : "Nulstil log niveau til \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Følgende inkompatible apps er blevet deaktiveret: %s",
     "Following apps have been disabled: %s" : "Følgende apps er blevet deaktiveret: %s",
     "Already up to date" : "Allerede opdateret",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 639f387af15..f8cfe728226 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -10,6 +10,8 @@
     "Updated \"%s\" to %s" : "Opdaterede \"%s\" til %s",
     "Repair warning: " : "Reparationsadvarsel:",
     "Repair error: " : "Reparationsfejl:",
+    "Set log level to debug - current level: \"%s\"" : "Sæt log niveau til fejlfinding - nuværende niveau: \"%s\"",
+    "Reset log level to  \"%s\"" : "Nulstil log niveau til \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Følgende inkompatible apps er blevet deaktiveret: %s",
     "Following apps have been disabled: %s" : "Følgende apps er blevet deaktiveret: %s",
     "Already up to date" : "Allerede opdateret",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index a2ea55857c7..311b1b3555a 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Päivitetty \"%s\" versioon %s",
     "Repair warning: " : "Korjausvaroitus:",
     "Repair error: " : "Korjausvirhe:",
+    "Set log level to debug - current level: \"%s\"" : "Aseta lokitasoksi vianjäljitys - nykyinen taso: \"%s\"",
+    "Reset log level to  \"%s\"" : "Palauta lokitasoksi  \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Seuraavat yhteensopimattomat sovellukset on poistettu käytöstä: %s",
     "Following apps have been disabled: %s" : "Seuraavat sovellukset on poistettu käytöstä: %s",
     "Already up to date" : "Kaikki on jo ajan tasalla",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 4d74b0dd393..1ded17dc019 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -10,6 +10,8 @@
     "Updated \"%s\" to %s" : "Päivitetty \"%s\" versioon %s",
     "Repair warning: " : "Korjausvaroitus:",
     "Repair error: " : "Korjausvirhe:",
+    "Set log level to debug - current level: \"%s\"" : "Aseta lokitasoksi vianjäljitys - nykyinen taso: \"%s\"",
+    "Reset log level to  \"%s\"" : "Palauta lokitasoksi  \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Seuraavat yhteensopimattomat sovellukset on poistettu käytöstä: %s",
     "Following apps have been disabled: %s" : "Seuraavat sovellukset on poistettu käytöstä: %s",
     "Already up to date" : "Kaikki on jo ajan tasalla",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index b031dfe9ab5..d10b8711976 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Aggiornato \"%s\" a %s",
     "Repair warning: " : "Avviso di riparazione",
     "Repair error: " : "Errore di riparazione:",
+    "Set log level to debug - current level: \"%s\"" : "Imposta il livello del log a debug - livello attuale: \"%s\"",
+    "Reset log level to  \"%s\"" : "Ripristina il livello del log a \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Le seguenti applicazioni incompatibili sono state disabilitate: %s",
     "Following apps have been disabled: %s" : "Le seguenti applicazioni sono state disabilitate: %s",
     "Already up to date" : "Già aggiornato",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 380c31b8ecb..9a49de0d76b 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -10,6 +10,8 @@
     "Updated \"%s\" to %s" : "Aggiornato \"%s\" a %s",
     "Repair warning: " : "Avviso di riparazione",
     "Repair error: " : "Errore di riparazione:",
+    "Set log level to debug - current level: \"%s\"" : "Imposta il livello del log a debug - livello attuale: \"%s\"",
+    "Reset log level to  \"%s\"" : "Ripristina il livello del log a \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Le seguenti applicazioni incompatibili sono state disabilitate: %s",
     "Following apps have been disabled: %s" : "Le seguenti applicazioni sono state disabilitate: %s",
     "Already up to date" : "Già aggiornato",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index a18d79596b5..068dd12ff98 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Bijgewerkt \"%s\" naar %s",
     "Repair warning: " : "Reparatiewaarschuwing:",
     "Repair error: " : "Reparatiefout:",
+    "Set log level to debug - current level: \"%s\"" : "Instellen logniveau op debug - huidige niveau: \"%s\"",
+    "Reset log level to  \"%s\"" : "Terugzetten logniveau op \"#%s\"",
     "Following incompatible apps have been disabled: %s" : "De volgende incompatibele apps zijn uitgeschakeld: %s",
     "Following apps have been disabled: %s" : "De volgende apps zijn gedeactiveerd: %s",
     "Already up to date" : "Al bijgewerkt",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index fc221886e41..a2c18a59ed1 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -10,6 +10,8 @@
     "Updated \"%s\" to %s" : "Bijgewerkt \"%s\" naar %s",
     "Repair warning: " : "Reparatiewaarschuwing:",
     "Repair error: " : "Reparatiefout:",
+    "Set log level to debug - current level: \"%s\"" : "Instellen logniveau op debug - huidige niveau: \"%s\"",
+    "Reset log level to  \"%s\"" : "Terugzetten logniveau op \"#%s\"",
     "Following incompatible apps have been disabled: %s" : "De volgende incompatibele apps zijn uitgeschakeld: %s",
     "Following apps have been disabled: %s" : "De volgende apps zijn gedeactiveerd: %s",
     "Already up to date" : "Al bijgewerkt",
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
index 3fce61d224b..ac741571911 100644
--- a/settings/l10n/oc.js
+++ b/settings/l10n/oc.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "APCu" : "APCu",
     "Security & setup warnings" : "Avertiments de seguretat & configuracion",
     "Sharing" : "Partiment",
     "Server-side encryption" : "Chiframent costat servidor",
@@ -54,6 +55,9 @@ OC.L10N.register(
     "Migration in progress. Please wait until the migration is finished" : "Migracion en cors. Esperatz qu'aquela s'acabe",
     "Migration started …" : "Migracion aviada...",
     "Sending..." : "Mandadís en cors...",
+    "Official" : "Oficial",
+    "Approved" : "Aprovat",
+    "Experimental" : "Experimental",
     "All" : "Totes",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat ownCloud. Ofrisson sas foncionalitats principalas a ownCloud e son prèstas per una utilizacion en produccion. ",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicacions aprovadas son creadas per de desvolopaires de fisança e an passat los tèst de seguretat. Son activament mantengudas dins un depaus dobèrt e lors desvolopaires pensan que son establas per una utilizacion normala.",
@@ -69,6 +73,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Desinstallacion...",
     "Error while uninstalling app" : "Error al moment de la desinstallacion de l'aplicacion",
     "Uninstall" : "Desinstallar",
+    "An error occurred: {message}" : "Una error s'es produsida : {message}",
     "Select a profile picture" : "Seleccionar una fòto de perfil ",
     "Very weak password" : "Senhal de fòrt febla seguretat",
     "Weak password" : "Senhal de febla seguretat",
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
index b1df1e9bd24..11a67d294e7 100644
--- a/settings/l10n/oc.json
+++ b/settings/l10n/oc.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "APCu" : "APCu",
     "Security & setup warnings" : "Avertiments de seguretat & configuracion",
     "Sharing" : "Partiment",
     "Server-side encryption" : "Chiframent costat servidor",
@@ -52,6 +53,9 @@
     "Migration in progress. Please wait until the migration is finished" : "Migracion en cors. Esperatz qu'aquela s'acabe",
     "Migration started …" : "Migracion aviada...",
     "Sending..." : "Mandadís en cors...",
+    "Official" : "Oficial",
+    "Approved" : "Aprovat",
+    "Experimental" : "Experimental",
     "All" : "Totes",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "Las aplicacions oficialas son desvolopadas per e amb la comunautat ownCloud. Ofrisson sas foncionalitats principalas a ownCloud e son prèstas per una utilizacion en produccion. ",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "Las aplicacions aprovadas son creadas per de desvolopaires de fisança e an passat los tèst de seguretat. Son activament mantengudas dins un depaus dobèrt e lors desvolopaires pensan que son establas per una utilizacion normala.",
@@ -67,6 +71,7 @@
     "Uninstalling ...." : "Desinstallacion...",
     "Error while uninstalling app" : "Error al moment de la desinstallacion de l'aplicacion",
     "Uninstall" : "Desinstallar",
+    "An error occurred: {message}" : "Una error s'es produsida : {message}",
     "Select a profile picture" : "Seleccionar una fòto de perfil ",
     "Very weak password" : "Senhal de fòrt febla seguretat",
     "Weak password" : "Senhal de febla seguretat",
-- 
GitLab


From 6e104bc933036b77b2967334a99922eb26c40dbc Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 17 Sep 2015 16:01:11 +0200
Subject: [PATCH 613/783] Repair step to remove bogus expiration dates from
 non-link shares

---
 lib/private/repair.php                   |   2 +
 lib/repair/repairinvalidshares.php       |  79 ++++++++++++++++
 tests/lib/repair/repairinvalidshares.php | 111 +++++++++++++++++++++++
 3 files changed, 192 insertions(+)
 create mode 100644 lib/repair/repairinvalidshares.php
 create mode 100644 tests/lib/repair/repairinvalidshares.php

diff --git a/lib/private/repair.php b/lib/private/repair.php
index 3639440a518..20219e313fd 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -44,6 +44,7 @@ use OC\Repair\RepairLegacyStorages;
 use OC\Repair\RepairMimeTypes;
 use OC\Repair\SearchLuceneTables;
 use OC\Repair\UpdateOutdatedOcsIds;
+use OC\Repair\RepairInvalidShares;
 
 class Repair extends BasicEmitter {
 	/**
@@ -113,6 +114,7 @@ class Repair extends BasicEmitter {
 			new DropOldJobs(\OC::$server->getJobList()),
 			new RemoveGetETagEntries(\OC::$server->getDatabaseConnection()),
 			new UpdateOutdatedOcsIds(\OC::$server->getConfig()),
+			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
 		];
 	}
 
diff --git a/lib/repair/repairinvalidshares.php b/lib/repair/repairinvalidshares.php
new file mode 100644
index 00000000000..f754c17939a
--- /dev/null
+++ b/lib/repair/repairinvalidshares.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Repair;
+
+use OC\Hooks\BasicEmitter;
+
+/**
+ * Repairs shares with invalid data
+ */
+class RepairInvalidShares extends BasicEmitter implements \OC\RepairStep {
+
+	/**
+	 * @var \OCP\IConfig
+	 */
+	protected $config;
+
+	/**
+	 * @var \OCP\IDBConnection
+	 */
+	protected $connection;
+
+	/**
+	 * @param \OCP\IConfig $config
+	 * @param \OCP\IDBConnection $connection
+	 */
+	public function __construct($config, $connection) {
+		$this->connection = $connection;
+		$this->config = $config;
+	}
+
+	public function getName() {
+		return 'Repair invalid shares';
+	}
+
+	/**
+	 * Past bugs would make it possible to set an expiration date on user shares even
+	 * though it is not supported. This functions removes the expiration date from such entries.
+	 */
+	private function removeExpirationDateFromNonLinkShares() {
+		$builder = $this->connection->getQueryBuilder();
+		$builder
+			->update('share')
+			->set('expiration', 'null')
+			->where($builder->expr()->isNotNull('expiration'))
+			->andWhere($builder->expr()->neq('share_type', $builder->expr()->literal(\OC\Share\Constants::SHARE_TYPE_LINK)));
+
+		$updatedEntries = $builder->execute();
+		if ($updatedEntries > 0) {
+			$this->emit('\OC\Repair', 'info', array('Removed invalid expiration date from ' . $updatedEntries . ' shares'));
+		}
+	}
+
+	public function run() {
+		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+		if (version_compare($ocVersionFromBeforeUpdate, '8.2.0', '<')) {
+			// this situation was only possible before 8.2
+			$this->removeExpirationDateFromNonLinkShares();
+		}
+	}
+}
diff --git a/tests/lib/repair/repairinvalidshares.php b/tests/lib/repair/repairinvalidshares.php
new file mode 100644
index 00000000000..f5b522f6b4f
--- /dev/null
+++ b/tests/lib/repair/repairinvalidshares.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright (c) 2015 Vincent Petry <pvince81@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace Test\Repair;
+
+/**
+ * Tests for repairing invalid shares
+ *
+ * @see \OC\Repair\RepairInvalidShares
+ */
+class RepairInvalidShares extends \Test\TestCase {
+
+	/** @var \OC\RepairStep */
+	private $repair;
+
+	/** @var \OCP\IDBConnection */
+	private $connection;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$config->expects($this->any())
+			->method('getSystemValue')
+			->with('version')
+			->will($this->returnValue('8.0.0.0'));
+
+		$this->connection = \OC::$server->getDatabaseConnection();
+
+		$this->repair = new \OC\Repair\RepairInvalidShares($config, $this->connection);
+	}
+
+	protected function tearDown() {
+		$qb = $this->connection->getQueryBuilder();
+		$qb->delete('share')->execute();
+
+		parent::tearDown();
+	}
+
+	/**
+	 * Test remove expiration date for non-link shares
+	 */
+	public function testRemoveExpirationDateForNonLinkShares() {
+		// user share with bogus expiration date
+		$qb = $this->connection->getQueryBuilder();
+		$qb->insert('share')
+			->values([
+				'share_type' => $qb->expr()->literal(\OC\Share\Constants::SHARE_TYPE_USER),
+				'share_with' => $qb->expr()->literal('recipientuser1'),
+				'uid_owner' => $qb->expr()->literal('user1'),
+				'item_type' => $qb->expr()->literal('folder'),
+				'item_source' => $qb->expr()->literal(123),
+				'item_target' => $qb->expr()->literal('/123'),
+				'file_source' => $qb->expr()->literal(123),
+				'file_target' => $qb->expr()->literal('/test'),
+				'permissions' => $qb->expr()->literal(1),
+				'stime' => $qb->expr()->literal(time()),
+				'expiration' => $qb->expr()->literal('2015-09-25 00:00:00')
+			])
+			->execute();
+
+		// select because lastInsertId does not work with OCI
+		$results = $this->connection->getQueryBuilder()
+			->select('id')
+			->from('share')
+			->execute()
+			->fetchAll();
+		$bogusShareId = $results[0]['id'];
+
+		// link share with expiration date
+		$qb = $this->connection->getQueryBuilder();
+		$qb->insert('share')
+			->values([
+				'share_type' => $qb->expr()->literal(\OC\Share\Constants::SHARE_TYPE_LINK),
+				'uid_owner' => $qb->expr()->literal('user1'),
+				'item_type' => $qb->expr()->literal('folder'),
+				'item_source' => $qb->expr()->literal(123),
+				'item_target' => $qb->expr()->literal('/123'),
+				'file_source' => $qb->expr()->literal(123),
+				'file_target' => $qb->expr()->literal('/test'),
+				'permissions' => $qb->expr()->literal(1),
+				'stime' => $qb->expr()->literal(time()),
+				'expiration' => $qb->expr()->literal('2015-09-25 00:00:00'),
+				'token' => $qb->expr()->literal('abcdefg')
+			])->execute();
+
+		$this->repair->run();
+
+		$results = $this->connection->getQueryBuilder()
+			->select('*')
+			->from('share')
+			->orderBy('share_type', 'ASC')
+			->execute()
+			->fetchAll();
+
+		$this->assertCount(2, $results);
+
+		$userShare = $results[0];
+		$linkShare = $results[1];
+		$this->assertEquals($bogusShareId, $userShare['id'], 'sanity check');
+		$this->assertNull($userShare['expiration'], 'bogus expiration date was removed');
+		$this->assertNotNull($linkShare['expiration'], 'valid link share expiration date still there');
+	}
+}
+
-- 
GitLab


From cc0812332c2641e15fadbaf3241b9a9f61272a27 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 29 Sep 2015 10:27:01 +0200
Subject: [PATCH 614/783] add more precise version to also repair git master
 instances

---
 lib/repair/repairinvalidshares.php | 2 +-
 version.php                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/repair/repairinvalidshares.php b/lib/repair/repairinvalidshares.php
index f754c17939a..21b4d8013e7 100644
--- a/lib/repair/repairinvalidshares.php
+++ b/lib/repair/repairinvalidshares.php
@@ -71,7 +71,7 @@ class RepairInvalidShares extends BasicEmitter implements \OC\RepairStep {
 
 	public function run() {
 		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-		if (version_compare($ocVersionFromBeforeUpdate, '8.2.0', '<')) {
+		if (version_compare($ocVersionFromBeforeUpdate, '8.2.0.7', '<')) {
 			// this situation was only possible before 8.2
 			$this->removeExpirationDateFromNonLinkShares();
 		}
diff --git a/version.php b/version.php
index 711d82f1ca1..925e897d1ab 100644
--- a/version.php
+++ b/version.php
@@ -23,7 +23,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(8, 2, 0, 6);
+$OC_Version = array(8, 2, 0, 7);
 
 // The human readable string
 $OC_VersionString = '8.2 beta1';
-- 
GitLab


From 8f2600a0ea602ad5af76d5a7f5fe454c3812e336 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 1 Oct 2015 08:32:24 +0200
Subject: [PATCH 615/783] Also delete all shares before the test, so the count
 matches

---
 ...shares.php => repairinvalidsharestest.php} | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)
 rename tests/lib/repair/{repairinvalidshares.php => repairinvalidsharestest.php} (86%)

diff --git a/tests/lib/repair/repairinvalidshares.php b/tests/lib/repair/repairinvalidsharestest.php
similarity index 86%
rename from tests/lib/repair/repairinvalidshares.php
rename to tests/lib/repair/repairinvalidsharestest.php
index f5b522f6b4f..89a5ba470e1 100644
--- a/tests/lib/repair/repairinvalidshares.php
+++ b/tests/lib/repair/repairinvalidsharestest.php
@@ -5,14 +5,20 @@
  * later.
  * See the COPYING-README file.
  */
+
 namespace Test\Repair;
 
+
+use OC\Repair\RepairInvalidShares;
+use OC\Share\Constants;
+use Test\TestCase;
+
 /**
  * Tests for repairing invalid shares
  *
  * @see \OC\Repair\RepairInvalidShares
  */
-class RepairInvalidShares extends \Test\TestCase {
+class RepairInvalidSharesTest extends TestCase {
 
 	/** @var \OC\RepairStep */
 	private $repair;
@@ -32,17 +38,23 @@ class RepairInvalidShares extends \Test\TestCase {
 			->will($this->returnValue('8.0.0.0'));
 
 		$this->connection = \OC::$server->getDatabaseConnection();
+		$this->deleteAllShares();
 
-		$this->repair = new \OC\Repair\RepairInvalidShares($config, $this->connection);
+		/** @var \OCP\IConfig $config */
+		$this->repair = new RepairInvalidShares($config, $this->connection);
 	}
 
 	protected function tearDown() {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('share')->execute();
+		$this->deleteAllShares();
 
 		parent::tearDown();
 	}
 
+	protected function deleteAllShares() {
+		$qb = $this->connection->getQueryBuilder();
+		$qb->delete('share')->execute();
+	}
+
 	/**
 	 * Test remove expiration date for non-link shares
 	 */
@@ -51,7 +63,7 @@ class RepairInvalidShares extends \Test\TestCase {
 		$qb = $this->connection->getQueryBuilder();
 		$qb->insert('share')
 			->values([
-				'share_type' => $qb->expr()->literal(\OC\Share\Constants::SHARE_TYPE_USER),
+				'share_type' => $qb->expr()->literal(Constants::SHARE_TYPE_USER),
 				'share_with' => $qb->expr()->literal('recipientuser1'),
 				'uid_owner' => $qb->expr()->literal('user1'),
 				'item_type' => $qb->expr()->literal('folder'),
@@ -77,7 +89,7 @@ class RepairInvalidShares extends \Test\TestCase {
 		$qb = $this->connection->getQueryBuilder();
 		$qb->insert('share')
 			->values([
-				'share_type' => $qb->expr()->literal(\OC\Share\Constants::SHARE_TYPE_LINK),
+				'share_type' => $qb->expr()->literal(Constants::SHARE_TYPE_LINK),
 				'uid_owner' => $qb->expr()->literal('user1'),
 				'item_type' => $qb->expr()->literal('folder'),
 				'item_source' => $qb->expr()->literal(123),
-- 
GitLab


From e7232a848bd0c0846ea020f7b07f2cfe1298b1fb Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 29 Sep 2015 13:17:39 +0200
Subject: [PATCH 616/783] versions should always use the keys of the original
 file, no need to create new one

---
 .../files/storage/wrapper/encryption.php      | 26 +++++++++++++++++--
 .../lib/files/storage/wrapper/encryption.php  | 23 ++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 805a2bc1ad0..c80e935b982 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -232,7 +232,11 @@ class Encryption extends Wrapper {
 
 		$result = $this->storage->rename($path1, $path2);
 
-		if ($result && $this->encryptionManager->isEnabled()) {
+		if ($result &&
+			// versions always use the keys from the original file, so we can skip
+			// this step for versions
+			$this->isVersion($path2) === false &&
+			$this->encryptionManager->isEnabled()) {
 			$source = $this->getFullPath($path1);
 			if (!$this->util->isExcluded($source)) {
 				$target = $this->getFullPath($path2);
@@ -449,7 +453,7 @@ class Encryption extends Wrapper {
 	public function copyFromStorage(Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
 
 		// TODO clean this up once the underlying moveFromStorage in OC\Files\Storage\Wrapper\Common is fixed:
-		// - call $this->storage->moveFromStorage() instead of $this->copyBetweenStorage
+		// - call $this->storage->copyFromStorage() instead of $this->copyBetweenStorage
 		// - copy the file cache update from  $this->copyBetweenStorage to this method
 		// - copy the copyKeys() call from  $this->copyBetweenStorage to this method
 		// - remove $this->copyBetweenStorage
@@ -469,6 +473,13 @@ class Encryption extends Wrapper {
 	 */
 	private function copyBetweenStorage(Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime, $isRename) {
 
+		// for versions we have nothing to do, because versions should always use the
+		// key from the original file. Just create a 1:1 copy and done
+		if ($this->isVersion($targetInternalPath) ||
+			$this->isVersion($sourceInternalPath)) {
+			return $this->storage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+		}
+
 		// first copy the keys that we reuse the existing file key on the target location
 		// and don't create a new one which would break versions for example.
 		$mount = $this->mountManager->findByStorageId($sourceStorage->getId());
@@ -741,4 +752,15 @@ class Encryption extends Wrapper {
 		return false;
 	}
 
+	/**
+	 * check if path points to a files version
+	 *
+	 * @param $path
+	 * @return bool
+	 */
+	protected function isVersion($path) {
+		$normalized = Filesystem::normalizePath($path);
+		return substr($normalized, 0, strlen('/files_versions/')) === '/files_versions/';
+	}
+
 }
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index 44e910b901f..095405462df 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -558,4 +558,27 @@ class Encryption extends \Test\Files\Storage\Storage {
 
 		$this->assertFalse(false);
 	}
+
+	/**
+	 * @dataProvider dataTestIsVersion
+	 * @param string $path
+	 * @param bool $expected
+	 */
+	public function testIsVersion($path, $expected) {
+		$this->assertSame($expected,
+			$this->invokePrivate($this->instance, 'isVersion', [$path])
+		);
+	}
+
+	public function dataTestIsVersion() {
+		return [
+			['files_versions/foo', true],
+			['/files_versions/foo', true],
+			['//files_versions/foo', true],
+			['files/versions/foo', false],
+			['files/files_versions/foo', false],
+			['files_versions_test/foo', false],
+		];
+	}
+
 }
-- 
GitLab


From 8a34c29b2c7f8d81aa0a3055d20dc2c7af24a34f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 1 Oct 2015 11:50:34 +0200
Subject: [PATCH 617/783] [IE8] Fix dangling Delete action when multiselect is
 enabled

For some reason we need to cancel out the table's top: 95px, but just
for the delete action and not the other ones... whatever, IE8...
---
 apps/files/css/files.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 1d4d0774482..9c36cdd4bd4 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -563,6 +563,10 @@ a.action > img {
 	margin-bottom: -1px;
 }
 
+html.ie8 .column-mtime .selectedActions {
+	top: -95px;
+}
+
 #fileList a.action {
 	display: inline;
 	padding: 17px 8px;
-- 
GitLab


From f4d180ee5c6be5b3d061a035299079fc675b945f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 17 Jul 2015 13:18:01 +0200
Subject: [PATCH 618/783] allow passing the fileinfo to the preview manager

---
 core/ajax/preview.php   | 2 +-
 lib/private/preview.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index c8bc05453ed..b6362fb3a70 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -53,7 +53,7 @@ if (!$info instanceof OCP\Files\FileInfo || !$always && !\OC::$server->getPrevie
 	\OC_Response::setStatus(404);
 } else {
 	$preview = new \OC\Preview(\OC_User::getUser(), 'files');
-	$preview->setFile($file);
+	$preview->setFile($file, $info);
 	$preview->setMaxX($maxX);
 	$preview->setMaxY($maxY);
 	$preview->setScalingUp($scalingUp);
diff --git a/lib/private/preview.php b/lib/private/preview.php
index 1127048b7fd..996bf81703b 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -252,12 +252,13 @@ class Preview {
 	 * Sets the path of the file you want a preview of
 	 *
 	 * @param string $file
+	 * @param \OCP\Files\FileInfo|null $info
 	 *
 	 * @return \OC\Preview
 	 */
-	public function setFile($file) {
+	public function setFile($file, $info = null) {
 		$this->file = $file;
-		$this->info = null;
+		$this->info = $info;
 
 		if ($file !== '') {
 			$this->getFileInfo();
-- 
GitLab


From 52d4495793377c8eb2c2cdabf8ec8b8cce2dd9d1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 17 Jul 2015 13:18:19 +0200
Subject: [PATCH 619/783] use the fileinfo to check if we have a valid file

---
 lib/private/preview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index 996bf81703b..e445f5356a4 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -375,7 +375,7 @@ class Preview {
 			return false;
 		}
 
-		if (!$this->fileView->file_exists($file)) {
+		if (!$this->getFileInfo() instanceof FileInfo) {
 			\OCP\Util::writeLog('core', 'File:"' . $file . '" not found', \OCP\Util::DEBUG);
 
 			return false;
-- 
GitLab


From 9925ff33f10bbece12816c0638756eb0e6ddbe92 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 17 Jul 2015 13:25:09 +0200
Subject: [PATCH 620/783] use cache data we already have to check if a
 thumbnail of specific size is cached

---
 lib/private/preview.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index e445f5356a4..dabb274323f 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -479,7 +479,7 @@ class Preview {
 			$preview = $this->buildCachePath($fileId, $previewWidth, $previewHeight);
 
 			// This checks if we have a preview of those exact dimensions in the cache
-			if ($this->userView->file_exists($preview)) {
+			if ($this->thumbnailSizeExists($allThumbnails, $previewWidth, $previewHeight)) {
 				return $preview;
 			}
 
@@ -524,6 +524,29 @@ class Preview {
 		return [$maxPreviewX, $maxPreviewY];
 	}
 
+	/**
+	 * Check if a specific thumbnail size is cached
+	 *
+	 * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
+	 * @param int $width
+	 * @param int $height
+	 * @return bool
+	 */
+	private function thumbnailSizeExists($allThumbnails, $width, $height) {
+
+		foreach ($allThumbnails as $thumbnail) {
+			$name = $thumbnail['name'];
+			if (strpos($name, 'max')) {
+				list($cachedWidth, $cachedHeight) = $this->getDimensionsFromFilename($name);
+				if ($cachedWidth === $width && $cachedHeight === $height) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Determines the size of the preview we should be looking for in the cache
 	 *
-- 
GitLab


From 884e2fcd6ecd9a402619fced47b8b5c9a63a85dd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 17 Jul 2015 14:41:16 +0200
Subject: [PATCH 621/783] to much copy paste

---
 lib/private/preview.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index dabb274323f..41fc29e045f 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -536,11 +536,9 @@ class Preview {
 
 		foreach ($allThumbnails as $thumbnail) {
 			$name = $thumbnail['name'];
-			if (strpos($name, 'max')) {
-				list($cachedWidth, $cachedHeight) = $this->getDimensionsFromFilename($name);
-				if ($cachedWidth === $width && $cachedHeight === $height) {
-					return true;
-				}
+			list($cachedWidth, $cachedHeight) = $this->getDimensionsFromFilename($name);
+			if ($cachedWidth === $width && $cachedHeight === $height) {
+				return true;
 			}
 		}
 
-- 
GitLab


From dc49e767472ef67bcfd6318133537bef03ce7a7c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 17 Jul 2015 14:44:24 +0200
Subject: [PATCH 622/783] stricter check if thumbnail is cached

---
 lib/private/preview.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index 41fc29e045f..24a9082b176 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -479,7 +479,7 @@ class Preview {
 			$preview = $this->buildCachePath($fileId, $previewWidth, $previewHeight);
 
 			// This checks if we have a preview of those exact dimensions in the cache
-			if ($this->thumbnailSizeExists($allThumbnails, $previewWidth, $previewHeight)) {
+			if ($this->thumbnailSizeExists($allThumbnails, basename($preview))) {
 				return $preview;
 			}
 
@@ -528,16 +528,13 @@ class Preview {
 	 * Check if a specific thumbnail size is cached
 	 *
 	 * @param FileInfo[] $allThumbnails the list of all our cached thumbnails
-	 * @param int $width
-	 * @param int $height
+	 * @param string $name
 	 * @return bool
 	 */
-	private function thumbnailSizeExists($allThumbnails, $width, $height) {
+	private function thumbnailSizeExists($allThumbnails, $name) {
 
 		foreach ($allThumbnails as $thumbnail) {
-			$name = $thumbnail['name'];
-			list($cachedWidth, $cachedHeight) = $this->getDimensionsFromFilename($name);
-			if ($cachedWidth === $width && $cachedHeight === $height) {
+			if ($name === $thumbnail->getName()) {
 				return true;
 			}
 		}
-- 
GitLab


From 1c3e28a73b602423dfc4ba447b26dcd3b8b45fac Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 29 Sep 2015 14:40:14 +0200
Subject: [PATCH 623/783] Add tests

---
 lib/private/preview.php |  2 +-
 tests/lib/preview.php   | 74 +++++++++++++++++++++++++++++++----------
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index 24a9082b176..b2accdfd00f 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -531,7 +531,7 @@ class Preview {
 	 * @param string $name
 	 * @return bool
 	 */
-	private function thumbnailSizeExists($allThumbnails, $name) {
+	private function thumbnailSizeExists(array $allThumbnails, $name) {
 
 		foreach ($allThumbnails as $thumbnail) {
 			if ($name === $thumbnail->getName()) {
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index 9374cf2393f..e4c599c66cf 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -22,7 +22,15 @@
 
 namespace Test;
 
+use OC\Files\FileInfo;
+use OC\Files\Storage\Temporary;
+use OC\Files\View;
+use Test\Traits\MountProviderTrait;
+use Test\Traits\UserTrait;
+
 class Preview extends TestCase {
+	use UserTrait;
+	use MountProviderTrait;
 
 	const TEST_PREVIEW_USER1 = "test-preview-user1";
 
@@ -59,11 +67,7 @@ class Preview extends TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$userManager = \OC::$server->getUserManager();
-		$userManager->clearBackends();
-		$backend = new \Test\Util\User\Dummy();
-		$userManager->registerBackend($backend);
-		$backend->createUser(self::TEST_PREVIEW_USER1, self::TEST_PREVIEW_USER1);
+		$this->createUser(self::TEST_PREVIEW_USER1, self::TEST_PREVIEW_USER1);
 		$this->loginAsUser(self::TEST_PREVIEW_USER1);
 
 		$storage = new \OC\Files\Storage\Temporary([]);
@@ -75,13 +79,13 @@ class Preview extends TestCase {
 
 		// We simulate the max dimension set in the config
 		\OC::$server->getConfig()
-					->setSystemValue('preview_max_x', $this->configMaxWidth);
+			->setSystemValue('preview_max_x', $this->configMaxWidth);
 		\OC::$server->getConfig()
-					->setSystemValue('preview_max_y', $this->configMaxHeight);
+			->setSystemValue('preview_max_y', $this->configMaxHeight);
 		// Used to test upscaling
 		$this->maxScaleFactor = 2;
 		\OC::$server->getConfig()
-					->setSystemValue('preview_max_scale_factor', $this->maxScaleFactor);
+			->setSystemValue('preview_max_scale_factor', $this->maxScaleFactor);
 
 		// We need to enable the providers we're going to use in the tests
 		$providers = [
@@ -92,7 +96,7 @@ class Preview extends TestCase {
 			'OC\\Preview\\Postscript'
 		];
 		\OC::$server->getConfig()
-					->setSystemValue('enabledPreviewProviders', $providers);
+			->setSystemValue('enabledPreviewProviders', $providers);
 
 		// Sample is 1680x1050 JPEG
 		$this->prepareSample('testimage.jpg', 1680, 1050);
@@ -161,7 +165,7 @@ class Preview extends TestCase {
 		$fileId = $fileInfo['fileid'];
 
 		$thumbCacheFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER .
-							'/' . $fileId . '/';
+			'/' . $fileId . '/';
 
 		$this->assertSame(true, $this->rootView->is_dir($thumbCacheFolder), "$thumbCacheFolder \n");
 
@@ -318,7 +322,7 @@ class Preview extends TestCase {
 
 		// There should be no cached thumbnails
 		$thumbnailFolder = '/' . self::TEST_PREVIEW_USER1 . '/' . \OC\Preview::THUMBNAILS_FOLDER .
-						   '/' . $sampleFileId;
+			'/' . $sampleFileId;
 		$this->assertSame(false, $this->rootView->is_dir($thumbnailFolder));
 
 		$image = $preview->getPreview();
@@ -611,7 +615,7 @@ class Preview extends TestCase {
 		// Need to take care of special postfix added to the dimensions
 		$postfix = '';
 		$isMaxPreview = ($width === $this->maxPreviewWidth
-						 && $height === $this->maxPreviewHeight) ? true : false;
+			&& $height === $this->maxPreviewHeight) ? true : false;
 		if ($isMaxPreview) {
 			$postfix = '-max';
 		}
@@ -731,7 +735,7 @@ class Preview extends TestCase {
 		}
 
 		return $userPath . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId
-			   . '/' . $width . '-' . $height . $postfix . '.png';
+		. '/' . $width . '-' . $height . $postfix . '.png';
 	}
 
 	/**
@@ -752,11 +756,11 @@ class Preview extends TestCase {
 
 		$this->samples[] =
 			[
-				'sampleFileId'     => $fileInfo['fileid'],
-				'sampleFileName'   => $fileName,
-				'sampleWidth'      => $sampleWidth,
-				'sampleHeight'     => $sampleHeight,
-				'maxPreviewWidth'  => $maxPreviewWidth,
+				'sampleFileId' => $fileInfo['fileid'],
+				'sampleFileName' => $fileName,
+				'sampleWidth' => $sampleWidth,
+				'sampleHeight' => $sampleHeight,
+				'maxPreviewWidth' => $maxPreviewWidth,
 				'maxPreviewHeight' => $maxPreviewHeight
 			];
 	}
@@ -915,4 +919,38 @@ class Preview extends TestCase {
 		$this->assertGreaterThanOrEqual(150, $image->width());
 		$this->assertGreaterThanOrEqual(150, $image->height());
 	}
+
+	public function testSetFileWithInfo() {
+		$info = new FileInfo('/foo', null, '/foo', ['mimetype' => 'foo/bar'], null);
+		$preview = new \OC\Preview();
+		$preview->setFile('/foo', $info);
+		$this->assertEquals($info, $this->invokePrivate($preview, 'getFileInfo'));
+	}
+
+	public function testIsCached() {
+		$sourceFile = __DIR__ . '/../data/testimage.png';
+		$userId = $this->getUniqueID();
+		$this->createUser($userId, 'pass');
+
+		$storage = new Temporary();
+		$storage->mkdir('files');
+		$this->registerMount($userId, $storage, '/' . $userId);
+
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($userId);
+		$preview = new \OC\Preview($userId, 'files');
+		$view = new View('/' . $userId . '/files');
+		$view->file_put_contents('test.png', file_get_contents($sourceFile));
+		$info = $view->getFileInfo('test.png');
+		$preview->setFile('test.png', $info);
+
+		$preview->setMaxX(64);
+		$preview->setMaxY(64);
+
+		$this->assertFalse($preview->isCached($info->getId()));
+
+		$preview->getPreview();
+
+		$this->assertEquals('thumbnails/' . $info->getId() . '/64-64.png', $preview->isCached($info->getId()));
+	}
 }
-- 
GitLab


From 9e66653fb38d4eefab5a4d66b15fb0d43061a2c2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 1 Oct 2015 11:38:03 +0200
Subject: [PATCH 624/783] [IE8] Remove non-working ellipsis support

This prevents the name element to be too wide, which would cause users
to mistakenly click on it instead of the empty space when wanting to
focus on a file for the sidebar.

Also fixed the close button on the sidebar (make it appear)
---
 apps/files/css/files.css | 11 -----------
 core/css/fixes.css       |  4 ++++
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 1d4d0774482..74478338c54 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -330,10 +330,6 @@ table td.filename .nametext {
 	max-width: 800px;
 	height: 100%;
 }
-/* IE8 text-overflow: ellipsis support */
-.ie8 table td.filename .nametext {
-	min-width: 50%;
-}
 .has-favorites #fileList td.filename a.name {
 	left: 50px;
 	margin-right: 50px;
@@ -346,13 +342,6 @@ table td.filename .nametext .innernametext {
 	display: inline-block;
 	vertical-align: top;
 }
-/* IE8 text-overflow: ellipsis support */
-.ie8 table td.filename .nametext .innernametext {
-	white-space: nowrap;
-	word-wrap: normal;
-	-ms-text-overflow: ellipsis;
-	max-width: 47%;
-}
 
 @media only screen and (min-width: 1500px) {
 	table td.filename .nametext .innernametext {
diff --git a/core/css/fixes.css b/core/css/fixes.css
index 54852eb9beb..5f917dbbe81 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -24,6 +24,10 @@ select {
 	background-image: url('../img/actions/checkmark.png');
 }
 
+.ie8 .icon-close {
+	background-image: url('../img/actions/close.png');
+}
+
 .lte9 .icon-triangle-e {
 	background-image: url('../img/actions/triangle-e.png');
 }
-- 
GitLab


From 1d617c4bf6fe58d8eca125df10860ffab15f3e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 1 Oct 2015 13:45:49 +0200
Subject: [PATCH 625/783] always return float, update doc

---
 lib/private/helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/helper.php b/lib/private/helper.php
index b8e4b451835..f2f72fddcfb 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -274,7 +274,7 @@ class OC_Helper {
 	/**
 	 * Make a computer file size
 	 * @param string $str file size in human readable format
-	 * @return int a file size in bytes
+	 * @return float a file size in bytes
 	 *
 	 * Makes 2kB to 2048.
 	 *
@@ -283,7 +283,7 @@ class OC_Helper {
 	public static function computerFileSize($str) {
 		$str = strtolower($str);
 		if (is_numeric($str)) {
-			return $str;
+			return floatval($str);
 		}
 
 		$bytes_array = array(
-- 
GitLab


From 7cbdd9b90bcea3566b7d0198f23da3d427e6ef45 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 1 Oct 2015 14:23:25 +0200
Subject: [PATCH 626/783] setting to skip migration tests by default

* if you install owncloud via package it is not
  possible to skip migration tests
* this also allows to disable migration tests for
  an instance by default
---
 config/config.sample.php |  9 +++++++++
 core/ajax/update.php     | 11 ++++++++++-
 core/command/upgrade.php |  8 +++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index cf4b25b0674..88d1a294622 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1140,6 +1140,15 @@ $CONFIG = array(
  */
 'debug' => false,
 
+/**
+ * Skips the migration test during upgrades
+ *
+ * If this is set to true the migration test are deactivated during upgrade.
+ * This is only recommended in installations where upgrade tests are run in
+ * advance with the same data on a test system.
+ */
+'update.skip-migration-test' => false,
+
 /**
  * This entry is just here to show a warning in case somebody copied the sample
  * configuration. DO NOT ADD THIS SWITCH TO YOUR CONFIGURATION!
diff --git a/core/ajax/update.php b/core/ajax/update.php
index ff18d2bc04b..11d159f15d1 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -41,12 +41,21 @@ if (OC::checkUpgrade(false)) {
 	// avoid side effects
 	\OC_User::setIncognitoMode(true);
 
+
+
 	$logger = \OC::$server->getLogger();
+	$config = \OC::$server->getConfig();
 	$updater = new \OC\Updater(
 			\OC::$server->getHTTPHelper(),
-			\OC::$server->getConfig(),
+			$config,
 			$logger
 	);
+
+	if ($config->getSystemValue('update.skip-migration-test', false)) {
+		$eventSource->send('success', (string)$l->t('Migration tests are skipped - "update.skip-migration-test" is activated in config.php'));
+		$updater->setSimulateStepEnabled(false);
+	}
+
 	$incompatibleApps = [];
 	$disabledThirdPartyApps = [];
 
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index fa160d9a1c0..f50a0d92479 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -92,6 +92,12 @@ class Upgrade extends Command {
 		$updateStepEnabled = true;
 		$skip3rdPartyAppsDisable = false;
 
+		if ($this->config->getSystemValue('update.skip-migration-test', false)) {
+			$output->writeln(
+				'<info>"skip-migration-test" is activated via config.php</info>'
+			);
+			$simulateStepEnabled = false;
+		}
 		if ($input->getOption('skip-migration-test')) {
 			$simulateStepEnabled = false;
 		}
@@ -119,7 +125,7 @@ class Upgrade extends Command {
 
 			$self = $this;
 			$updater = new Updater(\OC::$server->getHTTPHelper(),
-				\OC::$server->getConfig());
+				$this->config);
 
 			$updater->setSimulateStepEnabled($simulateStepEnabled);
 			$updater->setUpdateStepEnabled($updateStepEnabled);
-- 
GitLab


From b2dd5cb61655b6ca82e8fd1fb117b42301d28c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 1 Oct 2015 15:37:55 +0200
Subject: [PATCH 627/783] save excluded groups in json format - fixes #10983

---
 lib/private/util.php | 7 ++++++-
 settings/admin.php   | 2 +-
 settings/js/admin.js | 6 +-----
 tests/lib/util.php   | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/private/util.php b/lib/private/util.php
index 9abaef71a68..746a2e09523 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -223,7 +223,12 @@ class OC_Util {
 		if (\OC::$server->getAppConfig()->getValue('core', 'shareapi_exclude_groups', 'no') === 'yes') {
 			$user = \OCP\User::getUser();
 			$groupsList = \OC::$server->getAppConfig()->getValue('core', 'shareapi_exclude_groups_list', '');
-			$excludedGroups = explode(',', $groupsList);
+			$excludedGroups = json_decode($groupsList);
+			if (is_null($excludedGroups)) {
+				$excludedGroups = explode(',', $groupsList);
+				$newValue = json_encode($excludedGroups);
+				\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups_list', $newValue);
+			}
 			$usersGroups = \OC_Group::getUserGroups($user);
 			if (!empty($usersGroups)) {
 				$remainingGroups = array_diff($usersGroups, $excludedGroups);
diff --git a/settings/admin.php b/settings/admin.php
index 31c9b8c1376..ec49b3e823f 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -87,7 +87,7 @@ $template->assign('shareEnforceExpireDate', $appConfig->getValue('core', 'sharea
 $excludeGroups = $appConfig->getValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false;
 $template->assign('shareExcludeGroups', $excludeGroups);
 $excludedGroupsList = $appConfig->getValue('core', 'shareapi_exclude_groups_list', '');
-$excludedGroupsList = explode(',', $excludedGroupsList); // FIXME: this should be JSON!
+$excludedGroupsList = json_decode($excludedGroupsList);
 $template->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList));
 $template->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled());
 $backends = \OC::$server->getUserManager()->getBackends();
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 7117c7b46cf..9f7133c6571 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -23,11 +23,7 @@ $(document).ready(function(){
 		OC.Settings.setupGroupsSelect($(element));
 		$(element).change(function(ev) {
 			var groups = ev.val || [];
-			if (groups.length > 0) {
-				groups = ev.val.join(','); // FIXME: make this JSON
-			} else {
-				groups = '';
-			}
+			groups = JSON.stringify(groups);
 			OC.AppConfig.setValue('core', $(this).attr('name'), groups);
 		});
 	});
diff --git a/tests/lib/util.php b/tests/lib/util.php
index 49579b3b6bd..eaa3d0795e3 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -303,7 +303,7 @@ class Test_Util extends \Test\TestCase {
 		}
 
 		$appConfig = \OC::$server->getAppConfig();
-		$appConfig->setValue('core', 'shareapi_exclude_groups_list', implode(',', $excludedGroups));
+		$appConfig->setValue('core', 'shareapi_exclude_groups_list', json_encode($excludedGroups));
 		$appConfig->setValue('core', 'shareapi_exclude_groups', 'yes');
 
 		$result = \OCP\Util::isSharingDisabledForUser();
-- 
GitLab


From b6114ba2b6fc7c7f40478c1fcde5fa4cae5bf726 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 1 Oct 2015 12:10:50 +0200
Subject: [PATCH 628/783] Reload versions list after revert

---
 apps/files_versions/js/versioncollection.js |  5 +++++
 apps/files_versions/js/versionstabview.js   | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apps/files_versions/js/versioncollection.js b/apps/files_versions/js/versioncollection.js
index 3f8214cde8c..176f8e7529c 100644
--- a/apps/files_versions/js/versioncollection.js
+++ b/apps/files_versions/js/versioncollection.js
@@ -67,6 +67,11 @@
 			return this.fetch({remove: false});
 		},
 
+		reset: function() {
+			this._currentIndex = 0;
+			OC.Backbone.Collection.prototype.reset.apply(this, arguments);
+		},
+
 		parse: function(result) {
 			var results = _.map(result.data.versions, function(version) {
 				var revision = parseInt(version.version, 10);
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js
index 55f24868196..f2b1c18bd37 100644
--- a/apps/files_versions/js/versionstabview.js
+++ b/apps/files_versions/js/versionstabview.js
@@ -85,12 +85,18 @@
 			ev.preventDefault();
 			revision = $target.attr('data-revision');
 
+			this.$el.find('.versions, .showMoreVersions').addClass('hidden');
+
 			var versionModel = this.collection.get(revision);
 			versionModel.revert({
 				success: function() {
 					// reset and re-fetch the updated collection
+					self.$versionsContainer.empty();
 					self.collection.setFileInfo(fileInfoModel);
-					self.collection.fetch();
+					self.collection.reset([], {silent: true});
+					self.collection.fetchNext();
+
+					self.$el.find('.versions').removeClass('hidden');
 
 					// update original model
 					fileInfoModel.trigger('busy', fileInfoModel, false);
@@ -157,7 +163,7 @@
 			if (fileInfo) {
 				this.render();
 				this.collection.setFileInfo(fileInfo);
-				this.collection.reset({silent: true});
+				this.collection.reset([], {silent: true});
 				this.nextPage();
 			} else {
 				this.render();
-- 
GitLab


From b940287ffa45d34f407514e339a4ec521742f57f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 30 Sep 2015 14:35:11 +0200
Subject: [PATCH 629/783] first copy to owner and then move to current user
 because the encryption wrapper always expect to work on the owner storage

---
 apps/files_trashbin/lib/storage.php  |  7 ++++++
 apps/files_trashbin/lib/trashbin.php | 37 ++++++++++++++--------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/apps/files_trashbin/lib/storage.php b/apps/files_trashbin/lib/storage.php
index 4185fc6aec4..0e42df1e967 100644
--- a/apps/files_trashbin/lib/storage.php
+++ b/apps/files_trashbin/lib/storage.php
@@ -142,6 +142,13 @@ class Storage extends Wrapper {
 		) {
 			return call_user_func_array([$this->storage, $method], [$path]);
 		}
+
+		// check permissions before we continue, this is especially important for
+		// shared files
+		if (!$this->isDeletable($path)) {
+			return false;
+		}
+
 		$normalized = Filesystem::normalizePath($this->mountPoint . '/' . $path);
 		$result = true;
 		if (!isset($this->deletedFiles[$normalized])) {
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 840fd4fa146..ea6f0993dd6 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -136,27 +136,28 @@ class Trashbin {
 	 *
 	 * @param string $sourcePath
 	 * @param string $owner
-	 * @param string $ownerPath
+	 * @param $targetPath
+	 * @param $user
 	 * @param integer $timestamp
 	 */
-	private static function copyFilesToOwner($sourcePath, $owner, $ownerPath, $timestamp) {
+	private static function copyFilesToUser($sourcePath, $owner, $targetPath, $user, $timestamp) {
 		self::setUpTrash($owner);
 
-		$ownerFilename = basename($ownerPath);
-		$ownerLocation = dirname($ownerPath);
+		$targetFilename = basename($targetPath);
+		$targetLocation = dirname($targetPath);
 
 		$sourceFilename = basename($sourcePath);
 
 		$view = new \OC\Files\View('/');
 
-		$source = \OCP\User::getUser() . '/files_trashbin/files/' . $sourceFilename . '.d' . $timestamp;
-		$target = $owner . '/files_trashbin/files/' . $ownerFilename . '.d' . $timestamp;
+		$target = $user . '/files_trashbin/files/' . $targetFilename . '.d' . $timestamp;
+		$source = $owner . '/files_trashbin/files/' . $sourceFilename . '.d' . $timestamp;
 		self::copy_recursive($source, $target, $view);
 
 
 		if ($view->file_exists($target)) {
 			$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)");
-			$result = $query->execute(array($ownerFilename, $timestamp, $ownerLocation, $owner));
+			$result = $query->execute(array($targetFilename, $timestamp, $targetLocation, $user));
 			if (!$result) {
 				\OCP\Util::writeLog('files_trashbin', 'trash bin database couldn\'t be updated for the files owner', \OCP\Util::ERROR);
 			}
@@ -168,6 +169,7 @@ class Trashbin {
 	 * move file to the trash bin
 	 *
 	 * @param string $file_path path to the deleted file/directory relative to the files root directory
+	 * @return bool
 	 */
 	public static function move2trash($file_path) {
 		// get the user for which the filesystem is setup
@@ -176,9 +178,9 @@ class Trashbin {
 		$size = 0;
 		list($owner, $ownerPath) = self::getUidAndFilename($file_path);
 
-		$view = new \OC\Files\View('/' . $user);
+		$ownerView = new \OC\Files\View('/' . $owner);
 		// file has been deleted in between
-		if (!$view->file_exists('/files/' . $file_path)) {
+		if (!$ownerView->file_exists('/files/' . $ownerPath)) {
 			return true;
 		}
 
@@ -188,7 +190,7 @@ class Trashbin {
 			self::setUpTrash($owner);
 		}
 
-		$path_parts = pathinfo($file_path);
+		$path_parts = pathinfo($ownerPath);
 
 		$filename = $path_parts['basename'];
 		$location = $path_parts['dirname'];
@@ -200,9 +202,9 @@ class Trashbin {
 		$trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp;
 
 		/** @var \OC\Files\Storage\Storage $trashStorage */
-		list($trashStorage, $trashInternalPath) = $view->resolvePath($trashPath);
+		list($trashStorage, $trashInternalPath) = $ownerView->resolvePath($trashPath);
 		/** @var \OC\Files\Storage\Storage $sourceStorage */
-		list($sourceStorage, $sourceInternalPath) = $view->resolvePath('/files/' . $file_path);
+		list($sourceStorage, $sourceInternalPath) = $ownerView->resolvePath('/files/' . $ownerPath);
 		try {
 			$sizeOfAddedFiles = $sourceStorage->filesize($sourceInternalPath);
 			if ($trashStorage->file_exists($trashInternalPath)) {
@@ -222,23 +224,23 @@ class Trashbin {
 			return false;
 		}
 
-		$view->getUpdater()->rename('/files/' . $file_path, $trashPath);
+		$ownerView->getUpdater()->rename('/files/' . $ownerPath, $trashPath);
 
 		if ($sizeOfAddedFiles !== false) {
 			$size = $sizeOfAddedFiles;
 			$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)");
-			$result = $query->execute(array($filename, $timestamp, $location, $user));
+			$result = $query->execute(array($filename, $timestamp, $location, $owner));
 			if (!$result) {
 				\OCP\Util::writeLog('files_trashbin', 'trash bin database couldn\'t be updated', \OCP\Util::ERROR);
 			}
 			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
 				'trashPath' => \OC\Files\Filesystem::normalizePath($filename . '.d' . $timestamp)));
 
-			$size += self::retainVersions($file_path, $filename, $owner, $ownerPath, $timestamp);
+			$size += self::retainVersions($filename, $owner, $ownerPath, $timestamp);
 
 			// if owner !== user we need to also add a copy to the owners trash
 			if ($user !== $owner) {
-				self::copyFilesToOwner($file_path, $owner, $ownerPath, $timestamp);
+				self::copyFilesToUser($ownerPath, $owner, $file_path, $user, $timestamp);
 			}
 		}
 
@@ -258,7 +260,6 @@ class Trashbin {
 	/**
 	 * Move file versions to trash so that they can be restored later
 	 *
-	 * @param string $file_path path to original file
 	 * @param string $filename of deleted file
 	 * @param string $owner owner user id
 	 * @param string $ownerPath path relative to the owner's home storage
@@ -266,7 +267,7 @@ class Trashbin {
 	 *
 	 * @return int size of stored versions
 	 */
-	private static function retainVersions($file_path, $filename, $owner, $ownerPath, $timestamp) {
+	private static function retainVersions($filename, $owner, $ownerPath, $timestamp) {
 		$size = 0;
 		if (\OCP\App::isEnabled('files_versions') && !empty($ownerPath)) {
 
-- 
GitLab


From d4ce71374985462e1110431e6aa0683c8f25ddfa Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Thu, 1 Oct 2015 22:54:36 +0200
Subject: [PATCH 630/783] display checkboxes properly after file restore

---
 apps/files_trashbin/js/filelist.js | 4 ++--
 core/css/styles.css                | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index febe3a45be3..6b624e333a0 100644
--- a/apps/files_trashbin/js/filelist.js
+++ b/apps/files_trashbin/js/filelist.js
@@ -268,12 +268,12 @@
 
 		enableActions: function() {
 			this.$el.find('.action').css('display', 'inline');
-			this.$el.find(':input:checkbox').css('display', 'inline');
+			this.$el.find('input:checkbox').removeClass('u-hidden');
 		},
 
 		disableActions: function() {
 			this.$el.find('.action').css('display', 'none');
-			this.$el.find(':input:checkbox').css('display', 'none');
+			this.$el.find('input:checkbox').addClass('u-hidden');
 		},
 
 		updateStorageStatistics: function() {
diff --git a/core/css/styles.css b/core/css/styles.css
index d952a33c24a..c0da29b71ca 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -183,6 +183,7 @@ html:not(.ie8) input[type="checkbox"].checkbox + label:before {
 html:not(.ie8) input[type="checkbox"].checkbox:disabled +label:before { opacity: .6; }
 
 html:not(.ie8) input[type="checkbox"].checkbox.u-left +label:before { float: left; }
+html:not(.ie8) input[type="checkbox"].checkbox.u-hidden + label:before { display: none; }
 
 html:not(.ie8) input[type="checkbox"].checkbox--white + label:before {
 	background-image: url('../img/actions/checkbox-white.svg');
-- 
GitLab


From 4a620211412f9cf1b2fc9af8fd9edfbb73eb76ae Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 26 Sep 2015 08:59:29 +0200
Subject: [PATCH 631/783] Move OCS endpoint ../remote_share to
 ../pending_shares

---
 apps/files_sharing/appinfo/routes.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 375124cb730..8f7dc72f5d9 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -88,17 +88,17 @@ API::register('delete',
 		'files_sharing');
 
 API::register('get',
-		'/apps/files_sharing/api/v1/remote_shares',
+		'/apps/files_sharing/api/v1/pending_shares',
 		array('\OCA\Files_Sharing\API\Remote', 'getOpenShares'),
 		'files_sharing');
 
 API::register('post',
-		'/apps/files_sharing/api/v1/remote_shares/{id}',
+		'/apps/files_sharing/api/v1/pending_shares/{id}',
 		array('\OCA\Files_Sharing\API\Remote', 'acceptShare'),
 		'files_sharing');
 
 API::register('delete',
-		'/apps/files_sharing/api/v1/remote_shares/{id}',
+		'/apps/files_sharing/api/v1/pending_shares/{id}',
 		array('\OCA\Files_Sharing\API\Remote', 'declineShare'),
 		'files_sharing');
 
-- 
GitLab


From 7310c4166ab3f5f441a29af6e4c74b9222b13df7 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 26 Sep 2015 09:55:59 +0200
Subject: [PATCH 632/783] Added '../remote_shares' endpoint

* list incoming remote shares at 'remote_shares'
* get per share info at 'remote_shares/<ID>'
* delete remote share with a DELETE to 'remote_shares/<ID>'
---
 apps/files_sharing/api/remote.php           | 79 ++++++++++++++++++++-
 apps/files_sharing/appinfo/routes.php       | 16 +++++
 apps/files_sharing/lib/external/manager.php | 13 +++-
 3 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/api/remote.php
index 0f6d2dc265a..ab87820611c 100644
--- a/apps/files_sharing/api/remote.php
+++ b/apps/files_sharing/api/remote.php
@@ -27,9 +27,9 @@ use OCA\Files_Sharing\External\Manager;
 class Remote {
 
 	/**
-	 * Accept a remote share
+	 * Get list of pending remote shares
 	 *
-	 * @param array $params contains the shareID 'id' which should be accepted
+	 * @param array $params empty
 	 * @return \OC_OCS_Result
 	 */
 	public static function getOpenShares($params) {
@@ -90,4 +90,79 @@ class Remote {
 
 		return new \OC_OCS_Result(null, 404, "wrong share ID, share doesn't exist.");
 	}
+
+	/**
+	 * List accepted remote shares
+	 *
+	 * @param array $params 
+	 * @return \OC_OCS_Result
+	 */
+	public static function getShares($params) {
+		$externalManager = new Manager(
+			\OC::$server->getDatabaseConnection(),
+			Filesystem::getMountManager(),
+			Filesystem::getLoader(),
+			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
+			\OC_User::getUser()
+		);
+	
+		return new \OC_OCS_Result($externalManager->getAcceptedShares());
+	}
+
+	/**
+	 * Get info of a remote share
+	 *
+	 * @param array $params contains the shareID 'id'
+	 * @return \OC_OCS_Result
+	 */
+	public static function getShare($params) {
+		$externalManager = new Manager(
+			\OC::$server->getDatabaseConnection(),
+			Filesystem::getMountManager(),
+			Filesystem::getLoader(),
+			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
+			\OC_User::getUser()
+		);
+
+		$shareInfo = $externalManager->getShare($params['id']);
+
+		if ($shareInfo === false) {
+			return new \OC_OCS_Result(null, 404, 'share does not exist');
+		} else {
+			return new \OC_OCS_Result($shareInfo);
+		}
+	}
+
+	/**
+	 * Unshare a remote share
+	 *
+	 * @param array $params contains the shareID 'id' which should be unshared
+	 * @return \OC_OCS_Result
+	 */
+	public static function unshare($params) {
+		$externalManager = new Manager(
+			\OC::$server->getDatabaseConnection(),
+			Filesystem::getMountManager(),
+			Filesystem::getLoader(),
+			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
+			\OC_User::getUser()
+		);
+
+		$shareInfo = $externalManager->getShare($params['id']);
+
+		if ($shareInfo === false) {
+			return new \OC_OCS_Result(null, 404, 'Share does not exist');
+		}
+
+		$mountPoint = '/' . \OC_User::getUser() . '/files' . $shareInfo['mountpoint'];
+
+		if ($externalManager->removeShare($mountPoint) === true) {
+			return new \OC_OCS_Result(null);
+		} else {
+			return new \OC_OCS_Result(null, 403, 'Could not unshare');
+		}
+	}
 }
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 8f7dc72f5d9..063b4d70a15 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -102,6 +102,22 @@ API::register('delete',
 		array('\OCA\Files_Sharing\API\Remote', 'declineShare'),
 		'files_sharing');
 
+API::register('get',
+		'/apps/files_sharing/api/v1/remote_shares',
+		array('\OCA\Files_Sharing\API\Remote', 'getShares'),
+		'files_sharing');
+
+API::register('get',
+		'/apps/files_sharing/api/v1/remote_shares/{id}',
+		array('\OCA\Files_Sharing\API\Remote', 'getShare'),
+		'files_sharing');
+
+API::register('delete',
+		'/apps/files_sharing/api/v1/remote_shares/{id}',
+		array('\OCA\Files_Sharing\API\Remote', 'unshare'),
+		'files_sharing');
+
+
 $sharees = new \OCA\Files_Sharing\API\Sharees(\OC::$server->getGroupManager(),
                                               \OC::$server->getUserManager(),
                                               \OC::$server->getContactsManager(),
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 8552b2fbd34..78d9581524d 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -180,9 +180,9 @@ class Manager {
 	 * @param int $id share id
 	 * @return mixed share of false
 	 */
-	private function getShare($id) {
+	public function getShare($id) {
 		$getShare = $this->connection->prepare('
-			SELECT `remote`, `remote_id`, `share_token`, `name`
+			SELECT *
 			FROM  `*PREFIX*share_external`
 			WHERE `id` = ? AND `user` = ?');
 		$result = $getShare->execute(array($id, $this->uid));
@@ -406,6 +406,15 @@ class Manager {
 		return $this->getShares(false);
 	}
 
+	/**
+	 * return a list of shares wich are accepted by the user
+	 *
+	 * @return array list of accepted server-to-server shares
+	 */
+	public function getAcceptedShares() {
+		return $this->getShares(true);
+	}
+
 	/**
 	 * return a list of shares for the user
 	 *
-- 
GitLab


From 0d3009951fe801f9c0d4599694638446166b4ee5 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 1 Oct 2015 14:25:14 +0200
Subject: [PATCH 633/783] Made routes remote_shares only again

Since we need a unique id to accept/reject shares for now we keep the
pending shares under remote_shares.

* remote_shares/pending lists pending shares
* PUT/DELETE to remote_shares/pending/<ID> will accept/reject the share
---
 apps/files_sharing/appinfo/routes.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 063b4d70a15..3794df37992 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -88,25 +88,25 @@ API::register('delete',
 		'files_sharing');
 
 API::register('get',
-		'/apps/files_sharing/api/v1/pending_shares',
+		'/apps/files_sharing/api/v1/remote_shares',
+		array('\OCA\Files_Sharing\API\Remote', 'getShares'),
+		'files_sharing');
+
+API::register('get',
+		'/apps/files_sharing/api/v1/remote_shares/pending',
 		array('\OCA\Files_Sharing\API\Remote', 'getOpenShares'),
 		'files_sharing');
 
 API::register('post',
-		'/apps/files_sharing/api/v1/pending_shares/{id}',
+		'/apps/files_sharing/api/v1/remote_shares/pending/{id}',
 		array('\OCA\Files_Sharing\API\Remote', 'acceptShare'),
 		'files_sharing');
 
 API::register('delete',
-		'/apps/files_sharing/api/v1/pending_shares/{id}',
+		'/apps/files_sharing/api/v1/remote_shares/pending/{id}',
 		array('\OCA\Files_Sharing\API\Remote', 'declineShare'),
 		'files_sharing');
 
-API::register('get',
-		'/apps/files_sharing/api/v1/remote_shares',
-		array('\OCA\Files_Sharing\API\Remote', 'getShares'),
-		'files_sharing');
-
 API::register('get',
 		'/apps/files_sharing/api/v1/remote_shares/{id}',
 		array('\OCA\Files_Sharing\API\Remote', 'getShare'),
-- 
GitLab


From c3e7d324c5e61eb087fb2ea5102d332f9f08db3d Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 1 Oct 2015 15:41:24 +0200
Subject: [PATCH 634/783] Extend share info

The data from the share_external is not to much. Thus we enrich this
data with info from the filecache.

This allows endpoints using this to actually show usefull information.

The filecache might not be up to date but that is a sacrifice we need to
make in terms of speed. Else the number of remote PROPFINDS grows
lineary with the number of remote shares wich will make this endpoint
practically unusable.
---
 apps/files_sharing/api/remote.php | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/api/remote.php
index ab87820611c..76f9babcd19 100644
--- a/apps/files_sharing/api/remote.php
+++ b/apps/files_sharing/api/remote.php
@@ -91,6 +91,23 @@ class Remote {
 		return new \OC_OCS_Result(null, 404, "wrong share ID, share doesn't exist.");
 	}
 
+	/**
+	 * @param array $share Share with info from the share_external table
+	 * @return enriched share info with data from the filecache
+	 */
+	private static function extendShareInfo($share) {
+		$view = new \OC\Files\View('/' . \OC_User::getUser() . '/files/');
+		$info = $view->getFileInfo($shares['mountpoint']);
+
+		$share['mimetype'] = $info->getMimetype();
+		$share['mtime'] = $info->getMtime();
+		$share['permissions'] = $info->getPermissions();
+		$share['type'] = $info->getType();
+		$share['file_id'] = $info->getId();
+
+		return $share;
+	}
+
 	/**
 	 * List accepted remote shares
 	 *
@@ -106,8 +123,12 @@ class Remote {
 			\OC::$server->getNotificationManager(),
 			\OC_User::getUser()
 		);
+
+		$shares = $externalManager->getAcceptedShares();
+
+		$shares = array_map('self::extendShareInfo', $shares);
 	
-		return new \OC_OCS_Result($externalManager->getAcceptedShares());
+		return new \OC_OCS_Result($shares);
 	}
 
 	/**
@@ -131,6 +152,7 @@ class Remote {
 		if ($shareInfo === false) {
 			return new \OC_OCS_Result(null, 404, 'share does not exist');
 		} else {
+			$shareInfo = self::extendShareInfo($shareInfo);
 			return new \OC_OCS_Result($shareInfo);
 		}
 	}
-- 
GitLab


From 3b4592718a40100d794a638559ead647dd5d1e2e Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 2 Oct 2015 01:54:51 -0400
Subject: [PATCH 635/783] [tx-robot] updated from transifex

---
 apps/files_external/l10n/pt_PT.js   |   2 +
 apps/files_external/l10n/pt_PT.json |   2 +
 apps/files_sharing/l10n/et_EE.js    |   2 +
 apps/files_sharing/l10n/et_EE.json  |   2 +
 apps/user_ldap/l10n/oc.js           | 168 ++++++++++++++--------------
 apps/user_ldap/l10n/oc.json         | 168 ++++++++++++++--------------
 apps/user_ldap/l10n/pt_PT.js        |   6 +
 apps/user_ldap/l10n/pt_PT.json      |   6 +
 core/l10n/cs_CZ.js                  |   1 +
 core/l10n/cs_CZ.json                |   1 +
 core/l10n/hu_HU.js                  |   6 +
 core/l10n/hu_HU.json                |   6 +
 core/l10n/pt_BR.js                  |   2 +
 core/l10n/pt_BR.json                |   2 +
 core/l10n/pt_PT.js                  |   1 +
 core/l10n/pt_PT.json                |   1 +
 core/l10n/th_TH.js                  |   2 +
 core/l10n/th_TH.json                |   2 +
 lib/l10n/et_EE.js                   |   1 +
 lib/l10n/et_EE.json                 |   1 +
 20 files changed, 214 insertions(+), 168 deletions(-)

diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
index 37a6d35471e..6ea55871262 100644
--- a/apps/files_external/l10n/pt_PT.js
+++ b/apps/files_external/l10n/pt_PT.js
@@ -67,9 +67,11 @@ OC.L10N.register(
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
+    "Domain" : "Domínio",
     "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
     "Username as share" : "Nome de utilizador como partilha",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
+    "Service name" : "Nome do serviço",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
index 90c863334a5..8711356815f 100644
--- a/apps/files_external/l10n/pt_PT.json
+++ b/apps/files_external/l10n/pt_PT.json
@@ -65,9 +65,11 @@
     "Root" : "Root",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Compartilhar",
+    "Domain" : "Domínio",
     "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
     "Username as share" : "Nome de utilizador como partilha",
     "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
+    "Service name" : "Nome do serviço",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js
index ada0a548162..6d02bdd6ced 100644
--- a/apps/files_sharing/l10n/et_EE.js
+++ b/apps/files_sharing/l10n/et_EE.js
@@ -32,6 +32,7 @@ OC.L10N.register(
     "You shared %1$s via link" : "Jagasid %1$s lingiga",
     "Shares" : "Jagamised",
     "Accept" : "Nõustu",
+    "Decline" : "Lükka tagasi",
     "This share is password-protected" : "See jagamine on parooliga kaitstud",
     "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.",
     "Password" : "Parool",
@@ -52,6 +53,7 @@ OC.L10N.register(
     "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse",
     "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest",
     "Share it:" : "Jaga seda:",
+    "Add to your website" : "Lisa oma veebisaidile",
     "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga",
     "HTML Code:" : "HTML kood:"
 },
diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json
index afa7fc6884d..481a75210ee 100644
--- a/apps/files_sharing/l10n/et_EE.json
+++ b/apps/files_sharing/l10n/et_EE.json
@@ -30,6 +30,7 @@
     "You shared %1$s via link" : "Jagasid %1$s lingiga",
     "Shares" : "Jagamised",
     "Accept" : "Nõustu",
+    "Decline" : "Lükka tagasi",
     "This share is password-protected" : "See jagamine on parooliga kaitstud",
     "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.",
     "Password" : "Parool",
@@ -50,6 +51,7 @@
     "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse",
     "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest",
     "Share it:" : "Jaga seda:",
+    "Add to your website" : "Lisa oma veebisaidile",
     "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga",
     "HTML Code:" : "HTML kood:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/user_ldap/l10n/oc.js b/apps/user_ldap/l10n/oc.js
index 450e1403c8c..16a136649d7 100644
--- a/apps/user_ldap/l10n/oc.js
+++ b/apps/user_ldap/l10n/oc.js
@@ -5,46 +5,46 @@ OC.L10N.register(
     "Failed to delete the server configuration" : "Fracàs de la supression de la configuracion del servidor",
     "The configuration is invalid: anonymous bind is not allowed." : "La configuracion es pas valida : lo ligam anonim es pas autorizat.",
     "The configuration is valid and the connection could be established!" : "La configuracion es valida e la connexion pòt èsser establida !",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuracion es valable, mas lo bind a fracassat. Verificatz los paramètres del servidor ainsi que vos identificants de connexion.",
-    "The configuration is invalid. Please have a look at the logs for further details." : "La configuracion es pas valable. Consultatz les logs per mai de detalhs.",
-    "No action specified" : "Aucune action especificada",
-    "No configuration specified" : "Aucune configuration especificada",
-    "No data specified" : "Aucune donada especificada",
-    " Could not set configuration %s" : "Impossible de especificar la configuracion %s",
-    "Action does not exist" : "L'action n'existe pas",
-    "The Base DN appears to be wrong" : "Lo DN de base es erroné",
-    "Configuration incorrect" : "Configuracion incorrecte",
-    "Configuration incomplete" : "Configuracion incomplète",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuracion es valabla, mas lo bind a fracassat. Verificatz los paramètres del servidor e tanben vòstres identificants de connexion.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configuracion es pas valabla. Consultatz los logs per mai de detalhs.",
+    "No action specified" : "Cap d'accion pas especificada",
+    "No configuration specified" : "Cap de configuration pas especificada",
+    "No data specified" : "Cap de donada pas especificada",
+    " Could not set configuration %s" : "Impossible d'especificar la configuracion %s",
+    "Action does not exist" : "L'accion existís pas",
+    "The Base DN appears to be wrong" : "Lo DN de basa es erronèu",
+    "Configuration incorrect" : "Configuracion incorrècta",
+    "Configuration incomplete" : "Configuracion incompleta",
     "Configuration OK" : "Configuracion OK",
-    "Select groups" : "Seleccionnez los gropes",
-    "Select object classes" : "Seleccionar les classes d'objècte",
-    "Please check the credentials, they seem to be wrong." : "Verificatz vos informations d'identification",
-    "Please specify the port, it could not be auto-detected." : "Veuillez especificar lo pòrt, il n'a pu èsser detectat automaticament",
-    "Base DN could not be auto-detected, please revise credentials, host and port." : "Lo DN de base n'a pu èsser detectat automaticament. Verificatz les informations d'identification, l'hôte e lo pòrt.",
-    "Could not detect Base DN, please enter it manually." : "Impossible de detectar lo DN de base, veuillez lo especificar manualament",
+    "Select groups" : "Seleccionatz los gropes",
+    "Select object classes" : "Seleccionar las classas d'objècte",
+    "Please check the credentials, they seem to be wrong." : "Verificatz vòstras informacions d'identificacion",
+    "Please specify the port, it could not be auto-detected." : "Especificatz lo pòrt, a pas pogut èsser detectat automaticament",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Lo DN de basa a pas pogut èsser detectat automaticament. Verificatz las informacions d'identificacion, l'òste e lo pòrt.",
+    "Could not detect Base DN, please enter it manually." : "Impossible de detectar lo DN de basa, especificatz-lo manualament",
     "{nthServer}. Server" : "{nthServer}. Servidor",
-    "No object found in the given Base DN. Please revise." : "Aucun objècte trobat dins lo DN de base especificat. Veuillez lo verificar.",
-    "More than 1.000 directory entries available." : "I a plus de 1000 entradas de repertòri disponibles.",
-    " entries available within the provided Base DN" : "entradas disponibles dins lo DN de base especificat",
-    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Una error es survenue. Verificatz lo DN de base, ainsi que los paramètres de connexion e les informations d'identification",
+    "No object found in the given Base DN. Please revise." : "Cap d'objècte pas trobat dins lo DN de basa especificat. Verificatz-lo.",
+    "More than 1.000 directory entries available." : "I a mai de 1000 entradas de repertòri disponiblas.",
+    " entries available within the provided Base DN" : "entradas disponiblas dins lo DN de basa especificat",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Una error s'es produsida. Verificatz lo DN de basa, e tanben los paramètres de connexion e las informacions d'identificacion.",
     "Do you really want to delete the current Server Configuration?" : "Sètz segur que volètz escafar la configuracion servidor actuala ?",
-    "Confirm Deletion" : "Confirmer la supression",
-    "Mappings cleared successfully!" : "Associations suprimidas amb succès !",
-    "Error while clearing the mappings." : "Error al moment de la supression des associations.",
+    "Confirm Deletion" : "Confirmar la supression",
+    "Mappings cleared successfully!" : "Associacions suprimidas amb succès !",
+    "Error while clearing the mappings." : "Error al moment de la supression de las associacions.",
     "Anonymous bind is not allowed. Please provide a User DN and Password." : "Lo ligam anonim es pas autorizat. Mercé de provesir lo DN d'un utilizaire e un senhal.",
-    "LDAP Operations error. Anonymous bind might not be allowed." : "Error LDAP. La connexion anonyme al servidor n'est probablement pas acceptada.",
-    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "La salvament a fracassat. Verificatz que la banca de donadas es opérationnelle. Rechargez avant de contunhar.",
-    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Changer de mode activera las requèstas LDAP automatiques. Selon la taille de votre annuaire LDAP, cela pòt prendre del temps. Volètz toujours changer de mode ?",
-    "Mode switch" : "Changer de mode",
+    "LDAP Operations error. Anonymous bind might not be allowed." : "Error LDAP. La connexion anonima al servidor es probablament pas acceptada.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Lo salvament a fracassat. Verificatz que la banca de donadas es operacionala. Recargatz abans de contunhar.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiar de mòde activarà las requèstas LDAP automaticas. Segon la talha de vòstre annuari LDAP, aquò pòt préner del temps. Volètz totjorn cambiar de mòde ?",
+    "Mode switch" : "Cambiar de mòde",
     "Select attributes" : "Seleccionar los atributs",
-    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilizaire introuvable. Verificatz los atributs de login e lo nom d'utilizaire. Filtre effectif (à copier-coller per valider en ligne de commande):<br/>",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilizaire introbable. Verificatz los atributs de login e lo nom d'utilizaire. Filtre efectiu (de copiar-pegar per validar en linha de comanda):<br/>",
     "User found and settings verified." : "Utilizaire trobat e paramètres verificats.",
-    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres verificats, mas seul lo premier utilizaire pourra se connecter. Utilizatz plutôt un filtre mens restrictif.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres verificats, mas sol lo primièr utilizaire se poirà connectar. Utilizatz puslèu un filtre mens restrictiu.",
     "An unspecified error occurred. Please check the settings and the log." : "Una error desconeguda s'es produsida. Verificatz los paramètres e lo log.",
-    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Lo filtre de recèrca es pas valide, probablement a cause de problèmas de syntaxe tels que des parenthèses manquantes. Veuillez lo corriger.",
-    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Una error s'es produsida al moment de la connexion al LDAP / AD. Verificatz l'hôte, lo pòrt e les informations d'identification.",
-    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "La chaîne %uid es manquante. Aquesta chaîne es remplacée per l'identificant de connexion al moment des requèstas LDAP / AD.",
-    "Please provide a login name to test against" : "Veuillez indiquer un identificant de connexion amb lequel tester.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Lo filtre de recèrca es pas valid, probablament a causa de problèmas de sintaxi tals coma de parentèsis mancantas. Corregissètz-los.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Una error s'es produsida al moment de la connexion al LDAP / AD. Verificatz l'òste, lo pòrt e las informacions d'identificacion.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "La cadena %uid es mancanta. Aquesta cadena es remplaçada per l'identificant de connexion al moment de las requèstas LDAP / AD.",
+    "Please provide a login name to test against" : "Indicatz un identificant de connexion amb lo qual cal testar.",
     "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Los gropes son desactivats perque lo servidor LDAP / AD pren pas en carga memberOf.",
     "_%s group found_::_%s groups found_" : ["%s grop trobat","%s gropes trobats"],
     "_%s user found_::_%s users found_" : ["%s utilizaire trobat","%s utilizaires trobats"],
@@ -65,15 +65,15 @@ OC.L10N.register(
     "Selected groups" : "Gropes seleccionats",
     "Edit LDAP Query" : "Modificar la requèsta LDAP",
     "LDAP Filter:" : "Filtre LDAP :",
-    "The filter specifies which LDAP groups shall have access to the %s instance." : "Lo filtre spécifie quels gropes LDAP ont accès a l'instància %s.",
-    "Verify settings and count groups" : "Verificar los paramètres e compter los gropes",
-    "When logging in, %s will find the user based on the following attributes:" : "Au login, %s cercarà l'utilizaire sus base de ces attributs :",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Lo filtre especifica quins gropes LDAP an accès a l'instància %s.",
+    "Verify settings and count groups" : "Verificar los paramètres e comptar los gropes",
+    "When logging in, %s will find the user based on the following attributes:" : "Al login, %s cercarà l'utilizaire sus basa d'aquestes atributs :",
     "LDAP / AD Username:" : "Nom d'utilizaire LDAP / AD :",
-    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Autorizar lo login amb lo nom d'utilizaire LDAP / AD (uid o samaccountname, la détection es automatique). ",
-    "LDAP / AD Email Address:" : "Adresse mail LDAP / AD :",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Autorizar lo login amb lo nom d'utilizaire LDAP / AD (uid o samaccountname, la deteccion es automatica). ",
+    "LDAP / AD Email Address:" : "Adreça mail LDAP / AD :",
     "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Autorizar lo login amb una adreça mail. Mail e mailPrimaryAddress son autorizats.",
-    "Other Attributes:" : "Autres attributs :",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit lo filtre a aplicar al moment d'una tentative de connexion. %%uid remplace lo nom d'utilizaire. Exemple : \"uid=%%uid\"",
+    "Other Attributes:" : "Autres atributs :",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definís lo filtre d'aplicar al moment d'una temptativa de connexion. %%uid remplaça lo nom d'utilizaire. Exemple : \"uid=%%uid\"",
     "Test Loginname" : "Loginname de tèst",
     "Verify settings" : "Testar los paramètres",
     "1. Server" : "1. Servidor",
@@ -82,77 +82,77 @@ OC.L10N.register(
     "Copy current configuration into new directory binding" : "Copiar la configuracion actuala cap a una novèla",
     "Delete the current configuration" : "Suprimir la configuracion actuala",
     "Host" : "Òste",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podètz omettre lo protocòl, levat se avètz besonh de SSL. Dins aqueste cas, prefixatz amb ldaps://",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podètz ometre lo protocòl, levat se avètz besonh de SSL. Dins aqueste cas, prefixatz amb ldaps://",
     "Port" : "Pòrt",
     "Detect Port" : "Detectar lo pòrt",
     "User DN" : "DN Utilizaire",
-    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN de l'utilizaire client per lequel la liaison deu se faire, per exemple uid=agent,dc=example,dc=com. Per un accès anonyme, laisser lo DN e lo senhal vides.",
+    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN de l'utilizaire client pel qual la ligason se deu far, per exemple uid=agent,dc=example,dc=com. Per un accès anonim, daissar lo DN e lo senhal voids.",
     "Password" : "Senhal",
-    "For anonymous access, leave DN and Password empty." : "Per un accès anonyme, laisser lo DN utilizaire e lo senhal vides.",
-    "One Base DN per line" : "Un DN de base per linha",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Podètz especificar les DN de base de vos utilizaires e gropes via l'onglet Avançat",
-    "Detect Base DN" : "Detectar lo DN de base",
-    "Test Base DN" : "Testar lo DN de base",
-    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Évite las requèstas LDAP automaticas. Mieux per las installacions de grande ampleur, mas demande des coneissenças en LDAP.",
-    "Manually enter LDAP filters (recommended for large directories)" : "Sasir los filtres LDAP manualament (recomandat per les annuaires de grande ampleur)",
-    "Limit %s access to users meeting these criteria:" : "Limiter l'accès a %s als utilizaires respectant ces critèris :",
-    "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Les classes d'objèctes fréquentes per los utilizaires son : organizationalPerson, person, user e inetOrgPerson. Se sètz pas segur de la classe a utiliser, demandez a l'administrator de l'annuaire.",
-    "The filter specifies which LDAP users shall have access to the %s instance." : "Lo filtre spécifie quels utilizaires LDAP auront accès a l'instància %s.",
-    "Verify settings and count users" : "Verificar los paramètres e compter los utilizaires",
+    "For anonymous access, leave DN and Password empty." : "Per un accès anonim, daissar lo DN utilizaire e lo senhal voids.",
+    "One Base DN per line" : "Un DN de basa per linha",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Podètz especificar los DN de basa de vòstres utilizaires e gropes via l'onglet Avançat",
+    "Detect Base DN" : "Detectar lo DN de basa",
+    "Test Base DN" : "Testar lo DN de basa",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita las requèstas LDAP automaticas. Melhor per las installacions de grand ample, mas demanda de coneissenças en LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Sasir los filtres LDAP manualament (recomandat pels annuaris de grand ample)",
+    "Limit %s access to users meeting these criteria:" : "Limitar l'accès a %s als utilizaires que respèctan aquestes critèris :",
+    "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Las classas d'objèctes frequentas pels utilizaires son : organizationalPerson, person, user e inetOrgPerson. Se sètz pas segur de la classa d'utilizar, demandatz a l'administrator de l'annuari.",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Lo filtre especifica quins utilizaires LDAP auràn accès a l'instància %s.",
+    "Verify settings and count users" : "Verificar los paramètres e comptar los utilizaires",
     "Saving" : "Enregistrament...",
     "Back" : "Retorn",
     "Continue" : "Contunhar",
     "LDAP" : "LDAP",
     "Expert" : "Expèrt",
     "Advanced" : "Avançat",
-    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap e user_webdavauth son incompatibles. Des dysfoncionaments pòdon survenir. Contactez vòstre administrator sistèma per qu'il en désactive une.",
-    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Atencion :</b> Lo module php LDAP es pas installat, per conséquent aquesta extension ne pourra fonctionner. Contactatz vòstre administrator sistèma afin qu'il l'installe.",
+    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertiment :</b> Las aplicacions user_ldap e user_webdavauth son incompatiblas. De disfoncionaments se pòdon provesir. Contactatz vòstre administrator sistèma per que ne desactive una.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Atencion :</b> Lo modul php LDAP es pas installat, per consequéncia aquesta extension poirà pas foncionar. Contactatz vòstre administrator sistèma per tal que l'installe.",
     "Connection Settings" : "Paramètres de connexion",
-    "Configuration Active" : "Configuracion active",
-    "When unchecked, this configuration will be skipped." : "Quand non cochée, la configuracion serà ignorada.",
+    "Configuration Active" : "Configuracion activa",
+    "When unchecked, this configuration will be skipped." : "Quand pas marcada, la configuracion serà ignorada.",
     "Backup (Replica) Host" : "Servidor de backup (replica)",
-    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Fournir un servidor de backup opcional.  Il deu s'agir d'una replica del servidor LDAP/AD principal.",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Provesir un servidor de backup opcional.  Se deu agir d'una replica del servidor LDAP/AD principal.",
     "Backup (Replica) Port" : "Pòrt del servidor de backup (replica)",
     "Disable Main Server" : "Desactivar lo servidor principal",
-    "Only connect to the replica server." : "Se connecter unicament a la replica",
-    "Turn off SSL certificate validation." : "Desactivar la validacion des certificats SSL",
-    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recomandat, a utiliser a des fins de tests unicament. Se la connexion ne fonctionne qu'amb aquesta option, importez lo certificat SSL del servidor LDAP dins lo servidor %s.",
-    "Cache Time-To-Live" : "Durada de vie de l'escondedor (TTL)",
-    "in seconds. A change empties the cache." : "en segondas. Tot cambiament vide l'escondedor.",
+    "Only connect to the replica server." : "Se connectar unicament a la replica",
+    "Turn off SSL certificate validation." : "Desactivar la validacion dels certificats SSL",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Pas recomandat, d'utilizar amb d'objectius de tèsts unicament. Se la connexion fonciona pas qu'amb aquesta opcion, importatz lo certificat SSL del servidor LDAP dins lo servidor %s.",
+    "Cache Time-To-Live" : "Durada de vida de l'escondedor (TTL)",
+    "in seconds. A change empties the cache." : "en segondas. Tot cambiament voida l'escondedor.",
     "Directory Settings" : "Paramètres del repertòri",
     "User Display Name Field" : "Camp \"nom d'afichatge\" de l'utilizaire",
     "The LDAP attribute to use to generate the user's display name." : "L'atribut LDAP utilizat per generar lo nom d'afichatge de l'utilizaire.",
     "Base User Tree" : "DN raiç de l'arbre utilizaires",
-    "One User Base DN per line" : "Un DN de base utilizaire per linha",
+    "One User Base DN per line" : "Un DN de basa utilizaire per linha",
     "User Search Attributes" : "Atributs de recèrca utilizaires",
     "Optional; one attribute per line" : "Opcional, un atribut per linha",
     "Group Display Name Field" : "Camp \"nom d'afichatge\" del grop",
     "The LDAP attribute to use to generate the groups's display name." : "L'atribut LDAP utilizat per generar lo nom d'afichatge del grop.",
     "Base Group Tree" : "DN raiç de l'arbre gropes",
-    "One Group Base DN per line" : "Un DN de base grop per linha",
+    "One Group Base DN per line" : "Un DN de basa grop per linha",
     "Group Search Attributes" : "Atributs de recèrca des gropes",
-    "Group-Member association" : "Association grop-membre",
-    "Nested Groups" : "Gropes imbriqués",
-    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Se activat, los gropes contenant d'autres gropes son pris en charge (fonctionne unicament se l'atribut membre del grop conten des DNs).",
+    "Group-Member association" : "Associacion grop-membre",
+    "Nested Groups" : "Gropes imbricats",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Se activat, los gropes que contenon d'autres gropes son preses en carga (fonciona unicament se l'atribut membre del grop conten de DNs).",
     "Paging chunksize" : "Paging chunksize",
-    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize utilizada per les recherches LDAP paginées qui pòdon retourner des résultats per lots coma una énumération d'utilizaires o de gropes. (Configurar a 0 per desactivar les recherches LDAP paginées)",
-    "Special Attributes" : "Atributs spéciaux",
-    "Quota Field" : "Camp del quota",
-    "Quota Default" : "Quota per defaut",
+    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize utilizada per las recèrcas LDAP paginadas que pòdon tornar de resultats per lòts coma una enumeracion d'utilizaires o de gropes. (Configurar a 0 per desactivar las recèrcas LDAP paginadas)",
+    "Special Attributes" : "Atributs especials",
+    "Quota Field" : "Camp del quòta",
+    "Quota Default" : "Quòta per defaut",
     "in bytes" : "en octets",
     "Email Field" : "Camp Email",
-    "User Home Folder Naming Rule" : "Règla de nommage del repertòri utilizaire",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide per user name (defaut). Podètz tanben especificar un atribut LDAP / AD.",
-    "Internal Username" : "Nom d'utilizaire interne",
-    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Per defaut lo nom d'utilizaire interne serà créé a partir de l'atribut UUID. Ceci permet d'assurer que lo nom d'utilizaire es unique e que les caractèrs ne nécessitent pas de conversion. Lo nom d'utilizaire interne deu contenir unicament les caractèrs seguents : [ a-zA-Z0-9_.@- ]. Les autres caractèrs son remplacés per lor correspondance ASCII o simplement omis. En cas de collision, un nombre es ajouté/incrémenté. Lo nom d'utilizaire interne es utilizat per identifier l'utilizaire al sein del sistèma. C'est tanben lo nom per defaut del repertòri utilizaire dins ownCloud. Il fait tanben partie de certains URL de services, per exemple per tous les services *DAV. Lo comportement per defaut pòt èsser modificat a l'aide de ce paramètre. Per obtenir un comportement similaire aux versions precedentas a ownCloud 5, saisir lo nom d'utilizaire a afichar dins lo camp seguent. Laisser a blanc per lo comportement per defaut. Les modifications prendront effet solament per les nouveaux (ajoutés) utilizaires LDAP.",
-    "Internal Username Attribute:" : "Nom d'utilizaire interne :",
-    "Override UUID detection" : "Passer outre la détection des UUID",
-    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Per defaut, l'atribut UUID es automaticament  detectat. Aqueste attribut es utilizat per identifier los utilizaires e gropes de façon fiable. Un nom d'utilizaire interne basé sus l'UUID serà automaticament créé, sauf s'il es especificat autrement çaisús. Podètz modificar ce comportement e définir l'atribut de votre choix. Vos cal alors vous assurer que l'atribut de votre choix pòt èsser recuperat per los utilizaires ainsi que per los gropes e qu'il soit unique. Laisser a blanc per lo comportement per defaut. Les modifications seront effectives unicament per les nouveaux (ajoutés) utilizaires e gropes LDAP.",
-    "UUID Attribute for Users:" : "Atribut UUID per les Utilizaires :",
-    "UUID Attribute for Groups:" : "Atribut UUID per los Gropes :",
-    "Username-LDAP User Mapping" : "Association Nom d'utilizaire-Utilizaire LDAP",
-    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Les noms d'utilizaires son utilizats per lo stockage e l'assignation de (meta) donadas. Per identifier e reconéisser précisément los utilizaires, cada utilizaire LDAP aura un nom interne spécifique. Cela requerís l'associacion d'un nom d'utilizaire ownCloud a un nom d'utilizaire LDAP. Lo nom d'utilizaire créé es associat a l'atribut UUID de l'utilizaire LDAP. Per ailleurs, lo DN es mémorisé en cache per limiter les interactions LDAP mas il es pas utilizat per l'identification. Se lo DN es modificat, ces modifications seront retrobadas. Seul lo nom interne a ownCloud es utilizat al sein del produit. Suprimir les associations creara des orphelins e l'action affectera totas les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mas unicament sus des environaments de tests e d'expérimentations.",
-    "Clear Username-LDAP User Mapping" : "Suprimir l'associacion utilizaire interne-utilizaire LDAP",
+    "User Home Folder Naming Rule" : "Règla de nomenatge del repertòri utilizaire",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Daissar void per user name (defaut). Podètz tanben especificar un atribut LDAP / AD.",
+    "Internal Username" : "Nom d'utilizaire intèrne",
+    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Per defaut lo nom d'utilizaire intèrne serà creat a partir de l'atribut UUID. Aquò permet d'assegurar que lo nom d'utilizaire es unic e que los caractèrs necessitan pas de conversion. Lo nom d'utilizaire intèrne deu contenir unicament los caractèrs seguents : [ a-zA-Z0-9_.@- ]. Los autres caractèrs son remplaçats per lor correspondéncia ASCII o simplament omeses. En cas de collision, un nombre es apondut/incrementat. Lo nom d'utilizaire intèrne es utilizat per identificar l'utilizaire al dintre del sistèma. Es tanben lo nom per defaut del repertòri utilizaire dins ownCloud. Fa tanben partida de certans URL de servicis, per exemple per totes los servicis *DAV. Lo comportament per defaut pòt èsser modificat amb l'ajuda d'aqueste paramètre. Per obtenir un comportament similar a las versions precedentas a ownCloud 5, sasir lo nom d'utilizaire d'afichar dins lo camp seguent. Daissar a blanc pel comportement per defaut. Las modificacions prendràn efièch solament pels novèls (aponduts) utilizaires LDAP.",
+    "Internal Username Attribute:" : "Nom d'utilizaire intèrne :",
+    "Override UUID detection" : "Passar outra la deteccion des UUID",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Per defaut, l'atribut UUID es detectat automaticament. Aqueste atribut es utilizat per identificar los utilizaires e gropes de faiçon fisabla. Un nom d'utilizaire intèrne basat sus l'UUID serà automaticament creat, levat s'es especificat autrament çaisús. Podètz modificar aqueste comportament e definir l'atribut que volètz. Vos cal alara vos assegurar que l'atribut que volètz pòt èsser recuperat pels utilizaires e tanben pels gropes e que siá unic. Daissar a blanc pel comportament per defaut. Las modificacions seràn efectivas unicament pels novèls (aponduts) utilizaires e gropes LDAP.",
+    "UUID Attribute for Users:" : "Atribut UUID pels Utilizaires :",
+    "UUID Attribute for Groups:" : "Atribut UUID pels Gropes :",
+    "Username-LDAP User Mapping" : "Associacion Nom d'utilizaire-Utilizaire LDAP",
+    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Los noms d'utilizaires son utilizats per l'emmagazinatge e l'assignacion de (meta) donadas. Per identificar e reconéisser precisament los utilizaires, cada utilizaire LDAP aurà un nom intèrne especific. Aquò requerís l'associacion d'un nom d'utilizaire ownCloud a un nom d'utilizaire LDAP. Lo nom d'utilizaire creat es associat a l'atribut UUID de l'utilizaire LDAP. Amai, lo DN es memorizat en escondedor per limitar las interaccions LDAP mas es pas utilizat per l'identificacion. Se lo DN es modificat, aquelas modificacions seràn retrobadas. Sol lo nom intèrne a ownCloud es utilizat al dintre del produch. Suprimir las associacions crearà d'orfanèls e l'accion afectarà totas las configuracions LDAP. SUPRIMISSÈTZ PAS JAMAI LAS ASSOCIACIONS EN ENVIRONAMENT DE PRODUCCION, mas unicament sus d'environaments de tèsts e d'experimentacions.",
+    "Clear Username-LDAP User Mapping" : "Suprimir l'associacion utilizaire intèrne-utilizaire LDAP",
     "Clear Groupname-LDAP Group Mapping" : "Suprimir l'associacion nom de grop-grop LDAP"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/user_ldap/l10n/oc.json b/apps/user_ldap/l10n/oc.json
index e39a43a6594..c7489f3f2b4 100644
--- a/apps/user_ldap/l10n/oc.json
+++ b/apps/user_ldap/l10n/oc.json
@@ -3,46 +3,46 @@
     "Failed to delete the server configuration" : "Fracàs de la supression de la configuracion del servidor",
     "The configuration is invalid: anonymous bind is not allowed." : "La configuracion es pas valida : lo ligam anonim es pas autorizat.",
     "The configuration is valid and the connection could be established!" : "La configuracion es valida e la connexion pòt èsser establida !",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuracion es valable, mas lo bind a fracassat. Verificatz los paramètres del servidor ainsi que vos identificants de connexion.",
-    "The configuration is invalid. Please have a look at the logs for further details." : "La configuracion es pas valable. Consultatz les logs per mai de detalhs.",
-    "No action specified" : "Aucune action especificada",
-    "No configuration specified" : "Aucune configuration especificada",
-    "No data specified" : "Aucune donada especificada",
-    " Could not set configuration %s" : "Impossible de especificar la configuracion %s",
-    "Action does not exist" : "L'action n'existe pas",
-    "The Base DN appears to be wrong" : "Lo DN de base es erroné",
-    "Configuration incorrect" : "Configuracion incorrecte",
-    "Configuration incomplete" : "Configuracion incomplète",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuracion es valabla, mas lo bind a fracassat. Verificatz los paramètres del servidor e tanben vòstres identificants de connexion.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configuracion es pas valabla. Consultatz los logs per mai de detalhs.",
+    "No action specified" : "Cap d'accion pas especificada",
+    "No configuration specified" : "Cap de configuration pas especificada",
+    "No data specified" : "Cap de donada pas especificada",
+    " Could not set configuration %s" : "Impossible d'especificar la configuracion %s",
+    "Action does not exist" : "L'accion existís pas",
+    "The Base DN appears to be wrong" : "Lo DN de basa es erronèu",
+    "Configuration incorrect" : "Configuracion incorrècta",
+    "Configuration incomplete" : "Configuracion incompleta",
     "Configuration OK" : "Configuracion OK",
-    "Select groups" : "Seleccionnez los gropes",
-    "Select object classes" : "Seleccionar les classes d'objècte",
-    "Please check the credentials, they seem to be wrong." : "Verificatz vos informations d'identification",
-    "Please specify the port, it could not be auto-detected." : "Veuillez especificar lo pòrt, il n'a pu èsser detectat automaticament",
-    "Base DN could not be auto-detected, please revise credentials, host and port." : "Lo DN de base n'a pu èsser detectat automaticament. Verificatz les informations d'identification, l'hôte e lo pòrt.",
-    "Could not detect Base DN, please enter it manually." : "Impossible de detectar lo DN de base, veuillez lo especificar manualament",
+    "Select groups" : "Seleccionatz los gropes",
+    "Select object classes" : "Seleccionar las classas d'objècte",
+    "Please check the credentials, they seem to be wrong." : "Verificatz vòstras informacions d'identificacion",
+    "Please specify the port, it could not be auto-detected." : "Especificatz lo pòrt, a pas pogut èsser detectat automaticament",
+    "Base DN could not be auto-detected, please revise credentials, host and port." : "Lo DN de basa a pas pogut èsser detectat automaticament. Verificatz las informacions d'identificacion, l'òste e lo pòrt.",
+    "Could not detect Base DN, please enter it manually." : "Impossible de detectar lo DN de basa, especificatz-lo manualament",
     "{nthServer}. Server" : "{nthServer}. Servidor",
-    "No object found in the given Base DN. Please revise." : "Aucun objècte trobat dins lo DN de base especificat. Veuillez lo verificar.",
-    "More than 1.000 directory entries available." : "I a plus de 1000 entradas de repertòri disponibles.",
-    " entries available within the provided Base DN" : "entradas disponibles dins lo DN de base especificat",
-    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Una error es survenue. Verificatz lo DN de base, ainsi que los paramètres de connexion e les informations d'identification",
+    "No object found in the given Base DN. Please revise." : "Cap d'objècte pas trobat dins lo DN de basa especificat. Verificatz-lo.",
+    "More than 1.000 directory entries available." : "I a mai de 1000 entradas de repertòri disponiblas.",
+    " entries available within the provided Base DN" : "entradas disponiblas dins lo DN de basa especificat",
+    "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Una error s'es produsida. Verificatz lo DN de basa, e tanben los paramètres de connexion e las informacions d'identificacion.",
     "Do you really want to delete the current Server Configuration?" : "Sètz segur que volètz escafar la configuracion servidor actuala ?",
-    "Confirm Deletion" : "Confirmer la supression",
-    "Mappings cleared successfully!" : "Associations suprimidas amb succès !",
-    "Error while clearing the mappings." : "Error al moment de la supression des associations.",
+    "Confirm Deletion" : "Confirmar la supression",
+    "Mappings cleared successfully!" : "Associacions suprimidas amb succès !",
+    "Error while clearing the mappings." : "Error al moment de la supression de las associacions.",
     "Anonymous bind is not allowed. Please provide a User DN and Password." : "Lo ligam anonim es pas autorizat. Mercé de provesir lo DN d'un utilizaire e un senhal.",
-    "LDAP Operations error. Anonymous bind might not be allowed." : "Error LDAP. La connexion anonyme al servidor n'est probablement pas acceptada.",
-    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "La salvament a fracassat. Verificatz que la banca de donadas es opérationnelle. Rechargez avant de contunhar.",
-    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Changer de mode activera las requèstas LDAP automatiques. Selon la taille de votre annuaire LDAP, cela pòt prendre del temps. Volètz toujours changer de mode ?",
-    "Mode switch" : "Changer de mode",
+    "LDAP Operations error. Anonymous bind might not be allowed." : "Error LDAP. La connexion anonima al servidor es probablament pas acceptada.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Lo salvament a fracassat. Verificatz que la banca de donadas es operacionala. Recargatz abans de contunhar.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiar de mòde activarà las requèstas LDAP automaticas. Segon la talha de vòstre annuari LDAP, aquò pòt préner del temps. Volètz totjorn cambiar de mòde ?",
+    "Mode switch" : "Cambiar de mòde",
     "Select attributes" : "Seleccionar los atributs",
-    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilizaire introuvable. Verificatz los atributs de login e lo nom d'utilizaire. Filtre effectif (à copier-coller per valider en ligne de commande):<br/>",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilizaire introbable. Verificatz los atributs de login e lo nom d'utilizaire. Filtre efectiu (de copiar-pegar per validar en linha de comanda):<br/>",
     "User found and settings verified." : "Utilizaire trobat e paramètres verificats.",
-    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres verificats, mas seul lo premier utilizaire pourra se connecter. Utilizatz plutôt un filtre mens restrictif.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres verificats, mas sol lo primièr utilizaire se poirà connectar. Utilizatz puslèu un filtre mens restrictiu.",
     "An unspecified error occurred. Please check the settings and the log." : "Una error desconeguda s'es produsida. Verificatz los paramètres e lo log.",
-    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Lo filtre de recèrca es pas valide, probablement a cause de problèmas de syntaxe tels que des parenthèses manquantes. Veuillez lo corriger.",
-    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Una error s'es produsida al moment de la connexion al LDAP / AD. Verificatz l'hôte, lo pòrt e les informations d'identification.",
-    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "La chaîne %uid es manquante. Aquesta chaîne es remplacée per l'identificant de connexion al moment des requèstas LDAP / AD.",
-    "Please provide a login name to test against" : "Veuillez indiquer un identificant de connexion amb lequel tester.",
+    "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Lo filtre de recèrca es pas valid, probablament a causa de problèmas de sintaxi tals coma de parentèsis mancantas. Corregissètz-los.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Una error s'es produsida al moment de la connexion al LDAP / AD. Verificatz l'òste, lo pòrt e las informacions d'identificacion.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "La cadena %uid es mancanta. Aquesta cadena es remplaçada per l'identificant de connexion al moment de las requèstas LDAP / AD.",
+    "Please provide a login name to test against" : "Indicatz un identificant de connexion amb lo qual cal testar.",
     "The group box was disabled, because the LDAP / AD server does not support memberOf." : "Los gropes son desactivats perque lo servidor LDAP / AD pren pas en carga memberOf.",
     "_%s group found_::_%s groups found_" : ["%s grop trobat","%s gropes trobats"],
     "_%s user found_::_%s users found_" : ["%s utilizaire trobat","%s utilizaires trobats"],
@@ -63,15 +63,15 @@
     "Selected groups" : "Gropes seleccionats",
     "Edit LDAP Query" : "Modificar la requèsta LDAP",
     "LDAP Filter:" : "Filtre LDAP :",
-    "The filter specifies which LDAP groups shall have access to the %s instance." : "Lo filtre spécifie quels gropes LDAP ont accès a l'instància %s.",
-    "Verify settings and count groups" : "Verificar los paramètres e compter los gropes",
-    "When logging in, %s will find the user based on the following attributes:" : "Au login, %s cercarà l'utilizaire sus base de ces attributs :",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Lo filtre especifica quins gropes LDAP an accès a l'instància %s.",
+    "Verify settings and count groups" : "Verificar los paramètres e comptar los gropes",
+    "When logging in, %s will find the user based on the following attributes:" : "Al login, %s cercarà l'utilizaire sus basa d'aquestes atributs :",
     "LDAP / AD Username:" : "Nom d'utilizaire LDAP / AD :",
-    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Autorizar lo login amb lo nom d'utilizaire LDAP / AD (uid o samaccountname, la détection es automatique). ",
-    "LDAP / AD Email Address:" : "Adresse mail LDAP / AD :",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "Autorizar lo login amb lo nom d'utilizaire LDAP / AD (uid o samaccountname, la deteccion es automatica). ",
+    "LDAP / AD Email Address:" : "Adreça mail LDAP / AD :",
     "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Autorizar lo login amb una adreça mail. Mail e mailPrimaryAddress son autorizats.",
-    "Other Attributes:" : "Autres attributs :",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Définit lo filtre a aplicar al moment d'una tentative de connexion. %%uid remplace lo nom d'utilizaire. Exemple : \"uid=%%uid\"",
+    "Other Attributes:" : "Autres atributs :",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definís lo filtre d'aplicar al moment d'una temptativa de connexion. %%uid remplaça lo nom d'utilizaire. Exemple : \"uid=%%uid\"",
     "Test Loginname" : "Loginname de tèst",
     "Verify settings" : "Testar los paramètres",
     "1. Server" : "1. Servidor",
@@ -80,77 +80,77 @@
     "Copy current configuration into new directory binding" : "Copiar la configuracion actuala cap a una novèla",
     "Delete the current configuration" : "Suprimir la configuracion actuala",
     "Host" : "Òste",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podètz omettre lo protocòl, levat se avètz besonh de SSL. Dins aqueste cas, prefixatz amb ldaps://",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podètz ometre lo protocòl, levat se avètz besonh de SSL. Dins aqueste cas, prefixatz amb ldaps://",
     "Port" : "Pòrt",
     "Detect Port" : "Detectar lo pòrt",
     "User DN" : "DN Utilizaire",
-    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN de l'utilizaire client per lequel la liaison deu se faire, per exemple uid=agent,dc=example,dc=com. Per un accès anonyme, laisser lo DN e lo senhal vides.",
+    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "DN de l'utilizaire client pel qual la ligason se deu far, per exemple uid=agent,dc=example,dc=com. Per un accès anonim, daissar lo DN e lo senhal voids.",
     "Password" : "Senhal",
-    "For anonymous access, leave DN and Password empty." : "Per un accès anonyme, laisser lo DN utilizaire e lo senhal vides.",
-    "One Base DN per line" : "Un DN de base per linha",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Podètz especificar les DN de base de vos utilizaires e gropes via l'onglet Avançat",
-    "Detect Base DN" : "Detectar lo DN de base",
-    "Test Base DN" : "Testar lo DN de base",
-    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Évite las requèstas LDAP automaticas. Mieux per las installacions de grande ampleur, mas demande des coneissenças en LDAP.",
-    "Manually enter LDAP filters (recommended for large directories)" : "Sasir los filtres LDAP manualament (recomandat per les annuaires de grande ampleur)",
-    "Limit %s access to users meeting these criteria:" : "Limiter l'accès a %s als utilizaires respectant ces critèris :",
-    "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Les classes d'objèctes fréquentes per los utilizaires son : organizationalPerson, person, user e inetOrgPerson. Se sètz pas segur de la classe a utiliser, demandez a l'administrator de l'annuaire.",
-    "The filter specifies which LDAP users shall have access to the %s instance." : "Lo filtre spécifie quels utilizaires LDAP auront accès a l'instància %s.",
-    "Verify settings and count users" : "Verificar los paramètres e compter los utilizaires",
+    "For anonymous access, leave DN and Password empty." : "Per un accès anonim, daissar lo DN utilizaire e lo senhal voids.",
+    "One Base DN per line" : "Un DN de basa per linha",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Podètz especificar los DN de basa de vòstres utilizaires e gropes via l'onglet Avançat",
+    "Detect Base DN" : "Detectar lo DN de basa",
+    "Test Base DN" : "Testar lo DN de basa",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita las requèstas LDAP automaticas. Melhor per las installacions de grand ample, mas demanda de coneissenças en LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Sasir los filtres LDAP manualament (recomandat pels annuaris de grand ample)",
+    "Limit %s access to users meeting these criteria:" : "Limitar l'accès a %s als utilizaires que respèctan aquestes critèris :",
+    "The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin." : "Las classas d'objèctes frequentas pels utilizaires son : organizationalPerson, person, user e inetOrgPerson. Se sètz pas segur de la classa d'utilizar, demandatz a l'administrator de l'annuari.",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Lo filtre especifica quins utilizaires LDAP auràn accès a l'instància %s.",
+    "Verify settings and count users" : "Verificar los paramètres e comptar los utilizaires",
     "Saving" : "Enregistrament...",
     "Back" : "Retorn",
     "Continue" : "Contunhar",
     "LDAP" : "LDAP",
     "Expert" : "Expèrt",
     "Advanced" : "Avançat",
-    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap e user_webdavauth son incompatibles. Des dysfoncionaments pòdon survenir. Contactez vòstre administrator sistèma per qu'il en désactive une.",
-    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Atencion :</b> Lo module php LDAP es pas installat, per conséquent aquesta extension ne pourra fonctionner. Contactatz vòstre administrator sistèma afin qu'il l'installe.",
+    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertiment :</b> Las aplicacions user_ldap e user_webdavauth son incompatiblas. De disfoncionaments se pòdon provesir. Contactatz vòstre administrator sistèma per que ne desactive una.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Atencion :</b> Lo modul php LDAP es pas installat, per consequéncia aquesta extension poirà pas foncionar. Contactatz vòstre administrator sistèma per tal que l'installe.",
     "Connection Settings" : "Paramètres de connexion",
-    "Configuration Active" : "Configuracion active",
-    "When unchecked, this configuration will be skipped." : "Quand non cochée, la configuracion serà ignorada.",
+    "Configuration Active" : "Configuracion activa",
+    "When unchecked, this configuration will be skipped." : "Quand pas marcada, la configuracion serà ignorada.",
     "Backup (Replica) Host" : "Servidor de backup (replica)",
-    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Fournir un servidor de backup opcional.  Il deu s'agir d'una replica del servidor LDAP/AD principal.",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Provesir un servidor de backup opcional.  Se deu agir d'una replica del servidor LDAP/AD principal.",
     "Backup (Replica) Port" : "Pòrt del servidor de backup (replica)",
     "Disable Main Server" : "Desactivar lo servidor principal",
-    "Only connect to the replica server." : "Se connecter unicament a la replica",
-    "Turn off SSL certificate validation." : "Desactivar la validacion des certificats SSL",
-    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recomandat, a utiliser a des fins de tests unicament. Se la connexion ne fonctionne qu'amb aquesta option, importez lo certificat SSL del servidor LDAP dins lo servidor %s.",
-    "Cache Time-To-Live" : "Durada de vie de l'escondedor (TTL)",
-    "in seconds. A change empties the cache." : "en segondas. Tot cambiament vide l'escondedor.",
+    "Only connect to the replica server." : "Se connectar unicament a la replica",
+    "Turn off SSL certificate validation." : "Desactivar la validacion dels certificats SSL",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Pas recomandat, d'utilizar amb d'objectius de tèsts unicament. Se la connexion fonciona pas qu'amb aquesta opcion, importatz lo certificat SSL del servidor LDAP dins lo servidor %s.",
+    "Cache Time-To-Live" : "Durada de vida de l'escondedor (TTL)",
+    "in seconds. A change empties the cache." : "en segondas. Tot cambiament voida l'escondedor.",
     "Directory Settings" : "Paramètres del repertòri",
     "User Display Name Field" : "Camp \"nom d'afichatge\" de l'utilizaire",
     "The LDAP attribute to use to generate the user's display name." : "L'atribut LDAP utilizat per generar lo nom d'afichatge de l'utilizaire.",
     "Base User Tree" : "DN raiç de l'arbre utilizaires",
-    "One User Base DN per line" : "Un DN de base utilizaire per linha",
+    "One User Base DN per line" : "Un DN de basa utilizaire per linha",
     "User Search Attributes" : "Atributs de recèrca utilizaires",
     "Optional; one attribute per line" : "Opcional, un atribut per linha",
     "Group Display Name Field" : "Camp \"nom d'afichatge\" del grop",
     "The LDAP attribute to use to generate the groups's display name." : "L'atribut LDAP utilizat per generar lo nom d'afichatge del grop.",
     "Base Group Tree" : "DN raiç de l'arbre gropes",
-    "One Group Base DN per line" : "Un DN de base grop per linha",
+    "One Group Base DN per line" : "Un DN de basa grop per linha",
     "Group Search Attributes" : "Atributs de recèrca des gropes",
-    "Group-Member association" : "Association grop-membre",
-    "Nested Groups" : "Gropes imbriqués",
-    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Se activat, los gropes contenant d'autres gropes son pris en charge (fonctionne unicament se l'atribut membre del grop conten des DNs).",
+    "Group-Member association" : "Associacion grop-membre",
+    "Nested Groups" : "Gropes imbricats",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Se activat, los gropes que contenon d'autres gropes son preses en carga (fonciona unicament se l'atribut membre del grop conten de DNs).",
     "Paging chunksize" : "Paging chunksize",
-    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize utilizada per les recherches LDAP paginées qui pòdon retourner des résultats per lots coma una énumération d'utilizaires o de gropes. (Configurar a 0 per desactivar les recherches LDAP paginées)",
-    "Special Attributes" : "Atributs spéciaux",
-    "Quota Field" : "Camp del quota",
-    "Quota Default" : "Quota per defaut",
+    "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "Chunksize utilizada per las recèrcas LDAP paginadas que pòdon tornar de resultats per lòts coma una enumeracion d'utilizaires o de gropes. (Configurar a 0 per desactivar las recèrcas LDAP paginadas)",
+    "Special Attributes" : "Atributs especials",
+    "Quota Field" : "Camp del quòta",
+    "Quota Default" : "Quòta per defaut",
     "in bytes" : "en octets",
     "Email Field" : "Camp Email",
-    "User Home Folder Naming Rule" : "Règla de nommage del repertòri utilizaire",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide per user name (defaut). Podètz tanben especificar un atribut LDAP / AD.",
-    "Internal Username" : "Nom d'utilizaire interne",
-    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Per defaut lo nom d'utilizaire interne serà créé a partir de l'atribut UUID. Ceci permet d'assurer que lo nom d'utilizaire es unique e que les caractèrs ne nécessitent pas de conversion. Lo nom d'utilizaire interne deu contenir unicament les caractèrs seguents : [ a-zA-Z0-9_.@- ]. Les autres caractèrs son remplacés per lor correspondance ASCII o simplement omis. En cas de collision, un nombre es ajouté/incrémenté. Lo nom d'utilizaire interne es utilizat per identifier l'utilizaire al sein del sistèma. C'est tanben lo nom per defaut del repertòri utilizaire dins ownCloud. Il fait tanben partie de certains URL de services, per exemple per tous les services *DAV. Lo comportement per defaut pòt èsser modificat a l'aide de ce paramètre. Per obtenir un comportement similaire aux versions precedentas a ownCloud 5, saisir lo nom d'utilizaire a afichar dins lo camp seguent. Laisser a blanc per lo comportement per defaut. Les modifications prendront effet solament per les nouveaux (ajoutés) utilizaires LDAP.",
-    "Internal Username Attribute:" : "Nom d'utilizaire interne :",
-    "Override UUID detection" : "Passer outre la détection des UUID",
-    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Per defaut, l'atribut UUID es automaticament  detectat. Aqueste attribut es utilizat per identifier los utilizaires e gropes de façon fiable. Un nom d'utilizaire interne basé sus l'UUID serà automaticament créé, sauf s'il es especificat autrement çaisús. Podètz modificar ce comportement e définir l'atribut de votre choix. Vos cal alors vous assurer que l'atribut de votre choix pòt èsser recuperat per los utilizaires ainsi que per los gropes e qu'il soit unique. Laisser a blanc per lo comportement per defaut. Les modifications seront effectives unicament per les nouveaux (ajoutés) utilizaires e gropes LDAP.",
-    "UUID Attribute for Users:" : "Atribut UUID per les Utilizaires :",
-    "UUID Attribute for Groups:" : "Atribut UUID per los Gropes :",
-    "Username-LDAP User Mapping" : "Association Nom d'utilizaire-Utilizaire LDAP",
-    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Les noms d'utilizaires son utilizats per lo stockage e l'assignation de (meta) donadas. Per identifier e reconéisser précisément los utilizaires, cada utilizaire LDAP aura un nom interne spécifique. Cela requerís l'associacion d'un nom d'utilizaire ownCloud a un nom d'utilizaire LDAP. Lo nom d'utilizaire créé es associat a l'atribut UUID de l'utilizaire LDAP. Per ailleurs, lo DN es mémorisé en cache per limiter les interactions LDAP mas il es pas utilizat per l'identification. Se lo DN es modificat, ces modifications seront retrobadas. Seul lo nom interne a ownCloud es utilizat al sein del produit. Suprimir les associations creara des orphelins e l'action affectera totas les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mas unicament sus des environaments de tests e d'expérimentations.",
-    "Clear Username-LDAP User Mapping" : "Suprimir l'associacion utilizaire interne-utilizaire LDAP",
+    "User Home Folder Naming Rule" : "Règla de nomenatge del repertòri utilizaire",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Daissar void per user name (defaut). Podètz tanben especificar un atribut LDAP / AD.",
+    "Internal Username" : "Nom d'utilizaire intèrne",
+    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Per defaut lo nom d'utilizaire intèrne serà creat a partir de l'atribut UUID. Aquò permet d'assegurar que lo nom d'utilizaire es unic e que los caractèrs necessitan pas de conversion. Lo nom d'utilizaire intèrne deu contenir unicament los caractèrs seguents : [ a-zA-Z0-9_.@- ]. Los autres caractèrs son remplaçats per lor correspondéncia ASCII o simplament omeses. En cas de collision, un nombre es apondut/incrementat. Lo nom d'utilizaire intèrne es utilizat per identificar l'utilizaire al dintre del sistèma. Es tanben lo nom per defaut del repertòri utilizaire dins ownCloud. Fa tanben partida de certans URL de servicis, per exemple per totes los servicis *DAV. Lo comportament per defaut pòt èsser modificat amb l'ajuda d'aqueste paramètre. Per obtenir un comportament similar a las versions precedentas a ownCloud 5, sasir lo nom d'utilizaire d'afichar dins lo camp seguent. Daissar a blanc pel comportement per defaut. Las modificacions prendràn efièch solament pels novèls (aponduts) utilizaires LDAP.",
+    "Internal Username Attribute:" : "Nom d'utilizaire intèrne :",
+    "Override UUID detection" : "Passar outra la deteccion des UUID",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Per defaut, l'atribut UUID es detectat automaticament. Aqueste atribut es utilizat per identificar los utilizaires e gropes de faiçon fisabla. Un nom d'utilizaire intèrne basat sus l'UUID serà automaticament creat, levat s'es especificat autrament çaisús. Podètz modificar aqueste comportament e definir l'atribut que volètz. Vos cal alara vos assegurar que l'atribut que volètz pòt èsser recuperat pels utilizaires e tanben pels gropes e que siá unic. Daissar a blanc pel comportament per defaut. Las modificacions seràn efectivas unicament pels novèls (aponduts) utilizaires e gropes LDAP.",
+    "UUID Attribute for Users:" : "Atribut UUID pels Utilizaires :",
+    "UUID Attribute for Groups:" : "Atribut UUID pels Gropes :",
+    "Username-LDAP User Mapping" : "Associacion Nom d'utilizaire-Utilizaire LDAP",
+    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Los noms d'utilizaires son utilizats per l'emmagazinatge e l'assignacion de (meta) donadas. Per identificar e reconéisser precisament los utilizaires, cada utilizaire LDAP aurà un nom intèrne especific. Aquò requerís l'associacion d'un nom d'utilizaire ownCloud a un nom d'utilizaire LDAP. Lo nom d'utilizaire creat es associat a l'atribut UUID de l'utilizaire LDAP. Amai, lo DN es memorizat en escondedor per limitar las interaccions LDAP mas es pas utilizat per l'identificacion. Se lo DN es modificat, aquelas modificacions seràn retrobadas. Sol lo nom intèrne a ownCloud es utilizat al dintre del produch. Suprimir las associacions crearà d'orfanèls e l'accion afectarà totas las configuracions LDAP. SUPRIMISSÈTZ PAS JAMAI LAS ASSOCIACIONS EN ENVIRONAMENT DE PRODUCCION, mas unicament sus d'environaments de tèsts e d'experimentacions.",
+    "Clear Username-LDAP User Mapping" : "Suprimir l'associacion utilizaire intèrne-utilizaire LDAP",
     "Clear Groupname-LDAP Group Mapping" : "Suprimir l'associacion nom de grop-grop LDAP"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index 2170def2922..d323732e061 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -44,8 +44,11 @@ OC.L10N.register(
     "Test Configuration" : "Testar a configuração",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Grupos que satisfazerem estes critérios estão disponíveis em %s:",
+    "Available groups" : "Grupos disponiveis",
     "Selected groups" : "Grupos seleccionados",
+    "LDAP Filter:" : "Filtro LDAP:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.",
+    "LDAP / AD Username:" : "Nome de Utilizador LDAP / AD:",
     "Other Attributes:" : "Outros Atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"",
     "Verify settings" : "Verificar definições",
@@ -62,10 +65,13 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
     "One Base DN per line" : "Uma base DN por linho",
     "You can specify Base DN for users and groups in the Advanced tab" : "Pode especificar o ND Base para utilizadores e grupos no separador Avançado",
+    "Detect Base DN" : "Detectar Base DN",
+    "Test Base DN" : "Testar Base DN",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita pedidos LDAP automáticos. Melhor para grandes configurações, mas requer conhecimentos LDAP.",
     "Manually enter LDAP filters (recommended for large directories)" : "Introduzir filtros LDAP manualmente (recomendado para directórios grandes)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acesso a %s de utilizadores com estes critérios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais utilizadores do LDAP devem ter acesso  à instância %s.",
+    "Verify settings and count users" : "Verificar definições e contar utilizadores",
     "Saving" : "Guardando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index f6fd6e48067..409b1873d10 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -42,8 +42,11 @@
     "Test Configuration" : "Testar a configuração",
     "Help" : "Ajuda",
     "Groups meeting these criteria are available in %s:" : "Grupos que satisfazerem estes critérios estão disponíveis em %s:",
+    "Available groups" : "Grupos disponiveis",
     "Selected groups" : "Grupos seleccionados",
+    "LDAP Filter:" : "Filtro LDAP:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.",
+    "LDAP / AD Username:" : "Nome de Utilizador LDAP / AD:",
     "Other Attributes:" : "Outros Atributos:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"",
     "Verify settings" : "Verificar definições",
@@ -60,10 +63,13 @@
     "For anonymous access, leave DN and Password empty." : "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
     "One Base DN per line" : "Uma base DN por linho",
     "You can specify Base DN for users and groups in the Advanced tab" : "Pode especificar o ND Base para utilizadores e grupos no separador Avançado",
+    "Detect Base DN" : "Detectar Base DN",
+    "Test Base DN" : "Testar Base DN",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita pedidos LDAP automáticos. Melhor para grandes configurações, mas requer conhecimentos LDAP.",
     "Manually enter LDAP filters (recommended for large directories)" : "Introduzir filtros LDAP manualmente (recomendado para directórios grandes)",
     "Limit %s access to users meeting these criteria:" : "Limitar o acesso a %s de utilizadores com estes critérios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais utilizadores do LDAP devem ter acesso  à instância %s.",
+    "Verify settings and count users" : "Verificar definições e contar utilizadores",
     "Saving" : "Guardando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 6661318154b..3ee5bdf13db 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Aktualizováno z \"%s\" na %s",
     "Repair warning: " : "Upozornění opravy:",
     "Repair error: " : "Chyba opravy:",
+    "Reset log level to  \"%s\"" : "Vrátit úroveň logování na \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Následující nekompatibilní aplikace byly zakázány: %s",
     "Following apps have been disabled: %s" : "Následující aplikace byly vypnuty: %s",
     "Already up to date" : "Je již aktuální",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index bb7e050231c..5f7ed392629 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -10,6 +10,7 @@
     "Updated \"%s\" to %s" : "Aktualizováno z \"%s\" na %s",
     "Repair warning: " : "Upozornění opravy:",
     "Repair error: " : "Chyba opravy:",
+    "Reset log level to  \"%s\"" : "Vrátit úroveň logování na \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Následující nekompatibilní aplikace byly zakázány: %s",
     "Following apps have been disabled: %s" : "Následující aplikace byly vypnuty: %s",
     "Already up to date" : "Je již aktuální",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 91859d31998..04a71f813b8 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Frissítettük  \"%s\"-t erre: %s",
     "Repair warning: " : "Javítás figyelmeztetés:",
     "Repair error: " : "Javítás hiba:",
+    "Set log level to debug - current level: \"%s\"" : "Hibakeresési naplózási szint beállítása - jelenlegi szint: \"%s\"",
+    "Reset log level to  \"%s\"" : "Naplózási szint visszaállítása \"%s\"-re",
     "Following incompatible apps have been disabled: %s" : "A következő nem kompatibilis applikációk lettek tiltva: %s",
     "Following apps have been disabled: %s" : "A következő applikációk lettek tiltva: %s",
     "Already up to date" : "Már a legfrissebb változat",
@@ -105,6 +107,7 @@ OC.L10N.register(
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nem lett gyorsítótár memória beállítva. A teljesítmény növeléséhez kérem állítson be gyorsítótárat, ha lehetséges. További információ található az alábbi <a href=\"{docLink}\">dokumentációban</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "a /dev/urandom eszköz nem elérhető PHP-ből, ami nagyon nagy biztonsági problémát jelent. További információ található az alábbi <a href=\"{docLink}\">dokumentációban</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A PHP verziód ({version}) már nem <a href=\"{phpLink}\">támogatott a PHP által</a>. Javasoljuk, hogy frissítsd a PHP verziót, hogy kihasználd a teljesítménybeli és biztonsági javításokat.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "A fordított proxy fejlécek konfigurációs beállításai helytelenek, vagy egy megbízható proxy-ból próbálja az ownCloud-ot elérni. Ha nem megbízható proxy-ból próbálja elérni az ownCloud-ot, akkor ez egy biztonsági probléma, a támadó az ownCloud számára látható IP cím csalást tud végrehajtani. További információ található a <a href=\"{docLink}\">dokumentációban</a>.",
     "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "A \"{header}\" HTTP fejléc nincs beállítva, hogy megegyezzen az elvárttal \"{expected}\". Ez egy potenciális biztonsági kockázat és kérjük, hogy változtassa meg a beállításokat.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "A \"Strict-Transport-Security\" HTTP fejléc nincs beállítva hogy \"{seconds}\" másodpercig tartson. Biztonsági okokból ajánljuk, hogy engedélyezze a HSTS, ahogyan ezt részletezzük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban.",
@@ -144,6 +147,7 @@ OC.L10N.register(
     "change" : "változtatás",
     "delete" : "töröl",
     "access control" : "jogosultság",
+    "Share details could not be loaded for this item." : "A megosztás részletei nem lehet betölteni ehhez az elemhez.",
     "An error occured. Please try again" : "Hiba történt. Kérjük, próbáld újra!",
     "Share" : "Megosztás",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Megosztás más ownCloud szerverekkel, a következő formátum használatával felhasznalo@példa.com/owncloud",
@@ -180,6 +184,8 @@ OC.L10N.register(
     "New Password" : "Új jelszó",
     "Reset password" : "Jelszó-visszaállítás",
     "Searching other places" : "Keresés más helyeken",
+    "No search results in other folders" : "Nincs keresési eredmény a másik könyvtárakban",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} keresési eredmény egy másik könyvtárban","{count} keresési eredmény más könyvtárakban"],
     "Personal" : "Személyes",
     "Users" : "Felhasználók",
     "Apps" : "Alkalmazások",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 48bd6dc8f92..ba30dfe1c8c 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -10,6 +10,8 @@
     "Updated \"%s\" to %s" : "Frissítettük  \"%s\"-t erre: %s",
     "Repair warning: " : "Javítás figyelmeztetés:",
     "Repair error: " : "Javítás hiba:",
+    "Set log level to debug - current level: \"%s\"" : "Hibakeresési naplózási szint beállítása - jelenlegi szint: \"%s\"",
+    "Reset log level to  \"%s\"" : "Naplózási szint visszaállítása \"%s\"-re",
     "Following incompatible apps have been disabled: %s" : "A következő nem kompatibilis applikációk lettek tiltva: %s",
     "Following apps have been disabled: %s" : "A következő applikációk lettek tiltva: %s",
     "Already up to date" : "Már a legfrissebb változat",
@@ -103,6 +105,7 @@
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nem lett gyorsítótár memória beállítva. A teljesítmény növeléséhez kérem állítson be gyorsítótárat, ha lehetséges. További információ található az alábbi <a href=\"{docLink}\">dokumentációban</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "a /dev/urandom eszköz nem elérhető PHP-ből, ami nagyon nagy biztonsági problémát jelent. További információ található az alábbi <a href=\"{docLink}\">dokumentációban</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A PHP verziód ({version}) már nem <a href=\"{phpLink}\">támogatott a PHP által</a>. Javasoljuk, hogy frissítsd a PHP verziót, hogy kihasználd a teljesítménybeli és biztonsági javításokat.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "A fordított proxy fejlécek konfigurációs beállításai helytelenek, vagy egy megbízható proxy-ból próbálja az ownCloud-ot elérni. Ha nem megbízható proxy-ból próbálja elérni az ownCloud-ot, akkor ez egy biztonsági probléma, a támadó az ownCloud számára látható IP cím csalást tud végrehajtani. További információ található a <a href=\"{docLink}\">dokumentációban</a>.",
     "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "A \"{header}\" HTTP fejléc nincs beállítva, hogy megegyezzen az elvárttal \"{expected}\". Ez egy potenciális biztonsági kockázat és kérjük, hogy változtassa meg a beállításokat.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "A \"Strict-Transport-Security\" HTTP fejléc nincs beállítva hogy \"{seconds}\" másodpercig tartson. Biztonsági okokból ajánljuk, hogy engedélyezze a HSTS, ahogyan ezt részletezzük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban.",
@@ -142,6 +145,7 @@
     "change" : "változtatás",
     "delete" : "töröl",
     "access control" : "jogosultság",
+    "Share details could not be loaded for this item." : "A megosztás részletei nem lehet betölteni ehhez az elemhez.",
     "An error occured. Please try again" : "Hiba történt. Kérjük, próbáld újra!",
     "Share" : "Megosztás",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Megosztás más ownCloud szerverekkel, a következő formátum használatával felhasznalo@példa.com/owncloud",
@@ -178,6 +182,8 @@
     "New Password" : "Új jelszó",
     "Reset password" : "Jelszó-visszaállítás",
     "Searching other places" : "Keresés más helyeken",
+    "No search results in other folders" : "Nincs keresési eredmény a másik könyvtárakban",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} keresési eredmény egy másik könyvtárban","{count} keresési eredmény más könyvtárakban"],
     "Personal" : "Személyes",
     "Users" : "Felhasználók",
     "Apps" : "Alkalmazások",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index e61218e465e..dbbd7ce2308 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s",
     "Repair warning: " : "Aviso de reparação:",
     "Repair error: " : "Reparação de erro:",
+    "Set log level to debug - current level: \"%s\"" : "Configure o nível de log para debug - nível corrente: \"%s\"",
+    "Reset log level to  \"%s\"" : "Reconfigurar o nível de log para \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Seguir aplicativos incompatíveis foi desativado: %s",
     "Following apps have been disabled: %s" : "Os seguintes aplicativos foram desabilitados: %s",
     "Already up to date" : "Já está atualizado",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index b11ed053b63..ef7d1bb8ec7 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -10,6 +10,8 @@
     "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s",
     "Repair warning: " : "Aviso de reparação:",
     "Repair error: " : "Reparação de erro:",
+    "Set log level to debug - current level: \"%s\"" : "Configure o nível de log para debug - nível corrente: \"%s\"",
+    "Reset log level to  \"%s\"" : "Reconfigurar o nível de log para \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Seguir aplicativos incompatíveis foi desativado: %s",
     "Following apps have been disabled: %s" : "Os seguintes aplicativos foram desabilitados: %s",
     "Already up to date" : "Já está atualizado",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index c47731d17fa..94690c68a9a 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -149,6 +149,7 @@ OC.L10N.register(
     "Share with users or groups …" : "Partilhar com utilizadores ou grupos...",
     "Share with users, groups or remote users …" : "Partilhar com utilizadores, grupos ou utilizadores remotos...",
     "Warning" : "Aviso",
+    "Error while sending notification" : "Erro enquanto estava a enviar a notificação",
     "The object type is not specified." : "O tipo de objeto não está especificado.",
     "Enter new" : "Introduza novo",
     "Delete" : "Apagar",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index fdafd1c3c01..3b6e031e26a 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -147,6 +147,7 @@
     "Share with users or groups …" : "Partilhar com utilizadores ou grupos...",
     "Share with users, groups or remote users …" : "Partilhar com utilizadores, grupos ou utilizadores remotos...",
     "Warning" : "Aviso",
+    "Error while sending notification" : "Erro enquanto estava a enviar a notificação",
     "The object type is not specified." : "O tipo de objeto não está especificado.",
     "Enter new" : "Introduza novo",
     "Delete" : "Apagar",
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index a7398d8eaef..e356d50c1f5 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "อัพเดท \"%s\" ไปยัง %s",
     "Repair warning: " : "เตือนการซ่อมแซม:",
     "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:",
+    "Set log level to debug - current level: \"%s\"" : "การตั้งค่าระดับของการบันทึกเพื่อแก้ปัญหา - ระดับปัจจุบันคือ: \"%s\"",
+    "Reset log level to  \"%s\"" : "รีเซ็ทระดับการบันทึกเป็น \"%s\"",
     "Following incompatible apps have been disabled: %s" : "แอพพลิเคชันต่อไปนี้เข้ากันไม่ได้มันจะถูกปิดการใช้งาน: %s",
     "Following apps have been disabled: %s" : "แอพฯดังต่อไปนี้ถูกปิดการใช้งาน: %s",
     "Already up to date" : "มีอยู่แล้วถึงวันที่",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index 9ff015ea8b9..a2056abd1f1 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -10,6 +10,8 @@
     "Updated \"%s\" to %s" : "อัพเดท \"%s\" ไปยัง %s",
     "Repair warning: " : "เตือนการซ่อมแซม:",
     "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:",
+    "Set log level to debug - current level: \"%s\"" : "การตั้งค่าระดับของการบันทึกเพื่อแก้ปัญหา - ระดับปัจจุบันคือ: \"%s\"",
+    "Reset log level to  \"%s\"" : "รีเซ็ทระดับการบันทึกเป็น \"%s\"",
     "Following incompatible apps have been disabled: %s" : "แอพพลิเคชันต่อไปนี้เข้ากันไม่ได้มันจะถูกปิดการใช้งาน: %s",
     "Following apps have been disabled: %s" : "แอพฯดังต่อไปนี้ถูกปิดการใช้งาน: %s",
     "Already up to date" : "มีอยู่แล้วถึงวันที่",
diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js
index c821776dfe9..378693d4538 100644
--- a/lib/l10n/et_EE.js
+++ b/lib/l10n/et_EE.js
@@ -14,6 +14,7 @@ OC.L10N.register(
     "The library %s is not available." : "Teek %s pole saadaval.",
     "Following platforms are supported: %s" : "Toetatud on järgnevad platformid: %s",
     "ownCloud %s or higher is required." : "ownCloud %s või uuem on nõutav.",
+    "ownCloud %s or lower is required." : "ownCloud %s või vanem on nõutav.",
     "Help" : "Abiinfo",
     "Personal" : "Isiklik",
     "Users" : "Kasutajad",
diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json
index 9ab7cd7e2ac..e5bfae2a91d 100644
--- a/lib/l10n/et_EE.json
+++ b/lib/l10n/et_EE.json
@@ -12,6 +12,7 @@
     "The library %s is not available." : "Teek %s pole saadaval.",
     "Following platforms are supported: %s" : "Toetatud on järgnevad platformid: %s",
     "ownCloud %s or higher is required." : "ownCloud %s või uuem on nõutav.",
+    "ownCloud %s or lower is required." : "ownCloud %s või vanem on nõutav.",
     "Help" : "Abiinfo",
     "Personal" : "Isiklik",
     "Users" : "Kasutajad",
-- 
GitLab


From c924b6740a523f45d0947a840c6934491a8f699e Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 2 Oct 2015 07:52:15 +0200
Subject: [PATCH 636/783] Do not return unneeded info

---
 apps/files_sharing/lib/external/manager.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 78d9581524d..2ba02f40d2f 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -182,7 +182,7 @@ class Manager {
 	 */
 	public function getShare($id) {
 		$getShare = $this->connection->prepare('
-			SELECT *
+			SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`
 			FROM  `*PREFIX*share_external`
 			WHERE `id` = ? AND `user` = ?');
 		$result = $getShare->execute(array($id, $this->uid));
@@ -424,7 +424,9 @@ class Manager {
 	 * @return array list of open server-to-server shares
 	 */
 	private function getShares($accepted) {
-		$query = 'SELECT * FROM `*PREFIX*share_external` WHERE `user` = ?';
+		$query = 'SELECT `id`, `remote`, `remote_id`, `share_token`, `name`, `owner`, `user`, `mountpoint`, `accepted`
+		          FROM `*PREFIX*share_external` 
+				  WHERE `user` = ?';
 		$parameters = [$this->uid];
 		if (!is_null($accepted)) {
 			$query .= ' AND `accepted` = ?';
-- 
GitLab


From 3ce45863ab646b312ad04b25fa9670bedb08497b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 2 Oct 2015 08:55:53 +0200
Subject: [PATCH 637/783] Modify the group user count when changing membership
 of a user

---
 settings/js/users/groups.js | 16 ++++++++++++----
 settings/js/users/users.js  |  5 +++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 322db6c1b45..c8d2ef7c5b1 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -49,18 +49,26 @@ GroupList = {
 		return parseInt($groupLiElement.data('usercount'), 10);
 	},
 
-	modEveryoneCount: function(diff) {
-		var $li = GroupList.getGroupLI(GroupList.everyoneGID);
+	modGroupCount: function(gid, diff) {
+		var $li = GroupList.getGroupLI(gid);
 		var count = GroupList.getUserCount($li) + diff;
 		GroupList.setUserCount($li, count);
 	},
 
 	incEveryoneCount: function() {
-		GroupList.modEveryoneCount(1);
+		GroupList.modGroupCount(GroupList.everyoneGID, 1);
 	},
 
 	decEveryoneCount: function() {
-		GroupList.modEveryoneCount(-1);
+		GroupList.modGroupCount(GroupList.everyoneGID, -1);
+	},
+
+	incGroupCount: function(gid) {
+		GroupList.modGroupCount(gid, 1);
+	},
+
+	decGroupCount: function(gid) {
+		GroupList.modGroupCount(gid, -1);
 	},
 
 	getCurrentGID: function () {
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 47d63c11b95..519fe9655db 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -470,6 +470,11 @@ var UserList = {
 								UserList.availableGroups.push(groupName);
 							}
 
+							if (response.data.action === 'add') {
+								GroupList.incGroupCount(groupName);
+							} else {
+								GroupList.decGroupCount(groupName);
+							}
 						}
 						if (response.data.message) {
 							OC.Notification.show(response.data.message);
-- 
GitLab


From 7707bbe6482c50cfda2529c8f0d7f8c7e1e52d48 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 2 Oct 2015 09:53:39 +0200
Subject: [PATCH 638/783] Allow identifying whether the current item is the
 filtered one

---
 lib/private/activitymanager.php  | 24 ++++++++++++++++++++++++
 lib/public/activity/imanager.php | 13 +++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php
index fc250173536..340f3d335e5 100644
--- a/lib/private/activitymanager.php
+++ b/lib/private/activitymanager.php
@@ -44,6 +44,12 @@ class ActivityManager implements IManager {
 	/** @var IConfig */
 	protected $config;
 
+	/** @var string */
+	protected $formattingObjectType;
+
+	/** @var int */
+	protected $formattingObjectId;
+
 	/**
 	 * constructor of the controller
 	 *
@@ -303,6 +309,24 @@ class ActivityManager implements IManager {
 		return '';
 	}
 
+	/**
+	 * @param string $type
+	 * @param int $id
+	 */
+	public function setFormattingObject($type, $id) {
+		$this->formattingObjectType = $type;
+		$this->formattingObjectId = $id;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isFormattingFilteredObject() {
+		return 'filter' === $this->request->getParam('filter')
+			&& $this->formattingObjectType === $this->request->getParam('objecttype')
+			&& $this->formattingObjectId === $this->request->getParam('objectid');
+	}
+
 	/**
 	 * @param string $app
 	 * @param string $text
diff --git a/lib/public/activity/imanager.php b/lib/public/activity/imanager.php
index b3a4969fb06..280babb7fa9 100644
--- a/lib/public/activity/imanager.php
+++ b/lib/public/activity/imanager.php
@@ -137,6 +137,19 @@ interface IManager {
 	 */
 	public function getTypeIcon($type);
 
+	/**
+	 * @param string $type
+	 * @param int $id
+	 * @since 8.2.0
+	 */
+	public function setFormattingObject($type, $id);
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isFormattingFilteredObject();
+
 	/**
 	 * @param string $app
 	 * @param string $text
-- 
GitLab


From f3864c5444a7e56602d25d82ad13c0d79522c97d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 2 Oct 2015 09:54:07 +0200
Subject: [PATCH 639/783] Use shorter text on the sidebar for files activities

---
 apps/files/lib/activity.php | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/apps/files/lib/activity.php b/apps/files/lib/activity.php
index bf80d0cfd7c..f3bbff48640 100644
--- a/apps/files/lib/activity.php
+++ b/apps/files/lib/activity.php
@@ -145,6 +145,24 @@ class Activity implements IExtension {
 		}
 
 		$l = $this->getL10N($languageCode);
+
+		if ($this->activityManager->isFormattingFilteredObject()) {
+			$translation = $this->translateShort($text, $l, $params);
+			if ($translation !== false) {
+				return $translation;
+			}
+		}
+
+		return $this->translateLong($text, $l, $params);
+	}
+
+	/**
+	 * @param string $text
+	 * @param IL10N $l
+	 * @param array $params
+	 * @return bool|string
+	 */
+	protected function translateLong($text, IL10N $l, array $params) {
 		switch ($text) {
 			case 'created_self':
 				return (string) $l->t('You created %1$s', $params);
@@ -170,6 +188,26 @@ class Activity implements IExtension {
 		}
 	}
 
+	/**
+	 * @param string $text
+	 * @param IL10N $l
+	 * @param array $params
+	 * @return bool|string
+	 */
+	protected function translateShort($text, IL10N $l, array $params) {
+		switch ($text) {
+			case 'changed_by':
+				return (string) $l->t('Changed by %2$s', $params);
+			case 'deleted_by':
+				return (string) $l->t('Deleted by %2$s', $params);
+			case 'restored_by':
+				return (string) $l->t('Restored by %2$s', $params);
+
+			default:
+				return false;
+		}
+	}
+
 	/**
 	 * The extension can define the type of parameters for translation
 	 *
-- 
GitLab


From 5dff9d88cb58c9c533a113d6cbde9d5b6acd1c92 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 2 Oct 2015 09:55:43 +0200
Subject: [PATCH 640/783] Make sure the conflict dialog is loaded before adding
 conflicts

---
 apps/files/js/file-upload.js |  7 +++++--
 core/js/oc-dialogs.js        | 15 +++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 03330ad7c5d..8bae8567a05 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -201,8 +201,11 @@ OC.Upload = {
 			return true;
 		});
 		if (conflicts.length) {
-			_.each(conflicts, function(conflictData) {
-				OC.dialogs.fileexists(conflictData[1], conflictData[0], conflictData[1].files[0], OC.Upload);
+			// wait for template loading
+			OC.dialogs.fileexists(null, null, null, OC.Upload).done(function() {
+				_.each(conflicts, function(conflictData) {
+					OC.dialogs.fileexists(conflictData[1], conflictData[0], conflictData[1].files[0], OC.Upload);
+				});
 			});
 		}
 
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index c38250c79c6..7af50c4ddfc 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -312,9 +312,11 @@ var OCdialogs = {
 	 * @param {object} original file with name, size and mtime
 	 * @param {object} replacement file with name, size and mtime
 	 * @param {object} controller with onCancel, onSkip, onReplace and onRename methods
+	 * @return {Promise} jquery promise that resolves after the dialog template was loaded
 	*/
 	fileexists:function(data, original, replacement, controller) {
 		var self = this;
+		var dialogDeferred = new $.Deferred();
 
 		var getCroppedPreview = function(file) {
 			var deferred = new $.Deferred();
@@ -540,7 +542,7 @@ var OCdialogs = {
 
 			//recalculate dimensions
 			$(window).trigger('resize');
-
+			dialogDeferred.resolve();
 		} else {
 			//create dialog
 			this._fileexistsshown = true;
@@ -559,8 +561,10 @@ var OCdialogs = {
 				});
 				$('body').append($dlg);
 
-				var $conflicts = $dlg.find('.conflicts');
-				addConflict($conflicts, original, replacement);
+				if (original && replacement) {
+					var $conflicts = $dlg.find('.conflicts');
+					addConflict($conflicts, original, replacement);
+				}
 
 				var buttonlist = [{
 						text: t('core', 'Cancel'),
@@ -612,7 +616,7 @@ var OCdialogs = {
 				});
 				$(dialogId).find('.conflicts').on('click', '.replacement input[type="checkbox"],.original:not(.readonly) input[type="checkbox"]', function() {
 					var $checkbox = $(this);
-					$checkbox.prop('checked', !checkbox.prop('checked'));
+					$checkbox.prop('checked', !$checkbox.prop('checked'));
 				});
 
 				//update counters
@@ -643,12 +647,15 @@ var OCdialogs = {
 						$(dialogId).find('.allexistingfiles + .count').text('');
 					}
 				});
+				dialogDeferred.resolve();
 			})
 			.fail(function() {
+				dialogDeferred.reject();
 				alert(t('core', 'Error loading file exists template'));
 			});
 		}
 		//}
+		return dialogDeferred.promise();
 	},
 	_getFilePickerTemplate: function() {
 		var defer = $.Deferred();
-- 
GitLab


From 17ab8e6c397011059b589da72a5d59cce8b65c7d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 2 Oct 2015 09:54:35 +0200
Subject: [PATCH 641/783] Use shorter text on the sidebar for files_sharing
 activities

---
 apps/files_sharing/appinfo/app.php    |  3 +-
 apps/files_sharing/lib/activity.php   | 66 +++++++++++++++++++++++++--
 apps/files_sharing/tests/activity.php |  5 +-
 3 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 15c0b864b08..1417dd6214b 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -70,7 +70,8 @@ $eventDispatcher->addListener(
 \OC::$server->getActivityManager()->registerExtension(function() {
 		return new \OCA\Files_Sharing\Activity(
 			\OC::$server->query('L10NFactory'),
-			\OC::$server->getURLGenerator()
+			\OC::$server->getURLGenerator(),
+			\OC::$server->getActivityManager()
 		);
 });
 
diff --git a/apps/files_sharing/lib/activity.php b/apps/files_sharing/lib/activity.php
index 63ac2e90b2a..6f0294bcb71 100644
--- a/apps/files_sharing/lib/activity.php
+++ b/apps/files_sharing/lib/activity.php
@@ -24,6 +24,8 @@
 namespace OCA\Files_Sharing;
 
 use OCP\Activity\IExtension;
+use OCP\Activity\IManager;
+use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\L10N\IFactory;
 
@@ -67,13 +69,18 @@ class Activity implements IExtension {
 	/** @var IURLGenerator */
 	protected $URLGenerator;
 
+	/** @var IManager */
+	protected $activityManager;
+
 	/**
 	 * @param IFactory $languageFactory
 	 * @param IURLGenerator $URLGenerator
+	 * @param IManager $activityManager
 	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $URLGenerator) {
+	public function __construct(IFactory $languageFactory, IURLGenerator $URLGenerator, IManager $activityManager) {
 		$this->languageFactory = $languageFactory;
 		$this->URLGenerator = $URLGenerator;
+		$this->activityManager = $activityManager;
 	}
 
 	protected function getL10N($languageCode = null) {
@@ -149,9 +156,30 @@ class Activity implements IExtension {
 	 * @return string|false
 	 */
 	public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode) {
+		if ($app !== self::FILES_SHARING_APP) {
+			return false;
+		}
+
 		$l = $this->getL10N($languageCode);
 
-		if ($app === self::FILES_SHARING_APP) {
+		if ($this->activityManager->isFormattingFilteredObject()) {
+			$translation = $this->translateShort($text, $l, $params);
+			if ($translation !== false) {
+				return $translation;
+			}
+		}
+
+		return $this->translateLong($text, $l, $params);
+	}
+
+	/**
+	 * @param string $text
+	 * @param IL10N $l
+	 * @param array $params
+	 * @return bool|string
+	 */
+	protected function translateLong($text, IL10N $l, array $params) {
+
 			switch ($text) {
 				case self::SUBJECT_REMOTE_SHARE_RECEIVED:
 					if (sizeof($params) === 2) {
@@ -186,11 +214,43 @@ class Activity implements IExtension {
 				case self::SUBJECT_SHARED_EMAIL:
 					return (string) $l->t('You shared %1$s with %2$s', $params);
 			}
-		}
 
 		return false;
 	}
 
+	/**
+	 * @param string $text
+	 * @param IL10N $l
+	 * @param array $params
+	 * @return bool|string
+	 */
+	protected function translateShort($text, IL10N $l, array $params) {
+		switch ($text) {
+			case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
+			case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
+				return (string) $l->t('Downloaded via public link');
+			case self::SUBJECT_SHARED_USER_SELF:
+				return (string) $l->t('Shared with %2$s', $params);
+			case self::SUBJECT_SHARED_GROUP_SELF:
+				return (string) $l->t('Shared with group %2$s', $params);
+			case self::SUBJECT_RESHARED_USER_BY:
+				return (string) $l->t('Shared with %3$s by %2$s', $params);
+			case self::SUBJECT_RESHARED_GROUP_BY:
+				return (string) $l->t('Shared with group %3$s by %2$s', $params);
+			case self::SUBJECT_RESHARED_LINK_BY:
+				return (string) $l->t('Shared via link by %2$s', $params);
+			case self::SUBJECT_SHARED_WITH_BY:
+				return (string) $l->t('Shared by %2$s', $params);
+			case self::SUBJECT_SHARED_LINK_SELF:
+				return (string) $l->t('Shared via public link');
+			case self::SUBJECT_SHARED_EMAIL:
+				return (string) $l->t('Shared with %2$s', $params);
+
+			default:
+				return false;
+		}
+	}
+
 	/**
 	 * The extension can define the type of parameters for translation
 	 *
diff --git a/apps/files_sharing/tests/activity.php b/apps/files_sharing/tests/activity.php
index 53a306b70f7..f7f324cdfc3 100644
--- a/apps/files_sharing/tests/activity.php
+++ b/apps/files_sharing/tests/activity.php
@@ -36,7 +36,10 @@ class Activity extends \OCA\Files_Sharing\Tests\TestCase{
 		parent::setUp();
 		$this->activity = new \OCA\Files_Sharing\Activity(
 			$this->getMock('\OC\L10N\Factory'),
-			$this->getMockBuilder('\OC\URLGenerator')
+			$this->getMockBuilder('\OCP\IURLGenerator')
+				->disableOriginalConstructor()
+				->getMock(),
+			$this->getMockBuilder('\OCP\Activity\IManager')
 				->disableOriginalConstructor()
 				->getMock()
 		);
-- 
GitLab


From e478d925c37d908046327f6f76c5ed2c5bdac313 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 2 Oct 2015 09:55:08 +0200
Subject: [PATCH 642/783] Fix intendation

---
 apps/files_sharing/lib/activity.php | 68 ++++++++++++++---------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/apps/files_sharing/lib/activity.php b/apps/files_sharing/lib/activity.php
index 6f0294bcb71..c5eb7d09ede 100644
--- a/apps/files_sharing/lib/activity.php
+++ b/apps/files_sharing/lib/activity.php
@@ -180,40 +180,40 @@ class Activity implements IExtension {
 	 */
 	protected function translateLong($text, IL10N $l, array $params) {
 
-			switch ($text) {
-				case self::SUBJECT_REMOTE_SHARE_RECEIVED:
-					if (sizeof($params) === 2) {
-						// New activity ownCloud 8.2+
-						return (string) $l->t('You received a new remote share %2$s from %1$s', $params);
-					}
-					return (string) $l->t('You received a new remote share from %s', $params);
-				case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
-					return (string) $l->t('%1$s accepted remote share %2$s', $params);
-				case self::SUBJECT_REMOTE_SHARE_DECLINED:
-					return (string) $l->t('%1$s declined remote share %2$s', $params);
-				case self::SUBJECT_REMOTE_SHARE_UNSHARED:
-					return (string) $l->t('%1$s unshared %2$s from you', $params);
-				case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
-					return (string) $l->t('Public shared folder %1$s was downloaded', $params);
-				case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
-					return (string) $l->t('Public shared file %1$s was downloaded', $params);
-				case self::SUBJECT_SHARED_USER_SELF:
-					return (string) $l->t('You shared %1$s with %2$s', $params);
-				case self::SUBJECT_SHARED_GROUP_SELF:
-					return (string) $l->t('You shared %1$s with group %2$s', $params);
-				case self::SUBJECT_RESHARED_USER_BY:
-					return (string) $l->t('%2$s shared %1$s with %3$s', $params);
-				case self::SUBJECT_RESHARED_GROUP_BY:
-					return (string) $l->t('%2$s shared %1$s with group %3$s', $params);
-				case self::SUBJECT_RESHARED_LINK_BY:
-					return (string) $l->t('%2$s shared %1$s via link', $params);
-				case self::SUBJECT_SHARED_WITH_BY:
-					return (string) $l->t('%2$s shared %1$s with you', $params);
-				case self::SUBJECT_SHARED_LINK_SELF:
-					return (string) $l->t('You shared %1$s via link', $params);
-				case self::SUBJECT_SHARED_EMAIL:
-					return (string) $l->t('You shared %1$s with %2$s', $params);
-			}
+		switch ($text) {
+			case self::SUBJECT_REMOTE_SHARE_RECEIVED:
+				if (sizeof($params) === 2) {
+					// New activity ownCloud 8.2+
+					return (string) $l->t('You received a new remote share %2$s from %1$s', $params);
+				}
+				return (string) $l->t('You received a new remote share from %s', $params);
+			case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
+				return (string) $l->t('%1$s accepted remote share %2$s', $params);
+			case self::SUBJECT_REMOTE_SHARE_DECLINED:
+				return (string) $l->t('%1$s declined remote share %2$s', $params);
+			case self::SUBJECT_REMOTE_SHARE_UNSHARED:
+				return (string) $l->t('%1$s unshared %2$s from you', $params);
+			case self::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED:
+				return (string) $l->t('Public shared folder %1$s was downloaded', $params);
+			case self::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED:
+				return (string) $l->t('Public shared file %1$s was downloaded', $params);
+			case self::SUBJECT_SHARED_USER_SELF:
+				return (string) $l->t('You shared %1$s with %2$s', $params);
+			case self::SUBJECT_SHARED_GROUP_SELF:
+				return (string) $l->t('You shared %1$s with group %2$s', $params);
+			case self::SUBJECT_RESHARED_USER_BY:
+				return (string) $l->t('%2$s shared %1$s with %3$s', $params);
+			case self::SUBJECT_RESHARED_GROUP_BY:
+				return (string) $l->t('%2$s shared %1$s with group %3$s', $params);
+			case self::SUBJECT_RESHARED_LINK_BY:
+				return (string) $l->t('%2$s shared %1$s via link', $params);
+			case self::SUBJECT_SHARED_WITH_BY:
+				return (string) $l->t('%2$s shared %1$s with you', $params);
+			case self::SUBJECT_SHARED_LINK_SELF:
+				return (string) $l->t('You shared %1$s via link', $params);
+			case self::SUBJECT_SHARED_EMAIL:
+				return (string) $l->t('You shared %1$s with %2$s', $params);
+		}
 
 		return false;
 	}
-- 
GitLab


From 4b3a5a257f0861db23b8d97836afdf398b3fef9a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 2 Oct 2015 10:16:21 +0200
Subject: [PATCH 643/783] Fix moment.js "a few seconds ago" with "seconds ago"

* fixes #18627
---
 apps/files/tests/js/mainfileinfodetailviewSpec.js   | 2 +-
 apps/files_versions/tests/js/versionstabviewSpec.js | 2 +-
 core/js/js.js                                       | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/files/tests/js/mainfileinfodetailviewSpec.js b/apps/files/tests/js/mainfileinfodetailviewSpec.js
index 2b9e2b23f93..f4403196f2e 100644
--- a/apps/files/tests/js/mainfileinfodetailviewSpec.js
+++ b/apps/files/tests/js/mainfileinfodetailviewSpec.js
@@ -58,7 +58,7 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 			expect(view.$el.find('.fileName h3').attr('title')).toEqual('One.txt');
 			expect(view.$el.find('.size').text()).toEqual('117.7 MB');
 			expect(view.$el.find('.size').attr('title')).toEqual('123456789 bytes');
-			expect(view.$el.find('.date').text()).toEqual('a few seconds ago');
+			expect(view.$el.find('.date').text()).toEqual('seconds ago');
 			expect(view.$el.find('.date').attr('title')).toEqual(dateExpected);
 			clock.restore();
 		});
diff --git a/apps/files_versions/tests/js/versionstabviewSpec.js b/apps/files_versions/tests/js/versionstabviewSpec.js
index 4435f38ef7e..306dd66be2a 100644
--- a/apps/files_versions/tests/js/versionstabviewSpec.js
+++ b/apps/files_versions/tests/js/versionstabviewSpec.js
@@ -76,7 +76,7 @@ describe('OCA.Versions.VersionsTabView', function() {
 			expect($versions.length).toEqual(2);
 			var $item = $versions.eq(0);
 			expect($item.find('.downloadVersion').attr('href')).toEqual(version1.getDownloadUrl());
-			expect($item.find('.versiondate').text()).toEqual('a few seconds ago');
+			expect($item.find('.versiondate').text()).toEqual('seconds ago');
 			expect($item.find('.revertVersion').length).toEqual(1);
 			expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl());
 
diff --git a/core/js/js.js b/core/js/js.js
index e40141ac617..36fa90e78a3 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1533,6 +1533,10 @@ OC.Util = {
 	 * @returns {string} human readable difference from now
 	 */
 	relativeModifiedDate: function (timestamp) {
+		var diff = moment().diff(moment(timestamp));
+		if (diff >= 0 && diff < 45000 ) {
+			return t('core', 'seconds ago');
+		}
 		return moment(timestamp).fromNow();
 	},
 	/**
-- 
GitLab


From dc38e674a5d547e7fd53d66fb0ac0dbb5490ea77 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 30 Sep 2015 21:35:52 +0200
Subject: [PATCH 644/783] Split files_sharing middelware

Since for external shares there is no need for link shares to be enabled
we should check which controller is actually being called.

This makes sure that in all cases we verify that the files_sharing app
is enabled. But only for the share controller (public shares) we check
if the API is enabled and if links are enabled.

TODO: add checks for federated sharing as well
---
 .../lib/middleware/sharingcheckmiddleware.php | 15 +++++
 .../middleware/sharingcheckmiddleware.php     | 57 +++++++++----------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
index 61dfd914d0b..f51399b76a8 100644
--- a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
@@ -68,6 +68,13 @@ class SharingCheckMiddleware extends Middleware {
 		if(!$this->isSharingEnabled()) {
 			throw new NotFoundException('Sharing is disabled.');
 		}
+
+		if ($controller instanceof \OCA\Files_Sharing\Controllers\ExternalSharesController) {
+			//TODO: Proper checks
+		} else if ($controller instanceof \OCA\Files_Sharing\Controllers\ShareController &&
+			!$this->isLinkSharingEnabled()) {
+			throw new NotFoundException('Link sharing is disabled');
+		}
 	}
 
 	/**
@@ -98,6 +105,14 @@ class SharingCheckMiddleware extends Middleware {
 			return false;
 		}
 
+		return true;
+	}
+
+	/**
+	 * Check if link sharing is allowed
+	 * @return bool
+	 */
+	private function isLinkSharingEnabled() {
 		// Check if the shareAPI is enabled
 		if ($this->config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
 			return false;
diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
index 3171d45d331..a43b11c81b6 100644
--- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
@@ -51,13 +51,27 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 		$this->sharingCheckMiddleware = new SharingCheckMiddleware('files_sharing', $this->config, $this->appManager);
 	}
 
-	public function testIsSharingEnabledWithEverythingEnabled() {
+	public function testIsSharingEnabledWithAppEnabled() {
 		$this->appManager
 			->expects($this->once())
 			->method('isEnabledForUser')
 			->with('files_sharing')
 			->will($this->returnValue(true));
 
+		$this->assertTrue(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+	}
+
+	public function testIsSharingEnabledWithAppDisabled() {
+		$this->appManager
+			->expects($this->once())
+			->method('isEnabledForUser')
+			->with('files_sharing')
+			->will($this->returnValue(false));
+
+		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+	}
+
+	public function testIsLinkSharingEnabledWithEverythinEnabled() {
 		$this->config
 			->expects($this->at(0))
 			->method('getAppValue')
@@ -70,26 +84,11 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->with('core', 'shareapi_allow_links', 'yes')
 			->will($this->returnValue('yes'));
 
-		$this->assertTrue(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+		$this->assertTrue(self::invokePrivate($this->sharingCheckMiddleware, 'isLinkSharingEnabled'));
 	}
 
-	public function testIsSharingEnabledWithAppDisabled() {
-		$this->appManager
-			->expects($this->once())
-			->method('isEnabledForUser')
-			->with('files_sharing')
-			->will($this->returnValue(false));
-
-		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
-	}
-
-	public function testIsSharingEnabledWithLinkSharingDisabled() {
-		$this->appManager
-			->expects($this->once())
-			->method('isEnabledForUser')
-			->with('files_sharing')
-			->will($this->returnValue(true));
 
+	public function testIsLinkSharingEnabledWithLinkSharingDisabled() {
 		$this->config
 			->expects($this->at(0))
 			->method('getAppValue')
@@ -102,23 +101,17 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->with('core', 'shareapi_allow_links', 'yes')
 			->will($this->returnValue('no'));
 
-		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isLinkSharingEnabled'));
 	}
 
-	public function testIsSharingEnabledWithSharingAPIDisabled() {
-		$this->appManager
-			->expects($this->once())
-			->method('isEnabledForUser')
-			->with('files_sharing')
-			->will($this->returnValue(true));
-
+	public function testIsLinkSharingEnabledWithSharingAPIDisabled() {
 		$this->config
 			->expects($this->once())
 			->method('getAppValue')
 			->with('core', 'shareapi_enabled', 'yes')
 			->will($this->returnValue('no'));
 
-		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isLinkSharingEnabled'));
 	}
 
 	public function testBeforeControllerWithSharingEnabled() {
@@ -140,7 +133,10 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->with('core', 'shareapi_allow_links', 'yes')
 			->will($this->returnValue('yes'));
 
-		$this->sharingCheckMiddleware->beforeController($this->controllerMock, 'myMethod');
+		$controller = $this->getMockBuilder('\OCA\Files_Sharing\Controllers\ShareController')
+			->disableOriginalConstructor()->getMock();
+
+		$this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
 	}
 
 	/**
@@ -154,7 +150,10 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->with('files_sharing')
 			->will($this->returnValue(false));
 
-		$this->sharingCheckMiddleware->beforeController($this->controllerMock, 'myMethod');
+		$controller = $this->getMockBuilder('\OCA\Files_Sharing\Controllers\ShareController')
+			->disableOriginalConstructor()->getMock();
+
+		$this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
 	}
 
 	/**
-- 
GitLab


From 3d2acb5003a4953d3f422b34f670d87c4afb11c9 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 2 Oct 2015 09:57:33 +0200
Subject: [PATCH 645/783] sharingcheckmiddleware now handles externalshares as
 well

Added new annotations for the externalsharescontroller class
* @NoOutgoingFederatedSharingRequired
* @NoIncomingFederatedSharingRequired

By default both are required for all functions in the
externalSharesController.

A proper exception is thrown and then a 405 is returned instead of the
default error page. Since it is only an API endpoint this makes more
sense.

Unit tests added and updated
---
 apps/files_sharing/appinfo/app.php            |   3 -
 apps/files_sharing/appinfo/application.php    |   7 +-
 .../controllers/externalsharescontroller.php  |  25 ++--
 .../brokenpath.php}                           |   0
 .../lib/exceptions/s2sexception.php           |  26 ++++
 .../lib/middleware/sharingcheckmiddleware.php |  38 +++++-
 .../controller/externalsharecontroller.php    |  36 +----
 .../middleware/sharingcheckmiddleware.php     | 126 +++++++++++++++++-
 8 files changed, 195 insertions(+), 66 deletions(-)
 rename apps/files_sharing/lib/{exceptions.php => exceptions/brokenpath.php} (100%)
 create mode 100644 apps/files_sharing/lib/exceptions/s2sexception.php

diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 15c0b864b08..e449843de73 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -39,9 +39,6 @@ $l = \OC::$server->getL10N('files_sharing');
 \OC::$CLASSPATH['OCA\Files\Share\Maintainer'] = 'files_sharing/lib/maintainer.php';
 \OC::$CLASSPATH['OCA\Files\Share\Proxy'] = 'files_sharing/lib/proxy.php';
 
-// Exceptions
-\OC::$CLASSPATH['OCA\Files_Sharing\Exceptions\BrokenPath'] = 'files_sharing/lib/exceptions.php';
-
 $application = new Application();
 $application->registerMountProviders();
 $application->setupPropagation();
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index d0dcadb77e8..ad5d5d63231 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -61,7 +61,6 @@ class Application extends App {
 			return new ExternalSharesController(
 				$c->query('AppName'),
 				$c->query('Request'),
-				$c->query('IsIncomingShareEnabled'),
 				$c->query('ExternalManager'),
 				$c->query('HttpClientService')
 			);
@@ -82,9 +81,6 @@ class Application extends App {
 		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
 			return $server->getHTTPClientService();
 		});
-		$container->registerService('IsIncomingShareEnabled', function (SimpleContainer $c) {
-			return Helper::isIncomingServer2serverShareEnabled();
-		});
 		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
 			$user = $server->getUserSession()->getUser();
 			$uid = $user ? $user->getUID() : null;
@@ -105,7 +101,8 @@ class Application extends App {
 			return new SharingCheckMiddleware(
 				$c->query('AppName'),
 				$server->getConfig(),
-				$server->getAppManager()
+				$server->getAppManager(),
+				$c['ControllerMethodReflector']
 			);
 		});
 
diff --git a/apps/files_sharing/lib/controllers/externalsharescontroller.php b/apps/files_sharing/lib/controllers/externalsharescontroller.php
index 6eb9d3c13d9..1b8351da420 100644
--- a/apps/files_sharing/lib/controllers/externalsharescontroller.php
+++ b/apps/files_sharing/lib/controllers/externalsharescontroller.php
@@ -36,8 +36,6 @@ use OCP\AppFramework\Http\DataResponse;
  */
 class ExternalSharesController extends Controller {
 
-	/** @var bool */
-	private $incomingShareEnabled;
 	/** @var \OCA\Files_Sharing\External\Manager */
 	private $externalManager;
 	/** @var IClientService */
@@ -52,53 +50,44 @@ class ExternalSharesController extends Controller {
 	 */
 	public function __construct($appName,
 								IRequest $request,
-								$incomingShareEnabled,
 								\OCA\Files_Sharing\External\Manager $externalManager,
 								IClientService $clientService) {
 		parent::__construct($appName, $request);
-		$this->incomingShareEnabled = $incomingShareEnabled;
 		$this->externalManager = $externalManager;
 		$this->clientService = $clientService;
 	}
 
 	/**
 	 * @NoAdminRequired
+	 * @NoOutgoingFederatedSharingRequired
 	 *
 	 * @return JSONResponse
 	 */
 	public function index() {
-		$shares = [];
-		if ($this->incomingShareEnabled) {
-			$shares = $this->externalManager->getOpenShares();
-		}
-		return new JSONResponse($shares);
+		return new JSONResponse($this->externalManager->getOpenShares());
 	}
 
 	/**
 	 * @NoAdminRequired
+	 * @NoOutgoingFederatedSharingRequired
 	 *
 	 * @param int $id
 	 * @return JSONResponse
 	 */
 	public function create($id) {
-		if ($this->incomingShareEnabled) {
-			$this->externalManager->acceptShare($id);
-		}
-
+		$this->externalManager->acceptShare($id);
 		return new JSONResponse();
 	}
 
 	/**
 	 * @NoAdminRequired
+	 * @NoOutgoingFederatedSharingRequired
 	 *
 	 * @param $id
 	 * @return JSONResponse
 	 */
 	public function destroy($id) {
-		if ($this->incomingShareEnabled) {
-			$this->externalManager->declineShare($id);
-		}
-
+		$this->externalManager->declineShare($id);
 		return new JSONResponse();
 	}
 
@@ -127,6 +116,8 @@ class ExternalSharesController extends Controller {
 
 	/**
 	 * @PublicPage
+	 * @NoOutgoingFederatedSharingRequired
+	 * @NoIncomingFederatedSharingRequired
 	 *
 	 * @param string $remote
 	 * @return DataResponse
diff --git a/apps/files_sharing/lib/exceptions.php b/apps/files_sharing/lib/exceptions/brokenpath.php
similarity index 100%
rename from apps/files_sharing/lib/exceptions.php
rename to apps/files_sharing/lib/exceptions/brokenpath.php
diff --git a/apps/files_sharing/lib/exceptions/s2sexception.php b/apps/files_sharing/lib/exceptions/s2sexception.php
new file mode 100644
index 00000000000..7f5557f8cd3
--- /dev/null
+++ b/apps/files_sharing/lib/exceptions/s2sexception.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_Sharing\Exceptions;
+
+/**
+ * S2S sharing not allowed
+ */
+class S2SException extends \Exception {
+}
diff --git a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
index f51399b76a8..942efc0483e 100644
--- a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
@@ -29,6 +29,9 @@ use OCP\AppFramework\Middleware;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Files\NotFoundException;
 use OCP\IConfig;
+use OCP\AppFramework\Utility\IControllerMethodReflector;
+use OCA\Files_Sharing\Exceptions\S2SException;
+use OCP\AppFramework\Http\JSONResponse;
 
 /**
  * Checks whether the "sharing check" is enabled
@@ -43,6 +46,8 @@ class SharingCheckMiddleware extends Middleware {
 	protected $config;
 	/** @var IAppManager */
 	protected $appManager;
+	/** @var IControllerMethodReflector */
+	protected $reflector;
 
 	/***
 	 * @param string $appName
@@ -51,10 +56,13 @@ class SharingCheckMiddleware extends Middleware {
 	 */
 	public function __construct($appName,
 								IConfig $config,
-								IAppManager $appManager) {
+								IAppManager $appManager,
+								IControllerMethodReflector $reflector
+								) {
 		$this->appName = $appName;
 		$this->config = $config;
 		$this->appManager = $appManager;
+		$this->reflector = $reflector;
 	}
 
 	/**
@@ -69,8 +77,9 @@ class SharingCheckMiddleware extends Middleware {
 			throw new NotFoundException('Sharing is disabled.');
 		}
 
-		if ($controller instanceof \OCA\Files_Sharing\Controllers\ExternalSharesController) {
-			//TODO: Proper checks
+		if ($controller instanceof \OCA\Files_Sharing\Controllers\ExternalSharesController &&
+			!$this->externalSharesChecks()) {
+			throw new S2SException('Federated sharing not allowed');
 		} else if ($controller instanceof \OCA\Files_Sharing\Controllers\ShareController &&
 			!$this->isLinkSharingEnabled()) {
 			throw new NotFoundException('Link sharing is disabled');
@@ -91,9 +100,32 @@ class SharingCheckMiddleware extends Middleware {
 			return new NotFoundResponse();
 		}
 
+		if (is_a($exception, '\OCA\Files_Sharing\Exceptions\S2SException')) {
+			return new JSONResponse($exception->getMessage(), 405);
+		}
+
 		throw $exception;
 	}
 
+	/**
+	 * Checks for externalshares controller
+	 * @return bool
+	 */
+	private function externalSharesChecks() {
+
+		if (!$this->reflector->hasAnnotation('NoIncomingFederatedSharingRequired') &&
+			$this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') !== 'yes') {
+			return false;
+		}
+
+		if (!$this->reflector->hasAnnotation('NoOutgoingFederatedSharingRequired') &&
+		    $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') !== 'yes') {
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 * Check whether sharing is enabled
 	 * @return bool
diff --git a/apps/files_sharing/tests/controller/externalsharecontroller.php b/apps/files_sharing/tests/controller/externalsharecontroller.php
index 3dc34bca7a4..7b3e1af4c74 100644
--- a/apps/files_sharing/tests/controller/externalsharecontroller.php
+++ b/apps/files_sharing/tests/controller/externalsharecontroller.php
@@ -32,8 +32,6 @@ use OCP\IRequest;
  * @package OCA\Files_Sharing\Controllers
  */
 class ExternalShareControllerTest extends \Test\TestCase {
-	/** @var bool */
-	private $incomingShareEnabled;
 	/** @var IRequest */
 	private $request;
 	/** @var \OCA\Files_Sharing\External\Manager */
@@ -57,22 +55,12 @@ class ExternalShareControllerTest extends \Test\TestCase {
 		return new ExternalSharesController(
 			'files_sharing',
 			$this->request,
-			$this->incomingShareEnabled,
 			$this->externalManager,
 			$this->clientService
 		);
 	}
 
-	public function testIndexDisabled() {
-		$this->externalManager
-			->expects($this->never())
-			->method('getOpenShares');
-
-		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->index());
-	}
-
-	public function testIndexEnabled() {
-		$this->incomingShareEnabled = true;
+	public function testIndex() {
 		$this->externalManager
 			->expects($this->once())
 			->method('getOpenShares')
@@ -81,16 +69,7 @@ class ExternalShareControllerTest extends \Test\TestCase {
 		$this->assertEquals(new JSONResponse(['MyDummyArray']), $this->getExternalShareController()->index());
 	}
 
-	public function testCreateDisabled() {
-		$this->externalManager
-			->expects($this->never())
-			->method('acceptShare');
-
-		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->create(4));
-	}
-
-	public function testCreateEnabled() {
-		$this->incomingShareEnabled = true;
+	public function testCreate() {
 		$this->externalManager
 			->expects($this->once())
 			->method('acceptShare')
@@ -99,16 +78,7 @@ class ExternalShareControllerTest extends \Test\TestCase {
 		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->create(4));
 	}
 
-	public function testDestroyDisabled() {
-		$this->externalManager
-			->expects($this->never())
-			->method('destroy');
-
-		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->destroy(4));
-	}
-
-	public function testDestroyEnabled() {
-		$this->incomingShareEnabled = true;
+	public function testDestroy() {
 		$this->externalManager
 			->expects($this->once())
 			->method('declineShare')
diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
index a43b11c81b6..05cb7497680 100644
--- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
@@ -25,6 +25,9 @@
 namespace OCA\Files_Sharing\Middleware;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\Files\NotFoundException;
+use OCP\AppFramework\Utility\IControllerMethodReflector;
+use OCA\Files_Sharing\Exceptions\S2SException;
+use OCP\AppFramework\Http\JSONResponse;
 
 /**
  * @package OCA\Files_Sharing\Middleware\SharingCheckMiddleware
@@ -39,6 +42,8 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 	private $sharingCheckMiddleware;
 	/** @var \OCP\AppFramework\Controller */
 	private $controllerMock;
+	/** @var IControllerMethodReflector */
+	private $reflector;
 
 	protected function setUp() {
 		$this->config = $this->getMockBuilder('\OCP\IConfig')
@@ -47,8 +52,14 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->disableOriginalConstructor()->getMock();
 		$this->controllerMock = $this->getMockBuilder('\OCP\AppFramework\Controller')
 			->disableOriginalConstructor()->getMock();
+		$this->reflector = $this->getMockBuilder('\OCP\AppFramework\Utility\IControllerMethodReflector')
+			->disableOriginalConstructor()->getMock();
 
-		$this->sharingCheckMiddleware = new SharingCheckMiddleware('files_sharing', $this->config, $this->appManager);
+		$this->sharingCheckMiddleware = new SharingCheckMiddleware(
+			'files_sharing',
+			$this->config,
+			$this->appManager,
+			$this->reflector);
 	}
 
 	public function testIsSharingEnabledWithAppEnabled() {
@@ -114,7 +125,93 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isLinkSharingEnabled'));
 	}
 
-	public function testBeforeControllerWithSharingEnabled() {
+	public function externalSharesChecksDataProvider() {
+
+		$data = [];
+
+		foreach ([false, true] as $annIn) {
+			foreach ([false, true] as $annOut) {
+				foreach ([false, true] as $confIn) {
+					foreach ([false, true] as $confOut) {
+
+						$res = true;
+						if (!$annIn && !$confIn) {
+							$res = false;
+						} elseif (!$annOut && !$confOut) {
+							$res = false;
+						}
+
+						$d = [
+							[
+								['NoIncomingFederatedSharingRequired', $annIn],
+								['NoOutgoingFederatedSharingRequired', $annOut],
+							],
+							[
+								['files_sharing', 'incoming_server2server_share_enabled', 'yes', $confIn ? 'yes' : 'no'],
+								['files_sharing', 'outgoing_server2server_share_enabled', 'yes', $confOut ? 'yes' : 'no'],
+							],
+							$res
+						];
+
+						$data[] = $d;
+					}
+				}
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * @dataProvider externalSharesChecksDataProvider
+	 */
+	public function testExternalSharesChecks($annotations, $config, $expectedResult) {
+		$this->reflector
+			->expects($this->atLeastOnce())
+			->method('hasAnnotation')
+			->will($this->returnValueMap($annotations));
+
+		$this->config
+			->method('getAppValue')
+			->will($this->returnValueMap($config));
+
+		$this->assertEquals($expectedResult, self::invokePrivate($this->sharingCheckMiddleware, 'externalSharesChecks'));
+	}
+
+	/**
+	 * @dataProvider externalSharesChecksDataProvider
+	 */
+	public function testBeforeControllerWithExternalShareControllerWithSharingEnabled($annotations, $config, $noException) {
+		$this->appManager
+			->expects($this->once())
+			->method('isEnabledForUser')
+			->with('files_sharing')
+			->will($this->returnValue(true));
+
+		$this->reflector
+			->expects($this->atLeastOnce())
+			->method('hasAnnotation')
+			->will($this->returnValueMap($annotations));
+
+		$this->config
+			->method('getAppValue')
+			->will($this->returnValueMap($config));
+
+		$controller = $this->getMockBuilder('\OCA\Files_Sharing\Controllers\ExternalSharesController')
+			->disableOriginalConstructor()->getMock();
+
+		$exceptionThrown = false;
+
+		try {
+			$this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
+		} catch (\OCA\Files_Sharing\Exceptions\S2SException $exception) {
+			$exceptionThrown = true;
+		}
+
+		$this->assertNotEquals($noException, $exceptionThrown);
+	}
+
+	public function testBeforeControllerWithShareControllerWithSharingEnabled() {
 		$this->appManager
 			->expects($this->once())
 			->method('isEnabledForUser')
@@ -141,14 +238,14 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 
 	/**
 	 * @expectedException \OCP\Files\NotFoundException
-	 * @expectedExceptionMessage Sharing is disabled.
+	 * @expectedExceptionMessage Link sharing is disabled
 	 */
-	public function testBeforeControllerWithSharingDisabled() {
+	public function testBeforeControllerWithShareControllerWithSharingEnabledAPIDisabled() {
 		$this->appManager
 			->expects($this->once())
 			->method('isEnabledForUser')
 			->with('files_sharing')
-			->will($this->returnValue(false));
+			->will($this->returnValue(true));
 
 		$controller = $this->getMockBuilder('\OCA\Files_Sharing\Controllers\ShareController')
 			->disableOriginalConstructor()->getMock();
@@ -156,6 +253,20 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 		$this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
 	}
 
+	/**
+	 * @expectedException \OCP\Files\NotFoundException
+	 * @expectedExceptionMessage Sharing is disabled.
+	 */
+	public function testBeforeControllerWithSharingDisabled() {
+		$this->appManager
+			->expects($this->once())
+			->method('isEnabledForUser')
+			->with('files_sharing')
+			->will($this->returnValue(false));
+
+		$this->sharingCheckMiddleware->beforeController($this->controllerMock, 'myMethod');
+	}
+
 	/**
 	 * @expectedException \Exception
 	 * @expectedExceptionMessage My Exception message
@@ -168,4 +279,9 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 		$this->assertEquals(new NotFoundResponse(), $this->sharingCheckMiddleware->afterException($this->controllerMock, 'myMethod', new NotFoundException('My Exception message')));
 	}
 
+	public function testAfterExceptionWithS2SException() {
+		$this->assertEquals(new JSONResponse('My Exception message', 405), $this->sharingCheckMiddleware->afterException($this->controllerMock, 'myMethod', new S2SException('My Exception message')));
+	}
+
+
 }
-- 
GitLab


From eeafccb3a65498e83071e71d5954bf4a856a1caa Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 1 Oct 2015 12:26:59 +0200
Subject: [PATCH 646/783] Start to show remote shares in shared with you
 section

---
 apps/files_sharing/js/sharedfilelist.js | 65 ++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 6 deletions(-)

diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 98dbd4c6702..7912944ac18 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -122,7 +122,9 @@
 			if (this._reloadCall) {
 				this._reloadCall.abort();
 			}
-			this._reloadCall = $.ajax({
+
+			var promises = [];
+			var shares = $.ajax({
 				url: OC.linkToOCS('apps/files_sharing/api/v1') + 'shares',
 				/* jshint camelcase: false */
 				data: {
@@ -132,25 +134,76 @@
 				type: 'GET',
 				beforeSend: function(xhr) {
 					xhr.setRequestHeader('OCS-APIREQUEST', 'true');
-				}
+				},
 			});
+			promises.push(shares);
+
+			if (!!this._sharedWithUser) {
+				var remoteShares = $.ajax({
+					url: OC.linkToOCS('apps/files_sharing/api/v1') + 'remote_shares',
+					/* jshint camelcase: false */
+					data: {
+						format: 'json'
+					},
+					type: 'GET',
+					beforeSend: function(xhr) {
+						xhr.setRequestHeader('OCS-APIREQUEST', 'true');
+					},
+				});
+				promises.push(remoteShares);
+			}
+
+			this._reloadCall = $.when.apply($, promises);
 			var callBack = this.reloadCallback.bind(this);
 			return this._reloadCall.then(callBack, callBack);
 		},
 
-		reloadCallback: function(result) {
+		reloadCallback: function(shares, remoteShares) {
 			delete this._reloadCall;
 			this.hideMask();
 
 			this.$el.find('#headerSharedWith').text(
 				t('files_sharing', this._sharedWithUser ? 'Shared by' : 'Shared with')
 			);
-			if (result.ocs && result.ocs.data) {
-				this.setFiles(this._makeFilesFromShares(result.ocs.data));
+
+			var files = [];
+
+			if (shares[0].ocs && shares[0].ocs.data) {
+				files = files.concat(this._makeFilesFromShares(shares[0].ocs.data));
+			} else {
+				// TODO: error handling
 			}
-			else {
+
+			if (remoteShares[0].ocs && remoteShares[0].ocs.data) {
+				files = files.concat(this._makeFilesFromRemoteShares(remoteShares[0].ocs.data));
+			} else {
 				// TODO: error handling
 			}
+
+			this.setFiles(files);
+		},
+
+		_makeFilesFromRemoteShares: function(data) {
+			var self = this;
+			var files = data;
+
+			files = _.chain(files)
+				// convert share data to file data
+				.map(function(share) {
+					var file = {
+						shareOwner: share.owner + '@' + share.remote,
+						name: share.name
+					};
+
+					file.shares = [{
+						id: share.id,
+						type: OC.Share.SHARE_TYPE_REMOTE,
+						target: share.mountpoint
+					}];
+					return file;
+				})
+				.value();
+			return files;
 		},
 
 		/**
-- 
GitLab


From 40dd2d9dbe4a732669bd85bfb56ba09054d5dd00 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 1 Oct 2015 16:04:22 +0200
Subject: [PATCH 647/783] More fileinfo

---
 apps/files_sharing/js/sharedfilelist.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 7912944ac18..84a628345dd 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -191,14 +191,18 @@
 				// convert share data to file data
 				.map(function(share) {
 					var file = {
-						shareOwner: share.owner + '@' + share.remote,
-						name: share.name
+						shareOwner: share.owner + '@' + share.remote.replace(/.*?:\/\//g, ""),
+						name: OC.basename(share.mountpoint),
+						mtime: share.mtime,
+						mimetype: share.mimetype,
+						type: share.type,
+						id: share.file_id,
+						path: OC.dirname(share.mountpoint)
 					};
 
 					file.shares = [{
 						id: share.id,
-						type: OC.Share.SHARE_TYPE_REMOTE,
-						target: share.mountpoint
+						type: OC.Share.SHARE_TYPE_REMOTE
 					}];
 					return file;
 				})
-- 
GitLab


From 4adc78b78b3f6a659d79eaf17dff3ae5d7f79db7 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 1 Oct 2015 17:20:47 +0200
Subject: [PATCH 648/783] Fix and extend unit tests

---
 apps/files_sharing/js/sharedfilelist.js       |  10 +-
 .../tests/js/sharedfilelistSpec.js            | 115 ++++++++++++++++--
 2 files changed, 111 insertions(+), 14 deletions(-)

diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 84a628345dd..2e798a92578 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -151,6 +151,9 @@
 					},
 				});
 				promises.push(remoteShares);
+			} else {
+				//Push empty promise so callback gets called the same way
+				promises.push($.Deferred().resolve());
 			}
 
 			this._reloadCall = $.when.apply($, promises);
@@ -174,7 +177,7 @@
 				// TODO: error handling
 			}
 
-			if (remoteShares[0].ocs && remoteShares[0].ocs.data) {
+			if (remoteShares && remoteShares[0].ocs && remoteShares[0].ocs.data) {
 				files = files.concat(this._makeFilesFromRemoteShares(remoteShares[0].ocs.data));
 			} else {
 				// TODO: error handling
@@ -193,11 +196,12 @@
 					var file = {
 						shareOwner: share.owner + '@' + share.remote.replace(/.*?:\/\//g, ""),
 						name: OC.basename(share.mountpoint),
-						mtime: share.mtime,
+						mtime: share.mtime * 1000,
 						mimetype: share.mimetype,
 						type: share.type,
 						id: share.file_id,
-						path: OC.dirname(share.mountpoint)
+						path: OC.dirname(share.mountpoint),
+						permissions: share.permissions
 					};
 
 					file.shares = [{
diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
index 7fdc6345e38..90ae9c2d6da 100644
--- a/apps/files_sharing/tests/js/sharedfilelistSpec.js
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -57,6 +57,7 @@ describe('OCA.Sharing.FileList tests', function() {
 
 	describe('loading file list for incoming shares', function() {
 		var ocsResponse;
+		var ocsResponseRemote;
 
 		beforeEach(function() {
 			fileList = new OCA.Sharing.FileList(
@@ -95,26 +96,64 @@ describe('OCA.Sharing.FileList tests', function() {
 					}]
 				}
 			};
+
+			/* jshint camelcase: false */
+			ocsResponseRemote = {
+				ocs: {
+					meta: {
+						status: 'ok',
+						statuscode: 100,
+						message: null
+					},
+					data: [{
+						id: 8,
+						remote: 'https://foo.bar/',
+						remote_id: 42,
+  						share_token: 'abc',
+						name: '/a.txt',
+						owner: 'user3',
+						user: 'user1',
+						mountpoint: '/b.txt',
+						mountpoint_hash: 'def',
+						accepted: 1,
+						mimetype: 'text/plain',
+						mtime: 22222,
+						permissions: 31,
+						type: 'file',
+						file_id: 1337
+					}]
+				}
+			};
+
 		});
 		it('render file shares', function() {
-			var request;
-
-			expect(fakeServer.requests.length).toEqual(1);
-			request = fakeServer.requests[0];
-			expect(request.url).toEqual(
+			expect(fakeServer.requests.length).toEqual(2);
+			expect(fakeServer.requests[0].url).toEqual(
 				OC.linkToOCS('apps/files_sharing/api/v1') +
 				'shares?format=json&shared_with_me=true'
 			);
 
+			expect(fakeServer.requests[1].url).toEqual(
+				OC.linkToOCS('apps/files_sharing/api/v1') +
+				'remote_shares?format=json'
+			);
+
 			fakeServer.requests[0].respond(
 				200,
 				{ 'Content-Type': 'application/json' },
 				JSON.stringify(ocsResponse)
 			);
 
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify(ocsResponseRemote)			
+			);
+
 			var $rows = fileList.$el.find('tbody tr');
+			expect($rows.length).toEqual(2);
+
 			var $tr = $rows.eq(0);
-			expect($rows.length).toEqual(1);
 			expect($tr.attr('data-id')).toEqual('49');
 			expect($tr.attr('data-type')).toEqual('file');
 			expect($tr.attr('data-file')).toEqual('local name.txt');
@@ -132,32 +171,66 @@ describe('OCA.Sharing.FileList tests', function() {
 				'?dir=%2Flocal%20path&files=local%20name.txt'
 			);
 			expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
+
+			$tr = $rows.eq(1);
+			expect($tr.attr('data-id')).toEqual('1337');
+			expect($tr.attr('data-type')).toEqual('file');
+			expect($tr.attr('data-file')).toEqual('b.txt');
+			expect($tr.attr('data-path')).toEqual('');
+			expect($tr.attr('data-size')).not.toBeDefined();
+			expect(parseInt($tr.attr('data-permissions'), 10))
+				.toEqual(OC.PERMISSION_ALL); // read and delete
+			expect($tr.attr('data-mime')).toEqual('text/plain');
+			expect($tr.attr('data-mtime')).toEqual('22222000');
+			expect($tr.attr('data-share-owner')).toEqual('user3@foo.bar/');
+			expect($tr.attr('data-share-id')).toEqual('8');
+			expect($tr.find('a.name').attr('href')).toEqual(
+				OC.webroot +
+				'/index.php/apps/files/ajax/download.php' +
+				'?dir=%2F&files=b.txt'
+			);
+			expect($tr.find('.nametext').text().trim()).toEqual('b.txt');
 		});
 		it('render folder shares', function() {
 			/* jshint camelcase: false */
-			var request;
 			ocsResponse.ocs.data[0] = _.extend(ocsResponse.ocs.data[0], {
 				item_type: 'folder',
 				file_target: '/local path/local name',
 				path: 'files/something shared',
 			});
 
-			expect(fakeServer.requests.length).toEqual(1);
-			request = fakeServer.requests[0];
-			expect(request.url).toEqual(
+			ocsResponseRemote.ocs.data[0] = _.extend(ocsResponseRemote.ocs.data[0], {
+				type: 'dir',
+				mimetype: 'httpd/unix-directory',
+				name: '/a',
+				mountpoint: '/b'
+			});
+
+			expect(fakeServer.requests.length).toEqual(2);
+			expect(fakeServer.requests[0].url).toEqual(
 				OC.linkToOCS('apps/files_sharing/api/v1') +
 				'shares?format=json&shared_with_me=true'
 			);
+			expect(fakeServer.requests[1].url).toEqual(
+				OC.linkToOCS('apps/files_sharing/api/v1') +
+				'remote_shares?format=json'
+			);
 
 			fakeServer.requests[0].respond(
 				200,
 				{ 'Content-Type': 'application/json' },
 				JSON.stringify(ocsResponse)
 			);
+			fakeServer.requests[1].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify(ocsResponseRemote)
+			);
 
 			var $rows = fileList.$el.find('tbody tr');
+			expect($rows.length).toEqual(2);
+
 			var $tr = $rows.eq(0);
-			expect($rows.length).toEqual(1);
 			expect($tr.attr('data-id')).toEqual('49');
 			expect($tr.attr('data-type')).toEqual('dir');
 			expect($tr.attr('data-file')).toEqual('local name');
@@ -175,6 +248,26 @@ describe('OCA.Sharing.FileList tests', function() {
 				'?dir=/local%20path/local%20name'
 			);
 			expect($tr.find('.nametext').text().trim()).toEqual('local name');
+
+			$tr = $rows.eq(1);
+			expect($tr.attr('data-id')).toEqual('1337');
+			expect($tr.attr('data-type')).toEqual('dir');
+			expect($tr.attr('data-file')).toEqual('b');
+			expect($tr.attr('data-path')).toEqual('');
+			expect($tr.attr('data-size')).not.toBeDefined();
+			expect(parseInt($tr.attr('data-permissions'), 10))
+				.toEqual(OC.PERMISSION_ALL); // read and delete
+			expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
+			expect($tr.attr('data-mtime')).toEqual('22222000');
+			expect($tr.attr('data-share-owner')).toEqual('user3@foo.bar/');
+			expect($tr.attr('data-share-id')).toEqual('8');
+			expect($tr.find('a.name').attr('href')).toEqual(
+				OC.webroot +
+				'/index.php/apps/files' +
+				'?dir=/b'
+			);
+			expect($tr.find('.nametext').text().trim()).toEqual('b');
+
 		});
 	});
 	describe('loading file list for outgoing shares', function() {
-- 
GitLab


From 6b53f7c40e8bbaecfa20a3b19b3164e332903f59 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 30 Sep 2015 17:53:15 +0200
Subject: [PATCH 649/783] [l10n] remove unused static methods

---
 lib/private/l10n.php | 39 +++------------------------------------
 tests/lib/l10n.php   |  6 ++----
 2 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 89ce2bc8d72..b3c87292f1d 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -389,29 +389,6 @@ class OC_L10N implements \OCP\IL10N {
 		}
 	}
 
-	/**
-	 * Choose a language
-	 * @param array $text Associative Array with possible strings
-	 * @return String
-	 *
-	 * $text is an array 'de' => 'hallo welt', 'en' => 'hello world', ...
-	 *
-	 * This function is useful to avoid loading thousands of files if only one
-	 * simple string is needed, for example in appinfo.php
-	 */
-	public static function selectLanguage($text) {
-		$lang = self::findLanguage(array_keys($text));
-		return $text[$lang];
-	}
-
-	/**
-	 * The given language is forced to be used while executing the current request
-	 * @param string $lang
-	 */
-	public static function forceLanguage($lang) {
-		self::$language = $lang;
-	}
-
 	/**
 	 * The code (en, de, ...) of the language that is used for this OC_L10N object
 	 *
@@ -423,17 +400,13 @@ class OC_L10N implements \OCP\IL10N {
 
 	/**
 	 * find the best language
-	 * @param array|string $app details below
+	 * @param string $app
 	 * @return string language
 	 *
-	 * If $app is an array, ownCloud assumes that these are the available
-	 * languages. Otherwise ownCloud tries to find the files in the l10n
-	 * folder.
-	 *
 	 * If nothing works it returns 'en'
 	 */
 	public static function findLanguage($app = null) {
-		if(!is_array($app) && self::$language != '') {
+		if(self::$language != '') {
 			return self::$language;
 		}
 
@@ -443,13 +416,7 @@ class OC_L10N implements \OCP\IL10N {
 		if($userId && $config->getUserValue($userId, 'core', 'lang')) {
 			$lang = $config->getUserValue($userId, 'core', 'lang');
 			self::$language = $lang;
-			if(is_array($app)) {
-				$available = $app;
-				$lang_exists = array_search($lang, $available) !== false;
-			} else {
-				$lang_exists = self::languageExists($app, $lang);
-			}
-			if($lang_exists) {
+			if(self::languageExists($app, $lang)) {
 				return $lang;
 			}
 		}
diff --git a/tests/lib/l10n.php b/tests/lib/l10n.php
index d5f9a5ca3fa..cb2f4179c4d 100644
--- a/tests/lib/l10n.php
+++ b/tests/lib/l10n.php
@@ -92,8 +92,7 @@ class Test_L10n extends \Test\TestCase {
 	 * @dataProvider localizationDataProvider
 	 */
 	public function testNumericStringLocalization($expectedDate, $lang, $type, $value) {
-		$l = new OC_L10N('test');
-		$l->forceLanguage($lang);
+		$l = new OC_L10N('test', $lang);
 		$this->assertSame($expectedDate, $l->l($type, $value));
 	}
 
@@ -110,8 +109,7 @@ class Test_L10n extends \Test\TestCase {
 	 * @param $lang
 	 */
 	public function testFirstWeekDay($expected, $lang) {
-		$l = new OC_L10N('test');
-		$l->forceLanguage($lang);
+		$l = new OC_L10N('test', $lang);
 		$this->assertSame($expected, $l->l('firstday', 'firstday'));
 	}
 
-- 
GitLab


From a1d0d23b6a6cc1258fe7410d9d1001d8a0b57218 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 2 Oct 2015 14:16:13 +0200
Subject: [PATCH 650/783] Work around INF=0 on some shared hosts

---
 lib/private/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/helper.php b/lib/private/helper.php
index ba1240a5218..973960ca7a5 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -742,7 +742,7 @@ class OC_Helper {
 			$freeSpace = max($freeSpace, 0);
 			return $freeSpace;
 		} else {
-			return INF;
+			return (INF > 0)? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
 		}
 	}
 
-- 
GitLab


From cd7aff47e163c1213e072af02fbbeafa11cf64e1 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Tue, 22 Sep 2015 13:34:07 +0100
Subject: [PATCH 651/783] Introduce a few new mimetypes for code

---
 core/js/mimetypelist.js                    | 56 +++++++++++++---------
 resources/config/mimetypealiases.dist.json | 28 +++++++----
 resources/config/mimetypemapping.dist.json |  7 ++-
 3 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index af2ad73c51b..760d7baab72 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -9,23 +9,26 @@
 OC.MimeTypeList={
 	aliases: {
     "application/coreldraw": "image",
-    "application/font-sfnt": "font",
-    "application/font-woff": "font",
-    "application/illustrator": "image/vector",
+    "application/epub+zip": "text",
+    "application/font-sfnt": "image",
+    "application/font-woff": "image",
+    "application/illustrator": "image",
+    "application/javascript": "text/code",
     "application/json": "text/code",
-    "application/msaccess": "database",
+    "application/msaccess": "file",
     "application/msexcel": "x-office/spreadsheet",
     "application/mspowerpoint": "x-office/presentation",
     "application/msword": "x-office/document",
     "application/octet-stream": "file",
-    "application/postscript": "image/vector",
+    "application/postscript": "image",
+    "application/rss+xml": "application/xml",
     "application/vnd.android.package-archive": "package/x-generic",
     "application/vnd.ms-excel": "x-office/spreadsheet",
     "application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
-    "application/vnd.ms-fontobject": "font",
+    "application/vnd.ms-fontobject": "image",
     "application/vnd.ms-powerpoint": "x-office/presentation",
     "application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
     "application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -49,10 +52,11 @@ OC.MimeTypeList={
     "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
     "application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
     "application/x-7z-compressed": "package/x-generic",
+    "application/x-cbr": "text",
     "application/x-compressed": "package/x-generic",
     "application/x-dcraw": "image",
     "application/x-deb": "package/x-generic",
-    "application/x-font": "font",
+    "application/x-font": "image",
     "application/x-gimp": "image",
     "application/x-gzip": "package/x-generic",
     "application/x-perl": "text/code",
@@ -64,33 +68,39 @@ OC.MimeTypeList={
     "application/xml": "text/html",
     "application/yaml": "text/code",
     "application/zip": "package/x-generic",
+    "database": "file",
     "httpd/unix-directory": "dir",
-    "image/svg+xml": "image/vector",
     "text/css": "text/code",
     "text/csv": "x-office/spreadsheet",
-    "text/x-shellscript": "text/code"
+    "text/html": "text/code",
+    "text/x-c": "text/code",
+    "text/x-h": "text/code",
+    "text/x-java-source": "text/code",
+    "text/x-python": "text/code",
+    "text/x-shellscript": "text/code",
+    "web": "text/code"
 },
 	files: [
-    "application-pdf",
-    "application",
-    "audio",
-    "file",
+    "video",
     "folder-drag-accept",
-    "folder-external",
-    "folder-public",
-    "folder-shared",
     "folder-starred",
-    "folder",
-    "image",
+    "folder-public",
     "package-x-generic",
-    "text-calendar",
-    "text-code",
-    "text-vcard",
     "text",
-    "video",
+    "folder-external",
+    "text-vcard",
+    "application",
+    "text-code",
+    "x-office-spreadsheet",
+    "application-pdf",
+    "folder",
     "x-office-document",
+    "text-calendar",
     "x-office-presentation",
-    "x-office-spreadsheet"
+    "file",
+    "folder-shared",
+    "image",
+    "audio"
 ],
 	themes: []
 };
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index 3d6c5edc132..d0019c4f0a7 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -9,23 +9,26 @@
 
 
 	"application/coreldraw": "image",
-	"application/font-sfnt": "font",
-	"application/font-woff": "font",
-	"application/illustrator": "image/vector",
+	"application/epub+zip": "text",
+	"application/font-sfnt": "image",
+	"application/font-woff": "image",
+	"application/illustrator": "image",
+	"application/javascript": "text/code",
 	"application/json": "text/code",
-	"application/msaccess": "database",
+	"application/msaccess": "file",
 	"application/msexcel": "x-office/spreadsheet",
 	"application/mspowerpoint": "x-office/presentation",
 	"application/msword": "x-office/document",
 	"application/octet-stream": "file",
-	"application/postscript": "image/vector",
+	"application/postscript": "image",
+	"application/rss+xml": "application/xml",
 	"application/vnd.android.package-archive": "package/x-generic",
 	"application/vnd.ms-excel": "x-office/spreadsheet",
 	"application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
 	"application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
 	"application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
 	"application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
-	"application/vnd.ms-fontobject": "font",
+	"application/vnd.ms-fontobject": "image",
 	"application/vnd.ms-powerpoint": "x-office/presentation",
 	"application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
 	"application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -49,10 +52,11 @@
 	"application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
 	"application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
 	"application/x-7z-compressed": "package/x-generic",
+	"application/x-cbr": "text",
 	"application/x-compressed": "package/x-generic",
 	"application/x-dcraw": "image",
 	"application/x-deb": "package/x-generic",
-	"application/x-font": "font",
+	"application/x-font": "image",
 	"application/x-gimp": "image",
 	"application/x-gzip": "package/x-generic",
 	"application/x-perl": "text/code",
@@ -64,10 +68,16 @@
 	"application/xml": "text/html",
 	"application/yaml": "text/code",
 	"application/zip": "package/x-generic",
+	"database": "file",
 	"httpd/unix-directory": "dir",
-	"image/svg+xml": "image/vector",
 	"text/css": "text/code",
 	"text/csv": "x-office/spreadsheet",
-	"text/x-shellscript": "text/code"
+	"text/html": "text/code",
+	"text/x-c": "text/code",
+	"text/x-h": "text/code",
+	"text/x-java-source": "text/code",
+	"text/x-python": "text/code",
+	"text/x-shellscript": "text/code",
+	"web": "text/code"
 }
 
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index 79b0ca65240..e7c08871817 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -27,6 +27,7 @@
 	"cbz": ["application/x-cbr"],
 	"cc": ["text/x-c"],
 	"cdr": ["application/coreldraw"],
+	"class": ["application/java"],
 	"cnf": ["text/plain"],
 	"conf": ["text/plain"],
 	"cpp": ["text/x-c++src"],
@@ -35,7 +36,7 @@
 	"csv": ["text/csv"],
 	"cvbdl": ["application/x-cbr"],
 	"c": ["text/x-c"],
-	"c++": ["text/x-c++src"],
+	"c++": ["text/x-c"],
 	"dcr": ["image/x-dcraw"],
 	"deb": ["application/x-deb"],
 	"dng": ["image/x-dcraw"],
@@ -57,12 +58,14 @@
 	"gzip": ["application/x-gzip"],
 	"h": ["text/x-h"],
 	"hh": ["text/x-h"],
+	"hpp": ["text/x-h"],
 	"html": ["text/html", "text/plain"],
 	"htm": ["text/html", "text/plain"],
 	"ical": ["text/calendar"],
 	"ics": ["text/calendar"],
 	"iiq": ["image/x-dcraw"],
 	"impress": ["text/impress"],
+	"java": ["text/x-java-source"],
 	"jpeg": ["image/jpeg"],
 	"jpg": ["image/jpeg"],
 	"jps": ["image/jpeg"],
@@ -130,6 +133,8 @@
 	"raf": ["image/x-dcraw"],
 	"rar": ["application/x-rar-compressed"],
 	"reveal": ["text/reveal"],
+	"rss": ["application/rss+xml"],
+	"rtf": ["text/rtf"],
 	"rw2": ["image/x-dcraw"],
 	"sgf": ["application/sgf"],
 	"sh-lib": ["text/x-shellscript"],
-- 
GitLab


From aeb20675dd9679331b0de8f7ebf72ed0b0815742 Mon Sep 17 00:00:00 2001
From: Robin McCorkell <rmccorkell@owncloud.com>
Date: Tue, 22 Sep 2015 14:39:02 +0100
Subject: [PATCH 652/783] Allow recursive mimetype aliases

application/xml -> text/html -> text/code
---
 core/js/mimetype.js                  | 2 +-
 lib/private/files/type/detection.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/js/mimetype.js b/core/js/mimetype.js
index d22b0a2378a..b0de8eb8411 100644
--- a/core/js/mimetype.js
+++ b/core/js/mimetype.js
@@ -70,7 +70,7 @@ OC.MimeType = {
 			return undefined;
 		}
 
-		if (mimeType in OC.MimeTypeList.aliases) {
+		while (mimeType in OC.MimeTypeList.aliases) {
 			mimeType = OC.MimeTypeList.aliases[mimeType];
 		}
 		if (mimeType in OC.MimeType._mimeTypeIcons) {
diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index 0c647ab44c6..dc8aff2f30c 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -269,7 +269,7 @@ class Detection implements IMimeTypeDetector {
 	public function mimeTypeIcon($mimetype) {
 		$this->loadAliases();
 
-		if (isset($this->mimeTypeAlias[$mimetype])) {
+		while (isset($this->mimeTypeAlias[$mimetype])) {
 			$mimetype = $this->mimeTypeAlias[$mimetype];
 		}
 		if (isset($this->mimetypeIcons[$mimetype])) {
-- 
GitLab


From 57ceee13a964ac949717891e13af1990779ad841 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 22 Sep 2015 17:56:48 +0200
Subject: [PATCH 653/783] Updated some mimetypes

* c++ and cpp now both map to code
---
 core/js/mimetypelist.js                    | 1 +
 resources/config/mimetypealiases.dist.json | 1 +
 resources/config/mimetypemapping.dist.json | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index 760d7baab72..43f01273f55 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -74,6 +74,7 @@ OC.MimeTypeList={
     "text/csv": "x-office/spreadsheet",
     "text/html": "text/code",
     "text/x-c": "text/code",
+    "text/x-c++src": "text/code",
     "text/x-h": "text/code",
     "text/x-java-source": "text/code",
     "text/x-python": "text/code",
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index d0019c4f0a7..ed471f228e2 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -74,6 +74,7 @@
 	"text/csv": "x-office/spreadsheet",
 	"text/html": "text/code",
 	"text/x-c": "text/code",
+	"text/x-c++src": "text/code",
 	"text/x-h": "text/code",
 	"text/x-java-source": "text/code",
 	"text/x-python": "text/code",
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index e7c08871817..e26ec7038b1 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -36,7 +36,7 @@
 	"csv": ["text/csv"],
 	"cvbdl": ["application/x-cbr"],
 	"c": ["text/x-c"],
-	"c++": ["text/x-c"],
+	"c++": ["text/x-c++src"],
 	"dcr": ["image/x-dcraw"],
 	"deb": ["application/x-deb"],
 	"dng": ["image/x-dcraw"],
-- 
GitLab


From c80dd82fe4c197cb09344a2ce25f790cd597b792 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 2 Oct 2015 15:28:03 +0200
Subject: [PATCH 654/783] Added mimetype repair step

* Version number increased
---
 lib/repair/repairmimetypes.php       | 52 ++++++++++++++++++++
 tests/lib/repair/repairmimetypes.php | 72 ++++++++++++++++++++++++++++
 version.php                          |  2 +-
 3 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/lib/repair/repairmimetypes.php b/lib/repair/repairmimetypes.php
index db11f526ad6..b9cd42f3136 100644
--- a/lib/repair/repairmimetypes.php
+++ b/lib/repair/repairmimetypes.php
@@ -250,6 +250,39 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
 		self::updateMimetypes($updatedMimetypes);
 	}
 
+	private function introduceJavaMimeType() {
+		$updatedMimetypes = array(
+			'class' => 'application/java',
+			'java' => 'text/x-java-source',
+		);
+
+		self::updateMimetypes($updatedMimetypes);
+	}
+
+	private function introduceHppMimeType() {
+		$updatedMimetypes = array(
+			'hpp' => 'text/x-h',
+		);
+
+		self::updateMimetypes($updatedMimetypes);
+	}
+
+	private function introduceRssMimeType() {
+		$updatedMimetypes = array(
+			'rss' => 'application/rss+xml',
+		);
+
+		self::updateMimetypes($updatedMimetypes);
+	}
+
+	private function introduceRtfMimeType() {
+		$updatedMimetypes = array(
+			'rtf' => 'text/rtf',
+		);
+
+		self::updateMimetypes($updatedMimetypes);
+	}
+
 	/**
 	 * Fix mime types
 	 */
@@ -294,5 +327,24 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
 				$this->emit('\OC\Repair', 'info', array('Fixed Yaml/Yml mime types'));
 			}
 		}
+
+		// Mimetype updates from #19272
+		if (version_compare($ocVersionFromBeforeUpdate, '8.2.0.8', '<')) {
+			if ($this->introduceJavaMimeType()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed java/class mime types'));
+			}
+
+			if ($this->introduceHppMimeType()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed hpp mime type'));
+			}
+
+			if ($this->introduceRssMimeType()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed rss mime type'));
+			}
+
+			if ($this->introduceRtfMimeType()) {
+				$this->emit('\OC\Repair', 'info', array('Fixed rtf mime type'));
+			}
+		}
 	}
 }
diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php
index 3c100b808cf..0288a476ede 100644
--- a/tests/lib/repair/repairmimetypes.php
+++ b/tests/lib/repair/repairmimetypes.php
@@ -282,6 +282,68 @@ class RepairMimeTypes extends \Test\TestCase {
 		$this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
 	}
 
+	/**
+	 * Test renaming the java mime types
+	 */
+	public function testRenameJavaMimeType() {
+		$currentMimeTypes = [
+			['test.java', 'application/octet-stream'],
+			['test.class', 'application/octet-stream'],
+		];
+
+		$fixedMimeTypes = [
+			['test.java', 'text/x-java-source'],
+			['test.class', 'application/java'],
+		];
+
+		$this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
+	}
+
+	/**
+	 * Test renaming the hpp mime type
+	 */
+	public function testRenameHppMimeType() {
+		$currentMimeTypes = [
+			['test.hpp', 'application/octet-stream'],
+		];
+
+		$fixedMimeTypes = [
+			['test.hpp', 'text/x-h'],
+		];
+
+		$this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
+	}
+
+	/**
+	 * Test renaming the rss mime type
+	 */
+	public function testRenameRssMimeType() {
+		$currentMimeTypes = [
+			['test.rss', 'application/octet-stream'],
+		];
+
+		$fixedMimeTypes = [
+			['test.rss', 'application/rss+xml'],
+		];
+
+		$this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
+	}
+
+	/**
+	 * Test renaming the hpp mime type
+	 */
+	public function testRenameRtfMimeType() {
+		$currentMimeTypes = [
+			['test.rtf', 'application/octet-stream'],
+		];
+
+		$fixedMimeTypes = [
+			['test.rtf', 'text/rtf'],
+		];
+
+		$this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
+	}
+
 	/**
 	 * Test renaming and splitting old office mime types when
 	 * new ones already exist
@@ -399,6 +461,11 @@ class RepairMimeTypes extends \Test\TestCase {
 			['test.cnf', 'text/plain'],
 			['test.yaml', 'application/yaml'],
 			['test.yml', 'application/yaml'],
+			['test.java', 'text/x-java-source'],
+			['test.class', 'application/java'],
+			['test.hpp', 'text/x-h'],
+			['test.rss', 'application/rss+xml'],
+			['test.rtf', 'text/rtf'],
 		];
 
 		$fixedMimeTypes = [
@@ -438,6 +505,11 @@ class RepairMimeTypes extends \Test\TestCase {
 			['test.cnf', 'text/plain'],
 			['test.yaml', 'application/yaml'],
 			['test.yml', 'application/yaml'],
+			['test.java', 'text/x-java-source'],
+			['test.class', 'application/java'],
+			['test.hpp', 'text/x-h'],
+			['test.rss', 'application/rss+xml'],
+			['test.rtf', 'text/rtf'],
 		];
 
 		$this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
diff --git a/version.php b/version.php
index 925e897d1ab..7ba6c3d93bc 100644
--- a/version.php
+++ b/version.php
@@ -23,7 +23,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(8, 2, 0, 7);
+$OC_Version = array(8, 2, 0, 8);
 
 // The human readable string
 $OC_VersionString = '8.2 beta1';
-- 
GitLab


From 64ca00925b0384592091cab3e596d5427c1c5517 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 2 Oct 2015 12:14:24 +0200
Subject: [PATCH 655/783] Prevent moving mount point into already shared folder
 (outgoing)

It is already not allowed to share a folder containing mount points /
incoming shares.

This fixes an issue that made it possible to bypass the check by moving
the incoming share mount point into an existing outgoing share folder.
---
 lib/private/files/view.php |  37 ++++++++---
 tests/lib/files/view.php   | 131 +++++++++++++++++++++++++++++++------
 2 files changed, 141 insertions(+), 27 deletions(-)

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 95b688fef5c..c8dbc001f2d 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1602,25 +1602,46 @@ class View {
 
 	/**
 	 * check if it is allowed to move a mount point to a given target.
-	 * It is not allowed to move a mount point into a different mount point
+	 * It is not allowed to move a mount point into a different mount point or
+	 * into an already shared folder
 	 *
 	 * @param string $target path
 	 * @return boolean
 	 */
 	private function isTargetAllowed($target) {
 
-		$result = false;
-
-		list($targetStorage,) = \OC\Files\Filesystem::resolvePath($target);
-		if ($targetStorage->instanceOfStorage('\OCP\Files\IHomeStorage')) {
-			$result = true;
-		} else {
+		list($targetStorage, $targetInternalPath) = \OC\Files\Filesystem::resolvePath($target);
+		if (!$targetStorage->instanceOfStorage('\OCP\Files\IHomeStorage')) {
 			\OCP\Util::writeLog('files',
 				'It is not allowed to move one mount point into another one',
 				\OCP\Util::DEBUG);
+			return false;
 		}
 
-		return $result;
+		// note: cannot use the view because the target is already locked
+		$fileId = (int)$targetStorage->getCache()->getId($targetInternalPath);
+		if ($fileId === -1) {
+			// target might not exist, need to check parent instead
+			$fileId = (int)$targetStorage->getCache()->getId(dirname($targetInternalPath));
+		}
+
+		// check if any of the parents were shared by the current owner (include collections)
+		$shares = \OCP\Share::getItemShared(
+			'folder',
+			$fileId,
+			\OCP\Share::FORMAT_NONE,
+			null,
+			true
+		);
+
+		if (count($shares) > 0) {
+			\OCP\Util::writeLog('files',
+				'It is not allowed to move one mount point into a shared folder',
+				\OCP\Util::DEBUG);
+			return false;
+		}
+
+		return true;
 	}
 
 	/**
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index ceeb9ba7a94..94f9e209152 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -104,6 +104,9 @@ class View extends \Test\TestCase {
 		$this->userObject->delete();
 		$this->groupObject->delete();
 
+		$mountProviderCollection = \OC::$server->getMountProviderCollection();
+		\Test\TestCase::invokePrivate($mountProviderCollection, 'providers', [[]]);
+
 		parent::tearDown();
 	}
 
@@ -1486,6 +1489,112 @@ class View extends \Test\TestCase {
 		$this->assertEquals($shouldEmit, $result);
 	}
 
+	/**
+	 * Create test movable mount points
+	 *
+	 * @param array $mountPoints array of mount point locations
+	 * @return array array of MountPoint objects
+	 */
+	private function createTestMovableMountPoints($mountPoints) {
+		$mounts = [];
+		foreach ($mountPoints as $mountPoint) {
+			$storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
+				->setMethods([])
+				->getMock();
+
+			$mounts[] = $this->getMock(
+				'\Test\TestMoveableMountPoint',
+				['moveMount'],
+				[$storage, $mountPoint]
+			);
+		}
+
+		$mountProvider = $this->getMock('\OCP\Files\Config\IMountProvider');
+		$mountProvider->expects($this->any())
+			->method('getMountsForUser')
+			->will($this->returnValue($mounts));
+
+		$mountProviderCollection = \OC::$server->getMountProviderCollection();
+		$mountProviderCollection->registerProvider($mountProvider);
+
+		return $mounts;
+	}
+
+	/**
+	 * Test mount point move
+	 */
+	public function testMountPointMove() {
+		$this->loginAsUser($this->user);
+
+		list($mount1, $mount2) = $this->createTestMovableMountPoints([
+			$this->user . '/files/mount1',
+			$this->user . '/files/mount2',
+		]);
+		$mount1->expects($this->once())
+			->method('moveMount')
+			->will($this->returnValue(true));
+
+		$mount2->expects($this->once())
+			->method('moveMount')
+			->will($this->returnValue(true));
+
+		$view = new \OC\Files\View('/' . $this->user . '/files/');
+		$view->mkdir('sub');
+
+		$this->assertTrue($view->rename('mount1', 'renamed_mount'), 'Can rename mount point');
+		$this->assertTrue($view->rename('mount2', 'sub/moved_mount'), 'Can move a mount point into a subdirectory');
+	}
+	/**
+	 * Test that moving a mount point into another is forbidden
+	 */
+	public function testMoveMountPointIntoAnother() {
+		$this->loginAsUser($this->user);
+
+		list($mount1, $mount2) = $this->createTestMovableMountPoints([
+			$this->user . '/files/mount1',
+			$this->user . '/files/mount2',
+		]);
+
+		$mount1->expects($this->never())
+			->method('moveMount');
+
+		$mount2->expects($this->never())
+			->method('moveMount');
+
+		$view = new \OC\Files\View('/' . $this->user . '/files/');
+
+		$this->assertFalse($view->rename('mount1', 'mount2'), 'Cannot overwrite another mount point');
+		$this->assertFalse($view->rename('mount1', 'mount2/sub'), 'Cannot move a mount point into another');
+	}
+	/**
+	 * Test that moving a mount point into a shared folder is forbidden
+	 */
+	public function testMoveMountPointIntoSharedFolder() {
+		$this->loginAsUser($this->user);
+
+		list($mount1) = $this->createTestMovableMountPoints([
+			$this->user . '/files/mount1',
+		]);
+
+		$mount1->expects($this->never())
+			->method('moveMount');
+
+		$view = new \OC\Files\View('/' . $this->user . '/files/');
+		$view->mkdir('shareddir');
+		$view->mkdir('shareddir/sub');
+		$view->mkdir('shareddir/sub2');
+
+		$fileId = $view->getFileInfo('shareddir')->getId();
+		$userObject = \OC::$server->getUserManager()->createUser('test2', 'IHateNonMockableStaticClasses');
+		$this->assertTrue(\OCP\Share::shareItem('folder', $fileId, \OCP\Share::SHARE_TYPE_USER, 'test2', \OCP\Constants::PERMISSION_READ));
+
+		$this->assertFalse($view->rename('mount1', 'shareddir'), 'Cannot overwrite shared folder');
+		$this->assertFalse($view->rename('mount1', 'shareddir/sub'), 'Cannot move mount point into shared folder');
+		$this->assertFalse($view->rename('mount1', 'shareddir/sub/sub2'), 'Cannot move mount point into shared subfolder');
+
+		$this->assertTrue(\OCP\Share::unshare('folder', $fileId, \OCP\Share::SHARE_TYPE_USER, 'test2'));
+		$userObject->delete();
+	}
 
 	public function basicOperationProviderForLocks() {
 		return [
@@ -2042,23 +2151,9 @@ class View extends \Test\TestCase {
 	public function testLockMoveMountPoint() {
 		$this->loginAsUser('test');
 
-		$subStorage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
-			->setMethods([])
-			->getMock();
-
-		$mount = $this->getMock(
-			'\Test\TestMoveableMountPoint',
-			['moveMount'],
-			[$subStorage, $this->user . '/files/substorage']
-		);
-
-		$mountProvider = $this->getMock('\OCP\Files\Config\IMountProvider');
-		$mountProvider->expects($this->once())
-			->method('getMountsForUser')
-			->will($this->returnValue([$mount]));
-
-		$mountProviderCollection = \OC::$server->getMountProviderCollection();
-		$mountProviderCollection->registerProvider($mountProvider);
+		list($mount) = $this->createTestMovableMountPoints([
+			$this->user . '/files/substorage',
+		]);
 
 		$view = new \OC\Files\View('/' . $this->user . '/files/');
 		$view->mkdir('subdir');
@@ -2109,8 +2204,6 @@ class View extends \Test\TestCase {
 		$this->assertNull($this->getFileLockType($view, $sourcePath, false), 'Shared storage root not locked after operation');
 		$this->assertNull($this->getFileLockType($view, $sourcePath, true), 'Source path not locked after operation');
 		$this->assertNull($this->getFileLockType($view, $targetPath, true), 'Target path not locked after operation');
-
-		\Test\TestCase::invokePrivate($mountProviderCollection, 'providers', [[]]);
 	}
 
 	/**
-- 
GitLab


From 0ce28a574a4c747dc7a92fd3bb79cca55891c795 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 2 Oct 2015 16:04:04 +0200
Subject: [PATCH 656/783] if mountpoint is applicable to all users the old API
 expects a array with 'all'

---
 apps/files_external/lib/config.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index afea7ead4e6..457fd58f0f8 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -207,6 +207,11 @@ class OC_Mount_Config {
 			'groups' => $storage->getApplicableGroups(),
 			'users' => $storage->getApplicableUsers(),
 		];
+		// if mountpoint is applicable to all users the old API expects ['all']
+		if (empty($mountEntry['applicable']['groups']) && empty($mountEntry['applicable']['users'])) {
+			$mountEntry['applicable']['users'] = ['all'];
+		}
+
 		$mountEntry['id'] = $storage->getId();
 
 		return $mountEntry;
-- 
GitLab


From 1562da3691e69e5872a32e0582b3316aa3e16991 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 2 Oct 2015 16:35:33 +0200
Subject: [PATCH 657/783] Focus on share field after first display

---
 core/js/sharedialogview.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index ee31ed33132..7b02e6a3a50 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -174,12 +174,19 @@
 			// only show the loading spinner for the first request (for now)
 			if (!this._loadingOnce) {
 				this._toggleLoading(true);
-				this._loadingOnce = true;
 			}
 		},
 
 		_onEndRequest: function() {
+			var self = this;
 			this._toggleLoading(false);
+			if (!this._loadingOnce) {
+				this._loadingOnce = true;
+				// the first time, focus on the share field after the spinner disappeared
+				_.defer(function() {
+					self.$('#shareWith').focus();
+				});
+			}
 		},
 
 		render: function() {
-- 
GitLab


From 943c5069d4822802d3c210fcabe80a5364c438ef Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 2 Oct 2015 17:08:39 +0200
Subject: [PATCH 658/783] Lock files when rolling back version

---
 apps/files_versions/lib/storage.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index bdf1811c5f9..cd2077d2922 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -42,6 +42,7 @@ namespace OCA\Files_Versions;
 
 use OCA\Files_Versions\AppInfo\Application;
 use OCA\Files_Versions\Command\Expire;
+use OCP\Lock\ILockingProvider;
 
 class Storage {
 
@@ -337,11 +338,19 @@ class Storage {
 	 * @return bool true for success, false otherwise
 	 */
 	private static function copyFileContents($view, $path1, $path2) {
+		/** @var \OC\Files\Storage\Storage $storage1 */
 		list($storage1, $internalPath1) = $view->resolvePath($path1);
+		/** @var \OC\Files\Storage\Storage $storage2 */
 		list($storage2, $internalPath2) = $view->resolvePath($path2);
 
+		$view->lockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
+		$view->lockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
+
 		$result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
 
+		$view->unlockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
+		$view->unlockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
+
 		return ($result !== false);
 	}
 
-- 
GitLab


From f135128664cae62a831ed46853ac820af6a4812b Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 2 Oct 2015 18:02:55 +0200
Subject: [PATCH 659/783] Fix filelist size issues, breadcrumb, multiselect

- calculate multiselect header width to exclude scrollbar
- call FileList._onResize() when sidebar is toggled ("appresized"), this
  also updates the breadcrumb width
- moved global getScrollBarWidth() to OC.Util namespace
---
 apps/files/js/filelist.js |  4 +++
 core/js/js.js             | 68 +++++++++++++++++++++++++--------------
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 9c4e43b3b8b..2516dd3e957 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -233,6 +233,7 @@
 			this.$el.find('thead th .columntitle').click(_.bind(this._onClickHeader, this));
 
 			this._onResize = _.debounce(_.bind(this._onResize, this), 100);
+			$('#app-content').on('appresized', this._onResize);
 			$(window).resize(this._onResize);
 
 			this.$el.on('show', this._onResize);
@@ -278,6 +279,7 @@
 			this.fileActions.off('registerAction', this._onFileActionsUpdated);
 			this.fileActions.off('setDefault', this._onFileActionsUpdated);
 			OC.Plugins.detach('OCA.Files.FileList', this);
+			$('#app-content').off('appresized', this._onResize);
 		},
 
 		/**
@@ -437,6 +439,8 @@
 
 			this.breadcrumb.setMaxWidth(containerWidth - actionsWidth - 10);
 
+			this.$table.find('>thead').width($('#app-content').width() - OC.Util.getScrollBarWidth());
+
 			this.updateSearch();
 		},
 
diff --git a/core/js/js.js b/core/js/js.js
index e40141ac617..38ccc70cb15 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1636,6 +1636,45 @@ OC.Util = {
 		return $('html').hasClass('ie8');
 	},
 
+	/**
+	 * Returns the width of a generic browser scrollbar
+	 *
+	 * @return {int} width of scrollbar
+	 */
+	getScrollBarWidth: function() {
+		if (this._scrollBarWidth) {
+			return this._scrollBarWidth;
+		}
+
+		var inner = document.createElement('p');
+		inner.style.width = "100%";
+		inner.style.height = "200px";
+
+		var outer = document.createElement('div');
+		outer.style.position = "absolute";
+		outer.style.top = "0px";
+		outer.style.left = "0px";
+		outer.style.visibility = "hidden";
+		outer.style.width = "200px";
+		outer.style.height = "150px";
+		outer.style.overflow = "hidden";
+		outer.appendChild (inner);
+
+		document.body.appendChild (outer);
+		var w1 = inner.offsetWidth;
+		outer.style.overflow = 'scroll';
+		var w2 = inner.offsetWidth;
+		if(w1 === w2) {
+			w2 = outer.clientWidth;
+		}
+
+		document.body.removeChild (outer);
+
+		this._scrollBarWidth = (w1 - w2);
+
+		return this._scrollBarWidth;
+	},
+
 	/**
 	 * Remove the time component from a given date
 	 *
@@ -1926,32 +1965,11 @@ jQuery.fn.exists = function(){
 	return this.length > 0;
 };
 
+/**
+ * @deprecated use OC.Util.getScrollBarWidth() instead
+ */
 function getScrollBarWidth() {
-	var inner = document.createElement('p');
-	inner.style.width = "100%";
-	inner.style.height = "200px";
-
-	var outer = document.createElement('div');
-	outer.style.position = "absolute";
-	outer.style.top = "0px";
-	outer.style.left = "0px";
-	outer.style.visibility = "hidden";
-	outer.style.width = "200px";
-	outer.style.height = "150px";
-	outer.style.overflow = "hidden";
-	outer.appendChild (inner);
-
-	document.body.appendChild (outer);
-	var w1 = inner.offsetWidth;
-	outer.style.overflow = 'scroll';
-	var w2 = inner.offsetWidth;
-	if(w1 === w2) {
-		w2 = outer.clientWidth;
-	}
-
-	document.body.removeChild (outer);
-
-	return (w1 - w2);
+	return OC.Util.getScrollBarWidth();
 }
 
 /**
-- 
GitLab


From 8f4611e21d334ea3135bbdbf9519236bb4b6b173 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 2 Oct 2015 21:56:20 +0200
Subject: [PATCH 660/783] Check if decoded JSON returned null

The value might return null resulting in a PHP error.

Fixes https://github.com/owncloud/core/issues/19542
---
 settings/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/admin.php b/settings/admin.php
index ec49b3e823f..aa891314fab 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -88,7 +88,7 @@ $excludeGroups = $appConfig->getValue('core', 'shareapi_exclude_groups', 'no') =
 $template->assign('shareExcludeGroups', $excludeGroups);
 $excludedGroupsList = $appConfig->getValue('core', 'shareapi_exclude_groups_list', '');
 $excludedGroupsList = json_decode($excludedGroupsList);
-$template->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList));
+$template->assign('shareExcludedGroupsList', !is_null($excludedGroupsList) ? implode('|', $excludedGroupsList) : '');
 $template->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled());
 $backends = \OC::$server->getUserManager()->getBackends();
 $externalBackends = (count($backends) > 1) ? true : false;
-- 
GitLab


From f6e055b2fd7420e58a1e16c13406e1a63ad74585 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 2 Oct 2015 23:19:26 +0200
Subject: [PATCH 661/783] Add remark that $run is not supported anymore

Fixes https://github.com/owncloud/core/issues/16908
---
 lib/private/group.php | 1 +
 lib/private/user.php  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/private/group.php b/lib/private/group.php
index 87e85a539ff..4eed2a85450 100644
--- a/lib/private/group.php
+++ b/lib/private/group.php
@@ -36,6 +36,7 @@
 /**
  * This class provides all methods needed for managing groups.
  *
+ * Note that &run is deprecated and won't work anymore.
  * Hooks provided:
  *   pre_createGroup(&run, gid)
  *   post_createGroup(gid)
diff --git a/lib/private/user.php b/lib/private/user.php
index ee1ff6f3766..86b1385f15d 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -44,6 +44,8 @@
  * supported. User management operations are delegated to the configured backend for
  * execution.
  *
+ * Note that &run is deprecated and won't work anymore.
+ *
  * Hooks provided:
  *   pre_createUser(&run, uid, password)
  *   post_createUser(uid, password)
-- 
GitLab


From 6d06d1c5a4525696997c4d1d7d1d225895630fdb Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 3 Oct 2015 00:35:24 +0200
Subject: [PATCH 662/783] LDAP Wizard: do not be picky about credentials when
 only looking for the port

---
 apps/user_ldap/lib/wizard.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 13ccf805b69..8d96e7de91d 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -661,12 +661,13 @@ class Wizard extends LDAPUtility {
 			//connectAndBind may throw Exception, it needs to be catched by the
 			//callee of this method
 
-			// unallowed anonymous bind throws 48. But if it throws 48, we
-			// detected port and TLS, i.e. it is successful.
 			try {
 				$settingsFound = $this->connectAndBind($p, $t);
 			} catch (\Exception $e) {
-				if($e->getCode() === 48) {
+				// any reply other than -1 (= cannot connect) is already okay,
+				// because then we found the server
+				// unavailable startTLS returns -11
+				if($e->getCode() > 0) {
 					$settingsFound = true;
 				} else {
 					throw $e;
@@ -1084,7 +1085,7 @@ class Wizard extends LDAPUtility {
 		} else if ($errNo === 2) {
 			return $this->connectAndBind($port, $tls, true);
 		}
-		throw new \Exception($error);
+		throw new \Exception($error, $errNo);
 	}
 
 	/**
-- 
GitLab


From e0084059b921bb05a78c1da823df978a6cb73604 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 3 Oct 2015 01:56:20 -0400
Subject: [PATCH 663/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/fa.js       |  1 +
 apps/encryption/l10n/fa.json     |  1 +
 apps/files/l10n/ar.js            | 44 ++++++++++++++++++++++++---
 apps/files/l10n/ar.json          | 44 ++++++++++++++++++++++++---
 apps/files/l10n/fa.js            | 51 +++++++++++++++++++++++++++++++-
 apps/files/l10n/fa.json          | 51 +++++++++++++++++++++++++++++++-
 apps/files/l10n/hy.js            | 11 ++++++-
 apps/files/l10n/hy.json          | 11 ++++++-
 apps/files_external/l10n/fa.js   | 26 ++++++++++++++++
 apps/files_external/l10n/fa.json | 26 ++++++++++++++++
 apps/files_external/l10n/hy.js   |  5 ++++
 apps/files_external/l10n/hy.json |  5 ++++
 apps/files_external/l10n/ro.js   |  1 +
 apps/files_external/l10n/ro.json |  1 +
 apps/files_sharing/l10n/ar.js    |  1 +
 apps/files_sharing/l10n/ar.json  |  1 +
 apps/files_sharing/l10n/fa.js    |  9 +++++-
 apps/files_sharing/l10n/fa.json  |  9 +++++-
 apps/files_sharing/l10n/hy.js    |  3 ++
 apps/files_sharing/l10n/hy.json  |  3 ++
 apps/files_trashbin/l10n/ar.js   |  6 ++--
 apps/files_trashbin/l10n/ar.json |  6 ++--
 apps/files_trashbin/l10n/fa.js   |  6 ++--
 apps/files_trashbin/l10n/fa.json |  6 ++--
 apps/files_trashbin/l10n/hy.js   |  8 ++++-
 apps/files_trashbin/l10n/hy.json |  8 ++++-
 apps/files_versions/l10n/hy.js   |  7 +++++
 apps/files_versions/l10n/hy.json |  5 ++++
 apps/user_ldap/l10n/fa.js        | 10 +++++++
 apps/user_ldap/l10n/fa.json      | 10 +++++++
 apps/user_ldap/l10n/hr.js        |  1 +
 apps/user_ldap/l10n/hr.json      |  1 +
 apps/user_ldap/l10n/hy.js        |  3 +-
 apps/user_ldap/l10n/hy.json      |  3 +-
 apps/user_ldap/l10n/lt_LT.js     |  1 +
 apps/user_ldap/l10n/lt_LT.json   |  1 +
 apps/user_ldap/l10n/pt_PT.js     |  1 +
 apps/user_ldap/l10n/pt_PT.json   |  1 +
 core/l10n/af_ZA.js               |  1 +
 core/l10n/af_ZA.json             |  1 +
 core/l10n/ar.js                  |  1 +
 core/l10n/ar.json                |  1 +
 core/l10n/ast.js                 |  1 +
 core/l10n/ast.json               |  1 +
 core/l10n/az.js                  |  1 +
 core/l10n/az.json                |  1 +
 core/l10n/be.js                  |  1 +
 core/l10n/be.json                |  1 +
 core/l10n/bg_BG.js               |  1 +
 core/l10n/bg_BG.json             |  1 +
 core/l10n/bn_BD.js               |  1 +
 core/l10n/bn_BD.json             |  1 +
 core/l10n/ca.js                  |  1 +
 core/l10n/ca.json                |  1 +
 core/l10n/cs_CZ.js               |  1 +
 core/l10n/cs_CZ.json             |  1 +
 core/l10n/cy_GB.js               |  1 +
 core/l10n/cy_GB.json             |  1 +
 core/l10n/da.js                  |  1 +
 core/l10n/da.json                |  1 +
 core/l10n/de.js                  |  1 +
 core/l10n/de.json                |  1 +
 core/l10n/de_AT.js               |  1 +
 core/l10n/de_AT.json             |  1 +
 core/l10n/de_DE.js               |  1 +
 core/l10n/de_DE.json             |  1 +
 core/l10n/el.js                  |  1 +
 core/l10n/el.json                |  1 +
 core/l10n/en_GB.js               |  1 +
 core/l10n/en_GB.json             |  1 +
 core/l10n/eo.js                  |  1 +
 core/l10n/eo.json                |  1 +
 core/l10n/es.js                  |  1 +
 core/l10n/es.json                |  1 +
 core/l10n/es_AR.js               |  1 +
 core/l10n/es_AR.json             |  1 +
 core/l10n/es_CL.js               |  1 +
 core/l10n/es_CL.json             |  1 +
 core/l10n/es_MX.js               |  1 +
 core/l10n/es_MX.json             |  1 +
 core/l10n/et_EE.js               |  1 +
 core/l10n/et_EE.json             |  1 +
 core/l10n/eu.js                  |  1 +
 core/l10n/eu.json                |  1 +
 core/l10n/fa.js                  | 28 ++++++++++++++++++
 core/l10n/fa.json                | 28 ++++++++++++++++++
 core/l10n/fi_FI.js               |  1 +
 core/l10n/fi_FI.json             |  1 +
 core/l10n/fr.js                  |  1 +
 core/l10n/fr.json                |  1 +
 core/l10n/gl.js                  |  1 +
 core/l10n/gl.json                |  1 +
 core/l10n/he.js                  |  1 +
 core/l10n/he.json                |  1 +
 core/l10n/hr.js                  |  5 ++++
 core/l10n/hr.json                |  5 ++++
 core/l10n/hu_HU.js               |  1 +
 core/l10n/hu_HU.json             |  1 +
 core/l10n/hy.js                  | 11 +++++++
 core/l10n/hy.json                | 11 +++++++
 core/l10n/ia.js                  |  1 +
 core/l10n/ia.json                |  1 +
 core/l10n/id.js                  |  1 +
 core/l10n/id.json                |  1 +
 core/l10n/is.js                  |  1 +
 core/l10n/is.json                |  1 +
 core/l10n/it.js                  |  1 +
 core/l10n/it.json                |  1 +
 core/l10n/ja.js                  |  1 +
 core/l10n/ja.json                |  1 +
 core/l10n/ka_GE.js               |  1 +
 core/l10n/ka_GE.json             |  1 +
 core/l10n/km.js                  |  1 +
 core/l10n/km.json                |  1 +
 core/l10n/ko.js                  |  1 +
 core/l10n/ko.json                |  1 +
 core/l10n/lb.js                  |  1 +
 core/l10n/lb.json                |  1 +
 core/l10n/lt_LT.js               | 31 +++++++++++++++++++
 core/l10n/lt_LT.json             | 31 +++++++++++++++++++
 core/l10n/lv.js                  |  1 +
 core/l10n/lv.json                |  1 +
 core/l10n/mk.js                  |  1 +
 core/l10n/mk.json                |  1 +
 core/l10n/my_MM.js               |  1 +
 core/l10n/my_MM.json             |  1 +
 core/l10n/nb_NO.js               |  1 +
 core/l10n/nb_NO.json             |  1 +
 core/l10n/nl.js                  |  1 +
 core/l10n/nl.json                |  1 +
 core/l10n/nn_NO.js               |  1 +
 core/l10n/nn_NO.json             |  1 +
 core/l10n/oc.js                  |  1 +
 core/l10n/oc.json                |  1 +
 core/l10n/pa.js                  |  1 +
 core/l10n/pa.json                |  1 +
 core/l10n/pl.js                  |  1 +
 core/l10n/pl.json                |  1 +
 core/l10n/pt_BR.js               |  1 +
 core/l10n/pt_BR.json             |  1 +
 core/l10n/pt_PT.js               |  1 +
 core/l10n/pt_PT.json             |  1 +
 core/l10n/ro.js                  |  1 +
 core/l10n/ro.json                |  1 +
 core/l10n/ru.js                  |  1 +
 core/l10n/ru.json                |  1 +
 core/l10n/si_LK.js               |  1 +
 core/l10n/si_LK.json             |  1 +
 core/l10n/sk_SK.js               |  1 +
 core/l10n/sk_SK.json             |  1 +
 core/l10n/sl.js                  |  1 +
 core/l10n/sl.json                |  1 +
 core/l10n/sq.js                  |  1 +
 core/l10n/sq.json                |  1 +
 core/l10n/sr.js                  |  1 +
 core/l10n/sr.json                |  1 +
 core/l10n/sr@latin.js            |  1 +
 core/l10n/sr@latin.json          |  1 +
 core/l10n/sv.js                  |  1 +
 core/l10n/sv.json                |  1 +
 core/l10n/ta_LK.js               |  1 +
 core/l10n/ta_LK.json             |  1 +
 core/l10n/te.js                  |  1 +
 core/l10n/te.json                |  1 +
 core/l10n/th_TH.js               |  1 +
 core/l10n/th_TH.json             |  1 +
 core/l10n/tr.js                  |  1 +
 core/l10n/tr.json                |  1 +
 core/l10n/uk.js                  |  1 +
 core/l10n/uk.json                |  1 +
 core/l10n/ur_PK.js               |  1 +
 core/l10n/ur_PK.json             |  1 +
 core/l10n/vi.js                  |  1 +
 core/l10n/vi.json                |  1 +
 core/l10n/zh_CN.js               |  1 +
 core/l10n/zh_CN.json             |  1 +
 core/l10n/zh_HK.js               |  1 +
 core/l10n/zh_HK.json             |  1 +
 core/l10n/zh_TW.js               |  1 +
 core/l10n/zh_TW.json             |  1 +
 lib/l10n/fa.js                   | 20 ++++++++++++-
 lib/l10n/fa.json                 | 20 ++++++++++++-
 lib/l10n/hy.js                   |  3 +-
 lib/l10n/hy.json                 |  3 +-
 settings/l10n/fa.js              | 34 +++++++++++++++++++++
 settings/l10n/fa.json            | 34 +++++++++++++++++++++
 settings/l10n/hy.js              | 16 ++++++++++
 settings/l10n/hy.json            | 16 ++++++++++
 settings/l10n/lt_LT.js           |  5 ++++
 settings/l10n/lt_LT.json         |  5 ++++
 190 files changed, 798 insertions(+), 30 deletions(-)
 create mode 100644 apps/files_versions/l10n/hy.js
 create mode 100644 apps/files_versions/l10n/hy.json

diff --git a/apps/encryption/l10n/fa.js b/apps/encryption/l10n/fa.js
index 706491f45a4..1793326a3f9 100644
--- a/apps/encryption/l10n/fa.js
+++ b/apps/encryption/l10n/fa.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Could not enable recovery key. Please check your recovery key password!" : "کلید بازیابی نمی تواند فعال شود. لطفا رمزعبور کلید بازیابی خود را بررسی نمایید!",
     "Recovery key successfully disabled" : "کلید بازیابی با موفقیت غیر فعال شده است.",
     "Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
+    "Missing parameters" : "پارامترهای فراموش شده",
     "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
     "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
diff --git a/apps/encryption/l10n/fa.json b/apps/encryption/l10n/fa.json
index 1071fd6e110..3b863326db4 100644
--- a/apps/encryption/l10n/fa.json
+++ b/apps/encryption/l10n/fa.json
@@ -3,6 +3,7 @@
     "Could not enable recovery key. Please check your recovery key password!" : "کلید بازیابی نمی تواند فعال شود. لطفا رمزعبور کلید بازیابی خود را بررسی نمایید!",
     "Recovery key successfully disabled" : "کلید بازیابی با موفقیت غیر فعال شده است.",
     "Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
+    "Missing parameters" : "پارامترهای فراموش شده",
     "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
     "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js
index f6bc5581b76..0e20f237022 100644
--- a/apps/files/l10n/ar.js
+++ b/apps/files/l10n/ar.js
@@ -1,9 +1,16 @@
 OC.L10N.register(
     "files",
     {
+    "Storage not available" : "وحدة التخزين غير متوفرة ",
+    "Storage invalid" : "وحدة تخزين غير صالحه ",
     "Unknown error" : "خطأ غير معروف. ",
     "Could not move %s - File with this name already exists" : "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
     "Could not move %s" : "فشل في نقل %s",
+    "Permission denied" : "تم رفض الاذن ",
+    "The target folder has been moved or deleted." : "المجلد المطلوب قد تم نقله او حذفه ",
+    "The name %s is already used in the folder %s. Please choose a different name." : "هذا الاسم %s مستخدم مسبقا في المجلد %s . فضلا اختر اسم مختلف .",
+    "Error when creating the file" : "خطأ اثناء انشاء الملف ",
+    "Error when creating the folder" : "خطأ اثناء انشاء المجلد ",
     "Unable to set upload directory." : "غير قادر على تحميل المجلد",
     "Invalid Token" : "علامة غير صالحة",
     "No file was uploaded. Unknown error" : "لم يتم رفع أي ملف , خطأ غير معروف",
@@ -24,34 +31,52 @@ OC.L10N.register(
     "Home" : "البيت",
     "Close" : "إغلاق",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت",
+    "Total file size {size1} exceeds upload limit {size2}" : "حجم الملف الكلي {size1} تجاوز الحد المسموح للرفع {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.",
     "Upload cancelled." : "تم إلغاء عملية رفع الملفات .",
     "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
     "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",
     "Rename" : "إعادة التسمية",
-    "Delete" : "إلغاء",
+    "Delete" : "حذف ",
     "Details" : "تفاصيل",
+    "Select" : "اختار",
     "Pending" : "قيد الانتظار",
+    "Unable to determine date" : "تعذر تحديد التاريخ",
+    "This operation is forbidden" : "هذة العملية ممنوعة ",
+    "Error moving file." : "خطأ اثناء نقل الملف ",
     "Error moving file" : "حدث خطأ أثناء نقل الملف",
     "Error" : "خطأ",
     "{new_name} already exists" : "{new_name} موجود مسبقا",
+    "Could not rename file" : "لا يستطيع اعادة تسمية الملف",
+    "Could not create file" : "لا يستطيع انشاء ملف ",
+    "Could not create folder" : "لا يستطيع انشاء مجلد ",
+    "Error deleting file." : "خطأ اثناء حذف الملف ",
+    "No entries in this folder match '{filter}'" : "لا يوجد مدخلات في هذا المجلد تتوافق مع '{filter}'",
     "Name" : "اسم",
     "Size" : "حجم",
     "Modified" : "معدل",
     "_%n folder_::_%n folders_" : ["لا يوجد مجلدات %n","1 مجلد %n","2 مجلد %n","عدد قليل من مجلدات %n","عدد كبير من مجلدات %n","مجلدات %n"],
     "_%n file_::_%n files_" : ["لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"],
     "{dirs} and {files}" : "{dirs} و {files}",
+    "You don’t have permission to upload or create files here" : "لا تملك الصلاحية لرفع او انشاء ملف هنا ",
     "_Uploading %n file_::_Uploading %n files_" : ["لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"],
     "New" : "جديد",
+    "\"{name}\" is an invalid file name." : "\"{name}\" اسم ملف غير صالح للاستخدام .",
     "File name cannot be empty." : "اسم الملف لا يجوز أن يكون فارغا",
-    "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "مساحة تخزين {owner} ممتلئة، لا يمكن تحديث الملفات او مزامنتها بعد الان !",
+    "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكن تحديث ملفاتك أو مزامنتها بعد الآن !",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "المساحة التخزينية لـ {owner} ممتلئة تقريبا ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ",
     "Favorite" : "المفضلة",
+    "{newname} already exists" : "{newname} موجود مسبقاً",
     "Upload" : "رفع",
-    "Text file" : "ملف",
+    "Text file" : "ملف نصي",
+    "New text file.txt" : "ملف نصي جديد fille.txt",
     "Folder" : "مجلد",
     "New folder" : "مجلد جديد",
+    "An error occurred while trying to update the tags" : "حدث خطأ اثناء محاولة تحديث tags",
     "A new file or folder has been <strong>created</strong>" : "تم <strong>  إنشاء</strong> ملف جديد أو مجلد ",
     "A file or folder has been <strong>changed</strong>" : "تم  <strong> تغيير</strong> ملف أو مجلد",
     "A file or folder has been <strong>deleted</strong>" : "تم <strong>حذف </strong> ملف أو مجلد",
@@ -65,17 +90,28 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s حذف %1$s",
     "You restored %1$s" : "لقد قمت باستعادة %1$s",
     "%2$s restored %1$s" : "%2$s مستعاد %1$s",
+    "%s could not be renamed as it has been deleted" : "%s لا يمكن اعادة تسميته فقد تم حذفه ",
     "%s could not be renamed" : "%s  لا يمكن إعادة تسميته. ",
+    "Upload (max. %s)" : "الرفع ( حد اقصى. %s ) ",
     "File handling" : "التعامل مع الملف",
     "Maximum upload size" : "الحد الأقصى لحجم الملفات التي يمكن رفعها",
     "max. possible: " : "الحد الأقصى المسموح به",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "بستخدام PHP-FPM هذه القيمة سوف تحتاج الي 5 دقائق حتي تُتِم عملها بعد الحفظ ",
     "Save" : "حفظ",
+    "Can not be edited from here due to insufficient permissions." : "لا يمكن التعديل من هنا نظرا لعدم توفر الصلاحيات الكافيه ",
     "Settings" : "إعدادات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
     "Cancel upload" : "إلغاء الرفع",
+    "No files in here" : "لا يوجد ملفات هنا ",
+    "Upload some content or sync with your devices!" : "ارفع بعض المحتوي او زامن مع اجهزتك !",
+    "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ",
+    "Select all" : "تحديد الكل ",
     "Upload too large" : "حجم الترفيع أعلى من المسموح",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.",
-    "Files are being scanned, please wait." : "يرجى الانتظار , جاري فحص الملفات ."
+    "Files are being scanned, please wait." : "يرجى الانتظار , جاري فحص الملفات .",
+    "Currently scanning" : "حالياً يقوم بالفحص",
+    "No favorites" : "لا يوجد مفضلات ",
+    "Files and folders you mark as favorite will show up here" : "الملفات والمجلدات التي حددتها كامفضلة سوف تظهر هنا "
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json
index 2de484b30f2..e1b2eb3af1b 100644
--- a/apps/files/l10n/ar.json
+++ b/apps/files/l10n/ar.json
@@ -1,7 +1,14 @@
 { "translations": {
+    "Storage not available" : "وحدة التخزين غير متوفرة ",
+    "Storage invalid" : "وحدة تخزين غير صالحه ",
     "Unknown error" : "خطأ غير معروف. ",
     "Could not move %s - File with this name already exists" : "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
     "Could not move %s" : "فشل في نقل %s",
+    "Permission denied" : "تم رفض الاذن ",
+    "The target folder has been moved or deleted." : "المجلد المطلوب قد تم نقله او حذفه ",
+    "The name %s is already used in the folder %s. Please choose a different name." : "هذا الاسم %s مستخدم مسبقا في المجلد %s . فضلا اختر اسم مختلف .",
+    "Error when creating the file" : "خطأ اثناء انشاء الملف ",
+    "Error when creating the folder" : "خطأ اثناء انشاء المجلد ",
     "Unable to set upload directory." : "غير قادر على تحميل المجلد",
     "Invalid Token" : "علامة غير صالحة",
     "No file was uploaded. Unknown error" : "لم يتم رفع أي ملف , خطأ غير معروف",
@@ -22,34 +29,52 @@
     "Home" : "البيت",
     "Close" : "إغلاق",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت",
+    "Total file size {size1} exceeds upload limit {size2}" : "حجم الملف الكلي {size1} تجاوز الحد المسموح للرفع {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "لا يوجد مساحة تخزين كافية، انت تقوم برفع {size1} ولكن المساحه المتوفره هي {size2}.",
     "Upload cancelled." : "تم إلغاء عملية رفع الملفات .",
     "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
     "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",
     "Rename" : "إعادة التسمية",
-    "Delete" : "إلغاء",
+    "Delete" : "حذف ",
     "Details" : "تفاصيل",
+    "Select" : "اختار",
     "Pending" : "قيد الانتظار",
+    "Unable to determine date" : "تعذر تحديد التاريخ",
+    "This operation is forbidden" : "هذة العملية ممنوعة ",
+    "Error moving file." : "خطأ اثناء نقل الملف ",
     "Error moving file" : "حدث خطأ أثناء نقل الملف",
     "Error" : "خطأ",
     "{new_name} already exists" : "{new_name} موجود مسبقا",
+    "Could not rename file" : "لا يستطيع اعادة تسمية الملف",
+    "Could not create file" : "لا يستطيع انشاء ملف ",
+    "Could not create folder" : "لا يستطيع انشاء مجلد ",
+    "Error deleting file." : "خطأ اثناء حذف الملف ",
+    "No entries in this folder match '{filter}'" : "لا يوجد مدخلات في هذا المجلد تتوافق مع '{filter}'",
     "Name" : "اسم",
     "Size" : "حجم",
     "Modified" : "معدل",
     "_%n folder_::_%n folders_" : ["لا يوجد مجلدات %n","1 مجلد %n","2 مجلد %n","عدد قليل من مجلدات %n","عدد كبير من مجلدات %n","مجلدات %n"],
     "_%n file_::_%n files_" : ["لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"],
     "{dirs} and {files}" : "{dirs} و {files}",
+    "You don’t have permission to upload or create files here" : "لا تملك الصلاحية لرفع او انشاء ملف هنا ",
     "_Uploading %n file_::_Uploading %n files_" : ["لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"],
     "New" : "جديد",
+    "\"{name}\" is an invalid file name." : "\"{name}\" اسم ملف غير صالح للاستخدام .",
     "File name cannot be empty." : "اسم الملف لا يجوز أن يكون فارغا",
-    "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "مساحة تخزين {owner} ممتلئة، لا يمكن تحديث الملفات او مزامنتها بعد الان !",
+    "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكن تحديث ملفاتك أو مزامنتها بعد الآن !",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "المساحة التخزينية لـ {owner} ممتلئة تقريبا ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ",
     "Favorite" : "المفضلة",
+    "{newname} already exists" : "{newname} موجود مسبقاً",
     "Upload" : "رفع",
-    "Text file" : "ملف",
+    "Text file" : "ملف نصي",
+    "New text file.txt" : "ملف نصي جديد fille.txt",
     "Folder" : "مجلد",
     "New folder" : "مجلد جديد",
+    "An error occurred while trying to update the tags" : "حدث خطأ اثناء محاولة تحديث tags",
     "A new file or folder has been <strong>created</strong>" : "تم <strong>  إنشاء</strong> ملف جديد أو مجلد ",
     "A file or folder has been <strong>changed</strong>" : "تم  <strong> تغيير</strong> ملف أو مجلد",
     "A file or folder has been <strong>deleted</strong>" : "تم <strong>حذف </strong> ملف أو مجلد",
@@ -63,17 +88,28 @@
     "%2$s deleted %1$s" : "%2$s حذف %1$s",
     "You restored %1$s" : "لقد قمت باستعادة %1$s",
     "%2$s restored %1$s" : "%2$s مستعاد %1$s",
+    "%s could not be renamed as it has been deleted" : "%s لا يمكن اعادة تسميته فقد تم حذفه ",
     "%s could not be renamed" : "%s  لا يمكن إعادة تسميته. ",
+    "Upload (max. %s)" : "الرفع ( حد اقصى. %s ) ",
     "File handling" : "التعامل مع الملف",
     "Maximum upload size" : "الحد الأقصى لحجم الملفات التي يمكن رفعها",
     "max. possible: " : "الحد الأقصى المسموح به",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "بستخدام PHP-FPM هذه القيمة سوف تحتاج الي 5 دقائق حتي تُتِم عملها بعد الحفظ ",
     "Save" : "حفظ",
+    "Can not be edited from here due to insufficient permissions." : "لا يمكن التعديل من هنا نظرا لعدم توفر الصلاحيات الكافيه ",
     "Settings" : "إعدادات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
     "Cancel upload" : "إلغاء الرفع",
+    "No files in here" : "لا يوجد ملفات هنا ",
+    "Upload some content or sync with your devices!" : "ارفع بعض المحتوي او زامن مع اجهزتك !",
+    "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ",
+    "Select all" : "تحديد الكل ",
     "Upload too large" : "حجم الترفيع أعلى من المسموح",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.",
-    "Files are being scanned, please wait." : "يرجى الانتظار , جاري فحص الملفات ."
+    "Files are being scanned, please wait." : "يرجى الانتظار , جاري فحص الملفات .",
+    "Currently scanning" : "حالياً يقوم بالفحص",
+    "No favorites" : "لا يوجد مفضلات ",
+    "Files and folders you mark as favorite will show up here" : "الملفات والمجلدات التي حددتها كامفضلة سوف تظهر هنا "
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/fa.js b/apps/files/l10n/fa.js
index d238f45eb7e..1dc459ab584 100644
--- a/apps/files/l10n/fa.js
+++ b/apps/files/l10n/fa.js
@@ -1,9 +1,16 @@
 OC.L10N.register(
     "files",
     {
+    "Storage not available" : "فضای ذخیره سازی موجود نیست",
+    "Storage invalid" : "فضای ذخیره‌سازی نامعتبر",
     "Unknown error" : "خطای نامشخص",
     "Could not move %s - File with this name already exists" : "%s نمی توان جابجا کرد - در حال حاضر پرونده با این نام وجود دارد. ",
     "Could not move %s" : "%s نمی تواند حرکت کند ",
+    "Permission denied" : "رد دسترسی",
+    "The target folder has been moved or deleted." : "پوشه مقصد انتقال یافته یا حذف شده است.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "نام %s هم‌اکنون در پوشه %s مورد استفاده قرار گرفته شده است. لطفا نام دیگری انتخاب کنید.",
+    "Error when creating the file" : "خطا در حین ایجاد فایل",
+    "Error when creating the folder" : "خطا در حین ایجاد پوشه",
     "Unable to set upload directory." : "قادر به تنظیم پوشه آپلود نمی باشد.",
     "Invalid Token" : "رمز نامعتبر",
     "No file was uploaded. Unknown error" : "هیچ فایلی آپلود نشد.خطای ناشناس",
@@ -15,33 +22,65 @@ OC.L10N.register(
     "Missing a temporary folder" : "یک پوشه موقت گم شده",
     "Failed to write to disk" : "نوشتن بر روی دیسک سخت ناموفق بود",
     "Not enough storage available" : "فضای کافی در دسترس نیست",
+    "Upload failed. Could not find uploaded file" : "خطا در آپلود. امکان یافتن فایل‌های آپلود شده وجود ندارد",
+    "Upload failed. Could not get file info." : "خطای آپلود. امکان دریافت جزئیات فایل وجود ندارد.",
     "Invalid directory." : "فهرست راهنما نامعتبر می باشد.",
     "Files" : "پرونده‌ها",
+    "All files" : "تمامی فایل‌ها",
     "Favorites" : "موارد محبوب",
     "Home" : "خانه",
     "Close" : "بستن",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "امکان آپلود {filename} وجود ندارد، پوشه‌ای با این نام یا فایلی با حجم 0 بایت با این نام وجود دارد",
+    "Total file size {size1} exceeds upload limit {size2}" : "مجموع سایز {size1} بیشتر از محدودیت آپلود {size2} است",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "ظرفیت لازم وجود ندارد، شما آپلودی با حجم {size1}  را انجام میدهید اما تنها {size2} فضا باقی مانده است",
     "Upload cancelled." : "بار گذاری لغو شد",
+    "Could not get result from server." : "امکان دریافت نتایج از سرور وجود ندارد.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
     "Actions" : "فعالیت ها",
     "Download" : "دانلود",
     "Rename" : "تغییرنام",
     "Delete" : "حذف",
     "Details" : "جزئیات",
+    "Select" : "انتخاب",
     "Pending" : "در انتظار",
+    "Unable to determine date" : "امکان تعیین تاریخ وجود ندارد",
+    "This operation is forbidden" : "این عملیات غیرمجاز است",
+    "This directory is unavailable, please check the logs or contact the administrator" : "پوشه‌ در دسترس نیست، لطفا لاگ‌ها را بررسی کنید یا به مدیر سیستم اطلاع دهید",
+    "Error moving file." : "خطا در انتقال فایل.",
+    "Error moving file" : "خطا در انتقال فایل",
     "Error" : "خطا",
     "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
+    "Could not rename file" : "امکان تغییر نام وجود ندارد",
+    "Could not create file" : "امکان ایجاد فایل وجود ندارد",
+    "Could not create folder" : "امکان ایجاد پوشه وجود ندارد",
+    "Error deleting file." : "خطا در حذف فایل.",
+    "No entries in this folder match '{filter}'" : "هیچ ورودی‌ای با  '{filter}' تطبیق ندارد",
     "Name" : "نام",
     "Size" : "اندازه",
     "Modified" : "تاریخ",
+    "_%n folder_::_%n folders_" : ["%n پوشه"],
+    "_%n file_::_%n files_" : ["%n فایل"],
+    "{dirs} and {files}" : "{dirs} و {files}",
+    "You don’t have permission to upload or create files here" : "شما دسترسی مجاز برای آپلود یا ایجاد فایل در اینجا را ندارید",
     "_Uploading %n file_::_Uploading %n files_" : ["در حال بارگذاری %n فایل"],
     "New" : "جدید",
+    "\"{name}\" is an invalid file name." : "\"{name}\" نامی نامعتبر برای فایل است.",
     "File name cannot be empty." : "نام پرونده نمی تواند خالی باشد.",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "فضای ذخیر‌سازی {owner}  پر شده است، امکان بروزرسانی یا هم‌گام‌سازی بیشتر وجود ندارد!",
     "Your storage is full, files can not be updated or synced anymore!" : "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "فضای  {owner} تقریبا پر شده است ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
+    "_matches '{filter}'_::_match '{filter}'_" : ["تطبیق '{filter}'"],
+    "Path" : "مسیر",
+    "_%n byte_::_%n bytes_" : ["%n بایت"],
+    "Favorited" : "برگزیده شده",
+    "Favorite" : "برگزیده",
+    "{newname} already exists" : "{newname}  هم‌اکنون وجود دارد",
     "Upload" : "بارگزاری",
     "Text file" : "فایل متنی",
     "Folder" : "پوشه",
     "New folder" : "پوشه جدید",
+    "An error occurred while trying to update the tags" : "یک خطا در حین بروزرسانی برچسب‌ها رخ داده است",
     "A new file or folder has been <strong>created</strong>" : "فایل یا پوشه ای <strong>ایجاد</strong> شد",
     "A file or folder has been <strong>changed</strong>" : "فایل یا پوشه ای به <strong>تغییر</strong> یافت",
     "A file or folder has been <strong>deleted</strong>" : "فایل یا پوشه ای به <strong>حذف</strong> شد",
@@ -55,17 +94,27 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s مورد %1$s را حذف کرد",
     "You restored %1$s" : "شما %1$s را بازگردانی کردید",
     "%2$s restored %1$s" : "%2$s %1$s را بازگردانی کرد",
+    "%s could not be renamed as it has been deleted" : "امکان تغییر نام %s با توجه به حذف شدن آن وجود ندارد",
     "%s could not be renamed" : "%s نمیتواند تغییر نام دهد.",
+    "Upload (max. %s)" : "آپلود (بیشترین سایز %s)",
     "File handling" : "اداره پرونده ها",
     "Maximum upload size" : "حداکثر اندازه بارگزاری",
     "max. possible: " : "حداکثرمقدارممکن:",
     "Save" : "ذخیره",
+    "Can not be edited from here due to insufficient permissions." : "با توجه به دسترسی محدود، امکان ویرایش از اینجا وجود ندارد.",
     "Settings" : "تنظیمات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
     "Cancel upload" : "متوقف کردن بار گذاری",
+    "No files in here" : "هیچ فایلی اینجا وجود ندارد",
+    "Upload some content or sync with your devices!" : "محتوایی را آپلود کنید یا با دستگاه خود همگام‌سازی کنید!",
+    "No entries found in this folder" : "هیچ ورودی‌ای در این پوشه وجود ندارد",
+    "Select all" : "انتخاب همه",
     "Upload too large" : "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
-    "Files are being scanned, please wait." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
+    "Files are being scanned, please wait." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
+    "Currently scanning" : "در حال اسکن",
+    "No favorites" : "هیچ برگزیده",
+    "Files and folders you mark as favorite will show up here" : "فایل‌ها و پوشه‌های انتخاب شده به عنوان برگزیده توسط شما، در اینجا نمایش داده می‌شود"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files/l10n/fa.json b/apps/files/l10n/fa.json
index 5985202ae8d..4ea1170c288 100644
--- a/apps/files/l10n/fa.json
+++ b/apps/files/l10n/fa.json
@@ -1,7 +1,14 @@
 { "translations": {
+    "Storage not available" : "فضای ذخیره سازی موجود نیست",
+    "Storage invalid" : "فضای ذخیره‌سازی نامعتبر",
     "Unknown error" : "خطای نامشخص",
     "Could not move %s - File with this name already exists" : "%s نمی توان جابجا کرد - در حال حاضر پرونده با این نام وجود دارد. ",
     "Could not move %s" : "%s نمی تواند حرکت کند ",
+    "Permission denied" : "رد دسترسی",
+    "The target folder has been moved or deleted." : "پوشه مقصد انتقال یافته یا حذف شده است.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "نام %s هم‌اکنون در پوشه %s مورد استفاده قرار گرفته شده است. لطفا نام دیگری انتخاب کنید.",
+    "Error when creating the file" : "خطا در حین ایجاد فایل",
+    "Error when creating the folder" : "خطا در حین ایجاد پوشه",
     "Unable to set upload directory." : "قادر به تنظیم پوشه آپلود نمی باشد.",
     "Invalid Token" : "رمز نامعتبر",
     "No file was uploaded. Unknown error" : "هیچ فایلی آپلود نشد.خطای ناشناس",
@@ -13,33 +20,65 @@
     "Missing a temporary folder" : "یک پوشه موقت گم شده",
     "Failed to write to disk" : "نوشتن بر روی دیسک سخت ناموفق بود",
     "Not enough storage available" : "فضای کافی در دسترس نیست",
+    "Upload failed. Could not find uploaded file" : "خطا در آپلود. امکان یافتن فایل‌های آپلود شده وجود ندارد",
+    "Upload failed. Could not get file info." : "خطای آپلود. امکان دریافت جزئیات فایل وجود ندارد.",
     "Invalid directory." : "فهرست راهنما نامعتبر می باشد.",
     "Files" : "پرونده‌ها",
+    "All files" : "تمامی فایل‌ها",
     "Favorites" : "موارد محبوب",
     "Home" : "خانه",
     "Close" : "بستن",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "امکان آپلود {filename} وجود ندارد، پوشه‌ای با این نام یا فایلی با حجم 0 بایت با این نام وجود دارد",
+    "Total file size {size1} exceeds upload limit {size2}" : "مجموع سایز {size1} بیشتر از محدودیت آپلود {size2} است",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "ظرفیت لازم وجود ندارد، شما آپلودی با حجم {size1}  را انجام میدهید اما تنها {size2} فضا باقی مانده است",
     "Upload cancelled." : "بار گذاری لغو شد",
+    "Could not get result from server." : "امکان دریافت نتایج از سرور وجود ندارد.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
     "Actions" : "فعالیت ها",
     "Download" : "دانلود",
     "Rename" : "تغییرنام",
     "Delete" : "حذف",
     "Details" : "جزئیات",
+    "Select" : "انتخاب",
     "Pending" : "در انتظار",
+    "Unable to determine date" : "امکان تعیین تاریخ وجود ندارد",
+    "This operation is forbidden" : "این عملیات غیرمجاز است",
+    "This directory is unavailable, please check the logs or contact the administrator" : "پوشه‌ در دسترس نیست، لطفا لاگ‌ها را بررسی کنید یا به مدیر سیستم اطلاع دهید",
+    "Error moving file." : "خطا در انتقال فایل.",
+    "Error moving file" : "خطا در انتقال فایل",
     "Error" : "خطا",
     "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
+    "Could not rename file" : "امکان تغییر نام وجود ندارد",
+    "Could not create file" : "امکان ایجاد فایل وجود ندارد",
+    "Could not create folder" : "امکان ایجاد پوشه وجود ندارد",
+    "Error deleting file." : "خطا در حذف فایل.",
+    "No entries in this folder match '{filter}'" : "هیچ ورودی‌ای با  '{filter}' تطبیق ندارد",
     "Name" : "نام",
     "Size" : "اندازه",
     "Modified" : "تاریخ",
+    "_%n folder_::_%n folders_" : ["%n پوشه"],
+    "_%n file_::_%n files_" : ["%n فایل"],
+    "{dirs} and {files}" : "{dirs} و {files}",
+    "You don’t have permission to upload or create files here" : "شما دسترسی مجاز برای آپلود یا ایجاد فایل در اینجا را ندارید",
     "_Uploading %n file_::_Uploading %n files_" : ["در حال بارگذاری %n فایل"],
     "New" : "جدید",
+    "\"{name}\" is an invalid file name." : "\"{name}\" نامی نامعتبر برای فایل است.",
     "File name cannot be empty." : "نام پرونده نمی تواند خالی باشد.",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "فضای ذخیر‌سازی {owner}  پر شده است، امکان بروزرسانی یا هم‌گام‌سازی بیشتر وجود ندارد!",
     "Your storage is full, files can not be updated or synced anymore!" : "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "فضای  {owner} تقریبا پر شده است ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
+    "_matches '{filter}'_::_match '{filter}'_" : ["تطبیق '{filter}'"],
+    "Path" : "مسیر",
+    "_%n byte_::_%n bytes_" : ["%n بایت"],
+    "Favorited" : "برگزیده شده",
+    "Favorite" : "برگزیده",
+    "{newname} already exists" : "{newname}  هم‌اکنون وجود دارد",
     "Upload" : "بارگزاری",
     "Text file" : "فایل متنی",
     "Folder" : "پوشه",
     "New folder" : "پوشه جدید",
+    "An error occurred while trying to update the tags" : "یک خطا در حین بروزرسانی برچسب‌ها رخ داده است",
     "A new file or folder has been <strong>created</strong>" : "فایل یا پوشه ای <strong>ایجاد</strong> شد",
     "A file or folder has been <strong>changed</strong>" : "فایل یا پوشه ای به <strong>تغییر</strong> یافت",
     "A file or folder has been <strong>deleted</strong>" : "فایل یا پوشه ای به <strong>حذف</strong> شد",
@@ -53,17 +92,27 @@
     "%2$s deleted %1$s" : "%2$s مورد %1$s را حذف کرد",
     "You restored %1$s" : "شما %1$s را بازگردانی کردید",
     "%2$s restored %1$s" : "%2$s %1$s را بازگردانی کرد",
+    "%s could not be renamed as it has been deleted" : "امکان تغییر نام %s با توجه به حذف شدن آن وجود ندارد",
     "%s could not be renamed" : "%s نمیتواند تغییر نام دهد.",
+    "Upload (max. %s)" : "آپلود (بیشترین سایز %s)",
     "File handling" : "اداره پرونده ها",
     "Maximum upload size" : "حداکثر اندازه بارگزاری",
     "max. possible: " : "حداکثرمقدارممکن:",
     "Save" : "ذخیره",
+    "Can not be edited from here due to insufficient permissions." : "با توجه به دسترسی محدود، امکان ویرایش از اینجا وجود ندارد.",
     "Settings" : "تنظیمات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
     "Cancel upload" : "متوقف کردن بار گذاری",
+    "No files in here" : "هیچ فایلی اینجا وجود ندارد",
+    "Upload some content or sync with your devices!" : "محتوایی را آپلود کنید یا با دستگاه خود همگام‌سازی کنید!",
+    "No entries found in this folder" : "هیچ ورودی‌ای در این پوشه وجود ندارد",
+    "Select all" : "انتخاب همه",
     "Upload too large" : "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
-    "Files are being scanned, please wait." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
+    "Files are being scanned, please wait." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
+    "Currently scanning" : "در حال اسکن",
+    "No favorites" : "هیچ برگزیده",
+    "Files and folders you mark as favorite will show up here" : "فایل‌ها و پوشه‌های انتخاب شده به عنوان برگزیده توسط شما، در اینجا نمایش داده می‌شود"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/hy.js b/apps/files/l10n/hy.js
index 7c49399856c..62bc84d6c7b 100644
--- a/apps/files/l10n/hy.js
+++ b/apps/files/l10n/hy.js
@@ -1,9 +1,18 @@
 OC.L10N.register(
     "files",
     {
+    "Files" : "Ֆայլեր",
     "Close" : "Փակել",
     "Download" : "Բեռնել",
+    "Rename" : "Վերանվանել",
     "Delete" : "Ջնջել",
-    "Save" : "Պահպանել"
+    "Select" : "Նշել",
+    "Name" : "Անուն",
+    "Size" : "Չափս",
+    "New" : "Նոր",
+    "Folder" : "Պանակ",
+    "New folder" : "Նոր պանակ",
+    "Save" : "Պահպանել",
+    "Select all" : "Նշել բոլորը"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/hy.json b/apps/files/l10n/hy.json
index 8501b7eb9b2..c5afd306272 100644
--- a/apps/files/l10n/hy.json
+++ b/apps/files/l10n/hy.json
@@ -1,7 +1,16 @@
 { "translations": {
+    "Files" : "Ֆայլեր",
     "Close" : "Փակել",
     "Download" : "Բեռնել",
+    "Rename" : "Վերանվանել",
     "Delete" : "Ջնջել",
-    "Save" : "Պահպանել"
+    "Select" : "Նշել",
+    "Name" : "Անուն",
+    "Size" : "Չափս",
+    "New" : "Նոր",
+    "Folder" : "Պանակ",
+    "New folder" : "Նոր պանակ",
+    "Save" : "Պահպանել",
+    "Select all" : "Նշել բոլորը"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/fa.js b/apps/files_external/l10n/fa.js
index 1a3a06ba391..53723eae96e 100644
--- a/apps/files_external/l10n/fa.js
+++ b/apps/files_external/l10n/fa.js
@@ -3,25 +3,51 @@ OC.L10N.register(
     {
     "External storage" : "حافظه خارجی",
     "Personal" : "شخصی",
+    "System" : "سیستم",
     "Grant access" : " مجوز اعطا دسترسی",
     "Access granted" : "مجوز دسترسی صادر شد",
+    "Generate keys" : "تولید کلید",
+    "Enable encryption" : "فعال کردن رمزگذاری",
+    "Check for changes" : "بررسی برای تغییرات",
+    "Never" : "هرگز",
+    "(group)" : "(گروه)",
     "Saved" : "ذخیره شد",
+    "Access key" : "کلید دسترسی",
+    "Secret key" : "کلید مخفی",
     "None" : "هیچ‌کدام",
     "Username" : "نام کاربری",
     "Password" : "گذرواژه",
     "API key" : "کلید API ",
+    "Username and password" : "نام کاربری و رمز عبور",
+    "Public key" : "کلید عمومی",
+    "Amazon S3" : "Amazon S3",
     "Port" : "درگاه",
     "Region" : "ناحیه",
+    "Enable SSL" : "فعال‌سازی SSL",
     "WebDAV" : "WebDAV",
     "URL" : "آدرس",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "میزبانی",
+    "Google Drive" : "Google Drive",
+    "Local" : "محلی",
     "Location" : "محل",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "اشتراک‌گذاری",
+    "Domain" : "دامنه",
+    "Service name" : "نام سرویس",
+    "No external storage configured" : "هیچ فضای ذخیره‌سازی خارجی‌ای تنظیم نشده است",
     "Name" : "نام",
+    "Storage type" : "نوع فضای ذخیره‌سازی",
+    "Scope" : "حوزه",
     "External Storage" : "حافظه خارجی",
     "Folder name" : "نام پوشه",
+    "Authentication" : "احراز هویت",
     "Configuration" : "پیکربندی",
+    "Available for" : "در دسترس برای",
+    "Advanced settings" : "تنظیمات پیشرفته",
     "Delete" : "حذف",
     "Add storage" : "اضافه کردن حافظه",
     "Enable User External Storage" : "فعال سازی حافظه خارجی کاربر"
diff --git a/apps/files_external/l10n/fa.json b/apps/files_external/l10n/fa.json
index 79a599d7390..98aa7c58827 100644
--- a/apps/files_external/l10n/fa.json
+++ b/apps/files_external/l10n/fa.json
@@ -1,25 +1,51 @@
 { "translations": {
     "External storage" : "حافظه خارجی",
     "Personal" : "شخصی",
+    "System" : "سیستم",
     "Grant access" : " مجوز اعطا دسترسی",
     "Access granted" : "مجوز دسترسی صادر شد",
+    "Generate keys" : "تولید کلید",
+    "Enable encryption" : "فعال کردن رمزگذاری",
+    "Check for changes" : "بررسی برای تغییرات",
+    "Never" : "هرگز",
+    "(group)" : "(گروه)",
     "Saved" : "ذخیره شد",
+    "Access key" : "کلید دسترسی",
+    "Secret key" : "کلید مخفی",
     "None" : "هیچ‌کدام",
     "Username" : "نام کاربری",
     "Password" : "گذرواژه",
     "API key" : "کلید API ",
+    "Username and password" : "نام کاربری و رمز عبور",
+    "Public key" : "کلید عمومی",
+    "Amazon S3" : "Amazon S3",
     "Port" : "درگاه",
     "Region" : "ناحیه",
+    "Enable SSL" : "فعال‌سازی SSL",
     "WebDAV" : "WebDAV",
     "URL" : "آدرس",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "میزبانی",
+    "Google Drive" : "Google Drive",
+    "Local" : "محلی",
     "Location" : "محل",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "اشتراک‌گذاری",
+    "Domain" : "دامنه",
+    "Service name" : "نام سرویس",
+    "No external storage configured" : "هیچ فضای ذخیره‌سازی خارجی‌ای تنظیم نشده است",
     "Name" : "نام",
+    "Storage type" : "نوع فضای ذخیره‌سازی",
+    "Scope" : "حوزه",
     "External Storage" : "حافظه خارجی",
     "Folder name" : "نام پوشه",
+    "Authentication" : "احراز هویت",
     "Configuration" : "پیکربندی",
+    "Available for" : "در دسترس برای",
+    "Advanced settings" : "تنظیمات پیشرفته",
     "Delete" : "حذف",
     "Add storage" : "اضافه کردن حافظه",
     "Enable User External Storage" : "فعال سازی حافظه خارجی کاربر"
diff --git a/apps/files_external/l10n/hy.js b/apps/files_external/l10n/hy.js
index 2030a284acb..9996681f88b 100644
--- a/apps/files_external/l10n/hy.js
+++ b/apps/files_external/l10n/hy.js
@@ -2,6 +2,11 @@ OC.L10N.register(
     "files_external",
     {
     "Personal" : "Անձնական",
+    "Password" : "Գաղտնաբառ",
+    "URL" : "URL",
+    "Dropbox" : "Dropbox",
+    "Share" : "Կիսվել",
+    "Name" : "Անուն",
     "Delete" : "Ջնջել"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/hy.json b/apps/files_external/l10n/hy.json
index fa925e0854d..ac5a0edf013 100644
--- a/apps/files_external/l10n/hy.json
+++ b/apps/files_external/l10n/hy.json
@@ -1,5 +1,10 @@
 { "translations": {
     "Personal" : "Անձնական",
+    "Password" : "Գաղտնաբառ",
+    "URL" : "URL",
+    "Dropbox" : "Dropbox",
+    "Share" : "Կիսվել",
+    "Name" : "Անուն",
     "Delete" : "Ջնջել"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/ro.js b/apps/files_external/l10n/ro.js
index 502d9a5cbef..89f07797d96 100644
--- a/apps/files_external/l10n/ro.js
+++ b/apps/files_external/l10n/ro.js
@@ -17,6 +17,7 @@ OC.L10N.register(
     "Region" : "Regiune",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Dropbox" : "Dropbox",
     "Host" : "Gazdă",
     "Local" : "Local",
     "Location" : "Locație",
diff --git a/apps/files_external/l10n/ro.json b/apps/files_external/l10n/ro.json
index 41c844e36b7..912e6d99b9e 100644
--- a/apps/files_external/l10n/ro.json
+++ b/apps/files_external/l10n/ro.json
@@ -15,6 +15,7 @@
     "Region" : "Regiune",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Dropbox" : "Dropbox",
     "Host" : "Gazdă",
     "Local" : "Local",
     "Location" : "Locație",
diff --git a/apps/files_sharing/l10n/ar.js b/apps/files_sharing/l10n/ar.js
index 376526356dc..d597b01a7b8 100644
--- a/apps/files_sharing/l10n/ar.js
+++ b/apps/files_sharing/l10n/ar.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "This share is password-protected" : "هذه المشاركة محمية بكلمة مرور",
     "The password is wrong. Try again." : "كلمة المرور خاطئة. حاول مرة أخرى",
     "Password" : "كلمة المرور",
+    "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ",
     "Name" : "اسم",
     "Sorry, this link doesn’t seem to work anymore." : "عذرا، يبدو أن هذا الرابط لم يعد يعمل.",
     "Reasons might be:" : "الأسباب الممكنة :",
diff --git a/apps/files_sharing/l10n/ar.json b/apps/files_sharing/l10n/ar.json
index e8590b931d9..1b4c04b33db 100644
--- a/apps/files_sharing/l10n/ar.json
+++ b/apps/files_sharing/l10n/ar.json
@@ -11,6 +11,7 @@
     "This share is password-protected" : "هذه المشاركة محمية بكلمة مرور",
     "The password is wrong. Try again." : "كلمة المرور خاطئة. حاول مرة أخرى",
     "Password" : "كلمة المرور",
+    "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ",
     "Name" : "اسم",
     "Sorry, this link doesn’t seem to work anymore." : "عذرا، يبدو أن هذا الرابط لم يعد يعمل.",
     "Reasons might be:" : "الأسباب الممكنة :",
diff --git a/apps/files_sharing/l10n/fa.js b/apps/files_sharing/l10n/fa.js
index 5376ad45ca6..29cd5818d40 100644
--- a/apps/files_sharing/l10n/fa.js
+++ b/apps/files_sharing/l10n/fa.js
@@ -3,10 +3,13 @@ OC.L10N.register(
     {
     "Server to server sharing is not enabled on this server" : "اشتراک سرور به سرور در این سرور فعال نیست .",
     "Invalid or untrusted SSL certificate" : "گواهینامه SSL غیر قابل اعتماد یا غیر معتبر است.",
+    "Storage not valid" : "فضای ذخیره‌سازی معتبر نیست",
     "Couldn't add remote share" : "امکان افزودن اشتراک گذاری از راه دور وجود ندارد",
     "Shared with you" : "موارد به اشتراک گذاشته شده با شما",
     "Shared with others" : "موارد به اشتراک گذاشته شده با دیگران",
     "Shared by link" : "اشتراک گذاشته شده از طریق پیوند",
+    "Nothing shared yet" : "هیچ موردی تاکنون به اشتراک گذاشته نشده است",
+    "No shared links" : "هیچ لینک اشتراک‌گذاری وجود ندارد",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "آیا مایل به افزودن اشتراک از راه دور {name} از {owner}@{remote} هستید.",
     "Remote share" : "اشتراک از راه دور",
     "Remote share password" : "رمز عبور اشتراک از راه دور",
@@ -21,9 +24,11 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s مورد %1$s را با شما به اشتراک گذاشت",
     "You shared %1$s via link" : "شما %1$s را توسط پیوند به اشتراک گذاشتید",
     "Shares" : "موارد به اشتراک گذاشته",
+    "Accept" : "قبول",
     "This share is password-protected" : "این اشتراک توسط رمز عبور محافظت می شود",
     "The password is wrong. Try again." : "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
     "Password" : "گذرواژه",
+    "No entries found in this folder" : "هیچ ورودی‌ای در این پوشه وجود ندارد",
     "Name" : "نام",
     "Share time" : "زمان به اشتراک گذاری",
     "Sorry, this link doesn’t seem to work anymore." : "متاسفانه این پیوند دیگر کار نمی کند",
@@ -35,6 +40,8 @@ OC.L10N.register(
     "Add to your ownCloud" : "افزودن به ownCloud شما",
     "Download" : "دانلود",
     "Download %s" : "دانلود %s",
-    "Direct link" : "پیوند مستقیم"
+    "Direct link" : "پیوند مستقیم",
+    "Open documentation" : "بازکردن مستند",
+    "HTML Code:" : "کد HTML :"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/fa.json b/apps/files_sharing/l10n/fa.json
index 13778338f48..64d03e5186a 100644
--- a/apps/files_sharing/l10n/fa.json
+++ b/apps/files_sharing/l10n/fa.json
@@ -1,10 +1,13 @@
 { "translations": {
     "Server to server sharing is not enabled on this server" : "اشتراک سرور به سرور در این سرور فعال نیست .",
     "Invalid or untrusted SSL certificate" : "گواهینامه SSL غیر قابل اعتماد یا غیر معتبر است.",
+    "Storage not valid" : "فضای ذخیره‌سازی معتبر نیست",
     "Couldn't add remote share" : "امکان افزودن اشتراک گذاری از راه دور وجود ندارد",
     "Shared with you" : "موارد به اشتراک گذاشته شده با شما",
     "Shared with others" : "موارد به اشتراک گذاشته شده با دیگران",
     "Shared by link" : "اشتراک گذاشته شده از طریق پیوند",
+    "Nothing shared yet" : "هیچ موردی تاکنون به اشتراک گذاشته نشده است",
+    "No shared links" : "هیچ لینک اشتراک‌گذاری وجود ندارد",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "آیا مایل به افزودن اشتراک از راه دور {name} از {owner}@{remote} هستید.",
     "Remote share" : "اشتراک از راه دور",
     "Remote share password" : "رمز عبور اشتراک از راه دور",
@@ -19,9 +22,11 @@
     "%2$s shared %1$s with you" : "%2$s مورد %1$s را با شما به اشتراک گذاشت",
     "You shared %1$s via link" : "شما %1$s را توسط پیوند به اشتراک گذاشتید",
     "Shares" : "موارد به اشتراک گذاشته",
+    "Accept" : "قبول",
     "This share is password-protected" : "این اشتراک توسط رمز عبور محافظت می شود",
     "The password is wrong. Try again." : "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
     "Password" : "گذرواژه",
+    "No entries found in this folder" : "هیچ ورودی‌ای در این پوشه وجود ندارد",
     "Name" : "نام",
     "Share time" : "زمان به اشتراک گذاری",
     "Sorry, this link doesn’t seem to work anymore." : "متاسفانه این پیوند دیگر کار نمی کند",
@@ -33,6 +38,8 @@
     "Add to your ownCloud" : "افزودن به ownCloud شما",
     "Download" : "دانلود",
     "Download %s" : "دانلود %s",
-    "Direct link" : "پیوند مستقیم"
+    "Direct link" : "پیوند مستقیم",
+    "Open documentation" : "بازکردن مستند",
+    "HTML Code:" : "کد HTML :"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/hy.js b/apps/files_sharing/l10n/hy.js
index 10b9dfa1dd4..28de3fecd2e 100644
--- a/apps/files_sharing/l10n/hy.js
+++ b/apps/files_sharing/l10n/hy.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_sharing",
     {
+    "Cancel" : "Չեղարկել",
+    "Password" : "Գաղտնաբառ",
+    "Name" : "Անուն",
     "Download" : "Բեռնել"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/hy.json b/apps/files_sharing/l10n/hy.json
index 1d9890db3d9..ca2bc14a120 100644
--- a/apps/files_sharing/l10n/hy.json
+++ b/apps/files_sharing/l10n/hy.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Cancel" : "Չեղարկել",
+    "Password" : "Գաղտնաբառ",
+    "Name" : "Անուն",
     "Download" : "Բեռնել"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ar.js b/apps/files_trashbin/l10n/ar.js
index bd6a6ef89d9..964d547c42a 100644
--- a/apps/files_trashbin/l10n/ar.js
+++ b/apps/files_trashbin/l10n/ar.js
@@ -5,11 +5,13 @@ OC.L10N.register(
     "Couldn't restore %s" : "تعذّر استرجاع %s ",
     "Deleted files" : "حذف الملفات",
     "Restore" : "استعيد",
+    "Delete" : "إلغاء",
     "Delete permanently" : "حذف بشكل دائم",
     "Error" : "خطأ",
     "restored" : "تمت الاستعادة",
+    "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ",
+    "Select all" : "تحديد الكل ",
     "Name" : "اسم",
-    "Deleted" : "تم الحذف",
-    "Delete" : "إلغاء"
+    "Deleted" : "تم الحذف"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/apps/files_trashbin/l10n/ar.json b/apps/files_trashbin/l10n/ar.json
index 4df828c0843..cb73176fda1 100644
--- a/apps/files_trashbin/l10n/ar.json
+++ b/apps/files_trashbin/l10n/ar.json
@@ -3,11 +3,13 @@
     "Couldn't restore %s" : "تعذّر استرجاع %s ",
     "Deleted files" : "حذف الملفات",
     "Restore" : "استعيد",
+    "Delete" : "إلغاء",
     "Delete permanently" : "حذف بشكل دائم",
     "Error" : "خطأ",
     "restored" : "تمت الاستعادة",
+    "No entries found in this folder" : "لا يوجد مدخلات في هذا المجلد ",
+    "Select all" : "تحديد الكل ",
     "Name" : "اسم",
-    "Deleted" : "تم الحذف",
-    "Delete" : "إلغاء"
+    "Deleted" : "تم الحذف"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/fa.js b/apps/files_trashbin/l10n/fa.js
index 8dc5f70fd68..28aa38a96a6 100644
--- a/apps/files_trashbin/l10n/fa.js
+++ b/apps/files_trashbin/l10n/fa.js
@@ -5,11 +5,13 @@ OC.L10N.register(
     "Couldn't restore %s" : "%s را نمی توان بازگرداند",
     "Deleted files" : "فایل های حذف شده",
     "Restore" : "بازیابی",
+    "Delete" : "حذف",
     "Delete permanently" : "حذف قطعی",
     "Error" : "خطا",
     "restored" : "بازیابی شد",
+    "No entries found in this folder" : "هیچ ورودی‌ای در این پوشه وجود ندارد",
+    "Select all" : "انتخاب همه",
     "Name" : "نام",
-    "Deleted" : "حذف شده",
-    "Delete" : "حذف"
+    "Deleted" : "حذف شده"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/fa.json b/apps/files_trashbin/l10n/fa.json
index befa84ab15e..d8641316f44 100644
--- a/apps/files_trashbin/l10n/fa.json
+++ b/apps/files_trashbin/l10n/fa.json
@@ -3,11 +3,13 @@
     "Couldn't restore %s" : "%s را نمی توان بازگرداند",
     "Deleted files" : "فایل های حذف شده",
     "Restore" : "بازیابی",
+    "Delete" : "حذف",
     "Delete permanently" : "حذف قطعی",
     "Error" : "خطا",
     "restored" : "بازیابی شد",
+    "No entries found in this folder" : "هیچ ورودی‌ای در این پوشه وجود ندارد",
+    "Select all" : "انتخاب همه",
     "Name" : "نام",
-    "Deleted" : "حذف شده",
-    "Delete" : "حذف"
+    "Deleted" : "حذف شده"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/hy.js b/apps/files_trashbin/l10n/hy.js
index 0ad4f14c7b7..3cc05b39236 100644
--- a/apps/files_trashbin/l10n/hy.js
+++ b/apps/files_trashbin/l10n/hy.js
@@ -1,6 +1,12 @@
 OC.L10N.register(
     "files_trashbin",
     {
-    "Delete" : "Ջնջել"
+    "Deleted files" : "Ջնջված ֆայլեր",
+    "Restore" : "Վերականգնել",
+    "Delete" : "Ջնջել",
+    "Delete permanently" : "Ջնջել ընդմիշտ",
+    "No deleted files" : "Ջնջված ֆայլեր չկան",
+    "Select all" : "Նշել բոլորը",
+    "Name" : "Անուն"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/hy.json b/apps/files_trashbin/l10n/hy.json
index 081a2c5f49e..994d6afaa58 100644
--- a/apps/files_trashbin/l10n/hy.json
+++ b/apps/files_trashbin/l10n/hy.json
@@ -1,4 +1,10 @@
 { "translations": {
-    "Delete" : "Ջնջել"
+    "Deleted files" : "Ջնջված ֆայլեր",
+    "Restore" : "Վերականգնել",
+    "Delete" : "Ջնջել",
+    "Delete permanently" : "Ջնջել ընդմիշտ",
+    "No deleted files" : "Ջնջված ֆայլեր չկան",
+    "Select all" : "Նշել բոլորը",
+    "Name" : "Անուն"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/l10n/hy.js b/apps/files_versions/l10n/hy.js
new file mode 100644
index 00000000000..3924810e149
--- /dev/null
+++ b/apps/files_versions/l10n/hy.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Versions" : "Տարբերակներ",
+    "Restore" : "Վերականգնել"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/hy.json b/apps/files_versions/l10n/hy.json
new file mode 100644
index 00000000000..7f61c267c7c
--- /dev/null
+++ b/apps/files_versions/l10n/hy.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Versions" : "Տարբերակներ",
+    "Restore" : "Վերականգնել"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fa.js b/apps/user_ldap/l10n/fa.js
index 81f065ef7a4..7dd4e884a4d 100644
--- a/apps/user_ldap/l10n/fa.js
+++ b/apps/user_ldap/l10n/fa.js
@@ -25,18 +25,28 @@ OC.L10N.register(
     "Groups" : "گروه ها",
     "Test Configuration" : "امتحان پیکربندی",
     "Help" : "راه‌نما",
+    "Only from these groups:" : "تنها از این گروه‌ها:",
+    "Search groups" : "جستجوی گروه‌ها",
+    "Available groups" : "گروه‌های موجود",
+    "Selected groups" : "گروه‌های انتخاب شده",
+    "LDAP Filter:" : "فیلتر LDAP:",
+    "LDAP / AD Username:" : "نام‌کاربری LDAP / AD :",
+    "LDAP / AD Email Address:" : " آدرس ایمیل LDAP / AD :",
     "Other Attributes:" : "مشخصه های دیگر:",
     "1. Server" : "1. سرور",
     "%s. Server:" : "%s. سرور:",
     "Host" : "میزبانی",
     "Port" : "درگاه",
+    "Detect Port" : "شناسایی پورت",
     "User DN" : "کاربر DN",
     "Password" : "گذرواژه",
     "For anonymous access, leave DN and Password empty." : "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
     "One Base DN per line" : "یک پایه DN در هر خط",
     "You can specify Base DN for users and groups in the Advanced tab" : "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
+    "Saving" : "درحال ذخیره",
     "Back" : "بازگشت",
     "Continue" : "ادامه",
+    "LDAP" : "LDAP",
     "Expert" : "حرفه ای",
     "Advanced" : "پیشرفته",
     "Connection Settings" : "تنظیمات اتصال",
diff --git a/apps/user_ldap/l10n/fa.json b/apps/user_ldap/l10n/fa.json
index 2716f90e10f..34a36eaf3bd 100644
--- a/apps/user_ldap/l10n/fa.json
+++ b/apps/user_ldap/l10n/fa.json
@@ -23,18 +23,28 @@
     "Groups" : "گروه ها",
     "Test Configuration" : "امتحان پیکربندی",
     "Help" : "راه‌نما",
+    "Only from these groups:" : "تنها از این گروه‌ها:",
+    "Search groups" : "جستجوی گروه‌ها",
+    "Available groups" : "گروه‌های موجود",
+    "Selected groups" : "گروه‌های انتخاب شده",
+    "LDAP Filter:" : "فیلتر LDAP:",
+    "LDAP / AD Username:" : "نام‌کاربری LDAP / AD :",
+    "LDAP / AD Email Address:" : " آدرس ایمیل LDAP / AD :",
     "Other Attributes:" : "مشخصه های دیگر:",
     "1. Server" : "1. سرور",
     "%s. Server:" : "%s. سرور:",
     "Host" : "میزبانی",
     "Port" : "درگاه",
+    "Detect Port" : "شناسایی پورت",
     "User DN" : "کاربر DN",
     "Password" : "گذرواژه",
     "For anonymous access, leave DN and Password empty." : "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
     "One Base DN per line" : "یک پایه DN در هر خط",
     "You can specify Base DN for users and groups in the Advanced tab" : "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
+    "Saving" : "درحال ذخیره",
     "Back" : "بازگشت",
     "Continue" : "ادامه",
+    "LDAP" : "LDAP",
     "Expert" : "حرفه ای",
     "Advanced" : "پیشرفته",
     "Connection Settings" : "تنظیمات اتصال",
diff --git a/apps/user_ldap/l10n/hr.js b/apps/user_ldap/l10n/hr.js
index e9c7ce4e17b..284c9ee3207 100644
--- a/apps/user_ldap/l10n/hr.js
+++ b/apps/user_ldap/l10n/hr.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "user_ldap",
     {
     "Failed to delete the server configuration" : "Greška prilikom brisanja konfiguracije poslužitelja.",
+    "Select groups" : "Označi grupe",
     "Users" : "Korisnici",
     "Groups" : "Grupe",
     "Help" : "Pomoć",
diff --git a/apps/user_ldap/l10n/hr.json b/apps/user_ldap/l10n/hr.json
index 8aad60517c7..9a116a6ce86 100644
--- a/apps/user_ldap/l10n/hr.json
+++ b/apps/user_ldap/l10n/hr.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Failed to delete the server configuration" : "Greška prilikom brisanja konfiguracije poslužitelja.",
+    "Select groups" : "Označi grupe",
     "Users" : "Korisnici",
     "Groups" : "Grupe",
     "Help" : "Pomoć",
diff --git a/apps/user_ldap/l10n/hy.js b/apps/user_ldap/l10n/hy.js
index bd4f60364a3..469515bc42e 100644
--- a/apps/user_ldap/l10n/hy.js
+++ b/apps/user_ldap/l10n/hy.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "Save" : "Պահպանել"
+    "Groups" : "Խմբեր",
+    "Password" : "Գաղտնաբառ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/hy.json b/apps/user_ldap/l10n/hy.json
index cb94f4404a5..8b8bf5bd500 100644
--- a/apps/user_ldap/l10n/hy.json
+++ b/apps/user_ldap/l10n/hy.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "Save" : "Պահպանել"
+    "Groups" : "Խմբեր",
+    "Password" : "Գաղտնաբառ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/lt_LT.js b/apps/user_ldap/l10n/lt_LT.js
index 84d3cb8463e..e9429c0de2a 100644
--- a/apps/user_ldap/l10n/lt_LT.js
+++ b/apps/user_ldap/l10n/lt_LT.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "Select groups" : "Pasirinkti grupes",
     "Do you really want to delete the current Server Configuration?" : "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?",
     "Confirm Deletion" : "Patvirtinkite trynimą",
+    "Server" : "Serveris",
     "Users" : "Vartotojai",
     "Groups" : "Grupės",
     "Test Configuration" : "Bandyti konfigūraciją",
diff --git a/apps/user_ldap/l10n/lt_LT.json b/apps/user_ldap/l10n/lt_LT.json
index fd385a1e8dc..19ca042b62f 100644
--- a/apps/user_ldap/l10n/lt_LT.json
+++ b/apps/user_ldap/l10n/lt_LT.json
@@ -5,6 +5,7 @@
     "Select groups" : "Pasirinkti grupes",
     "Do you really want to delete the current Server Configuration?" : "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?",
     "Confirm Deletion" : "Patvirtinkite trynimą",
+    "Server" : "Serveris",
     "Users" : "Vartotojai",
     "Groups" : "Grupės",
     "Test Configuration" : "Bandyti konfigūraciją",
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index d323732e061..38da6186e90 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "Base DN could not be auto-detected, please revise credentials, host and port." : "O ND de base não pode ser detetado automaticamente, por favor verifique as credenciais, host e porta.",
     "Could not detect Base DN, please enter it manually." : "Não foi possível detetar o ND de base, por favor introduza-o manualmente.",
     "{nthServer}. Server" : "{nthServer}. Servidor",
+    "No object found in the given Base DN. Please revise." : "Nenhum objecto encontrado na Base DN fornecida. Por favor verifique.",
     "More than 1.000 directory entries available." : "Mais de 1,000 entradas de diretório disponíveis.",
     " entries available within the provided Base DN" : "entradas disponíveis no ND de base fornecido",
     "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ocorreu um erro. Por favor verifique o ND de base, bem como as definições de ligação e as credenciais.",
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index 409b1873d10..594b6ac1907 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -20,6 +20,7 @@
     "Base DN could not be auto-detected, please revise credentials, host and port." : "O ND de base não pode ser detetado automaticamente, por favor verifique as credenciais, host e porta.",
     "Could not detect Base DN, please enter it manually." : "Não foi possível detetar o ND de base, por favor introduza-o manualmente.",
     "{nthServer}. Server" : "{nthServer}. Servidor",
+    "No object found in the given Base DN. Please revise." : "Nenhum objecto encontrado na Base DN fornecida. Por favor verifique.",
     "More than 1.000 directory entries available." : "Mais de 1,000 entradas de diretório disponíveis.",
     " entries available within the provided Base DN" : "entradas disponíveis no ND de base fornecido",
     "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ocorreu um erro. Por favor verifique o ND de base, bem como as definições de ligação e as credenciais.",
diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
index 6bc1ed26add..fa31f60fc50 100644
--- a/core/l10n/af_ZA.js
+++ b/core/l10n/af_ZA.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "December" : "Desember",
     "Settings" : "Instellings",
     "Saving..." : "Stoor...",
+    "seconds ago" : "sekondes gelede",
     "Couldn't send reset email. Please contact your administrator." : "Die herstel epos kon nie gestuur word nie. Kontak asseblief die stelsel administrateur.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Die \"link\" vir die herstel van jou wagwoord is na jou epos gestuur. As jy dit nie binne 'n redelike tyd ontvang nie, soek deur jou \"spam/junk\" omslagte.<br>As dit nie daar is nie vra jou administrateur vir hulp.",
     "I know what I'm doing" : "Ek weet wat ek doen",
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
index b8e7eb39b43..098649bdccd 100644
--- a/core/l10n/af_ZA.json
+++ b/core/l10n/af_ZA.json
@@ -34,6 +34,7 @@
     "December" : "Desember",
     "Settings" : "Instellings",
     "Saving..." : "Stoor...",
+    "seconds ago" : "sekondes gelede",
     "Couldn't send reset email. Please contact your administrator." : "Die herstel epos kon nie gestuur word nie. Kontak asseblief die stelsel administrateur.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Die \"link\" vir die herstel van jou wagwoord is na jou epos gestuur. As jy dit nie binne 'n redelike tyd ontvang nie, soek deur jou \"spam/junk\" omslagte.<br>As dit nie daar is nie vra jou administrateur vir hulp.",
     "I know what I'm doing" : "Ek weet wat ek doen",
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index a0ef7db8521..e180f2e61df 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -45,6 +45,7 @@ OC.L10N.register(
     "Dec." : "كانون الأول",
     "Settings" : "إعدادات",
     "Saving..." : "جاري الحفظ...",
+    "seconds ago" : "منذ ثواني",
     "I know what I'm doing" : "أعرف ماذا أفعل",
     "Password can not be changed. Please contact your administrator." : "كلمة المرور لا يمكن تغييرها. فضلاً تحدث مع المسؤول",
     "No" : "لا",
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index 5ac8003fb4c..1240d8aadb0 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -43,6 +43,7 @@
     "Dec." : "كانون الأول",
     "Settings" : "إعدادات",
     "Saving..." : "جاري الحفظ...",
+    "seconds ago" : "منذ ثواني",
     "I know what I'm doing" : "أعرف ماذا أفعل",
     "Password can not be changed. Please contact your administrator." : "كلمة المرور لا يمكن تغييرها. فضلاً تحدث مع المسؤول",
     "No" : "لا",
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index 1e02a7ca37c..f4392491b1e 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Dec." : "Avi.",
     "Settings" : "Axustes",
     "Saving..." : "Guardando...",
+    "seconds ago" : "hai segundos",
     "Couldn't send reset email. Please contact your administrator." : "Nun pudo unviase'l corréu de reaniciu. Por favor, contauta col alministrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Unviósete al corréu l'enllaz pa reaniciar la to contraseña. Si nun lu recibes nuna cantidá razonable de tiempu, comprueba les tos carpetes de corréu puxarra. <br>Si nun ta ehí, entruga al to alministrador llocal",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Los tos ficheros tán crifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que se reanicie la to contraseña.<br />Si nun tas seguru de qué facer, por favor contauta col to alministrador enantes que sigas. <br />¿De xuru quies siguir?",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index 636960d6496..68adb758817 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -51,6 +51,7 @@
     "Dec." : "Avi.",
     "Settings" : "Axustes",
     "Saving..." : "Guardando...",
+    "seconds ago" : "hai segundos",
     "Couldn't send reset email. Please contact your administrator." : "Nun pudo unviase'l corréu de reaniciu. Por favor, contauta col alministrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Unviósete al corréu l'enllaz pa reaniciar la to contraseña. Si nun lu recibes nuna cantidá razonable de tiempu, comprueba les tos carpetes de corréu puxarra. <br>Si nun ta ehí, entruga al to alministrador llocal",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Los tos ficheros tán crifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que se reanicie la to contraseña.<br />Si nun tas seguru de qué facer, por favor contauta col to alministrador enantes que sigas. <br />¿De xuru quies siguir?",
diff --git a/core/l10n/az.js b/core/l10n/az.js
index 647c1f3c273..10532ce6607 100644
--- a/core/l10n/az.js
+++ b/core/l10n/az.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Dec." : "Dek.",
     "Settings" : "Quraşdırmalar",
     "Saving..." : "Saxlama...",
+    "seconds ago" : "saniyələr öncə",
     "No" : "Xeyir",
     "Yes" : "Bəli",
     "Choose" : "Seç",
diff --git a/core/l10n/az.json b/core/l10n/az.json
index a49a9528230..ebfeca74bf7 100644
--- a/core/l10n/az.json
+++ b/core/l10n/az.json
@@ -47,6 +47,7 @@
     "Dec." : "Dek.",
     "Settings" : "Quraşdırmalar",
     "Saving..." : "Saxlama...",
+    "seconds ago" : "saniyələr öncə",
     "No" : "Xeyir",
     "Yes" : "Bəli",
     "Choose" : "Seç",
diff --git a/core/l10n/be.js b/core/l10n/be.js
index defe9f70337..5b4674ee6d2 100644
--- a/core/l10n/be.js
+++ b/core/l10n/be.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "November" : "Лістапад",
     "December" : "Снежань",
     "Settings" : "Налады",
+    "seconds ago" : "Секунд таму",
     "No" : "Не",
     "Yes" : "Так",
     "Choose" : "Выбар",
diff --git a/core/l10n/be.json b/core/l10n/be.json
index 50e1a29dcaf..ef4093ebc67 100644
--- a/core/l10n/be.json
+++ b/core/l10n/be.json
@@ -19,6 +19,7 @@
     "November" : "Лістапад",
     "December" : "Снежань",
     "Settings" : "Налады",
+    "seconds ago" : "Секунд таму",
     "No" : "Не",
     "Yes" : "Так",
     "Choose" : "Выбар",
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
index f5ddc0f5b2d..f8d2e44204a 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -57,6 +57,7 @@ OC.L10N.register(
     "Dec." : "Дек.",
     "Settings" : "Настройки",
     "Saving..." : "Запазване...",
+    "seconds ago" : "преди секунди",
     "Couldn't send reset email. Please contact your administrator." : "Изпращането на електронна поща е неуспешно. Моля, свържете се с вашия администратор.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Връзката за възстановяване на паролата беше изпратена до вашата електронна поща. Ако не я получите в разумен период от време, проверете папките си за спам и junk.<br>Ако не я откривате и там, се свържете с местния администратор.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Файловете Ви са криптирани. Ако не сте настроили ключ за възстановяване, няма да е възможно да се възстановят данните Ви след смяна на паролата.<br />Ако не сте сигурни какво да направите, моля, свържете се с Вашия администратор преди да продължите. <br/>Наистина ли искате да продължите?",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index b20cbe83466..4709830c087 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -55,6 +55,7 @@
     "Dec." : "Дек.",
     "Settings" : "Настройки",
     "Saving..." : "Запазване...",
+    "seconds ago" : "преди секунди",
     "Couldn't send reset email. Please contact your administrator." : "Изпращането на електронна поща е неуспешно. Моля, свържете се с вашия администратор.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Връзката за възстановяване на паролата беше изпратена до вашата електронна поща. Ако не я получите в разумен период от време, проверете папките си за спам и junk.<br>Ако не я откривате и там, се свържете с местния администратор.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Файловете Ви са криптирани. Ако не сте настроили ключ за възстановяване, няма да е възможно да се възстановят данните Ви след смяна на паролата.<br />Ако не сте сигурни какво да направите, моля, свържете се с Вашия администратор преди да продължите. <br/>Наистина ли искате да продължите?",
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
index 98eb0da6414..1dc84a030ab 100644
--- a/core/l10n/bn_BD.js
+++ b/core/l10n/bn_BD.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Dec." : "ডিসে.",
     "Settings" : "নিয়ামকসমূহ",
     "Saving..." : "সংরক্ষণ করা হচ্ছে..",
+    "seconds ago" : "সেকেন্ড পূর্বে",
     "No" : "না",
     "Yes" : "হ্যাঁ",
     "Choose" : "বেছে নিন",
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
index f1f2cf05ca3..46675b0a904 100644
--- a/core/l10n/bn_BD.json
+++ b/core/l10n/bn_BD.json
@@ -46,6 +46,7 @@
     "Dec." : "ডিসে.",
     "Settings" : "নিয়ামকসমূহ",
     "Saving..." : "সংরক্ষণ করা হচ্ছে..",
+    "seconds ago" : "সেকেন্ড পূর্বে",
     "No" : "না",
     "Yes" : "হ্যাঁ",
     "Choose" : "বেছে নিন",
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index 1efc17de4ba..9d397d03408 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Des.",
     "Settings" : "Configuració",
     "Saving..." : "Desant...",
+    "seconds ago" : "segons enrere",
     "Couldn't send reset email. Please contact your administrator." : "No s'ha pogut restablir el correu. Contacteu amb l'administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu. Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. <br />Si sabeu què fer, contacteu amb l'administrador abans de continuar.<br />Voleu continuar?",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index 409ff636604..52de7a322b4 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -69,6 +69,7 @@
     "Dec." : "Des.",
     "Settings" : "Configuració",
     "Saving..." : "Desant...",
+    "seconds ago" : "segons enrere",
     "Couldn't send reset email. Please contact your administrator." : "No s'ha pogut restablir el correu. Contacteu amb l'administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu. Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. <br />Si sabeu què fer, contacteu amb l'administrador abans de continuar.<br />Voleu continuar?",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 3ee5bdf13db..b11e7eab730 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -72,6 +72,7 @@ OC.L10N.register(
     "Dec." : "prosinec",
     "Settings" : "Nastavení",
     "Saving..." : "Ukládám...",
+    "seconds ago" : "před pár sekundami",
     "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte svého správce systému.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovení hesla byl odeslán na vaši emailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte složku nevyžádané pošty a koš.<br>Pokud jej nenaleznete, kontaktujte svého správce systému.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data zpět.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce systému, než budete pokračovat. <br />Opravdu si přejete pokračovat?",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 5f7ed392629..7f92a531a69 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -70,6 +70,7 @@
     "Dec." : "prosinec",
     "Settings" : "Nastavení",
     "Saving..." : "Ukládám...",
+    "seconds ago" : "před pár sekundami",
     "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte svého správce systému.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovení hesla byl odeslán na vaši emailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte složku nevyžádané pošty a koš.<br>Pokud jej nenaleznete, kontaktujte svého správce systému.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data zpět.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce systému, než budete pokračovat. <br />Opravdu si přejete pokračovat?",
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
index ffea08840c1..5f99455146c 100644
--- a/core/l10n/cy_GB.js
+++ b/core/l10n/cy_GB.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "Dec." : "Rhag.",
     "Settings" : "Gosodiadau",
     "Saving..." : "Yn cadw...",
+    "seconds ago" : "eiliad yn ôl",
     "No" : "Na",
     "Yes" : "Ie",
     "Choose" : "Dewisiwch",
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
index e5f4dae203d..2c3c2533e0e 100644
--- a/core/l10n/cy_GB.json
+++ b/core/l10n/cy_GB.json
@@ -39,6 +39,7 @@
     "Dec." : "Rhag.",
     "Settings" : "Gosodiadau",
     "Saving..." : "Yn cadw...",
+    "seconds ago" : "eiliad yn ôl",
     "No" : "Na",
     "Yes" : "Ie",
     "Choose" : "Dewisiwch",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index f7dcb9c6836..3d90b55836c 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -73,6 +73,7 @@ OC.L10N.register(
     "Dec." : "Dec.",
     "Settings" : "Indstillinger",
     "Saving..." : "Gemmer...",
+    "seconds ago" : "sekunder siden",
     "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index f8cfe728226..53182aeab70 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -71,6 +71,7 @@
     "Dec." : "Dec.",
     "Settings" : "Indstillinger",
     "Saving..." : "Gemmer...",
+    "seconds ago" : "sekunder siden",
     "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 1ae859bef7e..39fec52fdf6 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -62,6 +62,7 @@ OC.L10N.register(
     "Dec." : "Dez.",
     "Settings" : "Einstellungen",
     "Saving..." : "Speichern…",
+    "seconds ago" : "Gerade eben",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link zum Rücksetzen Deines Passworts ist an Deine E-Mail-Adresse versandt worden. Solltest Du ihn innerhalb eines annehmbaren Zeitraums nicht empfangen, prüfe bitte Deine Spam-Ordner.<br>Wenn er sich nicht darin befindet, frage bitte bei Deinem lokalen Administrator nach.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Deine Dateien sind verschlüsselt. Solltest Du den Wiederherstellungsschlüssel nicht aktiviert haben, gibt es keine Möglichkeit, Deine Daten zurückzuerhalten, nachdem Dein Passwort zurückgesetzt ist.<br />Falls Du Dir nicht sicher bist, was zu tun ist, kontaktiere bitte Deinen Administrator, bevor Du fortfährst.<br />Willst Du wirklich fortfahren?",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 21af9345710..829bddc1102 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -60,6 +60,7 @@
     "Dec." : "Dez.",
     "Settings" : "Einstellungen",
     "Saving..." : "Speichern…",
+    "seconds ago" : "Gerade eben",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link zum Rücksetzen Deines Passworts ist an Deine E-Mail-Adresse versandt worden. Solltest Du ihn innerhalb eines annehmbaren Zeitraums nicht empfangen, prüfe bitte Deine Spam-Ordner.<br>Wenn er sich nicht darin befindet, frage bitte bei Deinem lokalen Administrator nach.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Deine Dateien sind verschlüsselt. Solltest Du den Wiederherstellungsschlüssel nicht aktiviert haben, gibt es keine Möglichkeit, Deine Daten zurückzuerhalten, nachdem Dein Passwort zurückgesetzt ist.<br />Falls Du Dir nicht sicher bist, was zu tun ist, kontaktiere bitte Deinen Administrator, bevor Du fortfährst.<br />Willst Du wirklich fortfahren?",
diff --git a/core/l10n/de_AT.js b/core/l10n/de_AT.js
index b41c1547953..d0a5e054fca 100644
--- a/core/l10n/de_AT.js
+++ b/core/l10n/de_AT.js
@@ -40,6 +40,7 @@ OC.L10N.register(
     "Nov." : "Nov.",
     "Dec." : "Dez.",
     "Settings" : "Einstellungen",
+    "seconds ago" : "Sekunden zuvor",
     "No" : "Nein",
     "Yes" : "Ja",
     "Cancel" : "Abbrechen",
diff --git a/core/l10n/de_AT.json b/core/l10n/de_AT.json
index 4e3b9669c16..6ab59d45c2d 100644
--- a/core/l10n/de_AT.json
+++ b/core/l10n/de_AT.json
@@ -38,6 +38,7 @@
     "Nov." : "Nov.",
     "Dec." : "Dez.",
     "Settings" : "Einstellungen",
+    "seconds ago" : "Sekunden zuvor",
     "No" : "Nein",
     "Yes" : "Ja",
     "Cancel" : "Abbrechen",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 6c689263cab..644149ddc1a 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Dez.",
     "Settings" : "Einstellungen",
     "Saving..." : "Speichervorgang…",
+    "seconds ago" : "Gerade eben",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse versandt worden. Sollten Sie ihn innerhalb eines annehmbaren Zeitraums nicht empfangen, prüfen Sie bitte Ihren Spam-Ordner.<br>Wenn er sich nicht darin befindet, fragen Sie bitte bei Ihrem lokalen Administrator nach.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 0b4b703f753..95bd4ff7b06 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -69,6 +69,7 @@
     "Dec." : "Dez.",
     "Settings" : "Einstellungen",
     "Saving..." : "Speichervorgang…",
+    "seconds ago" : "Gerade eben",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse versandt worden. Sollten Sie ihn innerhalb eines annehmbaren Zeitraums nicht empfangen, prüfen Sie bitte Ihren Spam-Ordner.<br>Wenn er sich nicht darin befindet, fragen Sie bitte bei Ihrem lokalen Administrator nach.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 79f6725e776..7552a0f7b32 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Δεκ.",
     "Settings" : "Ρυθμίσεις",
     "Saving..." : "Γίνεται αποθήκευση...",
+    "seconds ago" : "δευτερόλεπτα πριν",
     "Couldn't send reset email. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 3fb2fbae8a5..824bd30398c 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -69,6 +69,7 @@
     "Dec." : "Δεκ.",
     "Settings" : "Ρυθμίσεις",
     "Saving..." : "Γίνεται αποθήκευση...",
+    "seconds ago" : "δευτερόλεπτα πριν",
     "Couldn't send reset email. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index 7303eb2584a..d2f3ce77c73 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Dec." : "Dec.",
     "Settings" : "Settings",
     "Saving..." : "Saving...",
+    "seconds ago" : "seconds ago",
     "Couldn't send reset email. Please contact your administrator." : "Couldn't send reset email. Please contact your administrator.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index f2a5cf6e5ba..75e8e30d594 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -57,6 +57,7 @@
     "Dec." : "Dec.",
     "Settings" : "Settings",
     "Saving..." : "Saving...",
+    "seconds ago" : "seconds ago",
     "Couldn't send reset email. Please contact your administrator." : "Couldn't send reset email. Please contact your administrator.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
index 8ecd740bc7e..c4fafe2f96c 100644
--- a/core/l10n/eo.js
+++ b/core/l10n/eo.js
@@ -44,6 +44,7 @@ OC.L10N.register(
     "Dec." : "Dec.",
     "Settings" : "Agordo",
     "Saving..." : "Konservante...",
+    "seconds ago" : "sekundoj antaŭe",
     "No" : "Ne",
     "Yes" : "Jes",
     "Choose" : "Elekti",
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
index ddce56a528d..5d29d8534ec 100644
--- a/core/l10n/eo.json
+++ b/core/l10n/eo.json
@@ -42,6 +42,7 @@
     "Dec." : "Dec.",
     "Settings" : "Agordo",
     "Saving..." : "Konservante...",
+    "seconds ago" : "sekundoj antaŭe",
     "No" : "Ne",
     "Yes" : "Jes",
     "Choose" : "Elekti",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index a35f8464325..55ec168f0ae 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Dic.",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
+    "seconds ago" : "hace segundos",
     "Couldn't send reset email. Please contact your administrator." : "No pudo enviarse el correo para restablecer la contraseña. Por favor, contacte con su administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Se ha enviado un enlace para restablecer su contraseña a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta de spam/chatarra/basura.<br>Si no lo encuentra, consulte a su administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sus archivos están cifrados. Si no ha activado la clave de recuperación, no habrá manera de recuperar los datos una vez su contraseña sea restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 2a1d8b79a28..b196258a152 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -69,6 +69,7 @@
     "Dec." : "Dic.",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
+    "seconds ago" : "hace segundos",
     "Couldn't send reset email. Please contact your administrator." : "No pudo enviarse el correo para restablecer la contraseña. Por favor, contacte con su administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Se ha enviado un enlace para restablecer su contraseña a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta de spam/chatarra/basura.<br>Si no lo encuentra, consulte a su administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sus archivos están cifrados. Si no ha activado la clave de recuperación, no habrá manera de recuperar los datos una vez su contraseña sea restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?",
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
index 0a82908e2ee..789c3377e39 100644
--- a/core/l10n/es_AR.js
+++ b/core/l10n/es_AR.js
@@ -50,6 +50,7 @@ OC.L10N.register(
     "Dec." : "dic.",
     "Settings" : "Configuración",
     "Saving..." : "Guardando...",
+    "seconds ago" : "segundos atrás",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Elegir",
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
index 804167f4af4..a1ceedab0cb 100644
--- a/core/l10n/es_AR.json
+++ b/core/l10n/es_AR.json
@@ -48,6 +48,7 @@
     "Dec." : "dic.",
     "Settings" : "Configuración",
     "Saving..." : "Guardando...",
+    "seconds ago" : "segundos atrás",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Elegir",
diff --git a/core/l10n/es_CL.js b/core/l10n/es_CL.js
index 23e151199a7..33de74ee9ee 100644
--- a/core/l10n/es_CL.js
+++ b/core/l10n/es_CL.js
@@ -23,6 +23,7 @@ OC.L10N.register(
     "November" : "Noviembre",
     "December" : "Diciembre",
     "Settings" : "Configuración",
+    "seconds ago" : "segundos antes",
     "No" : "No",
     "Yes" : "Si",
     "Choose" : "Choose",
diff --git a/core/l10n/es_CL.json b/core/l10n/es_CL.json
index dd7bb617e64..58346c15741 100644
--- a/core/l10n/es_CL.json
+++ b/core/l10n/es_CL.json
@@ -21,6 +21,7 @@
     "November" : "Noviembre",
     "December" : "Diciembre",
     "Settings" : "Configuración",
+    "seconds ago" : "segundos antes",
     "No" : "No",
     "Yes" : "Si",
     "Choose" : "Choose",
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index 81113221e66..1d8cc914706 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -50,6 +50,7 @@ OC.L10N.register(
     "Dec." : "Dic.",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
+    "seconds ago" : "hace segundos",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Seleccionar",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index 978274222fe..783a374fa2a 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -48,6 +48,7 @@
     "Dec." : "Dic.",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
+    "seconds ago" : "hace segundos",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Seleccionar",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 18840c05923..a55e1c04ccd 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -69,6 +69,7 @@ OC.L10N.register(
     "Dec." : "Dets.",
     "Settings" : "Seaded",
     "Saving..." : "Salvestamine...",
+    "seconds ago" : "sekundit tagasi",
     "Couldn't send reset email. Please contact your administrator." : "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index e11a103480c..ee32aba5690 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -67,6 +67,7 @@
     "Dec." : "Dets.",
     "Settings" : "Seaded",
     "Saving..." : "Salvestamine...",
+    "seconds ago" : "sekundit tagasi",
     "Couldn't send reset email. Please contact your administrator." : "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index baed46b43a9..5227f1332cb 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Dec." : "abe.",
     "Settings" : "Ezarpenak",
     "Saving..." : "Gordetzen...",
+    "seconds ago" : "segundu",
     "Couldn't send reset email. Please contact your administrator." : "Ezin da berrezartzeko eposta bidali. Mesedez jarri harremetan zure administradorearekin.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora epe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan jarri.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. <br />Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik.<br /> Ziur zaude aurrera jarraitu nahi duzula?",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index 62f2d1ad502..37120181cbb 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -51,6 +51,7 @@
     "Dec." : "abe.",
     "Settings" : "Ezarpenak",
     "Saving..." : "Gordetzen...",
+    "seconds ago" : "segundu",
     "Couldn't send reset email. Please contact your administrator." : "Ezin da berrezartzeko eposta bidali. Mesedez jarri harremetan zure administradorearekin.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora epe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan jarri.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. <br />Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik.<br /> Ziur zaude aurrera jarraitu nahi duzula?",
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index b7312046777..694750bba81 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -2,9 +2,11 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "ارسال ایمیل برای کاربران روبرو با شکست مواجه شد : %s",
+    "Preparing update" : "آماده‌سازی به روز‌ رسانی",
     "Turned on maintenance mode" : "حالت \" در دست تعمیر \" فعال شد .",
     "Turned off maintenance mode" : "حالت \" در دست تعمیر \" غیرفعال شد .",
     "Updated database" : "بروز رسانی پایگاه داده انجام شد .",
+    "File is too big" : "فایل خیلی بزرگ است",
     "No image or file provided" : "هیچ فایل یا تصویری وارد نشده است",
     "Unknown filetype" : "نوع فایل ناشناخته",
     "Invalid image" : "عکس نامعتبر",
@@ -49,6 +51,7 @@ OC.L10N.register(
     "Dec." : "دسامبر",
     "Settings" : "تنظیمات",
     "Saving..." : "در حال ذخیره سازی...",
+    "seconds ago" : "ثانیه‌ها پیش",
     "Couldn't send reset email. Please contact your administrator." : "ارسال ایمیل مجدد با مشکل مواجه شد . لطفا با مدیر سیستم تماس بگیرید .",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
@@ -60,6 +63,7 @@ OC.L10N.register(
     "Error loading file picker template: {error}" : "خطا در بارگذاری قالب انتخاب فایل : {error}",
     "Ok" : "قبول",
     "Error loading message template: {error}" : "خطا در بارگذاری قالب پیام : {error}",
+    "read-only" : "فقط-خواندنی",
     "One file conflict" : "یک فایل متضاد",
     "New Files" : "فایل های جدید",
     "Already existing files" : "فایل های موجود در حال حاضر ",
@@ -80,6 +84,7 @@ OC.L10N.register(
     "Error while unsharing" : "خطا درحال لغو اشتراک",
     "Error while changing permissions" : "خطا در حال تغییر مجوز",
     "Error setting expiration date" : "خطا در تنظیم تاریخ انقضا",
+    "The public link will expire no later than {days} days after it is created" : "لینک عمومی پس از {days} روز پس از ایجاد منقضی خواهد شد",
     "Set expiration date" : "تنظیم تاریخ انقضا",
     "Expiration" : "تاریخ انقضا",
     "Expiration date" : "تاریخ انقضا",
@@ -87,31 +92,46 @@ OC.L10N.register(
     "Email sent" : "ایمیل ارسال شد",
     "Resharing is not allowed" : "اشتراک گذاری مجدد مجاز نمی باشد",
     "Share link" : "اشتراک گذاشتن لینک",
+    "Link" : "لینک",
     "Password protect" : "نگهداری کردن رمز عبور",
     "Password" : "گذرواژه",
+    "Choose a password for the public link" : "انتخاب رمز برای لینک عمومی",
+    "Allow editing" : "اجازه‌ی ویرایش",
     "Email link to person" : "پیوند ایمیل برای شخص.",
     "Send" : "ارسال",
     "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
     "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
     "Shared in {item} with {user}" : "به اشتراک گذاشته شده در {بخش} با {کاربر}",
     "group" : "گروه",
+    "remote" : "از راه دور",
     "notify by email" : "دریافت هشدار از طریق ایمیل",
     "Unshare" : "لغو اشتراک",
     "can share" : "قابل به اشتراک گذاری",
     "can edit" : "می توان ویرایش کرد",
     "create" : "ایجاد",
+    "change" : "تغییر",
     "delete" : "پاک کردن",
     "access control" : "کنترل دسترسی",
+    "An error occured. Please try again" : "یک خطا رخ داده است، لطفا مجددا تلاش کنید",
     "Share" : "اشتراک‌گذاری",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "اشتراک‌گذاری با دیگر افراد بر روی ownClouds بصورت username@example.com/owncloud",
+    "Share with users or groups …" : "اشتراک گذاری با کاربران یا گروه ها ...",
+    "Share with users, groups or remote users …" : "اشتراک گذاری با کاربران، گروه‌ها یا کاربران راه دور...",
     "Warning" : "اخطار",
     "The object type is not specified." : "نوع شی تعیین نشده است.",
     "Enter new" : "مورد جدید را وارد کنید",
     "Delete" : "حذف",
     "Add" : "افزودن",
     "Edit tags" : "ویرایش تگ ها",
+    "unknown text" : "متن نامعلوم",
+    "Hello world!" : "سلام دنیا!",
+    "sunny" : "آفتابی",
+    "Hello {name}" : "سلام {name}",
+    "_download %n file_::_download %n files_" : ["دانلود %n فایل"],
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
     "New password" : "گذرواژه جدید",
+    "New Password" : "رمزعبور جدید",
     "Reset password" : "تنظیم مجدد رمز عبور",
     "Personal" : "شخصی",
     "Users" : "کاربران",
@@ -126,7 +146,15 @@ OC.L10N.register(
     "Error favoriting" : "خطا هنگام افزودن به موارد محبوب",
     "Error unfavoriting" : "خطا هنگام حذف از موارد محبوب",
     "Access forbidden" : "اجازه دسترسی به مناطق ممنوعه را ندارید",
+    "File not found" : "فایل یافت نشد",
     "Cheers!" : "سلامتی!",
+    "Internal Server Error" : "خطای داخلی سرور",
+    "Technical details" : "جزئیات فنی",
+    "Type: %s" : "نوع: %s",
+    "Code: %s" : "کد: %s",
+    "Message: %s" : "پیام: %s",
+    "File: %s" : "فایل : %s",
+    "Line: %s" : "خط: %s",
     "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> بسازید",
     "Username" : "نام کاربری",
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index 5ec3ad5ee0e..d1dd024ec42 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -1,8 +1,10 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "ارسال ایمیل برای کاربران روبرو با شکست مواجه شد : %s",
+    "Preparing update" : "آماده‌سازی به روز‌ رسانی",
     "Turned on maintenance mode" : "حالت \" در دست تعمیر \" فعال شد .",
     "Turned off maintenance mode" : "حالت \" در دست تعمیر \" غیرفعال شد .",
     "Updated database" : "بروز رسانی پایگاه داده انجام شد .",
+    "File is too big" : "فایل خیلی بزرگ است",
     "No image or file provided" : "هیچ فایل یا تصویری وارد نشده است",
     "Unknown filetype" : "نوع فایل ناشناخته",
     "Invalid image" : "عکس نامعتبر",
@@ -47,6 +49,7 @@
     "Dec." : "دسامبر",
     "Settings" : "تنظیمات",
     "Saving..." : "در حال ذخیره سازی...",
+    "seconds ago" : "ثانیه‌ها پیش",
     "Couldn't send reset email. Please contact your administrator." : "ارسال ایمیل مجدد با مشکل مواجه شد . لطفا با مدیر سیستم تماس بگیرید .",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
@@ -58,6 +61,7 @@
     "Error loading file picker template: {error}" : "خطا در بارگذاری قالب انتخاب فایل : {error}",
     "Ok" : "قبول",
     "Error loading message template: {error}" : "خطا در بارگذاری قالب پیام : {error}",
+    "read-only" : "فقط-خواندنی",
     "One file conflict" : "یک فایل متضاد",
     "New Files" : "فایل های جدید",
     "Already existing files" : "فایل های موجود در حال حاضر ",
@@ -78,6 +82,7 @@
     "Error while unsharing" : "خطا درحال لغو اشتراک",
     "Error while changing permissions" : "خطا در حال تغییر مجوز",
     "Error setting expiration date" : "خطا در تنظیم تاریخ انقضا",
+    "The public link will expire no later than {days} days after it is created" : "لینک عمومی پس از {days} روز پس از ایجاد منقضی خواهد شد",
     "Set expiration date" : "تنظیم تاریخ انقضا",
     "Expiration" : "تاریخ انقضا",
     "Expiration date" : "تاریخ انقضا",
@@ -85,31 +90,46 @@
     "Email sent" : "ایمیل ارسال شد",
     "Resharing is not allowed" : "اشتراک گذاری مجدد مجاز نمی باشد",
     "Share link" : "اشتراک گذاشتن لینک",
+    "Link" : "لینک",
     "Password protect" : "نگهداری کردن رمز عبور",
     "Password" : "گذرواژه",
+    "Choose a password for the public link" : "انتخاب رمز برای لینک عمومی",
+    "Allow editing" : "اجازه‌ی ویرایش",
     "Email link to person" : "پیوند ایمیل برای شخص.",
     "Send" : "ارسال",
     "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
     "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
     "Shared in {item} with {user}" : "به اشتراک گذاشته شده در {بخش} با {کاربر}",
     "group" : "گروه",
+    "remote" : "از راه دور",
     "notify by email" : "دریافت هشدار از طریق ایمیل",
     "Unshare" : "لغو اشتراک",
     "can share" : "قابل به اشتراک گذاری",
     "can edit" : "می توان ویرایش کرد",
     "create" : "ایجاد",
+    "change" : "تغییر",
     "delete" : "پاک کردن",
     "access control" : "کنترل دسترسی",
+    "An error occured. Please try again" : "یک خطا رخ داده است، لطفا مجددا تلاش کنید",
     "Share" : "اشتراک‌گذاری",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "اشتراک‌گذاری با دیگر افراد بر روی ownClouds بصورت username@example.com/owncloud",
+    "Share with users or groups …" : "اشتراک گذاری با کاربران یا گروه ها ...",
+    "Share with users, groups or remote users …" : "اشتراک گذاری با کاربران، گروه‌ها یا کاربران راه دور...",
     "Warning" : "اخطار",
     "The object type is not specified." : "نوع شی تعیین نشده است.",
     "Enter new" : "مورد جدید را وارد کنید",
     "Delete" : "حذف",
     "Add" : "افزودن",
     "Edit tags" : "ویرایش تگ ها",
+    "unknown text" : "متن نامعلوم",
+    "Hello world!" : "سلام دنیا!",
+    "sunny" : "آفتابی",
+    "Hello {name}" : "سلام {name}",
+    "_download %n file_::_download %n files_" : ["دانلود %n فایل"],
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
     "New password" : "گذرواژه جدید",
+    "New Password" : "رمزعبور جدید",
     "Reset password" : "تنظیم مجدد رمز عبور",
     "Personal" : "شخصی",
     "Users" : "کاربران",
@@ -124,7 +144,15 @@
     "Error favoriting" : "خطا هنگام افزودن به موارد محبوب",
     "Error unfavoriting" : "خطا هنگام حذف از موارد محبوب",
     "Access forbidden" : "اجازه دسترسی به مناطق ممنوعه را ندارید",
+    "File not found" : "فایل یافت نشد",
     "Cheers!" : "سلامتی!",
+    "Internal Server Error" : "خطای داخلی سرور",
+    "Technical details" : "جزئیات فنی",
+    "Type: %s" : "نوع: %s",
+    "Code: %s" : "کد: %s",
+    "Message: %s" : "پیام: %s",
+    "File: %s" : "فایل : %s",
+    "Line: %s" : "خط: %s",
     "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> بسازید",
     "Username" : "نام کاربری",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 311b1b3555a..9f9cba2bf7a 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -73,6 +73,7 @@ OC.L10N.register(
     "Dec." : "Joulu",
     "Settings" : "Asetukset",
     "Saving..." : "Tallennetaan...",
+    "seconds ago" : "sekuntia sitten",
     "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 1ded17dc019..0617a3db574 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -71,6 +71,7 @@
     "Dec." : "Joulu",
     "Settings" : "Asetukset",
     "Saving..." : "Tallennetaan...",
+    "seconds ago" : "sekuntia sitten",
     "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 1ab890bc421..6e8343a0675 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Déc.",
     "Settings" : "Paramètres",
     "Saving..." : "Enregistrement…",
+    "seconds ago" : "il y a quelques secondes",
     "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Un lien permettant de réinitialiser votre mot de passe vient de vous être envoyé par courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index d56e5545a04..62e6ba164f6 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -69,6 +69,7 @@
     "Dec." : "Déc.",
     "Settings" : "Paramètres",
     "Saving..." : "Enregistrement…",
+    "seconds ago" : "il y a quelques secondes",
     "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Un lien permettant de réinitialiser votre mot de passe vient de vous être envoyé par courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index a2a93323a84..5ac505ab535 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -69,6 +69,7 @@ OC.L10N.register(
     "Dec." : "dec.",
     "Settings" : "Axustes",
     "Saving..." : "Gardando...",
+    "seconds ago" : "segundos atrás",
     "Couldn't send reset email. Please contact your administrator." : "Non foi posíbel enviar o correo do restabelecemento. Póñase en contacto co administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A ligazón para restabelecer o seu contrasinal foi enviada ao seu correo. Se non a recibe nun prazo razoábel de tempo, vexa o seu cartafol de correo lixo. <br> Se non está ali pregúntelle ao administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros están cifrados. Se non activou a chave de recuperación, non haberá maneira de recuperar os datos após o restabelecemento do contrasinal. <br />Se non está seguro de que facer, póñase en contacto co administrador antes de continuar. <br /> Confirma que quere continuar?",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index a0e5980563c..d9b28a5a86f 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -67,6 +67,7 @@
     "Dec." : "dec.",
     "Settings" : "Axustes",
     "Saving..." : "Gardando...",
+    "seconds ago" : "segundos atrás",
     "Couldn't send reset email. Please contact your administrator." : "Non foi posíbel enviar o correo do restabelecemento. Póñase en contacto co administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A ligazón para restabelecer o seu contrasinal foi enviada ao seu correo. Se non a recibe nun prazo razoábel de tempo, vexa o seu cartafol de correo lixo. <br> Se non está ali pregúntelle ao administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros están cifrados. Se non activou a chave de recuperación, non haberá maneira de recuperar os datos após o restabelecemento do contrasinal. <br />Se non está seguro de que facer, póñase en contacto co administrador antes de continuar. <br /> Confirma que quere continuar?",
diff --git a/core/l10n/he.js b/core/l10n/he.js
index c590e0c530e..baaa87b24e0 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "Dec." : "דצמ׳",
     "Settings" : "הגדרות",
     "Saving..." : "שמירה…",
+    "seconds ago" : "שניות",
     "No" : "לא",
     "Yes" : "כן",
     "Choose" : "בחירה",
diff --git a/core/l10n/he.json b/core/l10n/he.json
index 38cf01d285d..8455e46a61c 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -39,6 +39,7 @@
     "Dec." : "דצמ׳",
     "Settings" : "הגדרות",
     "Saving..." : "שמירה…",
+    "seconds ago" : "שניות",
     "No" : "לא",
     "Yes" : "כן",
     "Choose" : "בחירה",
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index 28891885e96..db7655f947f 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Dec." : "pros.",
     "Settings" : "Postavke",
     "Saving..." : "Spremanje...",
+    "seconds ago" : "prije par sekundi",
     "Couldn't send reset email. Please contact your administrator." : "Nije mogće poslati resetiranu poštu. MOlimo kontaktirajte svog administratora.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Veza za resetiranje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite unekom razumnom vremenskom roku, provjerite svoje spam/junk mape. <br> Ako nije tamo, kontaktirajtesvoga lokalnog administratora.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka,svoje podatke nećete moći dohvatitinakon što vaša lozinka bude resetirana.<br />Ako ne znate što učiniti, prije nego linastavite, molimo kontaktirajte svog administratora. <br />Želite li doista nastaviti?",
@@ -117,7 +118,11 @@ OC.L10N.register(
     "change" : "promijeni",
     "delete" : "Izbrišite",
     "access control" : "Kontrola pristupa",
+    "An error occured. Please try again" : "Dogodila se pogreška. Molimo Vas, pokušajte ponovno. ",
     "Share" : "Podijelite",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Podijelite sa korisnicima drugoga ownClouda koristeći format korisnickoime@primjer.com/owncloud",
+    "Share with users or groups …" : "Podijeli sa korisnicima ili grupama ...",
+    "Share with users, groups or remote users …" : "Podijeli sa korisnicima, grupama ili udaljenim korisnicima ...",
     "Warning" : "Upozorenje",
     "The object type is not specified." : "Vrsta objekta nije specificirana.",
     "Enter new" : "Unesite novi",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index eb234559d2e..9bde2af14e8 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -51,6 +51,7 @@
     "Dec." : "pros.",
     "Settings" : "Postavke",
     "Saving..." : "Spremanje...",
+    "seconds ago" : "prije par sekundi",
     "Couldn't send reset email. Please contact your administrator." : "Nije mogće poslati resetiranu poštu. MOlimo kontaktirajte svog administratora.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Veza za resetiranje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite unekom razumnom vremenskom roku, provjerite svoje spam/junk mape. <br> Ako nije tamo, kontaktirajtesvoga lokalnog administratora.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka,svoje podatke nećete moći dohvatitinakon što vaša lozinka bude resetirana.<br />Ako ne znate što učiniti, prije nego linastavite, molimo kontaktirajte svog administratora. <br />Želite li doista nastaviti?",
@@ -115,7 +116,11 @@
     "change" : "promijeni",
     "delete" : "Izbrišite",
     "access control" : "Kontrola pristupa",
+    "An error occured. Please try again" : "Dogodila se pogreška. Molimo Vas, pokušajte ponovno. ",
     "Share" : "Podijelite",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Podijelite sa korisnicima drugoga ownClouda koristeći format korisnickoime@primjer.com/owncloud",
+    "Share with users or groups …" : "Podijeli sa korisnicima ili grupama ...",
+    "Share with users, groups or remote users …" : "Podijeli sa korisnicima, grupama ili udaljenim korisnicima ...",
     "Warning" : "Upozorenje",
     "The object type is not specified." : "Vrsta objekta nije specificirana.",
     "Enter new" : "Unesite novi",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 04a71f813b8..c1ee751df34 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -73,6 +73,7 @@ OC.L10N.register(
     "Dec." : "dec.",
     "Settings" : "Beállítások",
     "Saving..." : "Mentés...",
+    "seconds ago" : "pár másodperce",
     "Couldn't send reset email. Please contact your administrator." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A jelszó felülírásához a linket e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index ba30dfe1c8c..55e9e828245 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -71,6 +71,7 @@
     "Dec." : "dec.",
     "Settings" : "Beállítások",
     "Saving..." : "Mentés...",
+    "seconds ago" : "pár másodperce",
     "Couldn't send reset email. Please contact your administrator." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A jelszó felülírásához a linket e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
diff --git a/core/l10n/hy.js b/core/l10n/hy.js
index e0a9e3060fc..4225d7efc7c 100644
--- a/core/l10n/hy.js
+++ b/core/l10n/hy.js
@@ -27,9 +27,20 @@ OC.L10N.register(
     "October" : "Հոկտեմբեր",
     "November" : "Նոյեմբեր",
     "December" : "Դեկտեմբեր",
+    "Cancel" : "Չեղարկել",
+    "Very weak password" : "Շատ թույլ գաղտնաբառ",
+    "Weak password" : "Թույլ գաղտնաբառ",
+    "Good password" : "Լավ գաղտնաբառ",
+    "Share link" : "Կիսվել հղմամբ",
+    "Link" : "Հղում",
+    "Password" : "Գաղտնաբառ",
+    "Send" : "Ուղարկել",
     "group" : "խումբ",
+    "delete" : "ջնջել",
+    "Share" : "Կիսվել",
     "Delete" : "Ջնջել",
     "Add" : "Ավելացնել",
+    "New password" : "Նոր գաղտնաբառ",
     "Personal" : "Անձնական"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hy.json b/core/l10n/hy.json
index 89a76b1626b..a051b79bafd 100644
--- a/core/l10n/hy.json
+++ b/core/l10n/hy.json
@@ -25,9 +25,20 @@
     "October" : "Հոկտեմբեր",
     "November" : "Նոյեմբեր",
     "December" : "Դեկտեմբեր",
+    "Cancel" : "Չեղարկել",
+    "Very weak password" : "Շատ թույլ գաղտնաբառ",
+    "Weak password" : "Թույլ գաղտնաբառ",
+    "Good password" : "Լավ գաղտնաբառ",
+    "Share link" : "Կիսվել հղմամբ",
+    "Link" : "Հղում",
+    "Password" : "Գաղտնաբառ",
+    "Send" : "Ուղարկել",
     "group" : "խումբ",
+    "delete" : "ջնջել",
+    "Share" : "Կիսվել",
     "Delete" : "Ջնջել",
     "Add" : "Ավելացնել",
+    "New password" : "Նոր գաղտնաբառ",
     "Personal" : "Անձնական"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
index 536affe6060..ef277277d51 100644
--- a/core/l10n/ia.js
+++ b/core/l10n/ia.js
@@ -52,6 +52,7 @@ OC.L10N.register(
     "Dec." : "Dec.",
     "Settings" : "Configurationes",
     "Saving..." : "Salveguardante...",
+    "seconds ago" : "secundas passate",
     "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
     "I know what I'm doing" : "Io sape lo que io es facente",
     "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
index 165d62ba61a..2947e3888c5 100644
--- a/core/l10n/ia.json
+++ b/core/l10n/ia.json
@@ -50,6 +50,7 @@
     "Dec." : "Dec.",
     "Settings" : "Configurationes",
     "Saving..." : "Salveguardante...",
+    "seconds ago" : "secundas passate",
     "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
     "I know what I'm doing" : "Io sape lo que io es facente",
     "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index cb922fc1a25..c113b1cd555 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Des.",
     "Settings" : "Pengaturan",
     "Saving..." : "Menyimpan...",
+    "seconds ago" : "beberapa detik yang lalu",
     "Couldn't send reset email. Please contact your administrator." : "Tidak dapat mengirim email setel ulang. Silakan hubungi administrator Anda.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 4e05c85b22c..f99a6568c01 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -69,6 +69,7 @@
     "Dec." : "Des.",
     "Settings" : "Pengaturan",
     "Saving..." : "Menyimpan...",
+    "seconds ago" : "beberapa detik yang lalu",
     "Couldn't send reset email. Please contact your administrator." : "Tidak dapat mengirim email setel ulang. Silakan hubungi administrator Anda.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 12027856d2d..bc3b13aaf4e 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Des.",
     "Settings" : "Stillingar",
     "Saving..." : "Er að vista ...",
+    "seconds ago" : "sek.",
     "Couldn't send reset email. Please contact your administrator." : "Gat ekki sent endursetningar tölvupóst. Vinsamlegast hafðu samband við kerfisstjóra.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Hlekkurinn til að endurstilla lykilorðið þitt hefur verið sent á netfangið þitt. Ef þú færð ekki póstinn innan hæfilegs tíma, athugaðu þá í ruslpóst möppu.<br>Ef það er ekki þar spurðu þá kerfisstjórann þinn.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Skrárnar þínar eru dulkóðaðar. Ef þú hefur ekki kveikt á vara lykill, það verður engin leið til að fá þinn gögn til baka eftir lykilorðið þitt er endurstillt.<br />Ef þú ert ekki viss hvað á að gera, skaltu hafa samband við kerfisstjórann áður en þú heldur áfram. <br />Viltu halda áfram?",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index fe7dd9fd64a..c46572fd129 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -69,6 +69,7 @@
     "Dec." : "Des.",
     "Settings" : "Stillingar",
     "Saving..." : "Er að vista ...",
+    "seconds ago" : "sek.",
     "Couldn't send reset email. Please contact your administrator." : "Gat ekki sent endursetningar tölvupóst. Vinsamlegast hafðu samband við kerfisstjóra.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Hlekkurinn til að endurstilla lykilorðið þitt hefur verið sent á netfangið þitt. Ef þú færð ekki póstinn innan hæfilegs tíma, athugaðu þá í ruslpóst möppu.<br>Ef það er ekki þar spurðu þá kerfisstjórann þinn.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Skrárnar þínar eru dulkóðaðar. Ef þú hefur ekki kveikt á vara lykill, það verður engin leið til að fá þinn gögn til baka eftir lykilorðið þitt er endurstillt.<br />Ef þú ert ekki viss hvað á að gera, skaltu hafa samband við kerfisstjórann áður en þú heldur áfram. <br />Viltu halda áfram?",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index d10b8711976..e343188ff2f 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -73,6 +73,7 @@ OC.L10N.register(
     "Dec." : "Dic.",
     "Settings" : "Impostazioni",
     "Saving..." : "Salvataggio in corso...",
+    "seconds ago" : "secondi fa",
     "Couldn't send reset email. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 9a49de0d76b..4dd4c7cad28 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -71,6 +71,7 @@
     "Dec." : "Dic.",
     "Settings" : "Impostazioni",
     "Saving..." : "Salvataggio in corso...",
+    "seconds ago" : "secondi fa",
     "Couldn't send reset email. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 295e0142814..b819989c217 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -69,6 +69,7 @@ OC.L10N.register(
     "Dec." : "12月",
     "Settings" : "設定",
     "Saving..." : "保存中...",
+    "seconds ago" : "数秒前",
     "Couldn't send reset email. Please contact your administrator." : "リセットメールを送信できませんでした。管理者に問い合わせてください。",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "パスワードをリセットするリンクをクリックしたので、メールを送信しました。しばらくたってもメールが届かなかった場合は、スパム/ジャンクフォルダーを確認してください。<br>それでも見つからなかった場合は、管理者に問合わせてください。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に問い合わせてください。<br />続けてよろしいでしょうか?",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index 20b86544225..4d9d98b9ef3 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -67,6 +67,7 @@
     "Dec." : "12月",
     "Settings" : "設定",
     "Saving..." : "保存中...",
+    "seconds ago" : "数秒前",
     "Couldn't send reset email. Please contact your administrator." : "リセットメールを送信できませんでした。管理者に問い合わせてください。",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "パスワードをリセットするリンクをクリックしたので、メールを送信しました。しばらくたってもメールが届かなかった場合は、スパム/ジャンクフォルダーを確認してください。<br>それでも見つからなかった場合は、管理者に問合わせてください。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に問い合わせてください。<br />続けてよろしいでしょうか?",
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
index 6fda99450a0..cfac021e495 100644
--- a/core/l10n/ka_GE.js
+++ b/core/l10n/ka_GE.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "Dec." : "დეკ.",
     "Settings" : "პარამეტრები",
     "Saving..." : "შენახვა...",
+    "seconds ago" : "წამის წინ",
     "No" : "არა",
     "Yes" : "კი",
     "Choose" : "არჩევა",
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
index f7cb23adc60..3498c8d891c 100644
--- a/core/l10n/ka_GE.json
+++ b/core/l10n/ka_GE.json
@@ -39,6 +39,7 @@
     "Dec." : "დეკ.",
     "Settings" : "პარამეტრები",
     "Saving..." : "შენახვა...",
+    "seconds ago" : "წამის წინ",
     "No" : "არა",
     "Yes" : "კი",
     "Choose" : "არჩევა",
diff --git a/core/l10n/km.js b/core/l10n/km.js
index b9a676b12ce..07bf2b0db00 100644
--- a/core/l10n/km.js
+++ b/core/l10n/km.js
@@ -43,6 +43,7 @@ OC.L10N.register(
     "Dec." : "ធ្នូ",
     "Settings" : "ការកំណត់",
     "Saving..." : "កំពុង​រក្សាទុក",
+    "seconds ago" : "វិនាទី​មុន",
     "No" : "ទេ",
     "Yes" : "ព្រម",
     "Choose" : "ជ្រើស",
diff --git a/core/l10n/km.json b/core/l10n/km.json
index 5815f6cd91d..9504a7c5236 100644
--- a/core/l10n/km.json
+++ b/core/l10n/km.json
@@ -41,6 +41,7 @@
     "Dec." : "ធ្នូ",
     "Settings" : "ការកំណត់",
     "Saving..." : "កំពុង​រក្សាទុក",
+    "seconds ago" : "វិនាទី​មុន",
     "No" : "ទេ",
     "Yes" : "ព្រម",
     "Choose" : "ជ្រើស",
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index 28f79d1bb79..3a63df5e745 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "12월",
     "Settings" : "설정",
     "Saving..." : "저장 중...",
+    "seconds ago" : "초 지남",
     "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "암호 재설정 링크를 포함하고 있는 이메일을 보냈습니다. 이메일이 도착하지 않은 경우 스팸함을 확인해 보십시오.<br>스팸함에도 없는 경우 로컬 관리자에게 문의하십시오.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "파일이 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다.<br />무엇을 해야 할 지 잘 모르겠으면 계속하기 전에 관리자에게 연락하십시오.<br />그래도 계속 진행하시겠습니까?",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index adf31bb5a9d..03919d7c253 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -69,6 +69,7 @@
     "Dec." : "12월",
     "Settings" : "설정",
     "Saving..." : "저장 중...",
+    "seconds ago" : "초 지남",
     "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "암호 재설정 링크를 포함하고 있는 이메일을 보냈습니다. 이메일이 도착하지 않은 경우 스팸함을 확인해 보십시오.<br>스팸함에도 없는 경우 로컬 관리자에게 문의하십시오.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "파일이 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다.<br />무엇을 해야 할 지 잘 모르겠으면 계속하기 전에 관리자에게 연락하십시오.<br />그래도 계속 진행하시겠습니까?",
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index bcb7299962a..0f37ae317de 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -47,6 +47,7 @@ OC.L10N.register(
     "Dec." : "Dez.",
     "Settings" : "Astellungen",
     "Saving..." : "Speicheren...",
+    "seconds ago" : "Sekonnen hier",
     "No" : "Nee",
     "Yes" : "Jo",
     "Choose" : "Auswielen",
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index 1a20e751fd8..72f78ae6e7e 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -45,6 +45,7 @@
     "Dec." : "Dez.",
     "Settings" : "Astellungen",
     "Saving..." : "Speicheren...",
+    "seconds ago" : "Sekonnen hier",
     "No" : "Nee",
     "Yes" : "Jo",
     "Choose" : "Auswielen",
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index d0a464b1a54..a5f9d19ac1e 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -2,10 +2,23 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ",
+    "Preparing update" : "Ruošiamasi atnaujinimui",
     "Turned on maintenance mode" : "Įjungta priežiūros veiksena",
     "Turned off maintenance mode" : "Išjungta priežiūros veiksena",
     "Maintenance mode is kept active" : "Priežiūros veiksena yra aktyvi",
     "Updated database" : "Atnaujinta duomenų bazė",
+    "Checked database schema update" : "Tikrinama duomenų bazės struktūra",
+    "Checked database schema update for apps" : "Tikrinama duomenų bazės struktūra įskiepiams",
+    "Updated \"%s\" to %s" : "Atnaujinta \"%s\" į %s",
+    "Repair warning: " : "Taisymo perspėjimas:",
+    "Repair error: " : "Taisymo klaida:",
+    "Set log level to debug - current level: \"%s\"" : "Nustatykite žurnalų lygį į derinimas - dabar \"%s\"",
+    "Reset log level to  \"%s\"" : "Atkurkite žurnalų lygį į \"%s\"",
+    "Following incompatible apps have been disabled: %s" : "Nesudarinami įskiepiai buvo išjungti: %s",
+    "Following apps have been disabled: %s" : "Išjungti įskiepiai: %s",
+    "Already up to date" : "Jau naujausia",
+    "File is too big" : "Per didelis failas",
+    "Invalid file provided" : "Netinkamas failas",
     "No image or file provided" : "Nenurodytas paveikslėlis ar failas",
     "Unknown filetype" : "Nežinomas failo tipas",
     "Invalid image" : "Netinkamas paveikslėlis",
@@ -25,6 +38,13 @@ OC.L10N.register(
     "Thu." : "Kt.",
     "Fri." : "Pn.",
     "Sat." : "Št.",
+    "Su" : "S",
+    "Mo" : "P",
+    "Tu" : "A",
+    "We" : "T",
+    "Th" : "K",
+    "Fr" : "Pn",
+    "Sa" : "Š",
     "January" : "Sausis",
     "February" : "Vasaris",
     "March" : "Kovas",
@@ -51,6 +71,10 @@ OC.L10N.register(
     "Dec." : "Groud.",
     "Settings" : "Nustatymai",
     "Saving..." : "Saugoma...",
+    "seconds ago" : "prieš sekundę",
+    "Couldn't send reset email. Please contact your administrator." : "Nepavyko išsiųsti atkūrimo laiško, susisiekite su administratoriumi.",
+    "I know what I'm doing" : "Aš žinau ką darau",
+    "Password can not be changed. Please contact your administrator." : "Slaptažodis negali būti pakeistas, susisiekite su administratoriumi.",
     "No" : "Ne",
     "Yes" : "Taip",
     "Choose" : "Pasirinkite",
@@ -60,6 +84,8 @@ OC.L10N.register(
     "read-only" : "tik skaitymui",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"],
     "One file conflict" : "Vienas failo konfliktas",
+    "New Files" : "Naujas failas",
+    "Already existing files" : "Egzistuojantys failai",
     "Which files do you want to keep?" : "Kuriuos failus norite laikyti?",
     "If you select both versions, the copied file will have a number added to its name." : "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime.",
     "Cancel" : "Atšaukti",
@@ -67,6 +93,11 @@ OC.L10N.register(
     "(all selected)" : "(visi pažymėti)",
     "({count} selected)" : "({count} pažymėtų)",
     "Error loading file exists template" : "Klaida įkeliant esančių failų ruošinį",
+    "Very weak password" : "Labai silpnas slaptažodis",
+    "Weak password" : "Silpnas slaptažodis",
+    "So-so password" : "Neblogas slaptažodis",
+    "Good password" : "Geras slaptažodis",
+    "Strong password" : "Stiprus slaptažodis",
     "Shared" : "Dalinamasi",
     "Error" : "Klaida",
     "Error while sharing" : "Klaida, dalijimosi metu",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index dbedb34be2d..defe7eece9b 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -1,9 +1,22 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ",
+    "Preparing update" : "Ruošiamasi atnaujinimui",
     "Turned on maintenance mode" : "Įjungta priežiūros veiksena",
     "Turned off maintenance mode" : "Išjungta priežiūros veiksena",
     "Maintenance mode is kept active" : "Priežiūros veiksena yra aktyvi",
     "Updated database" : "Atnaujinta duomenų bazė",
+    "Checked database schema update" : "Tikrinama duomenų bazės struktūra",
+    "Checked database schema update for apps" : "Tikrinama duomenų bazės struktūra įskiepiams",
+    "Updated \"%s\" to %s" : "Atnaujinta \"%s\" į %s",
+    "Repair warning: " : "Taisymo perspėjimas:",
+    "Repair error: " : "Taisymo klaida:",
+    "Set log level to debug - current level: \"%s\"" : "Nustatykite žurnalų lygį į derinimas - dabar \"%s\"",
+    "Reset log level to  \"%s\"" : "Atkurkite žurnalų lygį į \"%s\"",
+    "Following incompatible apps have been disabled: %s" : "Nesudarinami įskiepiai buvo išjungti: %s",
+    "Following apps have been disabled: %s" : "Išjungti įskiepiai: %s",
+    "Already up to date" : "Jau naujausia",
+    "File is too big" : "Per didelis failas",
+    "Invalid file provided" : "Netinkamas failas",
     "No image or file provided" : "Nenurodytas paveikslėlis ar failas",
     "Unknown filetype" : "Nežinomas failo tipas",
     "Invalid image" : "Netinkamas paveikslėlis",
@@ -23,6 +36,13 @@
     "Thu." : "Kt.",
     "Fri." : "Pn.",
     "Sat." : "Št.",
+    "Su" : "S",
+    "Mo" : "P",
+    "Tu" : "A",
+    "We" : "T",
+    "Th" : "K",
+    "Fr" : "Pn",
+    "Sa" : "Š",
     "January" : "Sausis",
     "February" : "Vasaris",
     "March" : "Kovas",
@@ -49,6 +69,10 @@
     "Dec." : "Groud.",
     "Settings" : "Nustatymai",
     "Saving..." : "Saugoma...",
+    "seconds ago" : "prieš sekundę",
+    "Couldn't send reset email. Please contact your administrator." : "Nepavyko išsiųsti atkūrimo laiško, susisiekite su administratoriumi.",
+    "I know what I'm doing" : "Aš žinau ką darau",
+    "Password can not be changed. Please contact your administrator." : "Slaptažodis negali būti pakeistas, susisiekite su administratoriumi.",
     "No" : "Ne",
     "Yes" : "Taip",
     "Choose" : "Pasirinkite",
@@ -58,6 +82,8 @@
     "read-only" : "tik skaitymui",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"],
     "One file conflict" : "Vienas failo konfliktas",
+    "New Files" : "Naujas failas",
+    "Already existing files" : "Egzistuojantys failai",
     "Which files do you want to keep?" : "Kuriuos failus norite laikyti?",
     "If you select both versions, the copied file will have a number added to its name." : "Jei pasirenkate abi versijas, nukopijuotas failas turės pridėtą numerį pavadinime.",
     "Cancel" : "Atšaukti",
@@ -65,6 +91,11 @@
     "(all selected)" : "(visi pažymėti)",
     "({count} selected)" : "({count} pažymėtų)",
     "Error loading file exists template" : "Klaida įkeliant esančių failų ruošinį",
+    "Very weak password" : "Labai silpnas slaptažodis",
+    "Weak password" : "Silpnas slaptažodis",
+    "So-so password" : "Neblogas slaptažodis",
+    "Good password" : "Geras slaptažodis",
+    "Strong password" : "Stiprus slaptažodis",
     "Shared" : "Dalinamasi",
     "Error" : "Klaida",
     "Error while sharing" : "Klaida, dalijimosi metu",
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index 54beb6a107b..1bfbef01275 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -47,6 +47,7 @@ OC.L10N.register(
     "Dec." : "Dec.",
     "Settings" : "Iestatījumi",
     "Saving..." : "Saglabā...",
+    "seconds ago" : "sekundes atpakaļ",
     "I know what I'm doing" : "Es zinu ko es daru",
     "Password can not be changed. Please contact your administrator." : "Paroli, nevar nomainīt. Lūdzu kontaktēties ar savu administratoru.",
     "No" : "Nē",
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index b874c1f4008..6d3eed2c2a7 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -45,6 +45,7 @@
     "Dec." : "Dec.",
     "Settings" : "Iestatījumi",
     "Saving..." : "Saglabā...",
+    "seconds ago" : "sekundes atpakaļ",
     "I know what I'm doing" : "Es zinu ko es daru",
     "Password can not be changed. Please contact your administrator." : "Paroli, nevar nomainīt. Lūdzu kontaktēties ar savu administratoru.",
     "No" : "Nē",
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
index 26d0f8f2152..ef283e7d24f 100644
--- a/core/l10n/mk.js
+++ b/core/l10n/mk.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Dec." : "Дек.",
     "Settings" : "Подесувања",
     "Saving..." : "Снимам...",
+    "seconds ago" : "пред секунди",
     "Couldn't send reset email. Please contact your administrator." : "Не можам да истпратам порака за ресетирање. Ве молам контактирајте го вашиот администратор.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Врската за ресетирање на вашата лозинка е испратена на вашата е-адреса. Ако не ја добиете во разумно време, проверете ги вашите папки за спам/ѓубре.<br>Ако не е таму прашајте го вашиот локален администратор.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Вашите датотеки се шифрирани. Ако не сте го овозможиле клучот за враќање, нема да можете да ги повратите вашите податоци откога вашата лозинка ќе биде ресетирана.<br>Ако не сте сигурни што да правите, ве молам контактирајте го вашиот локален администратор пред да продолжите.<br/>Дали навистина сакате да продолжите?",
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
index 60dfe4305c7..258a912388d 100644
--- a/core/l10n/mk.json
+++ b/core/l10n/mk.json
@@ -57,6 +57,7 @@
     "Dec." : "Дек.",
     "Settings" : "Подесувања",
     "Saving..." : "Снимам...",
+    "seconds ago" : "пред секунди",
     "Couldn't send reset email. Please contact your administrator." : "Не можам да истпратам порака за ресетирање. Ве молам контактирајте го вашиот администратор.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Врската за ресетирање на вашата лозинка е испратена на вашата е-адреса. Ако не ја добиете во разумно време, проверете ги вашите папки за спам/ѓубре.<br>Ако не е таму прашајте го вашиот локален администратор.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Вашите датотеки се шифрирани. Ако не сте го овозможиле клучот за враќање, нема да можете да ги повратите вашите податоци откога вашата лозинка ќе биде ресетирана.<br>Ако не сте сигурни што да правите, ве молам контактирајте го вашиот локален администратор пред да продолжите.<br/>Дали навистина сакате да продолжите?",
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
index 564eaebeeec..fc47c956844 100644
--- a/core/l10n/my_MM.js
+++ b/core/l10n/my_MM.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "October" : "အောက်တိုဘာ",
     "November" : "နိုဝင်ဘာ",
     "December" : "ဒီဇင်ဘာ",
+    "seconds ago" : "စက္ကန့်အနည်းငယ်က",
     "No" : "မဟုတ်ဘူး",
     "Yes" : "ဟုတ်",
     "Choose" : "ရွေးချယ်",
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
index 6840d924488..157e38e0312 100644
--- a/core/l10n/my_MM.json
+++ b/core/l10n/my_MM.json
@@ -11,6 +11,7 @@
     "October" : "အောက်တိုဘာ",
     "November" : "နိုဝင်ဘာ",
     "December" : "ဒီဇင်ဘာ",
+    "seconds ago" : "စက္ကန့်အနည်းငယ်က",
     "No" : "မဟုတ်ဘူး",
     "Yes" : "ဟုတ်",
     "Choose" : "ရွေးချယ်",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index dc22e3f3030..13cf58087a9 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Des.",
     "Settings" : "Innstillinger",
     "Saving..." : "Lagrer...",
+    "seconds ago" : "for få sekunder siden",
     "Couldn't send reset email. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling. Kontakt administratoren.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index 0f6363831b7..efdf8439833 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -69,6 +69,7 @@
     "Dec." : "Des.",
     "Settings" : "Innstillinger",
     "Saving..." : "Lagrer...",
+    "seconds ago" : "for få sekunder siden",
     "Couldn't send reset email. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling. Kontakt administratoren.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 068dd12ff98..9e42bf3c26e 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -73,6 +73,7 @@ OC.L10N.register(
     "Dec." : "Dec.",
     "Settings" : "Instellingen",
     "Saving..." : "Opslaan",
+    "seconds ago" : "seconden geleden",
     "Couldn't send reset email. Please contact your administrator." : "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammap. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index a2c18a59ed1..a2314251c84 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -71,6 +71,7 @@
     "Dec." : "Dec.",
     "Settings" : "Instellingen",
     "Saving..." : "Opslaan",
+    "seconds ago" : "seconden geleden",
     "Couldn't send reset email. Please contact your administrator." : "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammap. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?",
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
index dce6076578d..161fa88958d 100644
--- a/core/l10n/nn_NO.js
+++ b/core/l10n/nn_NO.js
@@ -50,6 +50,7 @@ OC.L10N.register(
     "Dec." : "Des.",
     "Settings" : "Innstillingar",
     "Saving..." : "Lagrar …",
+    "seconds ago" : "sekund sidan",
     "I know what I'm doing" : "Eg veit kva eg gjer",
     "No" : "Nei",
     "Yes" : "Ja",
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
index 1f6883b3361..654df3317cb 100644
--- a/core/l10n/nn_NO.json
+++ b/core/l10n/nn_NO.json
@@ -48,6 +48,7 @@
     "Dec." : "Des.",
     "Settings" : "Innstillingar",
     "Saving..." : "Lagrar …",
+    "seconds ago" : "sekund sidan",
     "I know what I'm doing" : "Eg veit kva eg gjer",
     "No" : "Nei",
     "Yes" : "Ja",
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index ae8bbf09986..48a672add67 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Dec." : "Dec.",
     "Settings" : "Paramètres",
     "Saving..." : "Enregistrament…",
+    "seconds ago" : "i a qualques segondas",
     "Couldn't send reset email. Please contact your administrator." : "Impossible de mandar lo corrièl de reïnicializacion. Contactatz vòstre administrator.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lo ligam que permet de reïnicializar vòstre senhal ven d'èsser mandat a vòstra adreça de corrièl.<br>Se o recebètz pas dins un relambi rasonable, contactatz vòstre administrator.<br>Doblidetz pas de verificar dins vòstre dorsièr corrièr indesirable / spam!",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vòstres fichièrs son chifrats. Se avètz pas activat la clau de recuperacion, i aurà pas cap de mejan de recuperar vòstras donadas un còp lo senhal reïnicializat.<br />Se sètz pas segur(a) de çò que fasètz, contactatz vòstre administrator abans de contunhar. <br />Sètz segur que volètz contunhar ?",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index 7f5aaaff4e1..44402648aa7 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -57,6 +57,7 @@
     "Dec." : "Dec.",
     "Settings" : "Paramètres",
     "Saving..." : "Enregistrament…",
+    "seconds ago" : "i a qualques segondas",
     "Couldn't send reset email. Please contact your administrator." : "Impossible de mandar lo corrièl de reïnicializacion. Contactatz vòstre administrator.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lo ligam que permet de reïnicializar vòstre senhal ven d'èsser mandat a vòstra adreça de corrièl.<br>Se o recebètz pas dins un relambi rasonable, contactatz vòstre administrator.<br>Doblidetz pas de verificar dins vòstre dorsièr corrièr indesirable / spam!",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vòstres fichièrs son chifrats. Se avètz pas activat la clau de recuperacion, i aurà pas cap de mejan de recuperar vòstras donadas un còp lo senhal reïnicializat.<br />Se sètz pas segur(a) de çò que fasètz, contactatz vòstre administrator abans de contunhar. <br />Sètz segur que volètz contunhar ?",
diff --git a/core/l10n/pa.js b/core/l10n/pa.js
index ec3e48920f5..2ab5eb0faff 100644
--- a/core/l10n/pa.js
+++ b/core/l10n/pa.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "December" : "ਦਸੰਬਰ",
     "Settings" : "ਸੈਟਿੰਗ",
     "Saving..." : "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
+    "seconds ago" : "ਸਕਿੰਟ ਪਹਿਲਾਂ",
     "No" : "ਨਹੀਂ",
     "Yes" : "ਹਾਂ",
     "Choose" : "ਚੁਣੋ",
diff --git a/core/l10n/pa.json b/core/l10n/pa.json
index 853b3a5d86f..8a8d992589b 100644
--- a/core/l10n/pa.json
+++ b/core/l10n/pa.json
@@ -20,6 +20,7 @@
     "December" : "ਦਸੰਬਰ",
     "Settings" : "ਸੈਟਿੰਗ",
     "Saving..." : "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
+    "seconds ago" : "ਸਕਿੰਟ ਪਹਿਲਾਂ",
     "No" : "ਨਹੀਂ",
     "Yes" : "ਹਾਂ",
     "Choose" : "ਚੁਣੋ",
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index 75190fcdb36..525c4aef880 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -57,6 +57,7 @@ OC.L10N.register(
     "Dec." : "Gru.",
     "Settings" : "Ustawienia",
     "Saving..." : "Zapisywanie...",
+    "seconds ago" : "sekund temu",
     "Couldn't send reset email. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Skontaktuj się z administratorem.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index 69a036f69a0..d187cbcc626 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -55,6 +55,7 @@
     "Dec." : "Gru.",
     "Settings" : "Ustawienia",
     "Saving..." : "Zapisywanie...",
+    "seconds ago" : "sekund temu",
     "Couldn't send reset email. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Skontaktuj się z administratorem.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index dbbd7ce2308..430a245b1fc 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -73,6 +73,7 @@ OC.L10N.register(
     "Dec." : "Dez.",
     "Settings" : "Configurações",
     "Saving..." : "Salvando...",
+    "seconds ago" : "segundos atrás",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para redefinir sua senha foi enviada para o seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo. <br> Se ele não estiver lá, pergunte ao administrador do local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida. <br/> Se você não tem certeza do que fazer, por favor, contate o administrador antes de continuar. <br/> Você realmente deseja continuar?",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index ef7d1bb8ec7..13caa948bfe 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -71,6 +71,7 @@
     "Dec." : "Dez.",
     "Settings" : "Configurações",
     "Saving..." : "Salvando...",
+    "seconds ago" : "segundos atrás",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para redefinir sua senha foi enviada para o seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo. <br> Se ele não estiver lá, pergunte ao administrador do local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida. <br/> Se você não tem certeza do que fazer, por favor, contate o administrador antes de continuar. <br/> Você realmente deseja continuar?",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index 94690c68a9a..903124c6b63 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Dez.",
     "Settings" : "Definições",
     "Saving..." : "A guardar ...",
+    "seconds ago" : "segundos atrás",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A hiperligação para reiniciar a sua senha foi enviada para o seu correio eletrónico. Se não a receber dentro de um tempo aceitável, verifique as suas pastas de span/lixo.<br> Se não a encontrar, pergunte ao seu administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não ativou a chave de recuperação, não terá nenhum modo para voltar obter os seus dados depois de reiniciar a sua senha. <br />Se não tem a certeza do que fazer, por favor, contacte o seu administrador antes de continuar.<br />  Tem a certeza que quer continuar?",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 3b6e031e26a..733f7375feb 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -69,6 +69,7 @@
     "Dec." : "Dez.",
     "Settings" : "Definições",
     "Saving..." : "A guardar ...",
+    "seconds ago" : "segundos atrás",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A hiperligação para reiniciar a sua senha foi enviada para o seu correio eletrónico. Se não a receber dentro de um tempo aceitável, verifique as suas pastas de span/lixo.<br> Se não a encontrar, pergunte ao seu administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não ativou a chave de recuperação, não terá nenhum modo para voltar obter os seus dados depois de reiniciar a sua senha. <br />Se não tem a certeza do que fazer, por favor, contacte o seu administrador antes de continuar.<br />  Tem a certeza que quer continuar?",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index 051f85db9b8..45f5cdece60 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -52,6 +52,7 @@ OC.L10N.register(
     "Dec." : "Dec.",
     "Settings" : "Setări",
     "Saving..." : "Se salvează...",
+    "seconds ago" : "secunde în urmă",
     "Couldn't send reset email. Please contact your administrator." : "Expedierea email-ului de resetare a eşuat. Vă rugăm să contactaţi administratorul dvs.",
     "I know what I'm doing" : "Eu știu ce fac",
     "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index db2280b78f1..1f85508c86e 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -50,6 +50,7 @@
     "Dec." : "Dec.",
     "Settings" : "Setări",
     "Saving..." : "Se salvează...",
+    "seconds ago" : "secunde în urmă",
     "Couldn't send reset email. Please contact your administrator." : "Expedierea email-ului de resetare a eşuat. Vă rugăm să contactaţi administratorul dvs.",
     "I know what I'm doing" : "Eu știu ce fac",
     "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index a5159a8d9a2..b2ef1b422fe 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -62,6 +62,7 @@ OC.L10N.register(
     "Dec." : "Дек.",
     "Settings" : "Настройки",
     "Saving..." : "Сохранение...",
+    "seconds ago" : "несколько секунд назад",
     "Couldn't send reset email. Please contact your administrator." : "Не удалось отправить письмо для сброса пароля. Пожалуйста, свяжитесь с вашим администратором.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку спама.<br>Если его там нет, то обратитесь к вашему администратору.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 8be25ffe06d..46ee1af1afe 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -60,6 +60,7 @@
     "Dec." : "Дек.",
     "Settings" : "Настройки",
     "Saving..." : "Сохранение...",
+    "seconds ago" : "несколько секунд назад",
     "Couldn't send reset email. Please contact your administrator." : "Не удалось отправить письмо для сброса пароля. Пожалуйста, свяжитесь с вашим администратором.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку спама.<br>Если его там нет, то обратитесь к вашему администратору.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?",
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
index dfdc037fb5a..3852cc7a3bf 100644
--- a/core/l10n/si_LK.js
+++ b/core/l10n/si_LK.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "Dec." : "දෙසැ.",
     "Settings" : "සිටුවම්",
     "Saving..." : "සුරැකෙමින් පවතී...",
+    "seconds ago" : "තත්පරයන්ට පෙර",
     "No" : "එපා",
     "Yes" : "ඔව්",
     "Choose" : "තෝරන්න",
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
index 62387a67e3f..6289858021c 100644
--- a/core/l10n/si_LK.json
+++ b/core/l10n/si_LK.json
@@ -39,6 +39,7 @@
     "Dec." : "දෙසැ.",
     "Settings" : "සිටුවම්",
     "Saving..." : "සුරැකෙමින් පවතී...",
+    "seconds ago" : "තත්පරයන්ට පෙර",
     "No" : "එපා",
     "Yes" : "ඔව්",
     "Choose" : "තෝරන්න",
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 2d0305196bc..044f126f353 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -67,6 +67,7 @@ OC.L10N.register(
     "Dec." : "Dec.",
     "Settings" : "Nastavenia",
     "Saving..." : "Ukladám...",
+    "seconds ago" : "pred sekundami",
     "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index 14205e73457..7938364de5f 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -65,6 +65,7 @@
     "Dec." : "Dec.",
     "Settings" : "Nastavenia",
     "Saving..." : "Ukladám...",
+    "seconds ago" : "pred sekundami",
     "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index b0edc70f232..fd415376b14 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -54,6 +54,7 @@ OC.L10N.register(
     "Dec." : "dec",
     "Settings" : "Nastavitve",
     "Saving..." : "Poteka shranjevanje ...",
+    "seconds ago" : "pred nekaj sekundami",
     "Couldn't send reset email. Please contact your administrator." : "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index 5e720949dd1..df0ec47a292 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -52,6 +52,7 @@
     "Dec." : "dec",
     "Settings" : "Nastavitve",
     "Saving..." : "Poteka shranjevanje ...",
+    "seconds ago" : "pred nekaj sekundami",
     "Couldn't send reset email. Please contact your administrator." : "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index 70633586661..794b9bc553d 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Dec." : "Dhje",
     "Settings" : "Parametra",
     "Saving..." : "Duke ruajtur...",
+    "seconds ago" : "sekonda më parë",
     "Couldn't send reset email. Please contact your administrator." : "Emaili i rivendosjes nuk mund të dërgohet. Ju lutem kontaktoni me administratorin.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj. Nëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme spam.<br>Nëse nuk është as aty, pyesni administratorin tuaj.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Skedarët tuaj janë të kodifikuar. Nëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin.<br />Nëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj përpara se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index 70351a75482..09461855de2 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -51,6 +51,7 @@
     "Dec." : "Dhje",
     "Settings" : "Parametra",
     "Saving..." : "Duke ruajtur...",
+    "seconds ago" : "sekonda më parë",
     "Couldn't send reset email. Please contact your administrator." : "Emaili i rivendosjes nuk mund të dërgohet. Ju lutem kontaktoni me administratorin.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lidhja për rivendosjen e kodit tuaj u dërgua tek email-i juaj. Nëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme spam.<br>Nëse nuk është as aty, pyesni administratorin tuaj.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Skedarët tuaj janë të kodifikuar. Nëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin.<br />Nëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj përpara se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index 7676beecc5b..17b0f7aa0c0 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -61,6 +61,7 @@ OC.L10N.register(
     "Dec." : "дец",
     "Settings" : "Поставке",
     "Saving..." : "Уписујем...",
+    "seconds ago" : "пре пар секунди",
     "Couldn't send reset email. Please contact your administrator." : "Не могу да пошаљем е-пошту за ресетовање лозинке. Контактирајте администратора.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Веза за ресетовање лозинке је послата на вашу е-адресу. Ако је не примите ускоро, проверите фасцикле за нежељену пошту.<br>Ако није ни тамо, контактирајте вашег администратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Фајлови су вам шифровани. Ако нисте укључили кључ за опоравак, нећете моћи да повратите податке након ресетовања лозинке.<br />Ако нисте сигурни шта да радите, контактирајте администратора пре него што наставите.<br />Да ли желите да наставите?",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index f06c58773bb..e9436162144 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -59,6 +59,7 @@
     "Dec." : "дец",
     "Settings" : "Поставке",
     "Saving..." : "Уписујем...",
+    "seconds ago" : "пре пар секунди",
     "Couldn't send reset email. Please contact your administrator." : "Не могу да пошаљем е-пошту за ресетовање лозинке. Контактирајте администратора.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Веза за ресетовање лозинке је послата на вашу е-адресу. Ако је не примите ускоро, проверите фасцикле за нежељену пошту.<br>Ако није ни тамо, контактирајте вашег администратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Фајлови су вам шифровани. Ако нисте укључили кључ за опоравак, нећете моћи да повратите податке након ресетовања лозинке.<br />Ако нисте сигурни шта да радите, контактирајте администратора пре него што наставите.<br />Да ли желите да наставите?",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index 276252e324f..d57db178ec2 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Dec." : "dec",
     "Settings" : "Podešavanja",
     "Saving..." : "Snimam...",
+    "seconds ago" : "Pre par sekundi",
     "Couldn't send reset email. Please contact your administrator." : "Nemoguće slanje e-mail-a za ponovno postavljanje lozinke. Molimo Vas kontaktirajte Vašeg administratora",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link za ponovno postavljanje Vaše lozinke je poslat na Vašu e-mail adresu. Ako ga ne primite u razumnom roku, proverite fascikle za neželjenu poštu.<br>Ako ga nema ni tamo, kontaktirajte Vašeg lokalnog administratora.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaši fajlovi su šifrovani. Ako nista omogućili ključ za povrat fajlova, neće biti načina da dobijete ponovo svoje podatke posle promene lozinke.<br />Ako niste sigurni šta da radite, molimo Vas da kontaktirate Vašeg administratora pre nego što nastavite.<br />Da li zaista želite da nastavite?",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index 03766ee0948..cbc738d0010 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -51,6 +51,7 @@
     "Dec." : "dec",
     "Settings" : "Podešavanja",
     "Saving..." : "Snimam...",
+    "seconds ago" : "Pre par sekundi",
     "Couldn't send reset email. Please contact your administrator." : "Nemoguće slanje e-mail-a za ponovno postavljanje lozinke. Molimo Vas kontaktirajte Vašeg administratora",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link za ponovno postavljanje Vaše lozinke je poslat na Vašu e-mail adresu. Ako ga ne primite u razumnom roku, proverite fascikle za neželjenu poštu.<br>Ako ga nema ni tamo, kontaktirajte Vašeg lokalnog administratora.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaši fajlovi su šifrovani. Ako nista omogućili ključ za povrat fajlova, neće biti načina da dobijete ponovo svoje podatke posle promene lozinke.<br />Ako niste sigurni šta da radite, molimo Vas da kontaktirate Vašeg administratora pre nego što nastavite.<br />Da li zaista želite da nastavite?",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index 8ef863b4a59..24bfac63cc3 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -53,6 +53,7 @@ OC.L10N.register(
     "Dec." : "Dec.",
     "Settings" : "Inställningar",
     "Saving..." : "Sparar...",
+    "seconds ago" : "sekunder sedan",
     "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index 5e425406a42..c98f97de9b9 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -51,6 +51,7 @@
     "Dec." : "Dec.",
     "Settings" : "Inställningar",
     "Saving..." : "Sparar...",
+    "seconds ago" : "sekunder sedan",
     "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
index d10cea1833f..1f61734642b 100644
--- a/core/l10n/ta_LK.js
+++ b/core/l10n/ta_LK.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "Dec." : "மார்கழி",
     "Settings" : "அமைப்புகள்",
     "Saving..." : "சேமிக்கப்படுகிறது...",
+    "seconds ago" : "செக்கன்களுக்கு முன்",
     "No" : "இல்லை",
     "Yes" : "ஆம்",
     "Choose" : "தெரிவுசெய்க ",
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
index 1d19146d104..89aadd5b791 100644
--- a/core/l10n/ta_LK.json
+++ b/core/l10n/ta_LK.json
@@ -39,6 +39,7 @@
     "Dec." : "மார்கழி",
     "Settings" : "அமைப்புகள்",
     "Saving..." : "சேமிக்கப்படுகிறது...",
+    "seconds ago" : "செக்கன்களுக்கு முன்",
     "No" : "இல்லை",
     "Yes" : "ஆம்",
     "Choose" : "தெரிவுசெய்க ",
diff --git a/core/l10n/te.js b/core/l10n/te.js
index 6169beff101..f2be12f12da 100644
--- a/core/l10n/te.js
+++ b/core/l10n/te.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "November" : "నవంబర్",
     "December" : "డిసెంబర్",
     "Settings" : "అమరికలు",
+    "seconds ago" : "క్షణాల క్రితం",
     "No" : "కాదు",
     "Yes" : "అవును",
     "Ok" : "సరే",
diff --git a/core/l10n/te.json b/core/l10n/te.json
index b09f286afbc..f165c3f457f 100644
--- a/core/l10n/te.json
+++ b/core/l10n/te.json
@@ -19,6 +19,7 @@
     "November" : "నవంబర్",
     "December" : "డిసెంబర్",
     "Settings" : "అమరికలు",
+    "seconds ago" : "క్షణాల క్రితం",
     "No" : "కాదు",
     "Yes" : "అవును",
     "Ok" : "సరే",
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index e356d50c1f5..1ceb8e7d2dd 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -73,6 +73,7 @@ OC.L10N.register(
     "Dec." : "ธ.ค.",
     "Settings" : "ตั้งค่า",
     "Saving..." : "กำลังบันทึกข้อมูล...",
+    "seconds ago" : "วินาที ก่อนหน้านี้",
     "Couldn't send reset email. Please contact your administrator." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่ กรุณาติดต่อผู้ดูแลระบบ",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "ลิงค์ที่ใช้สำหรับตั้งค่ารหัสผ่านใหม่ ของคุณ ได้ถูกส่งไปยังอีเมลของคุณ หากคุณยังไม่ได้รับอีกเมล ลองไปดูที่โฟลเดอร์ สแปม/ถังขยะ ในอีเมลของคุณ <br>ทั้งนี้หากหาอีเมลไม่พบกรุณาติดต่อผู้ดูแลระบบ",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ไฟล์ของคุณจะถูกเข้ารหัส หากคุณยังไม่ได้เปิดใช้งานรหัสการกู้คืน คุณจะได้รับข้อมูลของคุณกลับมาหลังจากที่รหัสผ่านของคุณถูกรีเซ็ต<br /> หากคุณไม่แน่ใจว่าควรทำอย่างไรโปรดติดต่อผู้ดูแลระบบของคุณก่อนที่คุณจะดำเนินการต่อไป <br /> คุณต้องการดำเนินการต่อ?",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index a2056abd1f1..53954b3110b 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -71,6 +71,7 @@
     "Dec." : "ธ.ค.",
     "Settings" : "ตั้งค่า",
     "Saving..." : "กำลังบันทึกข้อมูล...",
+    "seconds ago" : "วินาที ก่อนหน้านี้",
     "Couldn't send reset email. Please contact your administrator." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่ กรุณาติดต่อผู้ดูแลระบบ",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "ลิงค์ที่ใช้สำหรับตั้งค่ารหัสผ่านใหม่ ของคุณ ได้ถูกส่งไปยังอีเมลของคุณ หากคุณยังไม่ได้รับอีกเมล ลองไปดูที่โฟลเดอร์ สแปม/ถังขยะ ในอีเมลของคุณ <br>ทั้งนี้หากหาอีเมลไม่พบกรุณาติดต่อผู้ดูแลระบบ",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ไฟล์ของคุณจะถูกเข้ารหัส หากคุณยังไม่ได้เปิดใช้งานรหัสการกู้คืน คุณจะได้รับข้อมูลของคุณกลับมาหลังจากที่รหัสผ่านของคุณถูกรีเซ็ต<br /> หากคุณไม่แน่ใจว่าควรทำอย่างไรโปรดติดต่อผู้ดูแลระบบของคุณก่อนที่คุณจะดำเนินการต่อไป <br /> คุณต้องการดำเนินการต่อ?",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index b0dcc1953ba..b64f3110953 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Ara.",
     "Settings" : "Ayarlar",
     "Saving..." : "Kaydediliyor...",
+    "seconds ago" : "saniyeler önce",
     "Couldn't send reset email. Please contact your administrator." : "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index 30d443795ec..830a433a279 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -69,6 +69,7 @@
     "Dec." : "Ara.",
     "Settings" : "Ayarlar",
     "Saving..." : "Kaydediliyor...",
+    "seconds ago" : "saniyeler önce",
     "Couldn't send reset email. Please contact your administrator." : "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index 09952d200f7..1cd0de81ff5 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "Гру.",
     "Settings" : "Налаштування",
     "Saving..." : "Збереження...",
+    "seconds ago" : "секунди тому",
     "Couldn't send reset email. Please contact your administrator." : "Не можу надіслати email для скидання. Будь ласка, зверніться до вашого адміністратора.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Посилання для скидання вашого паролю було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index c46e55138bf..4e066cd6dd7 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -69,6 +69,7 @@
     "Dec." : "Гру.",
     "Settings" : "Налаштування",
     "Saving..." : "Збереження...",
+    "seconds ago" : "секунди тому",
     "Couldn't send reset email. Please contact your administrator." : "Не можу надіслати email для скидання. Будь ласка, зверніться до вашого адміністратора.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Посилання для скидання вашого паролю було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
index 58bc1695810..f2e922a8221 100644
--- a/core/l10n/ur_PK.js
+++ b/core/l10n/ur_PK.js
@@ -29,6 +29,7 @@ OC.L10N.register(
     "December" : "دسمبر",
     "Settings" : "ترتیبات",
     "Saving..." : "محفوظ ھو رہا ہے ...",
+    "seconds ago" : "سیکنڈز پہلے",
     "No" : "نہیں",
     "Yes" : "ہاں",
     "Choose" : "منتخب کریں",
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
index 037c35e29b0..763bdcb5f6f 100644
--- a/core/l10n/ur_PK.json
+++ b/core/l10n/ur_PK.json
@@ -27,6 +27,7 @@
     "December" : "دسمبر",
     "Settings" : "ترتیبات",
     "Saving..." : "محفوظ ھو رہا ہے ...",
+    "seconds ago" : "سیکنڈز پہلے",
     "No" : "نہیں",
     "Yes" : "ہاں",
     "Choose" : "منتخب کریں",
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index e22aaa2b4a7..be73909d894 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -50,6 +50,7 @@ OC.L10N.register(
     "Dec." : "Tháng 12",
     "Settings" : "Cài đặt",
     "Saving..." : "Đang lưu...",
+    "seconds ago" : "vài giây trước",
     "No" : "Không",
     "Yes" : "Có",
     "Choose" : "Chọn",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index acf5e2de9ab..6cb490030c3 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -48,6 +48,7 @@
     "Dec." : "Tháng 12",
     "Settings" : "Cài đặt",
     "Saving..." : "Đang lưu...",
+    "seconds ago" : "vài giây trước",
     "No" : "Không",
     "Yes" : "Có",
     "Choose" : "Chọn",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index ab377c9eb06..7af3d403f5d 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "十二月",
     "Settings" : "设置",
     "Saving..." : "保存中...",
+    "seconds ago" : "几秒前",
     "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index d16c744d51f..4eff4881d64 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -69,6 +69,7 @@
     "Dec." : "十二月",
     "Settings" : "设置",
     "Saving..." : "保存中...",
+    "seconds ago" : "几秒前",
     "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index 571ab585cd5..04ffd8c0ca4 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -22,6 +22,7 @@ OC.L10N.register(
     "December" : "十二月",
     "Settings" : "設定",
     "Saving..." : "儲存中...",
+    "seconds ago" : "秒前",
     "No" : "否",
     "Yes" : "是",
     "Ok" : "確認",
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index d7aa79c78a7..2d9e8565855 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -20,6 +20,7 @@
     "December" : "十二月",
     "Settings" : "設定",
     "Saving..." : "儲存中...",
+    "seconds ago" : "秒前",
     "No" : "否",
     "Yes" : "是",
     "Ok" : "確認",
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index 900c210d6b4..c17dc5f09e2 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Dec." : "十二月",
     "Settings" : "設定",
     "Saving..." : "儲存中...",
+    "seconds ago" : "幾秒前",
     "Couldn't send reset email. Please contact your administrator." : "無法寄送重設 email ，請聯絡系統管理員",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "重設密碼的連結已經 email 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index 2e94ebb294b..e336e6f5e74 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -69,6 +69,7 @@
     "Dec." : "十二月",
     "Settings" : "設定",
     "Saving..." : "儲存中...",
+    "seconds ago" : "幾秒前",
     "Couldn't send reset email. Please contact your administrator." : "無法寄送重設 email ，請聯絡系統管理員",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "重設密碼的連結已經 email 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
diff --git a/lib/l10n/fa.js b/lib/l10n/fa.js
index 70e368549d5..bd6435da10d 100644
--- a/lib/l10n/fa.js
+++ b/lib/l10n/fa.js
@@ -1,24 +1,37 @@
 OC.L10N.register(
     "lib",
     {
+    "Cannot write into \"config\" directory!" : "نمیتوانید داخل دایرکتوری \"config\" تغییراتی ایجاد کنید",
+    "See %s" : "مشاهده %s",
+    "Sample configuration detected" : "فایل پیکربندی نمونه پیدا شد",
+    "Following databases are supported: %s" : "پایگاه‌داده‌ های ذکر شده مورد نیاز است: %s",
+    "The command line tool %s could not be found" : "ابزار کامندلاین %s پیدا نشد",
     "Help" : "راه‌نما",
     "Personal" : "شخصی",
     "Users" : "کاربران",
     "Admin" : "مدیر",
+    "Recommended" : "پیشنهاد شده",
+    "No app name specified" : "اسم اپلیکیشن مشخص نشده‌ است",
     "Unknown filetype" : "نوع فایل ناشناخته",
     "Invalid image" : "عکس نامعتبر",
     "today" : "امروز",
     "yesterday" : "دیروز",
+    "_%n day ago_::_%n days ago_" : ["%n روز پیش"],
     "last month" : "ماه قبل",
     "_%n month ago_::_%n months ago_" : ["%n ماه قبل"],
     "last year" : "سال قبل",
+    "_%n year ago_::_%n years ago_" : ["%n سال پیش"],
     "_%n hour ago_::_%n hours ago_" : ["%n ساعت قبل"],
     "_%n minute ago_::_%n minutes ago_" : ["%n دقیقه قبل"],
     "seconds ago" : "ثانیه‌ها پیش",
     "web services under your control" : "سرویس های تحت وب در کنترل شما",
+    "Empty filename is not allowed" : "نام فایل نمی‌تواند خالی باشد",
+    "File name contains at least one invalid character" : "نام فایل دارای حداقل یک کاراکتر نامعتبر است",
+    "File name is too long" : "نام فایل خیلی بزرگ است",
     "Application is not enabled" : "برنامه فعال نشده است",
     "Authentication error" : "خطا در اعتبار سنجی",
     "Token expired. Please reload page." : "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید.",
+    "Unknown user" : "کاربر نامعلوم",
     "%s enter the database username." : "%s نام کاربری پایگاه داده را وارد نمایید.",
     "%s enter the database name." : "%s نام پایگاه داده را وارد نمایید.",
     "%s you may not use dots in the database name" : "%s شما نباید از نقطه در نام پایگاه داده استفاده نمایید.",
@@ -35,6 +48,11 @@ OC.L10N.register(
     "Could not find category \"%s\"" : "دسته بندی %s یافت نشد",
     "Apps" : "  برنامه ها",
     "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
-    "A valid password must be provided" : "رمز عبور صحیح باید وارد شود"
+    "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
+    "The username is already being used" : "نام‌کاربری قبلا استفاده شده است",
+    "Microsoft Windows Platform is not supported" : "بستر Microsoft Windows پشتیبانی نمی‎‌شود",
+    "Cannot write into \"config\" directory" : "امکان نوشتن درون شاخه‌ی \"config\" وجود ندارد",
+    "Please ask your server administrator to install the module." : "لطفا از مدیر سیستم بخواهید تا ماژول را نصب کند.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 نیاز است"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/fa.json b/lib/l10n/fa.json
index 45ed8d33832..620a0ef2ffc 100644
--- a/lib/l10n/fa.json
+++ b/lib/l10n/fa.json
@@ -1,22 +1,35 @@
 { "translations": {
+    "Cannot write into \"config\" directory!" : "نمیتوانید داخل دایرکتوری \"config\" تغییراتی ایجاد کنید",
+    "See %s" : "مشاهده %s",
+    "Sample configuration detected" : "فایل پیکربندی نمونه پیدا شد",
+    "Following databases are supported: %s" : "پایگاه‌داده‌ های ذکر شده مورد نیاز است: %s",
+    "The command line tool %s could not be found" : "ابزار کامندلاین %s پیدا نشد",
     "Help" : "راه‌نما",
     "Personal" : "شخصی",
     "Users" : "کاربران",
     "Admin" : "مدیر",
+    "Recommended" : "پیشنهاد شده",
+    "No app name specified" : "اسم اپلیکیشن مشخص نشده‌ است",
     "Unknown filetype" : "نوع فایل ناشناخته",
     "Invalid image" : "عکس نامعتبر",
     "today" : "امروز",
     "yesterday" : "دیروز",
+    "_%n day ago_::_%n days ago_" : ["%n روز پیش"],
     "last month" : "ماه قبل",
     "_%n month ago_::_%n months ago_" : ["%n ماه قبل"],
     "last year" : "سال قبل",
+    "_%n year ago_::_%n years ago_" : ["%n سال پیش"],
     "_%n hour ago_::_%n hours ago_" : ["%n ساعت قبل"],
     "_%n minute ago_::_%n minutes ago_" : ["%n دقیقه قبل"],
     "seconds ago" : "ثانیه‌ها پیش",
     "web services under your control" : "سرویس های تحت وب در کنترل شما",
+    "Empty filename is not allowed" : "نام فایل نمی‌تواند خالی باشد",
+    "File name contains at least one invalid character" : "نام فایل دارای حداقل یک کاراکتر نامعتبر است",
+    "File name is too long" : "نام فایل خیلی بزرگ است",
     "Application is not enabled" : "برنامه فعال نشده است",
     "Authentication error" : "خطا در اعتبار سنجی",
     "Token expired. Please reload page." : "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید.",
+    "Unknown user" : "کاربر نامعلوم",
     "%s enter the database username." : "%s نام کاربری پایگاه داده را وارد نمایید.",
     "%s enter the database name." : "%s نام پایگاه داده را وارد نمایید.",
     "%s you may not use dots in the database name" : "%s شما نباید از نقطه در نام پایگاه داده استفاده نمایید.",
@@ -33,6 +46,11 @@
     "Could not find category \"%s\"" : "دسته بندی %s یافت نشد",
     "Apps" : "  برنامه ها",
     "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
-    "A valid password must be provided" : "رمز عبور صحیح باید وارد شود"
+    "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
+    "The username is already being used" : "نام‌کاربری قبلا استفاده شده است",
+    "Microsoft Windows Platform is not supported" : "بستر Microsoft Windows پشتیبانی نمی‎‌شود",
+    "Cannot write into \"config\" directory" : "امکان نوشتن درون شاخه‌ی \"config\" وجود ندارد",
+    "Please ask your server administrator to install the module." : "لطفا از مدیر سیستم بخواهید تا ماژول را نصب کند.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 نیاز است"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/hy.js b/lib/l10n/hy.js
index c52c1de970f..b6fc39257f8 100644
--- a/lib/l10n/hy.js
+++ b/lib/l10n/hy.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "lib",
     {
-    "Personal" : "Անձնական"
+    "Personal" : "Անձնական",
+    "today" : "այսօր"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/hy.json b/lib/l10n/hy.json
index 9b571e73868..68db5355112 100644
--- a/lib/l10n/hy.json
+++ b/lib/l10n/hy.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "Personal" : "Անձնական"
+    "Personal" : "Անձնական",
+    "today" : "այսօր"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index 96a724cae10..641e8ae3f80 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -1,9 +1,13 @@
 OC.L10N.register(
     "settings",
     {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
     "Sharing" : "اشتراک گذاری",
+    "Server-side encryption" : "رمزگذاری سمت سرور",
     "External Storage" : "حافظه خارجی",
     "Cron" : "زمانبند",
+    "Email server" : "سرور ایمیل",
     "Log" : "کارنامه",
     "Updates" : "به روز رسانی ها",
     "Authentication error" : "خطا در اعتبار سنجی",
@@ -22,11 +26,17 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.",
     "Unable to change password" : "نمی‌توان رمز را تغییر داد",
     "Enabled" : "فعال شده",
+    "Not enabled" : "غیر فعال",
+    "Group already exists." : "گروه در حال حاضر موجود است",
     "Saved" : "ذخیره شد",
     "test email settings" : "تنظیمات ایمیل آزمایشی",
     "Email sent" : "ایمیل ارسال شد",
+    "Invalid user" : "کاربر نامعتبر",
     "Email saved" : "ایمیل ذخیره شد",
     "Sending..." : "در حال ارسال...",
+    "Official" : "رسمی",
+    "Approved" : "تایید شده",
+    "Experimental" : "آزمایشی",
     "All" : "همه",
     "Please wait...." : "لطفا صبر کنید ...",
     "Error while disabling app" : "خطا در هنگام غیر فعال سازی برنامه",
@@ -45,6 +55,7 @@ OC.L10N.register(
     "So-so password" : "رمز عبور متوسط",
     "Good password" : "رمز عبور خوب",
     "Strong password" : "رمز عبور قوی",
+    "Valid until {date}" : "معتبر تا {date}",
     "Delete" : "حذف",
     "Groups" : "گروه ها",
     "Unable to delete {objName}" : "امکان حذف {objName} وجود ندارد",
@@ -52,6 +63,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "نام کاربری معتبر می بایست وارد شود",
     "deleted {groupName}" : "گروه {groupName} حذف شد",
     "undo" : "بازگشت",
+    "no group" : "هیچ گروهی",
     "never" : "هرگز",
     "deleted {userName}" : "کاربر {userName} حذف شد",
     "add group" : "افزودن گروه",
@@ -59,6 +71,8 @@ OC.L10N.register(
     "Error creating user" : "خطا در ایجاد کاربر",
     "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
     "__language_name__" : "__language_name__",
+    "Sync clients" : "همگام‌سازی مشتریان",
+    "Personal info" : "مشخصات شخصی",
     "SSL root certificates" : "گواهی های اصلی SSL ",
     "Everything (fatal issues, errors, warnings, info, debug)" : "همه موارد (مشکلات مهلک، خطاها، اخطارها، اطلاعات، خطایابی)",
     "Info, warnings, errors and fatal issues" : "اطلاعات، اخطارها، خطاها، مشکلات اساسی",
@@ -72,6 +86,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "ماژول 'fileinfo' PHP از کار افتاده است.ما اکیدا توصیه می کنیم که این ماژول را فعال کنید تا نتایج بهتری به وسیله ی mime-type detection دریافت کنید.",
+    "Open documentation" : "بازکردن مستند",
     "Allow apps to use the Share API" : "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
     "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
     "Enforce password protection" : "اجبار برای محافظت توسط رمز عبور",
@@ -85,6 +100,8 @@ OC.L10N.register(
     "Cron was not executed yet!" : "کران هنوز اجرا نشده است!",
     "Execute one task with each page loaded" : "اجرای یک وظیفه با هر بار بارگذاری صفحه",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php در یک سرویس webcron ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
+    "Enable server-side encryption" : "فعال‌سازی رمزگذاری سمت-سرور",
+    "Enable encryption" : "فعال کردن رمزگذاری",
     "This is used for sending out notifications." : "این برای ارسال هشدار ها استفاده می شود",
     "Send mode" : "حالت ارسال",
     "Encryption" : "رمزگذاری",
@@ -100,14 +117,23 @@ OC.L10N.register(
     "Test email settings" : "تنظیمات ایمیل آزمایشی",
     "Send email" : "ارسال ایمیل",
     "Log level" : "سطح ورود",
+    "Download logfile" : "دانلود فایل لاگ",
     "More" : "بیش‌تر",
     "Less" : "کم‌تر",
+    "Advanced monitoring" : "مانیتورینگ پیشرفته",
     "Version" : "نسخه",
+    "Developer documentation" : "مستندات توسعه‌دهندگان",
     "by" : "با",
+    "licensed" : "مجوزنامه",
     "Documentation:" : "مستند سازی:",
+    "User documentation" : "مستندات کاربر",
+    "Admin documentation" : "مستندات مدیر",
+    "Show description …" : "نمایش توضیحات ...",
+    "Hide description …" : "عدم نمایش توضیحات...",
     "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص",
     "Uninstall App" : "حذف برنامه",
     "Cheers!" : "سلامتی!",
+    "Online documentation" : "مستندات آنلاین",
     "Forum" : "انجمن",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
     "Desktop client" : "نرم افزار دسکتاپ",
@@ -120,8 +146,10 @@ OC.L10N.register(
     "Current password" : "گذرواژه کنونی",
     "New password" : "گذرواژه جدید",
     "Change password" : "تغییر گذر واژه",
+    "Full name" : "نام کامل",
     "Email" : "ایمیل",
     "Your email address" : "پست الکترونیکی شما",
+    "No email address set" : "آدرس‌ایمیلی تنظیم نشده است",
     "Profile picture" : "تصویر پروفایل",
     "Upload new" : "بارگذاری جدید",
     "Select new from Files" : "انتخاب جدید از میان فایل ها",
@@ -130,7 +158,12 @@ OC.L10N.register(
     "Choose as profile image" : "یک تصویر پروفایل انتخاب کنید",
     "Language" : "زبان",
     "Help translate" : "به ترجمه آن کمک کنید",
+    "Valid until" : "متعبر تا",
+    "Show storage location" : "نمایش محل ذخیره‌سازی",
+    "Show last log in" : "نمایش اخرین ورود",
+    "Show email address" : "نمایش پست الکترونیکی",
     "Username" : "نام کاربری",
+    "E-Mail" : "ایمیل",
     "Create" : "ایجاد کردن",
     "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
     "Enter the recovery password in order to recover the users files during password change" : "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
@@ -148,6 +181,7 @@ OC.L10N.register(
     "Last Login" : "اخرین ورود",
     "change full name" : "تغییر نام کامل",
     "set new password" : "تنظیم کلمه عبور جدید",
+    "change email address" : "تغییر آدرس ایمیل ",
     "Default" : "پیش فرض"
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index 354e56e1ffc..1b9c287348a 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -1,7 +1,11 @@
 { "translations": {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
     "Sharing" : "اشتراک گذاری",
+    "Server-side encryption" : "رمزگذاری سمت سرور",
     "External Storage" : "حافظه خارجی",
     "Cron" : "زمانبند",
+    "Email server" : "سرور ایمیل",
     "Log" : "کارنامه",
     "Updates" : "به روز رسانی ها",
     "Authentication error" : "خطا در اعتبار سنجی",
@@ -20,11 +24,17 @@
     "Wrong admin recovery password. Please check the password and try again." : "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.",
     "Unable to change password" : "نمی‌توان رمز را تغییر داد",
     "Enabled" : "فعال شده",
+    "Not enabled" : "غیر فعال",
+    "Group already exists." : "گروه در حال حاضر موجود است",
     "Saved" : "ذخیره شد",
     "test email settings" : "تنظیمات ایمیل آزمایشی",
     "Email sent" : "ایمیل ارسال شد",
+    "Invalid user" : "کاربر نامعتبر",
     "Email saved" : "ایمیل ذخیره شد",
     "Sending..." : "در حال ارسال...",
+    "Official" : "رسمی",
+    "Approved" : "تایید شده",
+    "Experimental" : "آزمایشی",
     "All" : "همه",
     "Please wait...." : "لطفا صبر کنید ...",
     "Error while disabling app" : "خطا در هنگام غیر فعال سازی برنامه",
@@ -43,6 +53,7 @@
     "So-so password" : "رمز عبور متوسط",
     "Good password" : "رمز عبور خوب",
     "Strong password" : "رمز عبور قوی",
+    "Valid until {date}" : "معتبر تا {date}",
     "Delete" : "حذف",
     "Groups" : "گروه ها",
     "Unable to delete {objName}" : "امکان حذف {objName} وجود ندارد",
@@ -50,6 +61,7 @@
     "A valid group name must be provided" : "نام کاربری معتبر می بایست وارد شود",
     "deleted {groupName}" : "گروه {groupName} حذف شد",
     "undo" : "بازگشت",
+    "no group" : "هیچ گروهی",
     "never" : "هرگز",
     "deleted {userName}" : "کاربر {userName} حذف شد",
     "add group" : "افزودن گروه",
@@ -57,6 +69,8 @@
     "Error creating user" : "خطا در ایجاد کاربر",
     "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
     "__language_name__" : "__language_name__",
+    "Sync clients" : "همگام‌سازی مشتریان",
+    "Personal info" : "مشخصات شخصی",
     "SSL root certificates" : "گواهی های اصلی SSL ",
     "Everything (fatal issues, errors, warnings, info, debug)" : "همه موارد (مشکلات مهلک، خطاها، اخطارها، اطلاعات، خطایابی)",
     "Info, warnings, errors and fatal issues" : "اطلاعات، اخطارها، خطاها، مشکلات اساسی",
@@ -70,6 +84,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "ماژول 'fileinfo' PHP از کار افتاده است.ما اکیدا توصیه می کنیم که این ماژول را فعال کنید تا نتایج بهتری به وسیله ی mime-type detection دریافت کنید.",
+    "Open documentation" : "بازکردن مستند",
     "Allow apps to use the Share API" : "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
     "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
     "Enforce password protection" : "اجبار برای محافظت توسط رمز عبور",
@@ -83,6 +98,8 @@
     "Cron was not executed yet!" : "کران هنوز اجرا نشده است!",
     "Execute one task with each page loaded" : "اجرای یک وظیفه با هر بار بارگذاری صفحه",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php در یک سرویس webcron ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
+    "Enable server-side encryption" : "فعال‌سازی رمزگذاری سمت-سرور",
+    "Enable encryption" : "فعال کردن رمزگذاری",
     "This is used for sending out notifications." : "این برای ارسال هشدار ها استفاده می شود",
     "Send mode" : "حالت ارسال",
     "Encryption" : "رمزگذاری",
@@ -98,14 +115,23 @@
     "Test email settings" : "تنظیمات ایمیل آزمایشی",
     "Send email" : "ارسال ایمیل",
     "Log level" : "سطح ورود",
+    "Download logfile" : "دانلود فایل لاگ",
     "More" : "بیش‌تر",
     "Less" : "کم‌تر",
+    "Advanced monitoring" : "مانیتورینگ پیشرفته",
     "Version" : "نسخه",
+    "Developer documentation" : "مستندات توسعه‌دهندگان",
     "by" : "با",
+    "licensed" : "مجوزنامه",
     "Documentation:" : "مستند سازی:",
+    "User documentation" : "مستندات کاربر",
+    "Admin documentation" : "مستندات مدیر",
+    "Show description …" : "نمایش توضیحات ...",
+    "Hide description …" : "عدم نمایش توضیحات...",
     "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص",
     "Uninstall App" : "حذف برنامه",
     "Cheers!" : "سلامتی!",
+    "Online documentation" : "مستندات آنلاین",
     "Forum" : "انجمن",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
     "Desktop client" : "نرم افزار دسکتاپ",
@@ -118,8 +144,10 @@
     "Current password" : "گذرواژه کنونی",
     "New password" : "گذرواژه جدید",
     "Change password" : "تغییر گذر واژه",
+    "Full name" : "نام کامل",
     "Email" : "ایمیل",
     "Your email address" : "پست الکترونیکی شما",
+    "No email address set" : "آدرس‌ایمیلی تنظیم نشده است",
     "Profile picture" : "تصویر پروفایل",
     "Upload new" : "بارگذاری جدید",
     "Select new from Files" : "انتخاب جدید از میان فایل ها",
@@ -128,7 +156,12 @@
     "Choose as profile image" : "یک تصویر پروفایل انتخاب کنید",
     "Language" : "زبان",
     "Help translate" : "به ترجمه آن کمک کنید",
+    "Valid until" : "متعبر تا",
+    "Show storage location" : "نمایش محل ذخیره‌سازی",
+    "Show last log in" : "نمایش اخرین ورود",
+    "Show email address" : "نمایش پست الکترونیکی",
     "Username" : "نام کاربری",
+    "E-Mail" : "ایمیل",
     "Create" : "ایجاد کردن",
     "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
     "Enter the recovery password in order to recover the users files during password change" : "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
@@ -146,6 +179,7 @@
     "Last Login" : "اخرین ورود",
     "change full name" : "تغییر نام کامل",
     "set new password" : "تنظیم کلمه عبور جدید",
+    "change email address" : "تغییر آدرس ایمیل ",
     "Default" : "پیش فرض"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/l10n/hy.js b/settings/l10n/hy.js
index e73644e2e08..bc0e467826b 100644
--- a/settings/l10n/hy.js
+++ b/settings/l10n/hy.js
@@ -1,7 +1,23 @@
 OC.L10N.register(
     "settings",
     {
+    "Language changed" : "Լեզուն փոխվեց",
+    "Very weak password" : "Շատ թույլ գաղտնաբառ",
+    "Weak password" : "Թույլ գաղտնաբառ",
+    "Good password" : "Լավ գաղտնաբառ",
     "Delete" : "Ջնջել",
+    "Groups" : "Խմբեր",
+    "never" : "երբեք",
+    "add group" : "խումբ ավելացնել",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Password" : "Գաղտնաբառ",
+    "New password" : "Նոր գաղտնաբառ",
+    "Email" : "Էլ. հասցե",
+    "Cancel" : "Չեղարկել",
+    "Language" : "Լեզու",
+    "Help translate" : "Օգնել թարգմանել",
+    "Group" : "Խումբ",
     "Other" : "Այլ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hy.json b/settings/l10n/hy.json
index e3706d9554d..26cfdf5c9a7 100644
--- a/settings/l10n/hy.json
+++ b/settings/l10n/hy.json
@@ -1,5 +1,21 @@
 { "translations": {
+    "Language changed" : "Լեզուն փոխվեց",
+    "Very weak password" : "Շատ թույլ գաղտնաբառ",
+    "Weak password" : "Թույլ գաղտնաբառ",
+    "Good password" : "Լավ գաղտնաբառ",
     "Delete" : "Ջնջել",
+    "Groups" : "Խմբեր",
+    "never" : "երբեք",
+    "add group" : "խումբ ավելացնել",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Password" : "Գաղտնաբառ",
+    "New password" : "Նոր գաղտնաբառ",
+    "Email" : "Էլ. հասցե",
+    "Cancel" : "Չեղարկել",
+    "Language" : "Լեզու",
+    "Help translate" : "Օգնել թարգմանել",
+    "Group" : "Խումբ",
     "Other" : "Այլ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js
index bf13c23f2af..616923182cd 100644
--- a/settings/l10n/lt_LT.js
+++ b/settings/l10n/lt_LT.js
@@ -31,6 +31,11 @@ OC.L10N.register(
     "Error while updating app" : "Įvyko klaida atnaujinant programą",
     "Updated" : "Atnaujinta",
     "Select a profile picture" : "Pažymėkite profilio paveikslėlį",
+    "Very weak password" : "Labai silpnas slaptažodis",
+    "Weak password" : "Silpnas slaptažodis",
+    "So-so password" : "Neblogas slaptažodis",
+    "Good password" : "Geras slaptažodis",
+    "Strong password" : "Stiprus slaptažodis",
     "Delete" : "Ištrinti",
     "Groups" : "Grupės",
     "undo" : "anuliuoti",
diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json
index fe387dabec5..d78b5fc8632 100644
--- a/settings/l10n/lt_LT.json
+++ b/settings/l10n/lt_LT.json
@@ -29,6 +29,11 @@
     "Error while updating app" : "Įvyko klaida atnaujinant programą",
     "Updated" : "Atnaujinta",
     "Select a profile picture" : "Pažymėkite profilio paveikslėlį",
+    "Very weak password" : "Labai silpnas slaptažodis",
+    "Weak password" : "Silpnas slaptažodis",
+    "So-so password" : "Neblogas slaptažodis",
+    "Good password" : "Geras slaptažodis",
+    "Strong password" : "Stiprus slaptažodis",
     "Delete" : "Ištrinti",
     "Groups" : "Grupės",
     "undo" : "anuliuoti",
-- 
GitLab


From 6bf6ff9564640190413d255ed28181f3d9880ea3 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Sat, 3 Oct 2015 15:47:20 +0200
Subject: [PATCH 664/783] If an inline files action provides an alt text show
 it

* Added unit tests for icon display
* Added unit tests for icon alt text display
---
 apps/files/js/fileactions.js           |  3 +-
 apps/files/tests/js/fileactionsSpec.js | 56 ++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index bde0b094b87..079c5330ec2 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -144,7 +144,8 @@
 				order: action.order || 0,
 				icon: action.icon,
 				permissions: action.permissions,
-				type: action.type || FileActions.TYPE_DROPDOWN
+				type: action.type || FileActions.TYPE_DROPDOWN,
+				altText: action.altText || ''
 			};
 			if (_.isUndefined(action.displayName)) {
 				actionSpec.displayName = t('files', name);
diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js
index 1254843e66a..6a57c56c3af 100644
--- a/apps/files/tests/js/fileactionsSpec.js
+++ b/apps/files/tests/js/fileactionsSpec.js
@@ -151,6 +151,62 @@ describe('OCA.Files.FileActions tests', function() {
 			expect($tr.find('.action.action-match').length).toEqual(1);
 			expect($tr.find('.action.action-nomatch').length).toEqual(0);
 		});
+		it('display inline icon', function() {
+			fileActions.registerAction({
+				name: 'Icon',
+				displayName: 'IconDisplay',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'all',
+				icon: OC.imagePath('core', 'actions/icon'),
+				permissions: OC.PERMISSION_READ
+			});
+			fileActions.registerAction({
+				name: 'NoIcon',
+				displayName: 'NoIconDisplay',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'all',
+				permissions: OC.PERMISSION_READ
+			});
+
+			fileActions.display($tr.find('td.filename'), true, fileList);
+
+			expect($tr.find('.action.action-icon').length).toEqual(1);
+			expect($tr.find('.action.action-icon').find('img').length).toEqual(1);
+			expect($tr.find('.action.action-icon').find('img').eq(0).attr('src')).toEqual(OC.imagePath('core', 'actions/icon'));
+
+			expect($tr.find('.action.action-noicon').length).toEqual(1);
+			expect($tr.find('.action.action-noicon').find('img').length).toEqual(0);
+		});
+		it('display alt text on inline icon', function() {
+			fileActions.registerAction({
+				name: 'IconAltText',
+				displayName: 'IconAltTextDisplay',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'all',
+				icon: OC.imagePath('core', 'actions/iconAltText'),
+				altText: 'alt icon text',
+				permissions: OC.PERMISSION_READ
+			});
+
+			fileActions.registerAction({
+				name: 'IconNoAltText',
+				displayName: 'IconNoAltTextDisplay',
+				type: OCA.Files.FileActions.TYPE_INLINE,
+				mime: 'all',
+				icon: OC.imagePath('core', 'actions/iconNoAltText'),
+				permissions: OC.PERMISSION_READ
+			});
+
+			fileActions.display($tr.find('td.filename'), true, fileList);
+
+			expect($tr.find('.action.action-iconalttext').length).toEqual(1);
+			expect($tr.find('.action.action-iconalttext').find('img').length).toEqual(1);
+			expect($tr.find('.action.action-iconalttext').find('img').eq(0).attr('alt')).toEqual('alt icon text');
+
+			expect($tr.find('.action.action-iconnoalttext').length).toEqual(1);
+			expect($tr.find('.action.action-iconnoalttext').find('img').length).toEqual(1);
+			expect($tr.find('.action.action-iconnoalttext').find('img').eq(0).attr('alt')).toEqual('');
+		});
 	});
 	describe('action handler', function() {
 		var actionStub, $tr, clock;
-- 
GitLab


From 2ffb1c2135d80ac82f62c2bd403fe452e2c4e51d Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 4 Oct 2015 01:55:02 -0400
Subject: [PATCH 665/783] [tx-robot] updated from transifex

---
 apps/files/l10n/fi_FI.js            |   3 +
 apps/files/l10n/fi_FI.json          |   3 +
 apps/files/l10n/it.js               |   3 +
 apps/files/l10n/it.json             |   3 +
 apps/files/l10n/ko.js               |   3 +
 apps/files/l10n/ko.json             |   3 +
 apps/files/l10n/nl.js               |   3 +
 apps/files/l10n/nl.json             |   3 +
 apps/files/l10n/pt_BR.js            |   3 +
 apps/files/l10n/pt_BR.json          |   3 +
 apps/files_external/l10n/es_MX.js   |   1 +
 apps/files_external/l10n/es_MX.json |   1 +
 apps/files_external/l10n/ko.js      |  10 ++
 apps/files_external/l10n/ko.json    |  10 ++
 apps/files_external/l10n/oc.js      |  15 +++
 apps/files_external/l10n/oc.json    |  15 +++
 apps/files_sharing/l10n/fi_FI.js    |   8 ++
 apps/files_sharing/l10n/fi_FI.json  |   8 ++
 apps/files_sharing/l10n/it.js       |   8 ++
 apps/files_sharing/l10n/it.json     |   8 ++
 apps/files_sharing/l10n/ko.js       |  12 +++
 apps/files_sharing/l10n/ko.json     |  12 +++
 apps/files_sharing/l10n/nl.js       |   8 ++
 apps/files_sharing/l10n/nl.json     |   8 ++
 apps/files_sharing/l10n/pt_BR.js    |   8 ++
 apps/files_sharing/l10n/pt_BR.json  |   8 ++
 apps/user_ldap/l10n/ka_GE.js        |   1 +
 apps/user_ldap/l10n/ka_GE.json      |   1 +
 core/l10n/fi_FI.js                  |   1 +
 core/l10n/fi_FI.json                |   1 +
 core/l10n/it.js                     |   1 +
 core/l10n/it.json                   |   1 +
 core/l10n/ko.js                     |   7 ++
 core/l10n/ko.json                   |   7 ++
 core/l10n/nl.js                     |   1 +
 core/l10n/nl.json                   |   1 +
 core/l10n/pt_BR.js                  |   1 +
 core/l10n/pt_BR.json                |   1 +
 lib/l10n/oc.js                      | 149 ++++++++++++++++++++++++++--
 lib/l10n/oc.json                    | 149 ++++++++++++++++++++++++++--
 settings/l10n/es_MX.js              |   2 +
 settings/l10n/es_MX.json            |   2 +
 settings/l10n/ko.js                 |   3 +
 settings/l10n/ko.json               |   3 +
 44 files changed, 482 insertions(+), 20 deletions(-)

diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js
index a44c9f4fcd9..cf4bb0f5792 100644
--- a/apps/files/l10n/fi_FI.js
+++ b/apps/files/l10n/fi_FI.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s poisti kohteen %1$s",
     "You restored %1$s" : "Palautit kohteen %1$s",
     "%2$s restored %1$s" : "%2$s palautti kohteen %1$s",
+    "Changed by %2$s" : "Muuttanut %2$s",
+    "Deleted by %2$s" : "Poistanut %2$s",
+    "Restored by %2$s" : "Palauttanut %2$s",
     "%s could not be renamed as it has been deleted" : "Kohdetta %s ei voitu nimetä uudelleen, koska se on poistettu",
     "%s could not be renamed" : "kohteen %s nimeäminen uudelleen epäonnistui",
     "Upload (max. %s)" : "Lähetys (enintään %s)",
diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json
index 7528802b94b..56417b3c74d 100644
--- a/apps/files/l10n/fi_FI.json
+++ b/apps/files/l10n/fi_FI.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s poisti kohteen %1$s",
     "You restored %1$s" : "Palautit kohteen %1$s",
     "%2$s restored %1$s" : "%2$s palautti kohteen %1$s",
+    "Changed by %2$s" : "Muuttanut %2$s",
+    "Deleted by %2$s" : "Poistanut %2$s",
+    "Restored by %2$s" : "Palauttanut %2$s",
     "%s could not be renamed as it has been deleted" : "Kohdetta %s ei voitu nimetä uudelleen, koska se on poistettu",
     "%s could not be renamed" : "kohteen %s nimeäminen uudelleen epäonnistui",
     "Upload (max. %s)" : "Lähetys (enintään %s)",
diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js
index 681940955dc..c8286c66a57 100644
--- a/apps/files/l10n/it.js
+++ b/apps/files/l10n/it.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s ha eliminato %1$s",
     "You restored %1$s" : "Hai ripristinato %1$s",
     "%2$s restored %1$s" : "%2$s ha ripristinato %1$s",
+    "Changed by %2$s" : "Modificata da %2$s",
+    "Deleted by %2$s" : "Eliminata da %2$s",
+    "Restored by %2$s" : "Ripristinata da %2$s",
     "%s could not be renamed as it has been deleted" : "%s non può essere rinominato poiché è stato eliminato",
     "%s could not be renamed" : "%s non può essere rinominato",
     "Upload (max. %s)" : "Carica (massimo %s)",
diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json
index 1075d43e984..6f6092c5c15 100644
--- a/apps/files/l10n/it.json
+++ b/apps/files/l10n/it.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s ha eliminato %1$s",
     "You restored %1$s" : "Hai ripristinato %1$s",
     "%2$s restored %1$s" : "%2$s ha ripristinato %1$s",
+    "Changed by %2$s" : "Modificata da %2$s",
+    "Deleted by %2$s" : "Eliminata da %2$s",
+    "Restored by %2$s" : "Ripristinata da %2$s",
     "%s could not be renamed as it has been deleted" : "%s non può essere rinominato poiché è stato eliminato",
     "%s could not be renamed" : "%s non può essere rinominato",
     "Upload (max. %s)" : "Carica (massimo %s)",
diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js
index 87b7d0e655c..d5090d57bde 100644
--- a/apps/files/l10n/ko.js
+++ b/apps/files/l10n/ko.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s 님이 %1$s을(를) 삭제함",
     "You restored %1$s" : "내가 %1$s을(를) 복원함",
     "%2$s restored %1$s" : "%2$s 님이 %1$s을(를) 복원함",
+    "Changed by %2$s" : "%2$s 님이 변경함",
+    "Deleted by %2$s" : "%2$s 님이 삭제함",
+    "Restored by %2$s" : "%2$s 님이 복원함",
     "%s could not be renamed as it has been deleted" : "%s이(가) 삭제되었기 때문에 이름을 변경할 수 없습니다",
     "%s could not be renamed" : "%s의 이름을 변경할 수 없습니다",
     "Upload (max. %s)" : "업로드(최대 %s)",
diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json
index 8a9dc1cf432..92ea053f64f 100644
--- a/apps/files/l10n/ko.json
+++ b/apps/files/l10n/ko.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s 님이 %1$s을(를) 삭제함",
     "You restored %1$s" : "내가 %1$s을(를) 복원함",
     "%2$s restored %1$s" : "%2$s 님이 %1$s을(를) 복원함",
+    "Changed by %2$s" : "%2$s 님이 변경함",
+    "Deleted by %2$s" : "%2$s 님이 삭제함",
+    "Restored by %2$s" : "%2$s 님이 복원함",
     "%s could not be renamed as it has been deleted" : "%s이(가) 삭제되었기 때문에 이름을 변경할 수 없습니다",
     "%s could not be renamed" : "%s의 이름을 변경할 수 없습니다",
     "Upload (max. %s)" : "업로드(최대 %s)",
diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js
index c11318c2890..53ec6c1d804 100644
--- a/apps/files/l10n/nl.js
+++ b/apps/files/l10n/nl.js
@@ -95,6 +95,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s verwijderde %1$s",
     "You restored %1$s" : "U herstelde %1$s",
     "%2$s restored %1$s" : "%2$s herstelde %1$s",
+    "Changed by %2$s" : "Gewijzigd door %2$s",
+    "Deleted by %2$s" : "Verwijderd door %2$s",
+    "Restored by %2$s" : "Hersteld door %2$s",
     "%s could not be renamed as it has been deleted" : "%s kon niet worden hernoemd, omdat het verwijderd is",
     "%s could not be renamed" : "%s kon niet worden hernoemd",
     "Upload (max. %s)" : "Upload (max. %s)",
diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json
index 1a80d1eb3f1..6a077b1cc1a 100644
--- a/apps/files/l10n/nl.json
+++ b/apps/files/l10n/nl.json
@@ -93,6 +93,9 @@
     "%2$s deleted %1$s" : "%2$s verwijderde %1$s",
     "You restored %1$s" : "U herstelde %1$s",
     "%2$s restored %1$s" : "%2$s herstelde %1$s",
+    "Changed by %2$s" : "Gewijzigd door %2$s",
+    "Deleted by %2$s" : "Verwijderd door %2$s",
+    "Restored by %2$s" : "Hersteld door %2$s",
     "%s could not be renamed as it has been deleted" : "%s kon niet worden hernoemd, omdat het verwijderd is",
     "%s could not be renamed" : "%s kon niet worden hernoemd",
     "Upload (max. %s)" : "Upload (max. %s)",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index 61c0f3e2e59..70d38e747ba 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s eliminou %1$s",
     "You restored %1$s" : "Você restaurou %1$s",
     "%2$s restored %1$s" : "%2$s restaurou %1$s",
+    "Changed by %2$s" : "Modificado por %2$s",
+    "Deleted by %2$s" : "Deletado por %2$s",
+    "Restored by %2$s" : "Restaurado por %2$s",
     "%s could not be renamed as it has been deleted" : "%s não pode ser renomeado pois foi apagado",
     "%s could not be renamed" : "%s não pode ser renomeado",
     "Upload (max. %s)" : "Envio (max. %s)",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index 395976dbfdf..d0023e7d5be 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s eliminou %1$s",
     "You restored %1$s" : "Você restaurou %1$s",
     "%2$s restored %1$s" : "%2$s restaurou %1$s",
+    "Changed by %2$s" : "Modificado por %2$s",
+    "Deleted by %2$s" : "Deletado por %2$s",
+    "Restored by %2$s" : "Restaurado por %2$s",
     "%s could not be renamed as it has been deleted" : "%s não pode ser renomeado pois foi apagado",
     "%s could not be renamed" : "%s não pode ser renomeado",
     "Upload (max. %s)" : "Envio (max. %s)",
diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js
index a8d1dea1a09..7e2770e6f52 100644
--- a/apps/files_external/l10n/es_MX.js
+++ b/apps/files_external/l10n/es_MX.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Personal" : "Personal",
     "Grant access" : "Conceder acceso",
     "Access granted" : "Acceso concedido",
+    "None" : "Ninguno",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "API key" : "clave API",
diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json
index 3fdea60b775..9a9835d9598 100644
--- a/apps/files_external/l10n/es_MX.json
+++ b/apps/files_external/l10n/es_MX.json
@@ -3,6 +3,7 @@
     "Personal" : "Personal",
     "Grant access" : "Conceder acceso",
     "Access granted" : "Acceso concedido",
+    "None" : "Ninguno",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "API key" : "clave API",
diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js
index f27e885772e..3faf53bf1e5 100644
--- a/apps/files_external/l10n/ko.js
+++ b/apps/files_external/l10n/ko.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Invalid mount point" : "잘못된 마운트 지점",
     "Objectstore forbidden" : "Objectstore에 접근 금지됨",
     "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"",
+    "Not permitted to use backend \"%s\"" : "백엔드 \"%s\" 사용이 허가되지 않았음",
+    "Not permitted to use authentication mechanism \"%s\"" : "인증 방식 \"%s\" 사용이 허가되지 않았음",
     "Unsatisfied backend parameters" : "백엔드 인자가 부족함",
     "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함",
     "Personal" : "개인",
@@ -41,11 +43,16 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "클라이언트 ID",
     "Client secret" : "클라이언트 비밀 값",
+    "OpenStack" : "OpenStack",
     "Username" : "사용자 이름",
     "Password" : "암호",
+    "Tenant name" : "테넌트 이름",
+    "Identity endpoint URL" : "아이덴티티 끝점(Endpoint) URL",
+    "Rackspace" : "Rackspace",
     "API key" : "API 키",
     "Username and password" : "사용자 이름과 암호",
     "Session credentials" : "세션 접근 정보",
+    "RSA public key" : "RSA 공개 키",
     "Public key" : "공개 키",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "버킷",
@@ -71,9 +78,12 @@ OC.L10N.register(
     "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
     "SMB / CIFS" : "SMB/CIFS",
     "Share" : "공유",
+    "Domain" : "도메인",
     "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS",
     "Username as share" : "사용자 이름으로 공유",
     "OpenStack Object Storage" : "OpenStack 객체 저장소",
+    "Service name" : "서비스 이름",
+    "Request timeout (seconds)" : "요청 시간 제한(초)",
     "<b>Note:</b> " : "<b>메모:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json
index ab804d58702..039190cf4f9 100644
--- a/apps/files_external/l10n/ko.json
+++ b/apps/files_external/l10n/ko.json
@@ -10,6 +10,8 @@
     "Invalid mount point" : "잘못된 마운트 지점",
     "Objectstore forbidden" : "Objectstore에 접근 금지됨",
     "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"",
+    "Not permitted to use backend \"%s\"" : "백엔드 \"%s\" 사용이 허가되지 않았음",
+    "Not permitted to use authentication mechanism \"%s\"" : "인증 방식 \"%s\" 사용이 허가되지 않았음",
     "Unsatisfied backend parameters" : "백엔드 인자가 부족함",
     "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함",
     "Personal" : "개인",
@@ -39,11 +41,16 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "클라이언트 ID",
     "Client secret" : "클라이언트 비밀 값",
+    "OpenStack" : "OpenStack",
     "Username" : "사용자 이름",
     "Password" : "암호",
+    "Tenant name" : "테넌트 이름",
+    "Identity endpoint URL" : "아이덴티티 끝점(Endpoint) URL",
+    "Rackspace" : "Rackspace",
     "API key" : "API 키",
     "Username and password" : "사용자 이름과 암호",
     "Session credentials" : "세션 접근 정보",
+    "RSA public key" : "RSA 공개 키",
     "Public key" : "공개 키",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "버킷",
@@ -69,9 +76,12 @@
     "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
     "SMB / CIFS" : "SMB/CIFS",
     "Share" : "공유",
+    "Domain" : "도메인",
     "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS",
     "Username as share" : "사용자 이름으로 공유",
     "OpenStack Object Storage" : "OpenStack 객체 저장소",
+    "Service name" : "서비스 이름",
+    "Request timeout (seconds)" : "요청 시간 제한(초)",
     "<b>Note:</b> " : "<b>메모:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
diff --git a/apps/files_external/l10n/oc.js b/apps/files_external/l10n/oc.js
index 929d14347fc..b7bc419fdd7 100644
--- a/apps/files_external/l10n/oc.js
+++ b/apps/files_external/l10n/oc.js
@@ -14,16 +14,23 @@ OC.L10N.register(
     "Generate keys" : "Generar de claus",
     "Error generating key pair" : "Error al moment de la generacion de las claus",
     "Enable encryption" : "Activar lo chiframent",
+    "Enable previews" : "Activar las previsualizacions",
+    "Never" : "Pas jamai",
     "(group)" : "(grop)",
     "Saved" : "Salvat",
+    "Access key" : "Clau d'accès",
+    "Secret key" : "Clau secreta",
     "None" : "Pas cap",
+    "OAuth1" : "OAuth1",
     "App key" : "App key",
     "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
     "Username" : "Nom d'utilizaire",
     "Password" : "Senhal",
     "API key" : "Clau API",
+    "RSA public key" : "Clau publica RSA",
     "Public key" : "Clau publica",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -36,16 +43,23 @@ OC.L10N.register(
     "URL" : "URL",
     "Remote subfolder" : "Sosdorsièr distant",
     "Secure https://" : "Securizacion https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "Òste",
     "Secure ftps://" : "Securizacion ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Local",
     "Location" : "Emplaçament",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "SFTP with secret key login" : "SFTP amb un identificant secret",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Partejar",
+    "Domain" : "Domeni",
     "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC",
     "Username as share" : "Nom d'utilizaire coma nom de partiment",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nom del servici",
     "<b>Note:</b> " : "<b>Atencion :</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion :</b> La presa en carga de cURL per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> La presa en carga del FTP per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
@@ -57,6 +71,7 @@ OC.L10N.register(
     "Scope" : "Portada",
     "External Storage" : "Emmagazinatge externe",
     "Folder name" : "Nom del dorsièr",
+    "Authentication" : "Autentificacion",
     "Configuration" : "Configuracion",
     "Available for" : "Disponible per",
     "Advanced settings" : "Paramètres avançats",
diff --git a/apps/files_external/l10n/oc.json b/apps/files_external/l10n/oc.json
index 84fef9ec53f..05670245634 100644
--- a/apps/files_external/l10n/oc.json
+++ b/apps/files_external/l10n/oc.json
@@ -12,16 +12,23 @@
     "Generate keys" : "Generar de claus",
     "Error generating key pair" : "Error al moment de la generacion de las claus",
     "Enable encryption" : "Activar lo chiframent",
+    "Enable previews" : "Activar las previsualizacions",
+    "Never" : "Pas jamai",
     "(group)" : "(grop)",
     "Saved" : "Salvat",
+    "Access key" : "Clau d'accès",
+    "Secret key" : "Clau secreta",
     "None" : "Pas cap",
+    "OAuth1" : "OAuth1",
     "App key" : "App key",
     "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
     "Username" : "Nom d'utilizaire",
     "Password" : "Senhal",
     "API key" : "Clau API",
+    "RSA public key" : "Clau publica RSA",
     "Public key" : "Clau publica",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -34,16 +41,23 @@
     "URL" : "URL",
     "Remote subfolder" : "Sosdorsièr distant",
     "Secure https://" : "Securizacion https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "Òste",
     "Secure ftps://" : "Securizacion ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Local",
     "Location" : "Emplaçament",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "SFTP with secret key login" : "SFTP amb un identificant secret",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Partejar",
+    "Domain" : "Domeni",
     "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC",
     "Username as share" : "Nom d'utilizaire coma nom de partiment",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nom del servici",
     "<b>Note:</b> " : "<b>Atencion :</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion :</b> La presa en carga de cURL per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> La presa en carga del FTP per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
@@ -55,6 +69,7 @@
     "Scope" : "Portada",
     "External Storage" : "Emmagazinatge externe",
     "Folder name" : "Nom del dorsièr",
+    "Authentication" : "Autentificacion",
     "Configuration" : "Configuracion",
     "Available for" : "Disponible per",
     "Advanced settings" : "Paramètres avançats",
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index 2e4a32480b1..a87d6156d40 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -43,6 +43,14 @@ OC.L10N.register(
     "%2$s shared %1$s via link" : "%2$s jakoi kohteen %1$s linkin kautta",
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
+    "Downloaded via public link" : "Lataa julkista linkkiä käyttäen",
+    "Shared with %2$s" : "Jaettu käyttäjän %2$s kanssa",
+    "Shared with group %2$s" : "Jaettu ryhmän %2$s kanssa",
+    "Shared with %3$s by %2$s" : "Jaettu käyttäjän %3$s kanssa käyttäjän %2$s toimesta",
+    "Shared with group %3$s by %2$s" : "Jaettu ryhmän %3$s kanssa käyttäjän %2$s toimesta",
+    "Shared via link by %2$s" : "Jaettu linkin kautta käyttäjän %2$s toimesta",
+    "Shared by %2$s" : "Jakanut %2$s",
+    "Shared via public link" : "Jaettu julkisen linkin kautta",
     "Shares" : "Jaot",
     "You received %2$s as a remote share from %1$s" : "Sait kohteen %2$s etäjakona käyttäjältä %1$s",
     "Accept" : "Hyväksy",
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index 2b938d95c0e..172b8476092 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -41,6 +41,14 @@
     "%2$s shared %1$s via link" : "%2$s jakoi kohteen %1$s linkin kautta",
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
+    "Downloaded via public link" : "Lataa julkista linkkiä käyttäen",
+    "Shared with %2$s" : "Jaettu käyttäjän %2$s kanssa",
+    "Shared with group %2$s" : "Jaettu ryhmän %2$s kanssa",
+    "Shared with %3$s by %2$s" : "Jaettu käyttäjän %3$s kanssa käyttäjän %2$s toimesta",
+    "Shared with group %3$s by %2$s" : "Jaettu ryhmän %3$s kanssa käyttäjän %2$s toimesta",
+    "Shared via link by %2$s" : "Jaettu linkin kautta käyttäjän %2$s toimesta",
+    "Shared by %2$s" : "Jakanut %2$s",
+    "Shared via public link" : "Jaettu julkisen linkin kautta",
     "Shares" : "Jaot",
     "You received %2$s as a remote share from %1$s" : "Sait kohteen %2$s etäjakona käyttäjältä %1$s",
     "Accept" : "Hyväksy",
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index d6fcab9c788..8cd66b34d24 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -43,6 +43,14 @@ OC.L10N.register(
     "%2$s shared %1$s via link" : "%2$s ha condiviso %1$s tramite collegamento",
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
+    "Downloaded via public link" : "Scaricata tramite collegamento pubblico",
+    "Shared with %2$s" : "Condivisa con %2$s",
+    "Shared with group %2$s" : "Condivisa con il gruppo %2$s",
+    "Shared with %3$s by %2$s" : "Condivisa con %3$s da %2$s",
+    "Shared with group %3$s by %2$s" : "Condivisa con il gruppo %3$s da %2$s",
+    "Shared via link by %2$s" : "Condivisa tramite collegamento da %2$s",
+    "Shared by %2$s" : "Condivisa da %2$s",
+    "Shared via public link" : "Condivisa tramite collegamento pubblico",
     "Shares" : "Condivisioni",
     "You received %2$s as a remote share from %1$s" : "Hai ricevuto %2$s come condivisione remota da %1$s",
     "Accept" : "Accetta",
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index 1ae87296032..b93dafd7555 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -41,6 +41,14 @@
     "%2$s shared %1$s via link" : "%2$s ha condiviso %1$s tramite collegamento",
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
+    "Downloaded via public link" : "Scaricata tramite collegamento pubblico",
+    "Shared with %2$s" : "Condivisa con %2$s",
+    "Shared with group %2$s" : "Condivisa con il gruppo %2$s",
+    "Shared with %3$s by %2$s" : "Condivisa con %3$s da %2$s",
+    "Shared with group %3$s by %2$s" : "Condivisa con il gruppo %3$s da %2$s",
+    "Shared via link by %2$s" : "Condivisa tramite collegamento da %2$s",
+    "Shared by %2$s" : "Condivisa da %2$s",
+    "Shared via public link" : "Condivisa tramite collegamento pubblico",
     "Shares" : "Condivisioni",
     "You received %2$s as a remote share from %1$s" : "Hai ricevuto %2$s come condivisione remota da %1$s",
     "Accept" : "Accetta",
diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js
index e4b86b528f3..19eea24e97c 100644
--- a/apps/files_sharing/l10n/ko.js
+++ b/apps/files_sharing/l10n/ko.js
@@ -38,9 +38,21 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "공개 공유 파일 %1$s이(가) 다운로드됨",
     "You shared %1$s with %2$s" : "내가 %2$s 님과 %1$s을(를) 공유함",
     "You shared %1$s with group %2$s" : "내가 %2$s 그룹과 %1$s을(를) 공유함",
+    "%2$s shared %1$s with %3$s" : "%2$s 님이 %1$s을(를) %3$s 님과 공유함",
+    "%2$s shared %1$s with group %3$s" : "%2$s 님이 %1$s을(를) %3$s 그룹과 공유함",
+    "%2$s shared %1$s via link" : "%2$s 님이 %1$s을(를) 링크로 공유함",
     "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
     "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
+    "Downloaded via public link" : "공개 링크로 다운로드",
+    "Shared with %2$s" : "%2$s 님과 공유함",
+    "Shared with group %2$s" : "%2$s 그룹과 공유함",
+    "Shared with %3$s by %2$s" : "%2$s 님이 %3$s 님과 공유함",
+    "Shared with group %3$s by %2$s" : "%2$s 님이 %3$s 그룹과 공유함",
+    "Shared via link by %2$s" : "%2$s 님이 링크로 공유함",
+    "Shared by %2$s" : "%2$s 님이 공유함",
+    "Shared via public link" : "공개 링크로 공유함",
     "Shares" : "공유",
+    "You received %2$s as a remote share from %1$s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다",
     "Accept" : "수락",
     "Decline" : "거절",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s",
diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json
index 383e5038f3c..dd7e398c15c 100644
--- a/apps/files_sharing/l10n/ko.json
+++ b/apps/files_sharing/l10n/ko.json
@@ -36,9 +36,21 @@
     "Public shared file %1$s was downloaded" : "공개 공유 파일 %1$s이(가) 다운로드됨",
     "You shared %1$s with %2$s" : "내가 %2$s 님과 %1$s을(를) 공유함",
     "You shared %1$s with group %2$s" : "내가 %2$s 그룹과 %1$s을(를) 공유함",
+    "%2$s shared %1$s with %3$s" : "%2$s 님이 %1$s을(를) %3$s 님과 공유함",
+    "%2$s shared %1$s with group %3$s" : "%2$s 님이 %1$s을(를) %3$s 그룹과 공유함",
+    "%2$s shared %1$s via link" : "%2$s 님이 %1$s을(를) 링크로 공유함",
     "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
     "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
+    "Downloaded via public link" : "공개 링크로 다운로드",
+    "Shared with %2$s" : "%2$s 님과 공유함",
+    "Shared with group %2$s" : "%2$s 그룹과 공유함",
+    "Shared with %3$s by %2$s" : "%2$s 님이 %3$s 님과 공유함",
+    "Shared with group %3$s by %2$s" : "%2$s 님이 %3$s 그룹과 공유함",
+    "Shared via link by %2$s" : "%2$s 님이 링크로 공유함",
+    "Shared by %2$s" : "%2$s 님이 공유함",
+    "Shared via public link" : "공개 링크로 공유함",
     "Shares" : "공유",
+    "You received %2$s as a remote share from %1$s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다",
     "Accept" : "수락",
     "Decline" : "거절",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s",
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index f1edae5f8eb..7b31b7c73e2 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -43,6 +43,14 @@ OC.L10N.register(
     "%2$s shared %1$s via link" : "%2$s deelde %1$s via link",
     "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "You shared %1$s via link" : "U deelde %1$s via link",
+    "Downloaded via public link" : "Gedownload via een openbare link",
+    "Shared with %2$s" : "Gedeeld met %2$s",
+    "Shared with group %2$s" : "Gedeeld met groep %2$s",
+    "Shared with %3$s by %2$s" : "Gedeeld met %3$s door %2$s",
+    "Shared with group %3$s by %2$s" : "Gedeeld met groep %3$s door %2$s",
+    "Shared via link by %2$s" : "Gedeeld via link door %2$s",
+    "Shared by %2$s" : "Gedeeld door %2$s",
+    "Shared via public link" : "Gedeeld via een openbare link",
     "Shares" : "Gedeeld",
     "You received %2$s as a remote share from %1$s" : "U ontving %2$s als een externe share van %1$s",
     "Accept" : "Accepteren",
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index a285071ca30..92ba1c04268 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -41,6 +41,14 @@
     "%2$s shared %1$s via link" : "%2$s deelde %1$s via link",
     "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "You shared %1$s via link" : "U deelde %1$s via link",
+    "Downloaded via public link" : "Gedownload via een openbare link",
+    "Shared with %2$s" : "Gedeeld met %2$s",
+    "Shared with group %2$s" : "Gedeeld met groep %2$s",
+    "Shared with %3$s by %2$s" : "Gedeeld met %3$s door %2$s",
+    "Shared with group %3$s by %2$s" : "Gedeeld met groep %3$s door %2$s",
+    "Shared via link by %2$s" : "Gedeeld via link door %2$s",
+    "Shared by %2$s" : "Gedeeld door %2$s",
+    "Shared via public link" : "Gedeeld via een openbare link",
     "Shares" : "Gedeeld",
     "You received %2$s as a remote share from %1$s" : "U ontving %2$s als een externe share van %1$s",
     "Accept" : "Accepteren",
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index cb167dfb5a4..d2dac6d5955 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -43,6 +43,14 @@ OC.L10N.register(
     "%2$s shared %1$s via link" : "%2$s compartilhado via link %1$s",
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
+    "Downloaded via public link" : "Baixar via link público",
+    "Shared with %2$s" : "Compartilhado com %2$s",
+    "Shared with group %2$s" : "Compartilhado com o grupo %2$s",
+    "Shared with %3$s by %2$s" : "Compartilhado com %3$s por %2$s",
+    "Shared with group %3$s by %2$s" : "Compartilhado com o grupo %3$s por %2$s",
+    "Shared via link by %2$s" : "Compartilhado via link por %2$s",
+    "Shared by %2$s" : "Compartilhado por %2$s",
+    "Shared via public link" : "Compartilhado via link público",
     "Shares" : "Compartilhamentos",
     "You received %2$s as a remote share from %1$s" : "Você recebeu %2$s como um compartilhamento remoto de %1$s",
     "Accept" : "Aceitar",
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index b42a56f03ce..e64c07ff8e0 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -41,6 +41,14 @@
     "%2$s shared %1$s via link" : "%2$s compartilhado via link %1$s",
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
+    "Downloaded via public link" : "Baixar via link público",
+    "Shared with %2$s" : "Compartilhado com %2$s",
+    "Shared with group %2$s" : "Compartilhado com o grupo %2$s",
+    "Shared with %3$s by %2$s" : "Compartilhado com %3$s por %2$s",
+    "Shared with group %3$s by %2$s" : "Compartilhado com o grupo %3$s por %2$s",
+    "Shared via link by %2$s" : "Compartilhado via link por %2$s",
+    "Shared by %2$s" : "Compartilhado por %2$s",
+    "Shared via public link" : "Compartilhado via link público",
     "Shares" : "Compartilhamentos",
     "You received %2$s as a remote share from %1$s" : "Você recebeu %2$s como um compartilhamento remoto de %1$s",
     "Accept" : "Aceitar",
diff --git a/apps/user_ldap/l10n/ka_GE.js b/apps/user_ldap/l10n/ka_GE.js
index c2fc858d153..0fdf25fea6f 100644
--- a/apps/user_ldap/l10n/ka_GE.js
+++ b/apps/user_ldap/l10n/ka_GE.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Failed to clear the mappings." : "ბმების წაშლის დროს მოხდა შეცდომა",
     "Failed to delete the server configuration" : "შეცდომა სერვერის კონფიგურაციის წაშლისას",
     "The configuration is valid and the connection could be established!" : "კონფიგურაცია მართებულია და კავშირი დამყარდება!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
diff --git a/apps/user_ldap/l10n/ka_GE.json b/apps/user_ldap/l10n/ka_GE.json
index be93dc5a626..7ddaaef5bda 100644
--- a/apps/user_ldap/l10n/ka_GE.json
+++ b/apps/user_ldap/l10n/ka_GE.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Failed to clear the mappings." : "ბმების წაშლის დროს მოხდა შეცდომა",
     "Failed to delete the server configuration" : "შეცდომა სერვერის კონფიგურაციის წაშლისას",
     "The configuration is valid and the connection could be established!" : "კონფიგურაცია მართებულია და კავშირი დამყარდება!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 9f9cba2bf7a..4bc91566ac2 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
     "Preparing update" : "Valmistellaan päivitystä",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migraatiotestit ohitetaan - \"update.skip-migration-test\" on aktiivisena config.php-tiedostossa",
     "Turned on maintenance mode" : "Siirrytty huoltotilaan",
     "Turned off maintenance mode" : "Huoltotila asetettu pois päältä",
     "Maintenance mode is kept active" : "Huoltotila pidetään aktiivisena",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 0617a3db574..36e4bdfe2df 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
     "Preparing update" : "Valmistellaan päivitystä",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migraatiotestit ohitetaan - \"update.skip-migration-test\" on aktiivisena config.php-tiedostossa",
     "Turned on maintenance mode" : "Siirrytty huoltotilaan",
     "Turned off maintenance mode" : "Huoltotila asetettu pois päältä",
     "Maintenance mode is kept active" : "Huoltotila pidetään aktiivisena",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index e343188ff2f..1409fe93c8c 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s",
     "Preparing update" : "Preparazione aggiornamento",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "I test di migrazione sono saltati - \"update.skip-migration-test\" è attivato in config.php",
     "Turned on maintenance mode" : "Modalità di manutenzione attivata",
     "Turned off maintenance mode" : "Modalità di manutenzione disattivata",
     "Maintenance mode is kept active" : "La modalità di manutenzione è lasciata attiva",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 4dd4c7cad28..94d434cffd3 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s",
     "Preparing update" : "Preparazione aggiornamento",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "I test di migrazione sono saltati - \"update.skip-migration-test\" è attivato in config.php",
     "Turned on maintenance mode" : "Modalità di manutenzione attivata",
     "Turned off maintenance mode" : "Modalità di manutenzione disattivata",
     "Maintenance mode is kept active" : "La modalità di manutenzione è lasciata attiva",
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index 3a63df5e745..dd6cb9c664d 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "%s 님에게 메일을 보낼 수 없습니다.",
     "Preparing update" : "업데이트 준비 중",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "이전 작업 테스트를 건너뛰었습니다. config.php 파일에 \"update.skip-migration-test\"가 활성화되어 있습니다",
     "Turned on maintenance mode" : "유지 보수 모드 켜짐",
     "Turned off maintenance mode" : "유지 보수 모드 꺼짐",
     "Maintenance mode is kept active" : "유지 보수 모드가 켜져 있음",
@@ -12,6 +13,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "\"%s\"을(를) %s(으)로 업데이트함",
     "Repair warning: " : "수리 경고:",
     "Repair error: " : "수리 오류:",
+    "Set log level to debug - current level: \"%s\"" : "로그 단계를 디버그로 설정함 - 현재 단계: \"%s\"",
+    "Reset log level to  \"%s\"" : "로그 단계를 \"%s\"(으)로 초기화",
     "Following incompatible apps have been disabled: %s" : "다음 호환되지 않는 앱이 비활성화되었습니다: %s",
     "Following apps have been disabled: %s" : "다음 앱이 비활성화되었습니다: %s",
     "Already up to date" : "최신 상태임",
@@ -146,12 +149,14 @@ OC.L10N.register(
     "change" : "변경",
     "delete" : "삭제",
     "access control" : "접근 제어",
+    "Share details could not be loaded for this item." : "이 항목의 공유 정보를 불러올 수 없습니다.",
     "An error occured. Please try again" : "오류가 발생하였습니다. 다시 시도하십시오.",
     "Share" : "공유",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/owncloud 형식으로 다른 ownCloud 사용자와 공유할 수 있습니다",
     "Share with users or groups …" : "사용자 및 그룹과 공유...",
     "Share with users, groups or remote users …" : "사용자, 그룹 및 원격 사용자와 공유...",
     "Warning" : "경고",
+    "Error while sending notification" : "알림을 보내는 중 오류 발생",
     "The object type is not specified." : "객체 유형이 지정되지 않았습니다.",
     "Enter new" : "새로운 값 입력",
     "Delete" : "삭제",
@@ -181,6 +186,8 @@ OC.L10N.register(
     "New Password" : "새 암호",
     "Reset password" : "암호 재설정",
     "Searching other places" : "다른 장소 찾는 중",
+    "No search results in other folders" : "다른 폴더에 검색 결과 없음",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["다른 폴더의 검색 결과 {count}개"],
     "Personal" : "개인",
     "Users" : "사용자",
     "Apps" : "앱",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index 03919d7c253..dc44413880c 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "%s 님에게 메일을 보낼 수 없습니다.",
     "Preparing update" : "업데이트 준비 중",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "이전 작업 테스트를 건너뛰었습니다. config.php 파일에 \"update.skip-migration-test\"가 활성화되어 있습니다",
     "Turned on maintenance mode" : "유지 보수 모드 켜짐",
     "Turned off maintenance mode" : "유지 보수 모드 꺼짐",
     "Maintenance mode is kept active" : "유지 보수 모드가 켜져 있음",
@@ -10,6 +11,8 @@
     "Updated \"%s\" to %s" : "\"%s\"을(를) %s(으)로 업데이트함",
     "Repair warning: " : "수리 경고:",
     "Repair error: " : "수리 오류:",
+    "Set log level to debug - current level: \"%s\"" : "로그 단계를 디버그로 설정함 - 현재 단계: \"%s\"",
+    "Reset log level to  \"%s\"" : "로그 단계를 \"%s\"(으)로 초기화",
     "Following incompatible apps have been disabled: %s" : "다음 호환되지 않는 앱이 비활성화되었습니다: %s",
     "Following apps have been disabled: %s" : "다음 앱이 비활성화되었습니다: %s",
     "Already up to date" : "최신 상태임",
@@ -144,12 +147,14 @@
     "change" : "변경",
     "delete" : "삭제",
     "access control" : "접근 제어",
+    "Share details could not be loaded for this item." : "이 항목의 공유 정보를 불러올 수 없습니다.",
     "An error occured. Please try again" : "오류가 발생하였습니다. 다시 시도하십시오.",
     "Share" : "공유",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/owncloud 형식으로 다른 ownCloud 사용자와 공유할 수 있습니다",
     "Share with users or groups …" : "사용자 및 그룹과 공유...",
     "Share with users, groups or remote users …" : "사용자, 그룹 및 원격 사용자와 공유...",
     "Warning" : "경고",
+    "Error while sending notification" : "알림을 보내는 중 오류 발생",
     "The object type is not specified." : "객체 유형이 지정되지 않았습니다.",
     "Enter new" : "새로운 값 입력",
     "Delete" : "삭제",
@@ -179,6 +184,8 @@
     "New Password" : "새 암호",
     "Reset password" : "암호 재설정",
     "Searching other places" : "다른 장소 찾는 중",
+    "No search results in other folders" : "다른 폴더에 검색 결과 없음",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["다른 폴더의 검색 결과 {count}개"],
     "Personal" : "개인",
     "Users" : "사용자",
     "Apps" : "앱",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 9e42bf3c26e..96d66de25ad 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s",
     "Preparing update" : "Update voorbereiden",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migratietests worden overgeslagen - \"update.skip-migration-test\" is geactiveerd in config.php",
     "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
     "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
     "Maintenance mode is kept active" : "Onderhoudsmodus blijft actief",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index a2314251c84..5270567dbc1 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s",
     "Preparing update" : "Update voorbereiden",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migratietests worden overgeslagen - \"update.skip-migration-test\" is geactiveerd in config.php",
     "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
     "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
     "Maintenance mode is kept active" : "Onderhoudsmodus blijft actief",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 430a245b1fc..895fab159f3 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s",
     "Preparing update" : "Preparando atualização",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Os ensaios de migração forão ignoradas - \"update.skip-migration-test\" está ativado no config.php",
     "Turned on maintenance mode" : "Ativar modo de manutenção",
     "Turned off maintenance mode" : "Desligar o modo de manutenção",
     "Maintenance mode is kept active" : "O modo de manutenção está sendo mantido como ativo",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 13caa948bfe..817c9e1fa98 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s",
     "Preparing update" : "Preparando atualização",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Os ensaios de migração forão ignoradas - \"update.skip-migration-test\" está ativado no config.php",
     "Turned on maintenance mode" : "Ativar modo de manutenção",
     "Turned off maintenance mode" : "Desligar o modo de manutenção",
     "Maintenance mode is kept active" : "O modo de manutenção está sendo mantido como ativo",
diff --git a/lib/l10n/oc.js b/lib/l10n/oc.js
index 2e6bfe56fe6..11ccaef675d 100644
--- a/lib/l10n/oc.js
+++ b/lib/l10n/oc.js
@@ -1,23 +1,152 @@
 OC.L10N.register(
     "lib",
     {
+    "Cannot write into \"config\" directory!" : "Impossible d’escriure dins lo repertòri « config » !",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Aqueste problèma es generalament resolgut en donant al servidor web un accès en escritura al repertòri \"config\"",
+    "See %s" : "Veire %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Aqueste problèma es generalament resolgut %sen donant al servidor web un accès en escritura al repertòri de configuracion%s.",
+    "Sample configuration detected" : "Configuracion d'exemple detectada",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es estat detectat que la configuracion donada a títol d'exemple es estada copiada. Aquò pòt rendre vòstra installacion inoperanta e es pas pres en carga. Legissètz la documentacion abans d'efectuar de modifications dins config.php",
+    "PHP %s or higher is required." : "PHP %s o superior es requesit.",
+    "PHP with a version lower than %s is required." : "PHP amb una version anteriora a %s es requesit.",
+    "Following databases are supported: %s" : "Les bases de donadas seguentas son suportadas : %s",
+    "The command line tool %s could not be found" : "La comanda %s es introbabla",
+    "The library %s is not available." : "La bibliotèca %s es pas disponibla.",
+    "Library %s with a version higher than %s is required - available version %s." : "La bibliotèca %s deu èsser al mens a la version %s. Version disponibla : %s.",
+    "Library %s with a version lower than %s is required - available version %s." : "La bibliotèca %s deu aver una version anteriora a %s. Version disponibla : %s.",
+    "Following platforms are supported: %s" : "Las plataformas seguentas son presas en carga : %s",
+    "ownCloud %s or higher is required." : "ownCloud %s o superior es requesit.",
+    "ownCloud %s or lower is required." : "ownCloud %s o inferior es requesit.",
     "Help" : "Ajuda",
     "Personal" : "Personal",
-    "Users" : "Usancièrs",
-    "Admin" : "Admin",
+    "Users" : "Utilizaires",
+    "Admin" : "Administracion",
+    "Recommended" : "Recomandada",
+    "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "L'aplicacion \"%s\" pòt pas èsser installada perque es pas compatibla amb aquesta version d'ownCloud.",
+    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "L'aplicacion \"%s\" pòt pas èsser installada a causa de las dependéncias seguentas pas satisfachas : %s",
+    "No app name specified" : "Cap de nom d'aplicacion pas especificat",
     "Unknown filetype" : "Tipe de fichièr desconegut",
     "Invalid image" : "Imatge pas valable",
     "today" : "uèi",
     "yesterday" : "ièr",
-    "last month" : "mes passat",
-    "last year" : "an passat",
-    "seconds ago" : "segonda a",
-    "web services under your control" : "Services web jos ton contraròtle",
-    "File name contains at least one invalid character" : "Lo nom de fichièr conten al mens un caractèr invalid",
+    "_%n day ago_::_%n days ago_" : ["i a %n jorn","i a %n jorns"],
+    "last month" : "lo mes passat",
+    "_%n month ago_::_%n months ago_" : ["I a %n mes","I a %n meses"],
+    "last year" : "l'an passat",
+    "_%n year ago_::_%n years ago_" : ["i a %n an","i a %n ans"],
+    "_%n minute ago_::_%n minutes ago_" : ["i a %n minuta","i a %n minutas"],
+    "seconds ago" : "i a qualques segondas",
+    "web services under your control" : "servicis web jos vòstre contraròtle",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Lo modul amb l'id: %s existís pas. Mercé de l'activar dins los paramètres d'aplicacions o de contactar vòstre administrator.",
+    "Empty filename is not allowed" : "Lo nom de fichièr pòt pas èsser void",
+    "Dot files are not allowed" : "Lo nom de fichièr pòt pas començar per un punt",
+    "4-byte characters are not supported in file names" : "Los caractèrs sus 4 octets son pas preses en carga dins los noms de fichièrs",
+    "File name is a reserved word" : "Aqueste nom de fichièr es un mot reservat",
+    "File name contains at least one invalid character" : "Lo nom de fichièr conten un (de) caractèr(s) invalid(s)",
+    "File name is too long" : "Nom de fichièr tròp long",
+    "File is currently busy, please try again later" : "Lo fichièr es actualament utilizat, tornatz ensajar pus tard",
+    "Can't read file" : "Impossible de legir lo fichièr",
+    "App directory already exists" : "Lo dorsièr de l'aplicacion existís ja",
+    "Can't create app folder. Please fix permissions. %s" : "Impossible de crear lo dorsièr de l'aplicacion. Corregissètz los dreches d'accès. %s",
+    "Archive does not contain a directory named %s" : "Lo fichièr archiu conten pas de repertòri %s",
+    "No source specified when installing app" : "Cap de font pas especificada per installar l'aplicacion",
+    "No href specified when installing app from http" : "Cap de href pas especificat per installar l'aplicacion per http",
+    "No path specified when installing app from local file" : "Cap de camin pas especificat per installar l'aplicacion dempuèi un fichièr local",
+    "Archives of type %s are not supported" : "Los archius de tipe %s son pas preses en carga",
+    "Failed to open archive when installing app" : "Fracàs de la dobertura de l'archiu al moment de l'installacion de l'aplicacion",
+    "App does not provide an info.xml file" : "L'aplicacion provesís pas cap de fichièr info.xml",
+    "App can't be installed because of not allowed code in the App" : "L'aplicacion pòt pas èsser installada perque conten de còde pas autorizat",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "L'aplicacion pòt pas èsser installada perque es pas compatibla amb aquesta version d'ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicacion pòt pas èsser installada perque conten la balisa <shipped>true</shipped> qu'es pas autorizada per las aplicacions non inclusas per defaut",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "L'aplicacion pòt pas èsser installada perque la version dins info.xml/version es pas identica a la qu'es indicada sus l'app store",
+    "Application is not enabled" : "L'aplicacion es pas activada",
     "Authentication error" : "Error d'autentificacion",
+    "Token expired. Please reload page." : "La session a expirat. Recargatz la pagina.",
+    "Unknown user" : "Utilizaire desconegut",
+    "%s enter the database username." : "%s entratz lo nom d'utilizaire de la banca de donadas.",
+    "%s enter the database name." : "%s entratz lo nom de la banca de donadas.",
+    "%s you may not use dots in the database name" : "%s podètz pas utilizar de punts dins lo nom de la banca de donadas",
+    "Oracle connection could not be established" : "La connexion Oracle pòt pas èsser establida",
+    "Oracle username and/or password not valid" : "Nom d'utilizaire e/o senhal de la basa Oracle invalid(s)",
+    "DB Error: \"%s\"" : "Error de la banca de donadas : \"%s\"",
+    "Offending command was: \"%s\"" : "La requèsta en causa es : \"%s\"",
+    "You need to enter either an existing account or the administrator." : "Vos cal especificar lo nom d'un compte existent, o lo de l'administrator.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "La requèsta en causa es : \"%s\", nom : %s, senhal : %s",
+    "PostgreSQL username and/or password not valid" : "Nom d'utilizaire e/o senhal de la base PostgreSQL invalid(s)",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X es pas pres en carga e %s foncionarà pas corrèctament sus aquesta plataforma. Son utilizacion es jos vòstra responsabilitat !",
+    "For the best results, please consider using a GNU/Linux server instead." : "Per obténer los melhors resultats, vos caldriá utilizar un servidor GNU/Linux.",
+    "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Sembla qu'aquesta instància %s fonciona sus un environament PHP 32-bit e open_basedir es estat configurat dins php.ini. Aquò engendre de problèmas amb los fichièrs de talha superiora a 4 Go e es doncas fòrtament desconselhat.",
+    "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Suprimissètz la configuracion open_basedir de vòstre php.ini o utilizar una version PHP 64-bit.",
+    "Set an admin username." : "Especificatz un nom d'utilizaire per l'administrator.",
+    "Set an admin password." : "Especificatz un senhal per l'administrator.",
+    "Can't create or write into the data directory %s" : "Impossible de crear, o d'escriure dedins, lo repertòri de las donadas %s",
+    "Invalid Federated Cloud ID" : "ID Federated Cloud incorrècte",
+    "%s shared »%s« with you" : "%s a partejat «%s» amb vos",
+    "%s via %s" : "%s via %s",
+    "Sharing %s failed, because the backend does not allow shares from type %i" : "Lo partiment de %s a fracassat perque l’infrastructura autoriza pas los partiments de tipe %i",
+    "Sharing %s failed, because the file does not exist" : "Lo partiment de %s a fracassat perque lo fichièr existís pas",
+    "You are not allowed to share %s" : "Sètz pas autorizat a partejar %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Lo partiment de %s a fracassat perque l'utilizaire %s es lo proprietari de l'objècte",
+    "Sharing %s failed, because the user %s does not exist" : "Lo partiment de %s a fracassat perque l'utilizaire %s existís pas",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Lo partiment de %s a fracassat perque l'utilizaire %s es pas membre de cap de grop al qual %s aparten",
+    "Sharing %s failed, because this item is already shared with %s" : "Lo partiment de %s a fracassat perque aqueste objècte es ja partejat amb %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Lo partiment de %s a fracassat perque aqueste element es ja partejat amb l'utilizaire %s",
+    "Sharing %s failed, because the group %s does not exist" : "Lo partiment de %s a fracassat perque lo grop %s existís pas",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Lo partiment de %s a fracassat perque %s es pas membre del grop %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Vos cal provesir un senhal per crear un ligam public, sols los ligams protegits son autorizats.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Lo partiment de %s a fracassat perque lo partiment per ligam es pas permés",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable.",
+    "Share type %s is not valid for %s" : "Lo tipe de partiment %s es pas valid per %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Lo reglatge de las permissions per %s a fracassat perque las permissions depassan las que son acordadas a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Lo reglatge de las permissions per %s a fracassat perque l'objècte es pas estat trobat",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Impossible de configurar la data d'expiracion. Un partiment pòt pas expirar mai de %s aprèp sa creacion",
+    "Cannot set expiration date. Expiration date is in the past" : "Impossible de configurar la data d'expiracion : es dins lo passat.",
+    "Cannot clear expiration date. Shares are required to have an expiration date." : "Impossible de suprimir la data d'expiracion. Los partiments devon aver una data d'expiracion.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Lo servici de partiment %s deu implementar l'interfàcia OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Servici de partiment %s pas trobat",
+    "Sharing backend for %s not found" : "Lo servici de partiment per %s es introbable",
+    "Sharing %s failed, because the user %s is the original sharer" : "Lo partiment de %s a fracassat perque l'utilizaire %s es l'utilizaire a l'origina del partiment.",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Lo partiment de %s a fracassat perque las permissions depassan las que son acordadas a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Lo partiment de %s a fracassat perque lo repartatge es pas autorizat",
+    "Sharing %s failed, because the sharing backend for %s could not find its source" : "Lo partiment de %s a fracassat perque la font es pas estada trobada pel partiment %s.",
+    "Sharing %s failed, because the file could not be found in the file cache" : "Lo partiment de %s a fracassat perque lo fichièr es pas estat trobat dins los fichièrs meses en escondedor.",
+    "Could not find category \"%s\"" : "Impossible de trobar la categoria \"%s\"",
     "Apps" : "Aplicacions",
-    "A valid username must be provided" : "Un nom d'utilizaire valid deu èsser picat",
-    "A valid password must be provided" : "Un senhal valid deu èsser picat",
-    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La rason es probablament l'utilizacion d'un escondedor / accelerador tal coma Zend OPcache o eAccelerator."
+    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Sols los caractèrs seguents son autorizats dins un nom d'utilizaire : \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
+    "A valid username must be provided" : "Un nom d'utilizaire valid deu èsser sasit",
+    "A valid password must be provided" : "Un senhal valid deu èsser sasit",
+    "The username is already being used" : "Aqueste nom d'utilizaire es ja utilizat",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Cap de pilòt de banca de donadas es pas installat (sqlite, mysql o postgresql).",
+    "Microsoft Windows Platform is not supported" : "La plataforma Microsoft Windows es pas presa en carga.",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Executar un servidor ownCloud sus una plataforma Microsoft Windows es pas pres en carga. Se avètz pas la possibilitat de migrar vòstre servidor, vos suggerissèm d'utilizar un servidor Linux dins una maquina virtuala. Los paquets Linux necessaris amai los imatges virtuals de bon desplegar se tròban sus <a href=\"%s\">%s</a>. Per migrar d'installacions existentas cap a Linux, trobaretz de conselhs e d'escripts de migracion dins <a href=\"%s\">nòstra documentacion</a>.",
+    "Cannot write into \"config\" directory" : "Impossible d’escriure dins lo repertòri \"config\"",
+    "Cannot write into \"apps\" directory" : "Impossible d’escriure dins lo repertòri \"apps\"",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Aqueste problèma es generalament resolgut %sen donant al servidor web un accès en escritura al repertòri apps%s o en desactivant l'appstore dins lo fichièr de configuracion.",
+    "Cannot create \"data\" directory (%s)" : "Impossible de crear lo repertòri \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Aqueste problèma es generalament resolgut <a href=\"%s\" target=\"_blank\">en donant al servidor web un accès en escritura al repertòri raiç</a>.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Lo problèma de permissions pòt generalament èsser resolgut %sen donant al servidor web un accès en escritura al repertòri raiç%s",
+    "Setting locale to %s failed" : "Fracàs de l'especificacion dels paramètres regionals a %s",
+    "Please install one of these locales on your system and restart your webserver." : "Installatz un d'aqueles paramètres regionals sus vòstre sistèma e reaviatz vòstre servidor web.",
+    "Please ask your server administrator to install the module." : "Demandatz a vòstre administrator d’installar lo modul.",
+    "PHP module %s not installed." : "Lo modul PHP %s es pas installat.",
+    "PHP setting \"%s\" is not set to \"%s\"." : "Lo paramètre PHP \"%s\" es pas \"%s\".",
+    "Adjusting this setting in php.ini will make ownCloud run again" : "Ajustar aqueste paramètre dins php.ini permetrà a ownCloud de foncionar tornamai",
+    "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload es a \"%s\" mentre que la valor \"0\" es esperada",
+    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Per corregir aqueste problèma metètz <code>mbstring.func_overload</code> a <code>0</code> dins vòstre php.ini",
+    "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP sembla configurat de manièra a suprimir los blòts PHPdoc del còde. Aquò rendrà mantuna aplicacion de basa inaccessiblas.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La rason es probablament l'utilizacion d'un escondedor / accelerator tal coma Zend OPcache o eAccelerator.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Los moduls PHP son estats installats mas son totjorn indicats coma mancants ?",
+    "Please ask your server administrator to restart the web server." : "Demandatz a vòstre administrator servidor que reavie lo servidor web.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 requesit",
+    "Please upgrade your database version" : "Metètz a jorn vòstre gestionari de banca de donadas",
+    "Error occurred while checking PostgreSQL version" : "Una error s’es produsida pendent la recuperacion del numèro de version de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Verificatz qu'utilizatz PostgreSQL >= 9 , o agachatz dins lo jornal d’error per mai d’informacions sus aqueste problèma",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Cambiatz las permissions del repertòri en mòde 0770 per fin que son contengut pòsca èsser listat pels autres utilizaires.",
+    "Data directory (%s) is readable by other users" : "Lo repertòri de donadas (%s) es legible pels autres utilizaires",
+    "Data directory (%s) must be an absolute path" : "Lo camin del dorsièr de donadas (%s) deu èsser absolut",
+    "Check the value of \"datadirectory\" in your configuration" : "Verificatz la valor de \"datadirectory\" dins vòstra configuracion",
+    "Data directory (%s) is invalid" : "Lo repertòri (%s) es pas valid",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Verificatz que lo repertòri de donadas conten un fichièr \".ocdata\" a sa raiç.",
+    "Could not obtain lock type %d on \"%s\"." : "Impossible d'obténer lo varrolhatge de tipe %d sus \"%s\"."
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/oc.json b/lib/l10n/oc.json
index 3ac8367f556..2ee5fb2eaab 100644
--- a/lib/l10n/oc.json
+++ b/lib/l10n/oc.json
@@ -1,21 +1,150 @@
 { "translations": {
+    "Cannot write into \"config\" directory!" : "Impossible d’escriure dins lo repertòri « config » !",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Aqueste problèma es generalament resolgut en donant al servidor web un accès en escritura al repertòri \"config\"",
+    "See %s" : "Veire %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Aqueste problèma es generalament resolgut %sen donant al servidor web un accès en escritura al repertòri de configuracion%s.",
+    "Sample configuration detected" : "Configuracion d'exemple detectada",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es estat detectat que la configuracion donada a títol d'exemple es estada copiada. Aquò pòt rendre vòstra installacion inoperanta e es pas pres en carga. Legissètz la documentacion abans d'efectuar de modifications dins config.php",
+    "PHP %s or higher is required." : "PHP %s o superior es requesit.",
+    "PHP with a version lower than %s is required." : "PHP amb una version anteriora a %s es requesit.",
+    "Following databases are supported: %s" : "Les bases de donadas seguentas son suportadas : %s",
+    "The command line tool %s could not be found" : "La comanda %s es introbabla",
+    "The library %s is not available." : "La bibliotèca %s es pas disponibla.",
+    "Library %s with a version higher than %s is required - available version %s." : "La bibliotèca %s deu èsser al mens a la version %s. Version disponibla : %s.",
+    "Library %s with a version lower than %s is required - available version %s." : "La bibliotèca %s deu aver una version anteriora a %s. Version disponibla : %s.",
+    "Following platforms are supported: %s" : "Las plataformas seguentas son presas en carga : %s",
+    "ownCloud %s or higher is required." : "ownCloud %s o superior es requesit.",
+    "ownCloud %s or lower is required." : "ownCloud %s o inferior es requesit.",
     "Help" : "Ajuda",
     "Personal" : "Personal",
-    "Users" : "Usancièrs",
-    "Admin" : "Admin",
+    "Users" : "Utilizaires",
+    "Admin" : "Administracion",
+    "Recommended" : "Recomandada",
+    "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "L'aplicacion \"%s\" pòt pas èsser installada perque es pas compatibla amb aquesta version d'ownCloud.",
+    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "L'aplicacion \"%s\" pòt pas èsser installada a causa de las dependéncias seguentas pas satisfachas : %s",
+    "No app name specified" : "Cap de nom d'aplicacion pas especificat",
     "Unknown filetype" : "Tipe de fichièr desconegut",
     "Invalid image" : "Imatge pas valable",
     "today" : "uèi",
     "yesterday" : "ièr",
-    "last month" : "mes passat",
-    "last year" : "an passat",
-    "seconds ago" : "segonda a",
-    "web services under your control" : "Services web jos ton contraròtle",
-    "File name contains at least one invalid character" : "Lo nom de fichièr conten al mens un caractèr invalid",
+    "_%n day ago_::_%n days ago_" : ["i a %n jorn","i a %n jorns"],
+    "last month" : "lo mes passat",
+    "_%n month ago_::_%n months ago_" : ["I a %n mes","I a %n meses"],
+    "last year" : "l'an passat",
+    "_%n year ago_::_%n years ago_" : ["i a %n an","i a %n ans"],
+    "_%n minute ago_::_%n minutes ago_" : ["i a %n minuta","i a %n minutas"],
+    "seconds ago" : "i a qualques segondas",
+    "web services under your control" : "servicis web jos vòstre contraròtle",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "Lo modul amb l'id: %s existís pas. Mercé de l'activar dins los paramètres d'aplicacions o de contactar vòstre administrator.",
+    "Empty filename is not allowed" : "Lo nom de fichièr pòt pas èsser void",
+    "Dot files are not allowed" : "Lo nom de fichièr pòt pas començar per un punt",
+    "4-byte characters are not supported in file names" : "Los caractèrs sus 4 octets son pas preses en carga dins los noms de fichièrs",
+    "File name is a reserved word" : "Aqueste nom de fichièr es un mot reservat",
+    "File name contains at least one invalid character" : "Lo nom de fichièr conten un (de) caractèr(s) invalid(s)",
+    "File name is too long" : "Nom de fichièr tròp long",
+    "File is currently busy, please try again later" : "Lo fichièr es actualament utilizat, tornatz ensajar pus tard",
+    "Can't read file" : "Impossible de legir lo fichièr",
+    "App directory already exists" : "Lo dorsièr de l'aplicacion existís ja",
+    "Can't create app folder. Please fix permissions. %s" : "Impossible de crear lo dorsièr de l'aplicacion. Corregissètz los dreches d'accès. %s",
+    "Archive does not contain a directory named %s" : "Lo fichièr archiu conten pas de repertòri %s",
+    "No source specified when installing app" : "Cap de font pas especificada per installar l'aplicacion",
+    "No href specified when installing app from http" : "Cap de href pas especificat per installar l'aplicacion per http",
+    "No path specified when installing app from local file" : "Cap de camin pas especificat per installar l'aplicacion dempuèi un fichièr local",
+    "Archives of type %s are not supported" : "Los archius de tipe %s son pas preses en carga",
+    "Failed to open archive when installing app" : "Fracàs de la dobertura de l'archiu al moment de l'installacion de l'aplicacion",
+    "App does not provide an info.xml file" : "L'aplicacion provesís pas cap de fichièr info.xml",
+    "App can't be installed because of not allowed code in the App" : "L'aplicacion pòt pas èsser installada perque conten de còde pas autorizat",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "L'aplicacion pòt pas èsser installada perque es pas compatibla amb aquesta version d'ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicacion pòt pas èsser installada perque conten la balisa <shipped>true</shipped> qu'es pas autorizada per las aplicacions non inclusas per defaut",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "L'aplicacion pòt pas èsser installada perque la version dins info.xml/version es pas identica a la qu'es indicada sus l'app store",
+    "Application is not enabled" : "L'aplicacion es pas activada",
     "Authentication error" : "Error d'autentificacion",
+    "Token expired. Please reload page." : "La session a expirat. Recargatz la pagina.",
+    "Unknown user" : "Utilizaire desconegut",
+    "%s enter the database username." : "%s entratz lo nom d'utilizaire de la banca de donadas.",
+    "%s enter the database name." : "%s entratz lo nom de la banca de donadas.",
+    "%s you may not use dots in the database name" : "%s podètz pas utilizar de punts dins lo nom de la banca de donadas",
+    "Oracle connection could not be established" : "La connexion Oracle pòt pas èsser establida",
+    "Oracle username and/or password not valid" : "Nom d'utilizaire e/o senhal de la basa Oracle invalid(s)",
+    "DB Error: \"%s\"" : "Error de la banca de donadas : \"%s\"",
+    "Offending command was: \"%s\"" : "La requèsta en causa es : \"%s\"",
+    "You need to enter either an existing account or the administrator." : "Vos cal especificar lo nom d'un compte existent, o lo de l'administrator.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "La requèsta en causa es : \"%s\", nom : %s, senhal : %s",
+    "PostgreSQL username and/or password not valid" : "Nom d'utilizaire e/o senhal de la base PostgreSQL invalid(s)",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X es pas pres en carga e %s foncionarà pas corrèctament sus aquesta plataforma. Son utilizacion es jos vòstra responsabilitat !",
+    "For the best results, please consider using a GNU/Linux server instead." : "Per obténer los melhors resultats, vos caldriá utilizar un servidor GNU/Linux.",
+    "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "Sembla qu'aquesta instància %s fonciona sus un environament PHP 32-bit e open_basedir es estat configurat dins php.ini. Aquò engendre de problèmas amb los fichièrs de talha superiora a 4 Go e es doncas fòrtament desconselhat.",
+    "Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP." : "Suprimissètz la configuracion open_basedir de vòstre php.ini o utilizar una version PHP 64-bit.",
+    "Set an admin username." : "Especificatz un nom d'utilizaire per l'administrator.",
+    "Set an admin password." : "Especificatz un senhal per l'administrator.",
+    "Can't create or write into the data directory %s" : "Impossible de crear, o d'escriure dedins, lo repertòri de las donadas %s",
+    "Invalid Federated Cloud ID" : "ID Federated Cloud incorrècte",
+    "%s shared »%s« with you" : "%s a partejat «%s» amb vos",
+    "%s via %s" : "%s via %s",
+    "Sharing %s failed, because the backend does not allow shares from type %i" : "Lo partiment de %s a fracassat perque l’infrastructura autoriza pas los partiments de tipe %i",
+    "Sharing %s failed, because the file does not exist" : "Lo partiment de %s a fracassat perque lo fichièr existís pas",
+    "You are not allowed to share %s" : "Sètz pas autorizat a partejar %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Lo partiment de %s a fracassat perque l'utilizaire %s es lo proprietari de l'objècte",
+    "Sharing %s failed, because the user %s does not exist" : "Lo partiment de %s a fracassat perque l'utilizaire %s existís pas",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Lo partiment de %s a fracassat perque l'utilizaire %s es pas membre de cap de grop al qual %s aparten",
+    "Sharing %s failed, because this item is already shared with %s" : "Lo partiment de %s a fracassat perque aqueste objècte es ja partejat amb %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Lo partiment de %s a fracassat perque aqueste element es ja partejat amb l'utilizaire %s",
+    "Sharing %s failed, because the group %s does not exist" : "Lo partiment de %s a fracassat perque lo grop %s existís pas",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Lo partiment de %s a fracassat perque %s es pas membre del grop %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Vos cal provesir un senhal per crear un ligam public, sols los ligams protegits son autorizats.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Lo partiment de %s a fracassat perque lo partiment per ligam es pas permés",
+    "Sharing %s failed, could not find %s, maybe the server is currently unreachable." : "Lo partiment de %s a fracassat : impossible de trobar %s. Benlèu que lo servidor es momentanèament injonhable.",
+    "Share type %s is not valid for %s" : "Lo tipe de partiment %s es pas valid per %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Lo reglatge de las permissions per %s a fracassat perque las permissions depassan las que son acordadas a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Lo reglatge de las permissions per %s a fracassat perque l'objècte es pas estat trobat",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Impossible de configurar la data d'expiracion. Un partiment pòt pas expirar mai de %s aprèp sa creacion",
+    "Cannot set expiration date. Expiration date is in the past" : "Impossible de configurar la data d'expiracion : es dins lo passat.",
+    "Cannot clear expiration date. Shares are required to have an expiration date." : "Impossible de suprimir la data d'expiracion. Los partiments devon aver una data d'expiracion.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Lo servici de partiment %s deu implementar l'interfàcia OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Servici de partiment %s pas trobat",
+    "Sharing backend for %s not found" : "Lo servici de partiment per %s es introbable",
+    "Sharing %s failed, because the user %s is the original sharer" : "Lo partiment de %s a fracassat perque l'utilizaire %s es l'utilizaire a l'origina del partiment.",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Lo partiment de %s a fracassat perque las permissions depassan las que son acordadas a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Lo partiment de %s a fracassat perque lo repartatge es pas autorizat",
+    "Sharing %s failed, because the sharing backend for %s could not find its source" : "Lo partiment de %s a fracassat perque la font es pas estada trobada pel partiment %s.",
+    "Sharing %s failed, because the file could not be found in the file cache" : "Lo partiment de %s a fracassat perque lo fichièr es pas estat trobat dins los fichièrs meses en escondedor.",
+    "Could not find category \"%s\"" : "Impossible de trobar la categoria \"%s\"",
     "Apps" : "Aplicacions",
-    "A valid username must be provided" : "Un nom d'utilizaire valid deu èsser picat",
-    "A valid password must be provided" : "Un senhal valid deu èsser picat",
-    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La rason es probablament l'utilizacion d'un escondedor / accelerador tal coma Zend OPcache o eAccelerator."
+    "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", \"0-9\", and \"_.@-\"" : "Sols los caractèrs seguents son autorizats dins un nom d'utilizaire : \"a-z\", \"A-Z\", \"0-9\", e \"_.@-\"",
+    "A valid username must be provided" : "Un nom d'utilizaire valid deu èsser sasit",
+    "A valid password must be provided" : "Un senhal valid deu èsser sasit",
+    "The username is already being used" : "Aqueste nom d'utilizaire es ja utilizat",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Cap de pilòt de banca de donadas es pas installat (sqlite, mysql o postgresql).",
+    "Microsoft Windows Platform is not supported" : "La plataforma Microsoft Windows es pas presa en carga.",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Executar un servidor ownCloud sus una plataforma Microsoft Windows es pas pres en carga. Se avètz pas la possibilitat de migrar vòstre servidor, vos suggerissèm d'utilizar un servidor Linux dins una maquina virtuala. Los paquets Linux necessaris amai los imatges virtuals de bon desplegar se tròban sus <a href=\"%s\">%s</a>. Per migrar d'installacions existentas cap a Linux, trobaretz de conselhs e d'escripts de migracion dins <a href=\"%s\">nòstra documentacion</a>.",
+    "Cannot write into \"config\" directory" : "Impossible d’escriure dins lo repertòri \"config\"",
+    "Cannot write into \"apps\" directory" : "Impossible d’escriure dins lo repertòri \"apps\"",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Aqueste problèma es generalament resolgut %sen donant al servidor web un accès en escritura al repertòri apps%s o en desactivant l'appstore dins lo fichièr de configuracion.",
+    "Cannot create \"data\" directory (%s)" : "Impossible de crear lo repertòri \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Aqueste problèma es generalament resolgut <a href=\"%s\" target=\"_blank\">en donant al servidor web un accès en escritura al repertòri raiç</a>.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Lo problèma de permissions pòt generalament èsser resolgut %sen donant al servidor web un accès en escritura al repertòri raiç%s",
+    "Setting locale to %s failed" : "Fracàs de l'especificacion dels paramètres regionals a %s",
+    "Please install one of these locales on your system and restart your webserver." : "Installatz un d'aqueles paramètres regionals sus vòstre sistèma e reaviatz vòstre servidor web.",
+    "Please ask your server administrator to install the module." : "Demandatz a vòstre administrator d’installar lo modul.",
+    "PHP module %s not installed." : "Lo modul PHP %s es pas installat.",
+    "PHP setting \"%s\" is not set to \"%s\"." : "Lo paramètre PHP \"%s\" es pas \"%s\".",
+    "Adjusting this setting in php.ini will make ownCloud run again" : "Ajustar aqueste paramètre dins php.ini permetrà a ownCloud de foncionar tornamai",
+    "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload es a \"%s\" mentre que la valor \"0\" es esperada",
+    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "Per corregir aqueste problèma metètz <code>mbstring.func_overload</code> a <code>0</code> dins vòstre php.ini",
+    "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP sembla configurat de manièra a suprimir los blòts PHPdoc del còde. Aquò rendrà mantuna aplicacion de basa inaccessiblas.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La rason es probablament l'utilizacion d'un escondedor / accelerator tal coma Zend OPcache o eAccelerator.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Los moduls PHP son estats installats mas son totjorn indicats coma mancants ?",
+    "Please ask your server administrator to restart the web server." : "Demandatz a vòstre administrator servidor que reavie lo servidor web.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 requesit",
+    "Please upgrade your database version" : "Metètz a jorn vòstre gestionari de banca de donadas",
+    "Error occurred while checking PostgreSQL version" : "Una error s’es produsida pendent la recuperacion del numèro de version de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Verificatz qu'utilizatz PostgreSQL >= 9 , o agachatz dins lo jornal d’error per mai d’informacions sus aqueste problèma",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Cambiatz las permissions del repertòri en mòde 0770 per fin que son contengut pòsca èsser listat pels autres utilizaires.",
+    "Data directory (%s) is readable by other users" : "Lo repertòri de donadas (%s) es legible pels autres utilizaires",
+    "Data directory (%s) must be an absolute path" : "Lo camin del dorsièr de donadas (%s) deu èsser absolut",
+    "Check the value of \"datadirectory\" in your configuration" : "Verificatz la valor de \"datadirectory\" dins vòstra configuracion",
+    "Data directory (%s) is invalid" : "Lo repertòri (%s) es pas valid",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Verificatz que lo repertòri de donadas conten un fichièr \".ocdata\" a sa raiç.",
+    "Could not obtain lock type %d on \"%s\"." : "Impossible d'obténer lo varrolhatge de tipe %d sus \"%s\"."
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js
index 0453a78f842..3a061171231 100644
--- a/settings/l10n/es_MX.js
+++ b/settings/l10n/es_MX.js
@@ -47,12 +47,14 @@ OC.L10N.register(
     "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
     "Errors and fatal issues" : "Errores y problemas fatales",
     "Fatal issues only" : "Problemas fatales solamente",
+    "None" : "Ninguno",
     "Login" : "Iniciar sesión",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
     "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
     "Allow public uploads" : "Permitir subidas públicas",
+    "days" : "días",
     "Allow resharing" : "Permitir re-compartición",
     "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json
index 5bba876327a..138eca076da 100644
--- a/settings/l10n/es_MX.json
+++ b/settings/l10n/es_MX.json
@@ -45,12 +45,14 @@
     "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
     "Errors and fatal issues" : "Errores y problemas fatales",
     "Fatal issues only" : "Problemas fatales solamente",
+    "None" : "Ninguno",
     "Login" : "Iniciar sesión",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
     "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
     "Allow public uploads" : "Permitir subidas públicas",
+    "days" : "días",
     "Allow resharing" : "Permitir re-compartición",
     "Execute one task with each page loaded" : "Ejecutar una tarea con cada página cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index fdfcf281457..480179c27a0 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -125,11 +125,13 @@ OC.L10N.register(
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "서버가 Microsoft Windows 환경에서 동작하고 있습니다. 최적의 사용자 경험을 위해서는 리눅스를 사용할 것을 권장합니다.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s의 버전 %2$s 이하가 설치되어 있습니다. 안정성 및 성능 개선을 위하여 %1$s의 새 버전을 설치하는 것을 추천합니다.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "트랜잭션 기반 파일 잠금이 비활성화되어 있으며, 경쟁 상태 문제가 발생할 수 있습니다. config.php에서 'filelocking.enabled'를 활성화하면 본 문제를 해결할 수 있습니다. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"%s\">문서 ↗</a>를 참고하십시오.",
     "System locale can not be set to a one which supports UTF-8." : "UTF-8을 지원하는 시스템 로캘을 사용할 수 없습니다.",
     "This means that there might be problems with certain characters in file names." : "파일 이름의 일부 문자에 문제가 생길 수도 있습니다.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "다음 중 하나 이상의 로캘을 지원하기 위하여 필요한 패키지를 시스템에 설치하는 것을 추천합니다: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "도메인의 루트 디렉터리 아래에 설치되어 있지 않고 시스템 cron을 사용한다면 URL 생성에 문제가 발생할 수도 있습니다. 이 문제를 해결하려면 설치본의 웹 루트 경로에 있는 config.php 파일의 \"overwrite.cli.url\" 옵션을 변경하십시오(제안: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI로 cronjob을 실행할 수 없었습니다. 다음 기술적 오류가 발생하였습니다:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "잠금 백엔드로 데이터베이스를 사용하고 있으므로 트랜잭션 기반 파일 잠금을 사용합니다. 더 좋은 성능을 내려면 memcache 기반 잠금 사용을 추천합니다. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"%s\">문서 ↗</a>를 참고하십시오.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" href=\"%s\">설치 가이드 ↗</a>를 다시 확인하시고 <a href=\"#log-section\">로그</a>의 오류 및 경고를 확인하십시오.",
     "All checks passed." : "모든 검사를 통과하였습니다.",
     "Open documentation" : "문서 열기",
@@ -147,6 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "다른 사용자에게 공유 파일 이메일 알림 전송 허용",
     "Exclude groups from sharing" : "공유에서 그룹 제외",
     "These groups will still be able to receive shares, but not to initiate them." : "이 그룹의 사용자들은 다른 사용자가 공유한 파일을 받을 수는 있지만, 자기 파일을 공유할 수는 없습니다.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "공유 대화 상자에서 사용자 이름 자동 완성을 사용합니다. 이 설정을 사용하지 않으면 전체 사용자 이름을 입력해야 합니다.",
     "Last cron job execution: %s." : "마지막 cron 작업 실행: %s.",
     "Last cron job execution: %s. Something seems wrong." : "마지막 cron 작업 실행: %s. 문제가 발생한 것 같습니다.",
     "Cron was not executed yet!" : "Cron이 실행되지 않았습니다!",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 5c05bed51e8..68b64ee83a5 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -123,11 +123,13 @@
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "서버가 Microsoft Windows 환경에서 동작하고 있습니다. 최적의 사용자 경험을 위해서는 리눅스를 사용할 것을 권장합니다.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s의 버전 %2$s 이하가 설치되어 있습니다. 안정성 및 성능 개선을 위하여 %1$s의 새 버전을 설치하는 것을 추천합니다.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "트랜잭션 기반 파일 잠금이 비활성화되어 있으며, 경쟁 상태 문제가 발생할 수 있습니다. config.php에서 'filelocking.enabled'를 활성화하면 본 문제를 해결할 수 있습니다. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"%s\">문서 ↗</a>를 참고하십시오.",
     "System locale can not be set to a one which supports UTF-8." : "UTF-8을 지원하는 시스템 로캘을 사용할 수 없습니다.",
     "This means that there might be problems with certain characters in file names." : "파일 이름의 일부 문자에 문제가 생길 수도 있습니다.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "다음 중 하나 이상의 로캘을 지원하기 위하여 필요한 패키지를 시스템에 설치하는 것을 추천합니다: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "도메인의 루트 디렉터리 아래에 설치되어 있지 않고 시스템 cron을 사용한다면 URL 생성에 문제가 발생할 수도 있습니다. 이 문제를 해결하려면 설치본의 웹 루트 경로에 있는 config.php 파일의 \"overwrite.cli.url\" 옵션을 변경하십시오(제안: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI로 cronjob을 실행할 수 없었습니다. 다음 기술적 오류가 발생하였습니다:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "잠금 백엔드로 데이터베이스를 사용하고 있으므로 트랜잭션 기반 파일 잠금을 사용합니다. 더 좋은 성능을 내려면 memcache 기반 잠금 사용을 추천합니다. 더 많은 정보를 보려면 <a target=\"_blank\" href=\"%s\">문서 ↗</a>를 참고하십시오.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" href=\"%s\">설치 가이드 ↗</a>를 다시 확인하시고 <a href=\"#log-section\">로그</a>의 오류 및 경고를 확인하십시오.",
     "All checks passed." : "모든 검사를 통과하였습니다.",
     "Open documentation" : "문서 열기",
@@ -145,6 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "다른 사용자에게 공유 파일 이메일 알림 전송 허용",
     "Exclude groups from sharing" : "공유에서 그룹 제외",
     "These groups will still be able to receive shares, but not to initiate them." : "이 그룹의 사용자들은 다른 사용자가 공유한 파일을 받을 수는 있지만, 자기 파일을 공유할 수는 없습니다.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "공유 대화 상자에서 사용자 이름 자동 완성을 사용합니다. 이 설정을 사용하지 않으면 전체 사용자 이름을 입력해야 합니다.",
     "Last cron job execution: %s." : "마지막 cron 작업 실행: %s.",
     "Last cron job execution: %s. Something seems wrong." : "마지막 cron 작업 실행: %s. 문제가 발생한 것 같습니다.",
     "Cron was not executed yet!" : "Cron이 실행되지 않았습니다!",
-- 
GitLab


From 96deeca34d3e5cc930e171a2e3c826d53f513da1 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Sat, 3 Oct 2015 17:06:48 +0200
Subject: [PATCH 666/783] Use DD-MM-YYYY consistently in share sidebar

We used to display the response from the server. Which is in non ISO8601
format. Now this is weird since the datepickers shows us 'DD-MM-YYYY'
once a date is chosen.

Now use momentJS to properly format the date.

* Unit tests updated
---
 core/js/sharedialogexpirationview.js       |  7 ++++++-
 core/js/tests/specs/sharedialogviewSpec.js | 13 +++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/core/js/sharedialogexpirationview.js b/core/js/sharedialogexpirationview.js
index fab48f5e6bc..772b9ba97dc 100644
--- a/core/js/sharedialogexpirationview.js
+++ b/core/js/sharedialogexpirationview.js
@@ -132,6 +132,11 @@
 
 			var isExpirationSet = !!this.model.get('linkShare').expiration || isExpirationEnforced;
 
+			var expiration;
+			if (isExpirationSet) {
+				expiration = moment(this.model.get('linkShare').expiration, 'YYYY-MM-DD').format('DD-MM-YYYY')
+			}
+
 			var expirationTemplate = this.template();
 			this.$el.html(expirationTemplate({
 				setExpirationLabel: t('core', 'Set expiration date'),
@@ -142,7 +147,7 @@
 				isExpirationSet: isExpirationSet,
 				isExpirationEnforced: isExpirationEnforced,
 				disableCheckbox: isExpirationEnforced && isExpirationSet,
-				expirationValue: this.model.get('linkShare').expiration
+				expirationValue: expiration
 			}));
 
 			// what if there is another date picker on that page?
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index de6f9944094..37590ba79c2 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -274,10 +274,10 @@ describe('OC.Share.ShareDialogView', function() {
 				expect(dialog.$el.find('#expirationDate').val()).toEqual('');
 			});
 			it('checks expiration date checkbox and populates field when expiration date was set', function() {
-				shareModel.get('linkShare').expiration = 1234;
+				shareModel.get('linkShare').expiration = '2014-02-01 00:00:00';
 				dialog.render();
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
-				expect(dialog.$el.find('#expirationDate').val()).toEqual('1234');
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('01-02-2014');
 			});
 			it('sets default date when default date setting is enabled', function() {
 				configModel.set('isDefaultExpireDateEnabled', true);
@@ -289,8 +289,7 @@ describe('OC.Share.ShareDialogView', function() {
 
 				// enabled by default
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
-				// TODO: those zeros must go...
-				expect(dialog.$el.find('#expirationDate').val()).toEqual('2014-1-27 00:00:00');
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('27-01-2014');
 
 				// disabling is allowed
 				dialog.$el.find('[name=expirationCheckbox]').click();
@@ -308,8 +307,7 @@ describe('OC.Share.ShareDialogView', function() {
 				dialog.render();
 
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
-				// TODO: those zeros must go...
-				expect(dialog.$el.find('#expirationDate').val()).toEqual('2014-1-27 00:00:00');
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('27-01-2014');
 
 				// disabling is not allowed
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('disabled')).toEqual(true);
@@ -338,8 +336,7 @@ describe('OC.Share.ShareDialogView', function() {
 				);
 
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('checked')).toEqual(true);
-				// TODO: those zeros must go...
-				expect(dialog.$el.find('#expirationDate').val()).toEqual('2014-1-27 00:00:00');
+				expect(dialog.$el.find('#expirationDate').val()).toEqual('27-01-2014');
 
 				// disabling is not allowed
 				expect(dialog.$el.find('[name=expirationCheckbox]').prop('disabled')).toEqual(true);
-- 
GitLab


From bc593f79214e85b971b48a980e43e9b4b64e7e93 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 5 Oct 2015 01:54:55 -0400
Subject: [PATCH 667/783] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/de.js   | 5 +++++
 apps/files_sharing/l10n/de.json | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 973aa0f15ac..0eb2b032e52 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -38,8 +38,13 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
     "You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt",
     "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt",
+    "%2$s shared %1$s with %3$s" : "%2$s geteilt %1$s mit %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s geteilt %1$s mit Gruppe %3$s",
+    "%2$s shared %1$s via link" : "%2$s geteilt %1$s via Link",
     "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt",
     "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben",
+    "Downloaded via public link" : "Runtergeladen mittels öffentlichen Link",
+    "Shared with %2$s" : "Geteilt mit %2$s",
     "Shares" : "Freigaben",
     "Accept" : "Ok",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 5526be3b6bf..3c0b3dd5714 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -36,8 +36,13 @@
     "Public shared file %1$s was downloaded" : "Die öffentliche geteilte Datei %1$s wurde heruntergeladen",
     "You shared %1$s with %2$s" : "Du hast %1$s mit %2$s geteilt",
     "You shared %1$s with group %2$s" : "Du hast %1$s mit der Gruppe %2$s geteilt",
+    "%2$s shared %1$s with %3$s" : "%2$s geteilt %1$s mit %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s geteilt %1$s mit Gruppe %3$s",
+    "%2$s shared %1$s via link" : "%2$s geteilt %1$s via Link",
     "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt",
     "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben",
+    "Downloaded via public link" : "Runtergeladen mittels öffentlichen Link",
+    "Shared with %2$s" : "Geteilt mit %2$s",
     "Shares" : "Freigaben",
     "Accept" : "Ok",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
-- 
GitLab


From 94f2121980082411ca8dc6cc38ef0149dc7c2554 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Sun, 4 Oct 2015 13:30:06 +0200
Subject: [PATCH 668/783] Add notice about X-Forwarded-For

---
 config/config.sample.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/config.sample.php b/config/config.sample.php
index 88d1a294622..2a2bca708a8 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1087,6 +1087,9 @@ $CONFIG = array(
 
 /**
  * List of trusted proxy servers
+ * 
+ * If you configure these also consider setting `forwarded_for_headers` which
+ * otherwise defaults to `HTTP_X_FORWARDED_FOR` (the `X-Forwarded-For` header).
  */
 'trusted_proxies' => array('203.0.113.45', '198.51.100.128'),
 
-- 
GitLab


From 42b29e39c12fc4384b643216f9bc45a924af87cb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 5 Oct 2015 10:13:45 +0200
Subject: [PATCH 669/783] Clear the shares after the test like storages and
 files

---
 tests/lib/testcase.php | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index 7e4890a46c2..8cfa2a72598 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -24,6 +24,7 @@ namespace Test;
 
 use OC\Command\QueueBus;
 use OC\Files\Filesystem;
+use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Security\ISecureRandom;
 
 abstract class TestCase extends \PHPUnit_Framework_TestCase {
@@ -129,9 +130,11 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 
 	public static function tearDownAfterClass() {
 		$dataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data-autotest');
+		$queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder();
 
-		self::tearDownAfterClassCleanStorages();
-		self::tearDownAfterClassCleanFileCache();
+		self::tearDownAfterClassCleanShares($queryBuilder);
+		self::tearDownAfterClassCleanStorages($queryBuilder);
+		self::tearDownAfterClassCleanFileCache($queryBuilder);
 		self::tearDownAfterClassCleanStrayDataFiles($dataDir);
 		self::tearDownAfterClassCleanStrayHooks();
 		self::tearDownAfterClassCleanStrayLocks();
@@ -139,26 +142,34 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		parent::tearDownAfterClass();
 	}
 
+	/**
+	 * Remove all entries from the share table
+	 *
+	 * @param IQueryBuilder $queryBuilder
+	 */
+	static protected function tearDownAfterClassCleanShares(IQueryBuilder $queryBuilder) {
+		$queryBuilder->delete('share')
+			->execute();
+	}
+
 	/**
 	 * Remove all entries from the storages table
 	 *
-	 * @throws \OC\DatabaseException
+	 * @param IQueryBuilder $queryBuilder
 	 */
-	static protected function tearDownAfterClassCleanStorages() {
-		$sql = 'DELETE FROM `*PREFIX*storages`';
-		$query = \OC_DB::prepare($sql);
-		$query->execute();
+	static protected function tearDownAfterClassCleanStorages(IQueryBuilder $queryBuilder) {
+		$queryBuilder->delete('storages')
+			->execute();
 	}
 
 	/**
 	 * Remove all entries from the filecache table
 	 *
-	 * @throws \OC\DatabaseException
+	 * @param IQueryBuilder $queryBuilder
 	 */
-	static protected function tearDownAfterClassCleanFileCache() {
-		$sql = 'DELETE FROM `*PREFIX*filecache`';
-		$query = \OC_DB::prepare($sql);
-		$query->execute();
+	static protected function tearDownAfterClassCleanFileCache(IQueryBuilder $queryBuilder) {
+		$queryBuilder->delete('filecache')
+			->execute();
 	}
 
 	/**
-- 
GitLab


From ed2ed4be8dcc3807647ac288ae9f3214c048ccbb Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 5 Oct 2015 11:15:14 +0200
Subject: [PATCH 670/783] Update example theme with App URLs and PHPDoc

---
 themes/example/defaults.php | 81 +++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/themes/example/defaults.php b/themes/example/defaults.php
index 6fea8fa8a49..3580dc137fb 100644
--- a/themes/example/defaults.php
+++ b/themes/example/defaults.php
@@ -20,34 +20,106 @@
 
 class OC_Theme {
 
+	/**
+	 * Returns the base URL
+	 * @return string URL
+	 */
 	public function getBaseUrl() {
 		return 'https://owncloud.org';
 	}
 
+	/**
+	 * Returns the URL where the sync clients are listed
+	 * @return string URL
+	 */
 	public function getSyncClientUrl() {
 		return 'https://owncloud.org/install';
 	}
 
+	/**
+	 * Returns the URL to the App Store for the iOS Client
+	 * @return string URL
+	 */
+	public function getiOSClientUrl() {
+		return 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8';
+	}
+
+	/**
+	 * Returns the AppId for the App Store for the iOS Client
+	 * @return string AppId
+	 */
+	public function getiTunesAppId() {
+		return '543672169';
+	}
+
+	/**
+	 * Returns the URL to Google Play for the Android Client
+	 * @return string URL
+	 */
+	public function getAndroidClientUrl() {
+		return 'https://play.google.com/store/apps/details?id=com.owncloud.android';
+	}
+
+	/**
+	 * Returns the documentation URL
+	 * @return string URL
+	 */
 	public function getDocBaseUrl() {
 		return 'https://doc.owncloud.org';
 	}
 
+	/**
+	 * Returns the title
+	 * @return string title
+	 */
 	public function getTitle() {
 		return 'Custom Cloud';
 	}
 
+	/**
+	 * Returns the short name of the software
+	 * @return string title
+	 */
 	public function getName() {
 		return 'Custom Cloud';
 	}
 
+	/**
+	 * Returns the short name of the software containing HTML strings
+	 * @return string title
+	 */
+	public function getHTMLName() {
+		return 'Custom Cloud';
+	}
+
+	/**
+	 * Returns entity (e.g. company name) - used for footer, copyright
+	 * @return string entity name
+	 */
 	public function getEntity() {
 		return 'Custom Cloud Co.';
 	}
 
+	/**
+	 * Returns slogan
+	 * @return string slogan
+	 */
 	public function getSlogan() {
 		return 'Your custom cloud, personalized for you!';
 	}
 
+	/**
+	 * Returns logo claim
+	 * @return string logo claim
+	 */
+	public function getLogoClaim() {
+		return '';
+	}
+
+	/**
+	 * Returns short version of the footer
+	 * @return string short footer
+	 */
 	public function getShortFooter() {
 		$footer = '© 2015 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
 			'<br/>' . $this->getSlogan();
@@ -55,6 +127,10 @@ class OC_Theme {
 		return $footer;
 	}
 
+	/**
+	 * Returns long version of the footer
+	 * @return string long footer
+	 */
 	public function getLongFooter() {
 		$footer = '© 2015 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
 			'<br/>' . $this->getSlogan();
@@ -66,6 +142,11 @@ class OC_Theme {
 		return $this->getDocBaseUrl() . '/server/8.0/go.php?to=' . $key;
 	}
 
+
+	/**
+	 * Returns mail header color
+	 * @return string
+	 */
 	public function getMailHeaderColor() {
 		return '#745bca';
 	}
-- 
GitLab


From 8de0773214e9217d30b480609187127358c61e5a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 2 Oct 2015 13:07:20 +0200
Subject: [PATCH 671/783] Make sure the share we found is for the same item

---
 lib/private/share/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 32389f34868..b22b4b6a2ed 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -2070,7 +2070,7 @@ class Share extends Constants {
 
 			$userShareType = ($isGroupShare) ? self::$shareTypeGroupUserUnique : $shareType;
 
-			if ($sourceExists) {
+			if ($sourceExists && $sourceExists['item_source'] === $itemSource) {
 				$fileTarget = $sourceExists['file_target'];
 				$itemTarget = $sourceExists['item_target'];
 
-- 
GitLab


From 3bbb65998fed43728f3e67822d81a289a8886e17 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 5 Oct 2015 12:03:36 +0200
Subject: [PATCH 672/783] Make sure all variables are defined

---
 lib/private/share/share.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index b22b4b6a2ed..42fec03d3ae 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1989,6 +1989,8 @@ class Share extends Constants {
 
 		$queriesToExecute = array();
 		$suggestedItemTarget = null;
+		$groupFileTarget = $fileTarget = $suggestedFileTarget = $filePath = '';
+		$groupItemTarget = $itemTarget = $fileSource = $parent = 0;
 
 		$result = self::checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate);
 		if(!empty($result)) {
-- 
GitLab


From ac5b3161e44729b746e3a365b1011156a63e8fb6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 5 Oct 2015 12:36:16 +0200
Subject: [PATCH 673/783] Add a unit test for "share a file inside a folder
 that is already shared"

---
 tests/lib/share/share.php | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 58a76470afa..f0dc921e969 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -533,6 +533,39 @@ class Test_Share extends \Test\TestCase {
 		$this->assertEquals(\OCP\Constants::PERMISSION_READ, $result['permissions']);
 	}
 
+	public function testSharingAFileInsideAFolderThatIsAlreadyShared() {
+		OC_User::setUserId($this->user1);
+		$view = new \OC\Files\View('/' . $this->user1 . '/');
+		$view->mkdir('files/test');
+		$view->mkdir('files/test/sub1');
+		$view->file_put_contents('files/test/sub1/file.txt', 'abc');
+
+		$folderInfo = $view->getFileInfo('files/test/sub1');
+		$folderId = $folderInfo->getId();
+
+		$fileInfo = $view->getFileInfo('files/test/sub1/file.txt');
+		$fileId = $fileInfo->getId();
+
+		$this->assertTrue(
+			OCP\Share::shareItem('folder', $folderId, OCP\Share::SHARE_TYPE_GROUP, $this->group2, \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_UPDATE),
+			'Failed asserting that user 1 successfully shared "test/sub1" with group 2.'
+		);
+
+		$this->assertTrue(
+			OCP\Share::shareItem('file', $fileId, OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ),
+			'Failed asserting that user 1 successfully shared "test/sub1/file.txt" with user 2.'
+		);
+
+		$result = \OCP\Share::getItemsSharedWithUser('file', $this->user2);
+		$this->assertCount(2, $result);
+
+		foreach ($result as $share) {
+			$itemName = substr($share['path'], strrpos($share['path'], '/'));
+			$this->assertSame($itemName, $share['file_target'], 'Asserting that the file_target is the last segment of the path');
+			$this->assertSame($share['item_target'], '/' . $share['item_source'], 'Asserting that the item is the item that was shared');
+		}
+	}
+
 	protected function shareUserOneTestFileWithGroupOne() {
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(
-- 
GitLab


From bf82015254941a74dfcd00d8b509a2f2a0734904 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 5 Oct 2015 12:40:01 +0200
Subject: [PATCH 674/783] add some output to explain the pre-conditions for
 decrypt-all

---
 apps/encryption/lib/crypto/decryptall.php | 6 ++++++
 lib/private/encryption/decryptall.php     | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/apps/encryption/lib/crypto/decryptall.php b/apps/encryption/lib/crypto/decryptall.php
index d7cd422c5e9..1daf3699d13 100644
--- a/apps/encryption/lib/crypto/decryptall.php
+++ b/apps/encryption/lib/crypto/decryptall.php
@@ -84,6 +84,9 @@ class DecryptAll {
 		$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
 
 		if (!empty($user)) {
+			$output->writeln('You can only decrypt the users files if you know');
+			$output->writeln('the users password or if he activated the recovery key.');
+			$output->writeln('');
 			$questionUseLoginPassword = new ConfirmationQuestion(
 				'Do you want to use the users login password to decrypt all files? (y/n) ',
 				false
@@ -98,6 +101,9 @@ class DecryptAll {
 				$user = $recoveryKeyId;
 			}
 		} else {
+			$output->writeln('You can only decrypt the files of all users if the');
+			$output->writeln('recovery key is enabled by the admin and activated by the users.');
+			$output->writeln('');
 			$user = $recoveryKeyId;
 		}
 
diff --git a/lib/private/encryption/decryptall.php b/lib/private/encryption/decryptall.php
index c1875f16abd..e19ee6b745f 100644
--- a/lib/private/encryption/decryptall.php
+++ b/lib/private/encryption/decryptall.php
@@ -119,6 +119,9 @@ class DecryptAll {
 		foreach ($encryptionModules as $moduleDesc) {
 			/** @var IEncryptionModule $module */
 			$module = call_user_func($moduleDesc['callback']);
+			$this->output->writeln('');
+			$this->output->writeln('Prepare "' . $module->getDisplayName() . '"');
+			$this->output->writeln('');
 			if ($module->prepareDecryptAll($this->input, $this->output, $user) === false) {
 				$this->output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!');
 				return false;
-- 
GitLab


From b47d15cd2052b5e88214439d220461312af3493e Mon Sep 17 00:00:00 2001
From: Lennart Rosam <hello@takuto.de>
Date: Fri, 21 Aug 2015 23:54:45 +0200
Subject: [PATCH 675/783] Remove whitespace from base-DNs

---
 apps/user_ldap/lib/configuration.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index 1cbe45a82c2..ff839881aa2 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -145,6 +145,7 @@ class Configuration {
 			}
 
 			$setMethod = 'setValue';
+            $trim = false;
 			switch($key) {
 				case 'homeFolderNamingRule':
 					if(!empty($val) && strpos($val, 'attr:') === false) {
@@ -154,6 +155,7 @@ class Configuration {
 				case 'ldapBase':
 				case 'ldapBaseUsers':
 				case 'ldapBaseGroups':
+                    $trim = true;// Prevent login errors due to whitespace
 				case 'ldapAttributesForUserSearch':
 				case 'ldapAttributesForGroupSearch':
 				case 'ldapUserFilterObjectclass':
@@ -164,7 +166,7 @@ class Configuration {
 					$setMethod = 'setMultiLine';
 					break;
 			}
-			$this->$setMethod($key, $val);
+			$this->$setMethod($key, $val, $trim);
 			if(is_array($applied)) {
 				$applied[] = $inputKey;
 			}
@@ -275,14 +277,18 @@ class Configuration {
 	 * @param string $varName
 	 * @param array|string $value
 	 */
-	protected function setMultiLine($varName, $value) {
+	protected function setMultiLine($varName, $value, $trim = false) {
 		if(empty($value)) {
 			$value = '';
 		} else if (!is_array($value)) {
 			$value = preg_split('/\r\n|\r|\n|;/', $value);
 			if($value === false) {
 				$value = '';
-			}
+			} else if($trim) {
+                foreach($value as $key => $val) {
+                    $value[$key] = trim($val);
+                }
+            }
 		}
 
 		$this->setValue($varName, $value);
@@ -328,11 +334,11 @@ class Configuration {
 	}
 
 	/**
-	 * @param string $varName
+	 * @param string $varName 
 	 * @param mixed $value
 	 */
-	protected function setValue($varName, $value) {
-		$this->config[$varName] = $value;
+	protected function setValue($varName, $value, $trim = false) {
+		$this->config[$varName] = $trim ? trim($value) : $value;
 	}
 
 	/**
-- 
GitLab


From 70ffa2f9f88910bbfbfb4db93c8d6199bcb1c167 Mon Sep 17 00:00:00 2001
From: Lennart Rosam <hello@takuto.de>
Date: Sat, 22 Aug 2015 23:06:04 +0200
Subject: [PATCH 676/783] Spaces -> Tabs, Update PHP-Doc and function logic

---
 apps/user_ldap/lib/configuration.php | 39 +++++++++++++++++++---------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index ff839881aa2..fe3740108c2 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -145,7 +145,7 @@ class Configuration {
 			}
 
 			$setMethod = 'setValue';
-            $trim = false;
+			$trim = false;
 			switch($key) {
 				case 'homeFolderNamingRule':
 					if(!empty($val) && strpos($val, 'attr:') === false) {
@@ -155,7 +155,7 @@ class Configuration {
 				case 'ldapBase':
 				case 'ldapBaseUsers':
 				case 'ldapBaseGroups':
-                    $trim = true;// Prevent login errors due to whitespace
+					$trim = true;// Prevent login errors due to whitespace
 				case 'ldapAttributesForUserSearch':
 				case 'ldapAttributesForGroupSearch':
 				case 'ldapUserFilterObjectclass':
@@ -274,8 +274,11 @@ class Configuration {
 	}
 
 	/**
-	 * @param string $varName
-	 * @param array|string $value
+	 * Sets multi-line values as arrays
+	 * 
+	 * @param string $varName name of config-key
+	 * @param array|string $value to set
+	 * @param boolean $trim Trim value? (default: false)
 	 */
 	protected function setMultiLine($varName, $value, $trim = false) {
 		if(empty($value)) {
@@ -284,11 +287,17 @@ class Configuration {
 			$value = preg_split('/\r\n|\r|\n|;/', $value);
 			if($value === false) {
 				$value = '';
-			} else if($trim) {
-                foreach($value as $key => $val) {
-                    $value[$key] = trim($val);
-                }
-            }
+			}
+		}
+
+		if($trim) {
+			if(!is_array($value)) {
+				$value = trim($value);
+			} else {
+				foreach($value as $key => $val) {
+					$value[$key] = trim($val);
+				}
+			}
 		}
 
 		$this->setValue($varName, $value);
@@ -334,11 +343,17 @@ class Configuration {
 	}
 
 	/**
-	 * @param string $varName 
-	 * @param mixed $value
+	 * Sets a scalar value.
+	 * 
+	 * @param string $varName name of config key
+	 * @param mixed $value to set
+	 * @param boolean $trim Trim value? (default: false)
 	 */
 	protected function setValue($varName, $value, $trim = false) {
-		$this->config[$varName] = $trim ? trim($value) : $value;
+		if($trim && is_string($value)) {
+			$value = trim($value);
+		}
+		$this->config[$varName] = $value;
 	}
 
 	/**
-- 
GitLab


From fc273ac88c76b8dfa0385fb0f9380132b6cb2ffa Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 2 Oct 2015 17:40:38 +0200
Subject: [PATCH 677/783] trim by default, add unit tests

---
 apps/user_ldap/lib/configuration.php   |  50 ++++++++----
 apps/user_ldap/tests/configuration.php | 106 +++++++++++++++++++++++++
 2 files changed, 140 insertions(+), 16 deletions(-)
 create mode 100644 apps/user_ldap/tests/configuration.php

diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index fe3740108c2..6e62f5730b9 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -145,17 +145,18 @@ class Configuration {
 			}
 
 			$setMethod = 'setValue';
-			$trim = false;
 			switch($key) {
+				case 'ldapAgentPassword':
+					$setMethod = 'setRawValue';
+					break;
 				case 'homeFolderNamingRule':
-					if(!empty($val) && strpos($val, 'attr:') === false) {
-						$val = 'attr:'.$val;
+					if(!empty(trim($val)) && strpos($val, 'attr:') === false) {
+						$val = 'attr:'.trim($val);
 					}
 					break;
 				case 'ldapBase':
 				case 'ldapBaseUsers':
 				case 'ldapBaseGroups':
-					$trim = true;// Prevent login errors due to whitespace
 				case 'ldapAttributesForUserSearch':
 				case 'ldapAttributesForGroupSearch':
 				case 'ldapUserFilterObjectclass':
@@ -166,7 +167,7 @@ class Configuration {
 					$setMethod = 'setMultiLine';
 					break;
 			}
-			$this->$setMethod($key, $val, $trim);
+			$this->$setMethod($key, $val);
 			if(is_array($applied)) {
 				$applied[] = $inputKey;
 			}
@@ -280,7 +281,7 @@ class Configuration {
 	 * @param array|string $value to set
 	 * @param boolean $trim Trim value? (default: false)
 	 */
-	protected function setMultiLine($varName, $value, $trim = false) {
+	protected function setMultiLine($varName, $value) {
 		if(empty($value)) {
 			$value = '';
 		} else if (!is_array($value)) {
@@ -290,17 +291,25 @@ class Configuration {
 			}
 		}
 
-		if($trim) {
-			if(!is_array($value)) {
-				$value = trim($value);
-			} else {
-				foreach($value as $key => $val) {
-					$value[$key] = trim($val);
+		if(!is_array($value)) {
+			$finalValue = trim($value);
+		} else {
+			$finalValue = [];
+			foreach($value as $key => $val) {
+				if(is_string($val)) {
+					$val = trim($val);
+					if(!empty($val)) {
+						//accidental line breaks are not wanted and can cause
+						// odd behaviour. Thus, away with them.
+						$finalValue[] = $val;
+					}
+				} else {
+					$finalValue[] = $val;
 				}
 			}
 		}
 
-		$this->setValue($varName, $value);
+		$this->setRawValue($varName, $finalValue);
 	}
 
 	/**
@@ -347,15 +356,24 @@ class Configuration {
 	 * 
 	 * @param string $varName name of config key
 	 * @param mixed $value to set
-	 * @param boolean $trim Trim value? (default: false)
 	 */
-	protected function setValue($varName, $value, $trim = false) {
-		if($trim && is_string($value)) {
+	protected function setValue($varName, $value) {
+		if(is_string($value)) {
 			$value = trim($value);
 		}
 		$this->config[$varName] = $value;
 	}
 
+	/**
+	 * Sets a scalar value without trimming.
+	 *
+	 * @param string $varName name of config key
+	 * @param mixed $value to set
+	 */
+	protected function setRawValue($varName, $value) {
+		$this->config[$varName] = $value;
+	}
+
 	/**
 	 * @param string $varName
 	 * @param string $value
diff --git a/apps/user_ldap/tests/configuration.php b/apps/user_ldap/tests/configuration.php
new file mode 100644
index 00000000000..efe4d7eec83
--- /dev/null
+++ b/apps/user_ldap/tests/configuration.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\user_ldap\tests;
+
+class Test_Configuration extends \Test\TestCase {
+
+	public function configurationDataProvider() {
+		$inputWithDN = array(
+			'cn=someUsers,dc=example,dc=org',
+			'  ',
+			' cn=moreUsers,dc=example,dc=org '
+		);
+		$expectWithDN = array(
+			'cn=someUsers,dc=example,dc=org',
+			'cn=moreUsers,dc=example,dc=org'
+		);
+
+		$inputNames = array(
+			'  uid  ',
+			'cn ',
+			' ',
+			'',
+			' whats my name',
+		    '	'
+		);
+		$expectedNames = array('uid', 'cn', 'whats my name');
+
+		$inputString = ' alea iacta est ';
+		$expectedString = 'alea iacta est';
+
+		$inputHomeFolder = array(
+			' homeDirectory ',
+			' attr:homeDirectory ',
+			' '
+		);
+
+		$expectedHomeFolder = array(
+			'attr:homeDirectory', 'attr:homeDirectory', ''
+		);
+
+		$password = ' such a passw0rd ';
+
+		return array(
+			'set general base' => array('ldapBase', $inputWithDN, $expectWithDN),
+			'set user base'    => array('ldapBaseUsers', $inputWithDN, $expectWithDN),
+			'set group base'   => array('ldapBaseGroups', $inputWithDN, $expectWithDN),
+
+			'set search attributes users'  => array('ldapAttributesForUserSearch', $inputNames, $expectedNames),
+			'set search attributes groups' => array('ldapAttributesForGroupSearch', $inputNames, $expectedNames),
+
+			'set user filter objectclasses'  => array('ldapUserFilterObjectclass', $inputNames, $expectedNames),
+			'set user filter groups'         => array('ldapUserFilterGroups', $inputNames, $expectedNames),
+			'set group filter objectclasses' => array('ldapGroupFilterObjectclass', $inputNames, $expectedNames),
+			'set group filter groups'        => array('ldapGroupFilterGroups', $inputNames, $expectedNames),
+			'set login filter attributes'    => array('ldapLoginFilterAttributes', $inputNames, $expectedNames),
+
+			'set agent password' => array('ldapAgentPassword', $password, $password),
+
+			'set home folder, variant 1' => array('homeFolderNamingRule', $inputHomeFolder[0], $expectedHomeFolder[0]),
+			'set home folder, variant 2' => array('homeFolderNamingRule', $inputHomeFolder[1], $expectedHomeFolder[1]),
+			'set home folder, empty'     => array('homeFolderNamingRule', $inputHomeFolder[2], $expectedHomeFolder[2]),
+
+			// default behaviour, one case is enough, special needs must be tested
+			// individually
+			'set string value' => array('ldapHost', $inputString, $expectedString),
+		);
+	}
+
+	/**
+	 * @dataProvider configurationDataProvider
+	 */
+	public function testSetValue($key, $input, $expected) {
+		$configuration = new \OCA\user_ldap\lib\Configuration('t01', false);
+
+		$settingsInput = array(
+			'ldapBaseUsers' => array(
+				'cn=someUsers,dc=example,dc=org',
+				'  ',
+				' cn=moreUsers,dc=example,dc=org '
+			)
+		);
+
+		$configuration->setConfiguration([$key => $input]);
+		$this->assertSame($configuration->$key, $expected);
+	}
+
+}
-- 
GitLab


From 76a528e5112698afec67eb6fce43e2ba809972ac Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 5 Oct 2015 16:18:14 +0200
Subject: [PATCH 678/783] Make the external share manager a mount provider

---
 apps/files_sharing/lib/external/manager.php   | 61 +++++++------------
 apps/files_sharing/lib/helper.php             |  1 -
 .../tests/external/managertest.php            | 28 +++++++--
 3 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 2ba02f40d2f..662e70d1237 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -28,9 +28,12 @@ namespace OCA\Files_Sharing\External;
 
 use OC\Files\Filesystem;
 use OCP\Files;
+use OCP\Files\Config\IMountProvider;
+use OCP\Files\Storage\IStorageFactory;
 use OC\Notification\IManager;
+use OCP\IUser;
 
-class Manager {
+class Manager implements IMountProvider {
 	const STORAGE = '\OCA\Files_Sharing\External\Storage';
 
 	/**
@@ -152,26 +155,20 @@ class Manager {
 		return $this->mountShare($options);
 	}
 
-	private function setupMounts() {
-		// don't setup server-to-server shares if the admin disabled it
-		if (\OCA\Files_Sharing\Helper::isIncomingServer2serverShareEnabled() === false) {
-			return false;
-		}
-
-		if (!is_null($this->uid)) {
-			$query = $this->connection->prepare('
+	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+		$query = $this->connection->prepare('
 				SELECT `remote`, `share_token`, `password`, `mountpoint`, `owner`
 				FROM `*PREFIX*share_external`
 				WHERE `user` = ? AND `accepted` = ?
 			');
-			$query->execute(array($this->uid, 1));
-
-			while ($row = $query->fetch()) {
-				$row['manager'] = $this;
-				$row['token'] = $row['share_token'];
-				$this->mountShare($row);
-			}
+		$query->execute([$user->getUID(), 1]);
+		$mounts = [];
+		while ($row = $query->fetch()) {
+			$row['manager'] = $this;
+			$row['token'] = $row['share_token'];
+			$mounts[] = $this->getMount($row, $loader);
 		}
+		return $mounts;
 	}
 
 	/**
@@ -275,24 +272,6 @@ class Manager {
 		return ($result['success'] && $status['ocs']['meta']['statuscode'] === 100);
 	}
 
-	/**
-	 * setup the server-to-server mounts
-	 *
-	 * @param array $params
-	 */
-	public static function setup(array $params) {
-		$externalManager = new \OCA\Files_Sharing\External\Manager(
-				\OC::$server->getDatabaseConnection(),
-				\OC\Files\Filesystem::getMountManager(),
-				\OC\Files\Filesystem::getLoader(),
-				\OC::$server->getHTTPHelper(),
-				\OC::$server->getNotificationManager(),
-				$params['user']
-		);
-
-		$externalManager->setupMounts();
-	}
-
 	/**
 	 * remove '/user/files' from the path and trailing slashes
 	 *
@@ -304,16 +283,20 @@ class Manager {
 		return rtrim(substr($path, strlen($prefix)), '/');
 	}
 
+	protected function getMount($data, IStorageFactory $storageFactory) {
+		$data['manager'] = $this;
+		$mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
+		$data['mountpoint'] = $mountPoint;
+		$data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
+		return new Mount(self::STORAGE, $mountPoint, $data, $this, $storageFactory);
+	}
+
 	/**
 	 * @param array $data
 	 * @return Mount
 	 */
 	protected function mountShare($data) {
-		$data['manager'] = $this;
-		$mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
-		$data['mountpoint'] = $mountPoint;
-		$data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
-		$mount = new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
+		$mount = $this->getMount($data, $this->storageLoader);
 		$this->mountManager->addMount($mount);
 		return $mount;
 	}
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
index 38cb73be29c..2d92cac6c94 100644
--- a/apps/files_sharing/lib/helper.php
+++ b/apps/files_sharing/lib/helper.php
@@ -30,7 +30,6 @@ namespace OCA\Files_Sharing;
 class Helper {
 
 	public static function registerHooks() {
-		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OCA\Files_Sharing\External\Manager', 'setup');
 		\OCP\Util::connectHook('OC_Filesystem', 'delete', '\OC\Files\Cache\Shared_Updater', 'deleteHook');
 		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Shared_Updater', 'renameHook');
 		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php
index 8e03c67a9a3..2d31b163064 100644
--- a/apps/files_sharing/tests/external/managertest.php
+++ b/apps/files_sharing/tests/external/managertest.php
@@ -24,8 +24,10 @@ namespace OCA\Files_Sharing\Tests\External;
 use OC\Files\Storage\StorageFactory;
 use OCA\Files_Sharing\External\Manager;
 use OCA\Files_Sharing\Tests\TestCase;
+use Test\Traits\UserTrait;
 
 class ManagerTest extends TestCase {
+	use UserTrait;
 
 	/** @var Manager **/
 	private $manager;
@@ -38,10 +40,17 @@ class ManagerTest extends TestCase {
 
 	private $uid;
 
+	/**
+	 * @var \OCP\IUser
+	 */
+	private $user;
+
 	protected function setUp() {
 		parent::setUp();
 
 		$this->uid = $this->getUniqueID('user');
+		$this->createUser($this->uid, '');
+		$this->user = \OC::$server->getUserManager()->get($this->uid);
 		$this->mountManager = new \OC\Files\Mount\Manager();
 		$this->httpHelper = $httpHelper = $this->getMockBuilder('\OC\HTTPHelper')->disableOriginalConstructor()->getMock();
 		/** @var \OC\HTTPHelper $httpHelper */
@@ -55,6 +64,13 @@ class ManagerTest extends TestCase {
 		);
 	}
 
+	private function setupMounts() {
+		$mounts = $this->manager->getMountsForUser($this->user, new StorageFactory());
+		foreach ($mounts as $mount) {
+			$this->mountManager->addMount($mount);
+		}
+	}
+
 	public function testAddShare() {
 
 		$shareData1 = [
@@ -77,7 +93,7 @@ class ManagerTest extends TestCase {
 		$this->assertCount(1, $openShares);
 		$this->assertExternalShareEntry($shareData1, $openShares[0], 1, '{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
 
-		self::invokePrivate($this->manager, 'setupMounts');
+		$this->setupMounts();
 		$this->assertNotMount('SharedFolder');
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
 
@@ -89,7 +105,7 @@ class ManagerTest extends TestCase {
 		// New share falls back to "-1" appendix, because the name is already taken
 		$this->assertExternalShareEntry($shareData2, $openShares[1], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1');
 
-		self::invokePrivate($this->manager, 'setupMounts');
+		$this->setupMounts();
 		$this->assertNotMount('SharedFolder');
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1');
@@ -111,7 +127,7 @@ class ManagerTest extends TestCase {
 		$this->assertCount(1, $openShares);
 		$this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1');
 
-		self::invokePrivate($this->manager, 'setupMounts');
+		$this->setupMounts();
 		$this->assertMount($shareData1['name']);
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1');
@@ -124,7 +140,7 @@ class ManagerTest extends TestCase {
 		// New share falls back to the original name (no "-\d", because the name is not taken)
 		$this->assertExternalShareEntry($shareData3, $openShares[1], 3, '{{TemporaryMountPointName#' . $shareData3['name'] . '}}');
 
-		self::invokePrivate($this->manager, 'setupMounts');
+		$this->setupMounts();
 		$this->assertMount($shareData1['name']);
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1');
@@ -136,7 +152,7 @@ class ManagerTest extends TestCase {
 		// Decline the third share
 		$this->manager->declineShare($openShares[1]['id']);
 
-		self::invokePrivate($this->manager, 'setupMounts');
+		$this->setupMounts();
 		$this->assertMount($shareData1['name']);
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1');
@@ -151,7 +167,7 @@ class ManagerTest extends TestCase {
 		$this->assertCount(1, $openShares);
 		$this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1');
 
-		self::invokePrivate($this->manager, 'setupMounts');
+		$this->setupMounts();
 		$this->assertMount($shareData1['name']);
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
 		$this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1');
-- 
GitLab


From a0c9dc298680eaa4f9f077978d8baefdec102d93 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 5 Oct 2015 16:19:13 +0200
Subject: [PATCH 679/783] register the external share mount provider

---
 apps/files_sharing/appinfo/application.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index ad5d5d63231..c3e2a1d707d 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -138,6 +138,7 @@ class Application extends App {
 		$server = $this->getContainer()->query('ServerContainer');
 		$mountProviderCollection = $server->getMountProviderCollection();
 		$mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
+		$mountProviderCollection->registerProvider($this->getContainer()->query('ExternalManager'));
 	}
 
 	public function setupPropagation() {
-- 
GitLab


From e1c562f66b8547e0418a14f9f4fe8616c622caa8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 5 Oct 2015 16:39:11 +0200
Subject: [PATCH 680/783] extract the mount provider from the manager

---
 apps/files_sharing/appinfo/application.php    | 13 +++-
 apps/files_sharing/lib/external/manager.php   | 27 +------
 .../lib/external/mountprovider.php            | 75 +++++++++++++++++++
 3 files changed, 91 insertions(+), 24 deletions(-)
 create mode 100644 apps/files_sharing/lib/external/mountprovider.php

diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index c3e2a1d707d..872229fa743 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -118,6 +118,17 @@ class Application extends App {
 			);
 		});
 
+		$container->registerService('ExternalMountProvider', function (IContainer $c) {
+			/** @var \OCP\IServerContainer $server */
+			$server = $c->query('ServerContainer');
+			return new \OCA\Files_Sharing\External\MountProvider(
+				$server->getDatabaseConnection(),
+				function() use ($c) {
+					return $c->query('ExternalManager');
+				}
+			);
+		});
+
 		$container->registerService('PropagationManager', function (IContainer $c) {
 			/** @var \OCP\IServerContainer $server */
 			$server = $c->query('ServerContainer');
@@ -138,7 +149,7 @@ class Application extends App {
 		$server = $this->getContainer()->query('ServerContainer');
 		$mountProviderCollection = $server->getMountProviderCollection();
 		$mountProviderCollection->registerProvider($this->getContainer()->query('MountProvider'));
-		$mountProviderCollection->registerProvider($this->getContainer()->query('ExternalManager'));
+		$mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
 	}
 
 	public function setupPropagation() {
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 662e70d1237..a017a465b55 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -28,12 +28,9 @@ namespace OCA\Files_Sharing\External;
 
 use OC\Files\Filesystem;
 use OCP\Files;
-use OCP\Files\Config\IMountProvider;
-use OCP\Files\Storage\IStorageFactory;
 use OC\Notification\IManager;
-use OCP\IUser;
 
-class Manager implements IMountProvider {
+class Manager {
 	const STORAGE = '\OCA\Files_Sharing\External\Storage';
 
 	/**
@@ -155,22 +152,6 @@ class Manager implements IMountProvider {
 		return $this->mountShare($options);
 	}
 
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$query = $this->connection->prepare('
-				SELECT `remote`, `share_token`, `password`, `mountpoint`, `owner`
-				FROM `*PREFIX*share_external`
-				WHERE `user` = ? AND `accepted` = ?
-			');
-		$query->execute([$user->getUID(), 1]);
-		$mounts = [];
-		while ($row = $query->fetch()) {
-			$row['manager'] = $this;
-			$row['token'] = $row['share_token'];
-			$mounts[] = $this->getMount($row, $loader);
-		}
-		return $mounts;
-	}
-
 	/**
 	 * get share
 	 *
@@ -283,12 +264,12 @@ class Manager implements IMountProvider {
 		return rtrim(substr($path, strlen($prefix)), '/');
 	}
 
-	protected function getMount($data, IStorageFactory $storageFactory) {
+	public function getMount($data) {
 		$data['manager'] = $this;
 		$mountPoint = '/' . $this->uid . '/files' . $data['mountpoint'];
 		$data['mountpoint'] = $mountPoint;
 		$data['certificateManager'] = \OC::$server->getCertificateManager($this->uid);
-		return new Mount(self::STORAGE, $mountPoint, $data, $this, $storageFactory);
+		return new Mount(self::STORAGE, $mountPoint, $data, $this, $this->storageLoader);
 	}
 
 	/**
@@ -296,7 +277,7 @@ class Manager implements IMountProvider {
 	 * @return Mount
 	 */
 	protected function mountShare($data) {
-		$mount = $this->getMount($data, $this->storageLoader);
+		$mount = $this->getMount($data);
 		$this->mountManager->addMount($mount);
 		return $mount;
 	}
diff --git a/apps/files_sharing/lib/external/mountprovider.php b/apps/files_sharing/lib/external/mountprovider.php
new file mode 100644
index 00000000000..59072c203fb
--- /dev/null
+++ b/apps/files_sharing/lib/external/mountprovider.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_Sharing\External;
+
+use OCP\Files\Config\IMountProvider;
+use OCP\Files\Storage\IStorageFactory;
+use OCP\IDBConnection;
+use OCP\IUser;
+
+class MountProvider implements IMountProvider {
+	const STORAGE = '\OCA\Files_Sharing\External\Storage';
+
+	/**
+	 * @var \OCP\IDBConnection
+	 */
+	private $connection;
+
+	/**
+	 * @var callable
+	 */
+	private $managerProvider;
+
+	/**
+	 * @param \OCP\IDBConnection $connection
+	 * @param callable $managerProvider due to setup order we need a callable that return the manager instead of the manager itself
+	 */
+	public function __construct(IDBConnection $connection, callable $managerProvider) {
+		$this->connection = $connection;
+		$this->managerProvider = $managerProvider;
+	}
+
+	public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
+		$data['manager'] = $this;
+		$mountPoint = '/' . $user->getUID() . '/files' . $data['mountpoint'];
+		$data['mountpoint'] = $mountPoint;
+		$data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());
+		$managerProvider = $this->managerProvider;
+		return new Mount(self::STORAGE, $mountPoint, $data, $managerProvider(), $storageFactory);
+	}
+
+	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+		$query = $this->connection->prepare('
+				SELECT `remote`, `share_token`, `password`, `mountpoint`, `owner`
+				FROM `*PREFIX*share_external`
+				WHERE `user` = ? AND `accepted` = ?
+			');
+		$query->execute([$user->getUID(), 1]);
+		$mounts = [];
+		while ($row = $query->fetch()) {
+			$row['manager'] = $this;
+			$row['token'] = $row['share_token'];
+			$mounts[] = $this->getMount($user, $row, $loader);
+		}
+		return $mounts;
+	}
+}
-- 
GitLab


From 52c8b488cb0dd0fc95078602eb1e14516c74ae2e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 5 Oct 2015 16:43:10 +0200
Subject: [PATCH 681/783] fix test

---
 apps/files_sharing/tests/external/managertest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php
index 2d31b163064..7242779d455 100644
--- a/apps/files_sharing/tests/external/managertest.php
+++ b/apps/files_sharing/tests/external/managertest.php
@@ -23,6 +23,7 @@ namespace OCA\Files_Sharing\Tests\External;
 
 use OC\Files\Storage\StorageFactory;
 use OCA\Files_Sharing\External\Manager;
+use OCA\Files_Sharing\External\MountProvider;
 use OCA\Files_Sharing\Tests\TestCase;
 use Test\Traits\UserTrait;
 
@@ -44,6 +45,7 @@ class ManagerTest extends TestCase {
 	 * @var \OCP\IUser
 	 */
 	private $user;
+	private $mountProvider;
 
 	protected function setUp() {
 		parent::setUp();
@@ -62,10 +64,13 @@ class ManagerTest extends TestCase {
 			\OC::$server->getNotificationManager(),
 			$this->uid
 		);
+		$this->mountProvider = new MountProvider(\OC::$server->getDatabaseConnection(), function() {
+			return $this->manager;
+		});
 	}
 
 	private function setupMounts() {
-		$mounts = $this->manager->getMountsForUser($this->user, new StorageFactory());
+		$mounts = $this->mountProvider->getMountsForUser($this->user, new StorageFactory());
 		foreach ($mounts as $mount) {
 			$this->mountManager->addMount($mount);
 		}
-- 
GitLab


From 149792abe629c3105c7966ffb14c7514d4bcb3c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 28 Sep 2015 13:14:32 +0200
Subject: [PATCH 682/783] Clean PHPDoc

---
 lib/private/streamer.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/private/streamer.php b/lib/private/streamer.php
index 6f0a70e2388..b6e6892b6c7 100644
--- a/lib/private/streamer.php
+++ b/lib/private/streamer.php
@@ -89,9 +89,9 @@ class Streamer {
 	/**
 	 * Add a file to the archive at the specified location and file name.
 	 *
-	 * @param string $stream      Stream to read data from
-	 * @param string $internalName    Filepath and name to be used in the archive.
-	 * @param int $size           Filesize
+	 * @param string $stream Stream to read data from
+	 * @param string $internalName Filepath and name to be used in the archive.
+	 * @param int $size Filesize
 	 * @return bool $success
 	 */
 	public function addFileFromStream($stream, $internalName, $size){
@@ -101,17 +101,17 @@ class Streamer {
 			return $this->streamerInstance->addFileFromStream($stream, $internalName, $size);
 		}
 	}
-	
+
 	/**
 	 * Add an empty directory entry to the archive.
 	 *
-	 * @param string $directoryPath  Directory Path and name to be added to the archive.
+	 * @param string $dirName Directory Path and name to be added to the archive.
 	 * @return bool $success
 	 */
 	public function addEmptyDir($dirName){
 		return $this->streamerInstance->addEmptyDir($dirName);
 	}
-	
+
 	/**
 	 * Close the archive.
 	 * A closed archive can no longer have new files added to it. After
-- 
GitLab


From b5dce05cb6856cfd99bded35ca87b4a8c12813bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 28 Sep 2015 13:14:51 +0200
Subject: [PATCH 683/783] Lock files which are zipped

---
 lib/private/files.php | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/lib/private/files.php b/lib/private/files.php
index 86ebf40cc57..5befda3bad5 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -40,7 +40,6 @@
  *
  */
 
-use OC\Lock\NoopLockingProvider;
 use OC\Streamer;
 use OCP\Lock\ILockingProvider;
 
@@ -63,10 +62,11 @@ class OC_Files {
 		OC_Response::setContentDispositionHeader($name, 'attachment');
 		header('Content-Transfer-Encoding: binary');
 		OC_Response::disableCaching();
-		$filesize = \OC\Files\Filesystem::filesize($filename);
-		header('Content-Type: '.\OC_Helper::getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename)));
-		if ($filesize > -1) {
-			OC_Response::setContentLengthHeader($filesize);
+		$fileSize = \OC\Files\Filesystem::filesize($filename);
+		$type = \OC::$server->getMimeTypeDetector()->getSecureMimeType(\OC\Files\Filesystem::getMimeType($filename));
+		header('Content-Type: '.$type);
+		if ($fileSize > -1) {
+			OC_Response::setContentLengthHeader($fileSize);
 		}
 	}
 
@@ -122,7 +122,17 @@ class OC_Files {
 			if ($getType === self::FILE) {
 				$view->lockFile($filename, ILockingProvider::LOCK_SHARED);
 			}
-			
+			if ($getType === self::ZIP_FILES) {
+				foreach ($files as $file) {
+					$file = $dir . '/' . $file;
+					$view->lockFile($file, ILockingProvider::LOCK_SHARED);
+				}
+			}
+			if ($getType === self::ZIP_DIR) {
+				$file = $dir . '/' . $files;
+				$view->lockFile($file, ILockingProvider::LOCK_SHARED);
+			}
+
 			if ($streamer) {
 				$streamer->sendHeaders($name);
 			} elseif (\OC\Files\Filesystem::isReadable($filename)) {
@@ -166,6 +176,16 @@ class OC_Files {
 			if ($getType === self::FILE) {
 				$view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
 			}
+			if ($getType === self::ZIP_FILES) {
+				foreach ($files as $file) {
+					$file = $dir . '/' . $file;
+					$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
+				}
+			}
+			if ($getType === self::ZIP_DIR) {
+				$file = $dir . '/' . $files;
+				$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
+			}
 		} catch (\OCP\Lock\LockedException $ex) {
 			$l = \OC::$server->getL10N('core');
 			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
-- 
GitLab


From def8e0c12a263e16ec7245c5be47b6aed10f7a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 2 Oct 2015 17:40:45 +0200
Subject: [PATCH 684/783] log the exception during zip creation

---
 lib/private/files.php | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/lib/private/files.php b/lib/private/files.php
index 5befda3bad5..4783a617065 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -173,24 +173,14 @@ class OC_Files {
 			} else {
 				\OC\Files\Filesystem::readfile($filename);
 			}
-			if ($getType === self::FILE) {
-				$view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
-			}
-			if ($getType === self::ZIP_FILES) {
-				foreach ($files as $file) {
-					$file = $dir . '/' . $file;
-					$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
-				}
-			}
-			if ($getType === self::ZIP_DIR) {
-				$file = $dir . '/' . $files;
-				$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
-			}
+			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
 		} catch (\OCP\Lock\LockedException $ex) {
+			OC::$server->getLogger()->logException($ex);
 			$l = \OC::$server->getL10N('core');
 			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
 			\OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint);
 		} catch (\Exception $ex) {
+			OC::$server->getLogger()->logException($ex);
 			$l = \OC::$server->getL10N('core');
 			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
 			\OC_Template::printErrorPage($l->t('Can\'t read file'), $hint);
@@ -278,4 +268,27 @@ class OC_Files {
 		}
 		return false;
 	}
+
+	/**
+	 * @param $dir
+	 * @param $files
+	 * @param $getType
+	 * @param $view
+	 * @param $filename
+	 */
+	private static function unlockAllTheFiles($dir, $files, $getType, $view, $filename) {
+		if ($getType === self::FILE) {
+			$view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
+		}
+		if ($getType === self::ZIP_FILES) {
+			foreach ($files as $file) {
+				$file = $dir . '/' . $file;
+				$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
+			}
+		}
+		if ($getType === self::ZIP_DIR) {
+			$file = $dir . '/' . $files;
+			$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
+		}
+	}
 }
-- 
GitLab


From 3bf818450a826d296b8e56ab41f91b3f9f8112f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 2 Oct 2015 17:42:18 +0200
Subject: [PATCH 685/783]  release locks in case of exception

---
 lib/private/files.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/private/files.php b/lib/private/files.php
index 4783a617065..af3a8ac574d 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -175,11 +175,13 @@ class OC_Files {
 			}
 			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
 		} catch (\OCP\Lock\LockedException $ex) {
+			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
 			OC::$server->getLogger()->logException($ex);
 			$l = \OC::$server->getL10N('core');
 			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
 			\OC_Template::printErrorPage($l->t('File is currently busy, please try again later'), $hint);
 		} catch (\Exception $ex) {
+			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
 			OC::$server->getLogger()->logException($ex);
 			$l = \OC::$server->getL10N('core');
 			$hint = method_exists($ex, 'getHint') ? $ex->getHint() : '';
-- 
GitLab


From e468b38bd4349f871d15efa506c3f5e362faea39 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 5 Oct 2015 17:14:39 +0200
Subject: [PATCH 686/783] sanitize mountpoint

---
 apps/files_sharing/lib/external/mountprovider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/external/mountprovider.php b/apps/files_sharing/lib/external/mountprovider.php
index 59072c203fb..1739cec543f 100644
--- a/apps/files_sharing/lib/external/mountprovider.php
+++ b/apps/files_sharing/lib/external/mountprovider.php
@@ -50,7 +50,7 @@ class MountProvider implements IMountProvider {
 
 	public function getMount(IUser $user, $data, IStorageFactory $storageFactory) {
 		$data['manager'] = $this;
-		$mountPoint = '/' . $user->getUID() . '/files' . $data['mountpoint'];
+		$mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/');
 		$data['mountpoint'] = $mountPoint;
 		$data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID());
 		$managerProvider = $this->managerProvider;
-- 
GitLab


From 1c7244c1201ac607cc1b244551fa8f5282572ba7 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 5 Oct 2015 11:27:47 +0200
Subject: [PATCH 687/783] Remove invalid share items from result when missing
 group membership

Group shares usually have subshare entries for every user. In some
situations it can happen that the user was removed from the group but
the subshare entries still exist.

This fix makes sure that such subshare entries are not returned any more
as the user isn't in the group any more.
---
 lib/private/share/share.php |  6 ++++++
 tests/lib/share/share.php   | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 32389f34868..264dac30bb3 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1908,6 +1908,12 @@ class Share extends Constants {
 				$items = array_merge($items, $collectionItems);
 			}
 
+			// filter out invalid items, these can appear when subshare entries exist
+			// for a group in which the requested user isn't a member any more
+			$items = array_filter($items, function($item) {
+				return $item['share_type'] !== self::$shareTypeGroupUserUnique;
+			});
+
 			return self::formatResult($items, $column, $backend, $format, $parameters);
 		} elseif ($includeCollections && $collectionTypes && in_array('folder', $collectionTypes)) {
 			// FIXME: Thats a dirty hack to improve file sharing performance,
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 58a76470afa..eeabe852635 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -898,6 +898,43 @@ class Test_Share extends \Test\TestCase {
 		$this->assertEmpty($expected, 'did not found all expected values');
 	}
 
+	public function testGetShareSubItemsWhenUserNotInGroup() {
+		OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, \OCP\Constants::PERMISSION_READ);
+
+		$result = \OCP\Share::getItemsSharedWithUser('test', $this->user2);
+		$this->assertCount(1, $result);
+
+		$groupShareId = array_keys($result)[0];
+
+		// remove user from group
+		$userObject = \OC::$server->getUserManager()->get($this->user2);
+		\OC::$server->getGroupManager()->get($this->group1)->removeUser($userObject);
+
+		$result = \OCP\Share::getItemsSharedWithUser('test', $this->user2);
+		$this->assertCount(0, $result);
+
+		// test with buggy data
+		$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$qb->insert('share')
+			->values([
+				'share_type' => $qb->expr()->literal(2), // group sub-share
+				'share_with' => $qb->expr()->literal($this->user2),
+				'parent' => $qb->expr()->literal($groupShareId),
+				'uid_owner' => $qb->expr()->literal($this->user1),
+				'item_type' => $qb->expr()->literal('test'),
+				'item_source' => $qb->expr()->literal('test.txt'),
+				'item_target' => $qb->expr()->literal('test.txt'),
+				'file_target' => $qb->expr()->literal('test2.txt'),
+				'permissions' => $qb->expr()->literal(1),
+				'stime' => $qb->expr()->literal(time()),
+			])->execute();
+
+		$result = \OCP\Share::getItemsSharedWithUser('test', $this->user2);
+		$this->assertCount(0, $result);
+
+		$qb->delete('share')->execute();
+	}
+
 	public function testShareItemWithLink() {
 		OC_User::setUserId($this->user1);
 		$token = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, \OCP\Constants::PERMISSION_READ);
-- 
GitLab


From 57f841da2c414209ad9d4ae5a1cd0ac5ba604b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 5 Oct 2015 17:31:37 +0200
Subject: [PATCH 688/783] Recursively lock folder contents

---
 lib/private/files.php | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/lib/private/files.php b/lib/private/files.php
index af3a8ac574d..099602d56b0 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -40,6 +40,7 @@
  *
  */
 
+use OC\Files\View;
 use OC\Streamer;
 use OCP\Lock\ILockingProvider;
 
@@ -123,14 +124,10 @@ class OC_Files {
 				$view->lockFile($filename, ILockingProvider::LOCK_SHARED);
 			}
 			if ($getType === self::ZIP_FILES) {
-				foreach ($files as $file) {
-					$file = $dir . '/' . $file;
-					$view->lockFile($file, ILockingProvider::LOCK_SHARED);
-				}
+				self::lockFiles($view, $dir, $files);
 			}
 			if ($getType === self::ZIP_DIR) {
-				$file = $dir . '/' . $files;
-				$view->lockFile($file, ILockingProvider::LOCK_SHARED);
+				self::lockFiles($view, $dir, $files);
 			}
 
 			if ($streamer) {
@@ -189,6 +186,30 @@ class OC_Files {
 		}
 	}
 
+	/**
+	 * @param View $view
+	 * @param $dir
+	 * @param string[]|string $files
+	 */
+	public static function lockFiles($view, $dir, $files) {
+		if (!is_array($files)) {
+			$file = $dir . '/' . $files;
+			$files = [$file];
+		}
+		foreach ($files as $file) {
+			$file = $dir . '/' . $file;
+			$view->lockFile($file, ILockingProvider::LOCK_SHARED);
+			if ($view->is_dir($file)) {
+				$contents = $view->getDirectoryContent($file);
+				$contents = array_map(function($fileInfo) use ($file) {
+					/** @var \OCP\Files\FileInfo $fileInfo */
+					return $file . '/' . $fileInfo->getName();
+				}, $contents);
+				self::lockFiles($view, $dir, $contents);
+			}
+		}
+	}
+
 	/**
 	 * set the maximum upload size limit for apache hosts using .htaccess
 	 *
-- 
GitLab


From bc727d67cacc3737c50f039ff376b725c8af1bf4 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 5 Oct 2015 17:34:28 +0200
Subject: [PATCH 689/783] Make sidebar properly fullscreen in mobile/compact
 mode

---
 core/css/mobile.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/css/mobile.css b/core/css/mobile.css
index e8ed33933b7..26f7b8520b9 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -83,7 +83,7 @@
 }
 
 #app-sidebar{
-	width: 100%;
+	width: 100% !important;
 }
 
 /* allow horizontal scrollbar in settings
-- 
GitLab


From c17d60165a47d410721b9b043b9244c85a37b346 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 5 Oct 2015 17:44:25 +0200
Subject: [PATCH 690/783] Fix tooltip placement on rename error

---
 apps/files/js/filelist.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 2516dd3e957..6cf82391baf 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1783,7 +1783,7 @@
 					}
 				} catch (error) {
 					input.attr('title', error);
-					input.tooltip({placement: 'left', trigger: 'manual'});
+					input.tooltip({placement: 'right', trigger: 'manual'});
 					input.tooltip('show');
 					input.addClass('error');
 				}
@@ -1797,7 +1797,7 @@
 					input.removeClass('error');
 				} catch (error) {
 					input.attr('title', error);
-					input.tooltip({placement: 'left', trigger: 'manual'});
+					input.tooltip({placement: 'right', trigger: 'manual'});
 					input.tooltip('show');
 					input.addClass('error');
 				}
-- 
GitLab


From be46cd6737f7b4414d4583d0096d90b73929ce3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 5 Oct 2015 17:47:15 +0200
Subject: [PATCH 691/783] Refactor single file download into it's own method

---
 lib/private/files.php | 147 ++++++++++++++++++++----------------------
 1 file changed, 71 insertions(+), 76 deletions(-)

diff --git a/lib/private/files.php b/lib/private/files.php
index 099602d56b0..e49e0ffdbc2 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -79,97 +79,65 @@ class OC_Files {
 	 * @param boolean $onlyHeader ; boolean to only send header of the request
 	 */
 	public static function get($dir, $files, $onlyHeader = false) {
-		$view = \OC\Files\Filesystem::getView();
 
-		if (is_array($files) && count($files) === 1) {
-			$files = $files[0];
-		}
+		$view = \OC\Files\Filesystem::getView();
+		$getType = self::FILE;
+		$filename = $dir;
+		try {
 
-		if (is_array($files)) {
-			$getType = self::ZIP_FILES;
-			$basename = basename($dir);
-			if ($basename) {
-				$name = $basename;
-			} else {
-				$name = 'download';
+			if (is_array($files) && count($files) === 1) {
+				$files = $files[0];
+				$filename = $dir . '/' . $files;
+				if (!$view->is_dir($files)) {
+					self::getSingleFile($view, $dir, $files, $onlyHeader);
+					return;
+				}
 			}
 
-			$filename = $dir . '/' . $name;
-		} else {
-			$filename = $dir . '/' . $files;
-			if (\OC\Files\Filesystem::is_dir($dir . '/' . $files)) {
+			$name = 'download';
+			if (is_array($files)) {
+				$getType = self::ZIP_FILES;
+				$basename = basename($dir);
+				if ($basename) {
+					$name = $basename;
+				}
+
+				$filename = $dir . '/' . $name;
+			} else {
+				$filename = $dir . '/' . $files;
 				$getType = self::ZIP_DIR;
 				// downloading root ?
-				if ($files === '') {
-					$name = 'download';
-				} else {
+				if ($files !== '') {
 					$name = $files;
 				}
-
-			} else {
-				$getType = self::FILE;
-				$name = $files;
 			}
-		}
 
-		if ($getType === self::FILE) {
-			$streamer = false;
-		} else {
 			$streamer = new Streamer();
-		}
-		OC_Util::obEnd();
+			OC_Util::obEnd();
 
-		try {
-			if ($getType === self::FILE) {
-				$view->lockFile($filename, ILockingProvider::LOCK_SHARED);
-			}
-			if ($getType === self::ZIP_FILES) {
-				self::lockFiles($view, $dir, $files);
-			}
-			if ($getType === self::ZIP_DIR) {
-				self::lockFiles($view, $dir, $files);
-			}
+			self::lockFiles($view, $dir, $files);
 
-			if ($streamer) {
-				$streamer->sendHeaders($name);
-			} elseif (\OC\Files\Filesystem::isReadable($filename)) {
-				self::sendHeaders($filename, $name);
-			} elseif (!\OC\Files\Filesystem::file_exists($filename)) {
-				header("HTTP/1.0 404 Not Found");
-				$tmpl = new OC_Template('', '404', 'guest');
-				$tmpl->printPage();
-				exit();
-			} else {
-				header("HTTP/1.0 403 Forbidden");
-				die('403 Forbidden');
-			}
-			if ($onlyHeader) {
-				return;
-			}
-			if ($streamer) {
-				$executionTime = intval(ini_get('max_execution_time'));
-				set_time_limit(0);
-				if ($getType === self::ZIP_FILES) {
-					foreach ($files as $file) {
-						$file = $dir . '/' . $file;
-						if (\OC\Files\Filesystem::is_file($file)) {
-							$fileSize = \OC\Files\Filesystem::filesize($file);
-							$fh = \OC\Files\Filesystem::fopen($file, 'r');
-							$streamer->addFileFromStream($fh, basename($file), $fileSize);
-							fclose($fh);
-						} elseif (\OC\Files\Filesystem::is_dir($file)) {
-							$streamer->addDirRecursive($file);
-						}
+			$streamer->sendHeaders($name);
+			$executionTime = intval(ini_get('max_execution_time'));
+			set_time_limit(0);
+			if ($getType === self::ZIP_FILES) {
+				foreach ($files as $file) {
+					$file = $dir . '/' . $file;
+					if (\OC\Files\Filesystem::is_file($file)) {
+						$fileSize = \OC\Files\Filesystem::filesize($file);
+						$fh = \OC\Files\Filesystem::fopen($file, 'r');
+						$streamer->addFileFromStream($fh, basename($file), $fileSize);
+						fclose($fh);
+					} elseif (\OC\Files\Filesystem::is_dir($file)) {
+						$streamer->addDirRecursive($file);
 					}
-				} elseif ($getType === self::ZIP_DIR) {
-					$file = $dir . '/' . $files;
-					$streamer->addDirRecursive($file);
 				}
-				$streamer->finalize();
-				set_time_limit($executionTime);
-			} else {
-				\OC\Files\Filesystem::readfile($filename);
+			} elseif ($getType === self::ZIP_DIR) {
+				$file = $dir . '/' . $files;
+				$streamer->addDirRecursive($file);
 			}
+			$streamer->finalize();
+			set_time_limit($executionTime);
 			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
 		} catch (\OCP\Lock\LockedException $ex) {
 			self::unlockAllTheFiles($dir, $files, $getType, $view, $filename);
@@ -186,6 +154,32 @@ class OC_Files {
 		}
 	}
 
+	/**
+	 * @param View $view
+	 * @param string $name
+	 */
+	private static function getSingleFile($view, $dir, $name, $onlyHeader) {
+		$filename = $dir . '/' . $name;
+		OC_Util::obEnd();
+		$view->lockFile($filename, ILockingProvider::LOCK_SHARED);
+
+		if (\OC\Files\Filesystem::isReadable($filename)) {
+			self::sendHeaders($filename, $name);
+		} elseif (!\OC\Files\Filesystem::file_exists($filename)) {
+			header("HTTP/1.0 404 Not Found");
+			$tmpl = new OC_Template('', '404', 'guest');
+			$tmpl->printPage();
+			exit();
+		} else {
+			header("HTTP/1.0 403 Forbidden");
+			die('403 Forbidden');
+		}
+		if ($onlyHeader) {
+			return;
+		}
+		$view->readfile($filename);
+	}
+
 	/**
 	 * @param View $view
 	 * @param $dir
@@ -296,7 +290,7 @@ class OC_Files {
 	 * @param $dir
 	 * @param $files
 	 * @param $getType
-	 * @param $view
+	 * @param View $view
 	 * @param $filename
 	 */
 	private static function unlockAllTheFiles($dir, $files, $getType, $view, $filename) {
@@ -314,4 +308,5 @@ class OC_Files {
 			$view->unlockFile($file, ILockingProvider::LOCK_SHARED);
 		}
 	}
+
 }
-- 
GitLab


From 353a8e442f895500b8f324c2dc4afd389ac52425 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 1 Oct 2015 00:30:05 +0200
Subject: [PATCH 692/783] fix possible infinite loop when reading groups in the
 wizard

---
 apps/user_ldap/lib/access.php                 | 24 ++++++
 apps/user_ldap/lib/wizard.php                 |  2 +-
 .../integration/lib/integrationtestpaging.php | 81 +++++++++++++++++++
 3 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 apps/user_ldap/tests/integration/lib/integrationtestpaging.php

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 2a605a2a0f0..e5bb4fc10f6 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1466,6 +1466,30 @@ class Access extends LDAPUtility implements user\IUserTools {
 		return $cookie;
 	}
 
+	/**
+	 * checks whether an LDAP paged search operation has more pages that can be
+	 * retrieved, typically when offset and limit are provided.
+	 *
+	 * Be very careful to use it: the last cookie value, which is inspected, can
+	 * be reset by other operations. Best, call it immediately after a search(),
+	 * searchUsers() or searchGroups() call. count-methods are probably safe as
+	 * well. Don't rely on it with any fetchList-method.
+	 * @return bool
+	 */
+	public function hasMoreResults() {
+		if(!$this->connection->hasPagedResultSupport) {
+			return false;
+		}
+
+		if(empty($this->lastCookie) && $this->lastCookie !== '0') {
+			// as in RFC 2696, when all results are returned, the cookie will
+			// be empty.
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 * set a cookie for LDAP paged search run
 	 * @param string $base a string with the base DN for the search
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 8d96e7de91d..8dd7bc5abf6 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -438,7 +438,7 @@ class Wizard extends LDAPUtility {
 				$groupEntries[] = $item;
 			}
 			$offset += $limit;
-		} while (count($groupNames) > 0 && count($groupNames) % $limit === 0);
+		} while ($this->access->hasMoreResults());
 
 		if(count($groupNames) > 0) {
 			natsort($groupNames);
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestpaging.php b/apps/user_ldap/tests/integration/lib/integrationtestpaging.php
new file mode 100644
index 00000000000..f8d008d065f
--- /dev/null
+++ b/apps/user_ldap/tests/integration/lib/integrationtestpaging.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\user_ldap\tests\integration\lib;
+
+use OCA\user_ldap\lib\user\Manager as LDAPUserManager;
+use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
+use OCA\User_LDAP\Mapping\UserMapping;
+use OCA\user_ldap\USER_LDAP;
+
+require_once __DIR__  . '/../../../../../lib/base.php';
+
+class IntegrationTestPaging extends AbstractIntegrationTest {
+	/** @var  UserMapping */
+	protected $mapping;
+
+	/** @var USER_LDAP */
+	protected $backend;
+
+	/**
+	 * prepares the LDAP environment and sets up a test configuration for
+	 * the LDAP backend.
+	 */
+	public function init() {
+		require(__DIR__ . '/../setup-scripts/createExplicitUsers.php');
+		parent::init();
+
+		$this->backend = new \OCA\user_ldap\USER_LDAP($this->access, \OC::$server->getConfig());
+	}
+
+	/**
+	 * tests that paging works properly against a simple example (reading all
+	 * of few users in smallest steps)
+	 *
+	 * @return bool
+	 */
+	protected function case1() {
+		$limit = 1;
+		$offset = 0;
+
+		$filter = 'objectclass=inetorgperson';
+		$attributes = ['cn', 'dn'];
+		$users = [];
+		do {
+			$result = $this->access->searchUsers($filter, $attributes, $limit, $offset);
+			foreach($result as $user) {
+				$users[] = $user['cn'];
+			}
+			$offset += $limit;
+		} while ($this->access->hasMoreResults());
+
+		if(count($users) === 2) {
+			return true;
+		}
+
+		return false;
+	}
+}
+
+require_once(__DIR__ . '/../setup-scripts/config.php');
+$test = new IntegrationTestPaging($host, $port, $adn, $apwd, $bdn);
+$test->init();
+$test->run();
-- 
GitLab


From 99f1112e33af19f7f69f3edd8eb0ef9d78efc654 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Mon, 5 Oct 2015 20:52:25 +0300
Subject: [PATCH 693/783] Reset to auto if not set

---
 apps/files_versions/lib/expiration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_versions/lib/expiration.php b/apps/files_versions/lib/expiration.php
index fba705251e9..4b3cecc1202 100644
--- a/apps/files_versions/lib/expiration.php
+++ b/apps/files_versions/lib/expiration.php
@@ -138,7 +138,7 @@ class Expiration {
 		}
 
 		if (!isset($splitValues[1])) {
-			$maxValue = self::NO_OBLIGATION;
+			$maxValue = 'auto';
 		} else {
 			$maxValue = trim($splitValues[1]);
 		}
-- 
GitLab


From b1ce53f890d51aec97d2423651188e14c445c72e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 7 Sep 2015 17:19:50 +0200
Subject: [PATCH 694/783] use a normal rename when moving from the same storage
 in the encryption wrapper

---
 lib/private/files/storage/wrapper/encryption.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index c80e935b982..e9aabe2e5a2 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -424,6 +424,9 @@ class Encryption extends Wrapper {
 	 * @return bool
 	 */
 	public function moveFromStorage(Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = true) {
+		if ($sourceStorage === $this) {
+			return $this->rename($sourceInternalPath, $targetInternalPath);
+		}
 
 		// TODO clean this up once the underlying moveFromStorage in OC\Files\Storage\Wrapper\Common is fixed:
 		// - call $this->storage->moveFromStorage() instead of $this->copyBetweenStorage
-- 
GitLab


From 8c459a895d3338aa1565a4077add175c7020898d Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Sun, 4 Oct 2015 10:28:58 +0200
Subject: [PATCH 695/783] Do not remove linkshare if there is none

If the password is enforced we can't create a link share right away but
just show the password field. Untoggling the link sharing should not try
to remove the share.

* Added unit test
---
 core/js/sharedialoglinkshareview.js        |  6 +++-
 core/js/tests/specs/sharedialogviewSpec.js | 37 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 3d8fb461461..792062f0e16 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -124,7 +124,11 @@
 					this.$el.find('#linkPassText').focus();
 				}
 			} else {
-				this.model.removeLinkShare();
+				if (this.model.get('linkShare').isLinkShare) {
+					this.model.removeLinkShare();
+				} else {
+					this.$el.find('#linkPass').slideToggle(OC.menuSpeed);
+				}
 			}
 		},
 
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index de6f9944094..b01a3d2cae6 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -231,6 +231,43 @@ describe('OC.Share.ShareDialogView', function() {
 			expect(dialog.$el.find('#linkCheckbox').prop('checked')).toEqual(true);
 			expect(dialog.$el.find('#linkText').val()).toEqual(link);
 		});
+		describe('password', function() {
+			var slideToggleStub;
+
+			beforeEach(function() {
+				$('#allowShareWithLink').val('yes');
+				configModel.set({
+					enforcePasswordForPublicLink: false
+				});
+
+				slideToggleStub = sinon.stub($.fn, 'slideToggle');
+			});
+			afterEach(function() {
+				slideToggleStub.restore();
+			});
+
+			it('enforced but toggled does not fire request', function() {
+				configModel.set('enforcePasswordForPublicLink', true);
+				dialog.render();
+
+				dialog.$el.find('[name=linkCheckbox]').click();
+
+				// The password linkPass field is shown (slideToggle is called).
+				// No request is made yet
+				expect(slideToggleStub.callCount).toEqual(1);
+				expect(slideToggleStub.getCall(0).thisValue.eq(0).attr('id')).toEqual('linkPass');
+				expect(fakeServer.requests.length).toEqual(0);
+				
+				// Now untoggle share by link
+				dialog.$el.find('[name=linkCheckbox]').click();
+				dialog.render();
+
+				// Password field disappears and no ajax requests have been made
+				expect(fakeServer.requests.length).toEqual(0);
+				expect(slideToggleStub.callCount).toEqual(2);
+				expect(slideToggleStub.getCall(1).thisValue.eq(0).attr('id')).toEqual('linkPass');
+			});
+		});
 		describe('expiration date', function() {
 			var shareData;
 			var shareItem;
-- 
GitLab


From a0c950bf88aaf81ea8e5bc079781f9a8ed68ebef Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 5 Oct 2015 21:15:01 +0200
Subject: [PATCH 696/783] Update license header script to only use code changes

* ignores the first lines of a file with the license header
---
 build/license.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/license.php b/build/license.php
index 214ea3c2269..26b02bc71c3 100644
--- a/build/license.php
+++ b/build/license.php
@@ -144,7 +144,9 @@ EOD;
 	}
 
 	private function getAuthors($file) {
-		$out = shell_exec("git blame --line-porcelain $file | sed -n 's/^author //p;s/^author-mail //p' | sed 'N;s/\\n/ /' | sort -f | uniq");
+		// only add authors that changed code and not the license header
+		$licenseHeaderEndsAtLine = trim(shell_exec("grep -n '*/' $file | head -n 1 | cut -d ':' -f 1"));
+		$out = shell_exec("git blame --line-porcelain -L $licenseHeaderEndsAtLine, $file | sed -n 's/^author //p;s/^author-mail //p' | sed 'N;s/\\n/ /' | sort -f | uniq");
 		$authors = explode(PHP_EOL, $out);
 
 		$authors = array_filter($authors, function($author) {
@@ -173,7 +175,6 @@ if (isset($argv[1])) {
 		'../apps/files_versions',
 		'../apps/provisioning_api',
 		'../apps/user_ldap',
-		'../apps/user_webdavauth',
 		'../core',
 		'../lib',
 		'../ocs',
-- 
GitLab


From b945d713845d640d63241de4d5a67813384b88ce Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 5 Oct 2015 20:54:56 +0200
Subject: [PATCH 697/783] update licence headers via script

---
 apps/encryption/appinfo/app.php               |  1 -
 apps/encryption/appinfo/application.php       |  2 --
 apps/encryption/appinfo/register_command.php  |  1 -
 apps/encryption/appinfo/routes.php            |  2 --
 apps/encryption/command/migratekeys.php       |  1 -
 .../controller/recoverycontroller.php         |  2 --
 .../controller/settingscontroller.php         |  1 -
 .../controller/statuscontroller.php           |  1 -
 apps/encryption/hooks/contracts/ihook.php     |  2 --
 apps/encryption/lib/crypto/crypt.php          |  1 -
 apps/encryption/lib/crypto/encryption.php     |  1 -
 apps/encryption/lib/hookmanager.php           |  3 --
 apps/encryption/lib/migration.php             |  2 +-
 apps/encryption/lib/recovery.php              |  2 --
 apps/encryption/lib/session.php               |  2 --
 apps/encryption/lib/users/setup.php           |  1 -
 apps/encryption/lib/util.php                  |  2 --
 .../controller/RecoveryControllerTest.php     |  1 -
 .../controller/SettingsControllerTest.php     |  1 -
 apps/encryption/tests/hooks/UserHooksTest.php |  1 -
 apps/encryption/tests/lib/HookManagerTest.php |  2 --
 apps/encryption/tests/lib/KeyManagerTest.php  |  1 -
 apps/encryption/tests/lib/MigrationTest.php   |  1 -
 apps/encryption/tests/lib/RecoveryTest.php    |  2 --
 apps/encryption/tests/lib/SessionTest.php     |  1 +
 apps/encryption/tests/lib/UtilTest.php        |  2 --
 .../encryption/tests/lib/crypto/cryptTest.php |  1 -
 .../tests/lib/crypto/encryptionTest.php       |  2 --
 apps/encryption/tests/lib/users/SetupTest.php |  3 +-
 apps/files/admin.php                          |  1 +
 apps/files/ajax/list.php                      |  1 -
 apps/files/ajax/scan.php                      |  1 +
 apps/files/ajax/upload.php                    |  1 +
 apps/files/appinfo/remote.php                 |  3 +-
 apps/files/appinfo/routes.php                 |  1 -
 apps/files/appinfo/update.php                 |  1 +
 apps/files/controller/apicontroller.php       |  1 +
 apps/files/tests/ajax_rename.php              |  1 +
 apps/files_external/ajax/applicable.php       |  1 +
 apps/files_external/ajax/oauth1.php           |  2 +-
 apps/files_external/ajax/oauth2.php           |  1 +
 apps/files_external/appinfo/app.php           |  6 +---
 apps/files_external/appinfo/application.php   |  3 +-
 apps/files_external/appinfo/routes.php        |  2 ++
 .../controller/ajaxcontroller.php             |  1 +
 .../controller/globalstoragescontroller.php   |  1 +
 .../controller/storagescontroller.php         |  1 +
 .../controller/userstoragescontroller.php     |  1 +
 apps/files_external/lib/amazons3.php          |  2 ++
 apps/files_external/lib/api.php               |  1 +
 apps/files_external/lib/config.php            |  3 +-
 .../lib/definitionparameter.php               |  2 +-
 apps/files_external/lib/dropbox.php           |  1 +
 apps/files_external/lib/ftp.php               |  1 +
 apps/files_external/lib/google.php            |  1 +
 apps/files_external/lib/missingdependency.php |  2 +-
 apps/files_external/lib/personalmount.php     |  1 +
 apps/files_external/lib/prioritytrait.php     |  2 +-
 apps/files_external/lib/sftp.php              |  2 ++
 apps/files_external/lib/storageconfig.php     |  1 +
 apps/files_external/lib/swift.php             |  2 ++
 apps/files_external/lib/visibilitytrait.php   |  2 +-
 apps/files_external/personal.php              |  1 +
 .../files_external/service/backendservice.php |  2 +-
 .../service/globalstoragesservice.php         |  2 +-
 .../service/storagesservice.php               |  2 +-
 .../service/userstoragesservice.php           |  1 +
 apps/files_external/settings.php              |  2 +-
 .../tests/backends/amazons3.php               |  2 +-
 .../tests/backends/sftp_key.php               |  1 +
 .../globalstoragescontrollertest.php          |  1 +
 .../controller/storagescontrollertest.php     |  2 +-
 .../controller/userstoragescontrollertest.php |  1 +
 .../service/globalstoragesservicetest.php     |  1 +
 .../tests/service/storagesservicetest.php     |  2 +-
 .../tests/service/userstoragesservicetest.php |  1 +
 .../tests/storageconfigtest.php               |  1 +
 apps/files_sharing/ajax/external.php          |  2 ++
 apps/files_sharing/ajax/list.php              |  1 +
 apps/files_sharing/ajax/publicpreview.php     |  1 +
 apps/files_sharing/api/local.php              |  1 +
 apps/files_sharing/api/remote.php             |  1 +
 apps/files_sharing/api/server2server.php      |  2 ++
 apps/files_sharing/api/sharees.php            |  1 +
 apps/files_sharing/appinfo/app.php            |  1 +
 apps/files_sharing/appinfo/application.php    |  3 +-
 apps/files_sharing/appinfo/routes.php         |  1 -
 apps/files_sharing/appinfo/update.php         |  1 +
 apps/files_sharing/lib/cache.php              |  2 ++
 .../lib/connector/publicauth.php              |  1 +
 .../controllers/externalsharescontroller.php  |  1 +
 .../lib/exceptions/s2sexception.php           |  4 +++
 apps/files_sharing/lib/external/manager.php   |  1 +
 apps/files_sharing/lib/external/scanner.php   |  1 +
 apps/files_sharing/lib/helper.php             |  1 +
 apps/files_sharing/lib/hooks.php              |  1 +
 .../lib/middleware/sharingcheckmiddleware.php |  1 +
 .../lib/propagation/changewatcher.php         |  1 -
 .../lib/propagation/propagationmanager.php    |  1 -
 apps/files_sharing/lib/share/file.php         |  2 ++
 apps/files_sharing/lib/share/folder.php       |  2 ++
 apps/files_sharing/lib/sharedmount.php        |  2 ++
 apps/files_sharing/lib/sharedstorage.php      |  1 +
 apps/files_sharing/lib/updater.php            |  2 ++
 apps/files_sharing/public.php                 |  1 -
 apps/files_sharing/publicwebdav.php           |  3 +-
 apps/files_sharing/settings-personal.php      |  1 +
 apps/files_sharing/tests/api/shareestest.php  |  1 +
 apps/files_sharing/tests/capabilities.php     |  1 +
 .../controller/externalsharecontroller.php    |  1 +
 apps/files_sharing/tests/etagpropagation.php  |  1 -
 apps/files_sharing/tests/locking.php          |  3 +-
 .../middleware/sharingcheckmiddleware.php     |  2 +-
 apps/files_sharing/tests/permissions.php      |  1 -
 apps/files_sharing/tests/server2server.php    |  1 +
 apps/files_sharing/tests/share.php            |  1 +
 apps/files_sharing/tests/sharedmount.php      |  1 +
 apps/files_sharing/tests/sizepropagation.php  |  1 -
 apps/files_trashbin/ajax/delete.php           |  1 +
 apps/files_trashbin/ajax/preview.php          |  1 +
 apps/files_trashbin/ajax/undelete.php         |  1 +
 apps/files_trashbin/appinfo/app.php           |  2 +-
 apps/files_trashbin/appinfo/routes.php        |  1 -
 apps/files_trashbin/appinfo/update.php        |  1 +
 apps/files_trashbin/command/cleanup.php       |  1 +
 apps/files_trashbin/command/expire.php        |  1 -
 .../lib/backgroundjob/expiretrash.php         |  1 +
 apps/files_trashbin/lib/expiration.php        |  1 +
 apps/files_trashbin/lib/helper.php            |  1 +
 apps/files_trashbin/lib/hooks.php             |  1 -
 apps/files_trashbin/lib/trashbin.php          |  1 +
 .../tests/command/cleanuptest.php             |  1 +
 apps/files_trashbin/tests/expiration.php      |  1 +
 apps/files_trashbin/tests/storage.php         |  1 +
 apps/files_trashbin/tests/trashbin.php        |  1 +
 apps/files_versions/ajax/getVersions.php      |  1 +
 apps/files_versions/ajax/preview.php          |  2 ++
 apps/files_versions/appinfo/app.php           |  1 +
 apps/files_versions/appinfo/application.php   |  1 +
 apps/files_versions/appinfo/update.php        |  1 +
 apps/files_versions/command/expire.php        |  1 -
 apps/files_versions/lib/hooks.php             |  1 +
 apps/files_versions/lib/storage.php           |  1 +
 apps/files_versions/tests/expirationtest.php  |  1 +
 apps/files_versions/tests/versions.php        |  2 ++
 apps/provisioning_api/appinfo/app.php         |  2 +-
 apps/provisioning_api/appinfo/routes.php      |  1 +
 apps/provisioning_api/lib/apps.php            |  2 ++
 apps/provisioning_api/lib/groups.php          |  2 ++
 apps/provisioning_api/lib/users.php           |  1 +
 apps/provisioning_api/tests/appstest.php      |  2 +-
 apps/provisioning_api/tests/groupstest.php    |  2 +-
 apps/provisioning_api/tests/testcase.php      |  1 +
 apps/user_ldap/ajax/setConfiguration.php      |  1 +
 apps/user_ldap/appinfo/install.php            |  1 +
 apps/user_ldap/appinfo/update.php             |  2 ++
 apps/user_ldap/group_ldap.php                 |  2 ++
 apps/user_ldap/lib/access.php                 |  1 +
 apps/user_ldap/lib/wizard.php                 |  1 +
 apps/user_ldap/tests/group_ldap.php           |  1 +
 .../lib/integrationtestuserhome.php           | 21 ++++++++++---
 .../lib/user/IntegrationTestUserAvatar.php    | 21 ++++++++++++-
 .../setup-scripts/createExplicitGroups.php    | 21 ++++++++++++-
 .../createExplicitGroupsDifferentOU.php       | 21 ++++++++++++-
 .../setup-scripts/createExplicitUsers.php     | 21 ++++++++++++-
 apps/user_ldap/tests/wizard.php               |  1 +
 apps/user_ldap/user_ldap.php                  |  3 +-
 apps/user_ldap/user_proxy.php                 |  1 +
 console.php                                   |  1 +
 core/ajax/preview.php                         |  1 +
 core/ajax/share.php                           |  1 +
 core/avatar/avatarcontroller.php              |  1 +
 core/command/app/checkcode.php                |  2 +-
 core/command/app/disable.php                  |  1 +
 core/command/app/enable.php                   |  1 +
 core/command/encryption/decryptall.php        |  1 +
 core/command/encryption/encryptall.php        |  1 +
 core/command/maintenance/install.php          |  1 -
 .../command/maintenance/mimetype/updatedb.php |  1 +
 .../command/maintenance/mimetype/updatejs.php |  2 ++
 core/command/upgrade.php                      |  1 +
 core/command/user/add.php                     |  1 -
 core/js/config.php                            |  1 +
 core/lostpassword/templates/email.php         |  1 -
 core/register_command.php                     |  2 ++
 core/setup/controller.php                     |  1 -
 cron.php                                      |  2 ++
 index.php                                     |  1 -
 lib/autoloader.php                            |  1 +
 lib/base.php                                  |  4 ++-
 lib/private/activity/event.php                |  1 +
 lib/private/activitymanager.php               |  1 -
 lib/private/api.php                           | 30 +++++++++++++++++++
 lib/private/app.php                           |  2 ++
 lib/private/app/appmanager.php                |  1 +
 lib/private/app/codechecker/nodevisitor.php   |  1 +
 lib/private/app/codechecker/privatecheck.php  |  2 --
 .../app/codechecker/strongcomparisoncheck.php |  2 --
 lib/private/app/dependencyanalyzer.php        |  1 +
 lib/private/appconfig.php                     |  2 --
 .../dependencyinjection/dicontainer.php       |  1 +
 lib/private/appframework/http.php             |  1 +
 lib/private/appframework/http/request.php     |  3 +-
 .../middleware/security/corsmiddleware.php    |  2 +-
 .../appframework/utility/simplecontainer.php  |  2 +-
 lib/private/backgroundjob/joblist.php         |  2 +-
 lib/private/cache/file.php                    |  2 +-
 lib/private/connector/sabre/auth.php          |  1 -
 .../connector/sabre/copyetagheaderplugin.php  |  1 -
 .../sabre/custompropertiesbackend.php         |  1 -
 .../connector/sabre/exceptionloggerplugin.php |  1 +
 .../connector/sabre/maintenanceplugin.php     |  1 +
 lib/private/connector/sabre/serverfactory.php |  1 +
 lib/private/console/application.php           |  1 +
 lib/private/db/ocsqliteplatform.php           |  1 -
 lib/private/encryption/hookmanager.php        |  1 -
 lib/private/encryption/keys/storage.php       |  1 -
 lib/private/encryption/manager.php            |  1 -
 lib/private/encryption/update.php             |  1 -
 lib/private/encryption/util.php               |  1 -
 lib/private/eventsource.php                   |  1 +
 lib/private/files.php                         |  7 +----
 lib/private/files/cache/cache.php             |  2 +-
 lib/private/files/cache/scanner.php           |  2 ++
 lib/private/files/cache/storage.php           |  2 ++
 lib/private/files/fileinfo.php                |  1 +
 lib/private/files/mount/mountpoint.php        |  2 ++
 lib/private/files/storage/common.php          |  1 +
 lib/private/files/storage/dav.php             |  2 --
 lib/private/files/storage/flysystem.php       | 21 ++++++++++---
 lib/private/files/storage/local.php           |  5 +---
 .../files/storage/localtempfiletrait.php      |  1 -
 .../files/storage/polyfill/copydirectory.php  | 22 +++++++++++---
 lib/private/files/storage/temporary.php       |  1 +
 .../files/storage/wrapper/encryption.php      |  1 -
 .../files/storage/wrapper/permissionsmask.php |  2 ++
 lib/private/files/storage/wrapper/wrapper.php |  1 +
 lib/private/files/stream/encryption.php       |  1 -
 lib/private/files/type/detection.php          |  3 +-
 lib/private/files/utils/scanner.php           |  1 +
 lib/private/files/view.php                    |  1 +
 lib/private/helper.php                        |  1 +
 lib/private/http/client/client.php            |  1 +
 lib/private/http/client/response.php          |  1 +
 lib/private/installer.php                     |  1 +
 lib/private/l10n.php                          |  1 -
 lib/private/l10n/factory.php                  |  2 +-
 lib/private/lock/dblockingprovider.php        |  1 +
 lib/private/lock/memcachelockingprovider.php  |  2 --
 lib/private/lock/nooplockingprovider.php      |  1 -
 lib/private/log.php                           |  2 +-
 lib/private/log/rotate.php                    |  1 +
 lib/private/memcache/memcached.php            |  1 +
 lib/private/naturalsort.php                   |  1 +
 lib/private/ocs.php                           |  5 ----
 lib/private/ocs/privatedata.php               |  1 +
 lib/private/ocs/result.php                    |  1 +
 lib/private/ocsclient.php                     |  2 +-
 lib/private/preview/bitmap.php                |  1 +
 lib/private/preview/bmp.php                   |  1 -
 lib/private/preview/gif.php                   |  1 -
 lib/private/preview/image.php                 |  2 +-
 lib/private/preview/jpeg.php                  |  1 -
 lib/private/preview/movie.php                 |  1 -
 lib/private/preview/mp3.php                   |  1 -
 lib/private/preview/office.php                |  3 +-
 lib/private/preview/png.php                   |  1 -
 lib/private/preview/provider.php              |  1 -
 lib/private/preview/svg.php                   |  2 +-
 lib/private/preview/txt.php                   |  1 +
 lib/private/preview/xbitmap.php               |  1 -
 lib/private/route/router.php                  |  1 +
 lib/private/security/crypto.php               |  1 +
 lib/private/server.php                        |  2 ++
 lib/private/session/cryptosessiondata.php     |  1 +
 lib/private/session/cryptowrapper.php         |  2 ++
 lib/private/session/internal.php              |  2 ++
 lib/private/session/memory.php                |  1 +
 lib/private/setup/mysql.php                   |  2 +-
 lib/private/setup/postgresql.php              |  2 +-
 lib/private/share/share.php                   |  1 +
 lib/private/streamer.php                      |  1 +
 lib/private/template.php                      |  1 +
 lib/private/tempmanager.php                   |  2 ++
 lib/private/user/backend.php                  |  2 +-
 lib/private/user/interface.php                |  2 +-
 lib/private/user/manager.php                  |  1 +
 lib/private/user/nouserexception.php          |  1 -
 lib/private/util.php                          |  3 ++
 lib/public/activity/iconsumer.php             |  1 +
 .../http/contentsecuritypolicy.php            |  1 +
 lib/public/appframework/http/jsonresponse.php |  1 +
 lib/public/appframework/http/ocsresponse.php  |  1 +
 lib/public/appframework/iappcontainer.php     |  1 +
 lib/public/appframework/ocscontroller.php     |  1 +
 lib/public/autoloadnotallowedexception.php    |  1 +
 lib/public/db/querybuilder/iliteral.php       |  1 +
 lib/public/db/querybuilder/iparameter.php     |  1 +
 lib/public/db/querybuilder/iqueryfunction.php |  1 +
 lib/public/encryption/iencryptionmodule.php   |  1 -
 lib/public/encryption/imanager.php            |  1 -
 lib/public/files/mount/imountmanager.php      |  1 +
 lib/public/files/storage.php                  |  1 +
 lib/public/http/client/iresponse.php          |  1 +
 lib/public/icontainer.php                     |  2 ++
 lib/public/iservercontainer.php               |  1 +
 lib/public/itempmanager.php                   |  1 +
 lib/public/util.php                           |  2 ++
 lib/repair/filletags.php                      |  1 +
 lib/repair/repairinvalidshares.php            |  1 +
 lib/repair/repairmimetypes.php                |  1 +
 lib/repair/sqliteautoincrement.php            |  1 -
 lib/repair/updateoutdatedocsids.php           |  2 +-
 ocs/routes.php                                |  1 +
 ocs/v1.php                                    |  1 -
 public.php                                    |  2 --
 remote.php                                    |  2 +-
 settings/admin.php                            |  1 -
 settings/ajax/enableapp.php                   |  1 +
 settings/ajax/navigationdetect.php            |  3 +-
 settings/changepassword/controller.php        |  1 -
 settings/controller/certificatecontroller.php |  2 ++
 settings/controller/checksetupcontroller.php  |  2 ++
 settings/controller/encryptioncontroller.php  |  1 +
 settings/personal.php                         |  3 +-
 settings/users.php                            |  2 ++
 status.php                                    |  1 +
 version.php                                   |  2 ++
 328 files changed, 450 insertions(+), 190 deletions(-)

diff --git a/apps/encryption/appinfo/app.php b/apps/encryption/appinfo/app.php
index 2eb12f638ed..1f336c05a8c 100644
--- a/apps/encryption/appinfo/app.php
+++ b/apps/encryption/appinfo/app.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index d89833a5ab2..812f1042a8f 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -2,8 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/encryption/appinfo/register_command.php b/apps/encryption/appinfo/register_command.php
index 0f03b63560a..4987ef24d61 100644
--- a/apps/encryption/appinfo/register_command.php
+++ b/apps/encryption/appinfo/register_command.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php
index a73cc578437..8fa163d0751 100644
--- a/apps/encryption/appinfo/routes.php
+++ b/apps/encryption/appinfo/routes.php
@@ -2,8 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/command/migratekeys.php b/apps/encryption/command/migratekeys.php
index 7e320102172..89e2aa01610 100644
--- a/apps/encryption/command/migratekeys.php
+++ b/apps/encryption/command/migratekeys.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/controller/recoverycontroller.php b/apps/encryption/controller/recoverycontroller.php
index a92c49f539f..f1a2651443e 100644
--- a/apps/encryption/controller/recoverycontroller.php
+++ b/apps/encryption/controller/recoverycontroller.php
@@ -3,8 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/controller/settingscontroller.php b/apps/encryption/controller/settingscontroller.php
index 8e6de19e784..e5bb79a1d40 100644
--- a/apps/encryption/controller/settingscontroller.php
+++ b/apps/encryption/controller/settingscontroller.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/controller/statuscontroller.php b/apps/encryption/controller/statuscontroller.php
index f330f726c0b..409fe1a258b 100644
--- a/apps/encryption/controller/statuscontroller.php
+++ b/apps/encryption/controller/statuscontroller.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/encryption/hooks/contracts/ihook.php b/apps/encryption/hooks/contracts/ihook.php
index 53217f8ac06..d4f20700d78 100644
--- a/apps/encryption/hooks/contracts/ihook.php
+++ b/apps/encryption/hooks/contracts/ihook.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php
index 5d1bb92460a..c55fb00f838 100644
--- a/apps/encryption/lib/crypto/crypt.php
+++ b/apps/encryption/lib/crypto/crypt.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index fde4a2c4a9c..1a05277e20d 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -5,7 +5,6 @@
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/encryption/lib/hookmanager.php b/apps/encryption/lib/hookmanager.php
index 0fea1b0f9f2..ab059369333 100644
--- a/apps/encryption/lib/hookmanager.php
+++ b/apps/encryption/lib/hookmanager.php
@@ -2,9 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/migration.php
index 5396a7db627..1a7c2e9877d 100644
--- a/apps/encryption/lib/migration.php
+++ b/apps/encryption/lib/migration.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/recovery.php b/apps/encryption/lib/recovery.php
index b22e3265628..e7b20e2c4af 100644
--- a/apps/encryption/lib/recovery.php
+++ b/apps/encryption/lib/recovery.php
@@ -2,8 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/session.php b/apps/encryption/lib/session.php
index 1d0c3711487..2c83319d71e 100644
--- a/apps/encryption/lib/session.php
+++ b/apps/encryption/lib/session.php
@@ -3,8 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/users/setup.php
index d4f7c374547..99368cab080 100644
--- a/apps/encryption/lib/users/setup.php
+++ b/apps/encryption/lib/users/setup.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/encryption/lib/util.php b/apps/encryption/lib/util.php
index e9f916eff38..a162dcde305 100644
--- a/apps/encryption/lib/util.php
+++ b/apps/encryption/lib/util.php
@@ -2,8 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/controller/RecoveryControllerTest.php b/apps/encryption/tests/controller/RecoveryControllerTest.php
index d122b992ef0..6c554c97ae9 100644
--- a/apps/encryption/tests/controller/RecoveryControllerTest.php
+++ b/apps/encryption/tests/controller/RecoveryControllerTest.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/controller/SettingsControllerTest.php b/apps/encryption/tests/controller/SettingsControllerTest.php
index 34aa5a27a75..724a01522af 100644
--- a/apps/encryption/tests/controller/SettingsControllerTest.php
+++ b/apps/encryption/tests/controller/SettingsControllerTest.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/hooks/UserHooksTest.php b/apps/encryption/tests/hooks/UserHooksTest.php
index 0b0222ce861..ada0081f649 100644
--- a/apps/encryption/tests/hooks/UserHooksTest.php
+++ b/apps/encryption/tests/hooks/UserHooksTest.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/HookManagerTest.php b/apps/encryption/tests/lib/HookManagerTest.php
index b1d511cb89b..288b27b5d8b 100644
--- a/apps/encryption/tests/lib/HookManagerTest.php
+++ b/apps/encryption/tests/lib/HookManagerTest.php
@@ -2,8 +2,6 @@
 /**
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/lib/KeyManagerTest.php
index 8f1da623efb..35ae8ad6ca0 100644
--- a/apps/encryption/tests/lib/KeyManagerTest.php
+++ b/apps/encryption/tests/lib/KeyManagerTest.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/lib/MigrationTest.php
index bb1f0a310a2..6146e4e7cfb 100644
--- a/apps/encryption/tests/lib/MigrationTest.php
+++ b/apps/encryption/tests/lib/MigrationTest.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/RecoveryTest.php b/apps/encryption/tests/lib/RecoveryTest.php
index c0624a36be9..0cdd76d6b44 100644
--- a/apps/encryption/tests/lib/RecoveryTest.php
+++ b/apps/encryption/tests/lib/RecoveryTest.php
@@ -3,8 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/SessionTest.php b/apps/encryption/tests/lib/SessionTest.php
index 0fa48666d70..1cc0d89a93d 100644
--- a/apps/encryption/tests/lib/SessionTest.php
+++ b/apps/encryption/tests/lib/SessionTest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/apps/encryption/tests/lib/UtilTest.php b/apps/encryption/tests/lib/UtilTest.php
index 9988ff93f43..723cc9fb910 100644
--- a/apps/encryption/tests/lib/UtilTest.php
+++ b/apps/encryption/tests/lib/UtilTest.php
@@ -2,8 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/crypto/cryptTest.php b/apps/encryption/tests/lib/crypto/cryptTest.php
index c6f16e952d7..cad34761840 100644
--- a/apps/encryption/tests/lib/crypto/cryptTest.php
+++ b/apps/encryption/tests/lib/crypto/cryptTest.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php
index 9e0cb2f09d1..f76bdfb6d61 100644
--- a/apps/encryption/tests/lib/crypto/encryptionTest.php
+++ b/apps/encryption/tests/lib/crypto/encryptionTest.php
@@ -2,8 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/users/SetupTest.php b/apps/encryption/tests/lib/users/SetupTest.php
index bca3ff58b07..022bf5dc466 100644
--- a/apps/encryption/tests/lib/users/SetupTest.php
+++ b/apps/encryption/tests/lib/users/SetupTest.php
@@ -1,8 +1,7 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files/admin.php b/apps/files/admin.php
index 349c27ff742..786a8edf2a6 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -7,6 +7,7 @@
  * @author Michael Göhler <somebody.here@gmx.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index 19129e9de11..6cfa04b49d6 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Jakob Sack <mail@jakobsack.de>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 7d47a538fa1..491adaa9b88 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -4,6 +4,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 7ff02d8db8e..a784642728f 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -5,6 +5,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Florian Pritz <bluewind@xinu.at>
  * @author Frank Karlitschek <frank@owncloud.org>
+ * @author Individual IT Services <info@individual-it.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 4d0d8b3e2ec..02f7f3c027f 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * @author Bart Visscher <bartv@thisnet.nl>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Jakob Sack <mail@jakobsack.de>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
index d1b8954d5ce..41aeec6a152 100644
--- a/apps/files/appinfo/routes.php
+++ b/apps/files/appinfo/routes.php
@@ -2,7 +2,6 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Tobias Kaminsky <tobias@kaminsky.me>
  * @author Tom Needham <tom@owncloud.com>
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index ff1369bb1a5..6084435fa5a 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -2,6 +2,7 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files/controller/apicontroller.php b/apps/files/controller/apicontroller.php
index 494d97db7a6..ea5ee81a9f6 100644
--- a/apps/files/controller/apicontroller.php
+++ b/apps/files/controller/apicontroller.php
@@ -4,6 +4,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tobias Kaminsky <tobias@kaminsky.me>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 8abde9094d9..45d49c9549d 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -5,6 +5,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author tbartenstein <tbartenstein@users.noreply.github.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/ajax/applicable.php b/apps/files_external/ajax/applicable.php
index 5ae91c8e182..53a5e83d56a 100644
--- a/apps/files_external/ajax/applicable.php
+++ b/apps/files_external/ajax/applicable.php
@@ -2,6 +2,7 @@
 /**
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/ajax/oauth1.php b/apps/files_external/ajax/oauth1.php
index ca339aeec58..9e7c85cd429 100644
--- a/apps/files_external/ajax/oauth1.php
+++ b/apps/files_external/ajax/oauth1.php
@@ -4,8 +4,8 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Volkan Gezer <volkangezer@gmail.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/ajax/oauth2.php b/apps/files_external/ajax/oauth2.php
index 0a202e3ddcb..a25c6d15a1e 100644
--- a/apps/files_external/ajax/oauth2.php
+++ b/apps/files_external/ajax/oauth2.php
@@ -6,6 +6,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Volkan Gezer <volkangezer@gmail.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index f33012b5f09..40408c0cc0c 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -1,18 +1,14 @@
 <?php
 /**
  * @author Christian Berendt <berendt@b1-systems.de>
- * @author fibsifan <fi@volans.uberspace.de>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author j-ed <juergen@eisfair.org>
- * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
- * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
- * @author Volkan Gezer <volkangezer@gmail.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index 3a222141fb5..3001fddfbaa 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -1,9 +1,10 @@
 <?php
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
index a371273e74e..e0a7d90fc75 100644
--- a/apps/files_external/appinfo/routes.php
+++ b/apps/files_external/appinfo/routes.php
@@ -3,6 +3,8 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/controller/ajaxcontroller.php b/apps/files_external/controller/ajaxcontroller.php
index c285cd34e70..846ede007c9 100644
--- a/apps/files_external/controller/ajaxcontroller.php
+++ b/apps/files_external/controller/ajaxcontroller.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php
index 3c1f2022505..443ddcf221e 100644
--- a/apps/files_external/controller/globalstoragescontroller.php
+++ b/apps/files_external/controller/globalstoragescontroller.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php
index 6a01112f8c5..cefb912930d 100644
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/controller/storagescontroller.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php
index f39f8a85d2d..b0a745c6a7e 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/controller/userstoragescontroller.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 24a0346df63..013424bfeb4 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -7,11 +7,13 @@
  * @author Christopher T. Johnson <ctjctj@gmail.com>
  * @author Johan Björk <johanimon@gmail.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/api.php b/apps/files_external/lib/api.php
index 015c15c41ff..f533a31cf57 100644
--- a/apps/files_external/lib/api.php
+++ b/apps/files_external/lib/api.php
@@ -2,6 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 457fd58f0f8..a9730665654 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -1,16 +1,17 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/definitionparameter.php b/apps/files_external/lib/definitionparameter.php
index 7f883e5fad1..1d3223255e0 100644
--- a/apps/files_external/lib/definitionparameter.php
+++ b/apps/files_external/lib/definitionparameter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 4ab14d4f3e0..4546d81c14e 100644
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -6,6 +6,7 @@
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Sascha Schmidt <realriot@realriot.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index f3631e53fa1..96ccec07f2b 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -8,6 +8,7 @@
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 94f954178c0..0e382062fdc 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -10,6 +10,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/missingdependency.php b/apps/files_external/lib/missingdependency.php
index 9b25aeacc9b..fcc5eb7c843 100644
--- a/apps/files_external/lib/missingdependency.php
+++ b/apps/files_external/lib/missingdependency.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/personalmount.php b/apps/files_external/lib/personalmount.php
index d177f1a1ad0..c8781eae062 100644
--- a/apps/files_external/lib/personalmount.php
+++ b/apps/files_external/lib/personalmount.php
@@ -2,6 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/prioritytrait.php b/apps/files_external/lib/prioritytrait.php
index 22f9fe275d8..ff716a9b881 100644
--- a/apps/files_external/lib/prioritytrait.php
+++ b/apps/files_external/lib/prioritytrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 921e7283c66..69d534b1c26 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -7,7 +7,9 @@
  * @author Lennart Rosam <lennart.rosam@medien-systempartner.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  * @author SA <stephen@mthosting.net>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_external/lib/storageconfig.php b/apps/files_external/lib/storageconfig.php
index aeb8f527078..84a93fab44b 100644
--- a/apps/files_external/lib/storageconfig.php
+++ b/apps/files_external/lib/storageconfig.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 20d2b8f4988..fe273feca00 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -5,10 +5,12 @@
  * @author Christian Berendt <berendt@b1-systems.de>
  * @author Felix Moeller <mail@felixmoeller.de>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/visibilitytrait.php b/apps/files_external/lib/visibilitytrait.php
index dfd2d323ca6..d858e5c5bf4 100644
--- a/apps/files_external/lib/visibilitytrait.php
+++ b/apps/files_external/lib/visibilitytrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index f048d65540b..b363881bef6 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -5,6 +5,7 @@
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/service/backendservice.php
index 1e90247b3e4..cbe67597472 100644
--- a/apps/files_external/service/backendservice.php
+++ b/apps/files_external/service/backendservice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/service/globalstoragesservice.php
index 49ffea43d1b..6912acc3d1d 100644
--- a/apps/files_external/service/globalstoragesservice.php
+++ b/apps/files_external/service/globalstoragesservice.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 83a82de0bed..05097a9446f 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/userstoragesservice.php b/apps/files_external/service/userstoragesservice.php
index 6e3c327c09c..e6acd039541 100644
--- a/apps/files_external/service/userstoragesservice.php
+++ b/apps/files_external/service/userstoragesservice.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index f82ab035c1c..a8e5dcb868b 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -7,7 +7,7 @@
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Vincent Petry <pvince81@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/backends/amazons3.php b/apps/files_external/tests/backends/amazons3.php
index 7e88f3d0b74..4c5adeabecf 100644
--- a/apps/files_external/tests/backends/amazons3.php
+++ b/apps/files_external/tests/backends/amazons3.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/backends/sftp_key.php b/apps/files_external/tests/backends/sftp_key.php
index c83d12251aa..6e8ac9f7239 100644
--- a/apps/files_external/tests/backends/sftp_key.php
+++ b/apps/files_external/tests/backends/sftp_key.php
@@ -2,6 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Ross Nicoll <jrn@jrn.me.uk>
+ * @author Viktor Szépe <viktor@szepe.net>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/controller/globalstoragescontrollertest.php b/apps/files_external/tests/controller/globalstoragescontrollertest.php
index 6b020198bd8..b79b588a62b 100644
--- a/apps/files_external/tests/controller/globalstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/globalstoragescontrollertest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php
index 5e1deb821f4..16f2f02db46 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/controller/storagescontrollertest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @author Vincent Petry <pvince81@owncloud.com>
  * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index 33ef274c87c..c0a0d152404 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/service/globalstoragesservicetest.php b/apps/files_external/tests/service/globalstoragesservicetest.php
index 94c34c221fc..b12afd393d5 100644
--- a/apps/files_external/tests/service/globalstoragesservicetest.php
+++ b/apps/files_external/tests/service/globalstoragesservicetest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/service/storagesservicetest.php
index ddf52e6272e..c5792ad5587 100644
--- a/apps/files_external/tests/service/storagesservicetest.php
+++ b/apps/files_external/tests/service/storagesservicetest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * @author Vincent Petry <pvince81@owncloud.com>
  * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/service/userstoragesservicetest.php b/apps/files_external/tests/service/userstoragesservicetest.php
index 8bbfbe5a050..00149f4818f 100644
--- a/apps/files_external/tests/service/userstoragesservicetest.php
+++ b/apps/files_external/tests/service/userstoragesservicetest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/storageconfigtest.php b/apps/files_external/tests/storageconfigtest.php
index dba5105d7db..69fe262f79f 100644
--- a/apps/files_external/tests/storageconfigtest.php
+++ b/apps/files_external/tests/storageconfigtest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php
index 66cfd8e9d1a..c80f0e0b288 100644
--- a/apps/files_sharing/ajax/external.php
+++ b/apps/files_sharing/ajax/external.php
@@ -1,9 +1,11 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/ajax/list.php b/apps/files_sharing/ajax/list.php
index 9185e508e67..9819048b881 100644
--- a/apps/files_sharing/ajax/list.php
+++ b/apps/files_sharing/ajax/list.php
@@ -3,6 +3,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_sharing/ajax/publicpreview.php b/apps/files_sharing/ajax/publicpreview.php
index 69894bb8da5..62157e0ac0e 100644
--- a/apps/files_sharing/ajax/publicpreview.php
+++ b/apps/files_sharing/ajax/publicpreview.php
@@ -4,6 +4,7 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php
index 61b8b47d2d3..42e77570f95 100644
--- a/apps/files_sharing/api/local.php
+++ b/apps/files_sharing/api/local.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/api/remote.php
index 76f9babcd19..d67920c3521 100644
--- a/apps/files_sharing/api/remote.php
+++ b/apps/files_sharing/api/remote.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php
index 7d8860ad6ff..a74b329aed5 100644
--- a/apps/files_sharing/api/server2server.php
+++ b/apps/files_sharing/api/server2server.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index 734c267020f..b34aef72163 100644
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 793a1789a0f..03e448be0af 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Gadzy <dev@gadzy.fr>
  * @author Joas Schilling <nickvergessen@owncloud.com>
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index ad5d5d63231..10e3fdae982 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 3794df37992..a466c4fc6cc 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -4,7 +4,6 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index 66b8b78cacf..0eb3224c1ca 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 377c9f02253..f0e5dadb992 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -8,6 +8,8 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_sharing/lib/connector/publicauth.php b/apps/files_sharing/lib/connector/publicauth.php
index 9d1bf391560..4ac355180fc 100644
--- a/apps/files_sharing/lib/connector/publicauth.php
+++ b/apps/files_sharing/lib/connector/publicauth.php
@@ -5,6 +5,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/controllers/externalsharescontroller.php b/apps/files_sharing/lib/controllers/externalsharescontroller.php
index 1b8351da420..71cc956ec98 100644
--- a/apps/files_sharing/lib/controllers/externalsharescontroller.php
+++ b/apps/files_sharing/lib/controllers/externalsharescontroller.php
@@ -3,6 +3,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/exceptions/s2sexception.php b/apps/files_sharing/lib/exceptions/s2sexception.php
index 7f5557f8cd3..d914e9e06db 100644
--- a/apps/files_sharing/lib/exceptions/s2sexception.php
+++ b/apps/files_sharing/lib/exceptions/s2sexception.php
@@ -1,5 +1,9 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
  *
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 2ba02f40d2f..ab6a02f94a1 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -5,6 +5,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/lib/external/scanner.php b/apps/files_sharing/lib/external/scanner.php
index 60eb7c8dacd..455225b2b79 100644
--- a/apps/files_sharing/lib/external/scanner.php
+++ b/apps/files_sharing/lib/external/scanner.php
@@ -2,6 +2,7 @@
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
index 38cb73be29c..63648b9f068 100644
--- a/apps/files_sharing/lib/helper.php
+++ b/apps/files_sharing/lib/helper.php
@@ -7,6 +7,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/lib/hooks.php b/apps/files_sharing/lib/hooks.php
index 1937010f390..079824f7fb0 100644
--- a/apps/files_sharing/lib/hooks.php
+++ b/apps/files_sharing/lib/hooks.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
diff --git a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
index 942efc0483e..9170c08b59d 100644
--- a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
@@ -2,6 +2,7 @@
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/lib/propagation/changewatcher.php b/apps/files_sharing/lib/propagation/changewatcher.php
index 9f23c19be88..9da3ffe51a2 100644
--- a/apps/files_sharing/lib/propagation/changewatcher.php
+++ b/apps/files_sharing/lib/propagation/changewatcher.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/lib/propagation/propagationmanager.php b/apps/files_sharing/lib/propagation/propagationmanager.php
index 7929c2aa5bb..d220551f8d6 100644
--- a/apps/files_sharing/lib/propagation/propagationmanager.php
+++ b/apps/files_sharing/lib/propagation/propagationmanager.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 7bbc2083702..6c676f47a0c 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -5,6 +5,8 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index ef42393f58d..514c5251af9 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -4,6 +4,8 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php
index 9aa9bbf562b..85eb264ce09 100644
--- a/apps/files_sharing/lib/sharedmount.php
+++ b/apps/files_sharing/lib/sharedmount.php
@@ -1,8 +1,10 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 27dd2f1e485..de059cf5245 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -7,6 +7,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author scambra <sergio@entrecables.com>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_sharing/lib/updater.php b/apps/files_sharing/lib/updater.php
index 9dd106a548c..d70ed23b941 100644
--- a/apps/files_sharing/lib/updater.php
+++ b/apps/files_sharing/lib/updater.php
@@ -4,6 +4,8 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 2cf8476f721..772419e64e4 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Felix Moeller <mail@felixmoeller.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
index fbf9d22cf76..7d96c8e8c97 100644
--- a/apps/files_sharing/publicwebdav.php
+++ b/apps/files_sharing/publicwebdav.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php
index f4c9c6cd308..deaa7b92ac7 100644
--- a/apps/files_sharing/settings-personal.php
+++ b/apps/files_sharing/settings-personal.php
@@ -3,6 +3,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index 91b8b1c7e66..923881d4569 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/capabilities.php b/apps/files_sharing/tests/capabilities.php
index cff7bdf1fe8..b151f47a468 100644
--- a/apps/files_sharing/tests/capabilities.php
+++ b/apps/files_sharing/tests/capabilities.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/controller/externalsharecontroller.php b/apps/files_sharing/tests/controller/externalsharecontroller.php
index 7b3e1af4c74..7bc11f7fb94 100644
--- a/apps/files_sharing/tests/controller/externalsharecontroller.php
+++ b/apps/files_sharing/tests/controller/externalsharecontroller.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php
index 8da4e6f29bd..6d23959d66d 100644
--- a/apps/files_sharing/tests/etagpropagation.php
+++ b/apps/files_sharing/tests/etagpropagation.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_sharing/tests/locking.php b/apps/files_sharing/tests/locking.php
index 269c924d142..ae1fcf30a53 100644
--- a/apps/files_sharing/tests/locking.php
+++ b/apps/files_sharing/tests/locking.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
index 05cb7497680..0269f77d0d5 100644
--- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php
index c10333defaa..80e727b7178 100644
--- a/apps/files_sharing/tests/permissions.php
+++ b/apps/files_sharing/tests/permissions.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php
index a4cc8209a8e..300c637c777 100644
--- a/apps/files_sharing/tests/server2server.php
+++ b/apps/files_sharing/tests/server2server.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php
index ed21e20f751..abff820c168 100644
--- a/apps/files_sharing/tests/share.php
+++ b/apps/files_sharing/tests/share.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php
index d1db6a644f0..6f487892b8f 100644
--- a/apps/files_sharing/tests/sharedmount.php
+++ b/apps/files_sharing/tests/sharedmount.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_sharing/tests/sizepropagation.php b/apps/files_sharing/tests/sizepropagation.php
index dbaa316f603..f46d5a5a7ad 100644
--- a/apps/files_sharing/tests/sizepropagation.php
+++ b/apps/files_sharing/tests/sizepropagation.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 63002671bfa..7ce8d632e4b 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -4,6 +4,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php
index c8bae2c5ce9..90add53f77f 100644
--- a/apps/files_trashbin/ajax/preview.php
+++ b/apps/files_trashbin/ajax/preview.php
@@ -3,6 +3,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 8eda7a8d640..01dc91f9bac 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -4,6 +4,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index 4805f9eeafd..7d99270557f 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
- * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Florin Peter <github@florin-peter.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php
index cf3d7b77ec2..caa9f0864a1 100644
--- a/apps/files_trashbin/appinfo/routes.php
+++ b/apps/files_trashbin/appinfo/routes.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Georg Ehrke <georg@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
index ae018a9da5d..bd2ee6bb390 100644
--- a/apps/files_trashbin/appinfo/update.php
+++ b/apps/files_trashbin/appinfo/update.php
@@ -3,6 +3,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_trashbin/command/cleanup.php b/apps/files_trashbin/command/cleanup.php
index 60717abac18..8af5dee4fcb 100644
--- a/apps/files_trashbin/command/cleanup.php
+++ b/apps/files_trashbin/command/cleanup.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_trashbin/command/expire.php b/apps/files_trashbin/command/expire.php
index 89b949bbcdf..f34c63b718b 100644
--- a/apps/files_trashbin/command/expire.php
+++ b/apps/files_trashbin/command/expire.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_trashbin/lib/backgroundjob/expiretrash.php b/apps/files_trashbin/lib/backgroundjob/expiretrash.php
index a222767669a..079fdd29912 100644
--- a/apps/files_trashbin/lib/backgroundjob/expiretrash.php
+++ b/apps/files_trashbin/lib/backgroundjob/expiretrash.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/lib/expiration.php b/apps/files_trashbin/lib/expiration.php
index 5069521aab3..1c08e2869f6 100644
--- a/apps/files_trashbin/lib/expiration.php
+++ b/apps/files_trashbin/lib/expiration.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index 0baa2b5414b..3d6a02c7776 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -5,6 +5,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/lib/hooks.php b/apps/files_trashbin/lib/hooks.php
index d11890aa4a7..57fc8d7a8d3 100644
--- a/apps/files_trashbin/lib/hooks.php
+++ b/apps/files_trashbin/lib/hooks.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index ea6f0993dd6..ef015c3566a 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -7,6 +7,7 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Qingping Hou <dave2008713@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/apps/files_trashbin/tests/command/cleanuptest.php b/apps/files_trashbin/tests/command/cleanuptest.php
index d4cccee448e..e928f55eb8b 100644
--- a/apps/files_trashbin/tests/command/cleanuptest.php
+++ b/apps/files_trashbin/tests/command/cleanuptest.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_trashbin/tests/expiration.php b/apps/files_trashbin/tests/expiration.php
index 76fb24aa4df..c142133ceb7 100644
--- a/apps/files_trashbin/tests/expiration.php
+++ b/apps/files_trashbin/tests/expiration.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/tests/storage.php b/apps/files_trashbin/tests/storage.php
index 64540505d22..44b680f265c 100644
--- a/apps/files_trashbin/tests/storage.php
+++ b/apps/files_trashbin/tests/storage.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index f60367a77e2..757239b8cc4 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -5,6 +5,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 59bd30f434f..d50545f7c69 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -5,6 +5,7 @@
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Sam Tuke <mail@samtuke.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php
index 2f33f0278ef..d7bc44f17a2 100644
--- a/apps/files_versions/ajax/preview.php
+++ b/apps/files_versions/ajax/preview.php
@@ -1,7 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index eadc7c69a23..89990fdf0d8 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -2,6 +2,7 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Frank Karlitschek <frank@owncloud.org>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_versions/appinfo/application.php b/apps/files_versions/appinfo/application.php
index b61b03dab13..00723e621ac 100644
--- a/apps/files_versions/appinfo/application.php
+++ b/apps/files_versions/appinfo/application.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
index 687e5d3b5d4..ef6772f3079 100644
--- a/apps/files_versions/appinfo/update.php
+++ b/apps/files_versions/appinfo/update.php
@@ -2,6 +2,7 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_versions/command/expire.php b/apps/files_versions/command/expire.php
index 4492497f851..5db33f38772 100644
--- a/apps/files_versions/command/expire.php
+++ b/apps/files_versions/command/expire.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 5ef2cc3c7d0..f9d9eddf5e2 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -7,6 +7,7 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Sam Tuke <mail@samtuke.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index cd2077d2922..fd51a54b108 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -13,6 +13,7 @@
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_versions/tests/expirationtest.php b/apps/files_versions/tests/expirationtest.php
index 11a4746c5e7..1081e412ce9 100644
--- a/apps/files_versions/tests/expirationtest.php
+++ b/apps/files_versions/tests/expirationtest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index d4a85c8bffe..00d2b75b7a9 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -1,8 +1,10 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/apps/provisioning_api/appinfo/app.php b/apps/provisioning_api/appinfo/app.php
index bb5c541c4fd..40d8d5d04d3 100644
--- a/apps/provisioning_api/appinfo/app.php
+++ b/apps/provisioning_api/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Tom Needham <tom@owncloud.com>
+
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php
index 2ee3a185dae..5c53684fd77 100644
--- a/apps/provisioning_api/appinfo/routes.php
+++ b/apps/provisioning_api/appinfo/routes.php
@@ -2,6 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Tom Needham <tom@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/provisioning_api/lib/apps.php b/apps/provisioning_api/lib/apps.php
index 80f6e7049c6..ba920c7a9c9 100644
--- a/apps/provisioning_api/lib/apps.php
+++ b/apps/provisioning_api/lib/apps.php
@@ -1,7 +1,9 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Tom Needham <tom@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/provisioning_api/lib/groups.php b/apps/provisioning_api/lib/groups.php
index c6fbe12b34e..7e7515bc709 100644
--- a/apps/provisioning_api/lib/groups.php
+++ b/apps/provisioning_api/lib/groups.php
@@ -1,7 +1,9 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Tom Needham <tom@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php
index 617e50b403e..add6325bde0 100644
--- a/apps/provisioning_api/lib/users.php
+++ b/apps/provisioning_api/lib/users.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/apps/provisioning_api/tests/appstest.php b/apps/provisioning_api/tests/appstest.php
index f2a3977eac4..2baea5bbc8c 100644
--- a/apps/provisioning_api/tests/appstest.php
+++ b/apps/provisioning_api/tests/appstest.php
@@ -2,8 +2,8 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Tom Needham <tom@owncloud.com>
- * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/groupstest.php
index 73044e33120..4afd246abcd 100644
--- a/apps/provisioning_api/tests/groupstest.php
+++ b/apps/provisioning_api/tests/groupstest.php
@@ -2,8 +2,8 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Tom Needham <tom@owncloud.com>
- * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/provisioning_api/tests/testcase.php b/apps/provisioning_api/tests/testcase.php
index ee7eb2a5a9a..cc8f5c1d16d 100644
--- a/apps/provisioning_api/tests/testcase.php
+++ b/apps/provisioning_api/tests/testcase.php
@@ -2,6 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/ajax/setConfiguration.php b/apps/user_ldap/ajax/setConfiguration.php
index 9311d72d21f..3b0ba1b7754 100644
--- a/apps/user_ldap/ajax/setConfiguration.php
+++ b/apps/user_ldap/ajax/setConfiguration.php
@@ -2,6 +2,7 @@
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Lennart Rosam <hello@takuto.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php
index f70eb746480..844c724ac25 100644
--- a/apps/user_ldap/appinfo/install.php
+++ b/apps/user_ldap/appinfo/install.php
@@ -2,6 +2,7 @@
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 33a7219644b..7d358e5b268 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lennart Rosam <hello@takuto.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index d2e69b4e12a..97ed8fa91ac 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -5,7 +5,9 @@
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Nicolas Grekas <nicolas.grekas@gmail.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 2a605a2a0f0..a2fdd88a240 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -12,6 +12,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Lyonel Vincent <lyonel@ezix.org>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Nicolas Grekas <nicolas.grekas@gmail.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 8d96e7de91d..18a0412a63d 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -7,6 +7,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Nicolas Grekas <nicolas.grekas@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index 7007afd5162..132fbfdf687 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
diff --git a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
index f34fca81c2d..ef000286109 100644
--- a/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
+++ b/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php
@@ -1,9 +1,22 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: blizzz
- * Date: 06.08.15
- * Time: 08:19
+ * @author Arthur Schiwon <blizzz@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\user_ldap\tests\integration\lib;
diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
index a03d6b0c0c6..6bb8afc01a2 100644
--- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
+++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php
@@ -1,5 +1,24 @@
 <?php
-
+/**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 use OCA\user_ldap\lib\user\User;
 use OCA\User_LDAP\Mapping\UserMapping;
 use OCA\user_ldap\tests\integration\AbstractIntegrationTest;
diff --git a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php b/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php
index 68854de5571..8ac35a54528 100644
--- a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php
+++ b/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php
@@ -1,5 +1,24 @@
 <?php
-
+/**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 if(php_sapi_name() !== 'cli') {
 	print('Only via CLI, please.');
 	exit(1);
diff --git a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php b/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php
index 361881969cc..e22b72c452c 100644
--- a/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php
+++ b/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php
@@ -1,5 +1,24 @@
 <?php
-
+/**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 if(php_sapi_name() !== 'cli') {
 	print('Only via CLI, please.');
 	exit(1);
diff --git a/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php b/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php
index bb784d60f7b..3e9cb674254 100644
--- a/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php
+++ b/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php
@@ -1,5 +1,24 @@
 <?php
-
+/**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 if(php_sapi_name() !== 'cli') {
 	print('Only via CLI, please.');
 	exit(1);
diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php
index 525364390bc..7b046187831 100644
--- a/apps/user_ldap/tests/wizard.php
+++ b/apps/user_ldap/tests/wizard.php
@@ -3,6 +3,7 @@
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Viktor Szépe <viktor@szepe.net>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 7304088ba95..59c61524c9b 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -1,11 +1,10 @@
 <?php
 /**
- * @author Andreas Fischer <bantu@owncloud.com>
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
- * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Dominik Schmidt <dev@dominik-schmidt.de>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 1491be3f394..2582355e4a3 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -2,6 +2,7 @@
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/console.php b/console.php
index a5808f4a06a..8bfbabf2a03 100644
--- a/console.php
+++ b/console.php
@@ -5,6 +5,7 @@
  * @author Jost Baron <Jost.Baron@gmx.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Philippe Le Brouster <plb@nebkha.net>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index b6362fb3a70..05eb4b62b79 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -3,6 +3,7 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 50c99cb56b4..4738d0e0827 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -5,6 +5,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Craig Morrissey <craig@owncloud.com>
  * @author dampfklon <me@dampfklon.de>
+ * @author Felix Böhm <felixboehm@gmx.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index 945e022600a..4841ba00f7a 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -5,6 +5,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php
index 9f6e0729ce9..a04f4bb5e03 100644
--- a/core/command/app/checkcode.php
+++ b/core/command/app/checkcode.php
@@ -2,8 +2,8 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/app/disable.php b/core/command/app/disable.php
index f2096448279..6c04860789f 100644
--- a/core/command/app/disable.php
+++ b/core/command/app/disable.php
@@ -2,6 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/app/enable.php b/core/command/app/enable.php
index 907006961dc..f82c23e7e60 100644
--- a/core/command/app/enable.php
+++ b/core/command/app/enable.php
@@ -2,6 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/encryption/decryptall.php b/core/command/encryption/decryptall.php
index a8560ce88bb..4755a9dc7ba 100644
--- a/core/command/encryption/decryptall.php
+++ b/core/command/encryption/decryptall.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
index 8294264f212..572991039ef 100644
--- a/core/command/encryption/encryptall.php
+++ b/core/command/encryption/encryptall.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php
index 7f5d9cae647..b0235c518ec 100644
--- a/core/command/maintenance/install.php
+++ b/core/command/maintenance/install.php
@@ -2,7 +2,6 @@
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Christian Kampka <christian@kampka.net>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/command/maintenance/mimetype/updatedb.php b/core/command/maintenance/mimetype/updatedb.php
index 37c401c0338..9d4062ff8c5 100644
--- a/core/command/maintenance/mimetype/updatedb.php
+++ b/core/command/maintenance/mimetype/updatedb.php
@@ -16,6 +16,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License, version 3,
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OC\Core\Command\Maintenance\Mimetype;
diff --git a/core/command/maintenance/mimetype/updatejs.php b/core/command/maintenance/mimetype/updatejs.php
index 5de75d53a3f..546bee146f3 100644
--- a/core/command/maintenance/mimetype/updatejs.php
+++ b/core/command/maintenance/mimetype/updatejs.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index f50a0d92479..0f1b828ba25 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Andreas Fischer <bantu@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Owen Winkler <a_github@midnightcircus.com>
  * @author Steffen Lindner <mail@steffen-lindner.de>
diff --git a/core/command/user/add.php b/core/command/user/add.php
index 07060bb172f..426b8489ccf 100644
--- a/core/command/user/add.php
+++ b/core/command/user/add.php
@@ -2,7 +2,6 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Laurens Post <lkpost@scept.re>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/js/config.php b/core/js/config.php
index 5da610698df..e2d7ae3784c 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -3,6 +3,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Guillaume AMAT <guillaume.amat@informatique-libre.com>
+ * @author Hasso Tepper <hasso@zone.ee>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
diff --git a/core/lostpassword/templates/email.php b/core/lostpassword/templates/email.php
index db968246600..618ac5dcd5c 100644
--- a/core/lostpassword/templates/email.php
+++ b/core/lostpassword/templates/email.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/register_command.php b/core/register_command.php
index 878542f72c9..e0739bd8d1a 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -1,10 +1,12 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christian Kampka <christian@kampka.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/core/setup/controller.php b/core/setup/controller.php
index f616ae5a5b3..36ba33f2a42 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
- * @author cmeh <cmeh@users.noreply.github.com>
  * @author ideaship <ideaship@users.noreply.github.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/cron.php b/cron.php
index e83e37b3471..92716060184 100644
--- a/cron.php
+++ b/cron.php
@@ -3,9 +3,11 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Jakob Sack <mail@jakobsack.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Oliver Kohl D.Sc. <oliver@kohl.bz>
+ * @author Phil Davis <phil.davis@inf.org>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Steffen Lindner <mail@steffen-lindner.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/index.php b/index.php
index 536a55ad6eb..5c376dcf285 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Frank Karlitschek <frank@owncloud.org>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
diff --git a/lib/autoloader.php b/lib/autoloader.php
index 8361f31b038..26bc2beb7a8 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -5,6 +5,7 @@
  * @author Markus Goetz <markus@woboq.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
diff --git a/lib/base.php b/lib/base.php
index 889801f9653..12c23f5ce1b 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -13,15 +13,17 @@
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Hugo Gonzalez Labrador <hglavra@gmail.com>
+ * @author Individual IT Services <info@individual-it.net>
  * @author Jakob Sack <mail@jakobsack.de>
- * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author marc0s <marcos@tenak.net>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Owen Winkler <a_github@midnightcircus.com>
+ * @author Phil Davis <phil.davis@inf.org>
  * @author Ramiro Aparicio <rapariciog@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
diff --git a/lib/private/activity/event.php b/lib/private/activity/event.php
index 247113d54a9..413ff613186 100644
--- a/lib/private/activity/event.php
+++ b/lib/private/activity/event.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Phil Davis <phil.davis@inf.org>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php
index 340f3d335e5..fadfedf277f 100644
--- a/lib/private/activitymanager.php
+++ b/lib/private/activitymanager.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Lukas Reschke <lukas@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/api.php b/lib/private/api.php
index 3c599de25a9..cd5148c51a1 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -1,4 +1,34 @@
 <?php
+/**
+ * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Michael Gapczynski <GapczynskiM@gmail.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Tom Needham <tom@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 use OCP\API;
 use OCP\AppFramework\Http;
 
diff --git a/lib/private/app.php b/lib/private/app.php
index 5122a4964d4..9fc79203803 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -18,8 +18,10 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Markus Goetz <markus@woboq.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author RealRancor <Fisch.666@gmx.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Sam Tuke <mail@samtuke.com>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php
index 75b1c0a7865..8fb197e73ff 100644
--- a/lib/private/app/appmanager.php
+++ b/lib/private/app/appmanager.php
@@ -4,6 +4,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/app/codechecker/nodevisitor.php b/lib/private/app/codechecker/nodevisitor.php
index a22f852f36a..3295f354324 100644
--- a/lib/private/app/codechecker/nodevisitor.php
+++ b/lib/private/app/codechecker/nodevisitor.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/private/app/codechecker/privatecheck.php b/lib/private/app/codechecker/privatecheck.php
index d6f4eb06981..bafcfd1d03e 100644
--- a/lib/private/app/codechecker/privatecheck.php
+++ b/lib/private/app/codechecker/privatecheck.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/app/codechecker/strongcomparisoncheck.php b/lib/private/app/codechecker/strongcomparisoncheck.php
index 7de0fe3e5c3..3072027b258 100644
--- a/lib/private/app/codechecker/strongcomparisoncheck.php
+++ b/lib/private/app/codechecker/strongcomparisoncheck.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/app/dependencyanalyzer.php b/lib/private/app/dependencyanalyzer.php
index dd40e4052a7..5d86368ea83 100644
--- a/lib/private/app/dependencyanalyzer.php
+++ b/lib/private/app/dependencyanalyzer.php
@@ -2,6 +2,7 @@
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index cf2a057f224..d1c1e4bfc45 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -5,12 +5,10 @@
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 544da74a010..4779d6bf0ad 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -5,6 +5,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php
index dee9818f4bc..f892ee7e5e3 100644
--- a/lib/private/appframework/http.php
+++ b/lib/private/appframework/http.php
@@ -3,6 +3,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index af6015b0eef..c36905da9f5 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -6,10 +6,11 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Vincent Petry <pvince81@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/appframework/middleware/security/corsmiddleware.php b/lib/private/appframework/middleware/security/corsmiddleware.php
index d7c42cd9b13..74b0dd09974 100644
--- a/lib/private/appframework/middleware/security/corsmiddleware.php
+++ b/lib/private/appframework/middleware/security/corsmiddleware.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index 3de6d9ba5bc..bcae351e023 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -2,9 +2,9 @@
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index deadadfb77e..434c61c76c0 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -4,7 +4,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php
index a433b84d7bf..1cda05f28e5 100644
--- a/lib/private/cache/file.php
+++ b/lib/private/cache/file.php
@@ -1,8 +1,8 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php
index 8a6eaab5bf8..d33ffad7d5c 100644
--- a/lib/private/connector/sabre/auth.php
+++ b/lib/private/connector/sabre/auth.php
@@ -8,7 +8,6 @@
  * @author Markus Goetz <markus@woboq.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/connector/sabre/copyetagheaderplugin.php b/lib/private/connector/sabre/copyetagheaderplugin.php
index 863d4cf3e10..fe1a8fab70e 100644
--- a/lib/private/connector/sabre/copyetagheaderplugin.php
+++ b/lib/private/connector/sabre/copyetagheaderplugin.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/connector/sabre/custompropertiesbackend.php b/lib/private/connector/sabre/custompropertiesbackend.php
index 47f34909a08..a05de1adb35 100644
--- a/lib/private/connector/sabre/custompropertiesbackend.php
+++ b/lib/private/connector/sabre/custompropertiesbackend.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/connector/sabre/exceptionloggerplugin.php b/lib/private/connector/sabre/exceptionloggerplugin.php
index 53a1f738ea6..3f53431c8a1 100644
--- a/lib/private/connector/sabre/exceptionloggerplugin.php
+++ b/lib/private/connector/sabre/exceptionloggerplugin.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php
index f886332418a..4b7ff8a39da 100644
--- a/lib/private/connector/sabre/maintenanceplugin.php
+++ b/lib/private/connector/sabre/maintenanceplugin.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/connector/sabre/serverfactory.php b/lib/private/connector/sabre/serverfactory.php
index 54470b0b8aa..a0c32c1da53 100644
--- a/lib/private/connector/sabre/serverfactory.php
+++ b/lib/private/connector/sabre/serverfactory.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/console/application.php b/lib/private/console/application.php
index edfb45c8577..edc3e104947 100644
--- a/lib/private/console/application.php
+++ b/lib/private/console/application.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/db/ocsqliteplatform.php b/lib/private/db/ocsqliteplatform.php
index 543f58b90ec..2456d262fe3 100644
--- a/lib/private/db/ocsqliteplatform.php
+++ b/lib/private/db/ocsqliteplatform.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/hookmanager.php b/lib/private/encryption/hookmanager.php
index d096b7ff3ad..8969379c957 100644
--- a/lib/private/encryption/hookmanager.php
+++ b/lib/private/encryption/hookmanager.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php
index d0c094538b0..e21fd62e366 100644
--- a/lib/private/encryption/keys/storage.php
+++ b/lib/private/encryption/keys/storage.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index c004dfda0d9..d38ec6684a6 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/update.php b/lib/private/encryption/update.php
index 125946ab266..64cccc16ed8 100644
--- a/lib/private/encryption/update.php
+++ b/lib/private/encryption/update.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php
index 90ae8259972..ef500883865 100644
--- a/lib/private/encryption/util.php
+++ b/lib/private/encryption/util.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/eventsource.php b/lib/private/eventsource.php
index e2be808e726..c076b87ddd9 100644
--- a/lib/private/eventsource.php
+++ b/lib/private/eventsource.php
@@ -2,6 +2,7 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Felix Moeller <mail@felixmoeller.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/files.php b/lib/private/files.php
index 86ebf40cc57..4862e1a7a5f 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -1,27 +1,22 @@
 <?php
 /**
- * @author Andreas Fischer <bantu@owncloud.com>
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
- * @author dratini0 <dratini0@gmail.com>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author mvn23 <schopdiedwaas@gmail.com>
  * @author Nicolai Ehemann <en@enlightened.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thibaut GRIDEL <tgridel@free.fr>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Valerio Ponte <valerio.ponte@gmail.com>
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 5c04da1f0d5..de6a2301603 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -11,9 +11,9 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author TheSFReader <TheSFReader@gmail.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index bfdab16b645..ac554f78396 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -6,9 +6,11 @@
  * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Owen Winkler <a_github@midnightcircus.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php
index 88ceb287fb9..64ce605df47 100644
--- a/lib/private/files/cache/storage.php
+++ b/lib/private/files/cache/storage.php
@@ -4,6 +4,8 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index b333844f8c8..cf9524241dd 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -6,6 +6,7 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
+ * @author tbartenstein <tbartenstein@users.noreply.github.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files/mount/mountpoint.php b/lib/private/files/mount/mountpoint.php
index 2871bbd9083..518c0be7e93 100644
--- a/lib/private/files/mount/mountpoint.php
+++ b/lib/private/files/mount/mountpoint.php
@@ -5,6 +5,8 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 2d579fa2b60..d9fee48bedb 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -7,6 +7,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 171afd649c6..dcde7b8029b 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Alexander Bogdanov <syn@li.ru>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Carlos Cerrillo <ccerrillo@gmail.com>
@@ -9,7 +8,6 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Philippe Kueck <pk@plusline.de>
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
diff --git a/lib/private/files/storage/flysystem.php b/lib/private/files/storage/flysystem.php
index 6d8dee10622..3ad2b8adc4c 100644
--- a/lib/private/files/storage/flysystem.php
+++ b/lib/private/files/storage/flysystem.php
@@ -1,9 +1,22 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OC\Files\Storage;
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 4b6b08a16fd..2b2a433c013 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -1,17 +1,14 @@
 <?php
 /**
- * @author Andreas Fischer <bantu@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Brice Maron <brice@bmaron.net>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Klaas Freitag <freitag@owncloud.com>
- * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Sjors van der Pluijm <sjors@desjors.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
diff --git a/lib/private/files/storage/localtempfiletrait.php b/lib/private/files/storage/localtempfiletrait.php
index 86c8b5c8377..84331f49b19 100644
--- a/lib/private/files/storage/localtempfiletrait.php
+++ b/lib/private/files/storage/localtempfiletrait.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files/storage/polyfill/copydirectory.php b/lib/private/files/storage/polyfill/copydirectory.php
index 73c6d3d5436..df4f5c27dcf 100644
--- a/lib/private/files/storage/polyfill/copydirectory.php
+++ b/lib/private/files/storage/polyfill/copydirectory.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Martin Mattel <martin.mattel@diemattels.at>
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OC\Files\Storage\PolyFill;
diff --git a/lib/private/files/storage/temporary.php b/lib/private/files/storage/temporary.php
index ca348313e45..c8b99a55637 100644
--- a/lib/private/files/storage/temporary.php
+++ b/lib/private/files/storage/temporary.php
@@ -3,6 +3,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index c80e935b982..ef5bfc59f65 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files/storage/wrapper/permissionsmask.php b/lib/private/files/storage/wrapper/permissionsmask.php
index 8d40d023630..8d7e0c47152 100644
--- a/lib/private/files/storage/wrapper/permissionsmask.php
+++ b/lib/private/files/storage/wrapper/permissionsmask.php
@@ -1,7 +1,9 @@
 <?php
 /**
+ * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/storage/wrapper/wrapper.php b/lib/private/files/storage/wrapper/wrapper.php
index b43dd4fe142..048738170db 100644
--- a/lib/private/files/storage/wrapper/wrapper.php
+++ b/lib/private/files/storage/wrapper/wrapper.php
@@ -2,6 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
index 1cef37baf9f..e0d263d80b1 100644
--- a/lib/private/files/stream/encryption.php
+++ b/lib/private/files/stream/encryption.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author jknockaert <jasper@knockaert.nl>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index dc8aff2f30c..d56db6ecdc4 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -2,11 +2,12 @@
 /**
  * @author Andreas Fischer <bantu@owncloud.com>
  * @author Jens-Christian Fischer <jens-christian.fischer@switch.ch>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Tanghus <thomas@tanghus.net>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php
index 558a1fba028..35e36e23cb2 100644
--- a/lib/private/files/utils/scanner.php
+++ b/lib/private/files/utils/scanner.php
@@ -2,6 +2,7 @@
 /**
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index c8dbc001f2d..1353fac51ff 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -11,6 +11,7 @@
  * @author Klaas Freitag <freitag@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Luke Policinski <lpolicinski@gmail.com>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 973960ca7a5..ac91164dfb0 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -16,6 +16,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Nicolas Grekas <nicolas.grekas@gmail.com>
  * @author Olivier Paroz <github@oparoz.com>
  * @author Owen Winkler <a_github@midnightcircus.com>
  * @author Pellaeon Lin <nfsmwlin@gmail.com>
diff --git a/lib/private/http/client/client.php b/lib/private/http/client/client.php
index 1907937e55e..5f298e1acd7 100644
--- a/lib/private/http/client/client.php
+++ b/lib/private/http/client/client.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/http/client/response.php b/lib/private/http/client/response.php
index 558482491d1..b3429f36d04 100644
--- a/lib/private/http/client/response.php
+++ b/lib/private/http/client/response.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/installer.php b/lib/private/installer.php
index 392dc1c0817..861ce6ea41b 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -12,6 +12,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Kamil Domanski <kdomanski@kdemail.net>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author michag86 <micha_g@arcor.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index b3c87292f1d..5816e20b104 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -4,7 +4,6 @@
  * @author Andreas Fischer <bantu@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Felix Moeller <mail@felixmoeller.de>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php
index a9ac4da42a2..b92c21b2d5d 100644
--- a/lib/private/l10n/factory.php
+++ b/lib/private/l10n/factory.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php
index 8f017a713c1..aa1357982a2 100644
--- a/lib/private/lock/dblockingprovider.php
+++ b/lib/private/lock/dblockingprovider.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Individual IT Services <info@individual-it.net>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/lock/memcachelockingprovider.php b/lib/private/lock/memcachelockingprovider.php
index 871572f7e3e..e4158dcdfdf 100644
--- a/lib/private/lock/memcachelockingprovider.php
+++ b/lib/private/lock/memcachelockingprovider.php
@@ -1,8 +1,6 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/lock/nooplockingprovider.php b/lib/private/lock/nooplockingprovider.php
index a8571f2aec4..9f88e6148f8 100644
--- a/lib/private/lock/nooplockingprovider.php
+++ b/lib/private/lock/nooplockingprovider.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/log.php b/lib/private/log.php
index 4a0a34b7113..ee5d61e98df 100644
--- a/lib/private/log.php
+++ b/lib/private/log.php
@@ -3,7 +3,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Olivier Paroz <owncloud@oparoz.com>
+ * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
diff --git a/lib/private/log/rotate.php b/lib/private/log/rotate.php
index 4572a9904d2..27731c07db2 100644
--- a/lib/private/log/rotate.php
+++ b/lib/private/log/rotate.php
@@ -2,6 +2,7 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php
index e99303ecc15..2d3c0d16807 100644
--- a/lib/private/memcache/memcached.php
+++ b/lib/private/memcache/memcached.php
@@ -4,6 +4,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/naturalsort.php b/lib/private/naturalsort.php
index 26b9cec6cf1..2071ede43e0 100644
--- a/lib/private/naturalsort.php
+++ b/lib/private/naturalsort.php
@@ -4,6 +4,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/ocs.php b/lib/private/ocs.php
index c5133bf9ee8..7b474fa439f 100644
--- a/lib/private/ocs.php
+++ b/lib/private/ocs.php
@@ -1,15 +1,10 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
- * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Frank Karlitschek <frank@owncloud.org>
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/ocs/privatedata.php b/lib/private/ocs/privatedata.php
index 249c17b3792..92f029aa12a 100644
--- a/lib/private/ocs/privatedata.php
+++ b/lib/private/ocs/privatedata.php
@@ -3,6 +3,7 @@
  * @author Andreas Fischer <bantu@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Frank Karlitschek <frank@owncloud.org>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php
index 42b6166b823..916e25e45ae 100644
--- a/lib/private/ocs/result.php
+++ b/lib/private/ocs/result.php
@@ -6,6 +6,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index 78df3b79bb6..1dfab4dd3a4 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -4,10 +4,10 @@
  * @author Brice Maron <brice@bmaron.net>
  * @author Felix Moeller <mail@felixmoeller.de>
  * @author Frank Karlitschek <frank@owncloud.org>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Kamil Domanski <kdomanski@kdemail.net>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Sam Tuke <mail@samtuke.com>
diff --git a/lib/private/preview/bitmap.php b/lib/private/preview/bitmap.php
index 065425c9a1d..ad0ef000510 100644
--- a/lib/private/preview/bitmap.php
+++ b/lib/private/preview/bitmap.php
@@ -3,6 +3,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/bmp.php b/lib/private/preview/bmp.php
index 2a24a783d52..36439626f08 100644
--- a/lib/private/preview/bmp.php
+++ b/lib/private/preview/bmp.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/preview/gif.php b/lib/private/preview/gif.php
index 08f6c41d98c..a3b57484999 100644
--- a/lib/private/preview/gif.php
+++ b/lib/private/preview/gif.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index fd90b15eb0c..9287d9c888b 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -2,8 +2,8 @@
 /**
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
+ * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
diff --git a/lib/private/preview/jpeg.php b/lib/private/preview/jpeg.php
index 86e447d3406..96f89f4d57e 100644
--- a/lib/private/preview/jpeg.php
+++ b/lib/private/preview/jpeg.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/preview/movie.php b/lib/private/preview/movie.php
index a687fefff65..f71eaaf3eb2 100644
--- a/lib/private/preview/movie.php
+++ b/lib/private/preview/movie.php
@@ -2,7 +2,6 @@
 /**
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/private/preview/mp3.php b/lib/private/preview/mp3.php
index 25fe6566e44..ffe596db71b 100644
--- a/lib/private/preview/mp3.php
+++ b/lib/private/preview/mp3.php
@@ -2,7 +2,6 @@
 /**
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index ac6b4afa0cc..c83d2f98b8b 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -1,8 +1,9 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/png.php b/lib/private/preview/png.php
index a6755671326..bab63c16ada 100644
--- a/lib/private/preview/png.php
+++ b/lib/private/preview/png.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/preview/provider.php b/lib/private/preview/provider.php
index d9b80939246..8f4a9f9fc3f 100644
--- a/lib/private/preview/provider.php
+++ b/lib/private/preview/provider.php
@@ -3,7 +3,6 @@
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
  *
diff --git a/lib/private/preview/svg.php b/lib/private/preview/svg.php
index f8318e9a69a..26ce0fa9411 100644
--- a/lib/private/preview/svg.php
+++ b/lib/private/preview/svg.php
@@ -2,8 +2,8 @@
 /**
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php
index 2fdc86d9546..b6c21b7c1b1 100644
--- a/lib/private/preview/txt.php
+++ b/lib/private/preview/txt.php
@@ -2,6 +2,7 @@
 /**
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Nmz <nemesiz@nmz.lt>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/preview/xbitmap.php b/lib/private/preview/xbitmap.php
index 8001f21684a..7887f2b73f5 100644
--- a/lib/private/preview/xbitmap.php
+++ b/lib/private/preview/xbitmap.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index 7b7849a6da0..c332b33ccd2 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -7,6 +7,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/security/crypto.php b/lib/private/security/crypto.php
index 9bae1d6992c..0bd34df3f36 100644
--- a/lib/private/security/crypto.php
+++ b/lib/private/security/crypto.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
diff --git a/lib/private/server.php b/lib/private/server.php
index 9055f092800..4b30b88fef4 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,12 +6,14 @@
  * @author Bernhard Reiter <ockham@raz.or.at>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
+ * @author Individual IT Services <info@individual-it.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Sander <brantje@gmail.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/session/cryptosessiondata.php b/lib/private/session/cryptosessiondata.php
index 6826ede5e33..dcae1648fe1 100644
--- a/lib/private/session/cryptosessiondata.php
+++ b/lib/private/session/cryptosessiondata.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/session/cryptowrapper.php b/lib/private/session/cryptowrapper.php
index 70c1dab7404..c79778587e0 100644
--- a/lib/private/session/cryptowrapper.php
+++ b/lib/private/session/cryptowrapper.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Phil Davis <phil.davis@inf.org>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php
index e10999ec48f..01d4569fd81 100644
--- a/lib/private/session/internal.php
+++ b/lib/private/session/internal.php
@@ -1,7 +1,9 @@
 <?php
 /**
  * @author cetra3 <peter@parashift.com.au>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Phil Davis <phil.davis@inf.org>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/private/session/memory.php b/lib/private/session/memory.php
index 0fc9165c7cd..ff95efc5345 100644
--- a/lib/private/session/memory.php
+++ b/lib/private/session/memory.php
@@ -2,6 +2,7 @@
 /**
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Phil Davis <phil.davis@inf.org>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php
index 5597592f21e..f2d2b15cd90 100644
--- a/lib/private/setup/mysql.php
+++ b/lib/private/setup/mysql.php
@@ -3,7 +3,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Michael Göhler <somebody.here@gmx.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php
index 319b6676ef8..0a559e7a589 100644
--- a/lib/private/setup/postgresql.php
+++ b/lib/private/setup/postgresql.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
- * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author eduardo <eduardo@vnexu.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 32389f34868..5a11d1de66e 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Bernhard Reiter <ockham@raz.or.at>
  * @author Björn Schießle <schiessle@owncloud.com>
diff --git a/lib/private/streamer.php b/lib/private/streamer.php
index 6f0a70e2388..383183f8119 100644
--- a/lib/private/streamer.php
+++ b/lib/private/streamer.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/template.php b/lib/private/template.php
index 0300e43edea..e22f153e601 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -6,6 +6,7 @@
  * @author Brice Maron <brice@bmaron.net>
  * @author drarko <drarko@users.noreply.github.com>
  * @author Frank Karlitschek <frank@owncloud.org>
+ * @author Individual IT Services <info@individual-it.net>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
diff --git a/lib/private/tempmanager.php b/lib/private/tempmanager.php
index cc7c51d8568..c13f5d44572 100644
--- a/lib/private/tempmanager.php
+++ b/lib/private/tempmanager.php
@@ -1,9 +1,11 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/user/backend.php b/lib/private/user/backend.php
index 10bf3e28085..cda91398a84 100644
--- a/lib/private/user/backend.php
+++ b/lib/private/user/backend.php
@@ -9,9 +9,9 @@
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Sam Tuke <mail@samtuke.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
diff --git a/lib/private/user/interface.php b/lib/private/user/interface.php
index 1ccda618e10..0b36340c4f9 100644
--- a/lib/private/user/interface.php
+++ b/lib/private/user/interface.php
@@ -2,8 +2,8 @@
 /**
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 6a57aa3f7ae..109f08f47a0 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -5,6 +5,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author RealRancor <Fisch.666@gmx.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Volkan Gezer <volkangezer@gmail.com>
diff --git a/lib/private/user/nouserexception.php b/lib/private/user/nouserexception.php
index 0a077d960bd..09874887469 100644
--- a/lib/private/user/nouserexception.php
+++ b/lib/private/user/nouserexception.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
- * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/util.php b/lib/private/util.php
index 746a2e09523..9ea355f0168 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -16,17 +16,20 @@
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author helix84 <helix84@centrum.sk>
+ * @author Individual IT Services <info@individual-it.net>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Markus Goetz <markus@woboq.com>
+ * @author Martin Mattel <martin.mattel@diemattels.at>
  * @author Marvin Thomas Rabe <mrabe@marvinrabe.de>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Michael Göhler <somebody.here@gmx.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Stefan Rado <owncloud@sradonia.net>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/public/activity/iconsumer.php b/lib/public/activity/iconsumer.php
index e74884d76c5..796bf1d8884 100644
--- a/lib/public/activity/iconsumer.php
+++ b/lib/public/activity/iconsumer.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/public/appframework/http/contentsecuritypolicy.php b/lib/public/appframework/http/contentsecuritypolicy.php
index 07c76f2969c..5371d76ff22 100644
--- a/lib/public/appframework/http/contentsecuritypolicy.php
+++ b/lib/public/appframework/http/contentsecuritypolicy.php
@@ -2,6 +2,7 @@
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author sualko <klaus@jsxc.org>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
index 1a509200dd7..306c70327b1 100644
--- a/lib/public/appframework/http/jsonresponse.php
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
diff --git a/lib/public/appframework/http/ocsresponse.php b/lib/public/appframework/http/ocsresponse.php
index 37af07b70c8..f26d219e581 100644
--- a/lib/public/appframework/http/ocsresponse.php
+++ b/lib/public/appframework/http/ocsresponse.php
@@ -2,6 +2,7 @@
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php
index 7338dbd858d..c92146124e2 100644
--- a/lib/public/appframework/iappcontainer.php
+++ b/lib/public/appframework/iappcontainer.php
@@ -3,6 +3,7 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/appframework/ocscontroller.php b/lib/public/appframework/ocscontroller.php
index 55ba518020a..8b04d65d8c3 100644
--- a/lib/public/appframework/ocscontroller.php
+++ b/lib/public/appframework/ocscontroller.php
@@ -2,6 +2,7 @@
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/autoloadnotallowedexception.php b/lib/public/autoloadnotallowedexception.php
index edb7121c065..ae269b1c9e8 100644
--- a/lib/public/autoloadnotallowedexception.php
+++ b/lib/public/autoloadnotallowedexception.php
@@ -16,6 +16,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License, version 3,
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCP;
diff --git a/lib/public/db/querybuilder/iliteral.php b/lib/public/db/querybuilder/iliteral.php
index f5db1ce0456..a2665e47a7d 100644
--- a/lib/public/db/querybuilder/iliteral.php
+++ b/lib/public/db/querybuilder/iliteral.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/db/querybuilder/iparameter.php b/lib/public/db/querybuilder/iparameter.php
index f597163ba00..ef822a9c97f 100644
--- a/lib/public/db/querybuilder/iparameter.php
+++ b/lib/public/db/querybuilder/iparameter.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/db/querybuilder/iqueryfunction.php b/lib/public/db/querybuilder/iqueryfunction.php
index 4e8c163f777..7051f2f38a3 100644
--- a/lib/public/db/querybuilder/iqueryfunction.php
+++ b/lib/public/db/querybuilder/iqueryfunction.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php
index 66cf1a80e0d..bb4dfdcdda8 100644
--- a/lib/public/encryption/iencryptionmodule.php
+++ b/lib/public/encryption/iencryptionmodule.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/encryption/imanager.php b/lib/public/encryption/imanager.php
index 07e2925b76c..c963c19e660 100644
--- a/lib/public/encryption/imanager.php
+++ b/lib/public/encryption/imanager.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/files/mount/imountmanager.php b/lib/public/files/mount/imountmanager.php
index 1eb9b66dad8..9a0362b12fb 100644
--- a/lib/public/files/mount/imountmanager.php
+++ b/lib/public/files/mount/imountmanager.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php
index ac3603e48d4..1cf8676c99d 100644
--- a/lib/public/files/storage.php
+++ b/lib/public/files/storage.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Michael Roth <michael.roth@rz.uni-augsburg.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
diff --git a/lib/public/http/client/iresponse.php b/lib/public/http/client/iresponse.php
index 92bb7af82dd..18371ddbbe6 100644
--- a/lib/public/http/client/iresponse.php
+++ b/lib/public/http/client/iresponse.php
@@ -2,6 +2,7 @@
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/icontainer.php b/lib/public/icontainer.php
index 64d5a7d8c1a..23c75aeaaf8 100644
--- a/lib/public/icontainer.php
+++ b/lib/public/icontainer.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Bernhard Posselt <dev@bernhard-posselt.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index e37652c1adc..3220083ad22 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -9,6 +9,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
diff --git a/lib/public/itempmanager.php b/lib/public/itempmanager.php
index 6364fa71913..da84a03992d 100644
--- a/lib/public/itempmanager.php
+++ b/lib/public/itempmanager.php
@@ -2,6 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/util.php b/lib/public/util.php
index 1ba091d1952..76b61347d46 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -5,12 +5,14 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Georg Ehrke <georg@owncloud.com>
+ * @author Individual IT Services <info@individual-it.net>
  * @author itheiss <ingo.theiss@i-matrixx.de>
  * @author Jens-Christian Fischer <jens-christian.fischer@switch.ch>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Nicolas Grekas <nicolas.grekas@gmail.com>
  * @author Pellaeon Lin <nfsmwlin@gmail.com>
  * @author Randolph Carter <RandolphCarter@fantasymail.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/lib/repair/filletags.php b/lib/repair/filletags.php
index 40072209982..8cfc4a7c258 100644
--- a/lib/repair/filletags.php
+++ b/lib/repair/filletags.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/repair/repairinvalidshares.php b/lib/repair/repairinvalidshares.php
index 21b4d8013e7..4b0aeb70c12 100644
--- a/lib/repair/repairinvalidshares.php
+++ b/lib/repair/repairinvalidshares.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/repair/repairmimetypes.php b/lib/repair/repairmimetypes.php
index b9cd42f3136..aeac69d00db 100644
--- a/lib/repair/repairmimetypes.php
+++ b/lib/repair/repairmimetypes.php
@@ -4,6 +4,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Normal Ra <normalraw@gmail.com>
  * @author Olivier Paroz <github@oparoz.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/repair/sqliteautoincrement.php b/lib/repair/sqliteautoincrement.php
index b8ae5c47ff3..70d0adae5d7 100644
--- a/lib/repair/sqliteautoincrement.php
+++ b/lib/repair/sqliteautoincrement.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/repair/updateoutdatedocsids.php b/lib/repair/updateoutdatedocsids.php
index afc9e968cad..5f6ee029536 100644
--- a/lib/repair/updateoutdatedocsids.php
+++ b/lib/repair/updateoutdatedocsids.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Lukas Reschke <l8kas@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/ocs/routes.php b/ocs/routes.php
index 9a8625bcc31..6afa2aa3960 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -4,6 +4,7 @@
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
  *
diff --git a/ocs/v1.php b/ocs/v1.php
index c5c18d20b8a..0aaa5d228da 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
- * @author Frank Karlitschek <frank@owncloud.org>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
diff --git a/public.php b/public.php
index 858e8af7782..aac3c3e517b 100644
--- a/public.php
+++ b/public.php
@@ -2,10 +2,8 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Georg Ehrke <georg@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/remote.php b/remote.php
index 01077e805eb..c9cd804c882 100644
--- a/remote.php
+++ b/remote.php
@@ -2,10 +2,10 @@
 /**
  * @author Brice Maron <brice@bmaron.net>
  * @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Georg Ehrke <georg@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/settings/admin.php b/settings/admin.php
index aa891314fab..bccb1171743 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -12,7 +12,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 55298430e28..5e0aba1ce7e 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -5,6 +5,7 @@
  * @author Kamil Domanski <kdomanski@kdemail.net>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index 5d3b34e10ef..c2af852239a 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * @author Bart Visscher <bartv@thisnet.nl>
- * @author Lukas Reschke <lukas@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 12499ada15d..3fa3ac67edb 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -6,7 +6,6 @@
  * @author cmeh <cmeh@users.noreply.github.com>
  * @author Florin Peter <github@florin-peter.de>
  * @author Jakob Sack <mail@jakobsack.de>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Sam Tuke <mail@samtuke.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/settings/controller/certificatecontroller.php b/settings/controller/certificatecontroller.php
index 4c129dcd588..cbe2688cf9c 100644
--- a/settings/controller/certificatecontroller.php
+++ b/settings/controller/certificatecontroller.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index ca4eb255f6b..9c4687bdc70 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -3,6 +3,8 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/controller/encryptioncontroller.php b/settings/controller/encryptioncontroller.php
index 7aaf184482f..b3515f962f4 100644
--- a/settings/controller/encryptioncontroller.php
+++ b/settings/controller/encryptioncontroller.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/personal.php b/settings/personal.php
index 26e730d8089..6bcc619dc5e 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -4,14 +4,15 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Frank Karlitschek <frank@owncloud.org>
  * @author Georg Ehrke <georg@owncloud.com>
  * @author Jakob Sack <mail@jakobsack.de>
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Marvin Thomas Rabe <mrabe@marvinrabe.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Volkan Gezer <volkangezer@gmail.com>
diff --git a/settings/users.php b/settings/users.php
index e0ef56f15c5..154bf2a03d1 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -11,6 +11,8 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Stephan Peijnik <speijnik@anexia-it.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/status.php b/status.php
index 90250ff2615..f59dc16b6a2 100644
--- a/status.php
+++ b/status.php
@@ -4,6 +4,7 @@
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
+ * @author Lukas Reschke <lukas@owncloud.com>
  * @author Masaki Kawabata Neto <masaki.kawabata@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  *
diff --git a/version.php b/version.php
index 7ba6c3d93bc..c84d8c5edf8 100644
--- a/version.php
+++ b/version.php
@@ -1,7 +1,9 @@
 <?php
 /**
+ * @author C Montero-Luque <cml@owncloud.com>
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
-- 
GitLab


From 69d68fbe8e2f9771a9542d11bdaf10b129a04fcf Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Fri, 2 Oct 2015 12:15:07 +0200
Subject: [PATCH 698/783] Reload the page when an app needs an update after
 being enabled

---
 settings/ajax/enableapp.php | 5 +++--
 settings/js/apps.js         | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 55298430e28..af80193ebc4 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -28,8 +28,9 @@ OCP\JSON::callCheck();
 $groups = isset($_POST['groups']) ? (array)$_POST['groups'] : null;
 
 try {
-	OC_App::enable(OC_App::cleanAppId((string)$_POST['appid']), $groups);
-	OC_JSON::success();
+	$app = OC_App::cleanAppId((string)$_POST['appid']);
+	OC_App::enable($app, $groups);
+	OC_JSON::success(['data' => ['update_required' => \OC_App::shouldUpgrade($app)]]);
 } catch (Exception $e) {
 	\OCP\Util::writeLog('core', $e->getMessage(), \OCP\Util::ERROR);
 	OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
diff --git a/settings/js/apps.js b/settings/js/apps.js
index f775ecad620..2a6876c53df 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -245,6 +245,14 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					element.val(t('settings','Enable'));
 					appItem.addClass('appwarning');
 				} else {
+					if (result.data.update_required) {
+						OC.Notification.show(t('settings', 'The app needs to be updated, please reload the page'));
+
+						setTimeout(function() {
+							location.reload();
+						}, 5000);
+					}
+
 					OC.Settings.Apps.rebuildNavigation();
 					appItem.data('active',true);
 					element.data('active',true);
-- 
GitLab


From 264d123396725288b4d2b1ef766dded03096fb0c Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 2 Oct 2015 14:12:29 +0200
Subject: [PATCH 699/783] Use OC.Dialogs for modal reload message

---
 settings/js/apps.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 2a6876c53df..325653ccbdc 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -246,7 +246,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					appItem.addClass('appwarning');
 				} else {
 					if (result.data.update_required) {
-						OC.Notification.show(t('settings', 'The app needs to be updated, please reload the page'));
+						OC.Settings.Apps.showReloadMessage();
 
 						setTimeout(function() {
 							location.reload();
@@ -398,6 +398,20 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			.text('');
 	},
 
+	showReloadMessage: function(appId) {
+		OC.dialogs.info(
+			t(
+				'settings',
+				'The app needs to be updated. This page will be reloaded in 5 seconds.'
+			),
+			t('settings','App update'),
+			function (result) {
+				window.location.reload();
+			},
+			true
+		);
+	},
+
 	filter: function(query) {
 		query = query.toLowerCase();
 		$('#apps-list').find('.section').addClass('hidden');
-- 
GitLab


From 3ff60cc2e3a47efd9796b5376694743c168efeb3 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 6 Oct 2015 01:55:00 -0400
Subject: [PATCH 700/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/de.js       |  1 +
 apps/encryption/l10n/de.json     |  1 +
 apps/encryption/l10n/tr.js       |  4 ++--
 apps/encryption/l10n/tr.json     |  4 ++--
 apps/files/l10n/de.js            |  6 ++++++
 apps/files/l10n/de.json          |  6 ++++++
 apps/files/l10n/es.js            |  3 +++
 apps/files/l10n/es.json          |  3 +++
 apps/files/l10n/id.js            |  3 +++
 apps/files/l10n/id.json          |  3 +++
 apps/files/l10n/tr.js            |  5 +++++
 apps/files/l10n/tr.json          |  5 +++++
 apps/files_external/l10n/de.js   | 11 +++++++++++
 apps/files_external/l10n/de.json | 11 +++++++++++
 apps/files_external/l10n/es.js   |  2 ++
 apps/files_external/l10n/es.json |  2 ++
 apps/files_external/l10n/tr.js   | 18 ++++++++++++++----
 apps/files_external/l10n/tr.json | 18 ++++++++++++++----
 apps/files_sharing/l10n/es.js    | 13 ++++++++++++-
 apps/files_sharing/l10n/es.json  | 13 ++++++++++++-
 apps/files_sharing/l10n/id.js    |  8 ++++++++
 apps/files_sharing/l10n/id.json  |  8 ++++++++
 apps/files_sharing/l10n/tr.js    | 14 ++++++++++++++
 apps/files_sharing/l10n/tr.json  | 14 ++++++++++++++
 apps/user_ldap/l10n/es.js        |  2 +-
 apps/user_ldap/l10n/es.json      |  2 +-
 core/l10n/de.js                  | 20 ++++++++++++++++++++
 core/l10n/de.json                | 20 ++++++++++++++++++++
 core/l10n/es.js                  |  8 ++++++--
 core/l10n/es.json                |  8 ++++++--
 core/l10n/tr.js                  |  9 ++++++++-
 core/l10n/tr.json                |  9 ++++++++-
 lib/l10n/de.js                   |  2 ++
 lib/l10n/de.json                 |  2 ++
 lib/l10n/es.js                   |  4 ++--
 lib/l10n/es.json                 |  4 ++--
 settings/l10n/de.js              |  3 +++
 settings/l10n/de.json            |  3 +++
 settings/l10n/es.js              |  6 ++++--
 settings/l10n/es.json            |  6 ++++--
 settings/l10n/tr.js              | 10 +++++++---
 settings/l10n/tr.json            | 10 +++++++---
 42 files changed, 268 insertions(+), 36 deletions(-)

diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index 18e74fb9ed1..a5ba567fb59 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.",
     "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
+    "one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index e15fe7e1cd1..dfac7ba8e9b 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -23,6 +23,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melde Dich nochmals ab und wieder an.",
     "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
+    "one-time password for server-side-encryption" : "Einmal-Passwort für serverseitige Verschlüsselung",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 96db8f91209..e1fcb526d06 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -28,10 +28,10 @@ OC.L10N.register(
     "one-time password for server-side-encryption" : "sunucu tarafında şifleme için tek kullanımlık parola",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan okunamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Selam,\n\nsistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız '%s' parolası kullanılarak şifrelendi.\n\nLütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.\n\n",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Selam,\n\nSistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız '%s' parolası kullanılarak şifrelendi.\n\nLütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girdikten sonra şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.\n\n",
     "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
     "Cheers!" : "Hoşçakalın!",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Selam,<br><br>sistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız <strong>%s</strong> parolası kullanılarak şifrelendi.<br><br>Lütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.<br><br>",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Selam,<br><br>Sistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız <strong>%s</strong> parolası kullanılarak şifrelendi.<br><br>Lütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girdikten sonra şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.<br><br>",
     "Enable recovery key" : "Kurtarma anahtarını etkinleştir",
     "Disable recovery key" : "Kurtarma anahtarını devre dışı bırak",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kurtarma anahtarı, dosyaların şifrelenmesi için daha fazla \nşifreleme sunar. Bu kullanıcının dosyasının şifresini unuttuğunda kurtarmasına imkan verir.",
diff --git a/apps/encryption/l10n/tr.json b/apps/encryption/l10n/tr.json
index be6f6a5dfdd..743d3e7d15c 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -26,10 +26,10 @@
     "one-time password for server-side-encryption" : "sunucu tarafında şifleme için tek kullanımlık parola",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan okunamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
-    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Selam,\n\nsistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız '%s' parolası kullanılarak şifrelendi.\n\nLütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.\n\n",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Selam,\n\nSistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız '%s' parolası kullanılarak şifrelendi.\n\nLütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girdikten sonra şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.\n\n",
     "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
     "Cheers!" : "Hoşçakalın!",
-    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Selam,<br><br>sistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız <strong>%s</strong> parolası kullanılarak şifrelendi.<br><br>Lütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.<br><br>",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Selam,<br><br>Sistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız <strong>%s</strong> parolası kullanılarak şifrelendi.<br><br>Lütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girdikten sonra şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.<br><br>",
     "Enable recovery key" : "Kurtarma anahtarını etkinleştir",
     "Disable recovery key" : "Kurtarma anahtarını devre dışı bırak",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kurtarma anahtarı, dosyaların şifrelenmesi için daha fazla \nşifreleme sunar. Bu kullanıcının dosyasının şifresini unuttuğunda kurtarmasına imkan verir.",
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index 2f9a48f0fd4..b6f3711617a 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -75,8 +75,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"],
     "Favorited" : "Favorisiert",
     "Favorite" : "Favorit",
+    "{newname} already exists" : "{newname} existiert bereits",
     "Upload" : "Hochladen",
     "Text file" : "Textdatei",
+    "New text file.txt" : "Neue Textdatei.txt",
     "Folder" : "Ordner",
     "New folder" : "Neuer Ordner",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
@@ -94,12 +96,16 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s hat %1$s gelöscht",
     "You restored %1$s" : "Du hast %1$s wiederhergestellt",
     "%2$s restored %1$s" : "%2$s wiederhergestellt %1$s",
+    "Changed by %2$s" : "Geändert von %2$s",
+    "Deleted by %2$s" : "Gelöscht von %2$s",
+    "Restored by %2$s" : "Wiederhergestellt von %2$s",
     "%s could not be renamed as it has been deleted" : "%s konnte nicht umbenannt werden, da es gelöscht wurde",
     "%s could not be renamed" : "%s konnte nicht umbenannt werden",
     "Upload (max. %s)" : "Hochladen (max. %s)",
     "File handling" : "Dateibehandlung",
     "Maximum upload size" : "Maximale Upload-Größe",
     "max. possible: " : "maximal möglich:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Mit PHP-FPM kann es bis zu 5 Minuten dauern, bis die Einstellungen übernommen werden.",
     "Save" : "Speichern",
     "Can not be edited from here due to insufficient permissions." : "Aufgrund unzureichender Berechtigungen kann dies nicht von hier bearbeitet werden.",
     "Settings" : "Einstellungen",
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index 6457eded01a..d0cfab4929e 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -73,8 +73,10 @@
     "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"],
     "Favorited" : "Favorisiert",
     "Favorite" : "Favorit",
+    "{newname} already exists" : "{newname} existiert bereits",
     "Upload" : "Hochladen",
     "Text file" : "Textdatei",
+    "New text file.txt" : "Neue Textdatei.txt",
     "Folder" : "Ordner",
     "New folder" : "Neuer Ordner",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
@@ -92,12 +94,16 @@
     "%2$s deleted %1$s" : "%2$s hat %1$s gelöscht",
     "You restored %1$s" : "Du hast %1$s wiederhergestellt",
     "%2$s restored %1$s" : "%2$s wiederhergestellt %1$s",
+    "Changed by %2$s" : "Geändert von %2$s",
+    "Deleted by %2$s" : "Gelöscht von %2$s",
+    "Restored by %2$s" : "Wiederhergestellt von %2$s",
     "%s could not be renamed as it has been deleted" : "%s konnte nicht umbenannt werden, da es gelöscht wurde",
     "%s could not be renamed" : "%s konnte nicht umbenannt werden",
     "Upload (max. %s)" : "Hochladen (max. %s)",
     "File handling" : "Dateibehandlung",
     "Maximum upload size" : "Maximale Upload-Größe",
     "max. possible: " : "maximal möglich:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Mit PHP-FPM kann es bis zu 5 Minuten dauern, bis die Einstellungen übernommen werden.",
     "Save" : "Speichern",
     "Can not be edited from here due to insufficient permissions." : "Aufgrund unzureichender Berechtigungen kann dies nicht von hier bearbeitet werden.",
     "Settings" : "Einstellungen",
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index 11dce6e8da5..15062395e40 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s ha eliminado %1$s",
     "You restored %1$s" : "Usted restauró %1$s",
     "%2$s restored %1$s" : "%2$s recuperó %1$s",
+    "Changed by %2$s" : "Cambiado por %2$s",
+    "Deleted by %2$s" : "Eliminado por %2$s",
+    "Restored by %2$s" : "Restaurado por %2$s",
     "%s could not be renamed as it has been deleted" : "%s no se pudo renombrar pues ha sido eliminado",
     "%s could not be renamed" : "%s no pudo ser renombrado",
     "Upload (max. %s)" : "Subida (máx. %s)",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index 6a325f1c3c6..4ce106ea4b5 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s ha eliminado %1$s",
     "You restored %1$s" : "Usted restauró %1$s",
     "%2$s restored %1$s" : "%2$s recuperó %1$s",
+    "Changed by %2$s" : "Cambiado por %2$s",
+    "Deleted by %2$s" : "Eliminado por %2$s",
+    "Restored by %2$s" : "Restaurado por %2$s",
     "%s could not be renamed as it has been deleted" : "%s no se pudo renombrar pues ha sido eliminado",
     "%s could not be renamed" : "%s no pudo ser renombrado",
     "Upload (max. %s)" : "Subida (máx. %s)",
diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js
index 4eb8836d1c8..f02a6d79c4d 100644
--- a/apps/files/l10n/id.js
+++ b/apps/files/l10n/id.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s menghapus %1$s",
     "You restored %1$s" : "Anda memulihkan %1$s",
     "%2$s restored %1$s" : "%2$s memulihkan %1$s",
+    "Changed by %2$s" : "Diubah oleh %2$s",
+    "Deleted by %2$s" : "Dihapus oleh %2$s",
+    "Restored by %2$s" : "Dipulihkan oleh %2$s",
     "%s could not be renamed as it has been deleted" : "%s tidak dapat diubah namanya kerena telah dihapus",
     "%s could not be renamed" : "%s tidak dapat diubah nama",
     "Upload (max. %s)" : "Unggah (maks. %s)",
diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json
index bcf66fa3a1e..773f6b8f5a7 100644
--- a/apps/files/l10n/id.json
+++ b/apps/files/l10n/id.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s menghapus %1$s",
     "You restored %1$s" : "Anda memulihkan %1$s",
     "%2$s restored %1$s" : "%2$s memulihkan %1$s",
+    "Changed by %2$s" : "Diubah oleh %2$s",
+    "Deleted by %2$s" : "Dihapus oleh %2$s",
+    "Restored by %2$s" : "Dipulihkan oleh %2$s",
     "%s could not be renamed as it has been deleted" : "%s tidak dapat diubah namanya kerena telah dihapus",
     "%s could not be renamed" : "%s tidak dapat diubah nama",
     "Upload (max. %s)" : "Unggah (maks. %s)",
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
index 6b2f9a14dcf..cd48408b9e1 100644
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@@ -75,8 +75,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n bayt","%n bayt"],
     "Favorited" : "Sık kullanılanlara eklendi",
     "Favorite" : "Sık kullanılan",
+    "{newname} already exists" : "{newname} zaten mevcut",
     "Upload" : "Yükle",
     "Text file" : "Metin dosyası",
+    "New text file.txt" : "Yeni metin dosyası.txt",
     "Folder" : "Klasör",
     "New folder" : "Yeni klasör",
     "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu",
@@ -94,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s, %1$s dosyasını sildi",
     "You restored %1$s" : "%1$s ögesini geri aldınız",
     "%2$s restored %1$s" : "%2$s, %1$s ögesini geri aldı",
+    "Changed by %2$s" : "%2$s tarafından değiştirildi",
+    "Deleted by %2$s" : "%2$s tarafından silindi",
+    "Restored by %2$s" : "%2$s tarafından geri yüklendi",
     "%s could not be renamed as it has been deleted" : "%s, silindiği için adlandırılamadı",
     "%s could not be renamed" : "%s yeniden adlandırılamadı",
     "Upload (max. %s)" : "Yükle (azami: %s)",
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
index 9f59757f715..92af334f703 100644
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@@ -73,8 +73,10 @@
     "_%n byte_::_%n bytes_" : ["%n bayt","%n bayt"],
     "Favorited" : "Sık kullanılanlara eklendi",
     "Favorite" : "Sık kullanılan",
+    "{newname} already exists" : "{newname} zaten mevcut",
     "Upload" : "Yükle",
     "Text file" : "Metin dosyası",
+    "New text file.txt" : "Yeni metin dosyası.txt",
     "Folder" : "Klasör",
     "New folder" : "Yeni klasör",
     "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu",
@@ -92,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s, %1$s dosyasını sildi",
     "You restored %1$s" : "%1$s ögesini geri aldınız",
     "%2$s restored %1$s" : "%2$s, %1$s ögesini geri aldı",
+    "Changed by %2$s" : "%2$s tarafından değiştirildi",
+    "Deleted by %2$s" : "%2$s tarafından silindi",
+    "Restored by %2$s" : "%2$s tarafından geri yüklendi",
     "%s could not be renamed as it has been deleted" : "%s, silindiği için adlandırılamadı",
     "%s could not be renamed" : "%s yeniden adlandırılamadı",
     "Upload (max. %s)" : "Yükle (azami: %s)",
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index bd4aa124ee1..afedf29dc03 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -22,14 +22,20 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
+    "Access key" : "Zugangsschlüssel",
+    "Secret key" : "Geheimer Schlüssel",
     "None" : "Keine",
+    "OAuth1" : "OAuth1",
     "App key" : "App-Schlüssel",
     "App secret" : "Geheime Zeichenkette der App",
     "Client ID" : "Client-ID",
     "Client secret" : "Geheime Zeichenkette des Client",
+    "OpenStack" : "OpenStack",
     "Username" : "Benutzername",
     "Password" : "Passwort",
     "API key" : "API-Schlüssel",
+    "Username and password" : "Benutzername und Passwort",
+    "RSA public key" : "RSA öffentlicher Schlüssel",
     "Public key" : "Öffentlicher Schlüssel",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -43,14 +49,19 @@ OC.L10N.register(
     "Remote subfolder" : "Entfernter Unterordner",
     "Secure https://" : "Sicherer HTTPS://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "Host",
     "Secure ftps://" : "Sicherer ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Lokal",
     "Location" : "Ort",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
     "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Share",
+    "Domain" : "Domain",
     "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
     "Username as share" : "Benutzername als Freigabe",
     "OpenStack Object Storage" : "Openstack-Objektspeicher",
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index f09172d814c..ef96bdcf0e5 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -20,14 +20,20 @@
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
+    "Access key" : "Zugangsschlüssel",
+    "Secret key" : "Geheimer Schlüssel",
     "None" : "Keine",
+    "OAuth1" : "OAuth1",
     "App key" : "App-Schlüssel",
     "App secret" : "Geheime Zeichenkette der App",
     "Client ID" : "Client-ID",
     "Client secret" : "Geheime Zeichenkette des Client",
+    "OpenStack" : "OpenStack",
     "Username" : "Benutzername",
     "Password" : "Passwort",
     "API key" : "API-Schlüssel",
+    "Username and password" : "Benutzername und Passwort",
+    "RSA public key" : "RSA öffentlicher Schlüssel",
     "Public key" : "Öffentlicher Schlüssel",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -41,14 +47,19 @@
     "Remote subfolder" : "Entfernter Unterordner",
     "Secure https://" : "Sicherer HTTPS://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "Host",
     "Secure ftps://" : "Sicherer ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Lokal",
     "Location" : "Ort",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Root",
     "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Share",
+    "Domain" : "Domain",
     "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
     "Username as share" : "Benutzername als Freigabe",
     "OpenStack Object Storage" : "Openstack-Objektspeicher",
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
index 3d9add9c2ec..21e9476f77a 100644
--- a/apps/files_external/l10n/es.js
+++ b/apps/files_external/l10n/es.js
@@ -36,9 +36,11 @@ OC.L10N.register(
     "Client secret" : "Cliente secreto",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
+    "Tenant name" : "Nombre del inquilino",
     "API key" : "Clave API",
     "Username and password" : "Nombre de usuario y contraseña",
     "Session credentials" : "Credenciales de la sesión",
+    "RSA public key" : "Clave pública RSA",
     "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Depósito",
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
index 60ae72faf72..5f89e008ed5 100644
--- a/apps/files_external/l10n/es.json
+++ b/apps/files_external/l10n/es.json
@@ -34,9 +34,11 @@
     "Client secret" : "Cliente secreto",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
+    "Tenant name" : "Nombre del inquilino",
     "API key" : "Clave API",
     "Username and password" : "Nombre de usuario y contraseña",
     "Session credentials" : "Credenciales de la sesión",
+    "RSA public key" : "Clave pública RSA",
     "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Depósito",
diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js
index b0fed7b5657..6eada0b32f3 100644
--- a/apps/files_external/l10n/tr.js
+++ b/apps/files_external/l10n/tr.js
@@ -1,18 +1,20 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Getirme istek jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
-    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Getirme erişim jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "İstek jetonları getirme başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Erişim jetonları getirme başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
     "Please provide a valid app key and secret." : "Lütfen geçerli bir uygulama anahtarı ve gizli bilgisini girin.",
     "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
     "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
     "External storage" : "Harici depolama",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
-    "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı",
+    "Invalid backend or authentication mechanism class" : "Geçersiz arka uç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
     "Objectstore forbidden" : "Nesne deposu yasaktır",
     "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"",
-    "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri",
+    "Not permitted to use backend \"%s\"" : "\"%s\" arka ucu kullanımına izin verilmiyor",
+    "Not permitted to use authentication mechanism \"%s\"" : "\"%s\" kimlik doğrulama mekanizmasına izin verilmiyor",
+    "Unsatisfied backend parameters" : "Yetersiz arka uç parametreleri",
     "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri",
     "Personal" : "Kişisel",
     "System" : "Sistem",
@@ -41,11 +43,16 @@ OC.L10N.register(
     "OAuth2" : "OAuth2",
     "Client ID" : "İstemci kimliği",
     "Client secret" : "İstemci parolası",
+    "OpenStack" : "OpenStack",
     "Username" : "Kullanıcı Adı",
     "Password" : "Parola",
+    "Tenant name" : "Kiracı adı",
+    "Identity endpoint URL" : "Kimlik uç nokta URL'si",
+    "Rackspace" : "Rackspace",
     "API key" : "API anahtarı",
     "Username and password" : "Kullanıcı adı ve parola",
     "Session credentials" : "Oturum bilgileri",
+    "RSA public key" : "RSA ortak anahtarı",
     "Public key" : "Ortak anahtar",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -71,9 +78,12 @@ OC.L10N.register(
     "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Paylaş",
+    "Domain" : "Alan adı",
     "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
     "Username as share" : "Paylaşım olarak kullanıcı adı",
     "OpenStack Object Storage" : "OpenStack Nesne Depolama",
+    "Service name" : "Hizmet adı",
+    "Request timeout (seconds)" : "İstek zamanaşımı (saniye)",
     "<b>Note:</b> " : "<b>Not:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json
index 2a7d69832f8..7fd764d0165 100644
--- a/apps/files_external/l10n/tr.json
+++ b/apps/files_external/l10n/tr.json
@@ -1,16 +1,18 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Getirme istek jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
-    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Getirme erişim jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "İstek jetonları getirme başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Erişim jetonları getirme başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
     "Please provide a valid app key and secret." : "Lütfen geçerli bir uygulama anahtarı ve gizli bilgisini girin.",
     "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
     "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
     "External storage" : "Harici depolama",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
-    "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı",
+    "Invalid backend or authentication mechanism class" : "Geçersiz arka uç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
     "Objectstore forbidden" : "Nesne deposu yasaktır",
     "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"",
-    "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri",
+    "Not permitted to use backend \"%s\"" : "\"%s\" arka ucu kullanımına izin verilmiyor",
+    "Not permitted to use authentication mechanism \"%s\"" : "\"%s\" kimlik doğrulama mekanizmasına izin verilmiyor",
+    "Unsatisfied backend parameters" : "Yetersiz arka uç parametreleri",
     "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri",
     "Personal" : "Kişisel",
     "System" : "Sistem",
@@ -39,11 +41,16 @@
     "OAuth2" : "OAuth2",
     "Client ID" : "İstemci kimliği",
     "Client secret" : "İstemci parolası",
+    "OpenStack" : "OpenStack",
     "Username" : "Kullanıcı Adı",
     "Password" : "Parola",
+    "Tenant name" : "Kiracı adı",
+    "Identity endpoint URL" : "Kimlik uç nokta URL'si",
+    "Rackspace" : "Rackspace",
     "API key" : "API anahtarı",
     "Username and password" : "Kullanıcı adı ve parola",
     "Session credentials" : "Oturum bilgileri",
+    "RSA public key" : "RSA ortak anahtarı",
     "Public key" : "Ortak anahtar",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Bucket",
@@ -69,9 +76,12 @@
     "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
     "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Paylaş",
+    "Domain" : "Alan adı",
     "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
     "Username as share" : "Paylaşım olarak kullanıcı adı",
     "OpenStack Object Storage" : "OpenStack Nesne Depolama",
+    "Service name" : "Hizmet adı",
+    "Request timeout (seconds)" : "İstek zamanaşımı (saniye)",
     "<b>Note:</b> " : "<b>Not:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index 037855d6d99..650fb5c524a 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -28,7 +28,7 @@ OC.L10N.register(
     "Sharing" : "Compartiendo",
     "A file or folder has been <strong>shared</strong>" : "Se ha <strong>compartido</strong> un archivo o carpeta",
     "A file or folder was shared from <strong>another server</strong>" : "Se ha compartido un archivo o carpeta desde <strong>otro servidor</strong>",
-    "A public shared file or folder was <strong>downloaded</strong>" : "Ha sido <strong>descargado</strong> un archivo (o carpeta) compartido públicamente",
+    "A public shared file or folder was <strong>downloaded</strong>" : "Se ha <strong>descargado</strong> un archivo o carpeta compartido públicamente",
     "You received a new remote share %2$s from %1$s" : "Recibió un nuevo recurso compartido remoto %2$s de %1$s",
     "You received a new remote share from %s" : "Ha recibido un nuevo recurso compartido remoto de %s",
     "%1$s accepted remote share %2$s" : "%1$s aceptó el recurso compartido remoto %2$s",
@@ -38,8 +38,19 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Se descargó el archivo público compartido %1$s",
     "You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Usted ha compartido %1$s con el grupo %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s compartó %1$s con %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s compartió %1$s con el grupo %3$s",
+    "%2$s shared %1$s via link" : "%2$s compartió %1$s vía enlace",
     "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
     "You shared %1$s via link" : "Ha compartido %1$s vía enlace",
+    "Downloaded via public link" : "Descargado vía enlace público",
+    "Shared with %2$s" : "Compartido con %2$s",
+    "Shared with group %2$s" : "Compartido con el grupo %2$s",
+    "Shared with %3$s by %2$s" : "Compartido con %3$s por %2$s",
+    "Shared with group %3$s by %2$s" : "Compartido con el grupo %3$s por %2$s",
+    "Shared via link by %2$s" : "Compartido vía enlace por %2$s",
+    "Shared by %2$s" : "Compartido por %2$s",
+    "Shared via public link" : "Compartido vía enlace público",
     "Shares" : "Compartidos",
     "Accept" : "Aceptar",
     "Decline" : "Denegar",
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index c0da82abdd6..6f963ab8fee 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -26,7 +26,7 @@
     "Sharing" : "Compartiendo",
     "A file or folder has been <strong>shared</strong>" : "Se ha <strong>compartido</strong> un archivo o carpeta",
     "A file or folder was shared from <strong>another server</strong>" : "Se ha compartido un archivo o carpeta desde <strong>otro servidor</strong>",
-    "A public shared file or folder was <strong>downloaded</strong>" : "Ha sido <strong>descargado</strong> un archivo (o carpeta) compartido públicamente",
+    "A public shared file or folder was <strong>downloaded</strong>" : "Se ha <strong>descargado</strong> un archivo o carpeta compartido públicamente",
     "You received a new remote share %2$s from %1$s" : "Recibió un nuevo recurso compartido remoto %2$s de %1$s",
     "You received a new remote share from %s" : "Ha recibido un nuevo recurso compartido remoto de %s",
     "%1$s accepted remote share %2$s" : "%1$s aceptó el recurso compartido remoto %2$s",
@@ -36,8 +36,19 @@
     "Public shared file %1$s was downloaded" : "Se descargó el archivo público compartido %1$s",
     "You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Usted ha compartido %1$s con el grupo %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s compartó %1$s con %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s compartió %1$s con el grupo %3$s",
+    "%2$s shared %1$s via link" : "%2$s compartió %1$s vía enlace",
     "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
     "You shared %1$s via link" : "Ha compartido %1$s vía enlace",
+    "Downloaded via public link" : "Descargado vía enlace público",
+    "Shared with %2$s" : "Compartido con %2$s",
+    "Shared with group %2$s" : "Compartido con el grupo %2$s",
+    "Shared with %3$s by %2$s" : "Compartido con %3$s por %2$s",
+    "Shared with group %3$s by %2$s" : "Compartido con el grupo %3$s por %2$s",
+    "Shared via link by %2$s" : "Compartido vía enlace por %2$s",
+    "Shared by %2$s" : "Compartido por %2$s",
+    "Shared via public link" : "Compartido vía enlace público",
     "Shares" : "Compartidos",
     "Accept" : "Aceptar",
     "Decline" : "Denegar",
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index 4486cd80545..bfded66f7c6 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -43,6 +43,14 @@ OC.L10N.register(
     "%2$s shared %1$s via link" : "%2$s berbagi %1$s via tautan",
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
+    "Downloaded via public link" : "Diunduh via tautan publik",
+    "Shared with %2$s" : "Dibagikan kepada %2$s",
+    "Shared with group %2$s" : "Dibagikan kepada grup %2$s",
+    "Shared with %3$s by %2$s" : "Dibagikan kepada %3$s oleh %2$s",
+    "Shared with group %3$s by %2$s" : "Dibagikan kepada grup %3$s oleh %2$s",
+    "Shared via link by %2$s" : "Dibagikan via tautan oleh %2$s",
+    "Shared by %2$s" : "Dibagikan oleh %2$s",
+    "Shared via public link" : "Dibagikan via tautan publik",
     "Shares" : "Dibagikan",
     "You received %2$s as a remote share from %1$s" : "Anda menerima %2$s sebagai berbagi remote dari %1$s",
     "Accept" : "Terima",
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index f9805231bcd..b6e9297bcc9 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -41,6 +41,14 @@
     "%2$s shared %1$s via link" : "%2$s berbagi %1$s via tautan",
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
+    "Downloaded via public link" : "Diunduh via tautan publik",
+    "Shared with %2$s" : "Dibagikan kepada %2$s",
+    "Shared with group %2$s" : "Dibagikan kepada grup %2$s",
+    "Shared with %3$s by %2$s" : "Dibagikan kepada %3$s oleh %2$s",
+    "Shared with group %3$s by %2$s" : "Dibagikan kepada grup %3$s oleh %2$s",
+    "Shared via link by %2$s" : "Dibagikan via tautan oleh %2$s",
+    "Shared by %2$s" : "Dibagikan oleh %2$s",
+    "Shared via public link" : "Dibagikan via tautan publik",
     "Shares" : "Dibagikan",
     "You received %2$s as a remote share from %1$s" : "Anda menerima %2$s sebagai berbagi remote dari %1$s",
     "Accept" : "Terima",
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index bb00dd4295a..5e99aaf3993 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -38,10 +38,23 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Herkese açık paylaşılan dosya %1$s indirildi",
     "You shared %1$s with %2$s" : "%1$s dosyasını %2$s ile paylaştınız",
     "You shared %1$s with group %2$s" : "%1$s dosyasını %2$s grubu ile paylaştınız",
+    "%2$s shared %1$s with %3$s" : "%2$s %3$s ile %1$s dosyasını paylaştı",
+    "%2$s shared %1$s with group %3$s" : "%2$s %3$s grubu ile %1$s dosyasını paylaştı",
+    "%2$s shared %1$s via link" : "%2$s bağlantı ile %1$s dosyasını paylaştı",
     "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı",
     "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız",
+    "Downloaded via public link" : "Herkese açık bağlantı ile indirildi",
+    "Shared with %2$s" : "%2$s ile paylaşıldı",
+    "Shared with group %2$s" : "%2$s grubu ile paylaşıldı",
+    "Shared with %3$s by %2$s" : "%3$s ile %2$s tarafından paylaşıldı",
+    "Shared with group %3$s by %2$s" : "%2$s tarafından %3$s grubu ile paylaşıldı",
+    "Shared via link by %2$s" : "%2$s tarafından bağlantı ile paylaşıldı",
+    "Shared by %2$s" : "%2$s tarafından paylaşıldı",
+    "Shared via public link" : "Herkese açık bağlantı ile paylaşıldı",
     "Shares" : "Paylaşımlar",
+    "You received %2$s as a remote share from %1$s" : "%1$s kişisinden %2$s paylaşımını uzak paylaşım olarak aldınız",
     "Accept" : "Kabul et",
+    "Decline" : "Reddet",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı",
     "This share is password-protected" : "Bu paylaşım parola korumalı",
@@ -67,6 +80,7 @@ OC.L10N.register(
     "Federated Cloud" : "Birleşmiş Bulut",
     "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:",
     "Share it:" : "Paylaşın:",
+    "Add to your website" : "Web sitenize ekleyin",
     "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı",
     "HTML Code:" : "HTML Kodu:"
 },
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index 1371bf37447..581ef2e0ffc 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -36,10 +36,23 @@
     "Public shared file %1$s was downloaded" : "Herkese açık paylaşılan dosya %1$s indirildi",
     "You shared %1$s with %2$s" : "%1$s dosyasını %2$s ile paylaştınız",
     "You shared %1$s with group %2$s" : "%1$s dosyasını %2$s grubu ile paylaştınız",
+    "%2$s shared %1$s with %3$s" : "%2$s %3$s ile %1$s dosyasını paylaştı",
+    "%2$s shared %1$s with group %3$s" : "%2$s %3$s grubu ile %1$s dosyasını paylaştı",
+    "%2$s shared %1$s via link" : "%2$s bağlantı ile %1$s dosyasını paylaştı",
     "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı",
     "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız",
+    "Downloaded via public link" : "Herkese açık bağlantı ile indirildi",
+    "Shared with %2$s" : "%2$s ile paylaşıldı",
+    "Shared with group %2$s" : "%2$s grubu ile paylaşıldı",
+    "Shared with %3$s by %2$s" : "%3$s ile %2$s tarafından paylaşıldı",
+    "Shared with group %3$s by %2$s" : "%2$s tarafından %3$s grubu ile paylaşıldı",
+    "Shared via link by %2$s" : "%2$s tarafından bağlantı ile paylaşıldı",
+    "Shared by %2$s" : "%2$s tarafından paylaşıldı",
+    "Shared via public link" : "Herkese açık bağlantı ile paylaşıldı",
     "Shares" : "Paylaşımlar",
+    "You received %2$s as a remote share from %1$s" : "%1$s kişisinden %2$s paylaşımını uzak paylaşım olarak aldınız",
     "Accept" : "Kabul et",
+    "Decline" : "Reddet",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı",
     "This share is password-protected" : "Bu paylaşım parola korumalı",
@@ -65,6 +78,7 @@
     "Federated Cloud" : "Birleşmiş Bulut",
     "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:",
     "Share it:" : "Paylaşın:",
+    "Add to your website" : "Web sitenize ekleyin",
     "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı",
     "HTML Code:" : "HTML Kodu:"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js
index c73f54b5489..5171628428d 100644
--- a/apps/user_ldap/l10n/es.js
+++ b/apps/user_ldap/l10n/es.js
@@ -31,7 +31,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Confirmar eliminación",
     "Mappings cleared successfully!" : "¡Asignaciones borradas exitosamente!",
     "Error while clearing the mappings." : "Error mientras se borraban las asignaciones.",
-    "Anonymous bind is not allowed. Please provide a User DN and Password." : "Enlace anónimo no está permitido. Por favor suministre un DN de usuario y contraseña ",
+    "Anonymous bind is not allowed. Please provide a User DN and Password." : "Un vínculo anónimo no está permitido. Por favor, suministre un DN de usuario y contraseña. ",
     "LDAP Operations error. Anonymous bind might not be allowed." : "Error de operaciones LDAP. Enlace anónimo puede no estar permitido.",
     "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Guardado fallido. Por favor, asegúrese de que la base de datos está en Operación. Actualizar antes de continuar.",
     "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiando el modo habilitará automáticamente las consultas LDAP. Dependiendo del tamaño de su LDAP puede tardar un rato. ¿Desea cambiar el modo?",
diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json
index 8666d1efdd9..8a896a9bda2 100644
--- a/apps/user_ldap/l10n/es.json
+++ b/apps/user_ldap/l10n/es.json
@@ -29,7 +29,7 @@
     "Confirm Deletion" : "Confirmar eliminación",
     "Mappings cleared successfully!" : "¡Asignaciones borradas exitosamente!",
     "Error while clearing the mappings." : "Error mientras se borraban las asignaciones.",
-    "Anonymous bind is not allowed. Please provide a User DN and Password." : "Enlace anónimo no está permitido. Por favor suministre un DN de usuario y contraseña ",
+    "Anonymous bind is not allowed. Please provide a User DN and Password." : "Un vínculo anónimo no está permitido. Por favor, suministre un DN de usuario y contraseña. ",
     "LDAP Operations error. Anonymous bind might not be allowed." : "Error de operaciones LDAP. Enlace anónimo puede no estar permitido.",
     "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Guardado fallido. Por favor, asegúrese de que la base de datos está en Operación. Actualizar antes de continuar.",
     "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Cambiando el modo habilitará automáticamente las consultas LDAP. Dependiendo del tamaño de su LDAP puede tardar un rato. ¿Desea cambiar el modo?",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 39fec52fdf6..d012c2238d9 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -2,6 +2,8 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
+    "Preparing update" : "Update vorbereiten",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrationstests wurden übersprungen - \"update.skip-migration-test\" is in der config.php aktiviert",
     "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
     "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
     "Maintenance mode is kept active" : "Wartungsmodus wird aktiv gehalten",
@@ -11,8 +13,11 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "„%s“ zu %s aktualisiert",
     "Repair warning: " : "Reperaturwarnung:",
     "Repair error: " : "Reperaturfehler:",
+    "Set log level to debug - current level: \"%s\"" : "Setze Log-Level auf Debug - aktuelles Level: \"%s\"",
+    "Reset log level to  \"%s\"" : "Setze Log-Level zu \"%s\" zurück",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
+    "Already up to date" : "Bereits aktuell",
     "File is too big" : "Datei ist zu groß",
     "Invalid file provided" : "Ungültige Datei zur Verfügung gestellt",
     "No image or file provided" : "Es wurde weder ein Bild noch eine Datei zur Verfügung gestellt",
@@ -36,6 +41,13 @@ OC.L10N.register(
     "Thu." : "Do",
     "Fri." : "Fr",
     "Sat." : "Sa",
+    "Su" : "So",
+    "Mo" : "Mo",
+    "Tu" : "Di",
+    "We" : "Mi",
+    "Th" : "Do",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "März",
@@ -142,6 +154,7 @@ OC.L10N.register(
     "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
     "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
     "Warning" : "Warnung",
+    "Error while sending notification" : "Fehler beim Senden der Benachrichtigung",
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Enter new" : "Neuen eingeben",
     "Delete" : "Löschen",
@@ -162,6 +175,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Das Update war erfolgreich. Warnungen wurden ausgegeben.",
     "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
     "Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
+    "Couldn't reset password because the token is expired" : "Das Passwort konnte nicht zurückgesetzt werden, da der Token abgelaufen ist",
     "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stelle sicher, dass Dein Benutzername korrekt ist.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versandt werden, weil für diesen Benutzernamen keine E-Mail-Adresse hinterlegt ist. Bitte kontaktiere Deinen Administrator.",
     "%s password reset" : "%s-Passwort zurücksetzen",
@@ -170,6 +184,8 @@ OC.L10N.register(
     "New Password" : "Neues Passwort",
     "Reset password" : "Passwort zurücksetzen",
     "Searching other places" : "Andere Orte durchsuchen",
+    "No search results in other folders" : "Keine Suchergebnisse in anderen Ordnern",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} Suchergebnis im anderen Ordner","{count} Suchergebnisse in anderen Ordnern"],
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
     "Apps" : "Apps",
@@ -246,6 +262,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktiere Deinen Administrator. Wenn Du Administrator dieser Instanz bist, konfiguriere bitte die „trusted_domain“-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereitgestellt.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Wenn es Deine Konfiguration zulässt, kannst Du als Administrator gegebenenfalls den Button unten benutzen, um diese Domain als vertrauenswürdig einzustufen.",
     "Add \"%s\" as trusted domain" : "„%s“ als vertrauenswürdige Domain hinzufügen",
+    "App update required" : "Appupdate notwendig",
+    "%s will be updated to version %s" : "%s wird auf Version %s aktuallisiert",
+    "These apps will be updated:" : "Diese Apps werden aktuallisiert:",
+    "These incompatible apps will be disabled:" : "Diese inkompatiblen Apps werden deaktiviert:",
     "The theme %s has been disabled." : "Das Theme %s wurde deaktiviert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Bitte stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
     "Start update" : "Aktualisierung starten",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 829bddc1102..7e207557dc5 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -1,5 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
+    "Preparing update" : "Update vorbereiten",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrationstests wurden übersprungen - \"update.skip-migration-test\" is in der config.php aktiviert",
     "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
     "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
     "Maintenance mode is kept active" : "Wartungsmodus wird aktiv gehalten",
@@ -9,8 +11,11 @@
     "Updated \"%s\" to %s" : "„%s“ zu %s aktualisiert",
     "Repair warning: " : "Reperaturwarnung:",
     "Repair error: " : "Reperaturfehler:",
+    "Set log level to debug - current level: \"%s\"" : "Setze Log-Level auf Debug - aktuelles Level: \"%s\"",
+    "Reset log level to  \"%s\"" : "Setze Log-Level zu \"%s\" zurück",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
+    "Already up to date" : "Bereits aktuell",
     "File is too big" : "Datei ist zu groß",
     "Invalid file provided" : "Ungültige Datei zur Verfügung gestellt",
     "No image or file provided" : "Es wurde weder ein Bild noch eine Datei zur Verfügung gestellt",
@@ -34,6 +39,13 @@
     "Thu." : "Do",
     "Fri." : "Fr",
     "Sat." : "Sa",
+    "Su" : "So",
+    "Mo" : "Mo",
+    "Tu" : "Di",
+    "We" : "Mi",
+    "Th" : "Do",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "März",
@@ -140,6 +152,7 @@
     "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
     "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
     "Warning" : "Warnung",
+    "Error while sending notification" : "Fehler beim Senden der Benachrichtigung",
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Enter new" : "Neuen eingeben",
     "Delete" : "Löschen",
@@ -160,6 +173,7 @@
     "The update was successful. There were warnings." : "Das Update war erfolgreich. Warnungen wurden ausgegeben.",
     "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
     "Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
+    "Couldn't reset password because the token is expired" : "Das Passwort konnte nicht zurückgesetzt werden, da der Token abgelaufen ist",
     "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stelle sicher, dass Dein Benutzername korrekt ist.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versandt werden, weil für diesen Benutzernamen keine E-Mail-Adresse hinterlegt ist. Bitte kontaktiere Deinen Administrator.",
     "%s password reset" : "%s-Passwort zurücksetzen",
@@ -168,6 +182,8 @@
     "New Password" : "Neues Passwort",
     "Reset password" : "Passwort zurücksetzen",
     "Searching other places" : "Andere Orte durchsuchen",
+    "No search results in other folders" : "Keine Suchergebnisse in anderen Ordnern",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} Suchergebnis im anderen Ordner","{count} Suchergebnisse in anderen Ordnern"],
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
     "Apps" : "Apps",
@@ -244,6 +260,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktiere Deinen Administrator. Wenn Du Administrator dieser Instanz bist, konfiguriere bitte die „trusted_domain“-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereitgestellt.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Wenn es Deine Konfiguration zulässt, kannst Du als Administrator gegebenenfalls den Button unten benutzen, um diese Domain als vertrauenswürdig einzustufen.",
     "Add \"%s\" as trusted domain" : "„%s“ als vertrauenswürdige Domain hinzufügen",
+    "App update required" : "Appupdate notwendig",
+    "%s will be updated to version %s" : "%s wird auf Version %s aktuallisiert",
+    "These apps will be updated:" : "Diese Apps werden aktuallisiert:",
+    "These incompatible apps will be disabled:" : "Diese inkompatiblen Apps werden deaktiviert:",
     "The theme %s has been disabled." : "Das Theme %s wurde deaktiviert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Bitte stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
     "Start update" : "Aktualisierung starten",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 55ec168f0ae..816e4601520 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "No se pudo enviar el mensaje a los siguientes usuarios: %s",
     "Preparing update" : "Preparando la actualización",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Se han saltado las pruebas de migración - \"update.skip-migration-test\" está activado en config.php",
     "Turned on maintenance mode" : "Modo mantenimiento activado",
     "Turned off maintenance mode" : "Modo mantenimiento desactivado",
     "Maintenance mode is kept active" : "El modo mantenimiento aún está activo.",
@@ -12,6 +13,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Se ha actualizado \"%s\" a %s",
     "Repair warning: " : "Advertencia de reparación:",
     "Repair error: " : "Error que reparar:",
+    "Set log level to debug - current level: \"%s\"" : "Establecer nivel de registro para depurar - nivel actual: \"%s\"",
+    "Reset log level to  \"%s\"" : "Restablecer nivel de registro a \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Las siguientes apps incompatibles se han deshabilitado: %s",
     "Following apps have been disabled: %s" : "Siguiendo aplicaciones ha sido deshabilitado: %s",
     "Already up to date" : "Ya actualizado",
@@ -166,8 +169,8 @@ OC.L10N.register(
     "sunny" : "soleado",
     "Hello {name}, the weather is {weather}" : "Hola {name}, el día es {weather}",
     "Hello {name}" : "Hola {name}",
-    "_download %n file_::_download %n files_" : ["descargar %n ficheros","descargar %n ficheros"],
-    "{version} is available. Get more information on how to update." : "Una nueva {version} está disponible. Consiga mas información de como actualizar.",
+    "_download %n file_::_download %n files_" : ["descargar %n ficheros","descargar %n archivos"],
+    "{version} is available. Get more information on how to update." : "Una nueva {version} está disponible. Obtenga más información sobre cómo actualizar.",
     "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a la versión {version}. Esto puede tardar un poco.",
     "Please reload the page." : "Recargue/Actualice la página",
     "The update was unsuccessful. " : "La actualización ha fallado.",
@@ -184,6 +187,7 @@ OC.L10N.register(
     "Reset password" : "Restablecer contraseña",
     "Searching other places" : "Buscando en otros lugares",
     "No search results in other folders" : "Ningún resultado de búsqueda en otras carpetas",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} resultado de búsqueda en otra carpeta","{count} resultados de búsqueda en otras carpetas"],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index b196258a152..bc4b3c4dd34 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "No se pudo enviar el mensaje a los siguientes usuarios: %s",
     "Preparing update" : "Preparando la actualización",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Se han saltado las pruebas de migración - \"update.skip-migration-test\" está activado en config.php",
     "Turned on maintenance mode" : "Modo mantenimiento activado",
     "Turned off maintenance mode" : "Modo mantenimiento desactivado",
     "Maintenance mode is kept active" : "El modo mantenimiento aún está activo.",
@@ -10,6 +11,8 @@
     "Updated \"%s\" to %s" : "Se ha actualizado \"%s\" a %s",
     "Repair warning: " : "Advertencia de reparación:",
     "Repair error: " : "Error que reparar:",
+    "Set log level to debug - current level: \"%s\"" : "Establecer nivel de registro para depurar - nivel actual: \"%s\"",
+    "Reset log level to  \"%s\"" : "Restablecer nivel de registro a \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Las siguientes apps incompatibles se han deshabilitado: %s",
     "Following apps have been disabled: %s" : "Siguiendo aplicaciones ha sido deshabilitado: %s",
     "Already up to date" : "Ya actualizado",
@@ -164,8 +167,8 @@
     "sunny" : "soleado",
     "Hello {name}, the weather is {weather}" : "Hola {name}, el día es {weather}",
     "Hello {name}" : "Hola {name}",
-    "_download %n file_::_download %n files_" : ["descargar %n ficheros","descargar %n ficheros"],
-    "{version} is available. Get more information on how to update." : "Una nueva {version} está disponible. Consiga mas información de como actualizar.",
+    "_download %n file_::_download %n files_" : ["descargar %n ficheros","descargar %n archivos"],
+    "{version} is available. Get more information on how to update." : "Una nueva {version} está disponible. Obtenga más información sobre cómo actualizar.",
     "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a la versión {version}. Esto puede tardar un poco.",
     "Please reload the page." : "Recargue/Actualice la página",
     "The update was unsuccessful. " : "La actualización ha fallado.",
@@ -182,6 +185,7 @@
     "Reset password" : "Restablecer contraseña",
     "Searching other places" : "Buscando en otros lugares",
     "No search results in other folders" : "Ningún resultado de búsqueda en otras carpetas",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} resultado de búsqueda en otra carpeta","{count} resultados de búsqueda en otras carpetas"],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index b64f3110953..a040c37e73e 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Şu kullanıcılara posta gönderilemedi: %s",
     "Preparing update" : "Güncelleme hazırlanıyor",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Taşıma testleri atlandı - config.php içerisinde \"update.skip-migration-test\" etkinleştirildi",
     "Turned on maintenance mode" : "Bakım kipi etkinleştirildi",
     "Turned off maintenance mode" : "Bakım kipi kapatıldı",
     "Maintenance mode is kept active" : "Bakım kipi etkin tutuldu",
@@ -12,6 +13,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "\"%s\", %s sürümüne güncellendi",
     "Repair warning: " : "Onarım uyarısı:",
     "Repair error: " : "Onarım hatası:",
+    "Set log level to debug - current level: \"%s\"" : "Günlük seviyesini hata ayıklamaya ayarla - geçerli seviye: \"%s\"",
+    "Reset log level to  \"%s\"" : "Günlük seviyesini \"%s\" olarak sıfırla",
     "Following incompatible apps have been disabled: %s" : "Aşağıdaki uyumsuz uygulamalar devre dışı bırakıldı: %s",
     "Following apps have been disabled: %s" : "Aşağıdaki uygulamalar devre dışı bırakıldı: %s",
     "Already up to date" : "Zaten güncel",
@@ -146,12 +149,14 @@ OC.L10N.register(
     "change" : "değiştir",
     "delete" : "sil",
     "access control" : "erişim kontrolü",
+    "Share details could not be loaded for this item." : "Bu öge için paylaşma ayrıntıları yüklenemedi.",
     "An error occured. Please try again" : "Bir hata oluştu. Lütfen yeniden deneyin",
     "Share" : "Paylaş",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş",
     "Share with users or groups …" : "Kullanıcı ve gruplarla paylaş...",
     "Share with users, groups or remote users …" : "Kullanıcılar, gruplar veya uzak kullanıcılarla paylaş ...",
     "Warning" : "Uyarı",
+    "Error while sending notification" : "Bildirim gönderilirken hata",
     "The object type is not specified." : "Nesne türü belirtilmemiş.",
     "Enter new" : "Yeni girin",
     "Delete" : "Sil",
@@ -181,6 +186,8 @@ OC.L10N.register(
     "New Password" : "Yeni Parola",
     "Reset password" : "Parolayı sıfırla",
     "Searching other places" : "Diğer konumlarda aranıyor",
+    "No search results in other folders" : "Diğer klasörlerde arama sonucu yok",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["Diğer klasörlerde {count} arama sonucu","Diğer bir klasörde {count} arama sonucu"],
     "Personal" : "Kişisel",
     "Users" : "Kullanıcılar",
     "Apps" : "Uygulamalar",
@@ -260,7 +267,7 @@ OC.L10N.register(
     "App update required" : "Uygulama güncellemesi gerekli",
     "%s will be updated to version %s" : "%s, %s sürümüne güncellenecek",
     "These apps will be updated:" : "Bu uygulamalar güncellenecek:",
-    "These incompatible apps will be disabled:" : "Bu uyumsuz uygulamalar kapatılacaklar:",
+    "These incompatible apps will be disabled:" : "Bu uyumsuz uygulamalar devre dışı bırakılacak:",
     "The theme %s has been disabled." : "%s teması devre dışı bırakıldı.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Devam etmeden önce lütfen veritabanının, yapılandırma ve veri klasörlerinin yedeklenmiş olduğundan emin olun.",
     "Start update" : "Güncellemeyi başlat",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index 830a433a279..2da5a2dec94 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Şu kullanıcılara posta gönderilemedi: %s",
     "Preparing update" : "Güncelleme hazırlanıyor",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Taşıma testleri atlandı - config.php içerisinde \"update.skip-migration-test\" etkinleştirildi",
     "Turned on maintenance mode" : "Bakım kipi etkinleştirildi",
     "Turned off maintenance mode" : "Bakım kipi kapatıldı",
     "Maintenance mode is kept active" : "Bakım kipi etkin tutuldu",
@@ -10,6 +11,8 @@
     "Updated \"%s\" to %s" : "\"%s\", %s sürümüne güncellendi",
     "Repair warning: " : "Onarım uyarısı:",
     "Repair error: " : "Onarım hatası:",
+    "Set log level to debug - current level: \"%s\"" : "Günlük seviyesini hata ayıklamaya ayarla - geçerli seviye: \"%s\"",
+    "Reset log level to  \"%s\"" : "Günlük seviyesini \"%s\" olarak sıfırla",
     "Following incompatible apps have been disabled: %s" : "Aşağıdaki uyumsuz uygulamalar devre dışı bırakıldı: %s",
     "Following apps have been disabled: %s" : "Aşağıdaki uygulamalar devre dışı bırakıldı: %s",
     "Already up to date" : "Zaten güncel",
@@ -144,12 +147,14 @@
     "change" : "değiştir",
     "delete" : "sil",
     "access control" : "erişim kontrolü",
+    "Share details could not be loaded for this item." : "Bu öge için paylaşma ayrıntıları yüklenemedi.",
     "An error occured. Please try again" : "Bir hata oluştu. Lütfen yeniden deneyin",
     "Share" : "Paylaş",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş",
     "Share with users or groups …" : "Kullanıcı ve gruplarla paylaş...",
     "Share with users, groups or remote users …" : "Kullanıcılar, gruplar veya uzak kullanıcılarla paylaş ...",
     "Warning" : "Uyarı",
+    "Error while sending notification" : "Bildirim gönderilirken hata",
     "The object type is not specified." : "Nesne türü belirtilmemiş.",
     "Enter new" : "Yeni girin",
     "Delete" : "Sil",
@@ -179,6 +184,8 @@
     "New Password" : "Yeni Parola",
     "Reset password" : "Parolayı sıfırla",
     "Searching other places" : "Diğer konumlarda aranıyor",
+    "No search results in other folders" : "Diğer klasörlerde arama sonucu yok",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["Diğer klasörlerde {count} arama sonucu","Diğer bir klasörde {count} arama sonucu"],
     "Personal" : "Kişisel",
     "Users" : "Kullanıcılar",
     "Apps" : "Uygulamalar",
@@ -258,7 +265,7 @@
     "App update required" : "Uygulama güncellemesi gerekli",
     "%s will be updated to version %s" : "%s, %s sürümüne güncellenecek",
     "These apps will be updated:" : "Bu uygulamalar güncellenecek:",
-    "These incompatible apps will be disabled:" : "Bu uyumsuz uygulamalar kapatılacaklar:",
+    "These incompatible apps will be disabled:" : "Bu uyumsuz uygulamalar devre dışı bırakılacak:",
     "The theme %s has been disabled." : "%s teması devre dışı bırakıldı.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Devam etmeden önce lütfen veritabanının, yapılandırma ve veri klasörlerinin yedeklenmiş olduğundan emin olun.",
     "Start update" : "Güncellemeyi başlat",
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index 9bb0ecab0ca..4e1b35f05e9 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Datei kann nicht gelesen werden",
     "App directory already exists" : "Das Applikationsverzeichnis existiert bereits",
     "Can't create app folder. Please fix permissions. %s" : "Es kann kein Applikationsordner erstellt werden. Bitte passe die  Berechtigungen an. %s",
+    "Archive does not contain a directory named %s" : "Das Archiv enthält kein Verzeichnis mit dem Namen %s",
     "No source specified when installing app" : "Für die Installation der Applikation wurde keine Quelle angegeben",
     "No href specified when installing app from http" : "Für die Installation der Applikation über http wurde keine Quelle (href) angegeben",
     "No path specified when installing app from local file" : "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
     "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
+    "Sharing %s failed, because this item is already shared with user %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit Nutzer %s geteilt wird",
     "Sharing %s failed, because the group %s does not exist" : "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert",
     "Sharing %s failed, because %s is not a member of the group %s" : "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist",
     "You need to provide a password to create a public link, only protected links are allowed" : "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren",
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index eccfbe94469..62a20165747 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Datei kann nicht gelesen werden",
     "App directory already exists" : "Das Applikationsverzeichnis existiert bereits",
     "Can't create app folder. Please fix permissions. %s" : "Es kann kein Applikationsordner erstellt werden. Bitte passe die  Berechtigungen an. %s",
+    "Archive does not contain a directory named %s" : "Das Archiv enthält kein Verzeichnis mit dem Namen %s",
     "No source specified when installing app" : "Für die Installation der Applikation wurde keine Quelle angegeben",
     "No href specified when installing app from http" : "Für die Installation der Applikation über http wurde keine Quelle (href) angegeben",
     "No path specified when installing app from local file" : "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s nicht existiert",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s kein Gruppenmitglied einer der Gruppen von %s ist",
     "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird",
+    "Sharing %s failed, because this item is already shared with user %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit Nutzer %s geteilt wird",
     "Sharing %s failed, because the group %s does not exist" : "Freigabe von %s fehlgeschlagen, da die Gruppe %s nicht existiert",
     "Sharing %s failed, because %s is not a member of the group %s" : "Freigabe von %s fehlgeschlagen, da %s kein Mitglied der Gruppe %s ist",
     "You need to provide a password to create a public link, only protected links are allowed" : "Es sind nur geschützte Links zulässig, daher müssen Sie ein Passwort angeben, um einen öffentlichen Link zu generieren",
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index 21360d673f4..78404d1b21a 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -23,7 +23,7 @@ OC.L10N.register(
     "Admin" : "Administración",
     "Recommended" : "Recomendado",
     "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "La App \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud.",
-    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "La App \"%s\" no puede instalarse porque las siguientes dependencias no están cumplimentadas: %s",
+    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "La app \"%s\" no puede instalarse porque las siguientes dependencias no están cumplimentadas: %s",
     "No app name specified" : "No se ha especificado nombre de la aplicación",
     "Unknown filetype" : "Tipo de archivo desconocido",
     "Invalid image" : "Imagen inválida",
@@ -119,7 +119,7 @@ OC.L10N.register(
     "The username is already being used" : "El nombre de usuario ya está en uso",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "No están instalados los drivers de BBDD  (sqlite, mysql, o postgresql)",
     "Microsoft Windows Platform is not supported" : "La plataforma Microsoft Windows no está soportada",
-    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Ejecutar el servidor ownCloud en la plataforma Microsoft Windows no está soportada. Sugerimos que utilice un servidor Linux en una máquina virtual si no posee opción de migrar de servidor. Encuentre paquetes de Linux así como implementar máquinas virtuales en <a href=\"%s\">%s</a>. Para migrar instalaciones actuales hacia Linux puede encontrar algunos consejos y un script de migración en <a href=\"%s\">nuestra documentación</a>.",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "No está soportado ejecutar el servidor ownCloud en la plataforma Microsoft Windows. Sugerimos que utilice un servidor GNU/Linux en una máquina virtual si no posee opción de migrar de servidor. Encuentre paquetes de GNU/Linux así como implementar máquinas virtuales en <a href=\"%s\">%s</a>. Para migrar instalaciones actuales hacia GNU/Linux puede encontrar algunos consejos y un script de migración en <a href=\"%s\">nuestra documentación</a>.",
     "Cannot write into \"config\" directory" : "No se puede escribir el el directorio de configuración",
     "Cannot write into \"apps\" directory" : "No se puede escribir en el directorio de \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Esto puede solucionarse fácilmente %sdándole permisos de escritura al servidor en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración.",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index 185b178baa8..3f9e95b232a 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -21,7 +21,7 @@
     "Admin" : "Administración",
     "Recommended" : "Recomendado",
     "App \"%s\" cannot be installed because it is not compatible with this version of ownCloud." : "La App \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud.",
-    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "La App \"%s\" no puede instalarse porque las siguientes dependencias no están cumplimentadas: %s",
+    "App \"%s\" cannot be installed because the following dependencies are not fulfilled: %s" : "La app \"%s\" no puede instalarse porque las siguientes dependencias no están cumplimentadas: %s",
     "No app name specified" : "No se ha especificado nombre de la aplicación",
     "Unknown filetype" : "Tipo de archivo desconocido",
     "Invalid image" : "Imagen inválida",
@@ -117,7 +117,7 @@
     "The username is already being used" : "El nombre de usuario ya está en uso",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "No están instalados los drivers de BBDD  (sqlite, mysql, o postgresql)",
     "Microsoft Windows Platform is not supported" : "La plataforma Microsoft Windows no está soportada",
-    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Ejecutar el servidor ownCloud en la plataforma Microsoft Windows no está soportada. Sugerimos que utilice un servidor Linux en una máquina virtual si no posee opción de migrar de servidor. Encuentre paquetes de Linux así como implementar máquinas virtuales en <a href=\"%s\">%s</a>. Para migrar instalaciones actuales hacia Linux puede encontrar algunos consejos y un script de migración en <a href=\"%s\">nuestra documentación</a>.",
+    "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "No está soportado ejecutar el servidor ownCloud en la plataforma Microsoft Windows. Sugerimos que utilice un servidor GNU/Linux en una máquina virtual si no posee opción de migrar de servidor. Encuentre paquetes de GNU/Linux así como implementar máquinas virtuales en <a href=\"%s\">%s</a>. Para migrar instalaciones actuales hacia GNU/Linux puede encontrar algunos consejos y un script de migración en <a href=\"%s\">nuestra documentación</a>.",
     "Cannot write into \"config\" directory" : "No se puede escribir el el directorio de configuración",
     "Cannot write into \"apps\" directory" : "No se puede escribir en el directorio de \"apps\"",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Esto puede solucionarse fácilmente %sdándole permisos de escritura al servidor en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración.",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 477b954f657..709b95f9424 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -118,6 +118,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfe die <a target=\"_blank\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
@@ -152,6 +153,8 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Von allen Verschlüsselungsschlüsseln sollte regelmäßig ein Backup gemacht werden, um Datenverlust u vermeiden(data/<user>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
     "Select default encryption module:" : "Bite Standard-Verschlüsselungs-Modul auswählen:",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 1a7cbdc3c14..29352fe9232 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -116,6 +116,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfe die <a target=\"_blank\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
@@ -150,6 +151,8 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Von allen Verschlüsselungsschlüsseln sollte regelmäßig ein Backup gemacht werden, um Datenverlust u vermeiden(data/<user>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
     "Select default encryption module:" : "Bite Standard-Verschlüsselungs-Modul auswählen:",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 1ffc4e9fcf6..f6db6aa16e0 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -118,7 +118,8 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.",
-    "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, compruebe la <a target=\"_blank\" href=\"%s\">documentación de instalación ↗</a> para las notas de configuración de php y la configuración de php de su servidor, especialmente cuando use php-fpm.",
+    "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita tener que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
@@ -146,6 +147,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Permitir a los usuarios enviar notificaciones por correo electrónico de los archivos compartidos a otros usuarios",
     "Exclude groups from sharing" : "Excluye grupos de compartir",
     "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Permitir autocompletación del nombre de usuario en diálogos de compartición. Si está deshabilitado, se requiere introducir el nombre de usuario.",
     "Last cron job execution: %s." : "Cron se ejecutó por última vez: %s",
     "Last cron job execution: %s. Something seems wrong." : "Cron se ejecutó por última vez: %s. Algo va mal.",
     "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
@@ -157,7 +159,7 @@ OC.L10N.register(
     "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "El cifrado en el lado servidor es un proceso de una sola vía. Una vez el cifrado está habilitado, todos los archivos desde este punto en adelante serán cifrados en el servidor y no será posible deshabilitar el cifrado posteriormente. ",
     "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Cualquiera que tenga acceso a este servidor ownCloud, puede descifrar estos archivos, simplemente leyendo la contraseña que se guarda en texto plano en los archivos de sesión. El cifrado del lado servidor, no protege por tanto de administradores malintencionados, pero es ùtil para proteger los datos en almacenes de datos externos de accesos no autorizados. ",
     "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependiendo del módulo de cifrado seleccionado, el tamaño de los archivos se puede ver incrementado (hasta un 35%% o más para las opciones por defecto).",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Deberia salvar de forma regular las claves de cifrado para evitar la perdida de datos (data/<user>/files_encryption and data/files_encryption)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Debería guardar de forma regular las claves de cifrado para evitar la pérdida de datos (data/<user>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
     "Enable encryption" : "Habilitar cifrado",
     "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index b3ee25ce612..60ada93ac90 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -116,7 +116,8 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.",
-    "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, compruebe la <a target=\"_blank\" href=\"%s\">documentación de instalación ↗</a> para las notas de configuración de php y la configuración de php de su servidor, especialmente cuando use php-fpm.",
+    "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita tener que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
@@ -144,6 +145,7 @@
     "Allow users to send mail notification for shared files to other users" : "Permitir a los usuarios enviar notificaciones por correo electrónico de los archivos compartidos a otros usuarios",
     "Exclude groups from sharing" : "Excluye grupos de compartir",
     "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Permitir autocompletación del nombre de usuario en diálogos de compartición. Si está deshabilitado, se requiere introducir el nombre de usuario.",
     "Last cron job execution: %s." : "Cron se ejecutó por última vez: %s",
     "Last cron job execution: %s. Something seems wrong." : "Cron se ejecutó por última vez: %s. Algo va mal.",
     "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
@@ -155,7 +157,7 @@
     "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "El cifrado en el lado servidor es un proceso de una sola vía. Una vez el cifrado está habilitado, todos los archivos desde este punto en adelante serán cifrados en el servidor y no será posible deshabilitar el cifrado posteriormente. ",
     "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Cualquiera que tenga acceso a este servidor ownCloud, puede descifrar estos archivos, simplemente leyendo la contraseña que se guarda en texto plano en los archivos de sesión. El cifrado del lado servidor, no protege por tanto de administradores malintencionados, pero es ùtil para proteger los datos en almacenes de datos externos de accesos no autorizados. ",
     "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependiendo del módulo de cifrado seleccionado, el tamaño de los archivos se puede ver incrementado (hasta un 35%% o más para las opciones por defecto).",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Deberia salvar de forma regular las claves de cifrado para evitar la perdida de datos (data/<user>/files_encryption and data/files_encryption)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Debería guardar de forma regular las claves de cifrado para evitar la pérdida de datos (data/<user>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
     "Enable encryption" : "Habilitar cifrado",
     "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 13d5ac9687d..e795feba4e4 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -32,7 +32,7 @@ OC.L10N.register(
     "Not enabled" : "Etkin değil",
     "installing and updating apps via the app store or Federated Cloud Sharing" : "uygulama mağazası ve Birleşmiş Bulut Paylaşımından uygulama kurma ve güncelleme",
     "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı",
-    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL eskide kalmış bir sürüm %s kullanıyor (%s). Lütfen işletim sisteminizi güncelleyin yoksa %s gibi özellikler düzgün çalışmayacaktır.",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL eskide kalmış bir sürüm %s kullanıyor (%s). Lütfen işletim sisteminizi güncelleyin, aksi halde %s gibi özellikler düzgün çalışmayacaktır.",
     "A problem occurred, please check your log files (Error: %s)" : "Bir problem oluştu, lütfen log dosyalarını kontrol edin (Hata: %s)",
     "Migration Completed" : "Taşınma Tamamlandı",
     "Group already exists." : "Grup zaten mevcut.",
@@ -118,17 +118,20 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP sistem değişkenleri sorgusuna uygun olarak ayarlanmamış görünüyor. getenv(\"PATH\") komutu sadece boş bir cevap döndürüyor.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum belgelendirmesindeki ↗</a> php ayarlama notlarını ve sunucudaki özellikle php-fpm kullanırken php ayarlamalarını kontrol edin.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Salt Okunur yapılandırma etkinleştirilmiş. Bu, bazı ayarların web arayüzü ile yapılandırılmasını önler. Ayrıca, bu dosya her güncelleme sırasında el ile yazılabilir yapılmalıdır.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Sunucunuz, Microsoft Windows ile çalışıyor. En uygun kullanıcı deneyimi için şiddetle Linux'u öneriyoruz.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s %2$s sürümünden eskisi yüklü. Kararlılık ve performans nedenleri ile daha yeni bir %1$s sürümüne güncellemenizi öneriyoruz.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "İşlemsel dosya kilidi devre dışı, bu yarış koşulu durumlarına sebep olabilir. Bu sorunları önlemek için config.php içerisindeki 'filelocking.enabled' seçeneğini etkinleştirin. Daha fazla bilgi için <a target=\"_blank\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
     "System locale can not be set to a one which supports UTF-8." : "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.",
     "This means that there might be problems with certain characters in file names." : "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "İşlemsel dosya kilidi, kilitleme arkaucu olarak veritabanını kullanıyor. En iyi performans için kilitleme adına memcache yapılandırılması önerilir. Daha fazla bilgi için <a target=\"_blank\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum rehberlerini ↗</a> iki kez denetleyip <a href=\"#log-section\">günlük</a> içerisindeki hata ve uyarılara bakın.",
     "All checks passed." : "Tüm kontroller geçildi.",
     "Open documentation" : "Belgelendirmeyi aç",
@@ -146,6 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Kullanıcıların diğer kullanıcılara, paylaşılmış dosyalar için posta bildirimi göndermesine izin ver",
     "Exclude groups from sharing" : "Grupları paylaşma eyleminden hariç tut",
     "These groups will still be able to receive shares, but not to initiate them." : "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Paylaşma iletişim kutusunda kullanıcı adı otomatik tamamlamasını etkinleştir. Devre dışı olduğunda tam kullanıcı adı girilmeli.",
     "Last cron job execution: %s." : "Son cron çalıştırılma: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Son cron çalıştırılma: %s. Bir şeyler yanlış gibi görünüyor.",
     "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
@@ -156,8 +160,8 @@ OC.L10N.register(
     "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
     "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Sunucu tarafında şifreleme tek yönlü bir işlemdir. Bir defa etkinleştirildiğinde sunucudaki tüm dosyalar şifrelenir ve ileri bir tarihte şifrelemeyi iptal etmek mümkün değildir",
     "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud sunucunuza erişimi olan biri isteklere müdahale ederek veya oturum dosyalarında düz metin olarak saklanan parolayı kullanarak dosyalarınızın şifrelenmesini çözebilir. Bu nedenle sunucu tarafında şifreleme işlemi kötü niyetli sistem yöneticisine karşı koruma sağlamaz ama verinizi harici depolamada tutmanız durumunda yararlıdır.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Gerçek şifreleme modülüne bağlı olarak genel dosya boyutu artar (35%% veya varsayılan modül kullanıldığında daha fazla)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Veri kaybının önüne geçmek için düzenli olarak tüm şifreleme anahtarlarınızı yedeklemelisiniz (data/<user>/files_encryption and data/files_encryption)",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Gerçek şifreleme modülüne bağlı olarak genel dosya boyutu artar (%%35 veya varsayılan modül kullanıldığında daha fazla)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Veri kaybının önüne geçmek için düzenli olarak tüm şifreleme anahtarlarınızı yedeklemelisiniz (data/<kullanıcı>/files_encryption ve data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
     "Enable encryption" : "Şifrelemeyi aç",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index a995fcdc928..2793bf807b9 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -30,7 +30,7 @@
     "Not enabled" : "Etkin değil",
     "installing and updating apps via the app store or Federated Cloud Sharing" : "uygulama mağazası ve Birleşmiş Bulut Paylaşımından uygulama kurma ve güncelleme",
     "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı",
-    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL eskide kalmış bir sürüm %s kullanıyor (%s). Lütfen işletim sisteminizi güncelleyin yoksa %s gibi özellikler düzgün çalışmayacaktır.",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL eskide kalmış bir sürüm %s kullanıyor (%s). Lütfen işletim sisteminizi güncelleyin, aksi halde %s gibi özellikler düzgün çalışmayacaktır.",
     "A problem occurred, please check your log files (Error: %s)" : "Bir problem oluştu, lütfen log dosyalarını kontrol edin (Hata: %s)",
     "Migration Completed" : "Taşınma Tamamlandı",
     "Group already exists." : "Grup zaten mevcut.",
@@ -116,17 +116,20 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP sistem değişkenleri sorgusuna uygun olarak ayarlanmamış görünüyor. getenv(\"PATH\") komutu sadece boş bir cevap döndürüyor.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum belgelendirmesindeki ↗</a> php ayarlama notlarını ve sunucudaki özellikle php-fpm kullanırken php ayarlamalarını kontrol edin.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Salt Okunur yapılandırma etkinleştirilmiş. Bu, bazı ayarların web arayüzü ile yapılandırılmasını önler. Ayrıca, bu dosya her güncelleme sırasında el ile yazılabilir yapılmalıdır.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Sunucunuz, Microsoft Windows ile çalışıyor. En uygun kullanıcı deneyimi için şiddetle Linux'u öneriyoruz.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s %2$s sürümünden eskisi yüklü. Kararlılık ve performans nedenleri ile daha yeni bir %1$s sürümüne güncellemenizi öneriyoruz.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "İşlemsel dosya kilidi devre dışı, bu yarış koşulu durumlarına sebep olabilir. Bu sorunları önlemek için config.php içerisindeki 'filelocking.enabled' seçeneğini etkinleştirin. Daha fazla bilgi için <a target=\"_blank\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
     "System locale can not be set to a one which supports UTF-8." : "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.",
     "This means that there might be problems with certain characters in file names." : "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "İşlemsel dosya kilidi, kilitleme arkaucu olarak veritabanını kullanıyor. En iyi performans için kilitleme adına memcache yapılandırılması önerilir. Daha fazla bilgi için <a target=\"_blank\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum rehberlerini ↗</a> iki kez denetleyip <a href=\"#log-section\">günlük</a> içerisindeki hata ve uyarılara bakın.",
     "All checks passed." : "Tüm kontroller geçildi.",
     "Open documentation" : "Belgelendirmeyi aç",
@@ -144,6 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "Kullanıcıların diğer kullanıcılara, paylaşılmış dosyalar için posta bildirimi göndermesine izin ver",
     "Exclude groups from sharing" : "Grupları paylaşma eyleminden hariç tut",
     "These groups will still be able to receive shares, but not to initiate them." : "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Paylaşma iletişim kutusunda kullanıcı adı otomatik tamamlamasını etkinleştir. Devre dışı olduğunda tam kullanıcı adı girilmeli.",
     "Last cron job execution: %s." : "Son cron çalıştırılma: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Son cron çalıştırılma: %s. Bir şeyler yanlış gibi görünüyor.",
     "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
@@ -154,8 +158,8 @@
     "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
     "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Sunucu tarafında şifreleme tek yönlü bir işlemdir. Bir defa etkinleştirildiğinde sunucudaki tüm dosyalar şifrelenir ve ileri bir tarihte şifrelemeyi iptal etmek mümkün değildir",
     "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud sunucunuza erişimi olan biri isteklere müdahale ederek veya oturum dosyalarında düz metin olarak saklanan parolayı kullanarak dosyalarınızın şifrelenmesini çözebilir. Bu nedenle sunucu tarafında şifreleme işlemi kötü niyetli sistem yöneticisine karşı koruma sağlamaz ama verinizi harici depolamada tutmanız durumunda yararlıdır.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Gerçek şifreleme modülüne bağlı olarak genel dosya boyutu artar (35%% veya varsayılan modül kullanıldığında daha fazla)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Veri kaybının önüne geçmek için düzenli olarak tüm şifreleme anahtarlarınızı yedeklemelisiniz (data/<user>/files_encryption and data/files_encryption)",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Gerçek şifreleme modülüne bağlı olarak genel dosya boyutu artar (%%35 veya varsayılan modül kullanıldığında daha fazla)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Veri kaybının önüne geçmek için düzenli olarak tüm şifreleme anahtarlarınızı yedeklemelisiniz (data/<kullanıcı>/files_encryption ve data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
     "Enable encryption" : "Şifrelemeyi aç",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
-- 
GitLab


From b51996540889b29b3b1d2bc118f652c7b942404b Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 2 Oct 2015 16:17:56 +0200
Subject: [PATCH 701/783] [admin] check for correct PHP memcached module

---
 core/js/setupchecks.js                        |  6 +++
 core/js/tests/specs/setupchecksSpec.js        | 46 ++++++++++++++++---
 settings/controller/checksetupcontroller.php  | 18 ++++++++
 .../controller/CheckSetupControllerTest.php   |  1 +
 4 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 2e21c6ad725..6e2058d54fc 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -98,6 +98,12 @@
 							type: OC.SetupChecks.MESSAGE_TYPE_WARNING
 						});
 					}
+					if(!data.isCorrectMemcachedPHPModuleInstalled) {
+						messages.push({
+							msg: t('core', 'Memcached is configured as distributed cache, but the wrong PHP module "memcache" is installed. \\OC\\Memcache\\Memcached only supports "memcached" and not "memcache". See the <a href="{wikiLink}">memcached wiki about both modules</a>.', {wikiLink: 'https://code.google.com/p/memcached/wiki/PHPClientComparison'}),
+							type: OC.SetupChecks.MESSAGE_TYPE_WARNING
+						});
+					}
 				} else {
 					messages.push({
 						msg: t('core', 'Error occurred while checking server setup'),
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index c70ea0ff9fa..8dd2214621a 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -73,7 +73,8 @@ describe('OC.SetupChecks tests', function() {
 					isUrandomAvailable: true,
 					serverHasInternetConnection: false,
 					memcacheDocs: 'https://doc.owncloud.org/server/go.php?to=admin-performance',
-					forwardedForHeadersWorking: true
+					forwardedForHeadersWorking: true,
+					isCorrectMemcachedPHPModuleInstalled: true,
 				})
 			);
 
@@ -106,7 +107,8 @@ describe('OC.SetupChecks tests', function() {
 					serverHasInternetConnection: false,
 					dataDirectoryProtected: false,
 					memcacheDocs: 'https://doc.owncloud.org/server/go.php?to=admin-performance',
-					forwardedForHeadersWorking: true
+					forwardedForHeadersWorking: true,
+					isCorrectMemcachedPHPModuleInstalled: true,
 				})
 			);
 
@@ -141,7 +143,8 @@ describe('OC.SetupChecks tests', function() {
 					serverHasInternetConnection: false,
 					dataDirectoryProtected: false,
 					isMemcacheConfigured: true,
-					forwardedForHeadersWorking: true
+					forwardedForHeadersWorking: true,
+					isCorrectMemcachedPHPModuleInstalled: true,
 				})
 			);
 
@@ -173,7 +176,8 @@ describe('OC.SetupChecks tests', function() {
 					serverHasInternetConnection: true,
 					dataDirectoryProtected: true,
 					isMemcacheConfigured: true,
-					forwardedForHeadersWorking: true
+					forwardedForHeadersWorking: true,
+					isCorrectMemcachedPHPModuleInstalled: true,
 				})
 			);
 
@@ -186,6 +190,34 @@ describe('OC.SetupChecks tests', function() {
 			});
 		});
 
+		it('should return an error if the wrong memcache PHP module is installed', function(done) {
+			var async = OC.SetupChecks.checkSetup();
+
+			suite.server.requests[0].respond(
+				200,
+				{
+					'Content-Type': 'application/json',
+				},
+				JSON.stringify({
+					isUrandomAvailable: true,
+					securityDocs: 'https://docs.owncloud.org/myDocs.html',
+					serverHasInternetConnection: true,
+					dataDirectoryProtected: true,
+					isMemcacheConfigured: true,
+					forwardedForHeadersWorking: true,
+					isCorrectMemcachedPHPModuleInstalled: false,
+				})
+			);
+
+			async.done(function( data, s, x ){
+				expect(data).toEqual([{
+					msg: 'Memcached is configured as distributed cache, but the wrong PHP module "memcache" is installed. \\OC\\Memcache\\Memcached only supports "memcached" and not "memcache". See the <a href="https://code.google.com/p/memcached/wiki/PHPClientComparison">memcached wiki about both modules</a>.',
+					type: OC.SetupChecks.MESSAGE_TYPE_WARNING
+				}]);
+				done();
+			});
+		});
+
 		it('should return an error if the forwarded for headers are not working', function(done) {
 			var async = OC.SetupChecks.checkSetup();
 
@@ -200,7 +232,8 @@ describe('OC.SetupChecks tests', function() {
 					dataDirectoryProtected: true,
 					isMemcacheConfigured: true,
 					forwardedForHeadersWorking: false,
-					reverseProxyDocs: 'https://docs.owncloud.org/foo/bar.html'
+					reverseProxyDocs: 'https://docs.owncloud.org/foo/bar.html',
+					isCorrectMemcachedPHPModuleInstalled: true,
 				})
 			);
 
@@ -248,7 +281,8 @@ describe('OC.SetupChecks tests', function() {
 					dataDirectoryProtected: true,
 					isMemcacheConfigured: true,
 					forwardedForHeadersWorking: true,
-					phpSupported: {eol: true, version: '5.4.0'}
+					phpSupported: {eol: true, version: '5.4.0'},
+					isCorrectMemcachedPHPModuleInstalled: true,
 				})
 			);
 
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index ca4eb255f6b..34fe824bc97 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -210,6 +210,23 @@ class CheckSetupController extends Controller {
 		return true;
 	}
 
+	/**
+	 * Checks if the correct memcache module for PHP is installed. Only
+	 * fails if memcached is configured and the working module is not installed.
+	 *
+	 * @return bool
+	 */
+	private function isCorrectMemcachedPHPModuleInstalled() {
+		if ($this->config->getSystemValue('memcache.distributed', null) !== '\OC\Memcache\Memcached') {
+			return true;
+		}
+
+		// there are two different memcached modules for PHP
+		// we only support memcached and not memcache
+		// https://code.google.com/p/memcached/wiki/PHPClientComparison
+		return !extension_loaded('memcached') && extension_loaded('memcache');
+	}
+
 	/**
 	 * @return DataResponse
 	 */
@@ -226,6 +243,7 @@ class CheckSetupController extends Controller {
 				'phpSupported' => $this->isPhpSupported(),
 				'forwardedForHeadersWorking' => $this->forwardedForHeadersWorking(),
 				'reverseProxyDocs' => $this->urlGenerator->linkToDocs('admin-reverse-proxy'),
+				'isCorrectMemcachedPHPModuleInstalled' => $this->isCorrectMemcachedPHPModuleInstalled()
 			]
 		);
 	}
diff --git a/tests/settings/controller/CheckSetupControllerTest.php b/tests/settings/controller/CheckSetupControllerTest.php
index 2a8a6548ebb..c453822464f 100644
--- a/tests/settings/controller/CheckSetupControllerTest.php
+++ b/tests/settings/controller/CheckSetupControllerTest.php
@@ -346,6 +346,7 @@ class CheckSetupControllerTest extends TestCase {
 				],
 				'forwardedForHeadersWorking' => true,
 				'reverseProxyDocs' => 'reverse-proxy-doc-link',
+				'isCorrectMemcachedPHPModuleInstalled' => true,
 			]
 		);
 		$this->assertEquals($expected, $this->checkSetupController->check());
-- 
GitLab


From 8366ce27673b82349361e534853256dc869a8f93 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 6 Oct 2015 09:52:19 +0200
Subject: [PATCH 702/783] deduplicate @xenopathic

---
 .mailmap                                                        | 2 +-
 apps/files_external/ajax/applicable.php                         | 2 +-
 apps/files_external/ajax/oauth1.php                             | 2 +-
 apps/files_external/ajax/oauth2.php                             | 2 +-
 apps/files_external/appinfo/app.php                             | 2 +-
 apps/files_external/appinfo/application.php                     | 2 +-
 apps/files_external/appinfo/routes.php                          | 2 +-
 apps/files_external/controller/ajaxcontroller.php               | 2 +-
 apps/files_external/controller/globalstoragescontroller.php     | 2 +-
 apps/files_external/controller/storagescontroller.php           | 2 +-
 apps/files_external/controller/userstoragescontroller.php       | 2 +-
 apps/files_external/lib/amazons3.php                            | 1 -
 apps/files_external/lib/api.php                                 | 2 +-
 apps/files_external/lib/auth/amazons3/accesskey.php             | 2 +-
 apps/files_external/lib/auth/authmechanism.php                  | 2 +-
 apps/files_external/lib/auth/builtin.php                        | 2 +-
 apps/files_external/lib/auth/nullmechanism.php                  | 2 +-
 apps/files_external/lib/auth/oauth1/oauth1.php                  | 2 +-
 apps/files_external/lib/auth/oauth2/oauth2.php                  | 2 +-
 apps/files_external/lib/auth/openstack/openstack.php            | 2 +-
 apps/files_external/lib/auth/openstack/rackspace.php            | 2 +-
 apps/files_external/lib/auth/password/password.php              | 2 +-
 apps/files_external/lib/auth/password/sessioncredentials.php    | 2 +-
 apps/files_external/lib/auth/publickey/rsa.php                  | 2 +-
 apps/files_external/lib/backend/amazons3.php                    | 2 +-
 apps/files_external/lib/backend/backend.php                     | 2 +-
 apps/files_external/lib/backend/dav.php                         | 2 +-
 apps/files_external/lib/backend/dropbox.php                     | 2 +-
 apps/files_external/lib/backend/ftp.php                         | 2 +-
 apps/files_external/lib/backend/google.php                      | 2 +-
 apps/files_external/lib/backend/legacybackend.php               | 2 +-
 apps/files_external/lib/backend/local.php                       | 2 +-
 apps/files_external/lib/backend/owncloud.php                    | 2 +-
 apps/files_external/lib/backend/sftp.php                        | 2 +-
 apps/files_external/lib/backend/sftp_key.php                    | 2 +-
 apps/files_external/lib/backend/smb.php                         | 2 +-
 apps/files_external/lib/backend/smb_oc.php                      | 2 +-
 apps/files_external/lib/backend/swift.php                       | 2 +-
 apps/files_external/lib/config.php                              | 1 -
 apps/files_external/lib/config/configadapter.php                | 2 +-
 apps/files_external/lib/definitionparameter.php                 | 2 +-
 apps/files_external/lib/dependencytrait.php                     | 2 +-
 apps/files_external/lib/dropbox.php                             | 1 -
 apps/files_external/lib/failedstorage.php                       | 2 +-
 apps/files_external/lib/frontenddefinitiontrait.php             | 2 +-
 apps/files_external/lib/ftp.php                                 | 1 -
 apps/files_external/lib/google.php                              | 2 +-
 apps/files_external/lib/identifiertrait.php                     | 2 +-
 .../lib/insufficientdataformeaningfulanswerexception.php        | 2 +-
 apps/files_external/lib/legacydependencycheckpolyfill.php       | 2 +-
 apps/files_external/lib/missingdependency.php                   | 2 +-
 apps/files_external/lib/personalmount.php                       | 2 +-
 apps/files_external/lib/prioritytrait.php                       | 2 +-
 apps/files_external/lib/sessionstoragewrapper.php               | 2 +-
 apps/files_external/lib/sftp.php                                | 1 -
 apps/files_external/lib/storageconfig.php                       | 2 +-
 apps/files_external/lib/storagemodifiertrait.php                | 2 +-
 apps/files_external/lib/swift.php                               | 1 -
 apps/files_external/lib/visibilitytrait.php                     | 2 +-
 apps/files_external/personal.php                                | 2 +-
 apps/files_external/service/backendservice.php                  | 2 +-
 apps/files_external/service/globalstoragesservice.php           | 2 +-
 apps/files_external/service/storagesservice.php                 | 2 +-
 apps/files_external/service/userglobalstoragesservice.php       | 2 +-
 apps/files_external/service/userstoragesservice.php             | 2 +-
 apps/files_external/service/usertrait.php                       | 2 +-
 apps/files_external/settings.php                                | 2 +-
 apps/files_external/tests/auth/authmechanismtest.php            | 2 +-
 apps/files_external/tests/backend/backendtest.php               | 2 +-
 apps/files_external/tests/backend/legacybackendtest.php         | 2 +-
 apps/files_external/tests/backends/amazons3.php                 | 2 +-
 .../tests/controller/globalstoragescontrollertest.php           | 2 +-
 apps/files_external/tests/controller/storagescontrollertest.php | 2 +-
 .../tests/controller/userstoragescontrollertest.php             | 2 +-
 apps/files_external/tests/definitionparameterttest.php          | 2 +-
 apps/files_external/tests/frontenddefinitiontraittest.php       | 2 +-
 apps/files_external/tests/legacydependencycheckpolyfilltest.php | 2 +-
 apps/files_external/tests/service/backendservicetest.php        | 2 +-
 apps/files_external/tests/service/globalstoragesservicetest.php | 2 +-
 apps/files_external/tests/service/storagesservicetest.php       | 2 +-
 .../tests/service/userglobalstoragesservicetest.php             | 2 +-
 apps/files_external/tests/service/userstoragesservicetest.php   | 2 +-
 apps/files_external/tests/storageconfigtest.php                 | 2 +-
 apps/files_sharing/lib/cache.php                                | 1 -
 apps/files_sharing/lib/share/folder.php                         | 2 +-
 apps/files_sharing/lib/sharedstorage.php                        | 1 -
 core/command/log/manage.php                                     | 2 +-
 core/command/log/owncloud.php                                   | 2 +-
 core/command/maintenance/mimetype/updatedb.php                  | 2 +-
 core/command/maintenance/mimetype/updatejs.php                  | 2 +-
 core/register_command.php                                       | 1 -
 lib/autoloader.php                                              | 2 +-
 lib/private/app.php                                             | 1 -
 lib/private/appframework/http/request.php                       | 1 -
 lib/private/backgroundjob/joblist.php                           | 1 -
 lib/private/console/application.php                             | 2 +-
 lib/private/files/cache/cache.php                               | 1 -
 lib/private/files/cache/scanner.php                             | 1 -
 lib/private/files/cache/storage.php                             | 1 -
 lib/private/files/mount/mountpoint.php                          | 1 -
 lib/private/files/storage/wrapper/permissionsmask.php           | 2 +-
 lib/private/files/type/detection.php                            | 2 +-
 lib/private/files/type/loader.php                               | 2 +-
 lib/private/memcache/memcached.php                              | 2 +-
 lib/private/preview/office.php                                  | 2 +-
 lib/private/route/router.php                                    | 2 +-
 lib/private/server.php                                          | 1 -
 lib/private/tempmanager.php                                     | 2 +-
 lib/public/autoloadnotallowedexception.php                      | 2 +-
 lib/public/files/imimetypeloader.php                            | 2 +-
 lib/public/iservercontainer.php                                 | 2 +-
 lib/public/itempmanager.php                                     | 2 +-
 ocs/routes.php                                                  | 2 +-
 remote.php                                                      | 2 +-
 settings/ajax/navigationdetect.php                              | 2 +-
 settings/controller/certificatecontroller.php                   | 2 +-
 settings/personal.php                                           | 2 +-
 settings/users.php                                              | 2 +-
 118 files changed, 101 insertions(+), 118 deletions(-)

diff --git a/.mailmap b/.mailmap
index a6cf996587c..95841a36353 100644
--- a/.mailmap
+++ b/.mailmap
@@ -304,7 +304,7 @@ Robin Appelman <icewind@owncloud.com> Robin <robin@Amaya.(none)>
 Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail.com>
 Robin Appelman <icewind@owncloud.com> Robin Appelman <icewind1991@gmail>
 Robin Appelman <icewind@owncloud.com> Robin Appelman <robin@icewind.nl>
-Robin McCorkell <rmccorkell@karoshi.org.uk>
+Robin McCorkell <rmccorkell@karoshi.org.uk> Robin McCorkell <rmccorkell@owncloud.com>
 Rodrigo Hjort <rodrigo.hjort@gmail.com>
 Roeland Jago Douma <roeland@famdouma.nl>
 rok <brejktru@gmail.com>
diff --git a/apps/files_external/ajax/applicable.php b/apps/files_external/ajax/applicable.php
index 53a5e83d56a..7f1b4dc9221 100644
--- a/apps/files_external/ajax/applicable.php
+++ b/apps/files_external/ajax/applicable.php
@@ -2,7 +2,7 @@
 /**
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/ajax/oauth1.php b/apps/files_external/ajax/oauth1.php
index 9e7c85cd429..3d6736b3b59 100644
--- a/apps/files_external/ajax/oauth1.php
+++ b/apps/files_external/ajax/oauth1.php
@@ -4,7 +4,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/ajax/oauth2.php b/apps/files_external/ajax/oauth2.php
index a25c6d15a1e..e3e32c4b912 100644
--- a/apps/files_external/ajax/oauth2.php
+++ b/apps/files_external/ajax/oauth2.php
@@ -6,7 +6,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Volkan Gezer <volkangezer@gmail.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 40408c0cc0c..aa39d79a85e 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -5,7 +5,7 @@
  * @author j-ed <juergen@eisfair.org>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index 3001fddfbaa..c7deaaf270e 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
index e0a7d90fc75..a98a63c711d 100644
--- a/apps/files_external/appinfo/routes.php
+++ b/apps/files_external/appinfo/routes.php
@@ -3,7 +3,7 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_external/controller/ajaxcontroller.php b/apps/files_external/controller/ajaxcontroller.php
index 846ede007c9..b278d66c1c0 100644
--- a/apps/files_external/controller/ajaxcontroller.php
+++ b/apps/files_external/controller/ajaxcontroller.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php
index 443ddcf221e..e36d1fb2c03 100644
--- a/apps/files_external/controller/globalstoragescontroller.php
+++ b/apps/files_external/controller/globalstoragescontroller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php
index cefb912930d..f754565f628 100644
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/controller/storagescontroller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php
index b0a745c6a7e..71d1f7cca46 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/controller/userstoragescontroller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 013424bfeb4..00915140bab 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -13,7 +13,6 @@
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/api.php b/apps/files_external/lib/api.php
index f533a31cf57..af9b802e522 100644
--- a/apps/files_external/lib/api.php
+++ b/apps/files_external/lib/api.php
@@ -2,7 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/lib/auth/amazons3/accesskey.php b/apps/files_external/lib/auth/amazons3/accesskey.php
index 9e3aab374b9..d265db6279f 100644
--- a/apps/files_external/lib/auth/amazons3/accesskey.php
+++ b/apps/files_external/lib/auth/amazons3/accesskey.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/auth/authmechanism.php b/apps/files_external/lib/auth/authmechanism.php
index 2ab34ed0105..e695cbbebd5 100644
--- a/apps/files_external/lib/auth/authmechanism.php
+++ b/apps/files_external/lib/auth/authmechanism.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/auth/builtin.php b/apps/files_external/lib/auth/builtin.php
index ee28a4e8a5c..8fb4c901cbc 100644
--- a/apps/files_external/lib/auth/builtin.php
+++ b/apps/files_external/lib/auth/builtin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/auth/nullmechanism.php b/apps/files_external/lib/auth/nullmechanism.php
index 1765fc67396..399c8301c5a 100644
--- a/apps/files_external/lib/auth/nullmechanism.php
+++ b/apps/files_external/lib/auth/nullmechanism.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/auth/oauth1/oauth1.php b/apps/files_external/lib/auth/oauth1/oauth1.php
index 3fb1b16aa6d..7bdd01d4c16 100644
--- a/apps/files_external/lib/auth/oauth1/oauth1.php
+++ b/apps/files_external/lib/auth/oauth1/oauth1.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/auth/oauth2/oauth2.php b/apps/files_external/lib/auth/oauth2/oauth2.php
index 73faa85a44e..7123f8c16e3 100644
--- a/apps/files_external/lib/auth/oauth2/oauth2.php
+++ b/apps/files_external/lib/auth/oauth2/oauth2.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/auth/openstack/openstack.php b/apps/files_external/lib/auth/openstack/openstack.php
index faf356bcf2e..757fdab9ea6 100644
--- a/apps/files_external/lib/auth/openstack/openstack.php
+++ b/apps/files_external/lib/auth/openstack/openstack.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/auth/openstack/rackspace.php b/apps/files_external/lib/auth/openstack/rackspace.php
index 9268f3aad87..395b58e6fae 100644
--- a/apps/files_external/lib/auth/openstack/rackspace.php
+++ b/apps/files_external/lib/auth/openstack/rackspace.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/auth/password/password.php b/apps/files_external/lib/auth/password/password.php
index 96ad4b496d4..d3444cb1419 100644
--- a/apps/files_external/lib/auth/password/password.php
+++ b/apps/files_external/lib/auth/password/password.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/auth/password/sessioncredentials.php b/apps/files_external/lib/auth/password/sessioncredentials.php
index 37cfd97a176..8e36ff5f1d8 100644
--- a/apps/files_external/lib/auth/password/sessioncredentials.php
+++ b/apps/files_external/lib/auth/password/sessioncredentials.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/auth/publickey/rsa.php
index f40136dda01..4e19f90c83b 100644
--- a/apps/files_external/lib/auth/publickey/rsa.php
+++ b/apps/files_external/lib/auth/publickey/rsa.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/amazons3.php b/apps/files_external/lib/backend/amazons3.php
index 1cf62d7cb09..538b53637e3 100644
--- a/apps/files_external/lib/backend/amazons3.php
+++ b/apps/files_external/lib/backend/amazons3.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/backend.php b/apps/files_external/lib/backend/backend.php
index 68585cf377e..9868519ed4f 100644
--- a/apps/files_external/lib/backend/backend.php
+++ b/apps/files_external/lib/backend/backend.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/dav.php b/apps/files_external/lib/backend/dav.php
index c4f446548e1..abc5103c70f 100644
--- a/apps/files_external/lib/backend/dav.php
+++ b/apps/files_external/lib/backend/dav.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/dropbox.php b/apps/files_external/lib/backend/dropbox.php
index 3e595cb0a9c..01b7a62edbe 100644
--- a/apps/files_external/lib/backend/dropbox.php
+++ b/apps/files_external/lib/backend/dropbox.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/ftp.php b/apps/files_external/lib/backend/ftp.php
index 1caf3a8fcb8..8f3dfffc77b 100644
--- a/apps/files_external/lib/backend/ftp.php
+++ b/apps/files_external/lib/backend/ftp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/google.php b/apps/files_external/lib/backend/google.php
index bc0b52c464b..14b2815b6e5 100644
--- a/apps/files_external/lib/backend/google.php
+++ b/apps/files_external/lib/backend/google.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/legacybackend.php b/apps/files_external/lib/backend/legacybackend.php
index 83a5b45940d..5ebf143f749 100644
--- a/apps/files_external/lib/backend/legacybackend.php
+++ b/apps/files_external/lib/backend/legacybackend.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/local.php b/apps/files_external/lib/backend/local.php
index a80b437fab7..7827055eeac 100644
--- a/apps/files_external/lib/backend/local.php
+++ b/apps/files_external/lib/backend/local.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/owncloud.php b/apps/files_external/lib/backend/owncloud.php
index d06625de241..d10f0b3bd0b 100644
--- a/apps/files_external/lib/backend/owncloud.php
+++ b/apps/files_external/lib/backend/owncloud.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/sftp.php b/apps/files_external/lib/backend/sftp.php
index c0bcd27c54b..d3fcd41d520 100644
--- a/apps/files_external/lib/backend/sftp.php
+++ b/apps/files_external/lib/backend/sftp.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/backend/sftp_key.php
index 13f45f1140c..8db5761c1b2 100644
--- a/apps/files_external/lib/backend/sftp_key.php
+++ b/apps/files_external/lib/backend/sftp_key.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/smb.php b/apps/files_external/lib/backend/smb.php
index 7865b44d689..aa91cf51e85 100644
--- a/apps/files_external/lib/backend/smb.php
+++ b/apps/files_external/lib/backend/smb.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php
index 9fc17400884..b84b0b9dcb1 100644
--- a/apps/files_external/lib/backend/smb_oc.php
+++ b/apps/files_external/lib/backend/smb_oc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/backend/swift.php b/apps/files_external/lib/backend/swift.php
index 2e14855206c..8c64c791ad8 100644
--- a/apps/files_external/lib/backend/swift.php
+++ b/apps/files_external/lib/backend/swift.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index a9730665654..d9fdb748fcd 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -11,7 +11,6 @@
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index fb36e011655..3a04512e8a8 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -2,7 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/definitionparameter.php b/apps/files_external/lib/definitionparameter.php
index 1d3223255e0..7f883e5fad1 100644
--- a/apps/files_external/lib/definitionparameter.php
+++ b/apps/files_external/lib/definitionparameter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/dependencytrait.php b/apps/files_external/lib/dependencytrait.php
index f0d6d6080e5..f112f6c2e66 100644
--- a/apps/files_external/lib/dependencytrait.php
+++ b/apps/files_external/lib/dependencytrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 4546d81c14e..4ab14d4f3e0 100644
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -6,7 +6,6 @@
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Sascha Schmidt <realriot@realriot.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_external/lib/failedstorage.php b/apps/files_external/lib/failedstorage.php
index 22ee5326491..c3181fd6b02 100644
--- a/apps/files_external/lib/failedstorage.php
+++ b/apps/files_external/lib/failedstorage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/frontenddefinitiontrait.php b/apps/files_external/lib/frontenddefinitiontrait.php
index a5fb1a3f62f..d3b78aa56d4 100644
--- a/apps/files_external/lib/frontenddefinitiontrait.php
+++ b/apps/files_external/lib/frontenddefinitiontrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 96ccec07f2b..f3631e53fa1 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -8,7 +8,6 @@
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 0e382062fdc..eba2ee7f9b5 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -10,7 +10,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/identifiertrait.php b/apps/files_external/lib/identifiertrait.php
index 7f36144e474..913e1899db8 100644
--- a/apps/files_external/lib/identifiertrait.php
+++ b/apps/files_external/lib/identifiertrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php b/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php
index dd4cd75df12..f77667cb70a 100644
--- a/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php
+++ b/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/legacydependencycheckpolyfill.php b/apps/files_external/lib/legacydependencycheckpolyfill.php
index 7bb137fb3e1..bd0095debcd 100644
--- a/apps/files_external/lib/legacydependencycheckpolyfill.php
+++ b/apps/files_external/lib/legacydependencycheckpolyfill.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/missingdependency.php b/apps/files_external/lib/missingdependency.php
index fcc5eb7c843..9b25aeacc9b 100644
--- a/apps/files_external/lib/missingdependency.php
+++ b/apps/files_external/lib/missingdependency.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/personalmount.php b/apps/files_external/lib/personalmount.php
index c8781eae062..26f68ba32db 100644
--- a/apps/files_external/lib/personalmount.php
+++ b/apps/files_external/lib/personalmount.php
@@ -2,7 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/prioritytrait.php b/apps/files_external/lib/prioritytrait.php
index ff716a9b881..22f9fe275d8 100644
--- a/apps/files_external/lib/prioritytrait.php
+++ b/apps/files_external/lib/prioritytrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/sessionstoragewrapper.php b/apps/files_external/lib/sessionstoragewrapper.php
index f8f5aba53a2..e45589c4472 100644
--- a/apps/files_external/lib/sessionstoragewrapper.php
+++ b/apps/files_external/lib/sessionstoragewrapper.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 69d534b1c26..5dcc7686ca3 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -9,7 +9,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  * @author SA <stephen@mthosting.net>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/files_external/lib/storageconfig.php b/apps/files_external/lib/storageconfig.php
index 84a93fab44b..70aaa186783 100644
--- a/apps/files_external/lib/storageconfig.php
+++ b/apps/files_external/lib/storageconfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/lib/storagemodifiertrait.php b/apps/files_external/lib/storagemodifiertrait.php
index 3af0bb234d9..6d31ce8999a 100644
--- a/apps/files_external/lib/storagemodifiertrait.php
+++ b/apps/files_external/lib/storagemodifiertrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index fe273feca00..b9454b8d671 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -10,7 +10,6 @@
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/visibilitytrait.php b/apps/files_external/lib/visibilitytrait.php
index d858e5c5bf4..dfd2d323ca6 100644
--- a/apps/files_external/lib/visibilitytrait.php
+++ b/apps/files_external/lib/visibilitytrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index b363881bef6..df15c3bd258 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -5,7 +5,7 @@
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/service/backendservice.php
index cbe67597472..1e90247b3e4 100644
--- a/apps/files_external/service/backendservice.php
+++ b/apps/files_external/service/backendservice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/service/globalstoragesservice.php
index 6912acc3d1d..ec9b8e782fa 100644
--- a/apps/files_external/service/globalstoragesservice.php
+++ b/apps/files_external/service/globalstoragesservice.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 05097a9446f..d5260a066cd 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/userglobalstoragesservice.php b/apps/files_external/service/userglobalstoragesservice.php
index 7c60bc6d497..afe77e1e059 100644
--- a/apps/files_external/service/userglobalstoragesservice.php
+++ b/apps/files_external/service/userglobalstoragesservice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/service/userstoragesservice.php b/apps/files_external/service/userstoragesservice.php
index e6acd039541..a8cdf60ad9c 100644
--- a/apps/files_external/service/userstoragesservice.php
+++ b/apps/files_external/service/userstoragesservice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/usertrait.php b/apps/files_external/service/usertrait.php
index 4f84543565c..924f358f939 100644
--- a/apps/files_external/service/usertrait.php
+++ b/apps/files_external/service/usertrait.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index a8e5dcb868b..03ed363bdb2 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -7,7 +7,7 @@
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/auth/authmechanismtest.php b/apps/files_external/tests/auth/authmechanismtest.php
index b09d65a02df..6933cc988b1 100644
--- a/apps/files_external/tests/auth/authmechanismtest.php
+++ b/apps/files_external/tests/auth/authmechanismtest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/backend/backendtest.php b/apps/files_external/tests/backend/backendtest.php
index 4956a923e94..9e0e27c824b 100644
--- a/apps/files_external/tests/backend/backendtest.php
+++ b/apps/files_external/tests/backend/backendtest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/backend/legacybackendtest.php
index d57810de29b..6c977522e9e 100644
--- a/apps/files_external/tests/backend/legacybackendtest.php
+++ b/apps/files_external/tests/backend/legacybackendtest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/backends/amazons3.php b/apps/files_external/tests/backends/amazons3.php
index 4c5adeabecf..c16581a4495 100644
--- a/apps/files_external/tests/backends/amazons3.php
+++ b/apps/files_external/tests/backends/amazons3.php
@@ -4,7 +4,7 @@
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/controller/globalstoragescontrollertest.php b/apps/files_external/tests/controller/globalstoragescontrollertest.php
index b79b588a62b..37b5fed1481 100644
--- a/apps/files_external/tests/controller/globalstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/globalstoragescontrollertest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php
index 16f2f02db46..8a7acf81009 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/controller/storagescontrollertest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index c0a0d152404..acb25d11d09 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/definitionparameterttest.php b/apps/files_external/tests/definitionparameterttest.php
index 22e0b842254..3983a805dad 100644
--- a/apps/files_external/tests/definitionparameterttest.php
+++ b/apps/files_external/tests/definitionparameterttest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/frontenddefinitiontraittest.php
index d92d02b9854..d446813fe92 100644
--- a/apps/files_external/tests/frontenddefinitiontraittest.php
+++ b/apps/files_external/tests/frontenddefinitiontraittest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/legacydependencycheckpolyfilltest.php b/apps/files_external/tests/legacydependencycheckpolyfilltest.php
index 49d825d77aa..41109b63c1e 100644
--- a/apps/files_external/tests/legacydependencycheckpolyfilltest.php
+++ b/apps/files_external/tests/legacydependencycheckpolyfilltest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/service/backendservicetest.php b/apps/files_external/tests/service/backendservicetest.php
index 414a9eee2ec..5097b479a5f 100644
--- a/apps/files_external/tests/service/backendservicetest.php
+++ b/apps/files_external/tests/service/backendservicetest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/service/globalstoragesservicetest.php b/apps/files_external/tests/service/globalstoragesservicetest.php
index b12afd393d5..c129365913f 100644
--- a/apps/files_external/tests/service/globalstoragesservicetest.php
+++ b/apps/files_external/tests/service/globalstoragesservicetest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/service/storagesservicetest.php
index c5792ad5587..1bec543ff4c 100644
--- a/apps/files_external/tests/service/storagesservicetest.php
+++ b/apps/files_external/tests/service/storagesservicetest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php
index b6dc952605d..7c2516f0477 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/service/userstoragesservicetest.php b/apps/files_external/tests/service/userstoragesservicetest.php
index 00149f4818f..f829f73f050 100644
--- a/apps/files_external/tests/service/userstoragesservicetest.php
+++ b/apps/files_external/tests/service/userstoragesservicetest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/storageconfigtest.php b/apps/files_external/tests/storageconfigtest.php
index 69fe262f79f..c987f7a84e2 100644
--- a/apps/files_external/tests/storageconfigtest.php
+++ b/apps/files_external/tests/storageconfigtest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index f0e5dadb992..fa6c2d4c4f5 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -8,7 +8,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 514c5251af9..daa5b5e9eb8 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -4,7 +4,7 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index de059cf5245..27dd2f1e485 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -7,7 +7,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author scambra <sergio@entrecables.com>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/core/command/log/manage.php b/core/command/log/manage.php
index f3d18cffca0..1a5cd142413 100644
--- a/core/command/log/manage.php
+++ b/core/command/log/manage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/log/owncloud.php b/core/command/log/owncloud.php
index a2d9e4bc7c8..6200a8b6a53 100644
--- a/core/command/log/owncloud.php
+++ b/core/command/log/owncloud.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/maintenance/mimetype/updatedb.php b/core/command/maintenance/mimetype/updatedb.php
index 9d4062ff8c5..42d6af49baf 100644
--- a/core/command/maintenance/mimetype/updatedb.php
+++ b/core/command/maintenance/mimetype/updatedb.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/maintenance/mimetype/updatejs.php b/core/command/maintenance/mimetype/updatejs.php
index 546bee146f3..5329475c0a6 100644
--- a/core/command/maintenance/mimetype/updatejs.php
+++ b/core/command/maintenance/mimetype/updatejs.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/register_command.php b/core/register_command.php
index e0739bd8d1a..460e8626e5e 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -6,7 +6,6 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/autoloader.php b/lib/autoloader.php
index 26bc2beb7a8..f60f5a358ca 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -5,7 +5,7 @@
  * @author Markus Goetz <markus@woboq.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
diff --git a/lib/private/app.php b/lib/private/app.php
index 9fc79203803..718adcd25c1 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -21,7 +21,6 @@
  * @author RealRancor <Fisch.666@gmx.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Sam Tuke <mail@samtuke.com>
  * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index c36905da9f5..29414b92f7c 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -7,7 +7,6 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index 434c61c76c0..03c9180ddb0 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -4,7 +4,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/console/application.php b/lib/private/console/application.php
index edc3e104947..e7ddeed7d25 100644
--- a/lib/private/console/application.php
+++ b/lib/private/console/application.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index de6a2301603..f3e22701f40 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -11,7 +11,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author TheSFReader <TheSFReader@gmail.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index ac554f78396..dbffba1e306 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -10,7 +10,6 @@
  * @author Owen Winkler <a_github@midnightcircus.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php
index 64ce605df47..cee69194095 100644
--- a/lib/private/files/cache/storage.php
+++ b/lib/private/files/cache/storage.php
@@ -5,7 +5,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/mount/mountpoint.php b/lib/private/files/mount/mountpoint.php
index 518c0be7e93..fad8678aae1 100644
--- a/lib/private/files/mount/mountpoint.php
+++ b/lib/private/files/mount/mountpoint.php
@@ -5,7 +5,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/storage/wrapper/permissionsmask.php b/lib/private/files/storage/wrapper/permissionsmask.php
index 8d7e0c47152..e1822905692 100644
--- a/lib/private/files/storage/wrapper/permissionsmask.php
+++ b/lib/private/files/storage/wrapper/permissionsmask.php
@@ -3,7 +3,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index d56db6ecdc4..fd27d88eae6 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -5,7 +5,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
diff --git a/lib/private/files/type/loader.php b/lib/private/files/type/loader.php
index 78bfcf60bff..55dc09ab9b8 100644
--- a/lib/private/files/type/loader.php
+++ b/lib/private/files/type/loader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php
index 2d3c0d16807..ce7c6fa9577 100644
--- a/lib/private/memcache/memcached.php
+++ b/lib/private/memcache/memcached.php
@@ -4,7 +4,7 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index c83d2f98b8b..415220ed4af 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -2,7 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Olivier Paroz <github@oparoz.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index c332b33ccd2..f4abfae0f43 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -7,7 +7,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/server.php b/lib/private/server.php
index 4b30b88fef4..14fa323f74d 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -13,7 +13,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Sander <brantje@gmail.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/lib/private/tempmanager.php b/lib/private/tempmanager.php
index c13f5d44572..365d639389f 100644
--- a/lib/private/tempmanager.php
+++ b/lib/private/tempmanager.php
@@ -5,7 +5,7 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/autoloadnotallowedexception.php b/lib/public/autoloadnotallowedexception.php
index ae269b1c9e8..2e6556c4a7b 100644
--- a/lib/public/autoloadnotallowedexception.php
+++ b/lib/public/autoloadnotallowedexception.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/files/imimetypeloader.php b/lib/public/files/imimetypeloader.php
index 6d00c4a0b31..1ff8bc1b6c1 100644
--- a/lib/public/files/imimetypeloader.php
+++ b/lib/public/files/imimetypeloader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 3220083ad22..56afae95a40 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -9,7 +9,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
diff --git a/lib/public/itempmanager.php b/lib/public/itempmanager.php
index da84a03992d..73e21dd0aeb 100644
--- a/lib/public/itempmanager.php
+++ b/lib/public/itempmanager.php
@@ -2,7 +2,7 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/ocs/routes.php b/ocs/routes.php
index 6afa2aa3960..1722180c201 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -4,7 +4,7 @@
  * @author Christopher Schäpers <kondou@ts.unde.re>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
  *
diff --git a/remote.php b/remote.php
index c9cd804c882..b901b1f0fd7 100644
--- a/remote.php
+++ b/remote.php
@@ -5,7 +5,7 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index c2af852239a..be410b874ee 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/controller/certificatecontroller.php b/settings/controller/certificatecontroller.php
index cbe2688cf9c..2995c7f38bf 100644
--- a/settings/controller/certificatecontroller.php
+++ b/settings/controller/certificatecontroller.php
@@ -2,7 +2,7 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/personal.php b/settings/personal.php
index 6bcc619dc5e..e9e2046f00a 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -12,7 +12,7 @@
  * @author Marvin Thomas Rabe <mrabe@marvinrabe.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Volkan Gezer <volkangezer@gmail.com>
diff --git a/settings/users.php b/settings/users.php
index 154bf2a03d1..f16cbca2ae9 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -11,7 +11,7 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Stephan Peijnik <speijnik@anexia-it.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
-- 
GitLab


From b05422544d6dbd6247e17dd7ec2582279b2558ca Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 2 Oct 2015 16:59:43 +0200
Subject: [PATCH 703/783] Fixes last causes for WSOD

* print plain text if rendering of exception/error page is not possible
---
 lib/private/template.php | 55 ++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 16 deletions(-)

diff --git a/lib/private/template.php b/lib/private/template.php
index 0300e43edea..c6ae99f99b7 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -300,10 +300,20 @@ class OC_Template extends \OC\Template\Base {
 		* @param string $hint An optional hint message - needs to be properly escaped
 		*/
 	public static function printErrorPage( $error_msg, $hint = '' ) {
-		$content = new \OC_Template( '', 'error', 'error', false );
-		$errors = array(array('error' => $error_msg, 'hint' => $hint));
-		$content->assign( 'errors', $errors );
-		$content->printPage();
+		try {
+			$content = new \OC_Template( '', 'error', 'error', false );
+			$errors = array(array('error' => $error_msg, 'hint' => $hint));
+			$content->assign( 'errors', $errors );
+			$content->printPage();
+		} catch (\Exception $e) {
+			$logger = \OC::$server->getLogger();
+			$logger->error("$error_msg $hint", ['app' => 'core']);
+			$logger->logException($e, ['app' => 'core']);
+
+			header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error');
+			header('Content-Type: text/plain; charset=utf-8');
+			print("$error_msg $hint");
+		}
 		die();
 	}
 
@@ -312,18 +322,31 @@ class OC_Template extends \OC\Template\Base {
 	 * @param Exception $exception
 	 */
 	public static function printExceptionErrorPage($exception) {
-		$request = \OC::$server->getRequest();
-		$content = new \OC_Template('', 'exception', 'error', false);
-		$content->assign('errorClass', get_class($exception));
-		$content->assign('errorMsg', $exception->getMessage());
-		$content->assign('errorCode', $exception->getCode());
-		$content->assign('file', $exception->getFile());
-		$content->assign('line', $exception->getLine());
-		$content->assign('trace', $exception->getTraceAsString());
-		$content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false));
-		$content->assign('remoteAddr', $request->getRemoteAddress());
-		$content->assign('requestID', $request->getId());
-		$content->printPage();
+		try {
+			$request = \OC::$server->getRequest();
+			$content = new \OC_Template('', 'exception', 'error', false);
+			$content->assign('errorClass', get_class($exception));
+			$content->assign('errorMsg', $exception->getMessage());
+			$content->assign('errorCode', $exception->getCode());
+			$content->assign('file', $exception->getFile());
+			$content->assign('line', $exception->getLine());
+			$content->assign('trace', $exception->getTraceAsString());
+			$content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false));
+			$content->assign('remoteAddr', $request->getRemoteAddress());
+			$content->assign('requestID', $request->getId());
+			$content->printPage();
+		} catch (\Exception $e) {
+			$logger = \OC::$server->getLogger();
+			$logger->logException($exception, ['app' => 'core']);
+			$logger->logException($e, ['app' => 'core']);
+
+			header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error');
+			header('Content-Type: text/plain; charset=utf-8');
+			print("Internal Server Error\n\n");
+			print("The server encountered an internal error and was unable to complete your request.\n");
+			print("Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.\n");
+			print("More details can be found in the server log.\n");
+		}
 		die();
 	}
 
-- 
GitLab


From 583c082acf16cde33bac780285f1bd391e961b4e Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 29 Sep 2015 14:52:19 +0000
Subject: [PATCH 704/783] added some group logic

---
 .../features/bootstrap/FeatureContext.php     | 49 +++++++++++++++++++
 .../features/provisioning-v1.feature          | 12 +++++
 2 files changed, 61 insertions(+)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index b7a04e1ca76..feaa6cdd0f8 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -116,6 +116,55 @@ class FeatureContext extends BehatContext {
 		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
 	}
 
+
+    /**
+	 * @When /^creating the group "([^"]*)r"$/
+	 */
+	public function creatingTheGroup($group) {
+		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/addgroup" ;
+		$client = new Client();
+		$options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		}
+
+		$this->response = $client->post($fullUrl, [
+			'form_params' => [
+				'groupid' => $user
+			]
+		]);
+		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
+	}
+
+
+	/**
+	 * @Given /^group "([^"]*)" exists$/
+	 */
+	public function groupExists($group) {
+		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group";
+		$client = new Client();
+		$options = [];
+		if ($this->currentUser === 'admin') {
+			$options['auth'] = $this->adminUser;
+		}
+
+		$this->response = $client->get($fullUrl, $options);
+		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
+	}
+
+	/**
+	 * @Given /^group "([^"]*)" does not exist$/
+	 */
+	public function groupDoesNotExist($group) {
+		try {
+			$this->groupExists($group);
+		} catch (\GuzzleHttp\Exception\ClientException $ex) {
+			PHPUnit_Framework_Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+		}
+	}
+
+
 	/**
 	 * @When /^sending "([^"]*)" to "([^"]*)" with$/
 	 * @param \Behat\Gherkin\Node\TableNode|null $formData
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 9e3d2df50bb..fd925e2af5d 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -30,3 +30,15 @@ Feature: provisioning
       | userid | brand-new-user |
     Then the status code should be "200"
     And user "brand-new-user" does not exist
+
+
+  Scenario: Create a group
+    Given As an "admin"
+    And group "new-group" does not exist
+    When sending "POST" to "/cloud/groups" with
+      | groupid | new-group |
+      | password | 123456 |
+
+    Then the status code should be "200"
+    And group "new-group" exists
+
-- 
GitLab


From 7c63a6baa623bf17c73a5e5aa38db07d81502109 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 29 Sep 2015 15:05:52 +0000
Subject: [PATCH 705/783] added some deletion logic

---
 build/integration/features/provisioning-v1.feature | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index fd925e2af5d..2c9564bcdcf 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -26,8 +26,7 @@ Feature: provisioning
   Scenario: Delete a user
     Given As an "admin"
     And user "brand-new-user" exists
-    When sending "POST" to "/cloud/users" with
-      | userid | brand-new-user |
+    When sending "DELETE" to "/cloud/users/brand-new-user" 
     Then the status code should be "200"
     And user "brand-new-user" does not exist
 
@@ -42,3 +41,11 @@ Feature: provisioning
     Then the status code should be "200"
     And group "new-group" exists
 
+
+  Scenario: Delete a group
+    Given As an "admin"
+    And group "new-group" exists
+    When sending "DELETE" to "/cloud/groups/new-group"
+    Then the status code should be "200"
+    And group "new-group" does not exist
+
-- 
GitLab


From 186aff5deaf2b4f88945d6e5ca12ffb48190a3a7 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 29 Sep 2015 15:10:10 +0000
Subject: [PATCH 706/783] added some deletion logic

---
 build/integration/features/bootstrap/FeatureContext.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index feaa6cdd0f8..bd96304824a 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -121,7 +121,6 @@ class FeatureContext extends BehatContext {
 	 * @When /^creating the group "([^"]*)r"$/
 	 */
 	public function creatingTheGroup($group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
 		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/addgroup" ;
 		$client = new Client();
 		$options = [];
-- 
GitLab


From 0e3836ed48bfa14d15a2a32efd4fdc3a125e0c2b Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Wed, 30 Sep 2015 15:50:18 +0000
Subject: [PATCH 707/783] Return the actual ocs return codes and check it

---
 .../features/bootstrap/FeatureContext.php     | 40 ++++++++++++++-----
 .../features/provisioning-v1.feature          | 15 +++----
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index bd96304824a..da5b62153b8 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -49,13 +49,28 @@ class FeatureContext extends BehatContext {
 		$this->sendingToWith($verb, $url, null);
 	}
 
-	/**
+	// /**
+	//  * @Then /^the status code should be "([^"]*)"$/
+	//  */
+	// public function theStatusCodeShouldBe($statusCode) {
+	// 	PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode());
+	// }
+
+   
+    public function getOCSResponse($response){
+         return $response->xml()->meta[0]->statuscode;
+    }
+
+
+
+    /**
 	 * @Then /^the status code should be "([^"]*)"$/
 	 */
 	public function theStatusCodeShouldBe($statusCode) {
-		PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode());
+		PHPUnit_Framework_Assert::assertEquals($statusCode, $this->getOCSResponse($this->response));
 	}
 
+
 	/**
 	 * @Given /^As an "([^"]*)"$/
 	 */
@@ -74,7 +89,7 @@ class FeatureContext extends BehatContext {
 	 * @Given /^user "([^"]*)" exists$/
 	 */
 	public function userExists($user) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -82,7 +97,6 @@ class FeatureContext extends BehatContext {
 		}
 
 		$this->response = $client->get($fullUrl, $options);
-		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
 	}
 
 	/**
@@ -92,15 +106,16 @@ class FeatureContext extends BehatContext {
 		try {
 			$this->userExists($user);
 		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			PHPUnit_Framework_Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+			$this->response = $ex->getResponse();
 		}
 	}
 
+
 	/**
 	 * @When /^creating the user "([^"]*)r"$/
 	 */
 	public function creatingTheUser($user) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user" ;
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -113,7 +128,7 @@ class FeatureContext extends BehatContext {
 				'password' => '123456'
 			]
 		]);
-		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
+
 	}
 
 
@@ -133,7 +148,6 @@ class FeatureContext extends BehatContext {
 				'groupid' => $user
 			]
 		]);
-		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
 	}
 
 
@@ -141,7 +155,7 @@ class FeatureContext extends BehatContext {
 	 * @Given /^group "([^"]*)" exists$/
 	 */
 	public function groupExists($group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group";
+		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/$group";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -149,7 +163,6 @@ class FeatureContext extends BehatContext {
 		}
 
 		$this->response = $client->get($fullUrl, $options);
-		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
 	}
 
 	/**
@@ -159,7 +172,7 @@ class FeatureContext extends BehatContext {
 		try {
 			$this->groupExists($group);
 		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			PHPUnit_Framework_Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+			$this->response = $ex->getResponse();
 		}
 	}
 
@@ -187,4 +200,9 @@ class FeatureContext extends BehatContext {
 		}
 	}
 
+
+
+
+
+
 }
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 2c9564bcdcf..6e2076da6a9 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -5,12 +5,12 @@ Feature: provisioning
   Scenario: Getting an not existing user
     Given As an "admin"
     When sending "GET" to "/cloud/users/test"
-    Then the status code should be "200"
+    Then the status code should be "998"
 
   Scenario: Listing all users
     Given As an "admin"
     When sending "GET" to "/cloud/users"
-    Then the status code should be "200"
+    Then the status code should be "100"
 
   Scenario: Create a user
     Given As an "admin"
@@ -18,8 +18,7 @@ Feature: provisioning
     When sending "POST" to "/cloud/users" with
       | userid | brand-new-user |
       | password | 123456 |
-
-    Then the status code should be "200"
+    Then the status code should be "100"
     And user "brand-new-user" exists
 
 
@@ -27,7 +26,7 @@ Feature: provisioning
     Given As an "admin"
     And user "brand-new-user" exists
     When sending "DELETE" to "/cloud/users/brand-new-user" 
-    Then the status code should be "200"
+    Then the status code should be "100"
     And user "brand-new-user" does not exist
 
 
@@ -38,7 +37,7 @@ Feature: provisioning
       | groupid | new-group |
       | password | 123456 |
 
-    Then the status code should be "200"
+    Then the status code should be "100"
     And group "new-group" exists
 
 
@@ -46,6 +45,8 @@ Feature: provisioning
     Given As an "admin"
     And group "new-group" exists
     When sending "DELETE" to "/cloud/groups/new-group"
-    Then the status code should be "200"
+    Then the status code should be "100"
     And group "new-group" does not exist
 
+
+
-- 
GitLab


From ac478b19103c14990a5ca023362d87e7b7eeba55 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Wed, 30 Sep 2015 16:57:02 +0000
Subject: [PATCH 708/783] added edit user test

---
 build/integration/features/provisioning-v1.feature | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 6e2076da6a9..384452d50a3 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -22,6 +22,18 @@ Feature: provisioning
     And user "brand-new-user" exists
 
 
+  Scenario: Edit a user
+    Given As an "admin"
+    And user "brand-new-user" exists
+    When sending "PUT" to "/cloud/users/brand-new-user" with
+      | key | quota |
+      | value | 12MB |
+      | key | email |
+      | value | brand-new-user@gmail.com |
+    Then the status code should be "100"
+    And user "brand-new-user" exists
+
+
   Scenario: Delete a user
     Given As an "admin"
     And user "brand-new-user" exists
-- 
GitLab


From fd709b4b49f18113dce1523fdda88ef60f2c23a4 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Fri, 2 Oct 2015 07:40:25 +0000
Subject: [PATCH 709/783] Being explicit between http and ocs return codes

---
 .../features/bootstrap/FeatureContext.php     | 34 ++++++++++++-------
 .../features/provisioning-v1.feature          | 21 ++++++++----
 .../features/provisioning-v2.feature          |  2 +-
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index da5b62153b8..766f3a667f5 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -49,28 +49,36 @@ class FeatureContext extends BehatContext {
 		$this->sendingToWith($verb, $url, null);
 	}
 
-	// /**
-	//  * @Then /^the status code should be "([^"]*)"$/
-	//  */
-	// public function theStatusCodeShouldBe($statusCode) {
-	// 	PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode());
-	// }
-
-   
+
+    /**
+    *  Parses the xml answer to get ocs response which doesn't match with
+    *  http one in v1 of the api.
+    */
     public function getOCSResponse($response){
          return $response->xml()->meta[0]->statuscode;
     }
 
 
 
+
     /**
-	 * @Then /^the status code should be "([^"]*)"$/
+	 * @Then /^the OCS status code should be "([^"]*)"$/
 	 */
-	public function theStatusCodeShouldBe($statusCode) {
+	public function theOCSStatusCodeShouldBe($statusCode) {
 		PHPUnit_Framework_Assert::assertEquals($statusCode, $this->getOCSResponse($this->response));
 	}
 
 
+     /**
+	 * @Then /^the HTTP status code should be "([^"]*)"$/
+	 */
+	public function theHTTPStatusCodeShouldBe($statusCode) {
+		PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode());
+	}
+
+	
+
+
 	/**
 	 * @Given /^As an "([^"]*)"$/
 	 */
@@ -89,7 +97,7 @@ class FeatureContext extends BehatContext {
 	 * @Given /^user "([^"]*)" exists$/
 	 */
 	public function userExists($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -97,6 +105,7 @@ class FeatureContext extends BehatContext {
 		}
 
 		$this->response = $client->get($fullUrl, $options);
+		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
 	}
 
 	/**
@@ -155,7 +164,7 @@ class FeatureContext extends BehatContext {
 	 * @Given /^group "([^"]*)" exists$/
 	 */
 	public function groupExists($group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/$group";
+		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -163,6 +172,7 @@ class FeatureContext extends BehatContext {
 		}
 
 		$this->response = $client->get($fullUrl, $options);
+		PHPUnit_Framework_Assert::assertEquals(200, $this->response->getStatusCode());
 	}
 
 	/**
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 384452d50a3..2bfd6a06d0d 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -5,12 +5,14 @@ Feature: provisioning
   Scenario: Getting an not existing user
     Given As an "admin"
     When sending "GET" to "/cloud/users/test"
-    Then the status code should be "998"
+    Then the OCS status code should be "998"
+    And the HTTP status code should be "200"
 
   Scenario: Listing all users
     Given As an "admin"
     When sending "GET" to "/cloud/users"
-    Then the status code should be "100"
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
 
   Scenario: Create a user
     Given As an "admin"
@@ -18,7 +20,8 @@ Feature: provisioning
     When sending "POST" to "/cloud/users" with
       | userid | brand-new-user |
       | password | 123456 |
-    Then the status code should be "100"
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
     And user "brand-new-user" exists
 
 
@@ -30,7 +33,8 @@ Feature: provisioning
       | value | 12MB |
       | key | email |
       | value | brand-new-user@gmail.com |
-    Then the status code should be "100"
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
     And user "brand-new-user" exists
 
 
@@ -38,7 +42,8 @@ Feature: provisioning
     Given As an "admin"
     And user "brand-new-user" exists
     When sending "DELETE" to "/cloud/users/brand-new-user" 
-    Then the status code should be "100"
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
     And user "brand-new-user" does not exist
 
 
@@ -49,7 +54,8 @@ Feature: provisioning
       | groupid | new-group |
       | password | 123456 |
 
-    Then the status code should be "100"
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
     And group "new-group" exists
 
 
@@ -57,7 +63,8 @@ Feature: provisioning
     Given As an "admin"
     And group "new-group" exists
     When sending "DELETE" to "/cloud/groups/new-group"
-    Then the status code should be "100"
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
     And group "new-group" does not exist
 
 
diff --git a/build/integration/features/provisioning-v2.feature b/build/integration/features/provisioning-v2.feature
index 72ceed5d6a5..6140128684d 100644
--- a/build/integration/features/provisioning-v2.feature
+++ b/build/integration/features/provisioning-v2.feature
@@ -5,5 +5,5 @@ Feature: provisioning
   Scenario: Getting an not existing user
     Given As an "admin"
     When sending "GET" to "/cloud/users/test"
-    Then the status code should be "404"
+    Then the HTTP status code should be "404"
 
-- 
GitLab


From 0c1a657282dd0bbe889485ed4a0d1124f671ef2f Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Fri, 2 Oct 2015 09:45:25 +0000
Subject: [PATCH 710/783] restored assertions in existance of users and groups

---
 .../features/bootstrap/FeatureContext.php     | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index 766f3a667f5..ec181206259 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -43,25 +43,25 @@ class FeatureContext extends BehatContext {
 	}
 
 	/**
-	 * @When /^sending "([^"]*)" to "([^"]*)"$/
-	 */
+	* @When /^sending "([^"]*)" to "([^"]*)"$/
+	*/
 	public function sendingTo($verb, $url) {
 		$this->sendingToWith($verb, $url, null);
 	}
 
 
-    /**
-    *  Parses the xml answer to get ocs response which doesn't match with
-    *  http one in v1 of the api.
-    */
-    public function getOCSResponse($response){
-         return $response->xml()->meta[0]->statuscode;
-    }
+	/**
+	*  Parses the xml answer to get ocs response which doesn't match with
+	*  http one in v1 of the api.
+	*/
+	public function getOCSResponse($response){
+		return $response->xml()->meta[0]->statuscode;
+	}
 
 
 
 
-    /**
+	/**
 	 * @Then /^the OCS status code should be "([^"]*)"$/
 	 */
 	public function theOCSStatusCodeShouldBe($statusCode) {
@@ -69,7 +69,7 @@ class FeatureContext extends BehatContext {
 	}
 
 
-     /**
+	/**
 	 * @Then /^the HTTP status code should be "([^"]*)"$/
 	 */
 	public function theHTTPStatusCodeShouldBe($statusCode) {
@@ -116,6 +116,7 @@ class FeatureContext extends BehatContext {
 			$this->userExists($user);
 		} catch (\GuzzleHttp\Exception\ClientException $ex) {
 			$this->response = $ex->getResponse();
+			PHPUnit_Framework_Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
 		}
 	}
 
@@ -141,7 +142,7 @@ class FeatureContext extends BehatContext {
 	}
 
 
-    /**
+	/**
 	 * @When /^creating the group "([^"]*)r"$/
 	 */
 	public function creatingTheGroup($group) {
@@ -183,6 +184,7 @@ class FeatureContext extends BehatContext {
 			$this->groupExists($group);
 		} catch (\GuzzleHttp\Exception\ClientException $ex) {
 			$this->response = $ex->getResponse();
+			PHPUnit_Framework_Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
 		}
 	}
 
-- 
GitLab


From 6e5aae26086756576ffc7d55398aabe8e452885a Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Mon, 5 Oct 2015 11:54:30 +0000
Subject: [PATCH 711/783] added a couple of tests

---
 .../integration/features/provisioning-v1.feature  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 2bfd6a06d0d..823fd823c5e 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -24,6 +24,21 @@ Feature: provisioning
     And the HTTP status code should be "200"
     And user "brand-new-user" exists
 
+  Scenario: Create an existing user
+    Given As an "admin"
+    And user "brand-new-user" exists
+    When sending "POST" to "/cloud/users" with
+      | userid | brand-new-user |
+      | password | 123456 |
+    Then the OCS status code should be "102"
+    And the HTTP status code should be "200"
+
+  Scenario: Get an existing user
+    Given As an "admin"
+    When sending "GET" to "/cloud/users/brand-new-user"
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+
 
   Scenario: Edit a user
     Given As an "admin"
-- 
GitLab


From b0babfc847e6bf232e31caf64182c5c571732954 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Tue, 6 Oct 2015 10:29:33 +0200
Subject: [PATCH 712/783] [Intergration] Throw error if exception not thrown

---
 .../features/bootstrap/FeatureContext.php     | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index ec181206259..9676fc8ca40 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -58,9 +58,6 @@ class FeatureContext extends BehatContext {
 		return $response->xml()->meta[0]->statuscode;
 	}
 
-
-
-
 	/**
 	 * @Then /^the OCS status code should be "([^"]*)"$/
 	 */
@@ -68,7 +65,6 @@ class FeatureContext extends BehatContext {
 		PHPUnit_Framework_Assert::assertEquals($statusCode, $this->getOCSResponse($this->response));
 	}
 
-
 	/**
 	 * @Then /^the HTTP status code should be "([^"]*)"$/
 	 */
@@ -76,9 +72,6 @@ class FeatureContext extends BehatContext {
 		PHPUnit_Framework_Assert::assertEquals($statusCode, $this->response->getStatusCode());
 	}
 
-	
-
-
 	/**
 	 * @Given /^As an "([^"]*)"$/
 	 */
@@ -114,13 +107,13 @@ class FeatureContext extends BehatContext {
 	public function userDoesNotExist($user) {
 		try {
 			$this->userExists($user);
+			PHPUnit_Framework_Assert::fail('The user "' . $user . '" exists');
 		} catch (\GuzzleHttp\Exception\ClientException $ex) {
 			$this->response = $ex->getResponse();
 			PHPUnit_Framework_Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
 		}
 	}
 
-
 	/**
 	 * @When /^creating the user "([^"]*)r"$/
 	 */
@@ -141,7 +134,6 @@ class FeatureContext extends BehatContext {
 
 	}
 
-
 	/**
 	 * @When /^creating the group "([^"]*)r"$/
 	 */
@@ -160,7 +152,6 @@ class FeatureContext extends BehatContext {
 		]);
 	}
 
-
 	/**
 	 * @Given /^group "([^"]*)" exists$/
 	 */
@@ -182,13 +173,13 @@ class FeatureContext extends BehatContext {
 	public function groupDoesNotExist($group) {
 		try {
 			$this->groupExists($group);
+			PHPUnit_Framework_Assert::fail('The group "' . $group . '" exists');
 		} catch (\GuzzleHttp\Exception\ClientException $ex) {
 			$this->response = $ex->getResponse();
 			PHPUnit_Framework_Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
 		}
 	}
 
-
 	/**
 	 * @When /^sending "([^"]*)" to "([^"]*)" with$/
 	 * @param \Behat\Gherkin\Node\TableNode|null $formData
@@ -211,10 +202,4 @@ class FeatureContext extends BehatContext {
 			$this->response = $ex->getResponse();
 		}
 	}
-
-
-
-
-
-
 }
-- 
GitLab


From 14497ecfac6c92b9b7027b86a804a1821b6e2d3f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 5 Oct 2015 13:00:19 +0200
Subject: [PATCH 713/783] improved explanation of server side encryption

---
 settings/templates/admin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index bfb0d5d364d..524553ca4d5 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -353,10 +353,10 @@ if ($_['cronErrors']) {
 	<div id="EncryptionWarning" class="warning hidden">
 		<p><?php p($l->t('Please read carefully before activating server-side encryption: ')); ?></p>
 		<ul>
-			<li><?php p($l->t('Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date')); ?></li>
-			<li><?php p($l->t('Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage.')); ?></li>
-			<li><?php p($l->t('Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)')); ?></li>
-			<li><?php p($l->t('You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)')); ?></li>
+			<li><?php p($l->t('Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met.')); ?></li>
+			<li><?php p($l->t('Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases.')); ?></li>
+			<li><?php p($l->t('Be aware that encryption always increases the file size.')); ?></li>
+			<li><?php p($l->t('It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data.')); ?></li>
 		</ul>
 
 		<p><?php p($l->t('This is the final warning: Do you really want to enable encryption?')) ?> <input type="button"
-- 
GitLab


From 999196b9fb2a16822ca0fb6effebbdf52adc374b Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 6 Oct 2015 11:34:06 +0200
Subject: [PATCH 714/783] fix wording

---
 settings/js/apps.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/apps.js b/settings/js/apps.js
index 325653ccbdc..d51c642c9c9 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -402,7 +402,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		OC.dialogs.info(
 			t(
 				'settings',
-				'The app needs to be updated. This page will be reloaded in 5 seconds.'
+				'The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds.'
 			),
 			t('settings','App update'),
 			function (result) {
-- 
GitLab


From 0817024e6f817a04c1258dba971f412550f6a058 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 1 Oct 2015 15:37:26 +0200
Subject: [PATCH 715/783] Mark shares as dirty when changing permissions

---
 .../files_sharing/lib/propagation/changewatcher.php |  8 ++++++++
 .../lib/propagation/propagationmanager.php          |  8 +++++---
 apps/files_sharing/tests/etagpropagation.php        | 13 +++++++++++++
 lib/private/share/share.php                         | 10 +++++++++-
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/apps/files_sharing/lib/propagation/changewatcher.php b/apps/files_sharing/lib/propagation/changewatcher.php
index 9da3ffe51a2..f9b28c7f967 100644
--- a/apps/files_sharing/lib/propagation/changewatcher.php
+++ b/apps/files_sharing/lib/propagation/changewatcher.php
@@ -99,4 +99,12 @@ class ChangeWatcher {
 			$propagator->propagateChanges();
 		}
 	}
+
+	public function permissionsHook($params) {
+		$share = $params['share'];
+
+		if ($share['item_type'] === 'file' || $share['item_type'] === 'folder') {
+			$this->recipientPropagator->markDirty($share, time());
+		}
+	}
 }
diff --git a/apps/files_sharing/lib/propagation/propagationmanager.php b/apps/files_sharing/lib/propagation/propagationmanager.php
index d220551f8d6..7fcf467de9a 100644
--- a/apps/files_sharing/lib/propagation/propagationmanager.php
+++ b/apps/files_sharing/lib/propagation/propagationmanager.php
@@ -25,6 +25,7 @@ use OC\Files\Filesystem;
 use OC\Files\View;
 use OCP\IConfig;
 use OCP\IUserSession;
+use OCP\Util;
 
 
 /**
@@ -119,8 +120,9 @@ class PropagationManager {
 
 		// for marking shares owned by the active user as dirty when a file inside them changes
 		$this->listenToOwnerChanges($user->getUID(), $user->getUID());
-		\OC_Hook::connect('OC_Filesystem', 'post_write', $watcher, 'writeHook');
-		\OC_Hook::connect('OC_Filesystem', 'post_delete', $watcher, 'writeHook');
-		\OC_Hook::connect('OC_Filesystem', 'post_rename', $watcher, 'renameHook');
+		Util::connectHook('OC_Filesystem', 'post_write', $watcher, 'writeHook');
+		Util::connectHook('OC_Filesystem', 'post_delete', $watcher, 'writeHook');
+		Util::connectHook('OC_Filesystem', 'post_rename', $watcher, 'renameHook');
+		Util::connectHook('OCP\Share', 'post_update_permissions', $watcher, 'permissionsHook');
 	}
 }
diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php
index 6d23959d66d..427e371cd06 100644
--- a/apps/files_sharing/tests/etagpropagation.php
+++ b/apps/files_sharing/tests/etagpropagation.php
@@ -406,4 +406,17 @@ class EtagPropagation extends TestCase {
 
 		$this->assertAllUnchaged();
 	}
+
+	public function testEtagChangeOnPermissionsChange() {
+		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
+
+		$view = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
+		$folderInfo = $view->getFileInfo('/sub1/sub2/folder');
+
+		\OCP\Share::setPermissions('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 17);
+
+		$this->assertEtagsForFoldersChanged([self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_USER4]);
+
+		$this->assertAllUnchaged();
+	}
 }
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 97c36a03c86..7f9b899bf63 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1099,6 +1099,7 @@ class Share extends Constants {
 					'uidOwner' => \OC_User::getUser(),
 					'permissions' => $permissions,
 					'path' => $item['path'],
+					'share' => $item
 				));
 			}
 			// Check if permissions were removed
@@ -1109,16 +1110,18 @@ class Share extends Constants {
 					Helper::delete($item['id'], true, null, null, true);
 				} else {
 					$ids = array();
+					$items = [];
 					$parents = array($item['id']);
 					while (!empty($parents)) {
 						$parents = "'".implode("','", $parents)."'";
-						$query = \OC_DB::prepare('SELECT `id`, `permissions` FROM `*PREFIX*share`'
+						$query = \OC_DB::prepare('SELECT `id`, `permissions`, `item_type` FROM `*PREFIX*share`'
 							.' WHERE `parent` IN ('.$parents.')');
 						$result = $query->execute();
 						// Reset parents array, only go through loop again if
 						// items are found that need permissions removed
 						$parents = array();
 						while ($item = $result->fetchRow()) {
+							$items[] = $item;
 							// Check if permissions need to be removed
 							if ($item['permissions'] & ~$permissions) {
 								// Add to list of items that need permissions removed
@@ -1140,8 +1143,13 @@ class Share extends Constants {
 							.' WHERE `id` IN ('.$ids.')');
 						$query->execute(array($permissions));
 					}
+
+					foreach ($items as $item) {
+						\OC_Hook::emit('OCP\Share', 'post_update_permissions', ['share' => $item]);
+					}
 				}
 			}
+
 			return true;
 		}
 		$message = 'Setting permissions for %s failed, because the item was not found';
-- 
GitLab


From 41f9946272e4c41e96bd0918ff1b2adfd113b92a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 1 Oct 2015 16:20:48 +0200
Subject: [PATCH 716/783] clear hooks for tests

---
 apps/files_sharing/tests/etagpropagation.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php
index 427e371cd06..f7f8ec35288 100644
--- a/apps/files_sharing/tests/etagpropagation.php
+++ b/apps/files_sharing/tests/etagpropagation.php
@@ -47,6 +47,7 @@ class EtagPropagation extends TestCase {
 		\OC_Hook::clear('OC_Filesystem', 'post_write');
 		\OC_Hook::clear('OC_Filesystem', 'post_delete');
 		\OC_Hook::clear('OC_Filesystem', 'post_rename');
+		\OC_Hook::clear('OCP\Share', 'post_update_permissions');
 		parent::tearDown();
 	}
 
-- 
GitLab


From 47c71d8e8771cab6d5442e790f3edb94213b586e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 6 Oct 2015 13:00:17 +0200
Subject: [PATCH 717/783] use microtime

---
 apps/files_sharing/lib/propagation/changewatcher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/propagation/changewatcher.php b/apps/files_sharing/lib/propagation/changewatcher.php
index f9b28c7f967..e61c161da19 100644
--- a/apps/files_sharing/lib/propagation/changewatcher.php
+++ b/apps/files_sharing/lib/propagation/changewatcher.php
@@ -104,7 +104,7 @@ class ChangeWatcher {
 		$share = $params['share'];
 
 		if ($share['item_type'] === 'file' || $share['item_type'] === 'folder') {
-			$this->recipientPropagator->markDirty($share, time());
+			$this->recipientPropagator->markDirty($share, microtime(true));
 		}
 	}
 }
-- 
GitLab


From 384c6fd3ace1d2f908aafc126ca46ca4fe9e3fd8 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 6 Oct 2015 14:00:55 +0200
Subject: [PATCH 718/783] Fix importing of certificates

Fixes https://github.com/owncloud/core/issues/19601
---
 settings/controller/certificatecontroller.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/settings/controller/certificatecontroller.php b/settings/controller/certificatecontroller.php
index 2995c7f38bf..8ff9f51a66c 100644
--- a/settings/controller/certificatecontroller.php
+++ b/settings/controller/certificatecontroller.php
@@ -122,8 +122,9 @@ class CertificateController extends Controller {
 	protected function isCertificateImportAllowed() {
 		$externalStorageEnabled = $this->appManager->isEnabledForUser('files_external');
 		if ($externalStorageEnabled) {
-			$backendService = \OC_Mount_Config::$app->getContainer()->query('OCA\Files_External\Service\BackendService');
-			if ($backendService->getBackendsVisibleFor(\OCA\Files_External\Service\BackendService::VISIBILITY_PERSONAL)) {
+			/** @var \OCA\Files_External\Service\BackendService $backendService */
+			$backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
+			if ($backendService->isUserMountingAllowed()) {
 				return true;
 			}
 		}
-- 
GitLab


From 6c798889a5a9384371aa780c1b399e087543fd4a Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 6 Oct 2015 14:06:22 +0200
Subject: [PATCH 719/783] Only show import button if user storages are allowed

---
 settings/personal.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/settings/personal.php b/settings/personal.php
index e9e2046f00a..e58e043af50 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -119,7 +119,9 @@ $clients = array(
 $enableCertImport = false;
 $externalStorageEnabled = \OC::$server->getAppManager()->isEnabledForUser('files_external');
 if ($externalStorageEnabled) {
-	$enableCertImport = true;
+	/** @var \OCA\Files_External\Service\BackendService $backendService */
+	$backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
+	$enableCertImport = $backendService->isUserMountingAllowed();
 }
 
 
-- 
GitLab


From 48ef5b6b3bcb2ce0cd153d7590b00b11fedbf4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 6 Oct 2015 14:18:22 +0200
Subject: [PATCH 720/783] OC_Log not longer exists

---
 lib/private/share/share.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 97c36a03c86..49eeb3829c4 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -719,7 +719,7 @@ class Share extends Constants {
 				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
 					$message = 'Sharing %s failed, because this item is already shared with user %s';
 					$message_t = $l->t('Sharing %s failed, because this item is already shared with user %s', array($itemSourceName, $shareWith));
-					\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
 					throw new \Exception($message_t);
 				}
 			}
-- 
GitLab


From 80a232da6a5470e248979cfde7b1e4e2237b8284 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 6 Oct 2015 14:18:46 +0200
Subject: [PATCH 721/783] Add \OCP\IRequest::getHttpProtocol

Only allow valid HTTP protocols.

Ref https://github.com/owncloud/core/pull/19537#discussion_r41252333 + https://github.com/owncloud/security-tracker/issues/119
---
 lib/private/appframework/http/request.php   | 21 +++++++++
 lib/public/irequest.php                     |  8 ++++
 tests/lib/appframework/http/RequestTest.php | 51 +++++++++++++++++++++
 3 files changed, 80 insertions(+)

diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index 29414b92f7c..cfd903bffe5 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -552,6 +552,27 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 		return 'http';
 	}
 
+	/**
+	 * Returns the used HTTP protocol.
+	 *
+	 * @return string HTTP protocol. HTTP/2, HTTP/1.1 or HTTP/1.0.
+	 */
+	public function getHttpProtocol() {
+		$claimedProtocol = strtoupper($this->server['SERVER_PROTOCOL']);
+
+		$validProtocols = [
+			'HTTP/1.0',
+			'HTTP/1.1',
+			'HTTP/2',
+		];
+
+		if(in_array($claimedProtocol, $validProtocols, true)) {
+			return $claimedProtocol;
+		}
+
+		return 'HTTP/1.1';
+	}
+
 	/**
 	 * Returns the request uri, even if the website uses one or more
 	 * reverse proxies
diff --git a/lib/public/irequest.php b/lib/public/irequest.php
index 20fa543dd69..acfc4f3f1d0 100644
--- a/lib/public/irequest.php
+++ b/lib/public/irequest.php
@@ -167,6 +167,14 @@ interface IRequest {
 	 */
 	public function getServerProtocol();
 
+	/**
+	 * Returns the used HTTP protocol.
+	 *
+	 * @return string HTTP protocol. HTTP/2, HTTP/1.1 or HTTP/1.0.
+	 * @since 8.2.0
+	 */
+	public function getHttpProtocol();
+
 	/**
 	* Returns the request uri, even if the website uses one or more
 	* reverse proxies
diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php
index e9a0755d1f8..f75e4578546 100644
--- a/tests/lib/appframework/http/RequestTest.php
+++ b/tests/lib/appframework/http/RequestTest.php
@@ -497,6 +497,57 @@ class RequestTest extends \Test\TestCase {
 		$this->assertSame('192.168.0.233', $request->getRemoteAddress());
 	}
 
+	/**
+	 * @return array
+	 */
+	public function httpProtocolProvider() {
+		return [
+			// Valid HTTP 1.0
+			['HTTP/1.0', 'HTTP/1.0'],
+			['http/1.0', 'HTTP/1.0'],
+			['HTTp/1.0', 'HTTP/1.0'],
+
+			// Valid HTTP 1.1
+			['HTTP/1.1', 'HTTP/1.1'],
+			['http/1.1', 'HTTP/1.1'],
+			['HTTp/1.1', 'HTTP/1.1'],
+
+			// Valid HTTP 2.0
+			['HTTP/2', 'HTTP/2'],
+			['http/2', 'HTTP/2'],
+			['HTTp/2', 'HTTP/2'],
+
+			// Invalid
+			['HTTp/394', 'HTTP/1.1'],
+			['InvalidProvider/1.1', 'HTTP/1.1'],
+			[null, 'HTTP/1.1'],
+			['', 'HTTP/1.1'],
+
+		];
+	}
+
+	/**
+	 * @dataProvider httpProtocolProvider
+	 *
+	 * @param mixed $input
+	 * @param string $expected
+	 */
+	public function testGetHttpProtocol($input, $expected) {
+		$request = new Request(
+			[
+				'server' => [
+					'SERVER_PROTOCOL' => $input,
+				],
+			],
+			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
+			$this->config,
+			$this->stream
+		);
+
+		$this->assertSame($expected, $request->getHttpProtocol());
+	}
+
 	public function testGetServerProtocolWithOverride() {
 		$this->config
 			->expects($this->at(0))
-- 
GitLab


From d546c5bb593193e2f3083cde3b3afa8b0fc7c209 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 7 Aug 2015 17:14:54 +0200
Subject: [PATCH 722/783] Propagate shares etag when group membership changed

---
 apps/files_sharing/appinfo/application.php    |  13 ++
 .../propagation/grouppropagationmanager.php   | 133 +++++++++++++
 .../lib/propagation/propagationmanager.php    |  15 ++
 .../tests/grouppropagationmanager.php         | 175 ++++++++++++++++++
 4 files changed, 336 insertions(+)
 create mode 100644 apps/files_sharing/lib/propagation/grouppropagationmanager.php
 create mode 100644 apps/files_sharing/tests/grouppropagationmanager.php

diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index 10e3fdae982..9587d74f160 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -27,6 +27,7 @@ namespace OCA\Files_Sharing\AppInfo;
 use OCA\Files_Sharing\Helper;
 use OCA\Files_Sharing\MountProvider;
 use OCA\Files_Sharing\Propagation\PropagationManager;
+use OCA\Files_Sharing\Propagation\GroupPropagationManager;
 use OCP\AppFramework\App;
 use OC\AppFramework\Utility\SimpleContainer;
 use OCA\Files_Sharing\Controllers\ExternalSharesController;
@@ -128,6 +129,16 @@ class Application extends App {
 			);
 		});
 
+		$container->registerService('GroupPropagationManager', function (IContainer $c) {
+			/** @var \OCP\IServerContainer $server */
+			$server = $c->query('ServerContainer');
+			return new GroupPropagationManager(
+				$server->getUserSession(),
+				$server->getGroupManager(),
+				$c->query('PropagationManager')
+			);
+		});
+
 		/*
 		 * Register capabilities
 		 */
@@ -144,5 +155,7 @@ class Application extends App {
 	public function setupPropagation() {
 		$propagationManager = $this->getContainer()->query('PropagationManager');
 		\OCP\Util::connectHook('OC_Filesystem', 'setup', $propagationManager, 'globalSetup');
+
+		$this->getContainer()->query('GroupPropagationManager')->globalSetup();
 	}
 }
diff --git a/apps/files_sharing/lib/propagation/grouppropagationmanager.php b/apps/files_sharing/lib/propagation/grouppropagationmanager.php
new file mode 100644
index 00000000000..ba550dccec3
--- /dev/null
+++ b/apps/files_sharing/lib/propagation/grouppropagationmanager.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_Sharing\Propagation;
+
+use OC\Files\Filesystem;
+use OC\Files\View;
+use OCP\IConfig;
+use OCP\IUserSession;
+use OCP\IGroup;
+use OCP\IUser;
+use OCP\IGroupManager;
+use OCA\Files_Sharing\Propagation\PropagationManager;
+
+/**
+ * Propagate changes on group changes
+ */
+class GroupPropagationManager {
+	/**
+	 * @var \OCP\IUserSession
+	 */
+	private $userSession;
+
+	/**
+	 * @var \OCP\IGroupManager
+	 */
+	private $groupManager;
+
+	/**
+	 * @var PropagationManager
+	 */
+	private $propagationManager;
+
+	/**
+	 * Items shared with a given user.
+	 * Key is user id and value is an array of shares.
+	 *
+	 * @var array
+	 */
+	private $userShares = [];
+
+	public function __construct(IUserSession $userSession, IGroupManager $groupManager, PropagationManager $propagationManager) {
+		$this->userSession = $userSession;
+		$this->groupManager = $groupManager;
+		$this->propagationManager = $propagationManager;
+	}
+
+	public function onPreProcessUser(IGroup $group, IUser $targetUser) {
+		$this->userShares[$targetUser->getUID()] = $this->getUserShares($targetUser->getUID());
+	}
+
+	public function onPostAddUser(IGroup $group, IUser $targetUser) {
+		$targetUserId = $targetUser->getUID();
+		$sharesAfter = $this->getUserShares($targetUserId);
+
+		$this->propagateSharesDiff($targetUserId, $sharesAfter, $this->userShares[$targetUserId]);
+		unset($this->userShares[$targetUserId]);
+	}
+
+	public function onPostRemoveUser(IGroup $group, IUser $targetUser) {
+		$targetUserId = $targetUser->getUID();
+		$sharesAfter = $this->getUserShares($targetUserId);
+
+		$this->propagateSharesDiff($targetUserId, $this->userShares[$targetUserId], $sharesAfter);
+		unset($this->userShares[$targetUserId]);
+	}
+
+	private function getUserShares($targetUserId) {
+		return \OCP\Share::getItemsSharedWithUser('file', $targetUserId);
+	}
+
+	/**
+	 * Propagate etag for the shares that are in $shares1 but not in $shares2.
+	 *
+	 * @param string $targetUserId user id for which to propagate shares
+	 * @param array $shares1
+	 * @param array $shares2
+	 */
+	private function propagateSharesDiff($targetUserId, $shares1, $shares2) {
+		$sharesToPropagate = array_udiff(
+			$shares1,
+			$shares2,
+			function($share1, $share2) {
+				return ($share2['id'] - $share1['id']);
+			}
+		);
+
+		\OC\Files\Filesystem::initMountPoints($targetUserId);
+		$this->propagationManager->propagateSharesToUser($sharesToPropagate, $targetUserId);
+	}
+
+	/**
+	 * To be called from setupFS trough a hook
+	 *
+	 * Sets up listening to changes made to shares owned by the current user
+	 */
+	public function globalSetup() {
+		$user = $this->userSession->getUser();
+		if (!$user) {
+			return;
+		}
+
+		$this->groupManager->listen('\OC\Group', 'preAddUser', [$this, 'onPreProcessUser']);
+		$this->groupManager->listen('\OC\Group', 'postAddUser', [$this, 'onPostAddUser']);
+		$this->groupManager->listen('\OC\Group', 'preRemoveUser', [$this, 'onPreProcessUser']);
+		$this->groupManager->listen('\OC\Group', 'postRemoveUser', [$this, 'onPostRemoveUser']);
+	}
+
+	public function tearDown() {
+		$this->groupManager->removeListener('\OC\Group', 'preAddUser', [$this, 'onPreProcessUser']);
+		$this->groupManager->removeListener('\OC\Group', 'postAddUser', [$this, 'onPostAddUser']);
+		$this->groupManager->removeListener('\OC\Group', 'preRemoveUser', [$this, 'onPreProcessUser']);
+		$this->groupManager->removeListener('\OC\Group', 'postRemoveUser', [$this, 'onPostRemoveUser']);
+	}
+}
diff --git a/apps/files_sharing/lib/propagation/propagationmanager.php b/apps/files_sharing/lib/propagation/propagationmanager.php
index d220551f8d6..35048f89cfb 100644
--- a/apps/files_sharing/lib/propagation/propagationmanager.php
+++ b/apps/files_sharing/lib/propagation/propagationmanager.php
@@ -80,6 +80,21 @@ class PropagationManager {
 		return $this->changePropagators[$user];
 	}
 
+	/**
+	 * Propagates etag changes for the given shares to the given user
+	 *
+	 * @param array array of shares for which to trigger etag change
+	 * @param string $user
+	 */
+	public function propagateSharesToUser($shares, $user) {
+		$changePropagator = $this->getChangePropagator($user);
+		foreach ($shares as $share) {
+			$changePropagator->addChange($share['file_target']);
+		}
+		$time = microtime(true);
+		$changePropagator->propagateChanges(floor($time));
+	}
+
 	/**
 	 * @param string $user
 	 * @return \OCA\Files_Sharing\Propagation\RecipientPropagator
diff --git a/apps/files_sharing/tests/grouppropagationmanager.php b/apps/files_sharing/tests/grouppropagationmanager.php
new file mode 100644
index 00000000000..6fc6ef7a532
--- /dev/null
+++ b/apps/files_sharing/tests/grouppropagationmanager.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Robin Appelman <icewind@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Files_sharing\Tests;
+
+use OC\Files\View;
+use OCP\IGroupManager;
+use OCP\IGroup;
+use OCP\IUser;
+use OCP\Share;
+use OCA\Files_Sharing\Propagation\GroupPropagationManager;
+use OCA\Files_Sharing\Propagation\PropagationManager;
+
+class GroupPropagationManagerTest extends TestCase {
+
+	/**
+	 * @var GroupPropagationManager
+	 */
+	private $groupPropagationManager;
+
+	/**
+	 * @var IGroupManager
+	 */
+	private $groupManager;
+
+	/**
+	 * @var PropagationManager
+	 */
+	private $propagationManager;
+
+	/**
+	 * @var IGroup
+	 */
+	private $recipientGroup;
+
+	/**
+	 * @var IUser
+	 */
+	private $recipientUser;
+
+	/**
+	 * @var array
+	 */
+	private $fileInfo;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$user = $this->getMockBuilder('\OCP\IUser')
+		             ->disableOriginalConstructor()
+		             ->getMock();
+		$user->method('getUID')->willReturn(self::TEST_FILES_SHARING_API_USER1);
+		$userSession = $this->getMockBuilder('\OCP\IUserSession')
+		                    ->disableOriginalConstructor()
+		                    ->getMock();
+		$userSession->method('getUser')->willReturn(selF::TEST_FILES_SHARING_API_USER1);
+
+		$this->propagationManager = $this->getMockBuilder('OCA\Files_Sharing\Propagation\PropagationManager')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->groupManager = \OC::$server->getGroupManager();
+		$this->groupPropagationManager = new GroupPropagationManager(
+			$userSession,
+			$this->groupManager,
+			$this->propagationManager
+		);
+		$this->groupPropagationManager->globalSetup();
+
+		// since the sharing code is not mockable, we have to create a real folder
+		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
+		$view1 = new View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
+		$view1->mkdir('/folder');
+
+		$this->fileInfo = $view1->getFileInfo('/folder');
+
+		$this->recipientGroup = $this->groupManager->get(self::TEST_FILES_SHARING_API_GROUP1);
+		$this->recipientUser = \OC::$server->getUserManager()->get(self::TEST_FILES_SHARING_API_USER3);
+
+		Share::shareItem(
+			'folder',
+			$this->fileInfo['fileid'],
+			Share::SHARE_TYPE_GROUP,
+			$this->recipientGroup->getGID(),
+			\OCP\Constants::PERMISSION_READ
+		);
+
+		$this->loginAsUser($this->recipientUser->getUID());
+	}
+
+	protected function tearDown() {
+		$this->groupPropagationManager->tearDown();
+		$this->recipientGroup->removeUser($this->recipientUser);
+		parent::tearDown();
+	}
+
+	public function testPropagateWhenAddedToGroup() {
+		$this->propagationManager->expects($this->once())
+			->method('propagateSharesToUser')
+			->with($this->callback(function($shares) {
+				if (count($shares) !== 1) {
+					return false;
+				}
+				$share = array_values($shares)[0];
+				return $share['file_source'] === $this->fileInfo['fileid'] &&
+					$share['share_with'] === $this->recipientGroup->getGID() &&
+					$share['file_target'] === '/folder';
+			}), $this->recipientUser->getUID());
+
+		$this->recipientGroup->addUser($this->recipientUser);
+	}
+
+	public function testPropagateWhenRemovedFromGroup() {
+		$this->recipientGroup->addUser($this->recipientUser);
+
+		$this->propagationManager->expects($this->once())
+			->method('propagateSharesToUser')
+			->with($this->callback(function($shares) {
+				if (count($shares) !== 1) {
+					return false;
+				}
+				$share = array_values($shares)[0];
+				return $share['file_source'] === $this->fileInfo['fileid'] &&
+					$share['share_with'] === $this->recipientGroup->getGID() &&
+					$share['file_target'] === '/folder';
+			}), $this->recipientUser->getUID());
+
+		$this->recipientGroup->removeUser($this->recipientUser);
+	}
+
+	public function testPropagateWhenRemovedFromGroupWithSubdirTarget() {
+		$this->recipientGroup->addUser($this->recipientUser);
+
+		// relogin to refresh mount points
+		$this->loginAsUser($this->recipientUser->getUID());
+		$recipientView = new View('/' . $this->recipientUser->getUID() . '/files');
+
+		$this->assertTrue($recipientView->mkdir('sub'));
+		$this->assertTrue($recipientView->rename('folder', 'sub/folder'));
+
+		$this->propagationManager->expects($this->once())
+			->method('propagateSharesToUser')
+			->with($this->callback(function($shares) {
+				if (count($shares) !== 1) {
+					return false;
+				}
+				$share = array_values($shares)[0];
+				return $share['file_source'] === $this->fileInfo['fileid'] &&
+					$share['share_with'] === $this->recipientGroup->getGID() &&
+					$share['file_target'] === '/sub/folder';
+			}), $this->recipientUser->getUID());
+
+		$this->recipientGroup->removeUser($this->recipientUser);
+	}
+}
-- 
GitLab


From 6a4f22c61f58b80f826408780d6882f0d1041e70 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 6 Oct 2015 15:24:19 +0200
Subject: [PATCH 723/783] Use `/` if installed in main folder

Otherwise an empty string is used indicating the cookie is only valid for those resources. This can lead to eunexpected behaviour.

Fixes https://github.com/owncloud/core/issues/19196
---
 .../dependencyinjection/dicontainer.php          |  2 +-
 lib/private/appframework/http/output.php         | 16 +++++++++++++---
 lib/public/appframework/http/ioutput.php         |  4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 4779d6bf0ad..651b268a35e 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -79,7 +79,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 		});
 
 		$this->registerService('OCP\\AppFramework\\Http\\IOutput', function($c){
-			return new Output();
+			return new Output($this->getServer()->getWebRoot());
 		});
 
 		$this->registerService('OCP\\IAvatarManager', function($c) {
diff --git a/lib/private/appframework/http/output.php b/lib/private/appframework/http/output.php
index f04157665f8..01636d397b2 100644
--- a/lib/private/appframework/http/output.php
+++ b/lib/private/appframework/http/output.php
@@ -27,6 +27,15 @@ use OCP\AppFramework\Http\IOutput;
  * Very thin wrapper class to make output testable
  */
 class Output implements IOutput {
+	/** @var string */
+	private $webRoot;
+
+	/**
+	 * @param $webRoot
+	 */
+	public function __construct($webRoot) {
+		$this->webRoot = $webRoot;
+	}
 
 	/**
 	 * @param string $out
@@ -72,10 +81,11 @@ class Output implements IOutput {
 	 * @param string $path
 	 * @param string $domain
 	 * @param bool $secure
-	 * @param bool $httponly
+	 * @param bool $httpOnly
 	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httponly) {
-		setcookie($name, $value, $expire, $path, $domain, $secure, $httponly);
+	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly) {
+		$path = $this->webRoot ? : '/';
+		setcookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
 	}
 
 }
diff --git a/lib/public/appframework/http/ioutput.php b/lib/public/appframework/http/ioutput.php
index ba4c031001b..185bc589f22 100644
--- a/lib/public/appframework/http/ioutput.php
+++ b/lib/public/appframework/http/ioutput.php
@@ -68,9 +68,9 @@ interface IOutput {
 	 * @param string $path
 	 * @param string $domain
 	 * @param bool $secure
-	 * @param bool $httponly
+	 * @param bool $httpOnly
 	 * @since 8.1.0
 	 */
-	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httponly);
+	public function setCookie($name, $value, $expire, $path, $domain, $secure, $httpOnly);
 
 }
-- 
GitLab


From 285e73ac725956d1faeb15a44ddd991bf67e584a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 6 Oct 2015 15:11:11 +0200
Subject: [PATCH 724/783] validate HTTP protocol in case of an exception

---
 lib/private/template.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/lib/private/template.php b/lib/private/template.php
index c6ae99f99b7..45e2af049cb 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -310,7 +310,7 @@ class OC_Template extends \OC\Template\Base {
 			$logger->error("$error_msg $hint", ['app' => 'core']);
 			$logger->logException($e, ['app' => 'core']);
 
-			header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error');
+			header(self::getHttpProtocol() . ' 500 Internal Server Error');
 			header('Content-Type: text/plain; charset=utf-8');
 			print("$error_msg $hint");
 		}
@@ -340,7 +340,7 @@ class OC_Template extends \OC\Template\Base {
 			$logger->logException($exception, ['app' => 'core']);
 			$logger->logException($e, ['app' => 'core']);
 
-			header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error');
+			header(self::getHttpProtocol() . ' 500 Internal Server Error');
 			header('Content-Type: text/plain; charset=utf-8');
 			print("Internal Server Error\n\n");
 			print("The server encountered an internal error and was unable to complete your request.\n");
@@ -350,6 +350,28 @@ class OC_Template extends \OC\Template\Base {
 		die();
 	}
 
+	/**
+	 * This is only here to reduce the dependencies in case of an exception to
+	 * still be able to print a plain error message.
+	 *
+	 * Returns the used HTTP protocol.
+	 *
+	 * @return string HTTP protocol. HTTP/2, HTTP/1.1 or HTTP/1.0.
+	 * @internal Don't use this - use AppFramework\Http\Request->getHttpProtocol instead
+	 */
+	protected static function getHttpProtocol() {
+		$claimedProtocol = strtoupper($_SERVER['SERVER_PROTOCOL']);
+		$validProtocols = [
+			'HTTP/1.0',
+			'HTTP/1.1',
+			'HTTP/2',
+		];
+		if(in_array($claimedProtocol, $validProtocols, true)) {
+			return $claimedProtocol;
+		}
+		return 'HTTP/1.1';
+	}
+
 	/**
 	 * @return bool
 	 */
-- 
GitLab


From 3173ed29df07c7de9da241f43288eca8ca136dc5 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Fri, 2 Oct 2015 23:42:51 +0200
Subject: [PATCH 725/783] The minimum size for internalRootLength is 1

---
 lib/private/files/node/folder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php
index 23004fc3527..00bf738227d 100644
--- a/lib/private/files/node/folder.php
+++ b/lib/private/files/node/folder.php
@@ -222,7 +222,7 @@ class Folder extends Node implements \OCP\Files\Folder {
 
 		$results = call_user_func_array(array($cache, $method), $args);
 		foreach ($results as $result) {
-			if ($internalRootLength === 0 or substr($result['path'], 0, $internalRootLength) === $internalPath) {
+			if ($internalRootLength === 1 or substr($result['path'], 0, $internalRootLength) === $internalPath) {
 				$result['internalPath'] = $result['path'];
 				$result['path'] = substr($result['path'], $internalRootLength);
 				$result['storage'] = $storage;
-- 
GitLab


From e28a2ff8882d4f0369cb32194975fc04a6080cb4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 6 Oct 2015 15:02:33 +0200
Subject: [PATCH 726/783] Add unit test for searching in storage root

---
 tests/lib/files/node/folder.php | 39 +++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
index b30f352847d..8c98256575e 100644
--- a/tests/lib/files/node/folder.php
+++ b/tests/lib/files/node/folder.php
@@ -421,6 +421,45 @@ class Folder extends \Test\TestCase {
 		$this->assertEquals('/foo', $result[0]->getPath());
 	}
 
+	public function testSearchInStorageRoot() {
+		$manager = $this->getMock('\OC\Files\Mount\Manager');
+		/**
+		 * @var \OC\Files\View | \PHPUnit_Framework_MockObject_MockObject $view
+		 */
+		$view = $this->getMock('\OC\Files\View');
+		$root = $this->getMock('\OC\Files\Node\Root', array(), array($manager, $view, $this->user));
+		$root->expects($this->any())
+			->method('getUser')
+			->will($this->returnValue($this->user));
+		$storage = $this->getMock('\OC\Files\Storage\Storage');
+		$cache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
+
+		$storage->expects($this->once())
+			->method('getCache')
+			->will($this->returnValue($cache));
+
+		$cache->expects($this->once())
+			->method('search')
+			->with('%qw%')
+			->will($this->returnValue(array(
+				array('fileid' => 3, 'path' => 'foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'text/plain')
+			)));
+
+		$root->expects($this->once())
+			->method('getMountsIn')
+			->with('/bar')
+			->will($this->returnValue(array()));
+
+		$view->expects($this->once())
+			->method('resolvePath')
+			->will($this->returnValue(array($storage, '')));
+
+		$node = new \OC\Files\Node\Folder($root, $view, '/bar');
+		$result = $node->search('qw');
+		$this->assertEquals(1, count($result));
+		$this->assertEquals('/bar/foo/qwerty', $result[0]->getPath());
+	}
+
 	public function testSearchByTag() {
 		$manager = $this->getMock('\OC\Files\Mount\Manager');
 		/**
-- 
GitLab


From c2d76d201075733a89d5167faf1091e589249a77 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 6 Oct 2015 15:02:47 +0200
Subject: [PATCH 727/783] fix internal path when searching in storage root

---
 lib/private/files/node/folder.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php
index 00bf738227d..9032c2bfb9d 100644
--- a/lib/private/files/node/folder.php
+++ b/lib/private/files/node/folder.php
@@ -215,14 +215,17 @@ class Folder extends Node implements \OCP\Files\Folder {
 		 * @var \OC\Files\Storage\Storage $storage
 		 */
 		list($storage, $internalPath) = $this->view->resolvePath($this->path);
-		$internalPath = rtrim($internalPath, '/') . '/';
+		$internalPath = rtrim($internalPath, '/');
+		if ($internalPath !== '') {
+			$internalPath = $internalPath . '/';
+		}
 		$internalRootLength = strlen($internalPath);
 
 		$cache = $storage->getCache('');
 
 		$results = call_user_func_array(array($cache, $method), $args);
 		foreach ($results as $result) {
-			if ($internalRootLength === 1 or substr($result['path'], 0, $internalRootLength) === $internalPath) {
+			if ($internalRootLength === 0 or substr($result['path'], 0, $internalRootLength) === $internalPath) {
 				$result['internalPath'] = $result['path'];
 				$result['path'] = substr($result['path'], $internalRootLength);
 				$result['storage'] = $storage;
-- 
GitLab


From 5646e39248d9ac2bade491dc99c88a10b3dfbc34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 28 Sep 2015 16:38:01 +0200
Subject: [PATCH 728/783] test objectstore with ceph docker

use default config for swift primary storage test config

allow testsuite to complete

fix timeout, script cleanup, enable debug for now

use btrfs loopback device, requires privileged container and absolute path

throw exception when storage has problems

debug by echo ...

sleep more, more debug
---
 apps/files_sharing/tests/etagpropagation.php  |   6 +
 apps/files_sharing/tests/sizepropagation.php  |   2 +
 .../tests/command/expiretest.php              |   2 +-
 autotest.sh                                   |  38 ++-
 tests/lib/files/objectstore/swift.php         |  32 +--
 tests/lib/share/share.php                     |   5 +
 tests/objectstore/entrypoint.sh               | 271 ++++++++++++++++++
 tests/objectstore/start-swift-ceph.sh         | 108 +++++++
 tests/objectstore/stop-swift-ceph.sh          |  38 +++
 9 files changed, 479 insertions(+), 23 deletions(-)
 create mode 100755 tests/objectstore/entrypoint.sh
 create mode 100755 tests/objectstore/start-swift-ceph.sh
 create mode 100755 tests/objectstore/stop-swift-ceph.sh

diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php
index 6d23959d66d..35c7012a753 100644
--- a/apps/files_sharing/tests/etagpropagation.php
+++ b/apps/files_sharing/tests/etagpropagation.php
@@ -74,11 +74,14 @@ class EtagPropagation extends TestCase {
 		$view1->file_put_contents('/sub1/sub2/folder/file.txt', 'foobar');
 		$view1->file_put_contents('/sub1/sub2/folder/inside/file.txt', 'foobar');
 		$folderInfo = $view1->getFileInfo('/sub1/sub2/folder');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
 		$fileInfo = $view1->getFileInfo('/foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
 		\OCP\Share::shareItem('file', $fileInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
 		\OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
 		\OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER3, 31);
 		$folderInfo = $view1->getFileInfo('/directReshare');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
 		\OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, 31);
 		$this->fileIds[self::TEST_FILES_SHARING_API_USER1][''] = $view1->getFileInfo('')->getId();
 		$this->fileIds[self::TEST_FILES_SHARING_API_USER1]['sub1'] = $view1->getFileInfo('sub1')->getId();
@@ -89,8 +92,10 @@ class EtagPropagation extends TestCase {
 		$view2->mkdir('/sub1/sub2');
 		$view2->rename('/folder', '/sub1/sub2/folder');
 		$insideInfo = $view2->getFileInfo('/sub1/sub2/folder/inside');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $insideInfo);
 		\OCP\Share::shareItem('folder', $insideInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER4, 31);
 		$folderInfo = $view2->getFileInfo('/directReshare');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
 		\OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER4, 31);
 		$this->fileIds[self::TEST_FILES_SHARING_API_USER2][''] = $view2->getFileInfo('')->getId();
 		$this->fileIds[self::TEST_FILES_SHARING_API_USER2]['sub1'] = $view2->getFileInfo('sub1')->getId();
@@ -260,6 +265,7 @@ class EtagPropagation extends TestCase {
 	public function testOwnerUnshares() {
 		$this->loginAsUser(self::TEST_FILES_SHARING_API_USER1);
 		$folderInfo = $this->rootView->getFileInfo('/' . self::TEST_FILES_SHARING_API_USER1 . '/files/sub1/sub2/folder');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
 		$folderId = $folderInfo->getId();
 		$this->assertTrue(
 			\OCP\Share::unshare(
diff --git a/apps/files_sharing/tests/sizepropagation.php b/apps/files_sharing/tests/sizepropagation.php
index f46d5a5a7ad..c596003de76 100644
--- a/apps/files_sharing/tests/sizepropagation.php
+++ b/apps/files_sharing/tests/sizepropagation.php
@@ -35,6 +35,7 @@ class SizePropagation extends TestCase {
 		$ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'bar');
 
 		$sharedFolderInfo = $ownerView->getFileInfo('/sharedfolder', false);
+		$this->assertInstanceOf('\OC\Files\FileInfo', $sharedFolderInfo);
 		\OCP\Share::shareItem('folder', $sharedFolderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER1, 31);
 		$ownerRootInfo = $ownerView->getFileInfo('', false);
 
@@ -67,6 +68,7 @@ class SizePropagation extends TestCase {
 		$ownerView->file_put_contents('/sharedfolder/subfolder/foo.txt', 'bar');
 
 		$sharedFolderInfo = $ownerView->getFileInfo('/sharedfolder', false);
+		$this->assertInstanceOf('\OC\Files\FileInfo', $sharedFolderInfo);
 		\OCP\Share::shareItem('folder', $sharedFolderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER1, 31);
 		$ownerRootInfo = $ownerView->getFileInfo('', false);
 
diff --git a/apps/files_versions/tests/command/expiretest.php b/apps/files_versions/tests/command/expiretest.php
index 247fb99b767..eb622689c33 100644
--- a/apps/files_versions/tests/command/expiretest.php
+++ b/apps/files_versions/tests/command/expiretest.php
@@ -26,7 +26,7 @@ use Test\TestCase;
 
 class ExpireTest extends TestCase {
 	public function testExpireNonExistingUser() {
-		$command = new Expire('test', '');
+		$command = new Expire($this->getUniqueID('test'), '');
 		$command->handle();
 
 		$this->assertTrue(true);
diff --git a/autotest.sh b/autotest.sh
index f69a9b34a48..42807b83e11 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -9,6 +9,7 @@
 # @author Andreas Fischer
 # @author Joas Schilling
 # @author Lukas Reschke
+# @author Jörn Friedrich Dreyer
 # @copyright 2012-2015 Thomas Müller thomas.mueller@tmit.eu
 #
 
@@ -21,6 +22,7 @@ DATABASEHOST=localhost
 ADMINLOGIN=admin$EXECUTOR_NUMBER
 BASEDIR=$PWD
 
+PRIMARY_STORAGE_CONFIGS="local swift"
 DBCONFIGS="sqlite mysql mariadb pgsql oci"
 
 # $PHP_EXE is run through 'which' and as such e.g. 'php' or 'hhvm' is usually
@@ -91,6 +93,22 @@ if [ "$1" ]; then
 		exit 2
 	fi
 fi
+if [ "$PRIMARY_STORAGE_CONFIG" ]; then
+	FOUND=0
+	for PSC in $PRIMARY_STORAGE_CONFIGS; do
+		if [ "$PRIMARY_STORAGE_CONFIG" = "$PSC" ]; then
+			FOUND=1
+			break
+		fi
+	done
+	if [ $FOUND = 0 ]; then
+		echo -e "Unknown primary storage config name \"$PRIMARY_STORAGE_CONFIG\"\n" >&2
+		print_syntax
+		exit 2
+	fi
+else
+	PRIMARY_STORAGE_CONFIG="local"
+fi
 
 # check for the presence of @since in all OCP methods
 $PHP build/OCPSinceChecker.php
@@ -101,12 +119,17 @@ if [ -f config/config.php ] && [ ! -f config/config-autotest-backup.php ]; then
 fi
 
 function cleanup_config {
+
 	if [ ! -z "$DOCKER_CONTAINER_ID" ]; then
 		echo "Kill the docker $DOCKER_CONTAINER_ID"
 		docker rm -f "$DOCKER_CONTAINER_ID"
 	fi
 
 	cd "$BASEDIR"
+	if [ "$PRIMARY_STORAGE_CONFIG" == "swift" ] ; then
+		echo "Kill the swift docker"
+		tests/objectstore/stop-swift-ceph.sh
+	fi
 	# Restore existing config
 	if [ -f config/config-autotest-backup.php ]; then
 		mv config/config-autotest-backup.php config/config.php
@@ -115,6 +138,10 @@ function cleanup_config {
 	if [ -f config/autoconfig.php ]; then
 		rm config/autoconfig.php
 	fi
+	# Remove autotest swift storage config
+	if [ -f config/autotest-storage-swift.config.php ]; then
+		rm config/autotest-storage-swift.config.php
+	fi
 }
 
 # restore config on exit
@@ -131,7 +158,7 @@ echo "Using database $DATABASENAME"
 
 function execute_tests {
 	DB=$1
-	echo "Setup environment for $DB testing ..."
+	echo "Setup environment for $DB testing on $PRIMARY_STORAGE_CONFIG storage ..."
 	# back to root folder
 	cd "$BASEDIR"
 
@@ -142,6 +169,10 @@ function execute_tests {
 	rm -rf "$DATADIR"
 	mkdir "$DATADIR"
 
+	if [ "$PRIMARY_STORAGE_CONFIG" == "swift" ] ; then
+		tests/objectstore/start-swift-ceph.sh
+		cp tests/objectstore/swift.config.php config/autotest-storage-swift.config.php
+	fi
 	cp tests/preseed-config.php config/config.php
 
 	_DB=$DB
@@ -238,6 +269,11 @@ function execute_tests {
 		RESULT=$?
 	fi
 
+	if [ "$PRIMARY_STORAGE_CONFIG" == "swift" ] ; then
+		echo "Kill the swift docker"
+		tests/objectstore/stop-swift-ceph.sh
+	fi
+
 	if [ ! -z "$DOCKER_CONTAINER_ID" ] ; then
 		echo "Kill the docker $DOCKER_CONTAINER_ID"
 		docker rm -f $DOCKER_CONTAINER_ID
diff --git a/tests/lib/files/objectstore/swift.php b/tests/lib/files/objectstore/swift.php
index 0aaf7d906dd..136d8d18039 100644
--- a/tests/lib/files/objectstore/swift.php
+++ b/tests/lib/files/objectstore/swift.php
@@ -23,9 +23,11 @@ namespace OCA\ObjectStore\Tests\Unit;
 use OC\Files\ObjectStore\ObjectStoreStorage;
 use OC\Files\ObjectStore\Swift as ObjectStoreToTest;
 
-//class Swift extends PHPUnit_Framework_TestCase {
 class Swift extends \Test\Files\Storage\Storage {
 
+	/**
+	 * @var ObjectStoreToTest
+	 */
 	private $objectStorage;
 
 	protected function setUp() {
@@ -35,9 +37,6 @@ class Swift extends \Test\Files\Storage\Storage {
 			$this->markTestSkipped('objectstore tests are unreliable in some environments');
 		}
 
-		\OC_App::disable('files_sharing');
-		\OC_App::disable('files_versions');
-
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -50,28 +49,15 @@ class Swift extends \Test\Files\Storage\Storage {
 		}
 
 		// main test user
-		$userName = 'test';
 		\OC_Util::tearDownFS();
 		\OC_User::setUserId('');
 		\OC\Files\Filesystem::tearDown();
 		\OC_User::setUserId('test');
 
-		$testContainer = 'oc-test-container-'.substr( md5(rand()), 0, 7);
-
-		$params = array(
-			'username' => 'facebook100000330192569',
-			'password' => 'Dbdj1sXnRSHxIGc4',
-			'container' => $testContainer,
-			'autocreate' => true,
-			'region' => 'RegionOne', //required, trystack defaults to 'RegionOne'
-			'url' => 'http://8.21.28.222:5000/v2.0', // The Identity / Keystone endpoint
-			'tenantName' => 'facebook100000330192569', // required on trystack
-			'serviceName' => 'swift', //trystack uses swift by default, the lib defaults to 'cloudFiles' if omitted
-			'user' => \OC_User::getManager()->get($userName)
-		);
-		$this->objectStorage = new ObjectStoreToTest($params);
-		$params['objectstore'] = $this->objectStorage;
-		$this->instance = new ObjectStoreStorage($params);
+		$config = \OC::$server->getConfig()->getSystemValue('objectstore');
+		$this->objectStorage = new ObjectStoreToTest($config['arguments']);
+		$config['objectstore'] = $this->objectStorage;
+		$this->instance = new ObjectStoreStorage($config);
 	}
 
 	protected function tearDown() {
@@ -81,6 +67,10 @@ class Swift extends \Test\Files\Storage\Storage {
 		$this->objectStorage->deleteContainer(true);
 		$this->instance->getCache()->clear();
 
+		$users = array('test');
+		foreach($users as $userName) {
+			\OC_User::deleteUser($userName);
+		}
 		parent::tearDown();
 	}
 
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 2ca54390e65..4cb0577cc8c 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -405,6 +405,7 @@ class Test_Share extends \Test\TestCase {
 		$view->mkdir('files_trashbin/files');
 
 		$fileInfo = $view->getFileInfo('files/test/sub');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
 		$fileId = $fileInfo->getId();
 
 		$this->assertTrue(
@@ -509,6 +510,7 @@ class Test_Share extends \Test\TestCase {
 		$view->mkdir('files/test/sub1/sub2');
 
 		$fileInfo = $view->getFileInfo('files/test/sub1');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
 		$fileId = $fileInfo->getId();
 
 		$this->assertTrue(
@@ -521,6 +523,7 @@ class Test_Share extends \Test\TestCase {
 		$this->assertEquals(\OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_CREATE, $result['permissions']);
 
 		$fileInfo = $view->getFileInfo('files/test/sub1/sub2');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
 		$fileId = $fileInfo->getId();
 
 		$this->assertTrue(
@@ -541,9 +544,11 @@ class Test_Share extends \Test\TestCase {
 		$view->file_put_contents('files/test/sub1/file.txt', 'abc');
 
 		$folderInfo = $view->getFileInfo('files/test/sub1');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $folderInfo);
 		$folderId = $folderInfo->getId();
 
 		$fileInfo = $view->getFileInfo('files/test/sub1/file.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $fileInfo);
 		$fileId = $fileInfo->getId();
 
 		$this->assertTrue(
diff --git a/tests/objectstore/entrypoint.sh b/tests/objectstore/entrypoint.sh
new file mode 100755
index 00000000000..b490d760a2f
--- /dev/null
+++ b/tests/objectstore/entrypoint.sh
@@ -0,0 +1,271 @@
+#!/bin/bash
+set -e
+
+: ${CLUSTER:=ceph}
+: ${RGW_NAME:=$(hostname -s)}
+: ${MON_NAME:=$(hostname -s)}
+: ${RGW_CIVETWEB_PORT:=80}
+: ${OSD_SIZE:=100}
+
+: ${KEYSTONE_ADMIN_TOKEN:=admin}
+: ${KEYSTONE_ADMIN_PORT:=35357}
+: ${KEYSTONE_PUBLIC_PORT:=5001}
+
+: ${KEYSTONE_SERVICE:=${CLUSTER}}
+: ${KEYSTONE_ENDPOINT_REGION:=region}
+
+: ${KEYSTONE_ADMIN_USER:=admin}
+: ${KEYSTONE_ADMIN_TENANT:=admin}
+: ${KEYSTONE_ADMIN_PASS:=admin}
+
+ip_address=$(head -n1 /etc/hosts | cut -d"	" -f1)
+: ${MON_IP:=${ip_address}}
+subnet=$(ip route | grep "src ${ip_address}" | cut -d" " -f1)
+: ${CEPH_NETWORK:=${subnet}}
+
+#######
+# MON #
+#######
+
+if [ ! -n "$CEPH_NETWORK" ]; then
+   echo "ERROR- CEPH_NETWORK must be defined as the name of the network for the OSDs"
+   exit 1
+fi
+
+if [ ! -n "$MON_IP" ]; then
+   echo "ERROR- MON_IP must be defined as the IP address of the monitor"
+   exit 1
+fi
+
+# bootstrap MON
+if [ ! -e /etc/ceph/ceph.conf ]; then
+   fsid=$(uuidgen)
+   cat <<ENDHERE >/etc/ceph/${CLUSTER}.conf
+[global]
+fsid = $fsid
+mon initial members = ${MON_NAME}
+mon host = ${MON_IP}
+auth cluster required = cephx
+auth service required = cephx
+auth client required = cephx
+osd crush chooseleaf type = 0
+osd journal size = 100
+osd pool default pg num = 8
+osd pool default pgp num = 8
+osd pool default size = 1
+public network = ${CEPH_NETWORK}
+cluster network = ${CEPH_NETWORK}
+debug ms = 1
+
+[mon]
+debug mon = 20
+debug paxos = 20
+debug auth = 20
+
+[osd]
+debug osd = 20
+debug filestore = 20
+debug journal = 20
+debug monc = 20
+
+[mds]
+debug mds = 20
+debug mds balancer = 20
+debug mds log = 20
+debug mds migrator = 20
+
+[client.radosgw.gateway]
+rgw keystone url = http://${MON_IP}:${KEYSTONE_ADMIN_PORT}
+rgw keystone admin token = ${KEYSTONE_ADMIN_TOKEN}
+rgw keystone accepted roles = _member_
+ENDHERE
+
+   # Generate administrator key
+   ceph-authtool /etc/ceph/${CLUSTER}.client.admin.keyring --create-keyring --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow'
+
+   # Generate the mon. key
+   ceph-authtool /etc/ceph/${CLUSTER}.mon.keyring --create-keyring --gen-key -n mon. --cap mon 'allow *'
+
+   # Generate initial monitor map
+   monmaptool --create --add ${MON_NAME} ${MON_IP} --fsid ${fsid} /etc/ceph/monmap
+fi
+
+# If we don't have a monitor keyring, this is a new monitor
+if [ ! -e /var/lib/ceph/mon/${CLUSTER}-${MON_NAME}/keyring ]; then
+
+   if [ ! -e /etc/ceph/${CLUSTER}.client.admin.keyring ]; then
+      echo "ERROR- /etc/ceph/${CLUSTER}.client.admin.keyring must exist; get it from your existing mon"
+      exit 2
+   fi
+
+   if [ ! -e /etc/ceph/${CLUSTER}.mon.keyring ]; then
+      echo "ERROR- /etc/ceph/${CLUSTER}.mon.keyring must exist.  You can extract it from your current monitor by running 'ceph auth get mon. -o /tmp/${CLUSTER}.mon.keyring'"
+      exit 3
+   fi
+
+   if [ ! -e /etc/ceph/monmap ]; then
+      echo "ERROR- /etc/ceph/monmap must exist.  You can extract it from your current monitor by running 'ceph mon getmap -o /tmp/monmap'"
+      exit 4
+   fi
+
+   # Import the client.admin keyring and the monitor keyring into a new, temporary one
+   ceph-authtool /tmp/${CLUSTER}.mon.keyring --create-keyring --import-keyring /etc/ceph/${CLUSTER}.client.admin.keyring
+   ceph-authtool /tmp/${CLUSTER}.mon.keyring --import-keyring /etc/ceph/${CLUSTER}.mon.keyring
+
+   # Make the monitor directory
+   mkdir -p /var/lib/ceph/mon/${CLUSTER}-${MON_NAME}
+
+   # Prepare the monitor daemon's directory with the map and keyring
+   ceph-mon --mkfs -i ${MON_NAME} --monmap /etc/ceph/monmap --keyring /tmp/${CLUSTER}.mon.keyring
+
+   # Clean up the temporary key
+   rm /tmp/${CLUSTER}.mon.keyring
+fi
+
+# start MON
+ceph-mon -i ${MON_NAME} --public-addr ${MON_IP}:6789
+
+# change replica size
+ceph osd pool set rbd size 1
+
+
+#######
+# OSD #
+#######
+
+if [ ! -e /var/lib/ceph/osd/${CLUSTER}-0/keyring ]; then
+  # bootstrap OSD
+  mkdir -p /var/lib/ceph/osd/${CLUSTER}-0
+  # HACK create btrfs loopback device
+  echo "creating osd storage image"
+  dd if=/dev/zero of=/tmp/osddata bs=1M count=${OSD_SIZE}
+  mkfs.btrfs /tmp/osddata
+  echo "mounting via loopback"
+  mount -o loop /tmp/osddata /var/lib/ceph/osd/${CLUSTER}-0
+  echo "now mounted:"
+  mount
+  # end HACK
+  echo "creating osd"
+  ceph osd create
+  echo "creating osd filesystem"
+  ceph-osd -i 0 --mkfs
+  echo "creating osd keyring"
+  ceph auth get-or-create osd.0 osd 'allow *' mon 'allow profile osd' -o /var/lib/ceph/osd/${CLUSTER}-0/keyring
+  echo "configuring osd crush"
+  ceph osd crush add 0 1 root=default host=$(hostname -s)
+  echo "adding osd keyring"
+  ceph-osd -i 0 -k /var/lib/ceph/osd/${CLUSTER}-0/keyring
+fi
+
+# start OSD
+echo "starting osd"
+ceph-osd --cluster=${CLUSTER} -i 0
+
+#sleep 10
+
+#######
+# MDS #
+#######
+
+if [ ! -e /var/lib/ceph/mds/${CLUSTER}-0/keyring ]; then
+  # create ceph filesystem
+  echo "creating osd pool"
+  ceph osd pool create cephfs_data 8
+  echo "creating osd pool metadata"
+  ceph osd pool create cephfs_metadata 8
+  echo "creating cephfs"
+  ceph fs new cephfs cephfs_metadata cephfs_data
+
+  # bootstrap MDS
+  mkdir -p /var/lib/ceph/mds/${CLUSTER}-0
+  echo "creating mds auth"
+  ceph auth get-or-create mds.0 mds 'allow' osd 'allow *' mon 'allow profile mds' > /var/lib/ceph/mds/${CLUSTER}-0/keyring
+fi
+
+# start MDS
+echo "starting mds"
+ceph-mds --cluster=${CLUSTER} -i 0
+
+#sleep 10
+
+
+#######
+# RGW #
+#######
+
+if [ ! -e /var/lib/ceph/radosgw/${RGW_NAME}/keyring ]; then
+  # bootstrap RGW
+  mkdir -p /var/lib/ceph/radosgw/${RGW_NAME}
+  echo "creating rgw auth"
+  ceph auth get-or-create client.radosgw.gateway osd 'allow rwx' mon 'allow rw' -o /var/lib/ceph/radosgw/${RGW_NAME}/keyring
+fi
+
+# start RGW
+echo "starting rgw"
+radosgw -c /etc/ceph/ceph.conf -n client.radosgw.gateway -k /var/lib/ceph/radosgw/${RGW_NAME}/keyring --rgw-socket-path="" --rgw-frontends="civetweb port=${RGW_CIVETWEB_PORT}"
+
+
+#######
+# API #
+#######
+
+# start ceph-rest-api
+echo "starting rest api"
+ceph-rest-api -n client.admin &
+
+############
+# Keystone #
+############
+
+if [ ! -e /etc/keystone/${CLUSTER}.conf ]; then
+  cat <<ENDHERE > /etc/keystone/${CLUSTER}.conf
+[DEFAULT]
+admin_token=${KEYSTONE_ADMIN_TOKEN}
+admin_port=${KEYSTONE_ADMIN_PORT}
+public_port=${KEYSTONE_PUBLIC_PORT}
+
+[database]
+connection = sqlite:////var/lib/keystone/keystone.db
+ENDHERE
+
+  # start Keystone
+  echo "starting keystone"
+  keystone-all --config-file /etc/keystone/${CLUSTER}.conf &
+
+  # wait until up
+  while ! nc ${MON_IP} ${KEYSTONE_ADMIN_PORT} </dev/null; do
+    sleep 1
+  done
+
+  export OS_SERVICE_TOKEN=${KEYSTONE_ADMIN_TOKEN}
+  export OS_SERVICE_ENDPOINT=http://${MON_IP}:${KEYSTONE_ADMIN_PORT}/v2.0
+
+  echo "creating keystone service ${KEYSTONE_SERVICE}"
+  keystone service-create --name ${KEYSTONE_SERVICE} --type object-store
+  echo "creating keystone endpoint ${KEYSTONE_SERVICE}"
+  keystone endpoint-create --service ${KEYSTONE_SERVICE} \
+    --region ${KEYSTONE_ENDPOINT_REGION} \
+    --publicurl http://${MON_IP}:${RGW_CIVETWEB_PORT}/swift/v1 \
+    --internalurl http://${MON_IP}:${RGW_CIVETWEB_PORT}/swift/v1 \
+    --adminurl http://${MON_IP}:${RGW_CIVETWEB_PORT}/swift/v1
+
+  echo "creating keystone user ${KEYSTONE_ADMIN_USER}"
+  keystone user-create --name=${KEYSTONE_ADMIN_USER} --pass=${KEYSTONE_ADMIN_PASS} --email=dev@null.com
+  echo "creating keystone tenant ${KEYSTONE_ADMIN_TENANT}"
+  keystone tenant-create --name=${KEYSTONE_ADMIN_TENANT} --description=admin
+  echo "adding keystone role _member_"
+  keystone user-role-add --user=${KEYSTONE_ADMIN_USER} --tenant=${KEYSTONE_ADMIN_TENANT} --role=_member_
+
+  echo "creating keystone role admin"
+  keystone role-create --name=admin
+  echo "adding keystone role admin"
+  keystone user-role-add --user=${KEYSTONE_ADMIN_USER} --tenant=${KEYSTONE_ADMIN_TENANT} --role=admin
+fi
+
+
+#########
+# WATCH #
+#########
+
+echo "watching ceph"
+exec ceph -w
\ No newline at end of file
diff --git a/tests/objectstore/start-swift-ceph.sh b/tests/objectstore/start-swift-ceph.sh
new file mode 100755
index 00000000000..91a813f8bb3
--- /dev/null
+++ b/tests/objectstore/start-swift-ceph.sh
@@ -0,0 +1,108 @@
+#!/bin/bash
+#
+# ownCloud
+#
+# This script start a docker container to test the files_external tests
+# against. It will also change the files_external config to use the docker
+# container as testing environment. This is reverted in the stop step.W
+#
+# Set environment variable DEBUG to print config file
+#
+# @author Morris Jobke
+# @author Robin McCorkell
+# @copyright 2015 ownCloud
+
+if ! command -v docker >/dev/null 2>&1; then
+    echo "No docker executable found - skipped docker setup"
+    exit 0;
+fi
+
+echo "Docker executable found - setup docker"
+
+
+docker_image=xenopathic/ceph-keystone
+
+echo "Fetch recent ${docker_image} docker image"
+docker pull ${docker_image}
+
+# retrieve current folder to place the config in the parent folder
+thisFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+port=5034
+
+user=test
+pass=testing
+tenant=testenant
+region=testregion
+service=testceph
+
+container=`docker run -d \
+    -e KEYSTONE_PUBLIC_PORT=${port} \
+    -e KEYSTONE_ADMIN_USER=${user} \
+    -e KEYSTONE_ADMIN_PASS=${pass} \
+    -e KEYSTONE_ADMIN_TENANT=${tenant} \
+    -e KEYSTONE_ENDPOINT_REGION=${region} \
+    -e KEYSTONE_SERVICE=${service} \
+    -e OSD_SIZE=300 \
+    -v ${thisFolder}/entrypoint.sh:/entrypoint.sh \
+    --privileged \
+    --entrypoint /entrypoint.sh ${docker_image}`
+
+host=`docker inspect $container | grep IPAddress | cut -d '"' -f 4`
+
+
+echo "${docker_image} container: $container"
+
+# put container IDs into a file to drop them after the test run (keep in mind that multiple tests run in parallel on the same host)
+echo $container >> $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift
+
+echo -n "Waiting for ceph initialization"
+starttime=$(date +%s)
+# support for GNU netcat and BSD netcat
+while ! (nc -c -w 1 ${host} 80 </dev/null >&/dev/null \
+    || nc -w 1 ${host} 80 </dev/null >&/dev/null); do
+    sleep 1
+    echo -n '.'
+    if (( $(date +%s) > starttime + 160 )); then
+	echo
+	echo "[ERROR] Waited 120 seconds, no response" >&2
+	exit 1
+    fi
+done
+echo
+sleep 20 # the keystone server also needs some time to fully initialize
+
+cat > $thisFolder/swift.config.php <<DELIM
+<?php
+\$CONFIG = array (
+'objectstore' => array(
+	'class' => 'OC\\Files\\ObjectStore\\Swift',
+	'arguments' => array(
+		'username' => '$user',
+		'password' => '$pass',
+		'container' => 'owncloud-autotest$EXECUTOR_NUMBER',
+		'autocreate' => true,
+		'region' => '$region',
+		'url' => 'http://$host:$port/v2.0',
+		'tenantName' => '$tenant',
+		'serviceName' => '$service',
+	),
+),
+);
+
+DELIM
+
+if [ -n "$DEBUG" ]; then
+    echo "############## DEBUG info ###############"
+    echo "### Docker info"
+    docker info
+    echo "### Docker images"
+    docker images
+    echo "### current mountpoints"
+    mount
+    echo "### contents of $thisFolder/swift.config.php"
+    cat $thisFolder/swift.config.php
+    echo "### contents of $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift"
+    cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift
+    echo "############## DEBUG info end ###########"
+fi
diff --git a/tests/objectstore/stop-swift-ceph.sh b/tests/objectstore/stop-swift-ceph.sh
new file mode 100755
index 00000000000..fcf5fdfdcd7
--- /dev/null
+++ b/tests/objectstore/stop-swift-ceph.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# ownCloud
+#
+# This script stops the docker container the files_external tests were run
+# against. It will also revert the config changes done in start step.
+#
+# @author Morris Jobke
+# @author Robin McCorkell
+# @copyright 2015 ownCloud
+
+if ! command -v docker >/dev/null 2>&1; then
+    echo "No docker executable found - skipped docker stop"
+    exit 0;
+fi
+
+echo "Docker executable found - stop and remove docker containers"
+
+# retrieve current folder to remove the config from the parent folder
+thisFolder=`echo $0 | replace "stop-swift-ceph.sh" ""`
+
+if [ -z "$thisFolder" ]; then
+    thisFolder="."
+fi;
+
+# stopping and removing docker containers
+for container in `cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift`; do
+    if [ -n "$DEBUG" ]; then
+        docker logs $container
+    fi
+    echo "Stopping and removing docker container $container"
+    # kills running container and removes it
+    docker rm -f $container
+done;
+
+# cleanup
+rm $thisFolder/swift.config.php
+rm $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift
\ No newline at end of file
-- 
GitLab


From d3c1fcf9615339786d3134b8b30d150f9a80f89d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 6 Oct 2015 16:33:37 +0200
Subject: [PATCH 729/783] Fix getEtag for roots of shared storages

---
 apps/files_sharing/lib/sharedstorage.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 27dd2f1e485..b0e56f5f054 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -583,9 +583,6 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	}
 
 	public function getETag($path) {
-		if ($path == '') {
-			$path = $this->getMountPoint();
-		}
 		if ($source = $this->getSourcePath($path)) {
 			list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source);
 			return $storage->getETag($internalPath);
-- 
GitLab


From 17756ebf5bb7c2bdf9e949f3fc517c39ed284600 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 6 Oct 2015 16:37:43 +0200
Subject: [PATCH 730/783] fix phpdoc

---
 apps/files_sharing/lib/propagation/recipientpropagator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/propagation/recipientpropagator.php b/apps/files_sharing/lib/propagation/recipientpropagator.php
index 420cacb3d2f..8e064e2ee54 100644
--- a/apps/files_sharing/lib/propagation/recipientpropagator.php
+++ b/apps/files_sharing/lib/propagation/recipientpropagator.php
@@ -105,7 +105,7 @@ class RecipientPropagator {
 
 	/**
 	 * @param array $share
-	 * @param int $time
+	 * @param float $time
 	 */
 	public function markDirty($share, $time = null) {
 		if ($time === null) {
-- 
GitLab


From c1a5e9643589233e0e4e131f1b2808c40370cec9 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Tue, 6 Oct 2015 16:17:25 +0200
Subject: [PATCH 731/783] fix scrollbars in public template

---
 apps/files_sharing/css/public.css       |  5 +-
 apps/files_sharing/templates/public.php | 63 +++++++++++++------------
 core/css/styles.css                     |  2 +-
 3 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 2b7e84c987d..17356640aef 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -1,7 +1,10 @@
+#content {
+	height: initial;
+}
+
 #preview {
 	background: #fff;
 	text-align: center;
-	margin: 45px auto 0;
 	min-height: 200px;
 }
 
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 06d797c3c6f..b5dd653d718 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -86,38 +86,39 @@ $thumbSize = 1024;
 				</a>
 			</span>
 		</div>
-	</div></header>
-<div id="content">
-	<div id="preview">
-		<?php if (isset($_['folder'])): ?>
-			<?php print_unescaped($_['folder']); ?>
-		<?php else: ?>
-			<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
-				<div id="imgframe">
-					<video tabindex="0" controls="" preload="none">
-						<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
-					</video>
-				</div>
+</div></header>
+<div id="content-wrapper">
+	<div id="content">
+		<div id="preview">
+			<?php if (isset($_['folder'])): ?>
+				<?php print_unescaped($_['folder']); ?>
 			<?php else: ?>
-				<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
-				<div id="imgframe"></div>
+				<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
+					<div id="imgframe">
+						<video tabindex="0" controls="" preload="none">
+							<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
+						</video>
+					</div>
+				<?php else: ?>
+					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
+					<div id="imgframe"></div>
+				<?php endif; ?>
+				<div class="directDownload">
+					<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
+						<img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/>
+						<?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>)
+					</a>
+				</div>
+				<div class="directLink">
+					<label for="directLink"><?php p($l->t('Direct link')) ?></label>
+					<input id="directLink" type="text" readonly value="<?php p($_['downloadURL']); ?>">
+				</div>
 			<?php endif; ?>
-			<div class="directDownload">
-				<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
-					<img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/>
-					<?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>)
-				</a>
-			</div>
-			<div class="directLink">
-				<label for="directLink"><?php p($l->t('Direct link')) ?></label>
-				<input id="directLink" type="text" readonly value="<?php p($_['downloadURL']); ?>">
-			</div>
-		<?php endif; ?>
+		</div>
 	</div>
-
+	<footer>
+		<p class="info">
+			<?php print_unescaped($theme->getLongFooter()); ?>
+		</p>
+	</footer>
 </div>
-<footer>
-	<p class="info">
-		<?php print_unescaped($theme->getLongFooter()); ?>
-	</p>
-</footer>
diff --git a/core/css/styles.css b/core/css/styles.css
index df533aab318..1384f6403e8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -1164,7 +1164,7 @@ div.crumb:active {
 
 /* public footer */
 #body-public footer {
-	margin-top: 65px;
+	position: relative;
 	text-align: center;
 }
 
-- 
GitLab


From bbebffb60cef91553a7d73d7059c1e9278b1c3cb Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 6 Oct 2015 16:47:59 +0200
Subject: [PATCH 732/783] Remove oc_storages entries after removing ext
 storages

When removing external storages, either system-wide or user-wide,
automatically remove the matching oc_storages and oc_filecache entries.

This can only work if the backend configuration doesn't contain any
substitution variable $user in which case the storage id cannot be
computed, so this case is ignored for now.
---
 .../service/storagesservice.php               | 41 +++++++++++++++
 .../tests/service/storagesservicetest.php     | 50 ++++++++++++++++++-
 .../tests/service/userstoragesservicetest.php |  7 ++-
 3 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index d5260a066cd..41bb0ca9b80 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -550,6 +550,21 @@ abstract class StoragesService {
 		$this->writeConfig($allStorages);
 
 		$this->triggerHooks($deletedStorage, Filesystem::signal_delete_mount);
+
+		// delete oc_storages entries and oc_filecache
+		try {
+			$rustyStorageId = $this->getRustyStorageIdFromConfig($deletedStorage);
+			\OC\Files\Cache\Storage::remove($rustyStorageId);
+		} catch (\Exception $e) {
+			// can happen either for invalid configs where the storage could not
+			// be instantiated or whenever $user vars where used, in which case
+			// the storage id could not be computed
+			\OCP\Util::writeLog(
+				'files_external',
+				'Exception: "' . $e->getMessage() . '"',
+				\OCP\Util::ERROR
+			);
+		}
 	}
 
 	/**
@@ -570,4 +585,30 @@ abstract class StoragesService {
 		return (max(array_keys($allStorages)) + 1);
 	}
 
+	/**
+	 * Returns the rusty storage id from oc_storages from the given storage config.
+	 *
+	 * @param StorageConfig $storageConfig
+	 * @return string rusty storage id
+	 */
+	private function getRustyStorageIdFromConfig(StorageConfig $storageConfig) {
+		// if any of the storage options contains $user, it is not possible
+		// to compute the possible storage id as we don't know which users
+		// mounted it already (and we certainly don't want to iterate over ALL users)
+		foreach ($storageConfig->getBackendOptions() as $value) {
+			if (strpos($value, '$user') !== false) {
+				throw new \Exception('Cannot compute storage id for deletion due to $user vars in the configuration');
+			}
+		}
+
+		// note: similar to ConfigAdapter->prepateStorageConfig()
+		$storageConfig->getAuthMechanism()->manipulateStorageConfig($storageConfig);
+		$storageConfig->getBackend()->manipulateStorageConfig($storageConfig);
+
+		$class = $storageConfig->getBackend()->getStorageClass();
+		$storageImpl = new $class($storageConfig->getBackendOptions());
+
+		return $storageImpl->getId();
+	}
+
 }
diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/service/storagesservicetest.php
index 1bec543ff4c..7487ba459af 100644
--- a/apps/files_external/tests/service/storagesservicetest.php
+++ b/apps/files_external/tests/service/storagesservicetest.php
@@ -216,18 +216,57 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 		$this->service->updateStorage($storage);
 	}
 
-	public function testDeleteStorage() {
+	public function deleteStorageDataProvider() {
+		return [
+			// regular case, can properly delete the oc_storages entry
+			[
+				[
+					'share' => 'share',
+					'host' => 'example.com',
+					'user' => 'test',
+					'password' => 'testPassword',
+					'root' => 'someroot',
+				],
+				'smb::test@example.com//share//someroot/',
+				0
+			],
+			// special case with $user vars, cannot auto-remove the oc_storages entry
+			[
+				[
+					'share' => 'share',
+					'host' => 'example.com',
+					'user' => '$user',
+					'password' => 'testPassword',
+					'root' => 'someroot',
+				],
+				'smb::someone@example.com//share//someroot/',
+				1
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider deleteStorageDataProvider
+	 */
+	public function testDeleteStorage($backendOptions, $rustyStorageId, $expectedCountAfterDeletion) {
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
 		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
 		$storage = new StorageConfig(255);
 		$storage->setMountPoint('mountpoint');
 		$storage->setBackend($backend);
 		$storage->setAuthMechanism($authMechanism);
-		$storage->setBackendOptions(['password' => 'testPassword']);
+		$storage->setBackendOptions($backendOptions);
 
 		$newStorage = $this->service->addStorage($storage);
 		$this->assertEquals(1, $newStorage->getId());
 
+		// manually trigger storage entry because normally it happens on first
+		// access, which isn't possible within this test
+		$storageCache = new \OC\Files\Cache\Storage($rustyStorageId);
+
+		// get numeric id for later check
+		$numericId = $storageCache->getNumericId();
+
 		$newStorage = $this->service->removeStorage(1);
 
 		$caught = false;
@@ -238,6 +277,13 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 		}
 
 		$this->assertTrue($caught);
+
+		// storage id was removed from oc_storages
+		$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$storageCheckQuery = $qb->select('*')
+			->from('storages')
+			->where($qb->expr()->eq('numeric_id', $qb->expr()->literal($numericId)));
+		$this->assertCount($expectedCountAfterDeletion, $storageCheckQuery->execute()->fetchAll());
 	}
 
 	/**
diff --git a/apps/files_external/tests/service/userstoragesservicetest.php b/apps/files_external/tests/service/userstoragesservicetest.php
index f829f73f050..78f9231c3d1 100644
--- a/apps/files_external/tests/service/userstoragesservicetest.php
+++ b/apps/files_external/tests/service/userstoragesservicetest.php
@@ -138,8 +138,11 @@ class UserStoragesServiceTest extends StoragesServiceTest {
 		$this->assertEmpty(self::$hookCalls);
 	}
 
-	public function testDeleteStorage() {
-		parent::testDeleteStorage();
+	/**
+	 * @dataProvider deleteStorageDataProvider
+	 */
+	public function testDeleteStorage($backendOptions, $rustyStorageId, $expectedCountAfterDeletion) {
+		parent::testDeleteStorage($backendOptions, $rustyStorageId, $expectedCountAfterDeletion);
 
 		// hook called once for user (first one was during test creation)
 		$this->assertHookCall(
-- 
GitLab


From bb9f5686543531ccb55a59eb003cd6f83991b398 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Tue, 6 Oct 2015 16:37:55 +0000
Subject: [PATCH 733/783] lists getting ready

---
 .../features/bootstrap/FeatureContext.php     | 37 +++++++++++++++++++
 .../features/provisioning-v1.feature          |  7 ++++
 2 files changed, 44 insertions(+)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index 9676fc8ca40..99d030fa6fc 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -58,6 +58,43 @@ class FeatureContext extends BehatContext {
 		return $response->xml()->meta[0]->statuscode;
 	}
 
+	/**
+    *  Parses the xml answer to get the array of users returned.
+    */
+    public function getArrayOfUsersResponded($resp) {
+        $listCheckedElements = $resp->xml()->data[0]->users[0]->element;
+        $extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1);
+        return $extractedElementsArray;
+    }
+
+    
+    /**
+    *  Parses the xml answer to get the array of groups returned.
+    */
+    /*
+    public function getArrayOfGroupsResponded(){
+        $listCheckedElements = $this->$response->xml()->data[0]->groups[0]->element;
+        $extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1);
+        return $extractedElementsArray;
+    }
+	*/
+    
+
+
+	/**
+	 * @Then /^users returned are$/
+	 * @param \Behat\Gherkin\Node\TableNode|null $formData
+	 */
+	public function theUsersShouldBe($usersList) {
+		if ($usersList instanceof \Behat\Gherkin\Node\TableNode) {
+			$users = $usersList->getRows()[0];
+            $respondedArray = $this->getArrayOfUsersResponded($this->response);
+            PHPUnit_Framework_Assert::assertEquals($users, $respondedArray);
+		}
+
+	}
+		
+
 	/**
 	 * @Then /^the OCS status code should be "([^"]*)"$/
 	 */
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 823fd823c5e..448c06b8b51 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -40,6 +40,13 @@ Feature: provisioning
     And the HTTP status code should be "200"
 
 
+  Scenario: Getting all users
+    Given As an "admin"
+    When sending "GET" to "/cloud/users"
+    And users returned are
+      | brand-new-user | ser507 |
+
+
   Scenario: Edit a user
     Given As an "admin"
     And user "brand-new-user" exists
-- 
GitLab


From 58b85714547b12b32a71b6cbab51c8229e355827 Mon Sep 17 00:00:00 2001
From: C Montero-Luque <cml@owncloud.com>
Date: Tue, 6 Oct 2015 13:17:12 -0400
Subject: [PATCH 734/783] 8.2 RC1

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index c84d8c5edf8..458cb6389f5 100644
--- a/version.php
+++ b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(8, 2, 0, 8);
+$OC_Version = array(8, 2, 0, 9);
 
 // The human readable string
-$OC_VersionString = '8.2 beta1';
+$OC_VersionString = '8.2 RC1';
 
 $OC_VersionCanBeUpgradedFrom = array(8, 1);
 
-- 
GitLab


From e7b2da79ecd17cba4dff7fa47b6d4ff71ba8c54e Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Tue, 6 Oct 2015 23:55:56 +0200
Subject: [PATCH 735/783] fix public empty message

---
 apps/files_sharing/css/public.css | 1 -
 core/css/styles.css               | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 17356640aef..95013e0a352 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -5,7 +5,6 @@
 #preview {
 	background: #fff;
 	text-align: center;
-	min-height: 200px;
 }
 
 #preview .notCreatable {
diff --git a/core/css/styles.css b/core/css/styles.css
index 1384f6403e8..ee61fc86e31 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -425,9 +425,9 @@ input[type="submit"].enabled {
 .emptycontent {
 	font-size: 16px;
 	color: #888;
-	position: absolute;
 	text-align: center;
-	top: 30%;
+	margin-top: 100px; /* ie8 */
+	margin-top: 30vh;
 	width: 100%;
 }
 #emptycontent h2,
-- 
GitLab


From e1286a4151c1ad2c2cbdbd16255a4eaa16254776 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Wed, 7 Oct 2015 00:22:02 +0200
Subject: [PATCH 736/783] fix footer in public gallery

---
 core/css/styles.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index ee61fc86e31..3d68a591522 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -404,8 +404,7 @@ input[type="submit"].enabled {
 	width: 100%;
 }
 #content .hascontrols {
-	position: relative;
-	top: 45px;
+	margin-top: 45px;
 }
 #content-wrapper {
 	position: absolute;
-- 
GitLab


From cd818e7419fb39d97683ecc5803534b0ed632596 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 7 Oct 2015 01:55:56 -0400
Subject: [PATCH 737/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/ru.js         |   3 +
 apps/encryption/l10n/ru.json       |   3 +
 apps/files/l10n/fr.js              |   2 +-
 apps/files/l10n/fr.json            |   2 +-
 apps/files/l10n/hu_HU.js           |   3 +
 apps/files/l10n/hu_HU.json         |   3 +
 apps/files/l10n/nds.js             |   9 ++-
 apps/files/l10n/nds.json           |   9 ++-
 apps/files/l10n/ru.js              |   5 ++
 apps/files/l10n/ru.json            |   5 ++
 apps/files_external/l10n/nds.js    | 102 ++++++++++++++++++++++++++
 apps/files_external/l10n/nds.json  | 100 +++++++++++++++++++++++++
 apps/files_external/l10n/ru.js     |  31 ++++++++
 apps/files_external/l10n/ru.json   |  31 ++++++++
 apps/files_sharing/l10n/hu_HU.js   |   8 ++
 apps/files_sharing/l10n/hu_HU.json |   8 ++
 apps/files_sharing/l10n/nds.js     |   8 ++
 apps/files_sharing/l10n/nds.json   |   6 ++
 apps/files_sharing/l10n/ru.js      |  14 ++++
 apps/files_sharing/l10n/ru.json    |  14 ++++
 apps/files_trashbin/l10n/nds.js    |   7 ++
 apps/files_trashbin/l10n/nds.json  |   5 ++
 apps/user_ldap/l10n/nds.js         |   6 +-
 apps/user_ldap/l10n/nds.json       |   6 +-
 apps/user_ldap/l10n/pt_PT.js       |   4 +
 apps/user_ldap/l10n/pt_PT.json     |   4 +
 core/l10n/de.js                    |   8 +-
 core/l10n/de.json                  |   8 +-
 core/l10n/de_DE.js                 |  12 ++-
 core/l10n/de_DE.json               |  12 ++-
 core/l10n/el.js                    |   1 +
 core/l10n/el.json                  |   1 +
 core/l10n/hu_HU.js                 |   1 +
 core/l10n/hu_HU.json               |   1 +
 core/l10n/nds.js                   | 113 ++++++++++++++++++++++++++++-
 core/l10n/nds.json                 | 113 ++++++++++++++++++++++++++++-
 core/l10n/ru.js                    |  21 ++++++
 core/l10n/ru.json                  |  21 ++++++
 lib/l10n/nds.js                    |   9 +--
 lib/l10n/nds.json                  |   9 +--
 lib/l10n/ru.js                     |   2 +
 lib/l10n/ru.json                   |   2 +
 settings/l10n/de.js                |   4 +-
 settings/l10n/de.json              |   4 +-
 settings/l10n/de_DE.js             |   2 +-
 settings/l10n/de_DE.json           |   2 +-
 settings/l10n/nds.js               |  19 +++++
 settings/l10n/nds.json             |  17 +++++
 settings/l10n/ru.js                |  11 +++
 settings/l10n/ru.json              |  11 +++
 50 files changed, 754 insertions(+), 48 deletions(-)
 create mode 100644 apps/files_external/l10n/nds.js
 create mode 100644 apps/files_external/l10n/nds.json
 create mode 100644 apps/files_sharing/l10n/nds.js
 create mode 100644 apps/files_sharing/l10n/nds.json
 create mode 100644 apps/files_trashbin/l10n/nds.js
 create mode 100644 apps/files_trashbin/l10n/nds.json
 create mode 100644 settings/l10n/nds.js
 create mode 100644 settings/l10n/nds.json

diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
index 2b64fa66ed9..b326b71456d 100644
--- a/apps/encryption/l10n/ru.js
+++ b/apps/encryption/l10n/ru.js
@@ -25,10 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
     "Encryption App is enabled and ready" : "Приложение шифрования включено и готово",
+    "one-time password for server-side-encryption" : "одноразовый пароль для шифрования на стороне сервера",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удалось расшифровать файл, возможно это опубликованный файл. Попросите владельца файла повторно открыть к нему доступ.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удается прочитать файл, возможно это публичный файл. Пожалуйста попросите владельца открыть доступ снова.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Привет,\n\nадминистратор включил шифрование на стороне сервера. Ваши файлы были зашифрованы с помощью пароля '%s'.\n\nПожалуйста войдите в веб-приложение, в разделе 'ownCloud простой модуль шифрования' в личных настройках вам нужно обновить пароль шифрования.\n\n",
     "The share will expire on %s." : "Доступ будет закрыт %s",
     "Cheers!" : "Всего наилучшего!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Привет,<br><br>администратор включил шифрование на стороне сервера. Ваши файлы были зашифрованы с помощью пароля <strong>%s</strong>.<br><br>Пожалуйста войдите в веб-приложение, в разделе \"ownCloud простой модуль шифрования\" в личных настройках вам нужно обновить пароль шифрования.<br><br>",
     "Enable recovery key" : "Включить ключ восстановления",
     "Disable recovery key" : "Отключить ключ восстановления",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Ключ восстановления это дополнительный ключ, который используется для шифрования файлов. Он позволяет восстановить пользовательские файлы в случае утери пароля.",
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
index 229d4e32dee..f4a14cb841f 100644
--- a/apps/encryption/l10n/ru.json
+++ b/apps/encryption/l10n/ru.json
@@ -23,10 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение шифрования активно, но ваши ключи не инициализированы, выйдите из системы и войдите заново",
     "Encryption App is enabled and ready" : "Приложение шифрования включено и готово",
+    "one-time password for server-side-encryption" : "одноразовый пароль для шифрования на стороне сервера",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удалось расшифровать файл, возможно это опубликованный файл. Попросите владельца файла повторно открыть к нему доступ.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удается прочитать файл, возможно это публичный файл. Пожалуйста попросите владельца открыть доступ снова.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Привет,\n\nадминистратор включил шифрование на стороне сервера. Ваши файлы были зашифрованы с помощью пароля '%s'.\n\nПожалуйста войдите в веб-приложение, в разделе 'ownCloud простой модуль шифрования' в личных настройках вам нужно обновить пароль шифрования.\n\n",
     "The share will expire on %s." : "Доступ будет закрыт %s",
     "Cheers!" : "Всего наилучшего!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Привет,<br><br>администратор включил шифрование на стороне сервера. Ваши файлы были зашифрованы с помощью пароля <strong>%s</strong>.<br><br>Пожалуйста войдите в веб-приложение, в разделе \"ownCloud простой модуль шифрования\" в личных настройках вам нужно обновить пароль шифрования.<br><br>",
     "Enable recovery key" : "Включить ключ восстановления",
     "Disable recovery key" : "Отключить ключ восстановления",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Ключ восстановления это дополнительный ключ, который используется для шифрования файлов. Он позволяет восстановить пользовательские файлы в случае утери пароля.",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index bd39511a431..665d185cd2d 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -109,7 +109,7 @@ OC.L10N.register(
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\">accéder à vos fichiers par WebDAV</a>",
     "Cancel upload" : "Annuler l'envoi",
-    "No files in here" : "Aucun fichier ici",
+    "No files in here" : "Aucun fichier",
     "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
     "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier",
     "Select all" : "Tout sélectionner",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index dbff6e6731d..02601ee9d9b 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -107,7 +107,7 @@
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\">accéder à vos fichiers par WebDAV</a>",
     "Cancel upload" : "Annuler l'envoi",
-    "No files in here" : "Aucun fichier ici",
+    "No files in here" : "Aucun fichier",
     "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
     "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier",
     "Select all" : "Tout sélectionner",
diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js
index dfa628279c9..5eff7a8f842 100644
--- a/apps/files/l10n/hu_HU.js
+++ b/apps/files/l10n/hu_HU.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s törölte: %1$s",
     "You restored %1$s" : "Visszatöltötted %1$s",
     "%2$s restored %1$s" : "%1$s visszatöltötte %2$s",
+    "Changed by %2$s" : "Megváltoztatta: %2$s",
+    "Deleted by %2$s" : "Törölte: %2$s",
+    "Restored by %2$s" : "Visszaállította: %2$s",
     "%s could not be renamed as it has been deleted" : "%s nem lehet átnevezni, mivel törölve lett",
     "%s could not be renamed" : "%s átnevezése nem sikerült",
     "Upload (max. %s)" : "Feltöltés (max.: %s)",
diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json
index 0a6c87b9892..da5eed09733 100644
--- a/apps/files/l10n/hu_HU.json
+++ b/apps/files/l10n/hu_HU.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s törölte: %1$s",
     "You restored %1$s" : "Visszatöltötted %1$s",
     "%2$s restored %1$s" : "%1$s visszatöltötte %2$s",
+    "Changed by %2$s" : "Megváltoztatta: %2$s",
+    "Deleted by %2$s" : "Törölte: %2$s",
+    "Restored by %2$s" : "Visszaállította: %2$s",
     "%s could not be renamed as it has been deleted" : "%s nem lehet átnevezni, mivel törölve lett",
     "%s could not be renamed" : "%s átnevezése nem sikerült",
     "Upload (max. %s)" : "Feltöltés (max.: %s)",
diff --git a/apps/files/l10n/nds.js b/apps/files/l10n/nds.js
index 7988332fa91..9b28220ae43 100644
--- a/apps/files/l10n/nds.js
+++ b/apps/files/l10n/nds.js
@@ -1,9 +1,10 @@
 OC.L10N.register(
     "files",
     {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
+    "Files" : "Dateien",
+    "Delete" : "Löschen",
+    "Name" : "Name",
+    "Settings" : "Einstellungen",
+    "WebDAV" : "WebDAV"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/nds.json b/apps/files/l10n/nds.json
index ef5fc586755..4ab8de68b35 100644
--- a/apps/files/l10n/nds.json
+++ b/apps/files/l10n/nds.json
@@ -1,7 +1,8 @@
 { "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
+    "Files" : "Dateien",
+    "Delete" : "Löschen",
+    "Name" : "Name",
+    "Settings" : "Einstellungen",
+    "WebDAV" : "WebDAV"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index 60583d6baf1..270cc3c6a85 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -75,8 +75,10 @@ OC.L10N.register(
     "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"],
     "Favorited" : "Избранное",
     "Favorite" : "Избранное",
+    "{newname} already exists" : "{newname} уже существует",
     "Upload" : "Загрузить",
     "Text file" : "Текстовый файл",
+    "New text file.txt" : "Новый текстовый документ.txt",
     "Folder" : "Каталог",
     "New folder" : "Новый каталог",
     "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка",
@@ -94,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s удалил %1$s",
     "You restored %1$s" : "Вы восстановили %1$s",
     "%2$s restored %1$s" : "%2$s восстановил %1$s",
+    "Changed by %2$s" : "Изменено %2$s",
+    "Deleted by %2$s" : "Удалено %2$s",
+    "Restored by %2$s" : "Восстановлено %2$s",
     "%s could not be renamed as it has been deleted" : "Невозможно переименовать %s, поскольку объект удалён.",
     "%s could not be renamed" : "%s не может быть переименован",
     "Upload (max. %s)" : "Загрузка (максимум %s)",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index d15e181096f..36aae3834a9 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -73,8 +73,10 @@
     "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"],
     "Favorited" : "Избранное",
     "Favorite" : "Избранное",
+    "{newname} already exists" : "{newname} уже существует",
     "Upload" : "Загрузить",
     "Text file" : "Текстовый файл",
+    "New text file.txt" : "Новый текстовый документ.txt",
     "Folder" : "Каталог",
     "New folder" : "Новый каталог",
     "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка",
@@ -92,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s удалил %1$s",
     "You restored %1$s" : "Вы восстановили %1$s",
     "%2$s restored %1$s" : "%2$s восстановил %1$s",
+    "Changed by %2$s" : "Изменено %2$s",
+    "Deleted by %2$s" : "Удалено %2$s",
+    "Restored by %2$s" : "Восстановлено %2$s",
     "%s could not be renamed as it has been deleted" : "Невозможно переименовать %s, поскольку объект удалён.",
     "%s could not be renamed" : "%s не может быть переименован",
     "Upload (max. %s)" : "Загрузка (максимум %s)",
diff --git a/apps/files_external/l10n/nds.js b/apps/files_external/l10n/nds.js
new file mode 100644
index 00000000000..717417fdc2b
--- /dev/null
+++ b/apps/files_external/l10n/nds.js
@@ -0,0 +1,102 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Holen des Requesttokens fehlgeschlagen. Bitte überprüfe Schlüssel und Secret deiner App.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Holen des Zugrifftokens fehlgeschlagen. Bitte überprüfe Schlüssel und Secret deiner App.",
+    "Please provide a valid app key and secret." : "Bitte verwende für deine App einen gültigen Schüssel und ein gültiges Secret.",
+    "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Exception: %s",
+    "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Exception: %s",
+    "External storage" : "Externer Speicher",
+    "Storage with id \"%i\" not found" : "Speicher mit der ID \"%i\" wurde nicht gefunden",
+    "Invalid backend or authentication mechanism class" : "Ungültige Klasse für das Backend oder für den Authentifizierungsmechanismus",
+    "Invalid mount point" : "Ungültiger Einhängepunkt",
+    "Objectstore forbidden" : "Objectstore nicht erlaubt",
+    "Invalid storage backend \"%s\"" : "Ungültiges Speicherbackend \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Verwendung des Backends \"%s\" nicht erlaubt",
+    "Not permitted to use authentication mechanism \"%s\"" : "Verwendung des Authentifizierungsmechanismus \"%s\" nicht erlaubt",
+    "Unsatisfied backend parameters" : "Nicht bediente Backendparameter",
+    "Unsatisfied authentication mechanism parameters" : "Nicht bediente Authentifizierungsmechanismusparamter",
+    "Personal" : "Persönlich",
+    "System" : "System",
+    "Grant access" : "Erlaube Zugriff",
+    "Access granted" : "Zugriff erlaubt",
+    "Error configuring OAuth1" : "Fehler bei der Konfiguration von OAuth1",
+    "Error configuring OAuth2" : "Fehler bei der Konfiguration von OAuth2",
+    "Generate keys" : "Generiere Schlüssel",
+    "Error generating key pair" : "Fehler beim Generieren des Schlüsselpaars",
+    "Enable encryption" : "Verschlüsselung aktivieren",
+    "Enable previews" : "Vorschau aktivieren",
+    "Check for changes" : "Auf Änderungen prüfen",
+    "Never" : "Nie",
+    "Once every direct access" : "Einmal bei jedem direkten Zugriff",
+    "Every time the filesystem is used" : "Bei jeder Verwendung des Dateisystems",
+    "All users. Type to select user or group." : "Alle Benutzer. Tippe, um eine Benutzergruppe auszuwählen.",
+    "(group)" : "(Gruppe)",
+    "Saved" : "Gespeichert",
+    "Access key" : "Schlüssel für Zugriff",
+    "Secret key" : "Geheimer Schlüssel",
+    "Builtin" : "Eingebaut",
+    "None" : "Keine(r)",
+    "OAuth1" : "OAuth1",
+    "App key" : "App Schlüssel",
+    "App secret" : "App Secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client Geheimnis",
+    "OpenStack" : "OpenStack",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "API key" : "API Schlüssel",
+    "Username and password" : "Benutzername und Passwort",
+    "Session credentials" : "Anmeldedaten der Sitzung",
+    "RSA public key" : "Öffentlicher RSA Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
+    "Amazon S3" : "Amazon S3",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Path Style aktivieren",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Entfernter Unterordner",
+    "Secure https://" : "Sicheres https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicheres fpts://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SFTP with secret key login" : "SFTP mit Anmeldung über geheimen Schlüssel",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Teilen",
+    "Domain" : "Domäne",
+    "SMB / CIFS using OC login" : "SMB / DIFS mit OC Anmeldung",
+    "Username as share" : "Benutzername als Freigabe",
+    "Service name" : "Name des Dienstes",
+    "Request timeout (seconds)" : "Zeitüberschreitung der Anfrage (Sekunden)",
+    "<b>Note:</b> " : "<b>Notiz:</b>",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> Die cURL-Unterstützung ist in PHP nicht aktiviert oder nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> Die FTP-Unterstützung ist in PHP nicht aktiviert oder nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> \"%s\" ist nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.",
+    "No external storage configured" : "Kein externer Speicher konfiguriert",
+    "You can add external storages in the personal settings" : "Du kannst externe Speicher in deinen persönlichen Einstellungen hinzufügen",
+    "Name" : "Name",
+    "Storage type" : "Speicherart",
+    "Scope" : "Bereich",
+    "External Storage" : "Externer Speicher",
+    "Folder name" : "Ordnername",
+    "Authentication" : "Authentifizierung",
+    "Configuration" : "Konfiguration",
+    "Available for" : "Verfügbar für",
+    "Advanced settings" : "Erweiterte Einstellungen",
+    "Delete" : "Löschen",
+    "Add storage" : "Speicher hinzufügen",
+    "Enable User External Storage" : "Externen Speicher für Nutzer aktivieren",
+    "Allow users to mount the following external storage" : "Erlaube Benutzern folgenden externen Speicher einzuhängen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/nds.json b/apps/files_external/l10n/nds.json
new file mode 100644
index 00000000000..b7c196ef64c
--- /dev/null
+++ b/apps/files_external/l10n/nds.json
@@ -0,0 +1,100 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Holen des Requesttokens fehlgeschlagen. Bitte überprüfe Schlüssel und Secret deiner App.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Holen des Zugrifftokens fehlgeschlagen. Bitte überprüfe Schlüssel und Secret deiner App.",
+    "Please provide a valid app key and secret." : "Bitte verwende für deine App einen gültigen Schüssel und ein gültiges Secret.",
+    "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Exception: %s",
+    "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Exception: %s",
+    "External storage" : "Externer Speicher",
+    "Storage with id \"%i\" not found" : "Speicher mit der ID \"%i\" wurde nicht gefunden",
+    "Invalid backend or authentication mechanism class" : "Ungültige Klasse für das Backend oder für den Authentifizierungsmechanismus",
+    "Invalid mount point" : "Ungültiger Einhängepunkt",
+    "Objectstore forbidden" : "Objectstore nicht erlaubt",
+    "Invalid storage backend \"%s\"" : "Ungültiges Speicherbackend \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Verwendung des Backends \"%s\" nicht erlaubt",
+    "Not permitted to use authentication mechanism \"%s\"" : "Verwendung des Authentifizierungsmechanismus \"%s\" nicht erlaubt",
+    "Unsatisfied backend parameters" : "Nicht bediente Backendparameter",
+    "Unsatisfied authentication mechanism parameters" : "Nicht bediente Authentifizierungsmechanismusparamter",
+    "Personal" : "Persönlich",
+    "System" : "System",
+    "Grant access" : "Erlaube Zugriff",
+    "Access granted" : "Zugriff erlaubt",
+    "Error configuring OAuth1" : "Fehler bei der Konfiguration von OAuth1",
+    "Error configuring OAuth2" : "Fehler bei der Konfiguration von OAuth2",
+    "Generate keys" : "Generiere Schlüssel",
+    "Error generating key pair" : "Fehler beim Generieren des Schlüsselpaars",
+    "Enable encryption" : "Verschlüsselung aktivieren",
+    "Enable previews" : "Vorschau aktivieren",
+    "Check for changes" : "Auf Änderungen prüfen",
+    "Never" : "Nie",
+    "Once every direct access" : "Einmal bei jedem direkten Zugriff",
+    "Every time the filesystem is used" : "Bei jeder Verwendung des Dateisystems",
+    "All users. Type to select user or group." : "Alle Benutzer. Tippe, um eine Benutzergruppe auszuwählen.",
+    "(group)" : "(Gruppe)",
+    "Saved" : "Gespeichert",
+    "Access key" : "Schlüssel für Zugriff",
+    "Secret key" : "Geheimer Schlüssel",
+    "Builtin" : "Eingebaut",
+    "None" : "Keine(r)",
+    "OAuth1" : "OAuth1",
+    "App key" : "App Schlüssel",
+    "App secret" : "App Secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client Geheimnis",
+    "OpenStack" : "OpenStack",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "API key" : "API Schlüssel",
+    "Username and password" : "Benutzername und Passwort",
+    "Session credentials" : "Anmeldedaten der Sitzung",
+    "RSA public key" : "Öffentlicher RSA Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
+    "Amazon S3" : "Amazon S3",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Path Style aktivieren",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Entfernter Unterordner",
+    "Secure https://" : "Sicheres https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicheres fpts://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SFTP with secret key login" : "SFTP mit Anmeldung über geheimen Schlüssel",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Teilen",
+    "Domain" : "Domäne",
+    "SMB / CIFS using OC login" : "SMB / DIFS mit OC Anmeldung",
+    "Username as share" : "Benutzername als Freigabe",
+    "Service name" : "Name des Dienstes",
+    "Request timeout (seconds)" : "Zeitüberschreitung der Anfrage (Sekunden)",
+    "<b>Note:</b> " : "<b>Notiz:</b>",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> Die cURL-Unterstützung ist in PHP nicht aktiviert oder nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> Die FTP-Unterstützung ist in PHP nicht aktiviert oder nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Notiz:</b> \"%s\" ist nicht installiert, deshalb ist das Einhängen von %s nicht möglich. Bitte deinen Administrator diese zu installieren.",
+    "No external storage configured" : "Kein externer Speicher konfiguriert",
+    "You can add external storages in the personal settings" : "Du kannst externe Speicher in deinen persönlichen Einstellungen hinzufügen",
+    "Name" : "Name",
+    "Storage type" : "Speicherart",
+    "Scope" : "Bereich",
+    "External Storage" : "Externer Speicher",
+    "Folder name" : "Ordnername",
+    "Authentication" : "Authentifizierung",
+    "Configuration" : "Konfiguration",
+    "Available for" : "Verfügbar für",
+    "Advanced settings" : "Erweiterte Einstellungen",
+    "Delete" : "Löschen",
+    "Add storage" : "Speicher hinzufügen",
+    "Enable User External Storage" : "Externen Speicher für Nutzer aktivieren",
+    "Allow users to mount the following external storage" : "Erlaube Benutzern folgenden externen Speicher einzuhängen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js
index e4415e2e2b3..7e4bfc18730 100644
--- a/apps/files_external/l10n/ru.js
+++ b/apps/files_external/l10n/ru.js
@@ -1,16 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ошибка получения токенов запроса. Проверьте корректность ключа и секрета приложения.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ошибка получения токенов доступа. Проверьте корректность ключа и секрета приложения.",
+    "Please provide a valid app key and secret." : "Пожалуйста укажите корректные ключ и секрет приложения.",
     "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
     "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
     "External storage" : "Внешнее хранилище",
     "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено",
+    "Invalid backend or authentication mechanism class" : "Некорректный механизм авторизации или бэкенд",
     "Invalid mount point" : "Неправильная точка входа",
+    "Objectstore forbidden" : "Хранение объектов запрещено",
     "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Не допускается использование бэкенда \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Не допускается использование механизма авторизации \"%s\"",
+    "Unsatisfied backend parameters" : "Недопустимые настройки бэкенда",
+    "Unsatisfied authentication mechanism parameters" : "Недопустимые настройки механизма авторизации",
     "Personal" : "Личное",
     "System" : "Система",
     "Grant access" : "Предоставить доступ",
     "Access granted" : "Доступ предоставлен",
+    "Error configuring OAuth1" : "Ошибка настройки OAuth1",
+    "Error configuring OAuth2" : "Ошибка настройки OAuth2",
     "Generate keys" : "Создать ключи",
     "Error generating key pair" : "Ошибка создания ключевой пары",
     "Enable encryption" : "Включить шифрование",
@@ -22,14 +33,26 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.",
     "(group)" : "(группа)",
     "Saved" : "Сохранено",
+    "Access key" : "Ключ доступа",
+    "Secret key" : "Секретный ключ",
+    "Builtin" : "Встроенный",
     "None" : "Отсутствует",
+    "OAuth1" : "OAuth1",
     "App key" : "Ключ приложения",
     "App secret" : "Секретный ключ ",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Идентификатор клиента",
     "Client secret" : "Клиентский ключ ",
+    "OpenStack" : "OpenStack",
     "Username" : "Имя пользователя",
     "Password" : "Пароль",
+    "Tenant name" : "Имя арендатора",
+    "Identity endpoint URL" : "Удостоверение конечной точки URL",
+    "Rackspace" : "Rackspace",
     "API key" : "Ключ API",
+    "Username and password" : "Имя пользователя и пароль",
+    "Session credentials" : "Учетные данные сессии",
+    "RSA public key" : "Открытый ключ RSA",
     "Public key" : "Открытый ключ",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Корзина",
@@ -43,17 +66,24 @@ OC.L10N.register(
     "Remote subfolder" : "Удаленный подкаталог",
     "Secure https://" : "Безопасный https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "Сервер",
     "Secure ftps://" : "Защищённый ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Локально",
     "Location" : "Местоположение",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Корневой каталог",
     "SFTP with secret key login" : "SFTP с помощью секретного ключа",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Общий доступ",
+    "Domain" : "Домен",
     "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
     "Username as share" : "Имя пользователя в качестве имени общего ресурса",
     "OpenStack Object Storage" : "Хранилище объектов OpenStack",
+    "Service name" : "Название сервиса",
+    "Request timeout (seconds)" : "Таймаут запроса (секунды)",
     "<b>Note:</b> " : "<b>Примечание:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
@@ -65,6 +95,7 @@ OC.L10N.register(
     "Scope" : "Область",
     "External Storage" : "Внешнее хранилище",
     "Folder name" : "Имя каталога",
+    "Authentication" : "Авторизация",
     "Configuration" : "Конфигурация",
     "Available for" : "Доступно для",
     "Advanced settings" : "Расширенные настройки",
diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json
index 1ea452f5408..50754b309ec 100644
--- a/apps/files_external/l10n/ru.json
+++ b/apps/files_external/l10n/ru.json
@@ -1,14 +1,25 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ошибка получения токенов запроса. Проверьте корректность ключа и секрета приложения.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ошибка получения токенов доступа. Проверьте корректность ключа и секрета приложения.",
+    "Please provide a valid app key and secret." : "Пожалуйста укажите корректные ключ и секрет приложения.",
     "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
     "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
     "External storage" : "Внешнее хранилище",
     "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено",
+    "Invalid backend or authentication mechanism class" : "Некорректный механизм авторизации или бэкенд",
     "Invalid mount point" : "Неправильная точка входа",
+    "Objectstore forbidden" : "Хранение объектов запрещено",
     "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Не допускается использование бэкенда \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Не допускается использование механизма авторизации \"%s\"",
+    "Unsatisfied backend parameters" : "Недопустимые настройки бэкенда",
+    "Unsatisfied authentication mechanism parameters" : "Недопустимые настройки механизма авторизации",
     "Personal" : "Личное",
     "System" : "Система",
     "Grant access" : "Предоставить доступ",
     "Access granted" : "Доступ предоставлен",
+    "Error configuring OAuth1" : "Ошибка настройки OAuth1",
+    "Error configuring OAuth2" : "Ошибка настройки OAuth2",
     "Generate keys" : "Создать ключи",
     "Error generating key pair" : "Ошибка создания ключевой пары",
     "Enable encryption" : "Включить шифрование",
@@ -20,14 +31,26 @@
     "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.",
     "(group)" : "(группа)",
     "Saved" : "Сохранено",
+    "Access key" : "Ключ доступа",
+    "Secret key" : "Секретный ключ",
+    "Builtin" : "Встроенный",
     "None" : "Отсутствует",
+    "OAuth1" : "OAuth1",
     "App key" : "Ключ приложения",
     "App secret" : "Секретный ключ ",
+    "OAuth2" : "OAuth2",
     "Client ID" : "Идентификатор клиента",
     "Client secret" : "Клиентский ключ ",
+    "OpenStack" : "OpenStack",
     "Username" : "Имя пользователя",
     "Password" : "Пароль",
+    "Tenant name" : "Имя арендатора",
+    "Identity endpoint URL" : "Удостоверение конечной точки URL",
+    "Rackspace" : "Rackspace",
     "API key" : "Ключ API",
+    "Username and password" : "Имя пользователя и пароль",
+    "Session credentials" : "Учетные данные сессии",
+    "RSA public key" : "Открытый ключ RSA",
     "Public key" : "Открытый ключ",
     "Amazon S3" : "Amazon S3",
     "Bucket" : "Корзина",
@@ -41,17 +64,24 @@
     "Remote subfolder" : "Удаленный подкаталог",
     "Secure https://" : "Безопасный https://",
     "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
     "Host" : "Сервер",
     "Secure ftps://" : "Защищённый ftps://",
+    "Google Drive" : "Google Drive",
     "Local" : "Локально",
     "Location" : "Местоположение",
     "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
     "Root" : "Корневой каталог",
     "SFTP with secret key login" : "SFTP с помощью секретного ключа",
+    "SMB / CIFS" : "SMB / CIFS",
     "Share" : "Общий доступ",
+    "Domain" : "Домен",
     "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
     "Username as share" : "Имя пользователя в качестве имени общего ресурса",
     "OpenStack Object Storage" : "Хранилище объектов OpenStack",
+    "Service name" : "Название сервиса",
+    "Request timeout (seconds)" : "Таймаут запроса (секунды)",
     "<b>Note:</b> " : "<b>Примечание:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
@@ -63,6 +93,7 @@
     "Scope" : "Область",
     "External Storage" : "Внешнее хранилище",
     "Folder name" : "Имя каталога",
+    "Authentication" : "Авторизация",
     "Configuration" : "Конфигурация",
     "Available for" : "Доступно для",
     "Advanced settings" : "Расширенные настройки",
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index 7b85e236b44..c0d2d01b2c4 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -43,6 +43,14 @@ OC.L10N.register(
     "%2$s shared %1$s via link" : "%2$s megosztotta ezt: %1$s, hivatkozással",
     "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
+    "Downloaded via public link" : "Letöltve publikus hivatkozással",
+    "Shared with %2$s" : "Megosztva vele: %2$s",
+    "Shared with group %2$s" : "Megosztva ezzel a csoporttal: %2$s",
+    "Shared with %3$s by %2$s" : "Megosztva vele: %3$s, megosztó: %2$s",
+    "Shared with group %3$s by %2$s" : "Megosztva ezzel a csoporttal: %3$s, megosztó: %2$s",
+    "Shared via link by %2$s" : "Megosztva hivatkozással: %2$s",
+    "Shared by %2$s" : "Megosztó: %2$s",
+    "Shared via public link" : "Megosztva publikus hivatkozással",
     "Shares" : "Megosztások",
     "You received %2$s as a remote share from %1$s" : "Kaptál egy távoli megosztást: %2$s, innen: %1$s",
     "Accept" : "Elfogadás",
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index c749a5add97..a2e15c46c52 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -41,6 +41,14 @@
     "%2$s shared %1$s via link" : "%2$s megosztotta ezt: %1$s, hivatkozással",
     "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
+    "Downloaded via public link" : "Letöltve publikus hivatkozással",
+    "Shared with %2$s" : "Megosztva vele: %2$s",
+    "Shared with group %2$s" : "Megosztva ezzel a csoporttal: %2$s",
+    "Shared with %3$s by %2$s" : "Megosztva vele: %3$s, megosztó: %2$s",
+    "Shared with group %3$s by %2$s" : "Megosztva ezzel a csoporttal: %3$s, megosztó: %2$s",
+    "Shared via link by %2$s" : "Megosztva hivatkozással: %2$s",
+    "Shared by %2$s" : "Megosztó: %2$s",
+    "Shared via public link" : "Megosztva publikus hivatkozással",
     "Shares" : "Megosztások",
     "You received %2$s as a remote share from %1$s" : "Kaptál egy távoli megosztást: %2$s, innen: %1$s",
     "Accept" : "Elfogadás",
diff --git a/apps/files_sharing/l10n/nds.js b/apps/files_sharing/l10n/nds.js
new file mode 100644
index 00000000000..e263ab143a8
--- /dev/null
+++ b/apps/files_sharing/l10n/nds.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Abbrechen",
+    "Password" : "Passwort",
+    "Name" : "Name"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/nds.json b/apps/files_sharing/l10n/nds.json
new file mode 100644
index 00000000000..15e6870cb0e
--- /dev/null
+++ b/apps/files_sharing/l10n/nds.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Abbrechen",
+    "Password" : "Passwort",
+    "Name" : "Name"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index 2d89b5e3102..1a84d10ecea 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -38,10 +38,23 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Общий файл %1$s, был скачан",
     "You shared %1$s with %2$s" : "Вы поделились %1$s с %2$s",
     "You shared %1$s with group %2$s" : "Вы поделились %1$s с группой %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s поделился %1$s с %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s поделился %1$s с группой %3$s",
+    "%2$s shared %1$s via link" : "%2$s поделился %1$s по ссылке",
     "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
     "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки",
+    "Downloaded via public link" : "Загружено по открытой ссылке",
+    "Shared with %2$s" : "Поделился с %2$s",
+    "Shared with group %2$s" : "Поделился с группой %2$s",
+    "Shared with %3$s by %2$s" : "Поделился %2$s с %3$s",
+    "Shared with group %3$s by %2$s" : "Поделился %2$s с группой %3$s",
+    "Shared via link by %2$s" : "Поделился ссылкой %2$s",
+    "Shared by %2$s" : "Поделился %2$s",
+    "Shared via public link" : "Поделился открытой ссылкой",
     "Shares" : "События обмена файлами",
+    "You received %2$s as a remote share from %1$s" : "Вы получили %2$s через удаленный общий ресурс %1$s",
     "Accept" : "Принять",
+    "Decline" : "Отклонить",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ",
     "This share is password-protected" : "Общий ресурс защищен паролем",
@@ -67,6 +80,7 @@ OC.L10N.register(
     "Federated Cloud" : "Объединение облачных хранилищ",
     "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:",
     "Share it:" : "Поделись этим:",
+    "Add to your website" : "Добавить к себе на сайт",
     "Share with me via ownCloud" : "Поделитесь мной через ownCloud",
     "HTML Code:" : "HTML код:"
 },
diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json
index 0f7a152f536..401896709d6 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -36,10 +36,23 @@
     "Public shared file %1$s was downloaded" : "Общий файл %1$s, был скачан",
     "You shared %1$s with %2$s" : "Вы поделились %1$s с %2$s",
     "You shared %1$s with group %2$s" : "Вы поделились %1$s с группой %2$s",
+    "%2$s shared %1$s with %3$s" : "%2$s поделился %1$s с %3$s",
+    "%2$s shared %1$s with group %3$s" : "%2$s поделился %1$s с группой %3$s",
+    "%2$s shared %1$s via link" : "%2$s поделился %1$s по ссылке",
     "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
     "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки",
+    "Downloaded via public link" : "Загружено по открытой ссылке",
+    "Shared with %2$s" : "Поделился с %2$s",
+    "Shared with group %2$s" : "Поделился с группой %2$s",
+    "Shared with %3$s by %2$s" : "Поделился %2$s с %3$s",
+    "Shared with group %3$s by %2$s" : "Поделился %2$s с группой %3$s",
+    "Shared via link by %2$s" : "Поделился ссылкой %2$s",
+    "Shared by %2$s" : "Поделился %2$s",
+    "Shared via public link" : "Поделился открытой ссылкой",
     "Shares" : "События обмена файлами",
+    "You received %2$s as a remote share from %1$s" : "Вы получили %2$s через удаленный общий ресурс %1$s",
     "Accept" : "Принять",
+    "Decline" : "Отклонить",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ",
     "This share is password-protected" : "Общий ресурс защищен паролем",
@@ -65,6 +78,7 @@
     "Federated Cloud" : "Объединение облачных хранилищ",
     "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:",
     "Share it:" : "Поделись этим:",
+    "Add to your website" : "Добавить к себе на сайт",
     "Share with me via ownCloud" : "Поделитесь мной через ownCloud",
     "HTML Code:" : "HTML код:"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
diff --git a/apps/files_trashbin/l10n/nds.js b/apps/files_trashbin/l10n/nds.js
new file mode 100644
index 00000000000..b2dd9ff4ca6
--- /dev/null
+++ b/apps/files_trashbin/l10n/nds.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Delete" : "Löschen",
+    "Name" : "Name"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/nds.json b/apps/files_trashbin/l10n/nds.json
new file mode 100644
index 00000000000..45b0caa74ac
--- /dev/null
+++ b/apps/files_trashbin/l10n/nds.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Delete" : "Löschen",
+    "Name" : "Name"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/nds.js b/apps/user_ldap/l10n/nds.js
index 37042a4f412..7fe0e420a11 100644
--- a/apps/user_ldap/l10n/nds.js
+++ b/apps/user_ldap/l10n/nds.js
@@ -1,7 +1,9 @@
 OC.L10N.register(
     "user_ldap",
     {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
+    "Host" : "Host",
+    "Port" : "Port",
+    "Password" : "Passwort",
+    "Continue" : "Fortsetzen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/nds.json b/apps/user_ldap/l10n/nds.json
index 521de7ba1a8..78a3e1c8efd 100644
--- a/apps/user_ldap/l10n/nds.json
+++ b/apps/user_ldap/l10n/nds.json
@@ -1,5 +1,7 @@
 { "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
+    "Host" : "Host",
+    "Port" : "Port",
+    "Password" : "Passwort",
+    "Continue" : "Fortsetzen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index 38da6186e90..459fe817603 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Failed to clear the mappings." : "Falhou a limpar os mapas.",
     "Failed to delete the server configuration" : "Erro ao eliminar a configuração do servidor",
+    "The configuration is invalid: anonymous bind is not allowed." : "A configuração é inválida: ligação anónima não é permitida.",
     "The configuration is valid and the connection could be established!" : "A configuração está correcta e foi possível estabelecer a ligação!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A configuração está correcta, mas não foi possível estabelecer o \"laço\", por favor, verifique as configurações do servidor e as credenciais.",
     "The configuration is invalid. Please have a look at the logs for further details." : "A configuração é inválida. Por favor, veja o log do ownCloud para mais detalhes.",
@@ -32,6 +33,9 @@ OC.L10N.register(
     "Error while clearing the mappings." : "Erro a limpar os mapas.",
     "Anonymous bind is not allowed. Please provide a User DN and Password." : "Ligação anónima não permitida. Por favor forneça um ND de utilizador e password.",
     "LDAP Operations error. Anonymous bind might not be allowed." : "Erro de operações LDAP. Ligação anónima pode não ser permitida.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Falha na gravação. Por favor verifique que a base de dados está operacional. Recarregar antes de continuar.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Trocando o modo vai permitir a busca automática no LDAP. Dependendo do tamanho do seu LDAP poderá demorar um pouco. Ainda pretende trocar o modo?",
+    "Mode switch" : "Trocar de modo",
     "Select attributes" : "Selecionar atributos",
     "User found and settings verified." : "Utilizador encontrado e as definilções verificadas",
     "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index 594b6ac1907..c7358f61bd5 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Failed to clear the mappings." : "Falhou a limpar os mapas.",
     "Failed to delete the server configuration" : "Erro ao eliminar a configuração do servidor",
+    "The configuration is invalid: anonymous bind is not allowed." : "A configuração é inválida: ligação anónima não é permitida.",
     "The configuration is valid and the connection could be established!" : "A configuração está correcta e foi possível estabelecer a ligação!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A configuração está correcta, mas não foi possível estabelecer o \"laço\", por favor, verifique as configurações do servidor e as credenciais.",
     "The configuration is invalid. Please have a look at the logs for further details." : "A configuração é inválida. Por favor, veja o log do ownCloud para mais detalhes.",
@@ -30,6 +31,9 @@
     "Error while clearing the mappings." : "Erro a limpar os mapas.",
     "Anonymous bind is not allowed. Please provide a User DN and Password." : "Ligação anónima não permitida. Por favor forneça um ND de utilizador e password.",
     "LDAP Operations error. Anonymous bind might not be allowed." : "Erro de operações LDAP. Ligação anónima pode não ser permitida.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Falha na gravação. Por favor verifique que a base de dados está operacional. Recarregar antes de continuar.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Trocando o modo vai permitir a busca automática no LDAP. Dependendo do tamanho do seu LDAP poderá demorar um pouco. Ainda pretende trocar o modo?",
+    "Mode switch" : "Trocar de modo",
     "Select attributes" : "Selecionar atributos",
     "User found and settings verified." : "Utilizador encontrado e as definilções verificadas",
     "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
diff --git a/core/l10n/de.js b/core/l10n/de.js
index d012c2238d9..326aae34329 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
     "Preparing update" : "Update vorbereiten",
-    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrationstests wurden übersprungen - \"update.skip-migration-test\" is in der config.php aktiviert",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrationstests wurden übersprungen - \"update.skip-migration-test\" ist in der config.php aktiviert",
     "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
     "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
     "Maintenance mode is kept active" : "Wartungsmodus wird aktiv gehalten",
@@ -13,8 +13,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "„%s“ zu %s aktualisiert",
     "Repair warning: " : "Reperaturwarnung:",
     "Repair error: " : "Reperaturfehler:",
-    "Set log level to debug - current level: \"%s\"" : "Setze Log-Level auf Debug - aktuelles Level: \"%s\"",
-    "Reset log level to  \"%s\"" : "Setze Log-Level zu \"%s\" zurück",
+    "Set log level to debug - current level: \"%s\"" : "Log-Level auf Debug gesetzt - aktuelles Level: \"%s\"",
+    "Reset log level to  \"%s\"" : "Log-Level auf \"%s\" zurückgesetzt",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
     "Already up to date" : "Bereits aktuell",
@@ -108,7 +108,7 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Deinen Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Du es aus dem Document-Root-Verzeichnis des Webservers herausverschiebst.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ist für PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu findest Du in unserer <a href=\"{docLink}\">Dokumentation</a>.",
-    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Deine PHP Version ({version}) ist nicht länger <a href=\"{phpLink}\">supported</a>. Wir empfehlen ein Upgrade deiner PHP Version, um die volle Performance und Sicherheit zu gewährleisten.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Deine PHP Version ({version}) wird nicht länger <a href=\"{phpLink}\">unterstützt</a>. Wir empfehlen ein Upgrade deiner PHP Version, um die volle Performance und Sicherheit zu gewährleisten.",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für umfassende Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> erläutert ist.",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 7e207557dc5..975a325ddc4 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
     "Preparing update" : "Update vorbereiten",
-    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrationstests wurden übersprungen - \"update.skip-migration-test\" is in der config.php aktiviert",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrationstests wurden übersprungen - \"update.skip-migration-test\" ist in der config.php aktiviert",
     "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
     "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
     "Maintenance mode is kept active" : "Wartungsmodus wird aktiv gehalten",
@@ -11,8 +11,8 @@
     "Updated \"%s\" to %s" : "„%s“ zu %s aktualisiert",
     "Repair warning: " : "Reperaturwarnung:",
     "Repair error: " : "Reperaturfehler:",
-    "Set log level to debug - current level: \"%s\"" : "Setze Log-Level auf Debug - aktuelles Level: \"%s\"",
-    "Reset log level to  \"%s\"" : "Setze Log-Level zu \"%s\" zurück",
+    "Set log level to debug - current level: \"%s\"" : "Log-Level auf Debug gesetzt - aktuelles Level: \"%s\"",
+    "Reset log level to  \"%s\"" : "Log-Level auf \"%s\" zurückgesetzt",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
     "Already up to date" : "Bereits aktuell",
@@ -106,7 +106,7 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Deinen Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Du es aus dem Document-Root-Verzeichnis des Webservers herausverschiebst.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ist für PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu findest Du in unserer <a href=\"{docLink}\">Dokumentation</a>.",
-    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Deine PHP Version ({version}) ist nicht länger <a href=\"{phpLink}\">supported</a>. Wir empfehlen ein Upgrade deiner PHP Version, um die volle Performance und Sicherheit zu gewährleisten.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Deine PHP Version ({version}) wird nicht länger <a href=\"{phpLink}\">unterstützt</a>. Wir empfehlen ein Upgrade deiner PHP Version, um die volle Performance und Sicherheit zu gewährleisten.",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für umfassende Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> erläutert ist.",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 644149ddc1a..b593fc452ae 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
     "Preparing update" : "Update vorbereiten",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrationstests wurden übersprungen - \"update.skip-migration-test\" ist in der config.php aktiviert",
     "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ",
     "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
     "Maintenance mode is kept active" : "Wartungsmodus wird aktiv gehalten",
@@ -12,6 +13,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "„%s“ zu %s aktualisiert",
     "Repair warning: " : "Reperaturwarnung:",
     "Repair error: " : "Reperaturfehler:",
+    "Set log level to debug - current level: \"%s\"" : "Log-Level auf Debug gesetzt - aktuelles Level: \"%s\"",
+    "Reset log level to  \"%s\"" : "Log-Level auf \"%s\" zurückgesetzt",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
     "Already up to date" : "Bereits aktuell",
@@ -105,6 +108,7 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Ihren Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Sie es aus dem Document-Root-Verzeichnis des Webservers herausverschieben.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ihre PHP Version ({version}) wird nicht länger <a href=\"{phpLink}\">unterstützt</a>. Wir empfehlen ein Upgrade ihrer PHP Version, um die volle Performance und Sicherheit zu gewährleisten.",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für umfassende Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> erläutert ist.",
@@ -150,6 +154,7 @@ OC.L10N.register(
     "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
     "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
     "Warning" : "Warnung",
+    "Error while sending notification" : "Fehler beim Senden der Benachrichtigung",
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Enter new" : "Neuen eingeben",
     "Delete" : "Löschen",
@@ -170,6 +175,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Das Update war erfolgreich. Warnungen wurden ausgegeben.",
     "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
     "Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
+    "Couldn't reset password because the token is expired" : "Das Passwort konnte nicht zurückgesetzt werden, da der Token abgelaufen ist",
     "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stellen Sie sicher, dass Ihr Benutzername richtig ist.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versandt werden, weil für diesen Benutzernamen keine E-Mail-Adresse hinterlegt ist. Bitte kontaktieren Sie Ihren Administrator.",
     "%s password reset" : "%s-Passwort zurücksetzen",
@@ -178,6 +184,8 @@ OC.L10N.register(
     "New Password" : "Neues Passwort",
     "Reset password" : "Passwort zurücksetzen",
     "Searching other places" : "Andere Orte durchsuchen",
+    "No search results in other folders" : "Keine Suchergebnisse in anderen Ordnern",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} Suchergebnis in anderen Ordnern","{count} Suchergebnisse in anderen Ordnern"],
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
     "Apps" : "Apps",
@@ -203,13 +211,13 @@ OC.L10N.register(
     "More details can be found in the server log." : "Weitere Details können im Serverprotokoll gefunden werden.",
     "Technical details" : "Technische Details",
     "Remote Address: %s" : "Entfernte Adresse: %s",
-    "Request ID: %s" : "Anforderungskennung: %s",
+    "Request ID: %s" : "Anfragekennung: %s",
     "Type: %s" : "Typ: %s",
     "Code: %s" : "Code: %s",
     "Message: %s" : "Nachricht: %s",
     "File: %s" : "Datei: %s",
     "Line: %s" : "Zeile: %s",
-    "Trace" : "Spur",
+    "Trace" : "Ablauf",
     "Security warning" : "Sicherheitshinweis",
     "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>." : "Informationen zum richtigen Konfigurieren Ihres Servers können Sie der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 95bd4ff7b06..c7fa1e368a9 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
     "Preparing update" : "Update vorbereiten",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrationstests wurden übersprungen - \"update.skip-migration-test\" ist in der config.php aktiviert",
     "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ",
     "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
     "Maintenance mode is kept active" : "Wartungsmodus wird aktiv gehalten",
@@ -10,6 +11,8 @@
     "Updated \"%s\" to %s" : "„%s“ zu %s aktualisiert",
     "Repair warning: " : "Reperaturwarnung:",
     "Repair error: " : "Reperaturfehler:",
+    "Set log level to debug - current level: \"%s\"" : "Log-Level auf Debug gesetzt - aktuelles Level: \"%s\"",
+    "Reset log level to  \"%s\"" : "Log-Level auf \"%s\" zurückgesetzt",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
     "Already up to date" : "Bereits aktuell",
@@ -103,6 +106,7 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Ihren Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Sie es aus dem Document-Root-Verzeichnis des Webservers herausverschieben.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ihre PHP Version ({version}) wird nicht länger <a href=\"{phpLink}\">unterstützt</a>. Wir empfehlen ein Upgrade ihrer PHP Version, um die volle Performance und Sicherheit zu gewährleisten.",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für umfassende Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> erläutert ist.",
@@ -148,6 +152,7 @@
     "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
     "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
     "Warning" : "Warnung",
+    "Error while sending notification" : "Fehler beim Senden der Benachrichtigung",
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Enter new" : "Neuen eingeben",
     "Delete" : "Löschen",
@@ -168,6 +173,7 @@
     "The update was successful. There were warnings." : "Das Update war erfolgreich. Warnungen wurden ausgegeben.",
     "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
     "Couldn't reset password because the token is invalid" : "Das Passwort konnte aufgrund eines ungültigen Tokens nicht zurückgesetzt werden",
+    "Couldn't reset password because the token is expired" : "Das Passwort konnte nicht zurückgesetzt werden, da der Token abgelaufen ist",
     "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Bitte stellen Sie sicher, dass Ihr Benutzername richtig ist.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versandt werden, weil für diesen Benutzernamen keine E-Mail-Adresse hinterlegt ist. Bitte kontaktieren Sie Ihren Administrator.",
     "%s password reset" : "%s-Passwort zurücksetzen",
@@ -176,6 +182,8 @@
     "New Password" : "Neues Passwort",
     "Reset password" : "Passwort zurücksetzen",
     "Searching other places" : "Andere Orte durchsuchen",
+    "No search results in other folders" : "Keine Suchergebnisse in anderen Ordnern",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} Suchergebnis in anderen Ordnern","{count} Suchergebnisse in anderen Ordnern"],
     "Personal" : "Persönlich",
     "Users" : "Benutzer",
     "Apps" : "Apps",
@@ -201,13 +209,13 @@
     "More details can be found in the server log." : "Weitere Details können im Serverprotokoll gefunden werden.",
     "Technical details" : "Technische Details",
     "Remote Address: %s" : "Entfernte Adresse: %s",
-    "Request ID: %s" : "Anforderungskennung: %s",
+    "Request ID: %s" : "Anfragekennung: %s",
     "Type: %s" : "Typ: %s",
     "Code: %s" : "Code: %s",
     "Message: %s" : "Nachricht: %s",
     "File: %s" : "Datei: %s",
     "Line: %s" : "Zeile: %s",
-    "Trace" : "Spur",
+    "Trace" : "Ablauf",
     "Security warning" : "Sicherheitshinweis",
     "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>." : "Informationen zum richtigen Konfigurieren Ihres Servers können Sie der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 7552a0f7b32..861bd24c208 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
     "Preparing update" : "Προετοιμασία ενημέρωσης",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Οι δοκιμές μεταφοράς έχουν παρακαμφθεί - το \"update.skip-migration-test\" ελιναι ενεργοποιημένο στο ",
     "Turned on maintenance mode" : "Η κατάσταση συντήρησης ενεργοποιήθηκε",
     "Turned off maintenance mode" : "Η κατάσταση συντήρησης απενεργοποιήθηκε",
     "Maintenance mode is kept active" : "Η λειτουργία συντήρησης διατηρήθηκε ενεργή",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 824bd30398c..ea2f75f65e5 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
     "Preparing update" : "Προετοιμασία ενημέρωσης",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Οι δοκιμές μεταφοράς έχουν παρακαμφθεί - το \"update.skip-migration-test\" ελιναι ενεργοποιημένο στο ",
     "Turned on maintenance mode" : "Η κατάσταση συντήρησης ενεργοποιήθηκε",
     "Turned off maintenance mode" : "Η κατάσταση συντήρησης απενεργοποιήθηκε",
     "Maintenance mode is kept active" : "Η λειτουργία συντήρησης διατηρήθηκε ενεργή",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index c1ee751df34..17edf5dd286 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
     "Preparing update" : "Felkészülés a frissítésre",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrációs tesztek kihagyva - „update.skip-migration-test” aktiválva van a config.php fájlban",
     "Turned on maintenance mode" : "A karbantartási mód bekapcsolva",
     "Turned off maintenance mode" : "A karbantartási mód kikapcsolva",
     "Maintenance mode is kept active" : "Karbantartási mód aktiválva marad",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 55e9e828245..976fd0050fe 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
     "Preparing update" : "Felkészülés a frissítésre",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrációs tesztek kihagyva - „update.skip-migration-test” aktiválva van a config.php fájlban",
     "Turned on maintenance mode" : "A karbantartási mód bekapcsolva",
     "Turned off maintenance mode" : "A karbantartási mód kikapcsolva",
     "Maintenance mode is kept active" : "Karbantartási mód aktiválva marad",
diff --git a/core/l10n/nds.js b/core/l10n/nds.js
index 4cb36aaaaac..9c81f34e70f 100644
--- a/core/l10n/nds.js
+++ b/core/l10n/nds.js
@@ -1,8 +1,115 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
+    "Couldn't send mail to following users: %s " : "Senden der E-Mail an folgende Benutzer fehlgeschlagen: %s",
+    "Preparing update" : "Bereite Aktualisierung vor",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrierungstests werden übersprungen - \"update.skip-migration-test\" ist in der config.php aktiviert",
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Maintenance mode is kept active" : "Wartungsmodus wird fortgeführt",
+    "Updated database" : "Datenbank wurde aktualisiert",
+    "Checked database schema update" : "Datenbankschemaaktualisierung wurde geprüft",
+    "Checked database schema update for apps" : "Datenbankschemaaktualisierung für Apps wurde geprüft",
+    "Updated \"%s\" to %s" : "\"%s\" auf %s aktualisiert",
+    "Repair warning: " : "Reparaturwarnung",
+    "Repair error: " : "Reparaturfehler",
+    "Set log level to debug - current level: \"%s\"" : "Protokollierungsstufe auf Debug gesetzt - Aktuelle Stufe: \"%s\"",
+    "Reset log level to  \"%s\"" : "Protokollierungsstufe auf \"%s\" zurückgesetzt",
+    "Following incompatible apps have been disabled: %s" : "Folgende inkompatible Apps wurden deaktiviert: %s",
+    "Following apps have been disabled: %s" : "Folgende Apps wurden deaktiviert: %s",
+    "Already up to date" : "Bereits aktuell",
+    "File is too big" : "Datei ist zu groß",
+    "Invalid file provided" : "Ungültige Datei geliefert",
+    "No image or file provided" : "Kein Bild oder keine Datei geliefert",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "No temporary profile picture available, try again" : "Kein flüchtiges Profilbild verfügbar, bitte versuche es noch einmal",
+    "No crop data provided" : "Keine Angaben zum Zuschneiden geliefert",
+    "No valid crop data provided" : "Keine gültigen Angaben zum Zuschnitt geliefert",
+    "Crop is not square" : "Zuschnitt ist nicht quadratisch",
+    "Sunday" : "Sonntag",
+    "Monday" : "Montag",
+    "Tuesday" : "Dienstag",
+    "Wednesday" : "Mittwoch",
+    "Thursday" : "Donnerstag",
+    "Friday" : "Freitag",
+    "Saturday" : "Samstag",
+    "Sun." : "Son.",
+    "Mon." : "Mon.",
+    "Tue." : "Die.",
+    "Wed." : "Mit.",
+    "Thu." : "Don.",
+    "Fri." : "Fre.",
+    "Sat." : "Sam.",
+    "Su" : "So",
+    "Mo" : "Mo",
+    "Tu" : "Di",
+    "We" : "Mi",
+    "Th" : "Do",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "März",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mrz.",
+    "Apr." : "Apr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
+    "Settings" : "Einstellungen",
+    "Saving..." : "Speichern...",
+    "seconds ago" : "vor wenigen Sekunden",
+    "Couldn't send reset email. Please contact your administrator." : "E-Mail zum Zurücksetzen konnte nicht gesendet werden. Bitte wende Dich an Deinem Administrator.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link zum Zurücksetzen deines Passworts wurde an Deine E-Mailadresse geschickt. Wenn Du diesen in einer angemessenen Zeit nicht erhältst, prüfe bitte deine Spam/Junk Ordner.<br> Wenn die E-Mail dort nicht ist, wende Dich an Deinen lokalen Administrator.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Deine Dateien sind verschlüsselt. Wenn Dein Wiederherstellungsschlüssel nicht aktiviert ist, gibt es keine Möglichkeit die Daten wiederherzustellen, nachdem Dein Passwort zurückgesetzt wurde.<br /> Wenn Du nicht sicher weißt was zu tun ist, wende Dich bitte an deinen Adminstrator bevor du fortfährst.<br />Willst du wirklich fortfahren?",
+    "I know what I'm doing" : "Ich weiß was ich tue",
+    "Password can not be changed. Please contact your administrator." : "Das Passwort kann nicht geändert werden. Bitte wende Dich an Deinen Administrator.",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Error loading file picker template: {error}" : "Fehler beim Laden der Vorlage zum Auswählen von Dateien: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Fehler beim Laden der Nachrichtenvorlage: {error}",
+    "read-only" : "Nur Lesezugriff",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} Dateikonflikt","{count} Dateikonflikte"],
+    "One file conflict" : "Ein Dateikonflikt",
+    "New Files" : "Neue Dateien",
+    "Already existing files" : "Bereits vorhandene Dateien",
+    "Which files do you want to keep?" : "Welche Dateien willst du behalten?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wenn Du beide Versionen behältst, wird eine Nummer an den Namen der kopierten Datei angehängt.",
+    "Cancel" : "Abbrechen",
+    "Continue" : "Fortsetzen",
+    "(all selected)" : "(alle ausgewählt)",
+    "({count} selected)" : "({count} ausgewählt)",
+    "Error loading file exists template" : "Fehler beim Laden der Vorlage \"Datei existiert\"",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Mittelstarkes Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Dein Webserver ist für die Dateisynchronisierung noch nicht ordentlich eingerichtet, da die WebDAV-Schnittstelle fehlerhaft scheint. ",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server ist nicht mit dem Internet verbunden. Das bedeutet, dass manche Funktionen, wie das Einbinden von externen Speichern, Benachrichtigungen über Aktualisierungen oder die Installation von Drittanbieter Apps nicht zur Verfügung stehen. Auch der Fernzugriff auf Dateien und das Senden von Hinweis-E-Mails könnte nicht funktionieren. Wir empfehlen die Internetverbindung dieses Servers zu aktivieren, wenn Du diese Funktionen nutzen möchtest.",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Der Zugriff auf Dein Datenverzeichnis und Deine Dateien ist über das Internet vermutlich möglich. Die .htaccess-Datei greift nicht. Wir empfehlen dringend den Webserver derart zu konfigurieren, dass das Datenverzeichnis nicht mehr zugreifbar ist oder das Datenverzeichnis nach außerhalb des Dokumentenwurzelverzeichnisses des Webservers zu verschieben.",
+    "Password" : "Passwort",
+    "Share" : "Teilen",
+    "Delete" : "Löschen",
+    "Personal" : "Persönlich",
+    "Username" : "Benutzername"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nds.json b/core/l10n/nds.json
index 43fce52c5cf..e62ab93e307 100644
--- a/core/l10n/nds.json
+++ b/core/l10n/nds.json
@@ -1,6 +1,113 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
+    "Couldn't send mail to following users: %s " : "Senden der E-Mail an folgende Benutzer fehlgeschlagen: %s",
+    "Preparing update" : "Bereite Aktualisierung vor",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Migrierungstests werden übersprungen - \"update.skip-migration-test\" ist in der config.php aktiviert",
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Maintenance mode is kept active" : "Wartungsmodus wird fortgeführt",
+    "Updated database" : "Datenbank wurde aktualisiert",
+    "Checked database schema update" : "Datenbankschemaaktualisierung wurde geprüft",
+    "Checked database schema update for apps" : "Datenbankschemaaktualisierung für Apps wurde geprüft",
+    "Updated \"%s\" to %s" : "\"%s\" auf %s aktualisiert",
+    "Repair warning: " : "Reparaturwarnung",
+    "Repair error: " : "Reparaturfehler",
+    "Set log level to debug - current level: \"%s\"" : "Protokollierungsstufe auf Debug gesetzt - Aktuelle Stufe: \"%s\"",
+    "Reset log level to  \"%s\"" : "Protokollierungsstufe auf \"%s\" zurückgesetzt",
+    "Following incompatible apps have been disabled: %s" : "Folgende inkompatible Apps wurden deaktiviert: %s",
+    "Following apps have been disabled: %s" : "Folgende Apps wurden deaktiviert: %s",
+    "Already up to date" : "Bereits aktuell",
+    "File is too big" : "Datei ist zu groß",
+    "Invalid file provided" : "Ungültige Datei geliefert",
+    "No image or file provided" : "Kein Bild oder keine Datei geliefert",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "No temporary profile picture available, try again" : "Kein flüchtiges Profilbild verfügbar, bitte versuche es noch einmal",
+    "No crop data provided" : "Keine Angaben zum Zuschneiden geliefert",
+    "No valid crop data provided" : "Keine gültigen Angaben zum Zuschnitt geliefert",
+    "Crop is not square" : "Zuschnitt ist nicht quadratisch",
+    "Sunday" : "Sonntag",
+    "Monday" : "Montag",
+    "Tuesday" : "Dienstag",
+    "Wednesday" : "Mittwoch",
+    "Thursday" : "Donnerstag",
+    "Friday" : "Freitag",
+    "Saturday" : "Samstag",
+    "Sun." : "Son.",
+    "Mon." : "Mon.",
+    "Tue." : "Die.",
+    "Wed." : "Mit.",
+    "Thu." : "Don.",
+    "Fri." : "Fre.",
+    "Sat." : "Sam.",
+    "Su" : "So",
+    "Mo" : "Mo",
+    "Tu" : "Di",
+    "We" : "Mi",
+    "Th" : "Do",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "März",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mrz.",
+    "Apr." : "Apr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
+    "Settings" : "Einstellungen",
+    "Saving..." : "Speichern...",
+    "seconds ago" : "vor wenigen Sekunden",
+    "Couldn't send reset email. Please contact your administrator." : "E-Mail zum Zurücksetzen konnte nicht gesendet werden. Bitte wende Dich an Deinem Administrator.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link zum Zurücksetzen deines Passworts wurde an Deine E-Mailadresse geschickt. Wenn Du diesen in einer angemessenen Zeit nicht erhältst, prüfe bitte deine Spam/Junk Ordner.<br> Wenn die E-Mail dort nicht ist, wende Dich an Deinen lokalen Administrator.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Deine Dateien sind verschlüsselt. Wenn Dein Wiederherstellungsschlüssel nicht aktiviert ist, gibt es keine Möglichkeit die Daten wiederherzustellen, nachdem Dein Passwort zurückgesetzt wurde.<br /> Wenn Du nicht sicher weißt was zu tun ist, wende Dich bitte an deinen Adminstrator bevor du fortfährst.<br />Willst du wirklich fortfahren?",
+    "I know what I'm doing" : "Ich weiß was ich tue",
+    "Password can not be changed. Please contact your administrator." : "Das Passwort kann nicht geändert werden. Bitte wende Dich an Deinen Administrator.",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Error loading file picker template: {error}" : "Fehler beim Laden der Vorlage zum Auswählen von Dateien: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Fehler beim Laden der Nachrichtenvorlage: {error}",
+    "read-only" : "Nur Lesezugriff",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} Dateikonflikt","{count} Dateikonflikte"],
+    "One file conflict" : "Ein Dateikonflikt",
+    "New Files" : "Neue Dateien",
+    "Already existing files" : "Bereits vorhandene Dateien",
+    "Which files do you want to keep?" : "Welche Dateien willst du behalten?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wenn Du beide Versionen behältst, wird eine Nummer an den Namen der kopierten Datei angehängt.",
+    "Cancel" : "Abbrechen",
+    "Continue" : "Fortsetzen",
+    "(all selected)" : "(alle ausgewählt)",
+    "({count} selected)" : "({count} ausgewählt)",
+    "Error loading file exists template" : "Fehler beim Laden der Vorlage \"Datei existiert\"",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Mittelstarkes Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Dein Webserver ist für die Dateisynchronisierung noch nicht ordentlich eingerichtet, da die WebDAV-Schnittstelle fehlerhaft scheint. ",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Dieser Server ist nicht mit dem Internet verbunden. Das bedeutet, dass manche Funktionen, wie das Einbinden von externen Speichern, Benachrichtigungen über Aktualisierungen oder die Installation von Drittanbieter Apps nicht zur Verfügung stehen. Auch der Fernzugriff auf Dateien und das Senden von Hinweis-E-Mails könnte nicht funktionieren. Wir empfehlen die Internetverbindung dieses Servers zu aktivieren, wenn Du diese Funktionen nutzen möchtest.",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Der Zugriff auf Dein Datenverzeichnis und Deine Dateien ist über das Internet vermutlich möglich. Die .htaccess-Datei greift nicht. Wir empfehlen dringend den Webserver derart zu konfigurieren, dass das Datenverzeichnis nicht mehr zugreifbar ist oder das Datenverzeichnis nach außerhalb des Dokumentenwurzelverzeichnisses des Webservers zu verschieben.",
+    "Password" : "Passwort",
+    "Share" : "Teilen",
+    "Delete" : "Löschen",
+    "Personal" : "Persönlich",
+    "Username" : "Benutzername"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index b2ef1b422fe..eadbc2eac72 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -2,6 +2,8 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Невозможно отправить письмо следующим пользователям: %s",
+    "Preparing update" : "Подготовка к обновлению",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Миграционные тесты пропущены - параметр \"update.skip-migration-test\" указан в config.php",
     "Turned on maintenance mode" : "Режим отладки включён",
     "Turned off maintenance mode" : "Режим отладки отключён",
     "Maintenance mode is kept active" : "Режим обслуживания оставлен включенным",
@@ -11,8 +13,11 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s",
     "Repair warning: " : "Предупреждение восстановления:",
     "Repair error: " : "Ошибка восстановления:",
+    "Set log level to debug - current level: \"%s\"" : "Установить отладочное журналирование - текущий уровень: \"%s\"",
+    "Reset log level to  \"%s\"" : "Сбросить уровень журналирования в \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Следующие несовместимые приложения были отключены: %s",
     "Following apps have been disabled: %s" : "Были отключены следующие приложения: %s",
+    "Already up to date" : "Не нуждается в обновлении",
     "File is too big" : "Файл слишком большой",
     "Invalid file provided" : "Указан неправильный файл",
     "No image or file provided" : "Не указано изображение или файл",
@@ -36,6 +41,13 @@ OC.L10N.register(
     "Thu." : "Чт.",
     "Fri." : "Пт.",
     "Sat." : "Сб.",
+    "Su" : "Вс",
+    "Mo" : "Пн",
+    "Tu" : "Вт",
+    "We" : "Ср",
+    "Th" : "Чт",
+    "Fr" : "Пт",
+    "Sa" : "Сб",
     "January" : "Январь",
     "February" : "Февраль",
     "March" : "Март",
@@ -137,12 +149,14 @@ OC.L10N.register(
     "change" : "изменить",
     "delete" : "удалить",
     "access control" : "контроль доступа",
+    "Share details could not be loaded for this item." : "Информация об общем доступе для этого элемента не может быть загружена.",
     "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
     "Share" : "Поделиться",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud",
     "Share with users or groups …" : "Поделиться с пользователями или группами ...",
     "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...",
     "Warning" : "Предупреждение",
+    "Error while sending notification" : "Ошибка отправки уведомления",
     "The object type is not specified." : "Тип объекта не указан",
     "Enter new" : "Ввести новое",
     "Delete" : "Удалить",
@@ -163,6 +177,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Обновление прошло успешно. Были предупреждения.",
     "The update was successful. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляем в ownCloud.",
     "Couldn't reset password because the token is invalid" : "Невозможно сбросить пароль из-за неверного токена",
+    "Couldn't reset password because the token is expired" : "Не удается сбросить пароль, так как токен истек.",
     "Couldn't send reset email. Please make sure your username is correct." : "Не удалось отправить письмо для сброса пароля. Убедитесь, что имя пользователя указано верно.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Невозможно отправить письмо для сброса пароля, для вашей учетной записи не указан адрес электронной почты. Пожалуйста, свяжитесь с администратором.",
     "%s password reset" : "Сброс пароля %s",
@@ -171,6 +186,8 @@ OC.L10N.register(
     "New Password" : "Новый пароль",
     "Reset password" : "Сбросить пароль",
     "Searching other places" : "Идет поиск в других местах",
+    "No search results in other folders" : "Нет результатов поиска в других папках",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} результат в другой папке","{count} результата в другой папке","{count} результатов в другой папке","{count} результатов в другой папке"],
     "Personal" : "Личное",
     "Users" : "Пользователи",
     "Apps" : "Приложения",
@@ -247,6 +264,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, свяжитесь с вашим администратором. Если вы администратор этого сервера, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, как администратор вы можете также внести домен в доверенные с помощью кнопки ниже.",
     "Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен",
+    "App update required" : "Требуется обновление приложения",
+    "%s will be updated to version %s" : "%s будет обновлен до версии %s",
+    "These apps will be updated:" : "Следующие приложения будут обновлены:",
+    "These incompatible apps will be disabled:" : "Эти несовместимые приложения будут отключены:",
     "The theme %s has been disabled." : "Тема %s была отключена.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продолжением убедитесь, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.",
     "Start update" : "Запустить обновление",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 46ee1af1afe..54b96e373f2 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -1,5 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Невозможно отправить письмо следующим пользователям: %s",
+    "Preparing update" : "Подготовка к обновлению",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Миграционные тесты пропущены - параметр \"update.skip-migration-test\" указан в config.php",
     "Turned on maintenance mode" : "Режим отладки включён",
     "Turned off maintenance mode" : "Режим отладки отключён",
     "Maintenance mode is kept active" : "Режим обслуживания оставлен включенным",
@@ -9,8 +11,11 @@
     "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s",
     "Repair warning: " : "Предупреждение восстановления:",
     "Repair error: " : "Ошибка восстановления:",
+    "Set log level to debug - current level: \"%s\"" : "Установить отладочное журналирование - текущий уровень: \"%s\"",
+    "Reset log level to  \"%s\"" : "Сбросить уровень журналирования в \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Следующие несовместимые приложения были отключены: %s",
     "Following apps have been disabled: %s" : "Были отключены следующие приложения: %s",
+    "Already up to date" : "Не нуждается в обновлении",
     "File is too big" : "Файл слишком большой",
     "Invalid file provided" : "Указан неправильный файл",
     "No image or file provided" : "Не указано изображение или файл",
@@ -34,6 +39,13 @@
     "Thu." : "Чт.",
     "Fri." : "Пт.",
     "Sat." : "Сб.",
+    "Su" : "Вс",
+    "Mo" : "Пн",
+    "Tu" : "Вт",
+    "We" : "Ср",
+    "Th" : "Чт",
+    "Fr" : "Пт",
+    "Sa" : "Сб",
     "January" : "Январь",
     "February" : "Февраль",
     "March" : "Март",
@@ -135,12 +147,14 @@
     "change" : "изменить",
     "delete" : "удалить",
     "access control" : "контроль доступа",
+    "Share details could not be loaded for this item." : "Информация об общем доступе для этого элемента не может быть загружена.",
     "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
     "Share" : "Поделиться",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud",
     "Share with users or groups …" : "Поделиться с пользователями или группами ...",
     "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...",
     "Warning" : "Предупреждение",
+    "Error while sending notification" : "Ошибка отправки уведомления",
     "The object type is not specified." : "Тип объекта не указан",
     "Enter new" : "Ввести новое",
     "Delete" : "Удалить",
@@ -161,6 +175,7 @@
     "The update was successful. There were warnings." : "Обновление прошло успешно. Были предупреждения.",
     "The update was successful. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляем в ownCloud.",
     "Couldn't reset password because the token is invalid" : "Невозможно сбросить пароль из-за неверного токена",
+    "Couldn't reset password because the token is expired" : "Не удается сбросить пароль, так как токен истек.",
     "Couldn't send reset email. Please make sure your username is correct." : "Не удалось отправить письмо для сброса пароля. Убедитесь, что имя пользователя указано верно.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Невозможно отправить письмо для сброса пароля, для вашей учетной записи не указан адрес электронной почты. Пожалуйста, свяжитесь с администратором.",
     "%s password reset" : "Сброс пароля %s",
@@ -169,6 +184,8 @@
     "New Password" : "Новый пароль",
     "Reset password" : "Сбросить пароль",
     "Searching other places" : "Идет поиск в других местах",
+    "No search results in other folders" : "Нет результатов поиска в других папках",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} результат в другой папке","{count} результата в другой папке","{count} результатов в другой папке","{count} результатов в другой папке"],
     "Personal" : "Личное",
     "Users" : "Пользователи",
     "Apps" : "Приложения",
@@ -245,6 +262,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, свяжитесь с вашим администратором. Если вы администратор этого сервера, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, как администратор вы можете также внести домен в доверенные с помощью кнопки ниже.",
     "Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен",
+    "App update required" : "Требуется обновление приложения",
+    "%s will be updated to version %s" : "%s будет обновлен до версии %s",
+    "These apps will be updated:" : "Следующие приложения будут обновлены:",
+    "These incompatible apps will be disabled:" : "Эти несовместимые приложения будут отключены:",
     "The theme %s has been disabled." : "Тема %s была отключена.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продолжением убедитесь, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.",
     "Start update" : "Запустить обновление",
diff --git a/lib/l10n/nds.js b/lib/l10n/nds.js
index a12702211c2..04b6bdf25a8 100644
--- a/lib/l10n/nds.js
+++ b/lib/l10n/nds.js
@@ -1,10 +1,9 @@
 OC.L10N.register(
     "lib",
     {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
+    "Personal" : "Persönlich",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "seconds ago" : "vor wenigen Sekunden"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/nds.json b/lib/l10n/nds.json
index b994fa289eb..1c9232d838a 100644
--- a/lib/l10n/nds.json
+++ b/lib/l10n/nds.json
@@ -1,8 +1,7 @@
 { "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
+    "Personal" : "Persönlich",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "seconds ago" : "vor wenigen Sekunden"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index 215bd4f0ebb..7ef161a96a0 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Не удается прочитать файл",
     "App directory already exists" : "Каталог приложения уже существует",
     "Can't create app folder. Please fix permissions. %s" : "Не удалось создать каталог. Исправьте права доступа. %s",
+    "Archive does not contain a directory named %s" : "Архив не содержит папки с именем %s",
     "No source specified when installing app" : "Не указан источник при установке приложения",
     "No href specified when installing app from http" : "Не указан атрибут href при установке приложения через http",
     "No path specified when installing app from local file" : "Не указан путь при установке приложения из локального файла",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Не удалось поделиться %s, пользователь %s не существует.",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Не удалось поделиться %s, пользователь %s не состоит в какой-либо группе в которой состоит %s",
     "Sharing %s failed, because this item is already shared with %s" : "Не удалось поделиться %s, пользователь %s уже имеет доступ к этому элементу",
+    "Sharing %s failed, because this item is already shared with user %s" : "Не удалось поделиться %s, так как элемент находится в общем доступе у %s",
     "Sharing %s failed, because the group %s does not exist" : "Не удалось поделиться %s, группа %s не существует",
     "Sharing %s failed, because %s is not a member of the group %s" : "Не удалось поделиться %s, пользователь %s не является членом группы %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Вам нужно задать пароль для создания публичной ссылки. Разрешены только защищённые ссылки",
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index a0120518dfa..206f7371472 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Не удается прочитать файл",
     "App directory already exists" : "Каталог приложения уже существует",
     "Can't create app folder. Please fix permissions. %s" : "Не удалось создать каталог. Исправьте права доступа. %s",
+    "Archive does not contain a directory named %s" : "Архив не содержит папки с именем %s",
     "No source specified when installing app" : "Не указан источник при установке приложения",
     "No href specified when installing app from http" : "Не указан атрибут href при установке приложения через http",
     "No path specified when installing app from local file" : "Не указан путь при установке приложения из локального файла",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Не удалось поделиться %s, пользователь %s не существует.",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Не удалось поделиться %s, пользователь %s не состоит в какой-либо группе в которой состоит %s",
     "Sharing %s failed, because this item is already shared with %s" : "Не удалось поделиться %s, пользователь %s уже имеет доступ к этому элементу",
+    "Sharing %s failed, because this item is already shared with user %s" : "Не удалось поделиться %s, так как элемент находится в общем доступе у %s",
     "Sharing %s failed, because the group %s does not exist" : "Не удалось поделиться %s, группа %s не существует",
     "Sharing %s failed, because %s is not a member of the group %s" : "Не удалось поделиться %s, пользователь %s не является членом группы %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Вам нужно задать пароль для создания публичной ссылки. Разрешены только защищённые ссылки",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 709b95f9424..7e59f4567ac 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -118,7 +118,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
-    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfe die <a target=\"_blank\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schau in der <a target=\"_blank\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
@@ -218,7 +218,7 @@ OC.L10N.register(
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
     "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">beteilige Dich an der Entwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">hilf mit, es bekannter zu machen</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteilige Dich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">hilf mit, es bekannter zu machen</a>!",
     "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>",
     "Password" : "Passwort",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 29352fe9232..f5265888072 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -116,7 +116,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
-    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfe die <a target=\"_blank\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitte schau in der <a target=\"_blank\" href=\"%s\">Installationsdokumentation ↗</a>auf Hinweise zur PHP-Konfiguration, sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
@@ -216,7 +216,7 @@
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
     "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">beteilige Dich an der Entwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">hilf mit, es bekannter zu machen</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteilige Dich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">hilf mit, es bekannter zu machen</a>!",
     "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>",
     "Password" : "Passwort",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 5c931504348..ddf85fb4515 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -212,7 +212,7 @@ OC.L10N.register(
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
     "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten,\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">beteiligen Sie sich an der Entwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">helfen Sie mit, es bekannter zu machen</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteiligen Sie sich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">helfen Sie mit, es bekannter zu machen</a>!",
     "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
     "Password" : "Passwort",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 0518e75c4e5..ba5b2edeecb 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -210,7 +210,7 @@
     "Desktop client" : "Desktop-Client",
     "Android app" : "Android-App",
     "iOS app" : "iOS-App",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten,\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">beteiligen Sie sich an der Entwicklung</a>\n⇥⇥oder\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\" rel=\"noreferrer\">helfen Sie mit, es bekannter zu machen</a>!",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen möchten,\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\" rel=\"noreferrer\">beteiligen Sie sich an der Entwicklung</a>\noder\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\" rel=\"noreferrer\">helfen Sie mit, es bekannter zu machen</a>!",
     "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
     "Password" : "Passwort",
diff --git a/settings/l10n/nds.js b/settings/l10n/nds.js
new file mode 100644
index 00000000000..e1998c807fd
--- /dev/null
+++ b/settings/l10n/nds.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "settings",
+    {
+    "External Storage" : "Externer Speicher",
+    "Saved" : "Gespeichert",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Mittelstarkes Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Delete" : "Löschen",
+    "None" : "Keine(r)",
+    "Enable encryption" : "Verschlüsselung aktivieren",
+    "Port" : "Port",
+    "Password" : "Passwort",
+    "Cancel" : "Abbrechen",
+    "Username" : "Benutzername"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/nds.json b/settings/l10n/nds.json
new file mode 100644
index 00000000000..2c56decc573
--- /dev/null
+++ b/settings/l10n/nds.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "External Storage" : "Externer Speicher",
+    "Saved" : "Gespeichert",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Mittelstarkes Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Delete" : "Löschen",
+    "None" : "Keine(r)",
+    "Enable encryption" : "Verschlüsselung aktivieren",
+    "Port" : "Port",
+    "Password" : "Passwort",
+    "Cancel" : "Abbrechen",
+    "Username" : "Benutzername"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 4366083d5c2..24b1d9e96f5 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -118,18 +118,22 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP был установлен неверно. Запрос getenv(\"PATH\") возвращает пустые результаты.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Пожалуйста обратитесь к <a target=\"_blank\" href=\"%s\">документации по установке</a> для получения заметок по настройке php, а также к настройкам php вашего сервера, особенно это касается php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса невозможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ваш сервер работает на ОС Microsoft Windows. Мы настоятельно рекомендуем использовать ОС семейства Linux для достижения наилучших условий использования.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s ниже установленной версии %2$s, по причинам стабильности и производительности мы рекомендуем обновиться до новой версии %1$s.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Блокировка файлов во время передачи отключена, это может привести к состоянию гонки. Включите параметр 'filelocking.enabled' в config.php для избежания этой проблемы. За подробной информацией обратитесь к <a target=\"_blank\" href=\"%s\">документации</a>.",
     "System locale can not be set to a one which supports UTF-8." : "Невозможно установить системную локаль, поддерживающую UTF-8",
     "This means that there might be problems with certain characters in file names." : "Это значит, что могут быть проблемы с некоторыми символами в именах файлов.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Мы рекомендуем установить требуемые пакеты для вашей системы для поддержки одного из следующих языков: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует системный планировщик cron, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию \"overwrite.cli.url\" в файле config.php равной пути папки установки. (Предположительно: \"%s\".)",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не удается запустить задачу планировщика через CLI. Произошли следующие технические ошибки:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Механизм блокировки файлов во время передачи основан на базе данных, для лучшей производительности рекомендуется использование memcache. За подробной информацией обратитесь к <a target=\"_blank\" href=\"%s\">документации</a>.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Пожалуйста, перепроверьте <a href=\"%s\">инструкцию по установке</a> и проверьте ошибки или предупреждения в <a href=\"#log-section\">журнале</a>",
+    "All checks passed." : "Все проверки пройдены.",
     "Open documentation" : "Открыть документацию",
     "Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
     "Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
@@ -145,6 +149,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Разрешить пользователям отправлять оповещение других пользователей об открытии доступа к файлам",
     "Exclude groups from sharing" : "Исключить группы из общего доступа",
     "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие ресурсы, но не могут их создавать.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Включить автоматическое завершение имен пользователей в окне общего доступа. Если отключено, то необходимо вводить полное имя вручную.",
     "Last cron job execution: %s." : "Последнее выполненное Cron задание: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Последнее выполненное Cron задание: %s. Что-то кажется неправильным.",
     "Cron was not executed yet!" : "Задачи cron ещё не запускались!",
@@ -152,6 +157,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
     "Enable server-side encryption" : "Включить шифрование на стороне сервера",
+    "Please read carefully before activating server-side encryption: " : "Пожалуйста прочтите внимательно прежде чем включать шифрование на стороне сервера:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Шифрование на стороне сервера необратимый процесс. После включения шифрования все файлы на сервере будут зашифрованы, отключение этой опции невозможно.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Любой привилегированный пользователь, который имеет доступ к серверу ownCloud может расшифровать файлы путем перехвата паролей от пользователей, которые хранятся в открытом в виде в файлах сессии. Шифрование на стороне сервера не защищает от администраторов-злоумышленников, но оно может быть полезно при использовании стороннего хостинга.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "В зависимости от модуля шифрования общий размер файла может увеличиться (на 35 или более %% при использовании модуля по умолчанию)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Вам необходимо постоянно создавать резервную копию ключей шифрования с целью предотвращения потери данных (data/<user>/files_encryption и data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Это последнее предупреждение: Вы действительно желаете включить шифрование?",
     "Enable encryption" : "Включить шифрование",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Модуль шифрования не загружен, пожалуйста включите модуль шифрования в меню приложений.",
     "Select default encryption module:" : "Выберите модуль шифрования по умолчанию:",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 55a2680ed30..0cc7346af1c 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -116,18 +116,22 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP был установлен неверно. Запрос getenv(\"PATH\") возвращает пустые результаты.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Пожалуйста обратитесь к <a target=\"_blank\" href=\"%s\">документации по установке</a> для получения заметок по настройке php, а также к настройкам php вашего сервера, особенно это касается php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса невозможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ваш сервер работает на ОС Microsoft Windows. Мы настоятельно рекомендуем использовать ОС семейства Linux для достижения наилучших условий использования.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s ниже установленной версии %2$s, по причинам стабильности и производительности мы рекомендуем обновиться до новой версии %1$s.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Блокировка файлов во время передачи отключена, это может привести к состоянию гонки. Включите параметр 'filelocking.enabled' в config.php для избежания этой проблемы. За подробной информацией обратитесь к <a target=\"_blank\" href=\"%s\">документации</a>.",
     "System locale can not be set to a one which supports UTF-8." : "Невозможно установить системную локаль, поддерживающую UTF-8",
     "This means that there might be problems with certain characters in file names." : "Это значит, что могут быть проблемы с некоторыми символами в именах файлов.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Мы рекомендуем установить требуемые пакеты для вашей системы для поддержки одного из следующих языков: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует системный планировщик cron, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию \"overwrite.cli.url\" в файле config.php равной пути папки установки. (Предположительно: \"%s\".)",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Не удается запустить задачу планировщика через CLI. Произошли следующие технические ошибки:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Механизм блокировки файлов во время передачи основан на базе данных, для лучшей производительности рекомендуется использование memcache. За подробной информацией обратитесь к <a target=\"_blank\" href=\"%s\">документации</a>.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Пожалуйста, перепроверьте <a href=\"%s\">инструкцию по установке</a> и проверьте ошибки или предупреждения в <a href=\"#log-section\">журнале</a>",
+    "All checks passed." : "Все проверки пройдены.",
     "Open documentation" : "Открыть документацию",
     "Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
     "Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
@@ -143,6 +147,7 @@
     "Allow users to send mail notification for shared files to other users" : "Разрешить пользователям отправлять оповещение других пользователей об открытии доступа к файлам",
     "Exclude groups from sharing" : "Исключить группы из общего доступа",
     "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие ресурсы, но не могут их создавать.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Включить автоматическое завершение имен пользователей в окне общего доступа. Если отключено, то необходимо вводить полное имя вручную.",
     "Last cron job execution: %s." : "Последнее выполненное Cron задание: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Последнее выполненное Cron задание: %s. Что-то кажется неправильным.",
     "Cron was not executed yet!" : "Задачи cron ещё не запускались!",
@@ -150,6 +155,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
     "Enable server-side encryption" : "Включить шифрование на стороне сервера",
+    "Please read carefully before activating server-side encryption: " : "Пожалуйста прочтите внимательно прежде чем включать шифрование на стороне сервера:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Шифрование на стороне сервера необратимый процесс. После включения шифрования все файлы на сервере будут зашифрованы, отключение этой опции невозможно.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Любой привилегированный пользователь, который имеет доступ к серверу ownCloud может расшифровать файлы путем перехвата паролей от пользователей, которые хранятся в открытом в виде в файлах сессии. Шифрование на стороне сервера не защищает от администраторов-злоумышленников, но оно может быть полезно при использовании стороннего хостинга.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "В зависимости от модуля шифрования общий размер файла может увеличиться (на 35 или более %% при использовании модуля по умолчанию)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Вам необходимо постоянно создавать резервную копию ключей шифрования с целью предотвращения потери данных (data/<user>/files_encryption и data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Это последнее предупреждение: Вы действительно желаете включить шифрование?",
     "Enable encryption" : "Включить шифрование",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Модуль шифрования не загружен, пожалуйста включите модуль шифрования в меню приложений.",
     "Select default encryption module:" : "Выберите модуль шифрования по умолчанию:",
-- 
GitLab


From 937fb70757d7d5b164de73ed1089e13e15d1887c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Wed, 7 Oct 2015 08:07:52 +0200
Subject: [PATCH 738/783] Do not trigger the update exception when we already
 show an error

---
 lib/private/template.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/private/template.php b/lib/private/template.php
index 45e2af049cb..f64302341a3 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -69,7 +69,7 @@ class OC_Template extends \OC\Template\Base {
 	
 	public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
 		// Read the selected theme from the config file
-		self::initTemplateEngine();
+		self::initTemplateEngine($renderAs);
 		
 		$theme = OC_Util::getTheme();
 
@@ -89,13 +89,13 @@ class OC_Template extends \OC\Template\Base {
 		parent::__construct($template, $requesttoken, $l10n, $themeDefaults);
 	}
 
-	public static function initTemplateEngine() {
+	public static function initTemplateEngine($renderAs) {
 		if (self::$initTemplateEngineFirstRun){
 			
 			//apps that started before the template initialization can load their own scripts/styles
 			//so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true
 			//meaning the last script/style in this list will be loaded first
-			if (\OC::$server->getSystemConfig ()->getValue ( 'installed', false ) && ! \OCP\Util::needUpgrade ()) {
+			if (\OC::$server->getSystemConfig()->getValue ('installed', false) && $renderAs !== 'error' && !\OCP\Util::needUpgrade()) {
 				if (\OC::$server->getConfig ()->getAppValue ( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax') {
 					OC_Util::addScript ( 'backgroundjobs', null, true );
 				}
-- 
GitLab


From 1b0e128b4407fefe9ff7be7366bacbac94d101c9 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Wed, 7 Oct 2015 09:03:00 +0000
Subject: [PATCH 739/783] checking users and groups

---
 .../features/bootstrap/FeatureContext.php     | 24 ++++++++++++-------
 .../features/provisioning-v1.feature          |  9 ++++++-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index 99d030fa6fc..a09e74de57c 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -49,7 +49,6 @@ class FeatureContext extends BehatContext {
 		$this->sendingToWith($verb, $url, null);
 	}
 
-
 	/**
 	*  Parses the xml answer to get ocs response which doesn't match with
 	*  http one in v1 of the api.
@@ -67,19 +66,14 @@ class FeatureContext extends BehatContext {
         return $extractedElementsArray;
     }
 
-    
     /**
     *  Parses the xml answer to get the array of groups returned.
     */
-    /*
-    public function getArrayOfGroupsResponded(){
-        $listCheckedElements = $this->$response->xml()->data[0]->groups[0]->element;
+    public function getArrayOfGroupsResponded($resp) {
+        $listCheckedElements = $resp->xml()->data[0]->groups[0]->element;
         $extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1);
         return $extractedElementsArray;
     }
-	*/
-    
-
 
 	/**
 	 * @Then /^users returned are$/
@@ -93,8 +87,20 @@ class FeatureContext extends BehatContext {
 		}
 
 	}
-		
 
+	/**
+	 * @Then /^groups returned are$/
+	 * @param \Behat\Gherkin\Node\TableNode|null $formData
+	 */
+	public function theGroupsShouldBe($groupsList) {
+		if ($groupsList instanceof \Behat\Gherkin\Node\TableNode) {
+			$groups = $groupsList->getRows()[0];
+            $respondedArray = $this->getArrayOfGroupsResponded($this->response);
+            PHPUnit_Framework_Assert::assertEquals($groups, $respondedArray);
+		}
+
+	}
+		
 	/**
 	 * @Then /^the OCS status code should be "([^"]*)"$/
 	 */
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index 448c06b8b51..ad6841142a9 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -44,7 +44,7 @@ Feature: provisioning
     Given As an "admin"
     When sending "GET" to "/cloud/users"
     And users returned are
-      | brand-new-user | ser507 |
+      | brand-new-user | admin |
 
 
   Scenario: Edit a user
@@ -81,6 +81,13 @@ Feature: provisioning
     And group "new-group" exists
 
 
+  Scenario: Getting all users
+    Given As an "admin"
+    When sending "GET" to "/cloud/groups"
+    And groups returned are
+      | admin | new-group |
+
+
   Scenario: Delete a group
     Given As an "admin"
     And group "new-group" exists
-- 
GitLab


From 957d60cd0a30fae7fcdca63d73da5965545efed2 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Wed, 7 Oct 2015 09:24:12 +0000
Subject: [PATCH 740/783] ordering arrays before comparing

---
 build/integration/features/bootstrap/FeatureContext.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index a09e74de57c..70424b1d24c 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -83,7 +83,7 @@ class FeatureContext extends BehatContext {
 		if ($usersList instanceof \Behat\Gherkin\Node\TableNode) {
 			$users = $usersList->getRows()[0];
             $respondedArray = $this->getArrayOfUsersResponded($this->response);
-            PHPUnit_Framework_Assert::assertEquals($users, $respondedArray);
+            PHPUnit_Framework_Assert::assertEquals(asort($users), asort($respondedArray));
 		}
 
 	}
@@ -96,7 +96,7 @@ class FeatureContext extends BehatContext {
 		if ($groupsList instanceof \Behat\Gherkin\Node\TableNode) {
 			$groups = $groupsList->getRows()[0];
             $respondedArray = $this->getArrayOfGroupsResponded($this->response);
-            PHPUnit_Framework_Assert::assertEquals($groups, $respondedArray);
+            PHPUnit_Framework_Assert::assertEquals(asort($groups), asort($respondedArray));
 		}
 
 	}
-- 
GitLab


From 1ee56c702de8498bdc17bc7e93ff4c24c7b5590b Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <rullzer@owncloud.com>
Date: Tue, 6 Oct 2015 15:36:54 +0200
Subject: [PATCH 741/783] [WEBDAV] check if delete of source is allowed on move

Fixes #5251

If we perform a move we need to make sure first that the source can be
deleted. Else the dest might be cleared but the move will fail later.

* Added unit tests

Eventually we need more and better checking here.
---
 lib/private/connector/sabre/filesplugin.php   | 32 +++++++++-
 lib/private/connector/sabre/serverfactory.php |  2 +-
 tests/lib/connector/sabre/filesplugin.php     | 61 ++++++++++++++++++-
 3 files changed, 90 insertions(+), 5 deletions(-)

diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php
index 84620f454aa..ab7f6884a5e 100644
--- a/lib/private/connector/sabre/filesplugin.php
+++ b/lib/private/connector/sabre/filesplugin.php
@@ -63,11 +63,21 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin {
 	 */
 	private $isPublic;
 
+	/**
+	 * @var \OC\Files\View
+	 */
+	private $fileView;
+
 	/**
 	 * @param \Sabre\DAV\Tree $tree
+	 * @param \OC\Files\View $view
+	 * @param bool $isPublic
 	 */
-	public function __construct(\Sabre\DAV\Tree $tree, $isPublic = false) {
+	public function __construct(\Sabre\DAV\Tree $tree,
+	                            \OC\Files\View $view,
+	                            $isPublic = false) {
 		$this->tree = $tree;
+		$this->fileView = $view;
 		$this->isPublic = $isPublic;
 	}
 
@@ -106,6 +116,26 @@ class FilesPlugin extends \Sabre\DAV\ServerPlugin {
 				fclose($body);
 			}
 		});
+		$this->server->on('beforeMove', [$this, 'checkMove']);
+	}
+
+	/**
+	 * Plugin that checks if a move can actually be performed.
+	 * @param string $source source path
+	 * @param string $destination destination path
+	 * @throws \Sabre\DAV\Exception\Forbidden
+	 */
+	function checkMove($source, $destination) {
+		list($sourceDir,) = \Sabre\HTTP\URLUtil::splitPath($source);
+		list($destinationDir,) = \Sabre\HTTP\URLUtil::splitPath($destination);
+
+		if ($sourceDir !== $destinationDir) {
+			$sourceFileInfo = $this->fileView->getFileInfo($source);
+
+			if (!$sourceFileInfo->isDeletable()) {
+				throw new \Sabre\DAV\Exception\Forbidden($source . " cannot be deleted");
+			}
+		}
 	}
 
 	/**
diff --git a/lib/private/connector/sabre/serverfactory.php b/lib/private/connector/sabre/serverfactory.php
index a0c32c1da53..893e29fd41c 100644
--- a/lib/private/connector/sabre/serverfactory.php
+++ b/lib/private/connector/sabre/serverfactory.php
@@ -72,7 +72,6 @@ class ServerFactory {
 		$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()));
 		// FIXME: The following line is a workaround for legacy components relying on being able to send a GET to /
 		$server->addPlugin(new \OC\Connector\Sabre\DummyGetResponsePlugin());
-		$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
 		$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
 		$server->addPlugin(new \OC\Connector\Sabre\LockPlugin($objectTree));
 		$server->addPlugin(new \OC\Connector\Sabre\ListenerPlugin($this->dispatcher));
@@ -91,6 +90,7 @@ class ServerFactory {
 			}
 			$objectTree->init($root, $view, $this->mountManager);
 
+			$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree, $view));
 			$server->addPlugin(new \OC\Connector\Sabre\QuotaPlugin($view));
 
 			if($this->userSession->isLoggedIn()) {
diff --git a/tests/lib/connector/sabre/filesplugin.php b/tests/lib/connector/sabre/filesplugin.php
index a4cf9f7bfb9..0aa62cab176 100644
--- a/tests/lib/connector/sabre/filesplugin.php
+++ b/tests/lib/connector/sabre/filesplugin.php
@@ -31,13 +31,24 @@ class FilesPlugin extends \Test\TestCase {
 	 */
 	private $plugin;
 
+	/**
+	 * @var \OC\Files\View
+	 */
+	private $view;
+
 	public function setUp() {
 		parent::setUp();
-		$this->server = new \Sabre\DAV\Server();
+		$this->server = $this->getMockBuilder('\Sabre\DAV\Server')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->tree = $this->getMockBuilder('\Sabre\DAV\Tree')
 			->disableOriginalConstructor()
 			->getMock();
-		$this->plugin = new \OC\Connector\Sabre\FilesPlugin($this->tree);
+		$this->view = $this->getMockBuilder('\OC\Files\View')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->plugin = new \OC\Connector\Sabre\FilesPlugin($this->tree, $this->view);
 		$this->plugin->initialize($this->server);
 	}
 
@@ -104,7 +115,7 @@ class FilesPlugin extends \Test\TestCase {
 	}
 
 	public function testGetPublicPermissions() {
-		$this->plugin = new \OC\Connector\Sabre\FilesPlugin($this->tree, true);
+		$this->plugin = new \OC\Connector\Sabre\FilesPlugin($this->tree, $this->view, true);
 		$this->plugin->initialize($this->server);
 
 		$propFind = new \Sabre\DAV\PropFind(
@@ -196,4 +207,48 @@ class FilesPlugin extends \Test\TestCase {
 		$this->assertEquals(200, $result[self::GETETAG_PROPERTYNAME]);
 	}
 
+	/**
+	 * Testcase from https://github.com/owncloud/core/issues/5251
+	 *
+	 * |-FolderA
+	 *  |-text.txt
+	 * |-test.txt
+	 *
+	 * FolderA is an incomming shared folder and there are no delete permissions.
+	 * Thus moving /FolderA/test.txt to /test.txt should fail already on that check
+	 *
+	 * @expectedException \Sabre\DAV\Exception\Forbidden
+	 * @expectedExceptionMessage FolderA/test.txt cannot be deleted
+	 */
+	public function testMoveSrcNotDeletable() {
+		$fileInfoFolderATestTXT = $this->getMockBuilder('\OCP\Files\FileInfo')
+			->disableOriginalConstructor()
+			->getMock();
+		$fileInfoFolderATestTXT->expects($this->once())
+			->method('isDeletable')
+			->willReturn(false);
+
+		$this->view->expects($this->once())
+			->method('getFileInfo')
+			->with('FolderA/test.txt')
+			->willReturn($fileInfoFolderATestTXT);
+
+		$this->plugin->checkMove('FolderA/test.txt', 'test.txt');
+	}
+
+	public function testMoveSrcDeletable() {
+		$fileInfoFolderATestTXT = $this->getMockBuilder('\OCP\Files\FileInfo')
+			->disableOriginalConstructor()
+			->getMock();
+		$fileInfoFolderATestTXT->expects($this->once())
+			->method('isDeletable')
+			->willReturn(true);
+
+		$this->view->expects($this->once())
+			->method('getFileInfo')
+			->with('FolderA/test.txt')
+			->willReturn($fileInfoFolderATestTXT);
+
+		$this->plugin->checkMove('FolderA/test.txt', 'test.txt');
+	}
 }
-- 
GitLab


From ccfd052e81545099fe7d3527c5f906a56e4f7542 Mon Sep 17 00:00:00 2001
From: Hendrik Leppelsack <hendrik@leppelsack.de>
Date: Wed, 7 Oct 2015 12:33:58 +0200
Subject: [PATCH 742/783] move footer to bottom of public page

---
 apps/files_sharing/css/public.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 95013e0a352..bd8e98e966d 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -1,5 +1,7 @@
 #content {
 	height: initial;
+	min-height: calc(100vh - 120px);
+	overflow: hidden;
 }
 
 #preview {
-- 
GitLab


From 8f91426e0af32aa4007d9f3b4749a78261a44279 Mon Sep 17 00:00:00 2001
From: Sergio Bertolin <sbertolin@solidgear.es>
Date: Wed, 7 Oct 2015 11:09:01 +0000
Subject: [PATCH 743/783] changing indentation, vertical elements and previous
 existance of users and groups

---
 .../features/bootstrap/FeatureContext.php     | 40 +++++++++----------
 .../features/provisioning-v1.feature          | 12 ++++--
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index 70424b1d24c..f440aece603 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -58,22 +58,22 @@ class FeatureContext extends BehatContext {
 	}
 
 	/**
-    *  Parses the xml answer to get the array of users returned.
-    */
-    public function getArrayOfUsersResponded($resp) {
-        $listCheckedElements = $resp->xml()->data[0]->users[0]->element;
-        $extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1);
-        return $extractedElementsArray;
-    }
-
-    /**
-    *  Parses the xml answer to get the array of groups returned.
-    */
-    public function getArrayOfGroupsResponded($resp) {
-        $listCheckedElements = $resp->xml()->data[0]->groups[0]->element;
-        $extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1);
-        return $extractedElementsArray;
-    }
+	*  Parses the xml answer to get the array of users returned.
+	*/
+	public function getArrayOfUsersResponded($resp) {
+		$listCheckedElements = $resp->xml()->data[0]->users[0]->element;
+		$extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1);
+		return $extractedElementsArray;
+	}
+
+	/**
+	*  Parses the xml answer to get the array of groups returned.
+	*/
+	public function getArrayOfGroupsResponded($resp) {
+		$listCheckedElements = $resp->xml()->data[0]->groups[0]->element;
+		$extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1);
+		return $extractedElementsArray;
+	}
 
 	/**
 	 * @Then /^users returned are$/
@@ -82,8 +82,8 @@ class FeatureContext extends BehatContext {
 	public function theUsersShouldBe($usersList) {
 		if ($usersList instanceof \Behat\Gherkin\Node\TableNode) {
 			$users = $usersList->getRows()[0];
-            $respondedArray = $this->getArrayOfUsersResponded($this->response);
-            PHPUnit_Framework_Assert::assertEquals(asort($users), asort($respondedArray));
+			$respondedArray = $this->getArrayOfUsersResponded($this->response);
+			PHPUnit_Framework_Assert::assertEquals(asort($users), asort($respondedArray));
 		}
 
 	}
@@ -95,8 +95,8 @@ class FeatureContext extends BehatContext {
 	public function theGroupsShouldBe($groupsList) {
 		if ($groupsList instanceof \Behat\Gherkin\Node\TableNode) {
 			$groups = $groupsList->getRows()[0];
-            $respondedArray = $this->getArrayOfGroupsResponded($this->response);
-            PHPUnit_Framework_Assert::assertEquals(asort($groups), asort($respondedArray));
+			$respondedArray = $this->getArrayOfGroupsResponded($this->response);
+			PHPUnit_Framework_Assert::assertEquals(asort($groups), asort($respondedArray));
 		}
 
 	}
diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature
index ad6841142a9..d865ee687ed 100644
--- a/build/integration/features/provisioning-v1.feature
+++ b/build/integration/features/provisioning-v1.feature
@@ -42,9 +42,12 @@ Feature: provisioning
 
   Scenario: Getting all users
     Given As an "admin"
+    And user "brand-new-user" exists
+    And user "admin" exists
     When sending "GET" to "/cloud/users"
     And users returned are
-      | brand-new-user | admin |
+      | brand-new-user |
+      | admin |
 
 
   Scenario: Edit a user
@@ -81,11 +84,14 @@ Feature: provisioning
     And group "new-group" exists
 
 
-  Scenario: Getting all users
+  Scenario: Getting all groups
     Given As an "admin"
+    And group "new-group" exists
+    And group "admin" exists
     When sending "GET" to "/cloud/groups"
     And groups returned are
-      | admin | new-group |
+      | admin |
+      | new-group |
 
 
   Scenario: Delete a group
-- 
GitLab


From 9f257456494cf17ad9288d3ca8bfd5004f74dd91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 7 Oct 2015 13:15:58 +0200
Subject: [PATCH 744/783] Fix single file download - fixes #19614

---
 lib/private/files.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/private/files.php b/lib/private/files.php
index ad03904e036..e24e10ec299 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -82,6 +82,9 @@ class OC_Files {
 
 			if (is_array($files) && count($files) === 1) {
 				$files = $files[0];
+			}
+
+			if (!is_array($files)) {
 				$filename = $dir . '/' . $files;
 				if (!$view->is_dir($files)) {
 					self::getSingleFile($view, $dir, $files, $onlyHeader);
-- 
GitLab


From 8a1a1c1326ffa7cecc1a53b1e7648b060d7bfc0f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 7 Oct 2015 16:34:06 +0200
Subject: [PATCH 745/783] Debounce cancel upload message

---
 apps/files/js/file-upload.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 8bae8567a05..77b85ecd7da 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -75,6 +75,9 @@ OC.Upload = {
 			this._uploads.push(jqXHR);
 		}
 	},
+	showUploadCancelMessage: _.debounce(function() {
+		OC.Notification.showTemporary(t('files', 'Upload cancelled.'), {timeout: 10});
+	}, 500),
 	/**
 	 * Checks the currently known uploads.
 	 * returns true if any hxr has the state 'pending'
@@ -415,10 +418,10 @@ OC.Upload = {
 					OC.Upload.log('fail', e, data);
 					if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
 						if (data.textStatus === 'abort') {
-							OC.Notification.show(t('files', 'Upload cancelled.'));
+							OC.Upload.showUploadCancelMessage();
 						} else {
 							// HTTP connection problem
-							OC.Notification.show(data.errorThrown);
+							OC.Notification.showTemporary(data.errorThrown, {timeout: 10});
 							if (data.result) {
 								var result = JSON.parse(data.result);
 								if (result && result[0] && result[0].data && result[0].data.code === 'targetnotfound') {
@@ -427,10 +430,6 @@ OC.Upload = {
 								}
 							}
 						}
-						//hide notification after 10 sec
-						setTimeout(function() {
-							OC.Notification.hide();
-						}, 10000);
 					}
 					OC.Upload.deleteUpload(data);
 				},
-- 
GitLab


From 4a5cecd6fa64b33a63c39d289565837e6d8ac340 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 7 Oct 2015 18:57:49 +0200
Subject: [PATCH 746/783] allow an attribute to return more than one value

---
 apps/user_ldap/lib/access.php | 41 +++++++++++------------------------
 apps/user_ldap/lib/wizard.php |  2 +-
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index a2fdd88a240..c7ec06f356a 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -710,6 +710,9 @@ class Access extends LDAPUtility implements user\IUserTools {
 			if($manyAttributes) {
 				return $list;
 			} else {
+				$list = array_reduce($list, function($carry, $item) {
+					$carry[] = $item[0];
+				}, array());
 				return array_unique($list, SORT_LOCALE_STRING);
 			}
 		}
@@ -982,44 +985,26 @@ class Access extends LDAPUtility implements user\IUserTools {
 
 		if(!is_null($attr)) {
 			$selection = array();
-			$multiArray = false;
-			if(count($attr) > 1) {
-				$multiArray = true;
-				$i = 0;
-			}
+			$i = 0;
 			foreach($findings as $item) {
 				if(!is_array($item)) {
 					continue;
 				}
 				$item = \OCP\Util::mb_array_change_key_case($item, MB_CASE_LOWER, 'UTF-8');
-
-				if($multiArray) {
-					foreach($attr as $key) {
-						$key = mb_strtolower($key, 'UTF-8');
-						if(isset($item[$key])) {
-							if($key !== 'dn') {
-								$selection[$i][$key] = $this->resemblesDN($key) ?
-									$this->sanitizeDN($item[$key][0])
-									: $item[$key][0];
-							} else {
-								$selection[$i][$key] = $this->sanitizeDN($item[$key]);
-							}
-						}
-
-					}
-					$i++;
-				} else {
-					//tribute to case insensitivity
-					$key = mb_strtolower($attr[0], 'UTF-8');
-
+				foreach($attr as $key) {
+					$key = mb_strtolower($key, 'UTF-8');
 					if(isset($item[$key])) {
-						if($this->resemblesDN($key)) {
-							$selection[] = $this->sanitizeDN($item[$key]);
+						if($key !== 'dn') {
+							$selection[$i][$key] = $this->resemblesDN($key) ?
+								$this->sanitizeDN($item[$key])
+								: $item[$key];
 						} else {
-							$selection[] = $item[$key];
+							$selection[$i][$key] = $this->sanitizeDN($item[$key]);
 						}
 					}
+
 				}
+				$i++;
 			}
 			$findings = $selection;
 		}
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 18a0412a63d..a8fcae6314f 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -435,7 +435,7 @@ class Wizard extends LDAPUtility {
 			// detection will fail later
 			$result = $this->access->searchGroups($filter, array('cn', 'dn'), $limit, $offset);
 			foreach($result as $item) {
-				$groupNames[] = $item['cn'];
+				$groupNames[] = $item['cn'][0];
 				$groupEntries[] = $item;
 			}
 			$offset += $limit;
-- 
GitLab


From c5649a634f5187799994542c25c106f9dc6c7446 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 8 Oct 2015 01:54:58 -0400
Subject: [PATCH 747/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/fa.js          | 19 ++++++++++++++++++
 apps/encryption/l10n/fa.json        | 19 ++++++++++++++++++
 apps/files/l10n/cs_CZ.js            |  3 +++
 apps/files/l10n/cs_CZ.json          |  3 +++
 apps/files/l10n/el.js               |  3 +++
 apps/files/l10n/el.json             |  3 +++
 apps/files_external/l10n/cs_CZ.js   |  2 ++
 apps/files_external/l10n/cs_CZ.json |  2 ++
 apps/files_external/l10n/fa.js      | 10 ++++++++++
 apps/files_external/l10n/fa.json    | 10 ++++++++++
 apps/files_sharing/l10n/cs_CZ.js    |  8 ++++++++
 apps/files_sharing/l10n/cs_CZ.json  |  8 ++++++++
 apps/files_sharing/l10n/el.js       |  8 ++++++++
 apps/files_sharing/l10n/el.json     |  8 ++++++++
 apps/files_sharing/l10n/fa.js       |  4 ++++
 apps/files_sharing/l10n/fa.json     |  4 ++++
 apps/files_sharing/l10n/zh_TW.js    |  3 ++-
 apps/files_sharing/l10n/zh_TW.json  |  3 ++-
 apps/user_ldap/l10n/fa.js           |  2 ++
 apps/user_ldap/l10n/fa.json         |  2 ++
 core/l10n/cs_CZ.js                  |  1 +
 core/l10n/cs_CZ.json                |  1 +
 core/l10n/el.js                     |  3 +++
 core/l10n/el.json                   |  3 +++
 core/l10n/es.js                     |  1 +
 core/l10n/es.json                   |  1 +
 core/l10n/fa.js                     | 31 +++++++++++++++++++++++++++++
 core/l10n/fa.json                   | 31 +++++++++++++++++++++++++++++
 core/l10n/fi_FI.js                  |  1 +
 core/l10n/fi_FI.json                |  1 +
 core/l10n/it.js                     |  1 +
 core/l10n/it.json                   |  1 +
 core/l10n/pt_BR.js                  |  1 +
 core/l10n/pt_BR.json                |  1 +
 lib/l10n/fa.js                      |  1 +
 lib/l10n/fa.json                    |  1 +
 settings/l10n/cs_CZ.js              |  1 +
 settings/l10n/cs_CZ.json            |  1 +
 settings/l10n/el.js                 |  2 ++
 settings/l10n/el.json               |  2 ++
 settings/l10n/fa.js                 |  2 ++
 settings/l10n/fa.json               |  2 ++
 settings/l10n/fi_FI.js              |  2 ++
 settings/l10n/fi_FI.json            |  2 ++
 settings/l10n/it.js                 |  2 ++
 settings/l10n/it.json               |  2 ++
 settings/l10n/pt_BR.js              |  2 ++
 settings/l10n/pt_BR.json            |  2 ++
 settings/l10n/zh_TW.js              |  7 +++++++
 settings/l10n/zh_TW.json            |  7 +++++++
 50 files changed, 238 insertions(+), 2 deletions(-)

diff --git a/apps/encryption/l10n/fa.js b/apps/encryption/l10n/fa.js
index 1793326a3f9..ac39a7fbe88 100644
--- a/apps/encryption/l10n/fa.js
+++ b/apps/encryption/l10n/fa.js
@@ -1,18 +1,37 @@
 OC.L10N.register(
     "encryption",
     {
+    "Missing recovery key password" : "فاقد رمزعبور کلید بازیابی",
+    "Please repeat the recovery key password" : "لطفا رمز کلید بازیابی را تکرار کنید",
     "Recovery key successfully enabled" : "کلید بازیابی با موفقیت فعال شده است.",
     "Could not enable recovery key. Please check your recovery key password!" : "کلید بازیابی نمی تواند فعال شود. لطفا رمزعبور کلید بازیابی خود را بررسی نمایید!",
     "Recovery key successfully disabled" : "کلید بازیابی با موفقیت غیر فعال شده است.",
     "Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
     "Missing parameters" : "پارامترهای فراموش شده",
+    "Please provide the old recovery password" : "لطفا رمز بازیابی قدیمی را وارد کنید",
+    "Please provide a new recovery password" : "لطفا رمز بازیابی جدید را وارد کنید",
+    "Please repeat the new recovery password" : "لطفا رمز بازیابی  جدید را مجددا وارد کنید",
     "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
     "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
+    "Recovery Key disabled" : "کلید بازیابی غیرفعال شد",
+    "Recovery Key enabled" : "کلید بازیابی فعال شد",
+    "Could not enable the recovery key, please try again or contact your administrator" : "امکان فعال‌سازی کلید بازیابی وجود ندارد، لطفا مجددا تلاش کرده و یا با مدیر تماس بگیرید",
+    "Could not update the private key password." : "امکان بروزرسانی رمزعبور کلید خصوصی وجود ندارد.",
+    "The old password was not correct, please try again." : "رمزعبور قدیمی اشتباه است، لطفا مجددا تلاش کنید.",
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
+    "Encryption App is enabled and ready" : "برنامه رمزگذاری فعال و آماده است",
+    "The share will expire on %s." : "اشتراک‌گذاری در %s منقضی خواهد شد.",
     "Cheers!" : "سلامتی!",
+    "Enable recovery key" : "فعال‌سازی کلید بازیابی",
+    "Disable recovery key" : "غیرفعال‌سازی کلید بازیابی",
     "Recovery key password" : "رمزعبور کلید بازیابی",
+    "Repeat recovery key password" : "تکرار رمزعبور کلید بازیابی",
     "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
+    "Old recovery key password" : "رمزعبور  قدیمی کلید بازیابی",
+    "New recovery key password" : "رمزعبور جدید کلید بازیابی",
+    "Repeat new recovery key password" : "تکرار رمزعبور جدید کلید بازیابی",
     "Change Password" : "تغییر رمزعبور",
+    "ownCloud basic encryption module" : "ماژول پایه رمزگذاری ownCloud",
     " If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
     "Old log-in password" : "رمزعبور قدیمی",
     "Current log-in password" : "رمزعبور فعلی",
diff --git a/apps/encryption/l10n/fa.json b/apps/encryption/l10n/fa.json
index 3b863326db4..1a6e7d16275 100644
--- a/apps/encryption/l10n/fa.json
+++ b/apps/encryption/l10n/fa.json
@@ -1,16 +1,35 @@
 { "translations": {
+    "Missing recovery key password" : "فاقد رمزعبور کلید بازیابی",
+    "Please repeat the recovery key password" : "لطفا رمز کلید بازیابی را تکرار کنید",
     "Recovery key successfully enabled" : "کلید بازیابی با موفقیت فعال شده است.",
     "Could not enable recovery key. Please check your recovery key password!" : "کلید بازیابی نمی تواند فعال شود. لطفا رمزعبور کلید بازیابی خود را بررسی نمایید!",
     "Recovery key successfully disabled" : "کلید بازیابی با موفقیت غیر فعال شده است.",
     "Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
     "Missing parameters" : "پارامترهای فراموش شده",
+    "Please provide the old recovery password" : "لطفا رمز بازیابی قدیمی را وارد کنید",
+    "Please provide a new recovery password" : "لطفا رمز بازیابی جدید را وارد کنید",
+    "Please repeat the new recovery password" : "لطفا رمز بازیابی  جدید را مجددا وارد کنید",
     "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
     "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
+    "Recovery Key disabled" : "کلید بازیابی غیرفعال شد",
+    "Recovery Key enabled" : "کلید بازیابی فعال شد",
+    "Could not enable the recovery key, please try again or contact your administrator" : "امکان فعال‌سازی کلید بازیابی وجود ندارد، لطفا مجددا تلاش کرده و یا با مدیر تماس بگیرید",
+    "Could not update the private key password." : "امکان بروزرسانی رمزعبور کلید خصوصی وجود ندارد.",
+    "The old password was not correct, please try again." : "رمزعبور قدیمی اشتباه است، لطفا مجددا تلاش کنید.",
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
+    "Encryption App is enabled and ready" : "برنامه رمزگذاری فعال و آماده است",
+    "The share will expire on %s." : "اشتراک‌گذاری در %s منقضی خواهد شد.",
     "Cheers!" : "سلامتی!",
+    "Enable recovery key" : "فعال‌سازی کلید بازیابی",
+    "Disable recovery key" : "غیرفعال‌سازی کلید بازیابی",
     "Recovery key password" : "رمزعبور کلید بازیابی",
+    "Repeat recovery key password" : "تکرار رمزعبور کلید بازیابی",
     "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
+    "Old recovery key password" : "رمزعبور  قدیمی کلید بازیابی",
+    "New recovery key password" : "رمزعبور جدید کلید بازیابی",
+    "Repeat new recovery key password" : "تکرار رمزعبور جدید کلید بازیابی",
     "Change Password" : "تغییر رمزعبور",
+    "ownCloud basic encryption module" : "ماژول پایه رمزگذاری ownCloud",
     " If you don't remember your old password you can ask your administrator to recover your files." : "اگر رمزعبور قدیمی را فراموش کرده اید میتوانید از مدیر خود برای بازیابی فایل هایتان درخواست نمایید.",
     "Old log-in password" : "رمزعبور قدیمی",
     "Current log-in password" : "رمزعبور فعلی",
diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js
index 7ef3a2ec9aa..10f9d49984f 100644
--- a/apps/files/l10n/cs_CZ.js
+++ b/apps/files/l10n/cs_CZ.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s smazal(a) %1$s",
     "You restored %1$s" : "Obnovili jste %1$s",
     "%2$s restored %1$s" : "%2$s obnovil(a) %1$s",
+    "Changed by %2$s" : "Změněno uživatelem %2$s",
+    "Deleted by %2$s" : "Smazáno uživatelem %2$s",
+    "Restored by %2$s" : "Obnoveno uživatelem %2$s",
     "%s could not be renamed as it has been deleted" : "%s nelze přejmenovat, protože byl smazán",
     "%s could not be renamed" : "%s nemůže být přejmenován",
     "Upload (max. %s)" : "Nahrát (max. %s)",
diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json
index 55b374f9ea6..cc475fbfd5c 100644
--- a/apps/files/l10n/cs_CZ.json
+++ b/apps/files/l10n/cs_CZ.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s smazal(a) %1$s",
     "You restored %1$s" : "Obnovili jste %1$s",
     "%2$s restored %1$s" : "%2$s obnovil(a) %1$s",
+    "Changed by %2$s" : "Změněno uživatelem %2$s",
+    "Deleted by %2$s" : "Smazáno uživatelem %2$s",
+    "Restored by %2$s" : "Obnoveno uživatelem %2$s",
     "%s could not be renamed as it has been deleted" : "%s nelze přejmenovat, protože byl smazán",
     "%s could not be renamed" : "%s nemůže být přejmenován",
     "Upload (max. %s)" : "Nahrát (max. %s)",
diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js
index 895ffe19267..063c9f0fe44 100644
--- a/apps/files/l10n/el.js
+++ b/apps/files/l10n/el.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "Ο %2$s διέγραψε %1$s",
     "You restored %1$s" : "Επαναφέρατε %1$s",
     "%2$s restored %1$s" : "%2$s επανέφερε %1$s",
+    "Changed by %2$s" : "Άλλαξε από %2$s",
+    "Deleted by %2$s" : "Διαγράφηκε από %2$s",
+    "Restored by %2$s" : "Επαναφορά απο %2$s",
     "%s could not be renamed as it has been deleted" : "%s δεν μπορούσε να μετονομαστεί εφόσον είχε διαγραφεί",
     "%s could not be renamed" : "Αδυναμία μετονομασίας του %s",
     "Upload (max. %s)" : "Διαμοιρασμός (max. %s)",
diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json
index 0d24b6c7015..b374964c8b6 100644
--- a/apps/files/l10n/el.json
+++ b/apps/files/l10n/el.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "Ο %2$s διέγραψε %1$s",
     "You restored %1$s" : "Επαναφέρατε %1$s",
     "%2$s restored %1$s" : "%2$s επανέφερε %1$s",
+    "Changed by %2$s" : "Άλλαξε από %2$s",
+    "Deleted by %2$s" : "Διαγράφηκε από %2$s",
+    "Restored by %2$s" : "Επαναφορά απο %2$s",
     "%s could not be renamed as it has been deleted" : "%s δεν μπορούσε να μετονομαστεί εφόσον είχε διαγραφεί",
     "%s could not be renamed" : "Αδυναμία μετονομασίας του %s",
     "Upload (max. %s)" : "Διαμοιρασμός (max. %s)",
diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
index 59b3f9b148c..efa5f227a90 100644
--- a/apps/files_external/l10n/cs_CZ.js
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -41,6 +41,7 @@ OC.L10N.register(
     "OpenStack" : "OpenStack",
     "Username" : "Uživatelské jméno",
     "Password" : "Heslo",
+    "Rackspace" : "Rackspace",
     "API key" : "Klíč API",
     "Username and password" : "Uživatelské jméno a heslo",
     "Session credentials" : "Přihlašovací údaje sezení",
@@ -74,6 +75,7 @@ OC.L10N.register(
     "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
     "Username as share" : "Uživatelské jméno jako sdílený adresář",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Jméno služby",
     "Request timeout (seconds)" : "Čas vypršení požadavku (sekundy)",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
index 08837e76a83..8aa349522f9 100644
--- a/apps/files_external/l10n/cs_CZ.json
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -39,6 +39,7 @@
     "OpenStack" : "OpenStack",
     "Username" : "Uživatelské jméno",
     "Password" : "Heslo",
+    "Rackspace" : "Rackspace",
     "API key" : "Klíč API",
     "Username and password" : "Uživatelské jméno a heslo",
     "Session credentials" : "Přihlašovací údaje sezení",
@@ -72,6 +73,7 @@
     "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
     "Username as share" : "Uživatelské jméno jako sdílený adresář",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Jméno služby",
     "Request timeout (seconds)" : "Čas vypršení požadavku (sekundy)",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
diff --git a/apps/files_external/l10n/fa.js b/apps/files_external/l10n/fa.js
index 53723eae96e..efcb4fea048 100644
--- a/apps/files_external/l10n/fa.js
+++ b/apps/files_external/l10n/fa.js
@@ -1,11 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
+    "Please provide a valid app key and secret." : "لطفا یک کلید و رمز معتبر برای برنامه فرآهم کنید.",
+    "Step 1 failed. Exception: %s" : "گام 1 ناموفق بود. خطا: %s",
+    "Step 2 failed. Exception: %s" : "گام 2ناموفق بود. خطا: %s",
     "External storage" : "حافظه خارجی",
+    "Storage with id \"%i\" not found" : "فضای ذخیره‌سازی با شماره \"%i\" یافت نشد",
     "Personal" : "شخصی",
     "System" : "سیستم",
     "Grant access" : " مجوز اعطا دسترسی",
     "Access granted" : "مجوز دسترسی صادر شد",
+    "Error configuring OAuth1" : "خطا پیکربندی OAuth1",
+    "Error configuring OAuth2" : "خطا پیکربندی OAuth2",
     "Generate keys" : "تولید کلید",
     "Enable encryption" : "فعال کردن رمزگذاری",
     "Check for changes" : "بررسی برای تغییرات",
@@ -15,6 +21,10 @@ OC.L10N.register(
     "Access key" : "کلید دسترسی",
     "Secret key" : "کلید مخفی",
     "None" : "هیچ‌کدام",
+    "OAuth1" : "OAuth1",
+    "App secret" : "کد برنامه",
+    "OAuth2" : "OAuth2",
+    "OpenStack" : "OpenStack",
     "Username" : "نام کاربری",
     "Password" : "گذرواژه",
     "API key" : "کلید API ",
diff --git a/apps/files_external/l10n/fa.json b/apps/files_external/l10n/fa.json
index 98aa7c58827..9e4e3b00365 100644
--- a/apps/files_external/l10n/fa.json
+++ b/apps/files_external/l10n/fa.json
@@ -1,9 +1,15 @@
 { "translations": {
+    "Please provide a valid app key and secret." : "لطفا یک کلید و رمز معتبر برای برنامه فرآهم کنید.",
+    "Step 1 failed. Exception: %s" : "گام 1 ناموفق بود. خطا: %s",
+    "Step 2 failed. Exception: %s" : "گام 2ناموفق بود. خطا: %s",
     "External storage" : "حافظه خارجی",
+    "Storage with id \"%i\" not found" : "فضای ذخیره‌سازی با شماره \"%i\" یافت نشد",
     "Personal" : "شخصی",
     "System" : "سیستم",
     "Grant access" : " مجوز اعطا دسترسی",
     "Access granted" : "مجوز دسترسی صادر شد",
+    "Error configuring OAuth1" : "خطا پیکربندی OAuth1",
+    "Error configuring OAuth2" : "خطا پیکربندی OAuth2",
     "Generate keys" : "تولید کلید",
     "Enable encryption" : "فعال کردن رمزگذاری",
     "Check for changes" : "بررسی برای تغییرات",
@@ -13,6 +19,10 @@
     "Access key" : "کلید دسترسی",
     "Secret key" : "کلید مخفی",
     "None" : "هیچ‌کدام",
+    "OAuth1" : "OAuth1",
+    "App secret" : "کد برنامه",
+    "OAuth2" : "OAuth2",
+    "OpenStack" : "OpenStack",
     "Username" : "نام کاربری",
     "Password" : "گذرواژه",
     "API key" : "کلید API ",
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index be924134ae2..7c52f1c21ff 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -43,6 +43,14 @@ OC.L10N.register(
     "%2$s shared %1$s via link" : "%2$s nasdílel(a) %1$s jako odkaz",
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
+    "Downloaded via public link" : "Staženo pomocí veřejného odkazu",
+    "Shared with %2$s" : "Sdíleno s %2$s",
+    "Shared with group %2$s" : "Sdíleno se skupinou %2$s",
+    "Shared with %3$s by %2$s" : "%2$s sdílí s %3$s",
+    "Shared with group %3$s by %2$s" : "%2$s sdílí se skupinou %3$s",
+    "Shared via link by %2$s" : "%2$s sdílel(a) jako odkaz",
+    "Shared by %2$s" : "%2$s sdílel(a)",
+    "Shared via public link" : "Sdíleno jako veřejný odkaz",
     "Shares" : "Sdílení",
     "Accept" : "Přijmout",
     "Decline" : "Zamítnout",
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index a889bbc1235..0e139f7bbf5 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -41,6 +41,14 @@
     "%2$s shared %1$s via link" : "%2$s nasdílel(a) %1$s jako odkaz",
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
+    "Downloaded via public link" : "Staženo pomocí veřejného odkazu",
+    "Shared with %2$s" : "Sdíleno s %2$s",
+    "Shared with group %2$s" : "Sdíleno se skupinou %2$s",
+    "Shared with %3$s by %2$s" : "%2$s sdílí s %3$s",
+    "Shared with group %3$s by %2$s" : "%2$s sdílí se skupinou %3$s",
+    "Shared via link by %2$s" : "%2$s sdílel(a) jako odkaz",
+    "Shared by %2$s" : "%2$s sdílel(a)",
+    "Shared via public link" : "Sdíleno jako veřejný odkaz",
     "Shares" : "Sdílení",
     "Accept" : "Přijmout",
     "Decline" : "Zamítnout",
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 6f71bdc2832..e4024492b65 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -43,6 +43,14 @@ OC.L10N.register(
     "%2$s shared %1$s via link" : "Ο %2$s διαμοιράστηκε το %1$s μέσω συνδέσμου",
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
+    "Downloaded via public link" : "Μεταφορτώθηκε μέσω δημόσιου συνδέσμου",
+    "Shared with %2$s" : "Διαμοιράστηκε με %2$s",
+    "Shared with group %2$s" : "Διαμοιράστηκε με την ομάδα %2$s",
+    "Shared with %3$s by %2$s" : "Διαμοιράστηκε με %3$s από %2$s",
+    "Shared with group %3$s by %2$s" : "Διαμοιράστηκε με την ομάδα %3$s από %2$s",
+    "Shared via link by %2$s" : "Διαμοιράστηκε μέσω συνδέσμου από %2$s",
+    "Shared by %2$s" : "Διαμοιράστηκε από %2$s",
+    "Shared via public link" : "Διαμοιράστηκε μέσω δημόσιου συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
     "You received %2$s as a remote share from %1$s" : "Λάβατε το %2$s ως απομακρυσμένο διαμοιρασμό από %1$s",
     "Accept" : "Αποδοχή",
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index c1bdc039f9d..7bf5c00841e 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -41,6 +41,14 @@
     "%2$s shared %1$s via link" : "Ο %2$s διαμοιράστηκε το %1$s μέσω συνδέσμου",
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
+    "Downloaded via public link" : "Μεταφορτώθηκε μέσω δημόσιου συνδέσμου",
+    "Shared with %2$s" : "Διαμοιράστηκε με %2$s",
+    "Shared with group %2$s" : "Διαμοιράστηκε με την ομάδα %2$s",
+    "Shared with %3$s by %2$s" : "Διαμοιράστηκε με %3$s από %2$s",
+    "Shared with group %3$s by %2$s" : "Διαμοιράστηκε με την ομάδα %3$s από %2$s",
+    "Shared via link by %2$s" : "Διαμοιράστηκε μέσω συνδέσμου από %2$s",
+    "Shared by %2$s" : "Διαμοιράστηκε από %2$s",
+    "Shared via public link" : "Διαμοιράστηκε μέσω δημόσιου συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
     "You received %2$s as a remote share from %1$s" : "Λάβατε το %2$s ως απομακρυσμένο διαμοιρασμό από %1$s",
     "Accept" : "Αποδοχή",
diff --git a/apps/files_sharing/l10n/fa.js b/apps/files_sharing/l10n/fa.js
index 29cd5818d40..cd915b79a17 100644
--- a/apps/files_sharing/l10n/fa.js
+++ b/apps/files_sharing/l10n/fa.js
@@ -3,18 +3,22 @@ OC.L10N.register(
     {
     "Server to server sharing is not enabled on this server" : "اشتراک سرور به سرور در این سرور فعال نیست .",
     "Invalid or untrusted SSL certificate" : "گواهینامه SSL غیر قابل اعتماد یا غیر معتبر است.",
+    "Could not authenticate to remote share, password might be wrong" : "احرازهویت برای اشتراک‌گذاری راه‌دور انجام نشد، احتمالا رمزعبور نادرست است",
     "Storage not valid" : "فضای ذخیره‌سازی معتبر نیست",
     "Couldn't add remote share" : "امکان افزودن اشتراک گذاری از راه دور وجود ندارد",
     "Shared with you" : "موارد به اشتراک گذاشته شده با شما",
     "Shared with others" : "موارد به اشتراک گذاشته شده با دیگران",
     "Shared by link" : "اشتراک گذاشته شده از طریق پیوند",
+    "Nothing shared with you yet" : "هیچ موردی با شما به اشتراک گذاشته نشده است",
     "Nothing shared yet" : "هیچ موردی تاکنون به اشتراک گذاشته نشده است",
     "No shared links" : "هیچ لینک اشتراک‌گذاری وجود ندارد",
+    "Files and folders you share by link will show up here" : "فایل‌ها و پوشه‌های اشتراک‌گذاشته توسط شما همراه با لینک در اینجا نمایش داده خواهد شد",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "آیا مایل به افزودن اشتراک از راه دور {name} از {owner}@{remote} هستید.",
     "Remote share" : "اشتراک از راه دور",
     "Remote share password" : "رمز عبور اشتراک از راه دور",
     "Cancel" : "منصرف شدن",
     "Add remote share" : "افزودن اشتراک از راه دور",
+    "You can upload into this folder" : "می‌توانید در این پوشه آپلود کنید",
     "Invalid ownCloud url" : "آدرس نمونه ownCloud  غیر معتبر است",
     "Shared by" : "اشتراک گذاشته شده به وسیله",
     "Sharing" : "اشتراک گذاری",
diff --git a/apps/files_sharing/l10n/fa.json b/apps/files_sharing/l10n/fa.json
index 64d03e5186a..a345d9f1401 100644
--- a/apps/files_sharing/l10n/fa.json
+++ b/apps/files_sharing/l10n/fa.json
@@ -1,18 +1,22 @@
 { "translations": {
     "Server to server sharing is not enabled on this server" : "اشتراک سرور به سرور در این سرور فعال نیست .",
     "Invalid or untrusted SSL certificate" : "گواهینامه SSL غیر قابل اعتماد یا غیر معتبر است.",
+    "Could not authenticate to remote share, password might be wrong" : "احرازهویت برای اشتراک‌گذاری راه‌دور انجام نشد، احتمالا رمزعبور نادرست است",
     "Storage not valid" : "فضای ذخیره‌سازی معتبر نیست",
     "Couldn't add remote share" : "امکان افزودن اشتراک گذاری از راه دور وجود ندارد",
     "Shared with you" : "موارد به اشتراک گذاشته شده با شما",
     "Shared with others" : "موارد به اشتراک گذاشته شده با دیگران",
     "Shared by link" : "اشتراک گذاشته شده از طریق پیوند",
+    "Nothing shared with you yet" : "هیچ موردی با شما به اشتراک گذاشته نشده است",
     "Nothing shared yet" : "هیچ موردی تاکنون به اشتراک گذاشته نشده است",
     "No shared links" : "هیچ لینک اشتراک‌گذاری وجود ندارد",
+    "Files and folders you share by link will show up here" : "فایل‌ها و پوشه‌های اشتراک‌گذاشته توسط شما همراه با لینک در اینجا نمایش داده خواهد شد",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "آیا مایل به افزودن اشتراک از راه دور {name} از {owner}@{remote} هستید.",
     "Remote share" : "اشتراک از راه دور",
     "Remote share password" : "رمز عبور اشتراک از راه دور",
     "Cancel" : "منصرف شدن",
     "Add remote share" : "افزودن اشتراک از راه دور",
+    "You can upload into this folder" : "می‌توانید در این پوشه آپلود کنید",
     "Invalid ownCloud url" : "آدرس نمونه ownCloud  غیر معتبر است",
     "Shared by" : "اشتراک گذاشته شده به وسیله",
     "Sharing" : "اشتراک گذاری",
diff --git a/apps/files_sharing/l10n/zh_TW.js b/apps/files_sharing/l10n/zh_TW.js
index a5f97c92092..bc49d1d8a48 100644
--- a/apps/files_sharing/l10n/zh_TW.js
+++ b/apps/files_sharing/l10n/zh_TW.js
@@ -35,6 +35,7 @@ OC.L10N.register(
     "Add to your ownCloud" : "加入到你的 ownCloud",
     "Download" : "下載",
     "Download %s" : "下載 %s",
-    "Direct link" : "直接連結"
+    "Direct link" : "直接連結",
+    "Federated Cloud Sharing" : "聯盟式雲端分享"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/zh_TW.json b/apps/files_sharing/l10n/zh_TW.json
index 67150e495b9..3567ed51df4 100644
--- a/apps/files_sharing/l10n/zh_TW.json
+++ b/apps/files_sharing/l10n/zh_TW.json
@@ -33,6 +33,7 @@
     "Add to your ownCloud" : "加入到你的 ownCloud",
     "Download" : "下載",
     "Download %s" : "下載 %s",
-    "Direct link" : "直接連結"
+    "Direct link" : "直接連結",
+    "Federated Cloud Sharing" : "聯盟式雲端分享"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fa.js b/apps/user_ldap/l10n/fa.js
index 7dd4e884a4d..4e3e924d88d 100644
--- a/apps/user_ldap/l10n/fa.js
+++ b/apps/user_ldap/l10n/fa.js
@@ -13,6 +13,8 @@ OC.L10N.register(
     "Configuration OK" : "پیکربندی صحیح است",
     "Select groups" : "انتخاب گروه ها",
     "Select object classes" : "انتخاب کلاس های اشیا",
+    "Please specify the port, it could not be auto-detected." : "لطفا پورت را مشخص کنید، امکان تعیین خودکار وجود ندارد.",
+    "Could not detect Base DN, please enter it manually." : "امکان شناسایی Base DN, وجود ندارد، لطفا بصورت دستی آنرا وارد کنید.",
     "{nthServer}. Server" : "سرور {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
     "Confirm Deletion" : "تایید حذف",
diff --git a/apps/user_ldap/l10n/fa.json b/apps/user_ldap/l10n/fa.json
index 34a36eaf3bd..5efa24f0d51 100644
--- a/apps/user_ldap/l10n/fa.json
+++ b/apps/user_ldap/l10n/fa.json
@@ -11,6 +11,8 @@
     "Configuration OK" : "پیکربندی صحیح است",
     "Select groups" : "انتخاب گروه ها",
     "Select object classes" : "انتخاب کلاس های اشیا",
+    "Please specify the port, it could not be auto-detected." : "لطفا پورت را مشخص کنید، امکان تعیین خودکار وجود ندارد.",
+    "Could not detect Base DN, please enter it manually." : "امکان شناسایی Base DN, وجود ندارد، لطفا بصورت دستی آنرا وارد کنید.",
     "{nthServer}. Server" : "سرور {nthServer}.",
     "Do you really want to delete the current Server Configuration?" : "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
     "Confirm Deletion" : "تایید حذف",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index b11e7eab730..30c7e7d2b78 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -183,6 +183,7 @@ OC.L10N.register(
     "Reset password" : "Obnovit heslo",
     "Searching other places" : "Prohledávání ostatních umístění",
     "No search results in other folders" : "V ostatních adresářích nebylo nic nalezeno",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} nález v dalším adresáři","{count} nálezy v dalších adresářích","{count} nálezů v dalších adresářích"],
     "Personal" : "Osobní",
     "Users" : "Uživatelé",
     "Apps" : "Aplikace",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 7f92a531a69..ede877c6f23 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -181,6 +181,7 @@
     "Reset password" : "Obnovit heslo",
     "Searching other places" : "Prohledávání ostatních umístění",
     "No search results in other folders" : "V ostatních adresářích nebylo nic nalezeno",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} nález v dalším adresáři","{count} nálezy v dalších adresářích","{count} nálezů v dalších adresářích"],
     "Personal" : "Osobní",
     "Users" : "Uživatelé",
     "Apps" : "Aplikace",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 861bd24c208..96b0053ec1a 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -13,6 +13,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Αναβαθμίστηκε \"%s\" σε %s",
     "Repair warning: " : "Προειδοποίηση διόρθωσης:",
     "Repair error: " : "Σφάλμα διόρθωσης:",
+    "Set log level to debug - current level: \"%s\"" : "Καθορισμός του επιπέδου καταγραφής σε αποσφαλμάτωση - τρέχον επίπεδο: \"%s\"",
+    "Reset log level to  \"%s\"" : "Επαναφορά επιπέδου καταγραφής σε \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Οι παρακάτω εφαρμογές έχουν απενεργοποιηθεί: %s",
     "Following apps have been disabled: %s" : "Οι ακόλουθες εφαρμογές έχουν απενεργοποιηθεί: %s",
     "Already up to date" : "Ήδη ενημερωμένο",
@@ -108,6 +110,7 @@ OC.L10N.register(
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Το /dev/urandom δεν είναι αναγνώσιμο από την PHP, το οποίο δεν συνίσταται για λόγους ασφαλείας. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωσή</a> μας.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Η έκδοσή σας της PHP ({version}) <a href=\"{phpLink}\">δεν υποστηρίζεται πια από την PHP</a>. Σας παροτρύνουμε να αναβαθμίσετε την PHP για να επωφεληθείτε από την απόδοση και την ασφάλεια που παρέχει η PHP.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Η διαμόρφωση των reverse proxy headers δεν είναι σωστή ή συνδέεστε στο ownCloud από ένα έμπιστο διαμεσολαβητή. Αν δεν συνδέεστε στο ownCloud από έμπιστο διαμεσολαβητή, αυτό είναι ένα θέμα ασφαλείας και μπορεί να επιτρέψει σε έναν επιτιθέμενο να μασκαρέψει τη διεύθυνση IP του ως ορατή στο ownCloud. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωση</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Το Memcached είναι ρυθμισμένο ως κατανεμημένη cache, αλλά είναι εγκατεστημένη η λάθος μονάδα \"memcache\" της PHP. Το \\OC\\Memcache\\Memcached υποστηρίζει μόνο τη \"memcached\" και όχι τη \"memcache\". Δείτε τη <a href=\"{wikiLink}\">memcached wiki και για τις δύο μονάδες</a>.",
     "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "H \"{header}\" κεφαλίδα HTTP δεν έχει ρυθμιστεί ώστε να ισούται με \"{expected}\". Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας ή ιδιωτικότητας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Η «Strict-Transport-Security\" κεφαλίδα HTTP δεν έχει ρυθμιστεί για τουλάχιστον \"{seconds}\" δευτερόλεπτα. Για αυξημένη ασφάλεια συστήνουμε την ενεργοποίηση του HSTS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index ea2f75f65e5..36ea47aa2c3 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -11,6 +11,8 @@
     "Updated \"%s\" to %s" : "Αναβαθμίστηκε \"%s\" σε %s",
     "Repair warning: " : "Προειδοποίηση διόρθωσης:",
     "Repair error: " : "Σφάλμα διόρθωσης:",
+    "Set log level to debug - current level: \"%s\"" : "Καθορισμός του επιπέδου καταγραφής σε αποσφαλμάτωση - τρέχον επίπεδο: \"%s\"",
+    "Reset log level to  \"%s\"" : "Επαναφορά επιπέδου καταγραφής σε \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Οι παρακάτω εφαρμογές έχουν απενεργοποιηθεί: %s",
     "Following apps have been disabled: %s" : "Οι ακόλουθες εφαρμογές έχουν απενεργοποιηθεί: %s",
     "Already up to date" : "Ήδη ενημερωμένο",
@@ -106,6 +108,7 @@
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Το /dev/urandom δεν είναι αναγνώσιμο από την PHP, το οποίο δεν συνίσταται για λόγους ασφαλείας. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωσή</a> μας.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Η έκδοσή σας της PHP ({version}) <a href=\"{phpLink}\">δεν υποστηρίζεται πια από την PHP</a>. Σας παροτρύνουμε να αναβαθμίσετε την PHP για να επωφεληθείτε από την απόδοση και την ασφάλεια που παρέχει η PHP.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Η διαμόρφωση των reverse proxy headers δεν είναι σωστή ή συνδέεστε στο ownCloud από ένα έμπιστο διαμεσολαβητή. Αν δεν συνδέεστε στο ownCloud από έμπιστο διαμεσολαβητή, αυτό είναι ένα θέμα ασφαλείας και μπορεί να επιτρέψει σε έναν επιτιθέμενο να μασκαρέψει τη διεύθυνση IP του ως ορατή στο ownCloud. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωση</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Το Memcached είναι ρυθμισμένο ως κατανεμημένη cache, αλλά είναι εγκατεστημένη η λάθος μονάδα \"memcache\" της PHP. Το \\OC\\Memcache\\Memcached υποστηρίζει μόνο τη \"memcached\" και όχι τη \"memcache\". Δείτε τη <a href=\"{wikiLink}\">memcached wiki και για τις δύο μονάδες</a>.",
     "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "H \"{header}\" κεφαλίδα HTTP δεν έχει ρυθμιστεί ώστε να ισούται με \"{expected}\". Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας ή ιδιωτικότητας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Η «Strict-Transport-Security\" κεφαλίδα HTTP δεν έχει ρυθμιστεί για τουλάχιστον \"{seconds}\" δευτερόλεπτα. Για αυξημένη ασφάλεια συστήνουμε την ενεργοποίηση του HSTS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 816e4601520..598ab77ac09 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom no es legible por PHP el mismo es altamente desalentado por razones de seguridad. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Su versión PHP ({version}) ya no es  <a href=\"{phpLink}\">respaldada por PHP</a>.  Recomendamos actualizar su versión de PHP para aprovechar las actualizaciones de rendimiento y seguridad proporcionadas por PHP.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configuración de las cabeceras inversas del proxy son incorrectas, o está accediendo a ownCloud desde un proxy confiable. Si no está accediendo a ownCloud desde un proxy certificado y confiable, este es un problema de seguridad y puede permitirle a un hacker camuflar su dirección IP a ownCloud. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "memcached es un sistema de cache distribuido. pero ha sido instalado por error el modulo PHP memcache.\nConsulte <a href=\"{wikiLink}\">memcached wiki acerca de ambos modulos</a>",
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "La cabecera HTTP \"Strict-Transport-Security\" no está configurada en al menos \"{segundos}\" segundos. Para una mejor seguridad recomendamos que habilite HSTS como es descripta en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index bc4b3c4dd34..f650b9ba45e 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -108,6 +108,7 @@
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom no es legible por PHP el mismo es altamente desalentado por razones de seguridad. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Su versión PHP ({version}) ya no es  <a href=\"{phpLink}\">respaldada por PHP</a>.  Recomendamos actualizar su versión de PHP para aprovechar las actualizaciones de rendimiento y seguridad proporcionadas por PHP.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configuración de las cabeceras inversas del proxy son incorrectas, o está accediendo a ownCloud desde un proxy confiable. Si no está accediendo a ownCloud desde un proxy certificado y confiable, este es un problema de seguridad y puede permitirle a un hacker camuflar su dirección IP a ownCloud. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "memcached es un sistema de cache distribuido. pero ha sido instalado por error el modulo PHP memcache.\nConsulte <a href=\"{wikiLink}\">memcached wiki acerca de ambos modulos</a>",
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "La cabecera HTTP \"Strict-Transport-Security\" no está configurada en al menos \"{segundos}\" segundos. Para una mejor seguridad recomendamos que habilite HSTS como es descripta en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index 694750bba81..e781c67281d 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -5,8 +5,14 @@ OC.L10N.register(
     "Preparing update" : "آماده‌سازی به روز‌ رسانی",
     "Turned on maintenance mode" : "حالت \" در دست تعمیر \" فعال شد .",
     "Turned off maintenance mode" : "حالت \" در دست تعمیر \" غیرفعال شد .",
+    "Maintenance mode is kept active" : "حالت تعمیرات فعال نگه‌داشته شده است",
     "Updated database" : "بروز رسانی پایگاه داده انجام شد .",
+    "Updated \"%s\" to %s" : "\"%s\" به %s بروزرسانی شد",
+    "Repair warning: " : "اخطار تعمیر:",
+    "Repair error: " : "خطای تعمیر:",
+    "Already up to date" : "در حال حاضر بروز است",
     "File is too big" : "فایل خیلی بزرگ است",
+    "Invalid file provided" : "فایل داده‌شده نا معتبر است",
     "No image or file provided" : "هیچ فایل یا تصویری وارد نشده است",
     "Unknown filetype" : "نوع فایل ناشناخته",
     "Invalid image" : "عکس نامعتبر",
@@ -25,6 +31,13 @@ OC.L10N.register(
     "Thu." : "پنج شنبه",
     "Fri." : "جمعه",
     "Sat." : "شنبه",
+    "Su" : "یک‌شنبه",
+    "Mo" : "دوشنبه",
+    "Tu" : "سه‌شنبه",
+    "We" : "چهار‌شنبه",
+    "Th" : "پنج‌شنبه",
+    "Fr" : "جمعه",
+    "Sa" : "شنبه",
     "January" : "ژانویه",
     "February" : "فبریه",
     "March" : "مارس",
@@ -72,6 +85,7 @@ OC.L10N.register(
     "Continue" : "ادامه",
     "(all selected)" : "(همه انتخاب شده اند)",
     "({count} selected)" : "({count} انتخاب شده)",
+    "Error loading file exists template" : "خطا در بارگزاری فایل قالب",
     "Very weak password" : "رمز عبور بسیار ضعیف",
     "Weak password" : "رمز عبور ضعیف",
     "So-so password" : "رمز عبور متوسط",
@@ -118,6 +132,7 @@ OC.L10N.register(
     "Share with users or groups …" : "اشتراک گذاری با کاربران یا گروه ها ...",
     "Share with users, groups or remote users …" : "اشتراک گذاری با کاربران، گروه‌ها یا کاربران راه دور...",
     "Warning" : "اخطار",
+    "Error while sending notification" : "خطا در حین ارسال نوتیفیکیشن",
     "The object type is not specified." : "نوع شی تعیین نشده است.",
     "Enter new" : "مورد جدید را وارد کنید",
     "Delete" : "حذف",
@@ -126,9 +141,13 @@ OC.L10N.register(
     "unknown text" : "متن نامعلوم",
     "Hello world!" : "سلام دنیا!",
     "sunny" : "آفتابی",
+    "Hello {name}, the weather is {weather}" : "سلام {name}, هوا  {weather} است",
     "Hello {name}" : "سلام {name}",
     "_download %n file_::_download %n files_" : ["دانلود %n فایل"],
+    "The update was unsuccessful. " : "بروزرسانی ناموفق بود.",
+    "The update was successful. There were warnings." : "بروزرسانی با موفقیت انجام شد، اخطارهایی وجود دارد.",
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
+    "%s password reset" : "%s رمزعبور تغییر کرد",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
     "New password" : "گذرواژه جدید",
     "New Password" : "رمزعبور جدید",
@@ -147,14 +166,18 @@ OC.L10N.register(
     "Error unfavoriting" : "خطا هنگام حذف از موارد محبوب",
     "Access forbidden" : "اجازه دسترسی به مناطق ممنوعه را ندارید",
     "File not found" : "فایل یافت نشد",
+    "The share will expire on %s." : "اشتراک‌گذاری در %s منقضی خواهد شد.",
     "Cheers!" : "سلامتی!",
     "Internal Server Error" : "خطای داخلی سرور",
     "Technical details" : "جزئیات فنی",
+    "Remote Address: %s" : "آدرس راه‌دور: %s",
+    "Request ID: %s" : "ID درخواست: %s",
     "Type: %s" : "نوع: %s",
     "Code: %s" : "کد: %s",
     "Message: %s" : "پیام: %s",
     "File: %s" : "فایل : %s",
     "Line: %s" : "خط: %s",
+    "Security warning" : "اخطار امنیتی",
     "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> بسازید",
     "Username" : "نام کاربری",
@@ -167,14 +190,22 @@ OC.L10N.register(
     "Database name" : "نام پایگاه داده",
     "Database tablespace" : "جدول پایگاه داده",
     "Database host" : "هاست پایگاه داده",
+    "Performance warning" : "اخطار کارایی",
     "Finish setup" : "اتمام نصب",
     "Finishing …" : "در حال اتمام ...",
+    "Need help?" : "کمک لازم دارید ؟",
     "Log out" : "خروج",
     "Search" : "جست‌و‌جو",
+    "Please contact your administrator." : "لطفا با مدیر وب‌سایت تماس بگیرید.",
+    "An internal error occured." : "یک خطای داخلی رخ داده‌است.",
+    "Please try again or contact your administrator." : "لطفا مجددا تلاش کنید یا با مدیر سیستم تماس بگیرید.",
     "Log in" : "ورود",
     "remember" : "بیاد آوری",
     "Alternative Logins" : "ورود متناوب",
     "Thank you for your patience." : "از صبر شما متشکریم",
+    "Add \"%s\" as trusted domain" : "افزودن \"%s\" به عنوان دامنه مورد اعتماد",
+    "These apps will be updated:" : "این برنامه‌ها بروزرسانی شده‌اند:",
+    "The theme %s has been disabled." : "قالب %s غیر فعال شد.",
     "Start update" : "اغاز به روز رسانی"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index d1dd024ec42..56604614b4f 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -3,8 +3,14 @@
     "Preparing update" : "آماده‌سازی به روز‌ رسانی",
     "Turned on maintenance mode" : "حالت \" در دست تعمیر \" فعال شد .",
     "Turned off maintenance mode" : "حالت \" در دست تعمیر \" غیرفعال شد .",
+    "Maintenance mode is kept active" : "حالت تعمیرات فعال نگه‌داشته شده است",
     "Updated database" : "بروز رسانی پایگاه داده انجام شد .",
+    "Updated \"%s\" to %s" : "\"%s\" به %s بروزرسانی شد",
+    "Repair warning: " : "اخطار تعمیر:",
+    "Repair error: " : "خطای تعمیر:",
+    "Already up to date" : "در حال حاضر بروز است",
     "File is too big" : "فایل خیلی بزرگ است",
+    "Invalid file provided" : "فایل داده‌شده نا معتبر است",
     "No image or file provided" : "هیچ فایل یا تصویری وارد نشده است",
     "Unknown filetype" : "نوع فایل ناشناخته",
     "Invalid image" : "عکس نامعتبر",
@@ -23,6 +29,13 @@
     "Thu." : "پنج شنبه",
     "Fri." : "جمعه",
     "Sat." : "شنبه",
+    "Su" : "یک‌شنبه",
+    "Mo" : "دوشنبه",
+    "Tu" : "سه‌شنبه",
+    "We" : "چهار‌شنبه",
+    "Th" : "پنج‌شنبه",
+    "Fr" : "جمعه",
+    "Sa" : "شنبه",
     "January" : "ژانویه",
     "February" : "فبریه",
     "March" : "مارس",
@@ -70,6 +83,7 @@
     "Continue" : "ادامه",
     "(all selected)" : "(همه انتخاب شده اند)",
     "({count} selected)" : "({count} انتخاب شده)",
+    "Error loading file exists template" : "خطا در بارگزاری فایل قالب",
     "Very weak password" : "رمز عبور بسیار ضعیف",
     "Weak password" : "رمز عبور ضعیف",
     "So-so password" : "رمز عبور متوسط",
@@ -116,6 +130,7 @@
     "Share with users or groups …" : "اشتراک گذاری با کاربران یا گروه ها ...",
     "Share with users, groups or remote users …" : "اشتراک گذاری با کاربران، گروه‌ها یا کاربران راه دور...",
     "Warning" : "اخطار",
+    "Error while sending notification" : "خطا در حین ارسال نوتیفیکیشن",
     "The object type is not specified." : "نوع شی تعیین نشده است.",
     "Enter new" : "مورد جدید را وارد کنید",
     "Delete" : "حذف",
@@ -124,9 +139,13 @@
     "unknown text" : "متن نامعلوم",
     "Hello world!" : "سلام دنیا!",
     "sunny" : "آفتابی",
+    "Hello {name}, the weather is {weather}" : "سلام {name}, هوا  {weather} است",
     "Hello {name}" : "سلام {name}",
     "_download %n file_::_download %n files_" : ["دانلود %n فایل"],
+    "The update was unsuccessful. " : "بروزرسانی ناموفق بود.",
+    "The update was successful. There were warnings." : "بروزرسانی با موفقیت انجام شد، اخطارهایی وجود دارد.",
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
+    "%s password reset" : "%s رمزعبور تغییر کرد",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
     "New password" : "گذرواژه جدید",
     "New Password" : "رمزعبور جدید",
@@ -145,14 +164,18 @@
     "Error unfavoriting" : "خطا هنگام حذف از موارد محبوب",
     "Access forbidden" : "اجازه دسترسی به مناطق ممنوعه را ندارید",
     "File not found" : "فایل یافت نشد",
+    "The share will expire on %s." : "اشتراک‌گذاری در %s منقضی خواهد شد.",
     "Cheers!" : "سلامتی!",
     "Internal Server Error" : "خطای داخلی سرور",
     "Technical details" : "جزئیات فنی",
+    "Remote Address: %s" : "آدرس راه‌دور: %s",
+    "Request ID: %s" : "ID درخواست: %s",
     "Type: %s" : "نوع: %s",
     "Code: %s" : "کد: %s",
     "Message: %s" : "پیام: %s",
     "File: %s" : "فایل : %s",
     "Line: %s" : "خط: %s",
+    "Security warning" : "اخطار امنیتی",
     "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> بسازید",
     "Username" : "نام کاربری",
@@ -165,14 +188,22 @@
     "Database name" : "نام پایگاه داده",
     "Database tablespace" : "جدول پایگاه داده",
     "Database host" : "هاست پایگاه داده",
+    "Performance warning" : "اخطار کارایی",
     "Finish setup" : "اتمام نصب",
     "Finishing …" : "در حال اتمام ...",
+    "Need help?" : "کمک لازم دارید ؟",
     "Log out" : "خروج",
     "Search" : "جست‌و‌جو",
+    "Please contact your administrator." : "لطفا با مدیر وب‌سایت تماس بگیرید.",
+    "An internal error occured." : "یک خطای داخلی رخ داده‌است.",
+    "Please try again or contact your administrator." : "لطفا مجددا تلاش کنید یا با مدیر سیستم تماس بگیرید.",
     "Log in" : "ورود",
     "remember" : "بیاد آوری",
     "Alternative Logins" : "ورود متناوب",
     "Thank you for your patience." : "از صبر شما متشکریم",
+    "Add \"%s\" as trusted domain" : "افزودن \"%s\" به عنوان دامنه مورد اعتماد",
+    "These apps will be updated:" : "این برنامه‌ها بروزرسانی شده‌اند:",
+    "The theme %s has been disabled." : "قالب %s غیر فعال شد.",
     "Start update" : "اغاز به روز رسانی"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index 4bc91566ac2..a0e89b03383 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ei ole luettavissa PHP:n toimesta. Turvallisuussyistä tämä ei ole suositeltava asetus. Lisätietoja on tarjolla <a href=\"{docLink}\">dokumentaatiossa</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Käytössäsi oleva PHP-versio ({version}) ei ole enää <a href=\"{phpLink}\">PHP:n tukema</a>. Päivitä PHP:n versio, jotta hyödyt suorituskykyyn ja tietoturvaan vaikuttavista päivityksistä.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Käänteisen välityspalvelimen otsakkaiden asetukset ovat väärin, tai vaihtoehtoisesti käytät ownCloudia luotetun välityspalvelimen kautta. Jos et käytä ownCloudia luotetun välityspalvelimen kautta, kyseessä on tietoturvaongelma, joka mahdollistaa hyökkääjän väärentää ownCloudille näkyvän IP-osoitteen. Lisätietoja on saatavilla <a href=\"{docLink}\">dokumentaatiosta</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached on määritelty hajautetuksi välimuistiksi, mutta väärä PHP-moduuli \"memcache\" on asennettuna. \\OC\\Memcache\\Memcached tukee vain \"memcached\":ia, ei \"memcache\":a. Lisätietoja <a href=\"{wikiLink}\">memcachedin wikissä molemmista moduuleista</a>.",
     "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-otsaketta \"{header}\" ei ole määritetty vastaamaan arvoa \"{expected}\". Kyseessä on mahdollinen tietoturvaan tai -suojaan liittyvä riski, joten suosittelemme muuttamaan asetuksen arvoa.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP-otsaketta \"Strict-Transport-Security\" ei ole määritetty vähintään \"{seconds}\" sekuntiin. Suosittelemme HSTS:n käyttöä paremman tietoturvan vuoksi, kuten <a href=\"{docUrl}\">tietoturvavinkeissä</a> neuvotaan.",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 36e4bdfe2df..17ca162655f 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -108,6 +108,7 @@
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ei ole luettavissa PHP:n toimesta. Turvallisuussyistä tämä ei ole suositeltava asetus. Lisätietoja on tarjolla <a href=\"{docLink}\">dokumentaatiossa</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Käytössäsi oleva PHP-versio ({version}) ei ole enää <a href=\"{phpLink}\">PHP:n tukema</a>. Päivitä PHP:n versio, jotta hyödyt suorituskykyyn ja tietoturvaan vaikuttavista päivityksistä.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Käänteisen välityspalvelimen otsakkaiden asetukset ovat väärin, tai vaihtoehtoisesti käytät ownCloudia luotetun välityspalvelimen kautta. Jos et käytä ownCloudia luotetun välityspalvelimen kautta, kyseessä on tietoturvaongelma, joka mahdollistaa hyökkääjän väärentää ownCloudille näkyvän IP-osoitteen. Lisätietoja on saatavilla <a href=\"{docLink}\">dokumentaatiosta</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached on määritelty hajautetuksi välimuistiksi, mutta väärä PHP-moduuli \"memcache\" on asennettuna. \\OC\\Memcache\\Memcached tukee vain \"memcached\":ia, ei \"memcache\":a. Lisätietoja <a href=\"{wikiLink}\">memcachedin wikissä molemmista moduuleista</a>.",
     "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-otsaketta \"{header}\" ei ole määritetty vastaamaan arvoa \"{expected}\". Kyseessä on mahdollinen tietoturvaan tai -suojaan liittyvä riski, joten suosittelemme muuttamaan asetuksen arvoa.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP-otsaketta \"Strict-Transport-Security\" ei ole määritetty vähintään \"{seconds}\" sekuntiin. Suosittelemme HSTS:n käyttöä paremman tietoturvan vuoksi, kuten <a href=\"{docUrl}\">tietoturvavinkeissä</a> neuvotaan.",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 1409fe93c8c..50f7799ff13 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom non è leggibile da PHP e ciò è vivamente sconsigliato per motivi di sicurezza. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La tua versione ({version}) di PHP non è più <a href=\"{phpLink}\">supportata da PHP</a>. Ti esortiamo ad aggiornare la versione di PHP per trarre vantaggio dagli aggiornamenti in termini di prestazioni e sicurezza forniti da PHP.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configurazione delle intestazioni del proxy inverso non è corretta, o stai effettuando l'accesso a ownCloud da un proxy affidabile. Se non stai effettuando l'accesso da un proxy affidabile, questo è un problema di sicurezza e può consentire a un attaccante di falsificare il suo indirizzo IP, rendendo visibile a ownCloud. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached è configurato come cache distribuita, ma è installato il modulo \"memcache\" errato. \\OC\\Memcache\\Memcached supporta solo \"memcached\" e non \"memcache\". Vedi il  <a href=\"{wikiLink}\">wiki di memcached per informazioni su entrambi i moduli</a>.",
     "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'intestazione HTTP \"{header}\" non è configurata come \"{expected}\". \nQuesto è un potenziale rischio di sicurezza o di riservatezza dei dati e noi consigliamo di modificare questa impostazione.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'intestazione HTTP \"Strict-Transport-Security\" non è configurata con un valore almeno di \"{seconds}\" secondi. Per migliorare la sicurezza, consigliamo di abilitare HSTS come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 94d434cffd3..18052b86633 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -108,6 +108,7 @@
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom non è leggibile da PHP e ciò è vivamente sconsigliato per motivi di sicurezza. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La tua versione ({version}) di PHP non è più <a href=\"{phpLink}\">supportata da PHP</a>. Ti esortiamo ad aggiornare la versione di PHP per trarre vantaggio dagli aggiornamenti in termini di prestazioni e sicurezza forniti da PHP.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configurazione delle intestazioni del proxy inverso non è corretta, o stai effettuando l'accesso a ownCloud da un proxy affidabile. Se non stai effettuando l'accesso da un proxy affidabile, questo è un problema di sicurezza e può consentire a un attaccante di falsificare il suo indirizzo IP, rendendo visibile a ownCloud. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached è configurato come cache distribuita, ma è installato il modulo \"memcache\" errato. \\OC\\Memcache\\Memcached supporta solo \"memcached\" e non \"memcache\". Vedi il  <a href=\"{wikiLink}\">wiki di memcached per informazioni su entrambi i moduli</a>.",
     "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'intestazione HTTP \"{header}\" non è configurata come \"{expected}\". \nQuesto è un potenziale rischio di sicurezza o di riservatezza dei dati e noi consigliamo di modificare questa impostazione.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'intestazione HTTP \"Strict-Transport-Security\" non è configurata con un valore almeno di \"{seconds}\" secondi. Per migliorare la sicurezza, consigliamo di abilitare HSTS come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 895fab159f3..fc5b0c053dd 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom não pode ser lido por PHP o que é altamente desencorajado por razões de segurança. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\">documentation</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A sua versão do PHP ({version}) não é <a href=\"{phpLink}\">suportada pela PHP</a>. Nós o incentivamos a atualizar sua versão do PHP para tirar proveito de atualizações de desempenho e de segurança fornecidos pela PHP.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "A configuração de cabeçalhos do proxy reverso está incorreta, ou você está acessando ownCloud de um proxy confiável. Se você não está acessando ownCloud de um proxy confiável, esta é uma questão de segurança e pode permitir a um invasor falsificar seu endereço IP como visível para ownCloud. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\">documentação</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached está configurado como cache distribuído, mas o módulo PHP errado \"memcache\" está instalado. \\OC\\Memcache\\Memcached somente suporta \"memcached\" e não \"memcache\". Veja o <a href=\"{wikiLink}\">memcached wiki sobre esse módulo</a>.",
     "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O \"{header}\" cabeçalho HTTP não está configurado igual ao \"{expected}\". Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "O cabeçalho \"Transporte-de-Segurança-Restrita\"HTTP não está configurada para menos de \"{seconds}\" segundos. Para uma maior segurança recomendamos a ativação HSTS conforme descrito em nossas  <a href=\"{docUrl}\">dicas de segurança</a>.",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 817c9e1fa98..90d361b57f6 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -108,6 +108,7 @@
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom não pode ser lido por PHP o que é altamente desencorajado por razões de segurança. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\">documentation</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A sua versão do PHP ({version}) não é <a href=\"{phpLink}\">suportada pela PHP</a>. Nós o incentivamos a atualizar sua versão do PHP para tirar proveito de atualizações de desempenho e de segurança fornecidos pela PHP.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "A configuração de cabeçalhos do proxy reverso está incorreta, ou você está acessando ownCloud de um proxy confiável. Se você não está acessando ownCloud de um proxy confiável, esta é uma questão de segurança e pode permitir a um invasor falsificar seu endereço IP como visível para ownCloud. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\">documentação</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached está configurado como cache distribuído, mas o módulo PHP errado \"memcache\" está instalado. \\OC\\Memcache\\Memcached somente suporta \"memcached\" e não \"memcache\". Veja o <a href=\"{wikiLink}\">memcached wiki sobre esse módulo</a>.",
     "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O \"{header}\" cabeçalho HTTP não está configurado igual ao \"{expected}\". Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "O cabeçalho \"Transporte-de-Segurança-Restrita\"HTTP não está configurada para menos de \"{seconds}\" segundos. Para uma maior segurança recomendamos a ativação HSTS conforme descrito em nossas  <a href=\"{docUrl}\">dicas de segurança</a>.",
diff --git a/lib/l10n/fa.js b/lib/l10n/fa.js
index bd6435da10d..8658c4bf7fc 100644
--- a/lib/l10n/fa.js
+++ b/lib/l10n/fa.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Cannot write into \"config\" directory!" : "نمیتوانید داخل دایرکتوری \"config\" تغییراتی ایجاد کنید",
     "See %s" : "مشاهده %s",
     "Sample configuration detected" : "فایل پیکربندی نمونه پیدا شد",
+    "PHP %s or higher is required." : "PHP نسخه‌ی %s یا بالاتر نیاز است.",
     "Following databases are supported: %s" : "پایگاه‌داده‌ های ذکر شده مورد نیاز است: %s",
     "The command line tool %s could not be found" : "ابزار کامندلاین %s پیدا نشد",
     "Help" : "راه‌نما",
diff --git a/lib/l10n/fa.json b/lib/l10n/fa.json
index 620a0ef2ffc..b1ffa2ac122 100644
--- a/lib/l10n/fa.json
+++ b/lib/l10n/fa.json
@@ -2,6 +2,7 @@
     "Cannot write into \"config\" directory!" : "نمیتوانید داخل دایرکتوری \"config\" تغییراتی ایجاد کنید",
     "See %s" : "مشاهده %s",
     "Sample configuration detected" : "فایل پیکربندی نمونه پیدا شد",
+    "PHP %s or higher is required." : "PHP نسخه‌ی %s یا بالاتر نیاز است.",
     "Following databases are supported: %s" : "پایگاه‌داده‌ های ذکر شده مورد نیاز است: %s",
     "The command line tool %s could not be found" : "ابزار کامندلاین %s پیدا نشد",
     "Help" : "راه‌نما",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 17f02402aee..9af784c1c96 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -146,6 +146,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Povolit uživatelům odesílat emailová upozornění na sdílené soubory ostatním uživatelům",
     "Exclude groups from sharing" : "Vyjmout skupiny ze sdílení",
     "These groups will still be able to receive shares, but not to initiate them." : "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet ostatním.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Povolit automatické vyplňování v dialogu sdílení. Pokud je toto vypnuto, je třeba ručně vyplňovat celé uživatelské jméno.",
     "Last cron job execution: %s." : "Poslední cron proběhl: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Poslední cron proběhl: %s. Vypadá to, že něco není v pořádku.",
     "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 455280dbeb8..3d750f668a1 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -144,6 +144,7 @@
     "Allow users to send mail notification for shared files to other users" : "Povolit uživatelům odesílat emailová upozornění na sdílené soubory ostatním uživatelům",
     "Exclude groups from sharing" : "Vyjmout skupiny ze sdílení",
     "These groups will still be able to receive shares, but not to initiate them." : "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet ostatním.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Povolit automatické vyplňování v dialogu sdílení. Pokud je toto vypnuto, je třeba ručně vyplňovat celé uživatelské jméno.",
     "Last cron job execution: %s." : "Poslední cron proběhl: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Poslední cron proběhl: %s. Vypadá to, že něco není v pořádku.",
     "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 363758011e1..c9bd6733321 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -77,6 +77,8 @@ OC.L10N.register(
     "Uninstalling ...." : "Απεγκατάσταση ....",
     "Error while uninstalling app" : "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
     "Uninstall" : "Απεγκατάσταση",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Η εφαρμογή έχει ενεργοποιηθεί αλλά χρειάζεται ενημέρωση. Θα μεταφερθείτε στη σελίδα ενημέρωσης σε 5 δευτερόλεπτα.",
+    "App update" : "Ενημέρωση εφαρμογής",
     "An error occurred: {message}" : "Παρουσιάστηκε σφάλμα: {message}",
     "Select a profile picture" : "Επιλογή εικόνας προφίλ",
     "Very weak password" : "Πολύ αδύναμο συνθηματικό",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 12d2436fc92..3b2a1412273 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -75,6 +75,8 @@
     "Uninstalling ...." : "Απεγκατάσταση ....",
     "Error while uninstalling app" : "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
     "Uninstall" : "Απεγκατάσταση",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Η εφαρμογή έχει ενεργοποιηθεί αλλά χρειάζεται ενημέρωση. Θα μεταφερθείτε στη σελίδα ενημέρωσης σε 5 δευτερόλεπτα.",
+    "App update" : "Ενημέρωση εφαρμογής",
     "An error occurred: {message}" : "Παρουσιάστηκε σφάλμα: {message}",
     "Select a profile picture" : "Επιλογή εικόνας προφίλ",
     "Very weak password" : "Πολύ αδύναμο συνθηματικό",
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index 641e8ae3f80..062e77cbd6a 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -3,12 +3,14 @@ OC.L10N.register(
     {
     "APCu" : "APCu",
     "Redis" : "Redis",
+    "Security & setup warnings" : "اخطارهای نصب و امنیتی",
     "Sharing" : "اشتراک گذاری",
     "Server-side encryption" : "رمزگذاری سمت سرور",
     "External Storage" : "حافظه خارجی",
     "Cron" : "زمانبند",
     "Email server" : "سرور ایمیل",
     "Log" : "کارنامه",
+    "Tips & tricks" : "نکات و راهنمایی‌ها",
     "Updates" : "به روز رسانی ها",
     "Authentication error" : "خطا در اعتبار سنجی",
     "Your full name has been changed." : "نام کامل شما تغییر یافت",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index 1b9c287348a..c61ad80c655 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -1,12 +1,14 @@
 { "translations": {
     "APCu" : "APCu",
     "Redis" : "Redis",
+    "Security & setup warnings" : "اخطارهای نصب و امنیتی",
     "Sharing" : "اشتراک گذاری",
     "Server-side encryption" : "رمزگذاری سمت سرور",
     "External Storage" : "حافظه خارجی",
     "Cron" : "زمانبند",
     "Email server" : "سرور ایمیل",
     "Log" : "کارنامه",
+    "Tips & tricks" : "نکات و راهنمایی‌ها",
     "Updates" : "به روز رسانی ها",
     "Authentication error" : "خطا در اعتبار سنجی",
     "Your full name has been changed." : "نام کامل شما تغییر یافت",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index a7db9452562..cff1591d1e4 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -76,6 +76,8 @@ OC.L10N.register(
     "Uninstalling ...." : "Poistetaan asennusta....",
     "Error while uninstalling app" : "Virhe sovellusta poistaessa",
     "Uninstall" : "Poista asennus",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Tämä sovellus on otettu käyttöön, mutta se vaatii päivityksen. Sinut ohjataan päivityssivulle viiden sekunnin kuluttua.",
+    "App update" : "Sovelluspäivitys",
     "An error occurred: {message}" : "Tapahtui virhe: {message}",
     "Select a profile picture" : "Valitse profiilikuva",
     "Very weak password" : "Erittäin heikko salasana",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 9705353642b..853028e72ed 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -74,6 +74,8 @@
     "Uninstalling ...." : "Poistetaan asennusta....",
     "Error while uninstalling app" : "Virhe sovellusta poistaessa",
     "Uninstall" : "Poista asennus",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Tämä sovellus on otettu käyttöön, mutta se vaatii päivityksen. Sinut ohjataan päivityssivulle viiden sekunnin kuluttua.",
+    "App update" : "Sovelluspäivitys",
     "An error occurred: {message}" : "Tapahtui virhe: {message}",
     "Select a profile picture" : "Valitse profiilikuva",
     "Very weak password" : "Erittäin heikko salasana",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 7081214d89d..f6fd6352fef 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -77,6 +77,8 @@ OC.L10N.register(
     "Uninstalling ...." : "Disinstallazione...",
     "Error while uninstalling app" : "Errore durante la disinstallazione dell'applicazione",
     "Uninstall" : "Disinstalla",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'applicazione è stata abilitata, ma deve essere aggiornata. Sarai rediretto alla pagina di aggiornamento in 5 secondi.",
+    "App update" : "Aggiornamento applicazione",
     "An error occurred: {message}" : "Si è verificato un errore: {message}",
     "Select a profile picture" : "Seleziona un'immagine del profilo",
     "Very weak password" : "Password molto debole",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 70325f7071a..a51b053c2c9 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -75,6 +75,8 @@
     "Uninstalling ...." : "Disinstallazione...",
     "Error while uninstalling app" : "Errore durante la disinstallazione dell'applicazione",
     "Uninstall" : "Disinstalla",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "L'applicazione è stata abilitata, ma deve essere aggiornata. Sarai rediretto alla pagina di aggiornamento in 5 secondi.",
+    "App update" : "Aggiornamento applicazione",
     "An error occurred: {message}" : "Si è verificato un errore: {message}",
     "Select a profile picture" : "Seleziona un'immagine del profilo",
     "Very weak password" : "Password molto debole",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index f4bbc350a93..8adfebcac11 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -77,6 +77,8 @@ OC.L10N.register(
     "Uninstalling ...." : "Desinstalando ...",
     "Error while uninstalling app" : "Erro enquanto desinstalava aplicativo",
     "Uninstall" : "Desinstalar",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "O aplicativo foi habilitado, mas precisa ser atualizado. Você será redirecionado para a página de atualização em 5 segundos.",
+    "App update" : "Atualização de aplicativo",
     "An error occurred: {message}" : "Ocorreu um erro: {message}",
     "Select a profile picture" : "Selecione uma imagem para o perfil",
     "Very weak password" : "Senha muito fraca",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index f27256b828f..2bd0848cee5 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -75,6 +75,8 @@
     "Uninstalling ...." : "Desinstalando ...",
     "Error while uninstalling app" : "Erro enquanto desinstalava aplicativo",
     "Uninstall" : "Desinstalar",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "O aplicativo foi habilitado, mas precisa ser atualizado. Você será redirecionado para a página de atualização em 5 segundos.",
+    "App update" : "Atualização de aplicativo",
     "An error occurred: {message}" : "Ocorreu um erro: {message}",
     "Select a profile picture" : "Selecione uma imagem para o perfil",
     "Very weak password" : "Senha muito fraca",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 9f3946a930f..355533c0e67 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -29,6 +29,7 @@ OC.L10N.register(
     "Unable to change password" : "無法修改密碼",
     "Enabled" : "已啓用",
     "Not enabled" : "無啟動",
+    "Federated Cloud Sharing" : "聯盟式雲端分享",
     "Migration Completed" : "遷移已完成",
     "Group already exists." : "群組已存在",
     "Unable to add group." : "無法新增群組",
@@ -98,13 +99,18 @@ OC.L10N.register(
     "System locale can not be set to a one which supports UTF-8." : "系統語系無法設定只支援 UTF-8",
     "This means that there might be problems with certain characters in file names." : "這個意思是指在檔名中使用一些字元可能會有問題",
     "Allow apps to use the Share API" : "允許 apps 使用分享 API",
+    "Enforce password protection" : "強制分享連結使用密碼保護",
     "Allow public uploads" : "允許任何人上傳",
     "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知",
     "days" : "天",
+    "Enforce expiration date" : "強制分享連結設置分享期限",
     "Allow resharing" : "允許轉貼分享",
+    "Allow users to send mail notification for shared files to other users" : "允許使用者寄送檔案分享通知給其他使用者",
+    "Exclude groups from sharing" : "禁止群組分享檔案",
     "Cron was not executed yet!" : "排程沒有執行！",
     "Execute one task with each page loaded" : "當頁面載入時，執行",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
+    "Enable server-side encryption" : "啓用伺服器端加密",
     "This is used for sending out notifications." : "寄送通知用",
     "Send mode" : "寄送模式",
     "Encryption" : "加密",
@@ -180,6 +186,7 @@ OC.L10N.register(
     "Language" : "語言",
     "Help translate" : "幫助翻譯",
     "Common Name" : "Common Name",
+    "Issued By" : "發行者:",
     "Show storage location" : "顯示儲存位置",
     "Show last log in" : "顯示最近登入",
     "Show user backend" : "顯示用戶後台",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index ce87ffa614a..fad9ad99ed5 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -27,6 +27,7 @@
     "Unable to change password" : "無法修改密碼",
     "Enabled" : "已啓用",
     "Not enabled" : "無啟動",
+    "Federated Cloud Sharing" : "聯盟式雲端分享",
     "Migration Completed" : "遷移已完成",
     "Group already exists." : "群組已存在",
     "Unable to add group." : "無法新增群組",
@@ -96,13 +97,18 @@
     "System locale can not be set to a one which supports UTF-8." : "系統語系無法設定只支援 UTF-8",
     "This means that there might be problems with certain characters in file names." : "這個意思是指在檔名中使用一些字元可能會有問題",
     "Allow apps to use the Share API" : "允許 apps 使用分享 API",
+    "Enforce password protection" : "強制分享連結使用密碼保護",
     "Allow public uploads" : "允許任何人上傳",
     "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知",
     "days" : "天",
+    "Enforce expiration date" : "強制分享連結設置分享期限",
     "Allow resharing" : "允許轉貼分享",
+    "Allow users to send mail notification for shared files to other users" : "允許使用者寄送檔案分享通知給其他使用者",
+    "Exclude groups from sharing" : "禁止群組分享檔案",
     "Cron was not executed yet!" : "排程沒有執行！",
     "Execute one task with each page loaded" : "當頁面載入時，執行",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
+    "Enable server-side encryption" : "啓用伺服器端加密",
     "This is used for sending out notifications." : "寄送通知用",
     "Send mode" : "寄送模式",
     "Encryption" : "加密",
@@ -178,6 +184,7 @@
     "Language" : "語言",
     "Help translate" : "幫助翻譯",
     "Common Name" : "Common Name",
+    "Issued By" : "發行者:",
     "Show storage location" : "顯示儲存位置",
     "Show last log in" : "顯示最近登入",
     "Show user backend" : "顯示用戶後台",
-- 
GitLab


From e6d9869cf7ca7c8c0027ac6c6239a2bd494d064b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 8 Oct 2015 09:13:08 +0200
Subject: [PATCH 748/783] Only use zip64 when we have 64 bit php

---
 lib/private/streamer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/streamer.php b/lib/private/streamer.php
index 6db6fe42a79..a08c8444f02 100644
--- a/lib/private/streamer.php
+++ b/lib/private/streamer.php
@@ -39,7 +39,7 @@ class Streamer {
 		if ($request->isUserAgent($this->preferTarFor)) {
 			$this->streamerInstance = new TarStreamer();
 		} else {
-			$this->streamerInstance = new ZipStreamer();
+			$this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
 		}
 	}
 	
-- 
GitLab


From 336a12742624652e88f9a4f51bad9d0321c789ac Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 8 Oct 2015 11:35:57 +0200
Subject: [PATCH 749/783] Catch "missing table" exception when cleaning up
 locks

---
 lib/private/lock/dblockingprovider.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php
index aa1357982a2..1e93a6cec6c 100644
--- a/lib/private/lock/dblockingprovider.php
+++ b/lib/private/lock/dblockingprovider.php
@@ -185,6 +185,13 @@ class DBLockingProvider extends AbstractLockingProvider {
 	}
 
 	public function __destruct() {
-		$this->cleanEmptyLocks();
+		try {
+			$this->cleanEmptyLocks();
+		} catch (\PDOException $e) {
+			// If the table is missing, the clean up was successful
+			if ($this->connection->tableExists('file_locks')) {
+				throw $e;
+			}
+		}
 	}
 }
-- 
GitLab


From ececa907097222f8281b85399fc1f7884b061904 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 8 Oct 2015 11:21:17 +0200
Subject: [PATCH 750/783] Set download cookie on public download

---
 .../lib/controllers/sharecontroller.php          | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 28feb3110b4..616b64e6c59 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -233,9 +233,10 @@ class ShareController extends Controller {
 	 * @param string $token
 	 * @param string $files
 	 * @param string $path
+	 * @param string $downloadStartSecret
 	 * @return void|RedirectResponse
 	 */
-	public function downloadShare($token, $files = null, $path = '') {
+	public function downloadShare($token, $files = null, $path = '', $downloadStartSecret = '') {
 		\OC_User::setIncognitoMode(true);
 
 		$linkItem = OCP\Share::getShareByToken($token, false);
@@ -288,6 +289,19 @@ class ShareController extends Controller {
 			}
 		}
 
+		/**
+		 * this sets a cookie to be able to recognize the start of the download
+		 * the content must not be longer than 32 characters and must only contain
+		 * alphanumeric characters
+		 */
+		if (!empty($downloadStartSecret)
+			&& !isset($downloadStartSecret[32])
+			&& preg_match('!^[a-zA-Z0-9]+$!', $downloadStartSecret) === 1) {
+
+			// FIXME: set on the response once we use an actual app framework response
+			setcookie('ocDownloadStarted', $downloadStartSecret, time() + 20, '/');
+		}
+
 		// download selected files
 		if (!is_null($files)) {
 			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
-- 
GitLab


From 9866037d0cbcdfc19d0ebb047632892e444b5dc2 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 8 Oct 2015 14:52:52 +0200
Subject: [PATCH 751/783] Disable app store for EE by default

This disables the app store for EE versions by default to address some problems caused by the wrong assumption that "Official" means supported by ownCloud Inc.

Administrators can still enable the app store by setting `appstoreenabled` to true in the config file.
---
 lib/private/ocsclient.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index 1dfab4dd3a4..e2973f82605 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -68,7 +68,13 @@ class OCSClient {
 	 * @return bool
 	 */
 	public function isAppStoreEnabled() {
-		return $this->config->getSystemValue('appstoreenabled', true) === true;
+		// For a regular edition default to true, all others default to false
+		$default = false;
+		if (\OC_Util::getEditionString() === '') {
+			$default = true;
+		}
+
+		return $this->config->getSystemValue('appstoreenabled', $default) === true;
 	}
 
 	/**
-- 
GitLab


From 89a63ec74bb8f786a0e3a8df133abe84ef493489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 2 Oct 2015 09:59:58 +0200
Subject: [PATCH 752/783] make mkdir recursive, add phpdoc to api

---
 .../files/objectstore/objectstorestorage.php  | 39 ++++++++++---------
 lib/public/files/storage.php                  |  1 +
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/files/objectstore/objectstorestorage.php
index a85553186ae..40d52feb893 100644
--- a/lib/private/files/objectstore/objectstorestorage.php
+++ b/lib/private/files/objectstore/objectstorestorage.php
@@ -62,41 +62,44 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 	public function mkdir($path) {
 		$path = $this->normalizePath($path);
 
-		if ($this->is_dir($path)) {
+		if ($this->file_exists($path)) {
 			return false;
 		}
 
-		$dirName = $this->normalizePath(dirname($path));
-		$parentExists = $this->is_dir($dirName);
-
 		$mTime = time();
-
-		$data = array(
+		$data = [
 			'mimetype' => 'httpd/unix-directory',
 			'size' => 0,
 			'mtime' => $mTime,
 			'storage_mtime' => $mTime,
 			'permissions' => \OCP\Constants::PERMISSION_ALL,
-		);
-
-		if ($dirName === '' && !$parentExists) {
+		];
+		if ($path === '') {
 			//create root on the fly
 			$data['etag'] = $this->getETag('');
 			$this->getCache()->put('', $data);
-			$parentExists = true;
-
-			// we are done when the root folder was meant to be created
-			if ($dirName === $path) {
-				return true;
+			return true;
+		} else {
+			// if parent does not exist, create it
+			$parent = $this->normalizePath(dirname($path));
+			$parentType = $this->filetype($parent);
+			if ($parentType === false) {
+				if (!$this->mkdir($parent)) {
+					// something went wrong
+					return false;
+				}
+			} else if ($parentType === 'file') {
+				// parent is a file
+				return false;
 			}
-		}
-
-		if ($parentExists) {
+			// finally create the new dir
+			$mTime = time(); // update mtime
+			$data['mtime'] = $mTime;
+			$data['storage_mtime'] = $mTime;
 			$data['etag'] = $this->getETag($path);
 			$this->getCache()->put($path, $data);
 			return true;
 		}
-		return false;
 	}
 
 	/**
diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php
index 1cf8676c99d..7931a683ae1 100644
--- a/lib/public/files/storage.php
+++ b/lib/public/files/storage.php
@@ -62,6 +62,7 @@ interface Storage {
 
 	/**
 	 * see http://php.net/manual/en/function.mkdir.php
+	 * implementations need to implement a recursive mkdir
 	 *
 	 * @param string $path
 	 * @return bool
-- 
GitLab


From 7ff5a6ccf4a66d0af2ff74a9626251585966f223 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 8 Oct 2015 15:29:04 +0200
Subject: [PATCH 753/783] Dont use a transaction in the scanner while using db
 based locking

---
 lib/private/files/utils/scanner.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php
index 35e36e23cb2..460c8007bf4 100644
--- a/lib/private/files/utils/scanner.php
+++ b/lib/private/files/utils/scanner.php
@@ -31,6 +31,7 @@ use OC\Files\Cache\ChangePropagator;
 use OC\Files\Filesystem;
 use OC\ForbiddenException;
 use OC\Hooks\PublicEmitter;
+use OC\Lock\DBLockingProvider;
 
 /**
  * Class Scanner
@@ -156,9 +157,14 @@ class Scanner extends PublicEmitter {
 			$scanner = $storage->getScanner();
 			$scanner->setUseTransactions(false);
 			$this->attachListener($mount);
-			$this->db->beginTransaction();
+			$isDbLocking = \OC::$server->getLockingProvider() instanceof DBLockingProvider;
+			if (!$isDbLocking) {
+				$this->db->beginTransaction();
+			}
 			$scanner->scan($relativePath, \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG | \OC\Files\Cache\Scanner::REUSE_SIZE);
-			$this->db->commit();
+			if (!$isDbLocking) {
+				$this->db->commit();
+			}
 		}
 		$this->propagator->propagateChanges(time());
 	}
-- 
GitLab


From d78f6852c7daccf54614f54322f1b213fd6aea96 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 8 Oct 2015 16:21:31 +0200
Subject: [PATCH 754/783] Fix whitespace issues in integration tests

---
 .../features/bootstrap/FeatureContext.php     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php
index f440aece603..caff517a16d 100644
--- a/build/integration/features/bootstrap/FeatureContext.php
+++ b/build/integration/features/bootstrap/FeatureContext.php
@@ -43,35 +43,35 @@ class FeatureContext extends BehatContext {
 	}
 
 	/**
-	* @When /^sending "([^"]*)" to "([^"]*)"$/
-	*/
+	 * @When /^sending "([^"]*)" to "([^"]*)"$/
+	 */
 	public function sendingTo($verb, $url) {
 		$this->sendingToWith($verb, $url, null);
 	}
 
 	/**
-	*  Parses the xml answer to get ocs response which doesn't match with
-	*  http one in v1 of the api.
-	*/
-	public function getOCSResponse($response){
+	 * Parses the xml answer to get ocs response which doesn't match with
+	 * http one in v1 of the api.
+	 */
+	public function getOCSResponse($response) {
 		return $response->xml()->meta[0]->statuscode;
 	}
 
 	/**
-	*  Parses the xml answer to get the array of users returned.
-	*/
+	 * Parses the xml answer to get the array of users returned.
+	 */
 	public function getArrayOfUsersResponded($resp) {
 		$listCheckedElements = $resp->xml()->data[0]->users[0]->element;
-		$extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1);
+		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
 		return $extractedElementsArray;
 	}
 
 	/**
-	*  Parses the xml answer to get the array of groups returned.
-	*/
+	 * Parses the xml answer to get the array of groups returned.
+	 */
 	public function getArrayOfGroupsResponded($resp) {
 		$listCheckedElements = $resp->xml()->data[0]->groups[0]->element;
-		$extractedElementsArray = json_decode( json_encode($listCheckedElements) , 1);
+		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
 		return $extractedElementsArray;
 	}
 
@@ -100,7 +100,7 @@ class FeatureContext extends BehatContext {
 		}
 
 	}
-		
+
 	/**
 	 * @Then /^the OCS status code should be "([^"]*)"$/
 	 */
@@ -161,7 +161,7 @@ class FeatureContext extends BehatContext {
 	 * @When /^creating the user "([^"]*)r"$/
 	 */
 	public function creatingTheUser($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user" ;
+		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
@@ -181,7 +181,7 @@ class FeatureContext extends BehatContext {
 	 * @When /^creating the group "([^"]*)r"$/
 	 */
 	public function creatingTheGroup($group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/addgroup" ;
+		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/addgroup";
 		$client = new Client();
 		$options = [];
 		if ($this->currentUser === 'admin') {
-- 
GitLab


From 18394205c2149ee944871eb684bd0f8e4dbe262c Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 8 Oct 2015 16:46:42 +0200
Subject: [PATCH 755/783] Setup sendmail transport

Replaces https://github.com/owncloud/core/pull/19047 and fixes https://github.com/owncloud/enterprise/issues/854  and https://github.com/owncloud/core/issues/19110
---
 lib/private/mail/mailer.php | 5 ++++-
 tests/lib/mail/mailer.php   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/private/mail/mailer.php b/lib/private/mail/mailer.php
index d083b992326..bd93f3e3d58 100644
--- a/lib/private/mail/mailer.php
+++ b/lib/private/mail/mailer.php
@@ -157,7 +157,10 @@ class Mailer implements IMailer {
 				$this->instance = $this->getSMTPInstance();
 				break;
 			case 'sendmail':
-				$this->instance = $this->getSendMailInstance();
+				// FIXME: Move into the return statement but requires proper testing
+				//       for SMTP and mail as well. Thus not really doable for a
+				//       minor release.
+				$this->instance = \Swift_Mailer::newInstance($this->getSendMailInstance());
 				break;
 			default:
 				$this->instance = $this->getMailInstance();
diff --git a/tests/lib/mail/mailer.php b/tests/lib/mail/mailer.php
index 21565f9ffb5..8023cda820e 100644
--- a/tests/lib/mail/mailer.php
+++ b/tests/lib/mail/mailer.php
@@ -77,7 +77,7 @@ class MailerTest extends TestCase {
 			->method('getSystemValue')
 			->will($this->returnValue('sendmail'));
 
-		$this->assertInstanceOf('\Swift_SendmailTransport', self::invokePrivate($this->mailer, 'getInstance'));
+		$this->assertInstanceOf('\Swift_Mailer', self::invokePrivate($this->mailer, 'getInstance'));
 	}
 
 	public function testCreateMessage() {
-- 
GitLab


From 9b220d0576d2639740c60a72343ece99dbc39a9c Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 8 Oct 2015 17:30:40 +0200
Subject: [PATCH 756/783] Fix comment syntax

---
 settings/controller/checksetupcontroller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index 4aef2d3ade6..bd3e7f157b2 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -178,7 +178,7 @@ class CheckSetupController extends Controller {
 		return '';
 	}
 	
-	/*
+	/**
 	 * Whether the php version is still supported (at time of release)
 	 * according to: https://secure.php.net/supported-versions.php
 	 *
@@ -195,7 +195,7 @@ class CheckSetupController extends Controller {
 		return ['eol' => $eol, 'version' => PHP_VERSION];
 	}
 
-	/*
+	/**
 	 * Check if the reverse proxy configuration is working as expected
 	 *
 	 * @return bool
-- 
GitLab


From 12181aa6def2a20962ea536ace0ba472dbc1c26e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 8 Oct 2015 18:23:20 +0200
Subject: [PATCH 757/783] Don't perform checks for outdated TLS libs when no
 internet connection

This change makes the check return a positive result when:

- The instance has been configured to not use the internet
AND/OR
- S2S AND the appstore is disabled
---
 settings/controller/checksetupcontroller.php  |  22 +++-
 .../controller/CheckSetupControllerTest.php   | 118 ++++++++++++++++--
 2 files changed, 125 insertions(+), 15 deletions(-)

diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index bd3e7f157b2..2ff55fc72c9 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -123,7 +123,7 @@ class CheckSetupController extends Controller {
 	 *
 	 * @return array
 	 */
-	public function getCurlVersion() {
+	protected function getCurlVersion() {
 		return curl_version();
 	}
 
@@ -137,6 +137,24 @@ class CheckSetupController extends Controller {
 	 * @return string
 	 */
 	private function isUsedTlsLibOutdated() {
+		// Appstore is disabled by default in EE
+		$appStoreDefault = false;
+		if (\OC_Util::getEditionString() === '') {
+			$appStoreDefault = true;
+		}
+
+		// Don't run check when:
+		// 1. Server has `has_internet_connection` set to false
+		// 2. AppStore AND S2S is disabled
+		if(!$this->config->getSystemValue('has_internet_connection', true)) {
+			return '';
+		}
+		if(!$this->config->getSystemValue('appstoreenabled', $appStoreDefault)
+			&& $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'no'
+			&& $this->config->getAppValue('files_sharing', 'incoming_server2server_share_enabled', 'yes') === 'no') {
+			return '';
+		}
+
 		$versionString = $this->getCurlVersion();
 		if(isset($versionString['ssl_version'])) {
 			$versionString = $versionString['ssl_version'];
@@ -145,7 +163,7 @@ class CheckSetupController extends Controller {
 		}
 
 		$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
-		if(!$this->config->getSystemValue('appstoreenabled', true)) {
+		if(!$this->config->getSystemValue('appstoreenabled', $appStoreDefault)) {
 			$features = (string)$this->l10n->t('Federated Cloud Sharing');
 		}
 
diff --git a/tests/settings/controller/CheckSetupControllerTest.php b/tests/settings/controller/CheckSetupControllerTest.php
index c453822464f..ebba18de5fd 100644
--- a/tests/settings/controller/CheckSetupControllerTest.php
+++ b/tests/settings/controller/CheckSetupControllerTest.php
@@ -292,6 +292,10 @@ class CheckSetupControllerTest extends TestCase {
 			->with('memcache.local', null)
 			->will($this->returnValue('SomeProvider'));
 		$this->config->expects($this->at(2))
+			->method('getSystemValue')
+			->with('has_internet_connection', true)
+			->will($this->returnValue(false));
+		$this->config->expects($this->at(3))
 			->method('getSystemValue')
 			->with('trusted_proxies', [])
 			->willReturn(['1.2.3.4']);
@@ -365,10 +369,13 @@ class CheckSetupControllerTest extends TestCase {
 			])
 			->setMethods(null)->getMock();
 
-		$this->assertArrayHasKey('ssl_version', $checkSetupController->getCurlVersion());
+		$this->assertArrayHasKey('ssl_version', $this->invokePrivate($checkSetupController, 'getCurlVersion'));
 	}
 
 	public function testIsUsedTlsLibOutdatedWithAnotherLibrary() {
+		$this->config->expects($this->any())
+			->method('getSystemValue')
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
@@ -377,6 +384,9 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsUsedTlsLibOutdatedWithMisbehavingCurl() {
+		$this->config->expects($this->any())
+			->method('getSystemValue')
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
@@ -385,10 +395,8 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsUsedTlsLibOutdatedWithOlderOpenSsl() {
-		$this->config
-			->expects($this->once())
+		$this->config->expects($this->any())
 			->method('getSystemValue')
-			->with('appstoreenabled', true)
 			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
@@ -399,10 +407,10 @@ class CheckSetupControllerTest extends TestCase {
 
 	public function testIsUsedTlsLibOutdatedWithOlderOpenSslAndWithoutAppstore() {
 		$this->config
-			->expects($this->once())
+			->expects($this->at(0))
 			->method('getSystemValue')
-			->with('appstoreenabled', true)
-			->will($this->returnValue(false));
+			->with('has_internet_connection', true)
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
@@ -411,10 +419,8 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsUsedTlsLibOutdatedWithOlderOpenSsl1() {
-		$this->config
-			->expects($this->once())
+		$this->config->expects($this->any())
 			->method('getSystemValue')
-			->with('appstoreenabled', true)
 			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
@@ -424,6 +430,9 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsUsedTlsLibOutdatedWithMatchingOpenSslVersion() {
+		$this->config->expects($this->any())
+			->method('getSystemValue')
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
@@ -432,6 +441,9 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsUsedTlsLibOutdatedWithMatchingOpenSslVersion1() {
+		$this->config->expects($this->any())
+			->method('getSystemValue')
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
@@ -440,10 +452,8 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsBuggyNss400() {
-		$this->config
-			->expects($this->once())
+		$this->config->expects($this->any())
 			->method('getSystemValue')
-			->with('appstoreenabled', true)
 			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
@@ -476,6 +486,9 @@ class CheckSetupControllerTest extends TestCase {
 
 
 	public function testIsBuggyNss200() {
+		$this->config->expects($this->any())
+			->method('getSystemValue')
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
@@ -504,4 +517,83 @@ class CheckSetupControllerTest extends TestCase {
 
 		$this->assertSame('', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
 	}
+
+	public function testIsUsedTlsLibOutdatedWithInternetDisabled() {
+		$this->config
+			->expects($this->at(0))
+			->method('getSystemValue')
+			->with('has_internet_connection', true)
+			->will($this->returnValue(false));
+		$this->assertSame('', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
+	}
+
+	public function testIsUsedTlsLibOutdatedWithAppstoreDisabledAndServerToServerSharingEnabled() {
+		// Appstore is disabled by default in EE
+		$appStoreDefault = false;
+		if (\OC_Util::getEditionString() === '') {
+			$appStoreDefault = true;
+		}
+
+		$this->config
+			->expects($this->at(0))
+			->method('getSystemValue')
+			->with('has_internet_connection', true)
+			->will($this->returnValue(true));
+		$this->config
+			->expects($this->at(1))
+			->method('getSystemValue')
+			->with('appstoreenabled', $appStoreDefault)
+			->will($this->returnValue(false));
+		$this->config
+			->expects($this->at(2))
+			->method('getAppValue')
+			->with('files_sharing', 'outgoing_server2server_share_enabled', 'yes')
+			->will($this->returnValue('no'));
+		$this->config
+			->expects($this->at(3))
+			->method('getAppValue')
+			->with('files_sharing', 'incoming_server2server_share_enabled', 'yes')
+			->will($this->returnValue('yes'));
+
+		$this->checkSetupController
+			->expects($this->once())
+			->method('getCurlVersion')
+			->will($this->returnValue([]));
+		$this->assertSame('', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
+	}
+
+	public function testIsUsedTlsLibOutdatedWithAppstoreDisabledAndServerToServerSharingDisabled() {
+		// Appstore is disabled by default in EE
+		$appStoreDefault = false;
+		if (\OC_Util::getEditionString() === '') {
+			$appStoreDefault = true;
+		}
+
+		$this->config
+			->expects($this->at(0))
+			->method('getSystemValue')
+			->with('has_internet_connection', true)
+			->will($this->returnValue(true));
+		$this->config
+			->expects($this->at(1))
+			->method('getSystemValue')
+			->with('appstoreenabled', $appStoreDefault)
+			->will($this->returnValue(false));
+		$this->config
+			->expects($this->at(2))
+			->method('getAppValue')
+			->with('files_sharing', 'outgoing_server2server_share_enabled', 'yes')
+			->will($this->returnValue('no'));
+		$this->config
+			->expects($this->at(3))
+			->method('getAppValue')
+			->with('files_sharing', 'incoming_server2server_share_enabled', 'yes')
+			->will($this->returnValue('no'));
+
+		$this->checkSetupController
+			->expects($this->never())
+			->method('getCurlVersion')
+			->will($this->returnValue([]));
+		$this->assertSame('', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
+	}
 }
-- 
GitLab


From dd2e887a8d9be9cb95a52582612bf95e2f8eb247 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 8 Oct 2015 20:32:15 +0200
Subject: [PATCH 758/783] adjust handling changed return array structure from
 search() and fetchList()

---
 apps/user_ldap/group_ldap.php    |  2 +-
 apps/user_ldap/lib/access.php    | 23 ++++++++++++++++++-----
 apps/user_ldap/lib/user/user.php | 17 ++++++++++-------
 apps/user_ldap/lib/wizard.php    |  4 ++++
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 97ed8fa91ac..200ee6ea4ab 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -653,7 +653,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 					str_replace('%uid', $member, $this->access->connection->ldapLoginFilter),
 					$this->access->getFilterPartForUserSearch($search)
 				));
-				$ldap_users = $this->access->fetchListOfUsers($filter, 'dn');
+				$ldap_users = $this->access->fetchListOfUsers($filter, 'dn', 1);
 				if(count($ldap_users) < 1) {
 					continue;
 				}
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index c7ec06f356a..1809700b1be 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -489,7 +489,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 
 	/**
 	 * gives back the user names as they are used ownClod internally
-	 * @param array $ldapUsers an array with the ldap Users result in style of array ( array ('dn' => foo, 'uid' => bar), ... )
+	 * @param array $ldapUsers as returned by fetchList()
 	 * @return array an array with the user names to use in ownCloud
 	 *
 	 * gives back the user names as they are used ownClod internally
@@ -500,7 +500,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 
 	/**
 	 * gives back the group names as they are used ownClod internally
-	 * @param array $ldapGroups an array with the ldap Groups result in style of array ( array ('dn' => foo, 'cn' => bar), ... )
+	 * @param array $ldapGroups as returned by fetchList()
 	 * @return array an array with the group names to use in ownCloud
 	 *
 	 * gives back the group names as they are used ownClod internally
@@ -510,7 +510,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 	}
 
 	/**
-	 * @param array $ldapObjects
+	 * @param array $ldapObjects as returned by fetchList()
 	 * @param bool $isUsers
 	 * @return array
 	 */
@@ -523,7 +523,15 @@ class Access extends LDAPUtility implements user\IUserTools {
 		$ownCloudNames = array();
 
 		foreach($ldapObjects as $ldapObject) {
-			$nameByLDAP = isset($ldapObject[$nameAttribute]) ? $ldapObject[$nameAttribute] : null;
+			$nameByLDAP = null;
+			if(    isset($ldapObject[$nameAttribute])
+				&& is_array($ldapObject[$nameAttribute])
+				&& isset($ldapObject[$nameAttribute][0])
+			) {
+				// might be set, but not necessarily. if so, we use it.
+				$nameByLDAP = $ldapObject[$nameAttribute][0];
+			}
+
 			$ocName = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers);
 			if($ocName) {
 				$ownCloudNames[] = $ocName;
@@ -531,7 +539,9 @@ class Access extends LDAPUtility implements user\IUserTools {
 					//cache the user names so it does not need to be retrieved
 					//again later (e.g. sharing dialogue).
 					$this->cacheUserExists($ocName);
-					$this->cacheUserDisplayName($ocName, $nameByLDAP);
+					if(!is_null($nameByLDAP)) {
+						$this->cacheUserDisplayName($ocName, $nameByLDAP);
+					}
 				}
 			}
 			continue;
@@ -994,6 +1004,9 @@ class Access extends LDAPUtility implements user\IUserTools {
 				foreach($attr as $key) {
 					$key = mb_strtolower($key, 'UTF-8');
 					if(isset($item[$key])) {
+						if(is_array($item[$key]) && isset($item[$key]['count'])) {
+							unset($item[$key]['count']);
+						}
 						if($key !== 'dn') {
 							$selection[$i][$key] = $this->resemblesDN($key) ?
 								$this->sanitizeDN($item[$key])
diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php
index 6498cdf913f..d8148035d3f 100644
--- a/apps/user_ldap/lib/user/user.php
+++ b/apps/user_ldap/lib/user/user.php
@@ -147,21 +147,21 @@ class User {
 		//Quota
 		$attr = strtolower($this->connection->ldapQuotaAttribute);
 		if(isset($ldapEntry[$attr])) {
-			$this->updateQuota($ldapEntry[$attr]);
+			$this->updateQuota($ldapEntry[$attr][0]);
 		}
 		unset($attr);
 
 		//Email
 		$attr = strtolower($this->connection->ldapEmailAttribute);
 		if(isset($ldapEntry[$attr])) {
-			$this->updateEmail($ldapEntry[$attr]);
+			$this->updateEmail($ldapEntry[$attr][0]);
 		}
 		unset($attr);
 
 		//displayName
 		$attr = strtolower($this->connection->ldapUserDisplayName);
 		if(isset($ldapEntry[$attr])) {
-			$displayName = $ldapEntry[$attr];
+			$displayName = $ldapEntry[$attr][0];
 			if(!empty($displayName)) {
 				$this->storeDisplayName($displayName);
 				$this->access->cacheUserDisplayName($this->getUsername(), $displayName);
@@ -171,18 +171,20 @@ class User {
 
 		// LDAP Username, needed for s2s sharing
 		if(isset($ldapEntry['uid'])) {
-			$this->storeLDAPUserName($ldapEntry['uid']);
+			$this->storeLDAPUserName($ldapEntry['uid'][0]);
 		} else if(isset($ldapEntry['samaccountname'])) {
-			$this->storeLDAPUserName($ldapEntry['samaccountname']);
+			$this->storeLDAPUserName($ldapEntry['samaccountname'][0]);
 		}
+
 		//homePath
 		if(strpos($this->connection->homeFolderNamingRule, 'attr:') === 0) {
 			$attr = strtolower(substr($this->connection->homeFolderNamingRule, strlen('attr:')));
 			if(isset($ldapEntry[$attr])) {
 				$this->access->cacheUserHome(
-					$this->getUsername(), $this->getHomePath($ldapEntry[$attr]));
+					$this->getUsername(), $this->getHomePath($ldapEntry[$attr][0]));
 			}
 		}
+
 		//memberOf groups
 		$cacheKey = 'getMemberOf'.$this->getUsername();
 		$groups = false;
@@ -190,11 +192,12 @@ class User {
 			$groups = $ldapEntry['memberof'];
 		}
 		$this->connection->writeToCache($cacheKey, $groups);
+
 		//Avatar
 		$attrs = array('jpegphoto', 'thumbnailphoto');
 		foreach ($attrs as $attr)  {
 			if(isset($ldapEntry[$attr])) {
-				$this->avatarImage = $ldapEntry[$attr];
+				$this->avatarImage = $ldapEntry[$attr][0];
 				$this->updateAvatar();
 				break;
 			}
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index a8fcae6314f..64b3557e31a 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -435,6 +435,10 @@ class Wizard extends LDAPUtility {
 			// detection will fail later
 			$result = $this->access->searchGroups($filter, array('cn', 'dn'), $limit, $offset);
 			foreach($result as $item) {
+				if(!isset($item['cn']) && !is_array($item['cn']) && !isset($item['cn'][0])) {
+					// just in case - no issue known
+					continue;
+				}
 				$groupNames[] = $item['cn'][0];
 				$groupEntries[] = $item;
 			}
-- 
GitLab


From a876efda50680f7d8652299cb5265dc552be45cf Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 8 Oct 2015 21:18:34 +0200
Subject: [PATCH 759/783] treat dn as any other attribute when building the
 search() return array

---
 apps/user_ldap/group_ldap.php | 2 +-
 apps/user_ldap/lib/access.php | 6 +++---
 apps/user_ldap/user_ldap.php  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 200ee6ea4ab..0b9c9d9d5f0 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -491,7 +491,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 			array($this->access->connection->ldapGroupDisplayName, 'dn'));
 		if (is_array($groups)) {
 			foreach ($groups as $groupobj) {
-				$groupDN = $groupobj['dn'];
+				$groupDN = $groupobj['dn'][0];
 				$allGroups[$groupDN] = $groupobj;
 				$nestedGroups = $this->access->connection->ldapNestedGroups;
 				if (!empty($nestedGroups)) {
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 1809700b1be..adfb11da673 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -532,7 +532,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 				$nameByLDAP = $ldapObject[$nameAttribute][0];
 			}
 
-			$ocName = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers);
+			$ocName = $this->dn2ocname($ldapObject['dn'][0], $nameByLDAP, $isUsers);
 			if($ocName) {
 				$ownCloudNames[] = $ocName;
 				if($isUsers) {
@@ -692,7 +692,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 	 */
 	public function batchApplyUserAttributes(array $ldapRecords){
 		foreach($ldapRecords as $userRecord) {
-			$ocName  = $this->dn2ocname($userRecord['dn'], $userRecord[$this->connection->ldapUserDisplayName]);
+			$ocName  = $this->dn2ocname($userRecord['dn'][0], $userRecord[$this->connection->ldapUserDisplayName]);
 			$this->cacheUserExists($ocName);
 			$user = $this->userManager->get($ocName);
 			$user->processAttributes($userRecord);
@@ -1012,7 +1012,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 								$this->sanitizeDN($item[$key])
 								: $item[$key];
 						} else {
-							$selection[$i][$key] = $this->sanitizeDN($item[$key]);
+							$selection[$i][$key] = [$this->sanitizeDN($item[$key])];
 						}
 					}
 
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 59c61524c9b..fc8ce361637 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -78,7 +78,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 	public function loginName2UserName($loginName) {
 		try {
 			$ldapRecord = $this->getLDAPUserByLoginName($loginName);
-			$user = $this->access->userManager->get($ldapRecord['dn']);
+			$user = $this->access->userManager->get($ldapRecord['dn'][0]);
 			if($user instanceof OfflineUser) {
 				return false;
 			}
@@ -119,7 +119,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 		} catch(\Exception $e) {
 			return false;
 		}
-		$dn = $ldapRecord['dn'];
+		$dn = $ldapRecord['dn'][0];
 		$user = $this->access->userManager->get($dn);
 
 		if(!$user instanceof User) {
-- 
GitLab


From 5cb83937faf7a6cf72c932346fcf62073d4b405b Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 9 Oct 2015 01:55:02 -0400
Subject: [PATCH 760/783] [tx-robot] updated from transifex

---
 apps/files/l10n/fa.js            | 3 +++
 apps/files/l10n/fa.json          | 3 +++
 apps/files/l10n/fr.js            | 3 +++
 apps/files/l10n/fr.json          | 3 +++
 apps/files_external/l10n/fr.js   | 3 +++
 apps/files_external/l10n/fr.json | 3 +++
 apps/files_sharing/l10n/fr.js    | 2 ++
 apps/files_sharing/l10n/fr.json  | 2 ++
 apps/user_ldap/l10n/fa.js        | 4 ++++
 apps/user_ldap/l10n/fa.json      | 4 ++++
 core/l10n/fa.js                  | 1 +
 core/l10n/fa.json                | 1 +
 core/l10n/fr.js                  | 4 ++++
 core/l10n/fr.json                | 4 ++++
 core/l10n/hu_HU.js               | 1 +
 core/l10n/hu_HU.json             | 1 +
 lib/l10n/fa.js                   | 5 ++++-
 lib/l10n/fa.json                 | 5 ++++-
 settings/l10n/fa.js              | 6 ++++++
 settings/l10n/fa.json            | 6 ++++++
 settings/l10n/fr.js              | 1 +
 settings/l10n/fr.json            | 1 +
 settings/l10n/hu_HU.js           | 1 +
 settings/l10n/hu_HU.json         | 1 +
 24 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/apps/files/l10n/fa.js b/apps/files/l10n/fa.js
index 1dc459ab584..b053d4af79b 100644
--- a/apps/files/l10n/fa.js
+++ b/apps/files/l10n/fa.js
@@ -94,6 +94,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s مورد %1$s را حذف کرد",
     "You restored %1$s" : "شما %1$s را بازگردانی کردید",
     "%2$s restored %1$s" : "%2$s %1$s را بازگردانی کرد",
+    "Changed by %2$s" : "تغییریافته توسط %2$s",
+    "Deleted by %2$s" : "حذف شده توسط %2$s",
+    "Restored by %2$s" : "بازگردانی شده توسط  %2$s",
     "%s could not be renamed as it has been deleted" : "امکان تغییر نام %s با توجه به حذف شدن آن وجود ندارد",
     "%s could not be renamed" : "%s نمیتواند تغییر نام دهد.",
     "Upload (max. %s)" : "آپلود (بیشترین سایز %s)",
diff --git a/apps/files/l10n/fa.json b/apps/files/l10n/fa.json
index 4ea1170c288..0f745e7f243 100644
--- a/apps/files/l10n/fa.json
+++ b/apps/files/l10n/fa.json
@@ -92,6 +92,9 @@
     "%2$s deleted %1$s" : "%2$s مورد %1$s را حذف کرد",
     "You restored %1$s" : "شما %1$s را بازگردانی کردید",
     "%2$s restored %1$s" : "%2$s %1$s را بازگردانی کرد",
+    "Changed by %2$s" : "تغییریافته توسط %2$s",
+    "Deleted by %2$s" : "حذف شده توسط %2$s",
+    "Restored by %2$s" : "بازگردانی شده توسط  %2$s",
     "%s could not be renamed as it has been deleted" : "امکان تغییر نام %s با توجه به حذف شدن آن وجود ندارد",
     "%s could not be renamed" : "%s نمیتواند تغییر نام دهد.",
     "Upload (max. %s)" : "آپلود (بیشترین سایز %s)",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 665d185cd2d..650401d6fa3 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s a supprimé %1$s",
     "You restored %1$s" : "Vous avez restauré %1$s",
     "%2$s restored %1$s" : "%2$s a restauré %1$s",
+    "Changed by %2$s" : "Modifié par %2$s",
+    "Deleted by %2$s" : "Supprimé par %2$s",
+    "Restored by %2$s" : "Restauré par %2$s",
     "%s could not be renamed as it has been deleted" : "%s ne peut être renommé car il a été supprimé ",
     "%s could not be renamed" : "%s ne peut être renommé",
     "Upload (max. %s)" : "Envoi (max. %s)",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 02601ee9d9b..5f28b9d12e7 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s a supprimé %1$s",
     "You restored %1$s" : "Vous avez restauré %1$s",
     "%2$s restored %1$s" : "%2$s a restauré %1$s",
+    "Changed by %2$s" : "Modifié par %2$s",
+    "Deleted by %2$s" : "Supprimé par %2$s",
+    "Restored by %2$s" : "Restauré par %2$s",
     "%s could not be renamed as it has been deleted" : "%s ne peut être renommé car il a été supprimé ",
     "%s could not be renamed" : "%s ne peut être renommé",
     "Upload (max. %s)" : "Envoi (max. %s)",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index f183bfeef57..c5ceea05566 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Invalid mount point" : "Point de montage non valide",
     "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Non autorisé à utiliser backend \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Non autorisé à utiliser le mécanisme d'authentification \"%s\"",
     "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
     "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
     "Personal" : "Personnel",
@@ -77,6 +79,7 @@ OC.L10N.register(
     "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
     "Username as share" : "Nom d'utilisateur comme nom de partage",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nom du service",
     "<b>Note:</b> " : "<b>Attention :</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index ed5c397f302..3eab0afee30 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -10,6 +10,8 @@
     "Invalid mount point" : "Point de montage non valide",
     "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Non autorisé à utiliser backend \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Non autorisé à utiliser le mécanisme d'authentification \"%s\"",
     "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
     "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
     "Personal" : "Personnel",
@@ -75,6 +77,7 @@
     "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
     "Username as share" : "Nom d'utilisateur comme nom de partage",
     "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nom du service",
     "<b>Note:</b> " : "<b>Attention :</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 382bc1e69e5..f0c7d6c331c 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -42,6 +42,8 @@ OC.L10N.register(
     "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
+    "Downloaded via public link" : "Téléchargé via un lien publique",
+    "Shared via public link" : "Partagé via un lien publique",
     "Shares" : "Partages",
     "You received %2$s as a remote share from %1$s" : "Vous avez reçu %2$s en tant que partage distant par %1$s",
     "Accept" : "Accepter",
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 7766b016f3b..524eb382568 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -40,6 +40,8 @@
     "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
+    "Downloaded via public link" : "Téléchargé via un lien publique",
+    "Shared via public link" : "Partagé via un lien publique",
     "Shares" : "Partages",
     "You received %2$s as a remote share from %1$s" : "Vous avez reçu %2$s en tant que partage distant par %1$s",
     "Accept" : "Accepter",
diff --git a/apps/user_ldap/l10n/fa.js b/apps/user_ldap/l10n/fa.js
index 4e3e924d88d..082f297f98f 100644
--- a/apps/user_ldap/l10n/fa.js
+++ b/apps/user_ldap/l10n/fa.js
@@ -45,6 +45,7 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
     "One Base DN per line" : "یک پایه DN در هر خط",
     "You can specify Base DN for users and groups in the Advanced tab" : "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
+    "Test Base DN" : "تست DN پایه",
     "Saving" : "درحال ذخیره",
     "Back" : "بازگشت",
     "Continue" : "ادامه",
@@ -58,6 +59,7 @@ OC.L10N.register(
     "Backup (Replica) Port" : "پشتیبان گیری (بدل) پورت",
     "Disable Main Server" : "غیر فعال کردن سرور اصلی",
     "Turn off SSL certificate validation." : "غیرفعال کردن اعتبار گواهی نامه SSL .",
+    "Cache Time-To-Live" : "مدت زمان کش",
     "Directory Settings" : "تنظیمات پوشه",
     "User Display Name Field" : "فیلد نام کاربر",
     "Base User Tree" : "کاربر درخت پایه",
@@ -69,6 +71,7 @@ OC.L10N.register(
     "One Group Base DN per line" : "یک گروه پایه DN در هر خط",
     "Group Search Attributes" : "گروه صفات جستجو",
     "Group-Member association" : "انجمن گروه کاربران",
+    "Nested Groups" : "گروه‌های زیرمجموعه",
     "Special Attributes" : "ویژگی های مخصوص",
     "Quota Field" : "سهمیه بندی انجام نشد.",
     "Quota Default" : "سهمیه بندی پیش فرض",
@@ -79,6 +82,7 @@ OC.L10N.register(
     "Internal Username" : "نام کاربری داخلی",
     "Internal Username Attribute:" : "ویژگی نام کاربری داخلی:",
     "Override UUID detection" : "نادیده گرفتن تشخیص UUID ",
+    "UUID Attribute for Users:" : "UUID ویژگی‌ برای کاربران:",
     "Username-LDAP User Mapping" : "نام کاربری - نگاشت کاربر LDAP ",
     "Clear Username-LDAP User Mapping" : "پاک کردن نام کاربری- LDAP  نگاشت کاربر ",
     "Clear Groupname-LDAP Group Mapping" : "پاک کردن نام گروه -LDAP گروه نقشه برداری"
diff --git a/apps/user_ldap/l10n/fa.json b/apps/user_ldap/l10n/fa.json
index 5efa24f0d51..7a8b3e8212e 100644
--- a/apps/user_ldap/l10n/fa.json
+++ b/apps/user_ldap/l10n/fa.json
@@ -43,6 +43,7 @@
     "For anonymous access, leave DN and Password empty." : "برای دسترسی ناشناس، DN را رها نموده و رمزعبور را خالی بگذارید.",
     "One Base DN per line" : "یک پایه DN در هر خط",
     "You can specify Base DN for users and groups in the Advanced tab" : "شما می توانید پایه DN را برای کاربران و گروه ها در زبانه Advanced مشخص کنید.",
+    "Test Base DN" : "تست DN پایه",
     "Saving" : "درحال ذخیره",
     "Back" : "بازگشت",
     "Continue" : "ادامه",
@@ -56,6 +57,7 @@
     "Backup (Replica) Port" : "پشتیبان گیری (بدل) پورت",
     "Disable Main Server" : "غیر فعال کردن سرور اصلی",
     "Turn off SSL certificate validation." : "غیرفعال کردن اعتبار گواهی نامه SSL .",
+    "Cache Time-To-Live" : "مدت زمان کش",
     "Directory Settings" : "تنظیمات پوشه",
     "User Display Name Field" : "فیلد نام کاربر",
     "Base User Tree" : "کاربر درخت پایه",
@@ -67,6 +69,7 @@
     "One Group Base DN per line" : "یک گروه پایه DN در هر خط",
     "Group Search Attributes" : "گروه صفات جستجو",
     "Group-Member association" : "انجمن گروه کاربران",
+    "Nested Groups" : "گروه‌های زیرمجموعه",
     "Special Attributes" : "ویژگی های مخصوص",
     "Quota Field" : "سهمیه بندی انجام نشد.",
     "Quota Default" : "سهمیه بندی پیش فرض",
@@ -77,6 +80,7 @@
     "Internal Username" : "نام کاربری داخلی",
     "Internal Username Attribute:" : "ویژگی نام کاربری داخلی:",
     "Override UUID detection" : "نادیده گرفتن تشخیص UUID ",
+    "UUID Attribute for Users:" : "UUID ویژگی‌ برای کاربران:",
     "Username-LDAP User Mapping" : "نام کاربری - نگاشت کاربر LDAP ",
     "Clear Username-LDAP User Mapping" : "پاک کردن نام کاربری- LDAP  نگاشت کاربر ",
     "Clear Groupname-LDAP Group Mapping" : "پاک کردن نام گروه -LDAP گروه نقشه برداری"
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index e781c67281d..7a1becdbd5f 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -194,6 +194,7 @@ OC.L10N.register(
     "Finish setup" : "اتمام نصب",
     "Finishing …" : "در حال اتمام ...",
     "Need help?" : "کمک لازم دارید ؟",
+    "See the documentation" : "مشاهده‌ی مستندات",
     "Log out" : "خروج",
     "Search" : "جست‌و‌جو",
     "Please contact your administrator." : "لطفا با مدیر وب‌سایت تماس بگیرید.",
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index 56604614b4f..4f3d4163903 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -192,6 +192,7 @@
     "Finish setup" : "اتمام نصب",
     "Finishing …" : "در حال اتمام ...",
     "Need help?" : "کمک لازم دارید ؟",
+    "See the documentation" : "مشاهده‌ی مستندات",
     "Log out" : "خروج",
     "Search" : "جست‌و‌جو",
     "Please contact your administrator." : "لطفا با مدیر وب‌سایت تماس بگیرید.",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 6e8343a0675..9ab3dc1f1ed 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
     "Preparing update" : "Préparation de la mise à jour",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Les tests de migration sont ignorées - \"update.skip-migration-test\" est activée dans le fichier config.php",
     "Turned on maintenance mode" : "Mode de maintenance activé",
     "Turned off maintenance mode" : "Mode de maintenance désactivé",
     "Maintenance mode is kept active" : "Le mode de maintenance est laissé actif",
@@ -12,6 +13,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s",
     "Repair warning: " : "Avertissement de réparation :",
     "Repair error: " : "Erreur de réparation :",
+    "Set log level to debug - current level: \"%s\"" : "Régler le niveau de journal pour le débogage - niveau actuel: \"%s\"",
+    "Reset log level to  \"%s\"" : "Réinitialiser le niveau des journaux pour \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Les applications incompatibles suivantes ont été désactivées : %s",
     "Following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
     "Already up to date" : "Déjà à jour",
@@ -183,6 +186,7 @@ OC.L10N.register(
     "New Password" : "Nouveau mot de passe",
     "Reset password" : "Réinitialiser le mot de passe",
     "Searching other places" : "Recherche en cours dans d'autres emplacements",
+    "No search results in other folders" : "Aucun résultat de recherche dans les autres dossiers",
     "Personal" : "Personnel",
     "Users" : "Utilisateurs",
     "Apps" : "Applications",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 62e6ba164f6..a6c01c55636 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
     "Preparing update" : "Préparation de la mise à jour",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Les tests de migration sont ignorées - \"update.skip-migration-test\" est activée dans le fichier config.php",
     "Turned on maintenance mode" : "Mode de maintenance activé",
     "Turned off maintenance mode" : "Mode de maintenance désactivé",
     "Maintenance mode is kept active" : "Le mode de maintenance est laissé actif",
@@ -10,6 +11,8 @@
     "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s",
     "Repair warning: " : "Avertissement de réparation :",
     "Repair error: " : "Erreur de réparation :",
+    "Set log level to debug - current level: \"%s\"" : "Régler le niveau de journal pour le débogage - niveau actuel: \"%s\"",
+    "Reset log level to  \"%s\"" : "Réinitialiser le niveau des journaux pour \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Les applications incompatibles suivantes ont été désactivées : %s",
     "Following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
     "Already up to date" : "Déjà à jour",
@@ -181,6 +184,7 @@
     "New Password" : "Nouveau mot de passe",
     "Reset password" : "Réinitialiser le mot de passe",
     "Searching other places" : "Recherche en cours dans d'autres emplacements",
+    "No search results in other folders" : "Aucun résultat de recherche dans les autres dossiers",
     "Personal" : "Personnel",
     "Users" : "Utilisateurs",
     "Apps" : "Applications",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 17edf5dd286..f90cd8d2b62 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -110,6 +110,7 @@ OC.L10N.register(
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "a /dev/urandom eszköz nem elérhető PHP-ből, ami nagyon nagy biztonsági problémát jelent. További információ található az alábbi <a href=\"{docLink}\">dokumentációban</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A PHP verziód ({version}) már nem <a href=\"{phpLink}\">támogatott a PHP által</a>. Javasoljuk, hogy frissítsd a PHP verziót, hogy kihasználd a teljesítménybeli és biztonsági javításokat.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "A fordított proxy fejlécek konfigurációs beállításai helytelenek, vagy egy megbízható proxy-ból próbálja az ownCloud-ot elérni. Ha nem megbízható proxy-ból próbálja elérni az ownCloud-ot, akkor ez egy biztonsági probléma, a támadó az ownCloud számára látható IP cím csalást tud végrehajtani. További információ található a <a href=\"{docLink}\">dokumentációban</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached be van konfigurálva gyorsítótárnak, de rossz \"memcache\" PHP modul van telepítve. \\OC\\Memcache\\Memcached csak a \"memcached\"-t támogatja,  és nem a \"memcache\"-t. Kérjük, nézd meg a <a href=\"{wikiLink}\">memcached wiki oldalt a modulokkal kapcsolatban</a>.",
     "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "A \"{header}\" HTTP fejléc nincs beállítva, hogy megegyezzen az elvárttal \"{expected}\". Ez egy potenciális biztonsági kockázat és kérjük, hogy változtassa meg a beállításokat.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "A \"Strict-Transport-Security\" HTTP fejléc nincs beállítva hogy \"{seconds}\" másodpercig tartson. Biztonsági okokból ajánljuk, hogy engedélyezze a HSTS, ahogyan ezt részletezzük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban.",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 976fd0050fe..429c5e095ea 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -108,6 +108,7 @@
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "a /dev/urandom eszköz nem elérhető PHP-ből, ami nagyon nagy biztonsági problémát jelent. További információ található az alábbi <a href=\"{docLink}\">dokumentációban</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A PHP verziód ({version}) már nem <a href=\"{phpLink}\">támogatott a PHP által</a>. Javasoljuk, hogy frissítsd a PHP verziót, hogy kihasználd a teljesítménybeli és biztonsági javításokat.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "A fordított proxy fejlécek konfigurációs beállításai helytelenek, vagy egy megbízható proxy-ból próbálja az ownCloud-ot elérni. Ha nem megbízható proxy-ból próbálja elérni az ownCloud-ot, akkor ez egy biztonsági probléma, a támadó az ownCloud számára látható IP cím csalást tud végrehajtani. További információ található a <a href=\"{docLink}\">dokumentációban</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached be van konfigurálva gyorsítótárnak, de rossz \"memcache\" PHP modul van telepítve. \\OC\\Memcache\\Memcached csak a \"memcached\"-t támogatja,  és nem a \"memcache\"-t. Kérjük, nézd meg a <a href=\"{wikiLink}\">memcached wiki oldalt a modulokkal kapcsolatban</a>.",
     "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "A \"{header}\" HTTP fejléc nincs beállítva, hogy megegyezzen az elvárttal \"{expected}\". Ez egy potenciális biztonsági kockázat és kérjük, hogy változtassa meg a beállításokat.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "A \"Strict-Transport-Security\" HTTP fejléc nincs beállítva hogy \"{seconds}\" másodpercig tartson. Biztonsági okokból ajánljuk, hogy engedélyezze a HSTS, ahogyan ezt részletezzük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban.",
diff --git a/lib/l10n/fa.js b/lib/l10n/fa.js
index 8658c4bf7fc..3e77cf40baa 100644
--- a/lib/l10n/fa.js
+++ b/lib/l10n/fa.js
@@ -54,6 +54,9 @@ OC.L10N.register(
     "Microsoft Windows Platform is not supported" : "بستر Microsoft Windows پشتیبانی نمی‎‌شود",
     "Cannot write into \"config\" directory" : "امکان نوشتن درون شاخه‌ی \"config\" وجود ندارد",
     "Please ask your server administrator to install the module." : "لطفا از مدیر سیستم بخواهید تا ماژول را نصب کند.",
-    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 نیاز است"
+    "PHP module %s not installed." : "ماژول PHP %s نصب نشده است.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 نیاز است",
+    "Please upgrade your database version" : "لطفا نسخه‌ی پایگاه‌داده‌ی خود را بروز کنید",
+    "Error occurred while checking PostgreSQL version" : "خطا در هنگام بررسی نسخه‌ی PostgreSQL"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/fa.json b/lib/l10n/fa.json
index b1ffa2ac122..ae18861fa8a 100644
--- a/lib/l10n/fa.json
+++ b/lib/l10n/fa.json
@@ -52,6 +52,9 @@
     "Microsoft Windows Platform is not supported" : "بستر Microsoft Windows پشتیبانی نمی‎‌شود",
     "Cannot write into \"config\" directory" : "امکان نوشتن درون شاخه‌ی \"config\" وجود ندارد",
     "Please ask your server administrator to install the module." : "لطفا از مدیر سیستم بخواهید تا ماژول را نصب کند.",
-    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 نیاز است"
+    "PHP module %s not installed." : "ماژول PHP %s نصب نشده است.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 نیاز است",
+    "Please upgrade your database version" : "لطفا نسخه‌ی پایگاه‌داده‌ی خود را بروز کنید",
+    "Error occurred while checking PostgreSQL version" : "خطا در هنگام بررسی نسخه‌ی PostgreSQL"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index 062e77cbd6a..b6345dbb767 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -72,6 +72,7 @@ OC.L10N.register(
     "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
     "Error creating user" : "خطا در ایجاد کاربر",
     "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
+    "A valid email must be provided" : "یک ایمیل معتبر باید وارد شود",
     "__language_name__" : "__language_name__",
     "Sync clients" : "همگام‌سازی مشتریان",
     "Personal info" : "مشخصات شخصی",
@@ -88,6 +89,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "ماژول 'fileinfo' PHP از کار افتاده است.ما اکیدا توصیه می کنیم که این ماژول را فعال کنید تا نتایج بهتری به وسیله ی mime-type detection دریافت کنید.",
+    "All checks passed." : "تمامی موارد با موفقیت چک شدند.",
     "Open documentation" : "بازکردن مستند",
     "Allow apps to use the Share API" : "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
     "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
@@ -160,9 +162,13 @@ OC.L10N.register(
     "Choose as profile image" : "یک تصویر پروفایل انتخاب کنید",
     "Language" : "زبان",
     "Help translate" : "به ترجمه آن کمک کنید",
+    "Common Name" : "نام مشترک",
     "Valid until" : "متعبر تا",
+    "Issued By" : "صدور توسط",
+    "Valid until %s" : "متعبر تا %s",
     "Show storage location" : "نمایش محل ذخیره‌سازی",
     "Show last log in" : "نمایش اخرین ورود",
+    "Send email to new user" : "ارسال ایمیل به کاربر جدید",
     "Show email address" : "نمایش پست الکترونیکی",
     "Username" : "نام کاربری",
     "E-Mail" : "ایمیل",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index c61ad80c655..b9f5e3aca22 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -70,6 +70,7 @@
     "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
     "Error creating user" : "خطا در ایجاد کاربر",
     "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
+    "A valid email must be provided" : "یک ایمیل معتبر باید وارد شود",
     "__language_name__" : "__language_name__",
     "Sync clients" : "همگام‌سازی مشتریان",
     "Personal info" : "مشخصات شخصی",
@@ -86,6 +87,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "ماژول 'fileinfo' PHP از کار افتاده است.ما اکیدا توصیه می کنیم که این ماژول را فعال کنید تا نتایج بهتری به وسیله ی mime-type detection دریافت کنید.",
+    "All checks passed." : "تمامی موارد با موفقیت چک شدند.",
     "Open documentation" : "بازکردن مستند",
     "Allow apps to use the Share API" : "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
     "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
@@ -158,9 +160,13 @@
     "Choose as profile image" : "یک تصویر پروفایل انتخاب کنید",
     "Language" : "زبان",
     "Help translate" : "به ترجمه آن کمک کنید",
+    "Common Name" : "نام مشترک",
     "Valid until" : "متعبر تا",
+    "Issued By" : "صدور توسط",
+    "Valid until %s" : "متعبر تا %s",
     "Show storage location" : "نمایش محل ذخیره‌سازی",
     "Show last log in" : "نمایش اخرین ورود",
+    "Send email to new user" : "ارسال ایمیل به کاربر جدید",
     "Show email address" : "نمایش پست الکترونیکی",
     "Username" : "نام کاربری",
     "E-Mail" : "ایمیل",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index a7c389aab1e..23cc6357a2a 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Désinstallation...",
     "Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
     "Uninstall" : "Désinstaller",
+    "App update" : "Mise à jour App",
     "An error occurred: {message}" : "Une erreur est survenue : {message}",
     "Select a profile picture" : "Selectionnez une photo de profil ",
     "Very weak password" : "Mot de passe de très faible sécurité",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 81011944298..b51a82df574 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -75,6 +75,7 @@
     "Uninstalling ...." : "Désinstallation...",
     "Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
     "Uninstall" : "Désinstaller",
+    "App update" : "Mise à jour App",
     "An error occurred: {message}" : "Une erreur est survenue : {message}",
     "Select a profile picture" : "Selectionnez une photo de profil ",
     "Very weak password" : "Mot de passe de très faible sécurité",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index 226ce7e01d9..5451728773b 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -72,6 +72,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Eltávolítás ...",
     "Error while uninstalling app" : "Hiba történt az alkalmazás eltávolítása közben",
     "Uninstall" : "Eltávolítás",
+    "App update" : "Alkalmazás frissítése",
     "An error occurred: {message}" : "Hiba történt: {message}",
     "Select a profile picture" : "Válasszon profilképet!",
     "Very weak password" : "Nagyon gyenge jelszó",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index 14577924e94..08a34e158f5 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -70,6 +70,7 @@
     "Uninstalling ...." : "Eltávolítás ...",
     "Error while uninstalling app" : "Hiba történt az alkalmazás eltávolítása közben",
     "Uninstall" : "Eltávolítás",
+    "App update" : "Alkalmazás frissítése",
     "An error occurred: {message}" : "Hiba történt: {message}",
     "Select a profile picture" : "Válasszon profilképet!",
     "Very weak password" : "Nagyon gyenge jelszó",
-- 
GitLab


From c7aef6c36833b1d9bdec9dc30ceb874b8cb93019 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 26 Aug 2015 17:08:25 +0200
Subject: [PATCH 761/783] Fix uploading avatar and root certs in IE8

---
 core/avatar/avatarcontroller.php              | 58 +++++++++++++++----
 core/js/js.js                                 |  1 +
 lib/public/appframework/controller.php        |  8 ++-
 lib/public/util.php                           | 14 +++++
 settings/controller/certificatecontroller.php | 19 ++++--
 settings/js/personal.js                       | 46 +++++++++++----
 settings/personal.php                         |  1 +
 settings/templates/personal.php               | 11 ++--
 8 files changed, 124 insertions(+), 34 deletions(-)

diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index 4841ba00f7a..1604ecf79d1 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -140,12 +140,21 @@ class AvatarController extends Controller {
 		$userId = $this->userSession->getUser()->getUID();
 		$files = $this->request->getUploadedFile('files');
 
+		$headers = [];
+		if (\OCP\Util::isIE8()) {
+			// due to upload iframe workaround, need to set content-type to text/plain
+			$headers['Content-Type'] = 'text/plain';
+		}
+
 		if (isset($path)) {
 			$path = stripslashes($path);
 			$node = $this->userFolder->get($path);
 			if ($node->getSize() > 20*1024*1024) {
-				return new DataResponse(['data' => ['message' => $this->l->t('File is too big')]],
-					Http::STATUS_BAD_REQUEST);
+				return new DataResponse(
+					['data' => ['message' => $this->l->t('File is too big')]],
+					Http::STATUS_BAD_REQUEST,
+					$headers
+				);
 			}
 			$content = $node->getContent();
 		} elseif (!is_null($files)) {
@@ -155,20 +164,29 @@ class AvatarController extends Controller {
 				!\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
 			) {
 				if ($files['size'][0] > 20*1024*1024) {
-					return new DataResponse(['data' => ['message' => $this->l->t('File is too big')]],
-						Http::STATUS_BAD_REQUEST);
+					return new DataResponse(
+						['data' => ['message' => $this->l->t('File is too big')]],
+						Http::STATUS_BAD_REQUEST,
+						$headers
+					);
 				}
 				$this->cache->set('avatar_upload', file_get_contents($files['tmp_name'][0]), 7200);
 				$content = $this->cache->get('avatar_upload');
 				unlink($files['tmp_name'][0]);
 			} else {
-				return new DataResponse(['data' => ['message' => $this->l->t('Invalid file provided')]],
-										Http::STATUS_BAD_REQUEST);
+				return new DataResponse(
+					['data' => ['message' => $this->l->t('Invalid file provided')]],
+					Http::STATUS_BAD_REQUEST,
+					$headers
+				);
 			}
 		} else {
 			//Add imgfile
-			return new DataResponse(['data' => ['message' => $this->l->t('No image or file provided')]],
-									Http::STATUS_BAD_REQUEST);
+			return new DataResponse(
+				['data' => ['message' => $this->l->t('No image or file provided')]],
+				Http::STATUS_BAD_REQUEST,
+				$headers
+			);
 		}
 
 		try {
@@ -179,16 +197,32 @@ class AvatarController extends Controller {
 			if ($image->valid()) {
 				$mimeType = $image->mimeType();
 				if ($mimeType !== 'image/jpeg' && $mimeType !== 'image/png') {
-					return new DataResponse(['data' => ['message' => $this->l->t('Unknown filetype')]]);
+					return new DataResponse(
+						['data' => ['message' => $this->l->t('Unknown filetype')]],
+						Http::STATUS_OK,
+						$headers
+					);
 				}
 
 				$this->cache->set('tmpAvatar', $image->data(), 7200);
-				return new DataResponse(['data' => 'notsquare']);
+				return new DataResponse(
+					['data' => 'notsquare'],
+					Http::STATUS_OK,
+					$headers
+				);
 			} else {
-				return new DataResponse(['data' => ['message' => $this->l->t('Invalid image')]]);
+				return new DataResponse(
+					['data' => ['message' => $this->l->t('Invalid image')]],
+					Http::STATUS_OK,
+					$headers
+				);
 			}
 		} catch (\Exception $e) {
-			return new DataResponse(['data' => ['message' => $e->getMessage()]]);
+			return new DataResponse(
+				['data' => ['message' => $e->getMessage()]],
+				Http::STATUS_OK,
+				$headers
+			);
 		}
 	}
 
diff --git a/core/js/js.js b/core/js/js.js
index 4f0f288bd0c..00a775b8027 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -85,6 +85,7 @@ var OC={
 	appConfig: window.oc_appconfig || {},
 	theme: window.oc_defaults || {},
 	coreApps:['', 'admin','log','core/search','settings','core','3rdparty'],
+	requestToken: oc_requesttoken,
 	menuSpeed: 50,
 
 	/**
diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php
index b8986c0b772..5c7292cd130 100644
--- a/lib/public/appframework/controller.php
+++ b/lib/public/appframework/controller.php
@@ -83,7 +83,13 @@ abstract class Controller {
 						$data->getData(),
 						$data->getStatus()
 					);
-					$response->setHeaders(array_merge($data->getHeaders(), $response->getHeaders()));
+					$dataHeaders = $data->getHeaders();
+					$headers = $response->getHeaders();
+					// do not overwrite Content-Type if it already exists
+					if (isset($dataHeaders['Content-Type'])) {
+						unset($headers['Content-Type']);
+					}
+					$response->setHeaders(array_merge($dataHeaders, $headers));
 					return $response;
 				} else {
 					return new JSONResponse($data);
diff --git a/lib/public/util.php b/lib/public/util.php
index 76b61347d46..2b81b6bfc49 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -670,4 +670,18 @@ class Util {
 		}		
 		return self::$needUpgradeCache;
 	}
+
+	/**
+	 * Returns whether the current request is coming from a
+	 * famous awfully old browser.
+	 *
+	 * @return boolean true if it's IE8, false otherwise
+	 */
+	public static function isIE8() {
+		preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
+		if (count($matches) > 0 && $matches[1] <= 9) {
+			return true;
+		}
+		return false;
+	}
 }
diff --git a/settings/controller/certificatecontroller.php b/settings/controller/certificatecontroller.php
index 8ff9f51a66c..b7bc81920c2 100644
--- a/settings/controller/certificatecontroller.php
+++ b/settings/controller/certificatecontroller.php
@@ -68,19 +68,25 @@ class CertificateController extends Controller {
 	 * @return array
 	 */
 	public function addPersonalRootCertificate() {
+		$headers = [];
+		if (\OCP\Util::isIE8()) {
+			// due to upload iframe workaround, need to set content-type to text/plain
+			$headers['Content-Type'] = 'text/plain';
+		}
 
 		if ($this->isCertificateImportAllowed() === false) {
-			return new DataResponse('Individual certificate management disabled', Http::STATUS_FORBIDDEN);
+			return new DataResponse(['message' => 'Individual certificate management disabled'], Http::STATUS_FORBIDDEN, $headers);
 		}
 
 		$file = $this->request->getUploadedFile('rootcert_import');
 		if(empty($file)) {
-			return new DataResponse(['message' => 'No file uploaded'], Http::STATUS_UNPROCESSABLE_ENTITY);
+			return new DataResponse(['message' => 'No file uploaded'], Http::STATUS_UNPROCESSABLE_ENTITY, $headers);
 		}
 
 		try {
 			$certificate = $this->certificateManager->addCertificate(file_get_contents($file['tmp_name']), $file['name']);
-			return new DataResponse([
+			return new DataResponse(
+				[
 				'name' => $certificate->getName(),
 				'commonName' => $certificate->getCommonName(),
 				'organization' => $certificate->getOrganization(),
@@ -90,9 +96,12 @@ class CertificateController extends Controller {
 				'validTillString' => $this->l10n->l('date', $certificate->getExpireDate()),
 				'issuer' => $certificate->getIssuerName(),
 				'issuerOrganization' => $certificate->getIssuerOrganization(),
-			]);
+				],
+				Http::STATUS_OK,
+				$headers
+			);
 		} catch (\Exception $e) {
-			return new DataResponse('An error occurred.', Http::STATUS_UNPROCESSABLE_ENTITY);
+			return new DataResponse('An error occurred.', Http::STATUS_UNPROCESSABLE_ENTITY, $headers);
 		}
 	}
 
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 33746d22aca..acc1478cd78 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -5,8 +5,6 @@
  * See the COPYING-README file.
  */
 
-/* global OC, t */
-
 /**
  * The callback will be fired as soon as enter is pressed by the
  * user or 1 second after the last data entry
@@ -156,6 +154,9 @@ function cleanCropper () {
 }
 
 function avatarResponseHandler (data) {
+	if (typeof data === 'string') {
+		data = $.parseJSON(data);
+	}
 	var $warning = $('#avatar .warning');
 	$warning.hide();
 	if (data.status === "success") {
@@ -233,7 +234,21 @@ $(document).ready(function () {
 
 	var uploadparms = {
 		done: function (e, data) {
-			avatarResponseHandler(data.result);
+			var response = data;
+			if (typeof data.result === 'string') {
+				response = $.parseJSON(data.result);
+			} else if (data.result && data.result.length) {
+				// fetch response from iframe
+				response = $.parseJSON(data.result[0].body.innerText);
+			} else {
+				response = data.result;
+			}
+			avatarResponseHandler(response);
+		},
+		submit: function(e, data) {
+			data.formData = _.extend(data.formData || {}, {
+				requesttoken: OC.requestToken
+			});
 		},
 		fail: function (e, data){
 			var msg = data.jqXHR.statusText + ' (' + data.jqXHR.status + ')';
@@ -251,10 +266,6 @@ $(document).ready(function () {
 		}
 	};
 
-	$('#uploadavatarbutton').click(function () {
-		$('#uploadavatar').click();
-	});
-
 	$('#uploadavatar').fileupload(uploadparms);
 
 	$('#selectavatar').click(function () {
@@ -344,7 +355,24 @@ $(document).ready(function () {
 	$('#sslCertificate tr > td').tipsy({gravity: 'n', live: true});
 
 	$('#rootcert_import').fileupload({
+		submit: function(e, data) {
+			data.formData = _.extend(data.formData || {}, {
+				requesttoken: OC.requestToken
+			});
+		},
 		success: function (data) {
+			if (typeof data === 'string') {
+				data = $.parseJSON(data);
+			} else if (data && data.length) {
+				// fetch response from iframe
+				data = $.parseJSON(data[0].body.innerText);
+			}
+			if (!data || typeof(data) === 'string') {
+				// IE8 iframe workaround comes here instead of fail()
+				OC.Notification.showTemporary(
+					t('settings', 'An error occurred. Please upload an ASCII-encoded PEM certificate.'));
+				return;
+			}
 			var issueDate = new Date(data.validFrom * 1000);
 			var expireDate = new Date(data.validTill * 1000);
 			var now = new Date();
@@ -374,10 +402,6 @@ $(document).ready(function () {
 		}
 	});
 
-	$('#rootcert_import_button').click(function () {
-		$('#rootcert_import').click();
-	});
-
 	if ($('#sslCertificate > tbody > tr').length === 0) {
 		$('#sslCertificate').hide();
 	}
diff --git a/settings/personal.php b/settings/personal.php
index e58e043af50..8cbcf923a58 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -46,6 +46,7 @@ OC_Util::addScript( 'settings', 'personal' );
 OC_Util::addStyle( 'settings', 'settings' );
 \OC_Util::addVendorScript('strengthify/jquery.strengthify');
 \OC_Util::addVendorStyle('strengthify/strengthify');
+\OC_Util::addScript('files', 'jquery.iframe-transport');
 \OC_Util::addScript('files', 'jquery.fileupload');
 if ($config->getSystemValue('enable_avatars', true) === true) {
 	\OC_Util::addVendorScript('jcrop/js/jquery.Jcrop');
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index c0adaf9c5a3..0eba71d77d1 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -155,10 +155,11 @@ if($_['passwordChangeSupported']) {
 		<div class="avatardiv"></div><br>
 		<div class="warning hidden"></div>
 		<?php if ($_['avatarChangeSupported']): ?>
-		<div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div>
-		<input type="file" class="hidden" name="files[]" id="uploadavatar">
+		<label for="uploadavatar" class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></label>
 		<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div>
-		<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br>
+		<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div>
+		<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
+		<br>
 		<?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB.')); ?>
 		<?php else: ?>
 		<?php p($l->t('Your avatar is provided by your original account.')); ?>
@@ -239,8 +240,8 @@ if($_['passwordChangeSupported']) {
 		</tbody>
 	</table>
 	<form class="uploadButton" method="post" action="<?php p($_['urlGenerator']->linkToRoute('settings.Certificate.addPersonalRootCertificate')); ?>" target="certUploadFrame">
-		<input type="file" id="rootcert_import" name="rootcert_import" class="hidden">
-		<input type="button" id="rootcert_import_button" value="<?php p($l->t('Import root certificate')); ?>"/>
+		<label for="rootcert_import" class="inlineblock button" id="rootcert_import_button"><?php p($l->t('Import root certificate')); ?></label>
+		<input type="file" id="rootcert_import" name="rootcert_import" class="hiddenuploadfield">
 	</form>
 </div>
 <?php endif; ?>
-- 
GitLab


From bf579a153f8f0d6fb081a1d11718ea48c779da34 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 6 Oct 2015 14:58:07 +0200
Subject: [PATCH 762/783] fix IE8 user agent detection

---
 core/avatar/avatarcontroller.php              |  2 +-
 lib/private/appframework/http/request.php     |  1 +
 lib/public/util.php                           | 14 --------------
 settings/controller/certificatecontroller.php |  2 +-
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index 1604ecf79d1..eb2cb657104 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -141,7 +141,7 @@ class AvatarController extends Controller {
 		$files = $this->request->getUploadedFile('files');
 
 		$headers = [];
-		if (\OCP\Util::isIE8()) {
+		if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE_8])) {
 			// due to upload iframe workaround, need to set content-type to text/plain
 			$headers['Content-Type'] = 'text/plain';
 		}
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index 3e24eec37c8..77785135162 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -43,6 +43,7 @@ use OCP\Security\ISecureRandom;
 class Request implements \ArrayAccess, \Countable, IRequest {
 
 	const USER_AGENT_IE = '/MSIE/';
+	const USER_AGENT_IE_8 = '/MSIE 8.0/';
 	// Android Chrome user agent: https://developers.google.com/chrome/mobile/docs/user-agent
 	const USER_AGENT_ANDROID_MOBILE_CHROME = '#Android.*Chrome/[.0-9]*#';
 	const USER_AGENT_FREEBOX = '#^Mozilla/5\.0$#';
diff --git a/lib/public/util.php b/lib/public/util.php
index 2b81b6bfc49..76b61347d46 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -670,18 +670,4 @@ class Util {
 		}		
 		return self::$needUpgradeCache;
 	}
-
-	/**
-	 * Returns whether the current request is coming from a
-	 * famous awfully old browser.
-	 *
-	 * @return boolean true if it's IE8, false otherwise
-	 */
-	public static function isIE8() {
-		preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
-		if (count($matches) > 0 && $matches[1] <= 9) {
-			return true;
-		}
-		return false;
-	}
 }
diff --git a/settings/controller/certificatecontroller.php b/settings/controller/certificatecontroller.php
index b7bc81920c2..ef14ff3d9d9 100644
--- a/settings/controller/certificatecontroller.php
+++ b/settings/controller/certificatecontroller.php
@@ -69,7 +69,7 @@ class CertificateController extends Controller {
 	 */
 	public function addPersonalRootCertificate() {
 		$headers = [];
-		if (\OCP\Util::isIE8()) {
+		if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE_8])) {
 			// due to upload iframe workaround, need to set content-type to text/plain
 			$headers['Content-Type'] = 'text/plain';
 		}
-- 
GitLab


From 14591d9df70ed453b911b5c6647cb2fd20cf5be5 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 7 Oct 2015 11:13:47 +0200
Subject: [PATCH 763/783] Use injected request

---
 core/avatar/avatarcontroller.php              | 2 +-
 settings/controller/certificatecontroller.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index eb2cb657104..97b3615c032 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -141,7 +141,7 @@ class AvatarController extends Controller {
 		$files = $this->request->getUploadedFile('files');
 
 		$headers = [];
-		if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE_8])) {
+		if ($this->request->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE_8])) {
 			// due to upload iframe workaround, need to set content-type to text/plain
 			$headers['Content-Type'] = 'text/plain';
 		}
diff --git a/settings/controller/certificatecontroller.php b/settings/controller/certificatecontroller.php
index ef14ff3d9d9..750144e7a2c 100644
--- a/settings/controller/certificatecontroller.php
+++ b/settings/controller/certificatecontroller.php
@@ -69,7 +69,7 @@ class CertificateController extends Controller {
 	 */
 	public function addPersonalRootCertificate() {
 		$headers = [];
-		if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE_8])) {
+		if ($this->request->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE_8])) {
 			// due to upload iframe workaround, need to set content-type to text/plain
 			$headers['Content-Type'] = 'text/plain';
 		}
-- 
GitLab


From c8640cdcb02868e5d9766806000e3785ba2ae0ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 1 Oct 2015 13:23:30 +0200
Subject: [PATCH 764/783] adjust filesystem tests to objectstore

---
 tests/lib/files/filesystem.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index cc01ed70b5d..15a7c235405 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -325,8 +325,14 @@ class Filesystem extends \Test\TestCase {
 
 		$homeMount = \OC\Files\Filesystem::getStorage('/' . $userId . '/');
 
-		$this->assertTrue($homeMount->instanceOfStorage('\OC\Files\Storage\Home'));
-		$this->assertEquals('home::' . $userId, $homeMount->getId());
+		$this->assertTrue($homeMount->instanceOfStorage('\OCP\Files\IHomeStorage'));
+		if (getenv('RUN_OBJECTSTORE_TESTS')) {
+			$this->assertTrue($homeMount->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage'));
+			$this->assertEquals('object::user:' . $userId, $homeMount->getId());
+		} else {
+			$this->assertTrue($homeMount->instanceOfStorage('\OC\Files\Storage\Home'));
+			$this->assertEquals('home::' . $userId, $homeMount->getId());
+		}
 
 		\OC_User::deleteUser($userId);
 	}
@@ -336,6 +342,9 @@ class Filesystem extends \Test\TestCase {
 	 * for the user's mount point
 	 */
 	public function testLegacyHomeMount() {
+		if (getenv('RUN_OBJECTSTORE_TESTS')) {
+			$this->markTestSkipped('legacy storage unrelated to objectstore environments');
+		}
 		$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
 		$userId = $this->getUniqueID('user_');
 
@@ -380,7 +389,7 @@ class Filesystem extends \Test\TestCase {
 			\OC\Files\Filesystem::getMountPoint('/' . $userId . '/cache')
 		);
 		list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache');
-		$this->assertTrue($storage->instanceOfStorage('\OC\Files\Storage\Home'));
+		$this->assertTrue($storage->instanceOfStorage('\OCP\Files\IHomeStorage'));
 		$this->assertEquals('cache', $internalPath);
 		\OC_User::deleteUser($userId);
 
-- 
GitLab


From 38143d670b25cb172042a19a3aa822c62d2d3bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 9 Oct 2015 13:44:30 +0200
Subject: [PATCH 765/783] Catch exceptions during app upgrade - fixes #16240

---
 lib/private/updater.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/private/updater.php b/lib/private/updater.php
index 8aa8b0703d7..9e2e9c962f5 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -497,11 +497,15 @@ class Updater extends BasicEmitter {
 	 */
 	private function upgradeAppStoreApps(array $disabledApps) {
 		foreach($disabledApps as $app) {
-			if (OC_Installer::isUpdateAvailable($app)) {
-				$ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', '');
+			try {
+				if (OC_Installer::isUpdateAvailable($app)) {
+					$ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', '');
 
-				$this->emit('\OC\Updater', 'upgradeAppStoreApp', array($app));
-				OC_Installer::updateAppByOCSId($ocsId);
+					$this->emit('\OC\Updater', 'upgradeAppStoreApp', array($app));
+					OC_Installer::updateAppByOCSId($ocsId);
+				}
+			} catch (\Exception $ex) {
+				$this->log->logException($ex, ['app' => 'core']);
 			}
 		}
 	}
-- 
GitLab


From bd21e5925cf5e2f388b0f2b0f92d15e887c18423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 9 Oct 2015 13:46:59 +0200
Subject: [PATCH 766/783] Clean code

---
 lib/private/updater.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/updater.php b/lib/private/updater.php
index 9e2e9c962f5..69120427da8 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -32,7 +32,6 @@
 
 namespace OC;
 
-use OC\Core\Command\Log\Manage;
 use OC\Hooks\BasicEmitter;
 use OC_App;
 use OC_Installer;
@@ -207,7 +206,7 @@ class Updater extends BasicEmitter {
 		try {
 			$this->doUpgrade($currentVersion, $installedVersion);
 		} catch (\Exception $exception) {
-			\OCP\Util::logException('update', $exception);
+			$this->log->logException($exception, ['app' => 'core']);
 			$this->emit('\OC\Updater', 'failure', array(get_class($exception) . ': ' .$exception->getMessage()));
 			$success = false;
 		}
@@ -235,6 +234,7 @@ class Updater extends BasicEmitter {
 	private function getAllowedPreviousVersion() {
 		// this should really be a JSON file
 		require \OC::$SERVERROOT . '/version.php';
+		/** @var array $OC_VersionCanBeUpgradedFrom */
 		return implode('.', $OC_VersionCanBeUpgradedFrom);
 	}
 
-- 
GitLab


From 4cb5970947f915c801a6748ad26898831ed3b4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 9 Oct 2015 14:08:22 +0200
Subject: [PATCH 767/783] Always pass in ILogger

---
 core/command/upgrade.php       | 14 +++++++++-----
 core/register_command.php      |  2 +-
 lib/private/templatelayout.php |  2 +-
 lib/private/updater.php        |  4 +---
 tests/lib/updater.php          |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index 0f1b828ba25..5d4819f6baf 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -30,6 +30,7 @@ namespace OC\Core\Command;
 use OC\Console\TimestampFormatter;
 use OC\Updater;
 use OCP\IConfig;
+use OCP\ILogger;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -44,17 +45,19 @@ class Upgrade extends Command {
 	const ERROR_INVALID_ARGUMENTS = 4;
 	const ERROR_FAILURE = 5;
 
-	/**
-	 * @var IConfig
-	 */
+	/** @var IConfig */
 	private $config;
 
+	/** @var ILogger */
+	private $logger;
+
 	/**
 	 * @param IConfig $config
 	 */
-	public function __construct(IConfig $config) {
+	public function __construct(IConfig $config, ILogger $logger) {
 		parent::__construct();
 		$this->config = $config;
+		$this->logger = $logger;
 	}
 
 	protected function configure() {
@@ -126,7 +129,8 @@ class Upgrade extends Command {
 
 			$self = $this;
 			$updater = new Updater(\OC::$server->getHTTPHelper(),
-				$this->config);
+				$this->config,
+				$this->logger);
 
 			$updater->setSimulateStepEnabled($simulateStepEnabled);
 			$updater->setUpdateStepEnabled($updateStepEnabled);
diff --git a/core/register_command.php b/core/register_command.php
index 460e8626e5e..4044d2d200c 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -94,7 +94,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair(\OC\Repair::getRepairSteps()), \OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Maintenance\SingleUser(\OC::$server->getConfig()));
 
-	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig()));
+	$application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig(), \OC::$server->getLogger()));
 
 	$application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
 	$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 43c83dea815..7d16823d2a8 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -79,7 +79,7 @@ class OC_TemplateLayout extends OC_Template {
 			if($this->config->getSystemValue('updatechecker', true) === true &&
 				OC_User::isAdminUser(OC_User::getUser())) {
 				$updater = new \OC\Updater(\OC::$server->getHTTPHelper(),
-					\OC::$server->getConfig());
+					\OC::$server->getConfig(), \OC::$server->getLogger());
 				$data = $updater->check();
 
 				if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) {
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 69120427da8..70d68863788 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -198,9 +198,7 @@ class Updater extends BasicEmitter {
 
 		$installedVersion = $this->config->getSystemValue('version', '0.0.0');
 		$currentVersion = implode('.', \OC_Util::getVersion());
-		if ($this->log) {
-			$this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core'));
-		}
+		$this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core'));
 
 		$success = true;
 		try {
diff --git a/tests/lib/updater.php b/tests/lib/updater.php
index 763858acf5d..1651fe1759d 100644
--- a/tests/lib/updater.php
+++ b/tests/lib/updater.php
@@ -161,7 +161,7 @@ class UpdaterTest extends \Test\TestCase {
 	 * @param bool $result
 	 */
 	public function testIsUpgradePossible($oldVersion, $newVersion, $allowedVersion, $result) {
-		$updater = new Updater($this->httpHelper, $this->config);
+		$updater = new Updater($this->httpHelper, $this->config, $this->logger);
 		$this->assertSame($result, $updater->isUpgradePossible($oldVersion, $newVersion, $allowedVersion));
 	}
 
-- 
GitLab


From 2fddb1367acc381de965234588c84779ca178756 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 9 Oct 2015 14:12:59 +0200
Subject: [PATCH 768/783] fix primary group retrieval

---
 apps/user_ldap/group_ldap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 0b9c9d9d5f0..cf58e5b902d 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -247,7 +247,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		if(empty($result)) {
 			return false;
 		}
-		$dn = $result[0];
+		$dn = $result[0]['dn'][0];
 
 		//and now the group name
 		//NOTE once we have separate ownCloud group IDs and group names we can
-- 
GitLab


From d127b3f0d274547e1806bb33819b9966a6b544cb Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 9 Oct 2015 14:30:49 +0200
Subject: [PATCH 769/783] adjust tests

---
 apps/user_ldap/tests/group_ldap.php | 4 ++--
 apps/user_ldap/tests/user_ldap.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index 132fbfdf687..8ed2bc5c677 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -145,7 +145,7 @@ class Test_Group_Ldap extends \Test\TestCase {
 
 		$access->expects($this->once())
 			->method('searchGroups')
-			->will($this->returnValue(array('cn=foo,dc=barfoo,dc=bar')));
+			->will($this->returnValue([['dn' => ['cn=foo,dc=barfoo,dc=bar']]]));
 
 		$access->expects($this->once())
 			->method('dn2groupname')
@@ -221,7 +221,7 @@ class Test_Group_Ldap extends \Test\TestCase {
 
 		$access->expects($this->once())
 			->method('searchGroups')
-			->will($this->returnValue(array('cn=foo,dc=barfoo,dc=bar')));
+			->will($this->returnValue([['dn' => ['cn=foo,dc=barfoo,dc=bar']]]));
 
 		$access->expects($this->once())
 			->method('dn2groupname')
diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php
index 69a76c0b7ac..0f70c43fc11 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/user_ldap.php
@@ -124,7 +124,7 @@ class Test_User_Ldap_Direct extends \Test\TestCase {
 			   ->method('fetchListOfUsers')
 			   ->will($this->returnCallback(function($filter) {
 					if($filter === 'roland') {
-						return array(array('dn' => 'dnOfRoland,dc=test'));
+						return array(array('dn' => ['dnOfRoland,dc=test']));
 					}
 					return array();
 			   }));
@@ -133,7 +133,7 @@ class Test_User_Ldap_Direct extends \Test\TestCase {
 			->method('fetchUsersByLoginName')
 			->will($this->returnCallback(function($uid) {
 				if($uid === 'roland') {
-					return array(array('dn' => 'dnOfRoland,dc=test'));
+					return array(array('dn' => ['dnOfRoland,dc=test']));
 				}
 				return array();
 			}));
-- 
GitLab


From 8098c06e708ba24a5beccd7a85572c7990c9a3f5 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 9 Oct 2015 18:16:36 +0200
Subject: [PATCH 770/783] Do not update mime types for folders with extension

Some folders might have an extension like "test.conf".
This fix prevents to overwrite the folder's mime type with another mime
type while running the mimetype repair step.
---
 lib/repair/repairmimetypes.php       | 13 +++++++++++--
 tests/lib/repair/repairmimetypes.php | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/lib/repair/repairmimetypes.php b/lib/repair/repairmimetypes.php
index aeac69d00db..3ea9e45816e 100644
--- a/lib/repair/repairmimetypes.php
+++ b/lib/repair/repairmimetypes.php
@@ -35,6 +35,11 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
 	 */
 	protected $config;
 
+	/**
+	 * @var int
+	 */
+	protected $folderMimeTypeId;
+
 	/**
 	 * @param \OCP\IConfig $config
 	 */
@@ -91,7 +96,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
 		return \OC_DB::prepare('
 			UPDATE `*PREFIX*filecache`
 			SET `mimetype` = ?
-			WHERE `mimetype` <> ? AND `name` ILIKE ?
+			WHERE `mimetype` <> ? AND `mimetype` <> ? AND `name` ILIKE ?
 		');
 	}
 
@@ -124,6 +129,10 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
 	}
 
 	private function updateMimetypes($updatedMimetypes) {
+		if (empty($this->folderMimeTypeId)) {
+			$result = \OC_DB::executeAudited(self::getIdStmt(), array('httpd/unix-directory'));
+			$this->folderMimeTypeId = (int)$result->fetchOne();
+		}
 
 		foreach ($updatedMimetypes as $extension => $mimetype) {
 			$result = \OC_DB::executeAudited(self::existsStmt(), array($mimetype));
@@ -139,7 +148,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
 			$mimetypeId = $result->fetchOne();
 
 			// change mimetype for files with x extension
-			\OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $mimetypeId, '%.' . $extension));
+			\OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension));
 		}
 	}
 
diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php
index 0288a476ede..a0697776e73 100644
--- a/tests/lib/repair/repairmimetypes.php
+++ b/tests/lib/repair/repairmimetypes.php
@@ -514,5 +514,22 @@ class RepairMimeTypes extends \Test\TestCase {
 
 		$this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
 	}
+
+	/**
+	 * Test that mime type renaming does not affect folders
+	 */
+	public function testDoNotChangeFolderMimeType() {
+		$currentMimeTypes = [
+			['test.conf', 'httpd/unix-directory'],
+			['test.cnf', 'httpd/unix-directory'],
+		];
+
+		$fixedMimeTypes = [
+			['test.conf', 'httpd/unix-directory'],
+			['test.cnf', 'httpd/unix-directory'],
+		];
+
+		$this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
+	}
 }
 
-- 
GitLab


From e3a148584a434fe9748a4164dcddf77a402e0966 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 9 Oct 2015 20:07:35 +0200
Subject: [PATCH 771/783] adjust fetchList with a single requested attribute
 accordingly

---
 apps/user_ldap/lib/access.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index adfb11da673..c3a15c3ee45 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -721,7 +721,9 @@ class Access extends LDAPUtility implements user\IUserTools {
 				return $list;
 			} else {
 				$list = array_reduce($list, function($carry, $item) {
-					$carry[] = $item[0];
+					$attribute = array_keys($item)[0];
+					$carry[] = $item[$attribute][0];
+					return $carry;
 				}, array());
 				return array_unique($list, SORT_LOCALE_STRING);
 			}
-- 
GitLab


From 188acd5e4e4bf9e35e327ecf8389c75ead744732 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 10 Oct 2015 01:55:32 -0400
Subject: [PATCH 772/783] [tx-robot] updated from transifex

---
 apps/files/l10n/es_MX.js            | 3 +++
 apps/files/l10n/es_MX.json          | 3 +++
 apps/files/l10n/zh_CN.js            | 3 +++
 apps/files/l10n/zh_CN.json          | 3 +++
 apps/files_external/l10n/es_MX.js   | 2 ++
 apps/files_external/l10n/es_MX.json | 2 ++
 apps/files_external/l10n/fr.js      | 2 +-
 apps/files_external/l10n/fr.json    | 2 +-
 apps/files_sharing/l10n/fr.js       | 4 ++--
 apps/files_sharing/l10n/fr.json     | 4 ++--
 core/l10n/fr.js                     | 6 +++---
 core/l10n/fr.json                   | 6 +++---
 core/l10n/zh_CN.js                  | 6 ++++++
 core/l10n/zh_CN.json                | 6 ++++++
 settings/l10n/cs_CZ.js              | 6 +-----
 settings/l10n/cs_CZ.json            | 6 +-----
 settings/l10n/da.js                 | 6 +-----
 settings/l10n/da.json               | 6 +-----
 settings/l10n/de.js                 | 3 +--
 settings/l10n/de.json               | 3 +--
 settings/l10n/de_DE.js              | 2 +-
 settings/l10n/de_DE.json            | 2 +-
 settings/l10n/el.js                 | 6 +-----
 settings/l10n/el.json               | 6 +-----
 settings/l10n/en_GB.js              | 2 +-
 settings/l10n/en_GB.json            | 2 +-
 settings/l10n/es.js                 | 6 +-----
 settings/l10n/es.json               | 6 +-----
 settings/l10n/es_MX.js              | 1 +
 settings/l10n/es_MX.json            | 1 +
 settings/l10n/fi_FI.js              | 4 +---
 settings/l10n/fi_FI.json            | 4 +---
 settings/l10n/fr.js                 | 8 ++------
 settings/l10n/fr.json               | 8 ++------
 settings/l10n/gl.js                 | 2 +-
 settings/l10n/gl.json               | 2 +-
 settings/l10n/hu_HU.js              | 3 ++-
 settings/l10n/hu_HU.json            | 3 ++-
 settings/l10n/id.js                 | 6 +-----
 settings/l10n/id.json               | 6 +-----
 settings/l10n/it.js                 | 6 +-----
 settings/l10n/it.json               | 6 +-----
 settings/l10n/ko.js                 | 6 +-----
 settings/l10n/ko.json               | 6 +-----
 settings/l10n/nb_NO.js              | 6 +-----
 settings/l10n/nb_NO.json            | 6 +-----
 settings/l10n/nl.js                 | 6 +-----
 settings/l10n/nl.json               | 6 +-----
 settings/l10n/oc.js                 | 2 +-
 settings/l10n/oc.json               | 2 +-
 settings/l10n/pt_BR.js              | 6 +-----
 settings/l10n/pt_BR.json            | 6 +-----
 settings/l10n/ru.js                 | 6 +-----
 settings/l10n/ru.json               | 6 +-----
 settings/l10n/sr.js                 | 2 +-
 settings/l10n/sr.json               | 2 +-
 settings/l10n/th_TH.js              | 6 +-----
 settings/l10n/th_TH.json            | 6 +-----
 settings/l10n/tr.js                 | 6 +-----
 settings/l10n/tr.json               | 6 +-----
 settings/l10n/uk.js                 | 2 +-
 settings/l10n/uk.json               | 2 +-
 settings/l10n/zh_CN.js              | 6 +-----
 settings/l10n/zh_CN.json            | 6 +-----
 64 files changed, 94 insertions(+), 188 deletions(-)

diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js
index 29514b18226..5502733d2e2 100644
--- a/apps/files/l10n/es_MX.js
+++ b/apps/files/l10n/es_MX.js
@@ -59,6 +59,9 @@ OC.L10N.register(
     "Text file" : "Archivo de texto",
     "Folder" : "Carpeta",
     "New folder" : "Nueva carpeta",
+    "You created %1$s" : "Has creado %1$s",
+    "You changed %1$s" : "Has cambiado %1$s",
+    "You deleted %1$s" : "Has eliminado %1$s",
     "%s could not be renamed" : "%s no pudo ser renombrado",
     "File handling" : "Administración de archivos",
     "Maximum upload size" : "Tamaño máximo de subida",
diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json
index 520f2d0c446..22918fae182 100644
--- a/apps/files/l10n/es_MX.json
+++ b/apps/files/l10n/es_MX.json
@@ -57,6 +57,9 @@
     "Text file" : "Archivo de texto",
     "Folder" : "Carpeta",
     "New folder" : "Nueva carpeta",
+    "You created %1$s" : "Has creado %1$s",
+    "You changed %1$s" : "Has cambiado %1$s",
+    "You deleted %1$s" : "Has eliminado %1$s",
     "%s could not be renamed" : "%s no pudo ser renombrado",
     "File handling" : "Administración de archivos",
     "Maximum upload size" : "Tamaño máximo de subida",
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
index a56d59e240e..d2b0989e35a 100644
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s 删除了 %1$s",
     "You restored %1$s" : "你恢复了 %1$s",
     "%2$s restored %1$s" : "%2$s 恢复了 %1$s",
+    "Changed by %2$s" : "被 %2$s 更改",
+    "Deleted by %2$s" : "被 %2$s 删除",
+    "Restored by %2$s" : "被 %2$s 恢复",
     "%s could not be renamed as it has been deleted" : "%s 已经被删除，无法重命名 ",
     "%s could not be renamed" : "%s 不能被重命名",
     "Upload (max. %s)" : "上传 (最大 %s)",
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index c84450a095c..6eee0d3a765 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s 删除了 %1$s",
     "You restored %1$s" : "你恢复了 %1$s",
     "%2$s restored %1$s" : "%2$s 恢复了 %1$s",
+    "Changed by %2$s" : "被 %2$s 更改",
+    "Deleted by %2$s" : "被 %2$s 删除",
+    "Restored by %2$s" : "被 %2$s 恢复",
     "%s could not be renamed as it has been deleted" : "%s 已经被删除，无法重命名 ",
     "%s could not be renamed" : "%s 不能被重命名",
     "Upload (max. %s)" : "上传 (最大 %s)",
diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js
index 7e2770e6f52..574ba7443d8 100644
--- a/apps/files_external/l10n/es_MX.js
+++ b/apps/files_external/l10n/es_MX.js
@@ -5,10 +5,12 @@ OC.L10N.register(
     "Personal" : "Personal",
     "Grant access" : "Conceder acceso",
     "Access granted" : "Acceso concedido",
+    "Saved" : "Guardado",
     "None" : "Ninguno",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "API key" : "clave API",
+    "Public key" : "Llave pública",
     "Port" : "Puerto",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json
index 9a9835d9598..ab4fd8153c4 100644
--- a/apps/files_external/l10n/es_MX.json
+++ b/apps/files_external/l10n/es_MX.json
@@ -3,10 +3,12 @@
     "Personal" : "Personal",
     "Grant access" : "Conceder acceso",
     "Access granted" : "Acceso concedido",
+    "Saved" : "Guardado",
     "None" : "Ninguno",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "API key" : "clave API",
+    "Public key" : "Llave pública",
     "Port" : "Puerto",
     "WebDAV" : "WebDAV",
     "URL" : "URL",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index c5ceea05566..4225914efcc 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -12,7 +12,7 @@ OC.L10N.register(
     "Invalid mount point" : "Point de montage non valide",
     "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
-    "Not permitted to use backend \"%s\"" : "Non autorisé à utiliser backend \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Non autorisé à utiliser le service \"%s\"",
     "Not permitted to use authentication mechanism \"%s\"" : "Non autorisé à utiliser le mécanisme d'authentification \"%s\"",
     "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
     "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 3eab0afee30..f6fe940e1aa 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -10,7 +10,7 @@
     "Invalid mount point" : "Point de montage non valide",
     "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
-    "Not permitted to use backend \"%s\"" : "Non autorisé à utiliser backend \"%s\"",
+    "Not permitted to use backend \"%s\"" : "Non autorisé à utiliser le service \"%s\"",
     "Not permitted to use authentication mechanism \"%s\"" : "Non autorisé à utiliser le mécanisme d'authentification \"%s\"",
     "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
     "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index f0c7d6c331c..dc248783c5a 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -42,8 +42,8 @@ OC.L10N.register(
     "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
-    "Downloaded via public link" : "Téléchargé via un lien publique",
-    "Shared via public link" : "Partagé via un lien publique",
+    "Downloaded via public link" : "Téléchargé par lien public",
+    "Shared via public link" : "Partagé par lien public",
     "Shares" : "Partages",
     "You received %2$s as a remote share from %1$s" : "Vous avez reçu %2$s en tant que partage distant par %1$s",
     "Accept" : "Accepter",
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 524eb382568..1562e19304a 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -40,8 +40,8 @@
     "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
-    "Downloaded via public link" : "Téléchargé via un lien publique",
-    "Shared via public link" : "Partagé via un lien publique",
+    "Downloaded via public link" : "Téléchargé par lien public",
+    "Shared via public link" : "Partagé par lien public",
     "Shares" : "Partages",
     "You received %2$s as a remote share from %1$s" : "Vous avez reçu %2$s en tant que partage distant par %1$s",
     "Accept" : "Accepter",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 9ab3dc1f1ed..3f836fae2f1 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
     "Preparing update" : "Préparation de la mise à jour",
-    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Les tests de migration sont ignorées - \"update.skip-migration-test\" est activée dans le fichier config.php",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Les tests de migration sont ignorés - \"update.skip-migration-test\" est activé dans config.php",
     "Turned on maintenance mode" : "Mode de maintenance activé",
     "Turned off maintenance mode" : "Mode de maintenance désactivé",
     "Maintenance mode is kept active" : "Le mode de maintenance est laissé actif",
@@ -186,7 +186,7 @@ OC.L10N.register(
     "New Password" : "Nouveau mot de passe",
     "Reset password" : "Réinitialiser le mot de passe",
     "Searching other places" : "Recherche en cours dans d'autres emplacements",
-    "No search results in other folders" : "Aucun résultat de recherche dans les autres dossiers",
+    "No search results in other folders" : "Aucun résultat dans d'autres dossiers",
     "Personal" : "Personnel",
     "Users" : "Utilisateurs",
     "Apps" : "Applications",
@@ -266,7 +266,7 @@ OC.L10N.register(
     "App update required" : "Mise à jour de l'application nécessaire",
     "%s will be updated to version %s" : "%s sera mis à jour vers la version %s.",
     "These apps will be updated:" : "Les applications suivantes seront mises à jour:",
-    "These incompatible apps will be disabled:" : "Ces applications incompatibles ont été désactivés:",
+    "These incompatible apps will be disabled:" : "Ces applications incompatibles ont été désactivées:",
     "The theme %s has been disabled." : "Le thème %s a été désactivé.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Veuillez vous assurer qu'une copie de sauvegarde de la base de données, du dossier de configuration (config) et du dossier de données (data) a été réalisée avant de commencer.",
     "Start update" : "Démarrer la mise à jour",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index a6c01c55636..a55e0e10b9d 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
     "Preparing update" : "Préparation de la mise à jour",
-    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Les tests de migration sont ignorées - \"update.skip-migration-test\" est activée dans le fichier config.php",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Les tests de migration sont ignorés - \"update.skip-migration-test\" est activé dans config.php",
     "Turned on maintenance mode" : "Mode de maintenance activé",
     "Turned off maintenance mode" : "Mode de maintenance désactivé",
     "Maintenance mode is kept active" : "Le mode de maintenance est laissé actif",
@@ -184,7 +184,7 @@
     "New Password" : "Nouveau mot de passe",
     "Reset password" : "Réinitialiser le mot de passe",
     "Searching other places" : "Recherche en cours dans d'autres emplacements",
-    "No search results in other folders" : "Aucun résultat de recherche dans les autres dossiers",
+    "No search results in other folders" : "Aucun résultat dans d'autres dossiers",
     "Personal" : "Personnel",
     "Users" : "Utilisateurs",
     "Apps" : "Applications",
@@ -264,7 +264,7 @@
     "App update required" : "Mise à jour de l'application nécessaire",
     "%s will be updated to version %s" : "%s sera mis à jour vers la version %s.",
     "These apps will be updated:" : "Les applications suivantes seront mises à jour:",
-    "These incompatible apps will be disabled:" : "Ces applications incompatibles ont été désactivés:",
+    "These incompatible apps will be disabled:" : "Ces applications incompatibles ont été désactivées:",
     "The theme %s has been disabled." : "Le thème %s a été désactivé.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Veuillez vous assurer qu'une copie de sauvegarde de la base de données, du dossier de configuration (config) et du dossier de données (data) a été réalisée avant de commencer.",
     "Start update" : "Démarrer la mise à jour",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 7af3d403f5d..305caeb0b80 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -12,6 +12,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s",
     "Repair warning: " : "修复警告：",
     "Repair error: " : "修复错误：",
+    "Set log level to debug - current level: \"%s\"" : "设置日志级别为 调试 - 目前级别：%s",
+    "Reset log level to  \"%s\"" : "重设日志级别为 \"%s\"",
     "Following incompatible apps have been disabled: %s" : "下列不兼容应用已经被禁用：%s",
     "Following apps have been disabled: %s" : "下列应用已经被禁用：%s",
     "Already up to date" : "已经是最新",
@@ -146,12 +148,14 @@ OC.L10N.register(
     "change" : "更改",
     "delete" : "删除",
     "access control" : "访问控制",
+    "Share details could not be loaded for this item." : "无法加载这个项目的分享详情",
     "An error occured. Please try again" : "发生了一个错误请重新尝试",
     "Share" : "分享",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "使用语法 username@example.com/owncloud 分享给其他 ownCloud 上的用户",
     "Share with users or groups …" : "分享给其他用户或组 ...",
     "Share with users, groups or remote users …" : "分享给其他用户、组或远程用户 ...",
     "Warning" : "警告",
+    "Error while sending notification" : "发送通知时出现错误",
     "The object type is not specified." : "未指定对象类型。",
     "Enter new" : "输入新...",
     "Delete" : "删除",
@@ -181,6 +185,8 @@ OC.L10N.register(
     "New Password" : "新密码",
     "Reset password" : "重置密码",
     "Searching other places" : "搜索其他地方",
+    "No search results in other folders" : "在其他文件夹中没有得到任何搜索结果",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["在其他文件夹中找到 {count} 条搜索结果"],
     "Personal" : "个人",
     "Users" : "用户",
     "Apps" : "应用",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 4eff4881d64..001338a4383 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -10,6 +10,8 @@
     "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s",
     "Repair warning: " : "修复警告：",
     "Repair error: " : "修复错误：",
+    "Set log level to debug - current level: \"%s\"" : "设置日志级别为 调试 - 目前级别：%s",
+    "Reset log level to  \"%s\"" : "重设日志级别为 \"%s\"",
     "Following incompatible apps have been disabled: %s" : "下列不兼容应用已经被禁用：%s",
     "Following apps have been disabled: %s" : "下列应用已经被禁用：%s",
     "Already up to date" : "已经是最新",
@@ -144,12 +146,14 @@
     "change" : "更改",
     "delete" : "删除",
     "access control" : "访问控制",
+    "Share details could not be loaded for this item." : "无法加载这个项目的分享详情",
     "An error occured. Please try again" : "发生了一个错误请重新尝试",
     "Share" : "分享",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "使用语法 username@example.com/owncloud 分享给其他 ownCloud 上的用户",
     "Share with users or groups …" : "分享给其他用户或组 ...",
     "Share with users, groups or remote users …" : "分享给其他用户、组或远程用户 ...",
     "Warning" : "警告",
+    "Error while sending notification" : "发送通知时出现错误",
     "The object type is not specified." : "未指定对象类型。",
     "Enter new" : "输入新...",
     "Delete" : "删除",
@@ -179,6 +183,8 @@
     "New Password" : "新密码",
     "Reset password" : "重置密码",
     "Searching other places" : "搜索其他地方",
+    "No search results in other folders" : "在其他文件夹中没有得到任何搜索结果",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["在其他文件夹中找到 {count} 条搜索结果"],
     "Personal" : "个人",
     "Users" : "用户",
     "Apps" : "应用",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 9af784c1c96..45181ff7b2e 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "Středně silné heslo",
     "Good password" : "Dobré heslo",
     "Strong password" : "Silné heslo",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Došlo k chybě. Nahrajte prosím ASCII-kódovaný PEM certifikát.",
     "Valid until {date}" : "Platný do {date}",
     "Delete" : "Smazat",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Došlo k chybě. Nahrajte prosím ASCII-kódovaný PEM certifikát.",
     "Groups" : "Skupiny",
     "Unable to delete {objName}" : "Nelze smazat {objName}",
     "Error creating group" : "Chyba při vytváření skupiny",
@@ -155,10 +155,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
     "Enable server-side encryption" : "Povolit šifrování na straně serveru",
     "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Šifrování dat na serveru je nevratný proces. Po zapnutí šifrování jsou všechny datové soubory zašifrovány a toto již poté nelze vypnout",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Kdokoliv s administrátorským přístupem k tomuto ownCloud serveru má možnost dešifrovat data, buď zachycením požadavků nebo získáním uživatelských hesel, která jsou uložena v čitelné podobě v souborech sezení. Šifrování dat na serveru proto nechrání před administrátory serveru, ale je užitečné jako ochrana vašich dat na externě hostovaném úložišti.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "V závislosti na použitém šifrovacím modulu je velikost zašifrovaných souborů navýšena (o 35%% nebo více při použití výchozího modulu)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Pro zabránění ztráty dat je třeba pravidelně zálohovat všechny šifrovací klíče (data/<user>/files_encryption a data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
     "Enable encryption" : "Povolit šifrování",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 3d750f668a1..2814a79f401 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -82,9 +82,9 @@
     "So-so password" : "Středně silné heslo",
     "Good password" : "Dobré heslo",
     "Strong password" : "Silné heslo",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Došlo k chybě. Nahrajte prosím ASCII-kódovaný PEM certifikát.",
     "Valid until {date}" : "Platný do {date}",
     "Delete" : "Smazat",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Došlo k chybě. Nahrajte prosím ASCII-kódovaný PEM certifikát.",
     "Groups" : "Skupiny",
     "Unable to delete {objName}" : "Nelze smazat {objName}",
     "Error creating group" : "Chyba při vytváření skupiny",
@@ -153,10 +153,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
     "Enable server-side encryption" : "Povolit šifrování na straně serveru",
     "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Šifrování dat na serveru je nevratný proces. Po zapnutí šifrování jsou všechny datové soubory zašifrovány a toto již poté nelze vypnout",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Kdokoliv s administrátorským přístupem k tomuto ownCloud serveru má možnost dešifrovat data, buď zachycením požadavků nebo získáním uživatelských hesel, která jsou uložena v čitelné podobě v souborech sezení. Šifrování dat na serveru proto nechrání před administrátory serveru, ale je užitečné jako ochrana vašich dat na externě hostovaném úložišti.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "V závislosti na použitém šifrovacím modulu je velikost zašifrovaných souborů navýšena (o 35%% nebo více při použití výchozího modulu)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Pro zabránění ztráty dat je třeba pravidelně zálohovat všechny šifrovací klíče (data/<user>/files_encryption a data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
     "Enable encryption" : "Povolit šifrování",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 8bb3be30fca..0ba43b120fd 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "Jævnt kodeord",
     "Good password" : "Godt kodeord",
     "Strong password" : "Stærkt kodeord",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Der opstod en fejl. Upload venligst et ASCII-indkodet PEM-certifikat.",
     "Valid until {date}" : "Gyldig indtil {date}",
     "Delete" : "Slet",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Der opstod en fejl. Upload venligst et ASCII-indkodet PEM-certifikat.",
     "Groups" : "Grupper",
     "Unable to delete {objName}" : "Kunne ikke slette {objName}",
     "Error creating group" : "Fejl ved oprettelse af gruppe",
@@ -158,10 +158,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
     "Enable server-side encryption" : "Slå kryptering til på serversiden",
     "Please read carefully before activating server-side encryption: " : "Læs venligst dette omhyggeligt, før der aktivere kryptering på serversiden:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Kryptering på serversiden er en envejsproces. Når krypteringen slås til, så vil alle filer fremover blive krypteret på serveren, og det vil ikke være muligt at slå kryptering fra efterfølgende",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Enhver med priviligeret adgang til din ownCloud-server kan dekryptere dine filer, enten ved at opsnappe forespørgsler eller aflæse brugerkodeord, der bliver lagret i sessionsfiler med klartekst. Kryptering af serversiden beskytter derfor ikke mod ondsindede administratorer, men kan hjælpe til at beskytte dine data når de lagres hos eksterne værter.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhængig af det faktiske krypteringsmodul, så øges den generelle filstørrelse (med 35%% eller mere ved brug af standardmodulet)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør jævnligt foretage sikkerhedskopiering af alle krypteringsnøgler, for at forhindre permanente tab af data (data/<user>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Dette er den sidste advarsel: Sikker på at du vil slå kryptering til?",
     "Enable encryption" : "Slå kryptering til",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Der er ikke indlæst et krypteringsmodul - slå venligst et krypteringsmodul til i app-menuen.",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 90896f0ab28..f3f61602f11 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -82,9 +82,9 @@
     "So-so password" : "Jævnt kodeord",
     "Good password" : "Godt kodeord",
     "Strong password" : "Stærkt kodeord",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Der opstod en fejl. Upload venligst et ASCII-indkodet PEM-certifikat.",
     "Valid until {date}" : "Gyldig indtil {date}",
     "Delete" : "Slet",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Der opstod en fejl. Upload venligst et ASCII-indkodet PEM-certifikat.",
     "Groups" : "Grupper",
     "Unable to delete {objName}" : "Kunne ikke slette {objName}",
     "Error creating group" : "Fejl ved oprettelse af gruppe",
@@ -156,10 +156,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
     "Enable server-side encryption" : "Slå kryptering til på serversiden",
     "Please read carefully before activating server-side encryption: " : "Læs venligst dette omhyggeligt, før der aktivere kryptering på serversiden:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Kryptering på serversiden er en envejsproces. Når krypteringen slås til, så vil alle filer fremover blive krypteret på serveren, og det vil ikke være muligt at slå kryptering fra efterfølgende",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Enhver med priviligeret adgang til din ownCloud-server kan dekryptere dine filer, enten ved at opsnappe forespørgsler eller aflæse brugerkodeord, der bliver lagret i sessionsfiler med klartekst. Kryptering af serversiden beskytter derfor ikke mod ondsindede administratorer, men kan hjælpe til at beskytte dine data når de lagres hos eksterne værter.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhængig af det faktiske krypteringsmodul, så øges den generelle filstørrelse (med 35%% eller mere ved brug af standardmodulet)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør jævnligt foretage sikkerhedskopiering af alle krypteringsnøgler, for at forhindre permanente tab af data (data/<user>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Dette er den sidste advarsel: Sikker på at du vil slå kryptering til?",
     "Enable encryption" : "Slå kryptering til",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Der er ikke indlæst et krypteringsmodul - slå venligst et krypteringsmodul til i app-menuen.",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 7e59f4567ac..c9cab4d9ecb 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "Durchschnittliches Passwort",
     "Good password" : "Gutes Passwort",
     "Strong password" : "Starkes Passwort",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte lade ein ASCII-kodiertes PEM-Zertifikat hoch.",
     "Valid until {date}" : "Gültig bis {date}",
     "Delete" : "Löschen",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte lade ein ASCII-kodiertes PEM-Zertifikat hoch.",
     "Groups" : "Gruppen",
     "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
     "Error creating group" : "Fehler beim Erstellen der Gruppe",
@@ -153,7 +153,6 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Von allen Verschlüsselungsschlüsseln sollte regelmäßig ein Backup gemacht werden, um Datenverlust u vermeiden(data/<user>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index f5265888072..637a1381eeb 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -82,9 +82,9 @@
     "So-so password" : "Durchschnittliches Passwort",
     "Good password" : "Gutes Passwort",
     "Strong password" : "Starkes Passwort",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte lade ein ASCII-kodiertes PEM-Zertifikat hoch.",
     "Valid until {date}" : "Gültig bis {date}",
     "Delete" : "Löschen",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte lade ein ASCII-kodiertes PEM-Zertifikat hoch.",
     "Groups" : "Gruppen",
     "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
     "Error creating group" : "Fehler beim Erstellen der Gruppe",
@@ -151,7 +151,6 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Von allen Verschlüsselungsschlüsseln sollte regelmäßig ein Backup gemacht werden, um Datenverlust u vermeiden(data/<user>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index ddf85fb4515..31d7a450e58 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -81,9 +81,9 @@ OC.L10N.register(
     "So-so password" : "Passables Passwort",
     "Good password" : "Gutes Passwort",
     "Strong password" : "Starkes Passwort",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte laden Sie ein ASCII-kodiertes PEM-Zertifikat hoch.",
     "Valid until {date}" : "Gültig bis {date}",
     "Delete" : "Löschen",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte laden Sie ein ASCII-kodiertes PEM-Zertifikat hoch.",
     "Groups" : "Gruppen",
     "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
     "Error creating group" : "Fehler beim Erstellen der Gruppe",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index ba5b2edeecb..e6db2947ee9 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -79,9 +79,9 @@
     "So-so password" : "Passables Passwort",
     "Good password" : "Gutes Passwort",
     "Strong password" : "Starkes Passwort",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte laden Sie ein ASCII-kodiertes PEM-Zertifikat hoch.",
     "Valid until {date}" : "Gültig bis {date}",
     "Delete" : "Löschen",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Es ist ein Fehler aufgetreten. Bitte laden Sie ein ASCII-kodiertes PEM-Zertifikat hoch.",
     "Groups" : "Gruppen",
     "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
     "Error creating group" : "Fehler beim Erstellen der Gruppe",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index c9bd6733321..b67ae064766 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -86,9 +86,9 @@ OC.L10N.register(
     "So-so password" : "Μέτριο συνθηματικό",
     "Good password" : "Καλό συνθηματικό",
     "Strong password" : "Δυνατό συνθηματικό",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Προέκυψε σφάλμα. Παρακαλούμε μεταφορτώστε ένα πιστοποιητικό PEM κωδικοποιημένο κατά ASCII.",
     "Valid until {date}" : "Έγκυρο έως {date}",
     "Delete" : "Διαγραφή",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Προέκυψε σφάλμα. Παρακαλούμε μεταφορτώστε ένα πιστοποιητικό PEM κωδικοποιημένο κατά ASCII.",
     "Groups" : "Ομάδες",
     "Unable to delete {objName}" : "Αδυναμία διαγραφής του {objName}",
     "Error creating group" : "Σφάλμα δημιουργίας ομάδας",
@@ -160,10 +160,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
     "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή",
     "Please read carefully before activating server-side encryption: " : "Παρακαλούμε διαβάστε προσεκτικά πριν ενεργοποιήσετε την κρυπτογράφηση στο διακομιστή:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Η κρυπτογράφηση είναι μια μη αντιστρεπτή διαδικασία. Μόλις ενεργοποιηθεί, όλα τα αρχεία από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή και η κρυπτογράφηση δεν είναι δυνατόν να απενεργοποιηθεί αργότερα",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Οποιοσδήποτε έχει αυξημένα δικαιώματα πρόσβασης στο διακομιστή του ownCloud σας μπορεί να αποκρυπτογραφήσει τα αρχεία σας είτε παγιδεύοντας τα αιτήματα ή διαβάζοντας τους κωδικούς χρηστών που είναι αποθηκευμένοι σε απλά αρχεία κειμένου. Η κρυπτογράφηση στο διακομιστή δεν προστατεύει επομένως από κακόβουλους διαχειριστές αλλά είναι χρήσιμη στο να προστατεύει τα δεδομένα σας σε εξωτερικούς διακομιστές αποθήκευσης.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Ανάλογα με το άρθρωμα που χρησιμοποιείται το μέγεθος αρχείων γενικά αυξάνεται (κατά 35%% ή και περισσότερο αν χρησιμοποιηθεί το προεπιλεγμένο άρθρωμα)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Θα πρέπει να λαμβάνετε τακτικά αντίγραφα ασφαλείας όλων των κλειδιών κρυπτογράφησης για να αποφύγετε μόνιμη απώλεια δεδομένων (data/<user>/files_encryption και data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Δεν έχει φορτωθεί μονάδα κρυπτογράφησης, παρακαλούμε φορτώστε μια μονάδα κρυπτογράφησης από το μενού εφαρμογών.",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 3b2a1412273..bd657166280 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -84,9 +84,9 @@
     "So-so password" : "Μέτριο συνθηματικό",
     "Good password" : "Καλό συνθηματικό",
     "Strong password" : "Δυνατό συνθηματικό",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Προέκυψε σφάλμα. Παρακαλούμε μεταφορτώστε ένα πιστοποιητικό PEM κωδικοποιημένο κατά ASCII.",
     "Valid until {date}" : "Έγκυρο έως {date}",
     "Delete" : "Διαγραφή",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Προέκυψε σφάλμα. Παρακαλούμε μεταφορτώστε ένα πιστοποιητικό PEM κωδικοποιημένο κατά ASCII.",
     "Groups" : "Ομάδες",
     "Unable to delete {objName}" : "Αδυναμία διαγραφής του {objName}",
     "Error creating group" : "Σφάλμα δημιουργίας ομάδας",
@@ -158,10 +158,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
     "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή",
     "Please read carefully before activating server-side encryption: " : "Παρακαλούμε διαβάστε προσεκτικά πριν ενεργοποιήσετε την κρυπτογράφηση στο διακομιστή:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Η κρυπτογράφηση είναι μια μη αντιστρεπτή διαδικασία. Μόλις ενεργοποιηθεί, όλα τα αρχεία από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή και η κρυπτογράφηση δεν είναι δυνατόν να απενεργοποιηθεί αργότερα",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Οποιοσδήποτε έχει αυξημένα δικαιώματα πρόσβασης στο διακομιστή του ownCloud σας μπορεί να αποκρυπτογραφήσει τα αρχεία σας είτε παγιδεύοντας τα αιτήματα ή διαβάζοντας τους κωδικούς χρηστών που είναι αποθηκευμένοι σε απλά αρχεία κειμένου. Η κρυπτογράφηση στο διακομιστή δεν προστατεύει επομένως από κακόβουλους διαχειριστές αλλά είναι χρήσιμη στο να προστατεύει τα δεδομένα σας σε εξωτερικούς διακομιστές αποθήκευσης.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Ανάλογα με το άρθρωμα που χρησιμοποιείται το μέγεθος αρχείων γενικά αυξάνεται (κατά 35%% ή και περισσότερο αν χρησιμοποιηθεί το προεπιλεγμένο άρθρωμα)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Θα πρέπει να λαμβάνετε τακτικά αντίγραφα ασφαλείας όλων των κλειδιών κρυπτογράφησης για να αποφύγετε μόνιμη απώλεια δεδομένων (data/<user>/files_encryption και data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Δεν έχει φορτωθεί μονάδα κρυπτογράφησης, παρακαλούμε φορτώστε μια μονάδα κρυπτογράφησης από το μενού εφαρμογών.",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 3385448f4e4..f103c0c3b03 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -78,9 +78,9 @@ OC.L10N.register(
     "So-so password" : "So-so password",
     "Good password" : "Good password",
     "Strong password" : "Strong password",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.",
     "Valid until {date}" : "Valid until {date}",
     "Delete" : "Delete",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.",
     "Groups" : "Groups",
     "Unable to delete {objName}" : "Unable to delete {objName}",
     "Error creating group" : "Error creating group",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 7a426bbc1f4..a1a6697a0de 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -76,9 +76,9 @@
     "So-so password" : "So-so password",
     "Good password" : "Good password",
     "Strong password" : "Strong password",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.",
     "Valid until {date}" : "Valid until {date}",
     "Delete" : "Delete",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "An error occurred. Please upload an ASCII-encoded PEM certificate.",
     "Groups" : "Groups",
     "Unable to delete {objName}" : "Unable to delete {objName}",
     "Error creating group" : "Error creating group",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index f6db6aa16e0..f3eba3e61d9 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "Contraseña pasable",
     "Good password" : "Contraseña buena",
     "Strong password" : "Contraseña muy buena",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.",
     "Valid until {date}" : "Válido hasta {date}",
     "Delete" : "Eliminar",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "No es posible eliminar {objName}",
     "Error creating group" : "Error al crear un grupo",
@@ -156,10 +156,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar cifrado en el servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "El cifrado en el lado servidor es un proceso de una sola vía. Una vez el cifrado está habilitado, todos los archivos desde este punto en adelante serán cifrados en el servidor y no será posible deshabilitar el cifrado posteriormente. ",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Cualquiera que tenga acceso a este servidor ownCloud, puede descifrar estos archivos, simplemente leyendo la contraseña que se guarda en texto plano en los archivos de sesión. El cifrado del lado servidor, no protege por tanto de administradores malintencionados, pero es ùtil para proteger los datos en almacenes de datos externos de accesos no autorizados. ",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependiendo del módulo de cifrado seleccionado, el tamaño de los archivos se puede ver incrementado (hasta un 35%% o más para las opciones por defecto).",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Debería guardar de forma regular las claves de cifrado para evitar la pérdida de datos (data/<user>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
     "Enable encryption" : "Habilitar cifrado",
     "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 60ada93ac90..9078dd3ea7b 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -82,9 +82,9 @@
     "So-so password" : "Contraseña pasable",
     "Good password" : "Contraseña buena",
     "Strong password" : "Contraseña muy buena",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.",
     "Valid until {date}" : "Válido hasta {date}",
     "Delete" : "Eliminar",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ha ocurrido un error. Por favor, cargue un certificado PEM codificado en ASCII.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "No es posible eliminar {objName}",
     "Error creating group" : "Error al crear un grupo",
@@ -154,10 +154,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar cifrado en el servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "El cifrado en el lado servidor es un proceso de una sola vía. Una vez el cifrado está habilitado, todos los archivos desde este punto en adelante serán cifrados en el servidor y no será posible deshabilitar el cifrado posteriormente. ",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Cualquiera que tenga acceso a este servidor ownCloud, puede descifrar estos archivos, simplemente leyendo la contraseña que se guarda en texto plano en los archivos de sesión. El cifrado del lado servidor, no protege por tanto de administradores malintencionados, pero es ùtil para proteger los datos en almacenes de datos externos de accesos no autorizados. ",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependiendo del módulo de cifrado seleccionado, el tamaño de los archivos se puede ver incrementado (hasta un 35%% o más para las opciones por defecto).",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Debería guardar de forma regular las claves de cifrado para evitar la pérdida de datos (data/<user>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
     "Enable encryption" : "Habilitar cifrado",
     "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js
index 3a061171231..3111101135b 100644
--- a/settings/l10n/es_MX.js
+++ b/settings/l10n/es_MX.js
@@ -20,6 +20,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.",
     "Unable to change password" : "No se ha podido cambiar la contraseña",
     "Enabled" : "Habilitar",
+    "Saved" : "Guardado",
     "Email sent" : "Correo electrónico enviado",
     "Email saved" : "Correo electrónico guardado",
     "All" : "Todos",
diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json
index 138eca076da..d0cd473e262 100644
--- a/settings/l10n/es_MX.json
+++ b/settings/l10n/es_MX.json
@@ -18,6 +18,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.",
     "Unable to change password" : "No se ha podido cambiar la contraseña",
     "Enabled" : "Habilitar",
+    "Saved" : "Guardado",
     "Email sent" : "Correo electrónico enviado",
     "Email saved" : "Correo electrónico guardado",
     "All" : "Todos",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index cff1591d1e4..18ba17f8b6c 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -85,9 +85,9 @@ OC.L10N.register(
     "So-so password" : "Kohtalainen salasana",
     "Good password" : "Hyvä salasana",
     "Strong password" : "Vahva salasana",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Tapahtu virhe. Lähetä ASCII-koodattu PEM-varmenne.",
     "Valid until {date}" : "Kelvollinen {date} asti",
     "Delete" : "Poista",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Tapahtu virhe. Lähetä ASCII-koodattu PEM-varmenne.",
     "Groups" : "Ryhmät",
     "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui",
     "Error creating group" : "Virhe ryhmää luotaessa",
@@ -151,8 +151,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
     "Enable server-side encryption" : "Käytä palvelinpään salausta",
     "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Salausta ei voi perua. Kun salaus on käytössä, kaikki tiedostot siitä hetkestä eteenpäin palvelimella on salattu, eikä salausta voi enää poistaa käytöstä.",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Varmista, että otat säännöllisesti varmuuskopiot salausavaimista, jotta et menetä kaikkia tietoja pysyvästi (data/<käyttäjä>/files_encryption ja data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
     "Enable encryption" : "Käytä salausta",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Salausmoduulia ei ole käytössä. Ota salausmoduuli käyttöön sovellusvalikosta.",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 853028e72ed..deb850873db 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -83,9 +83,9 @@
     "So-so password" : "Kohtalainen salasana",
     "Good password" : "Hyvä salasana",
     "Strong password" : "Vahva salasana",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Tapahtu virhe. Lähetä ASCII-koodattu PEM-varmenne.",
     "Valid until {date}" : "Kelvollinen {date} asti",
     "Delete" : "Poista",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Tapahtu virhe. Lähetä ASCII-koodattu PEM-varmenne.",
     "Groups" : "Ryhmät",
     "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui",
     "Error creating group" : "Virhe ryhmää luotaessa",
@@ -149,8 +149,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
     "Enable server-side encryption" : "Käytä palvelinpään salausta",
     "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Salausta ei voi perua. Kun salaus on käytössä, kaikki tiedostot siitä hetkestä eteenpäin palvelimella on salattu, eikä salausta voi enää poistaa käytöstä.",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Varmista, että otat säännöllisesti varmuuskopiot salausavaimista, jotta et menetä kaikkia tietoja pysyvästi (data/<käyttäjä>/files_encryption ja data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
     "Enable encryption" : "Käytä salausta",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Salausmoduulia ei ole käytössä. Ota salausmoduuli käyttöön sovellusvalikosta.",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 23cc6357a2a..b85165d6bc7 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -77,7 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Désinstallation...",
     "Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
     "Uninstall" : "Désinstaller",
-    "App update" : "Mise à jour App",
+    "App update" : "Mise à jour",
     "An error occurred: {message}" : "Une erreur est survenue : {message}",
     "Select a profile picture" : "Selectionnez une photo de profil ",
     "Very weak password" : "Mot de passe de très faible sécurité",
@@ -85,9 +85,9 @@ OC.L10N.register(
     "So-so password" : "Mot de passe de sécurité tout juste acceptable",
     "Good password" : "Mot de passe de sécurité suffisante",
     "Strong password" : "Mot de passe de forte sécurité",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Une erreur est survenue. Veuillez fournir un certificat PEM encodé au format ASCII.",
     "Valid until {date}" : "Valide jusqu'au {date}",
     "Delete" : "Supprimer",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Une erreur est survenue. Veuillez fournir un certificat PEM encodé au format ASCII.",
     "Groups" : "Groupes",
     "Unable to delete {objName}" : "Impossible de supprimer {objName}",
     "Error creating group" : "Erreur lors de la création du groupe",
@@ -159,10 +159,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
     "Enable server-side encryption" : "Activer le chiffrement côté serveur",
     "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Le chiffrement côté serveur est un processus à sens unique. Une fois le chiffrement activé, tous les fichiers seront dorénavant chiffrés sur le serveur, et il ne sera plus possible de désactiver le chiffrement.",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Toute personne ayant un accès d'administrateur sur votre serveur ownCloud peut déchiffrer vos fichiers en interceptant les requêtes, ou en lisant les mots de passe des utilisateurs qui sont stockés dans les fichiers de sessions. Le chiffrement côté serveur n'empêche donc pas vos fichiers d'être lus par des administrateurs mal intentionnés, mais sert à protéger vos données stockées sur des espaces de stockages externes ou tiers.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Selon le module de chiffrement utilisé, la taille des fichiers peut augmenter (dans le cas du module par défaut, l'augmentation est de 35%% ou plus)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Vous devriez sauvegarder régulièrement les clés de chiffrement pour éviter toute perte de données irrémédiable (data/<user>/files_encryption et data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
     "Enable encryption" : "Activer le chiffrement",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index b51a82df574..e3205497944 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -75,7 +75,7 @@
     "Uninstalling ...." : "Désinstallation...",
     "Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
     "Uninstall" : "Désinstaller",
-    "App update" : "Mise à jour App",
+    "App update" : "Mise à jour",
     "An error occurred: {message}" : "Une erreur est survenue : {message}",
     "Select a profile picture" : "Selectionnez une photo de profil ",
     "Very weak password" : "Mot de passe de très faible sécurité",
@@ -83,9 +83,9 @@
     "So-so password" : "Mot de passe de sécurité tout juste acceptable",
     "Good password" : "Mot de passe de sécurité suffisante",
     "Strong password" : "Mot de passe de forte sécurité",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Une erreur est survenue. Veuillez fournir un certificat PEM encodé au format ASCII.",
     "Valid until {date}" : "Valide jusqu'au {date}",
     "Delete" : "Supprimer",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Une erreur est survenue. Veuillez fournir un certificat PEM encodé au format ASCII.",
     "Groups" : "Groupes",
     "Unable to delete {objName}" : "Impossible de supprimer {objName}",
     "Error creating group" : "Erreur lors de la création du groupe",
@@ -157,10 +157,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
     "Enable server-side encryption" : "Activer le chiffrement côté serveur",
     "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Le chiffrement côté serveur est un processus à sens unique. Une fois le chiffrement activé, tous les fichiers seront dorénavant chiffrés sur le serveur, et il ne sera plus possible de désactiver le chiffrement.",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Toute personne ayant un accès d'administrateur sur votre serveur ownCloud peut déchiffrer vos fichiers en interceptant les requêtes, ou en lisant les mots de passe des utilisateurs qui sont stockés dans les fichiers de sessions. Le chiffrement côté serveur n'empêche donc pas vos fichiers d'être lus par des administrateurs mal intentionnés, mais sert à protéger vos données stockées sur des espaces de stockages externes ou tiers.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Selon le module de chiffrement utilisé, la taille des fichiers peut augmenter (dans le cas du module par défaut, l'augmentation est de 35%% ou plus)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Vous devriez sauvegarder régulièrement les clés de chiffrement pour éviter toute perte de données irrémédiable (data/<user>/files_encryption et data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
     "Enable encryption" : "Activer le chiffrement",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index 60ea6e3c846..5dc7cdaa1f4 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "Contrasinal non moi aló",
     "Good password" : "Bo contrasinal",
     "Strong password" : "Contrasinal forte",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Produciuse un erro. Envíe un certificado PEM codificado en ASCII.",
     "Valid until {date}" : "Válido ata {date}",
     "Delete" : "Eliminar",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Produciuse un erro. Envíe un certificado PEM codificado en ASCII.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Non é posíbel eliminar {objName}",
     "Error creating group" : "Produciuse un erro ao crear o grupo",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 16472c0ac34..a807e517445 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -82,9 +82,9 @@
     "So-so password" : "Contrasinal non moi aló",
     "Good password" : "Bo contrasinal",
     "Strong password" : "Contrasinal forte",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Produciuse un erro. Envíe un certificado PEM codificado en ASCII.",
     "Valid until {date}" : "Válido ata {date}",
     "Delete" : "Eliminar",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Produciuse un erro. Envíe un certificado PEM codificado en ASCII.",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Non é posíbel eliminar {objName}",
     "Error creating group" : "Produciuse un erro ao crear o grupo",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index 5451728773b..f62795a0a84 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
     "Enabled" : "Engedélyezve",
     "Not enabled" : "Tiltva",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "alkalmazások telepítése és frissítése az alkalmazás tárból vagy Szövetséges Felhő Megosztásból",
     "Federated Cloud Sharing" : "Megosztás Egyesített Felhőben",
     "A problem occurred, please check your log files (Error: %s)" : "Probléma történt, kérjük nézd meg a naplófájlokat (Hiba: %s).",
     "Migration Completed" : "Migráció kész!",
@@ -138,6 +139,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "A felhasználók küldhessenek más felhasználóknak e-mail értesítést a megosztott fájlokról",
     "Exclude groups from sharing" : "Csoportok megosztási jogának tiltása",
     "These groups will still be able to receive shares, but not to initiate them." : "E csoportok tagjaival meg lehet osztani anyagokat, de ők nem hozhatnak létre megosztást.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Felhasználónév automatikus befejezése engedélyezése a megosztás ablakban. Ha le van tiltva, akkor a teljes felhasználónevet kell beírni.",
     "Last cron job execution: %s." : "Az utolsó cron feladat ekkor futott le: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Valami nincs rendben.",
     "Cron was not executed yet!" : "A cron feladat még nem futott le!",
@@ -146,7 +148,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
     "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
     "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "A szerveroldali titkosítás egyirányú folyamat. Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később nem lehet visszafordítani.",
     "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
     "Enable encryption" : "Titkosítás engedélyezése",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nincs titkosítási modul betöltve, kérjük engedélyezd a titkosítási modult az alkalmazások menüben.",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index 08a34e158f5..b324010e426 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -28,6 +28,7 @@
     "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
     "Enabled" : "Engedélyezve",
     "Not enabled" : "Tiltva",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "alkalmazások telepítése és frissítése az alkalmazás tárból vagy Szövetséges Felhő Megosztásból",
     "Federated Cloud Sharing" : "Megosztás Egyesített Felhőben",
     "A problem occurred, please check your log files (Error: %s)" : "Probléma történt, kérjük nézd meg a naplófájlokat (Hiba: %s).",
     "Migration Completed" : "Migráció kész!",
@@ -136,6 +137,7 @@
     "Allow users to send mail notification for shared files to other users" : "A felhasználók küldhessenek más felhasználóknak e-mail értesítést a megosztott fájlokról",
     "Exclude groups from sharing" : "Csoportok megosztási jogának tiltása",
     "These groups will still be able to receive shares, but not to initiate them." : "E csoportok tagjaival meg lehet osztani anyagokat, de ők nem hozhatnak létre megosztást.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Felhasználónév automatikus befejezése engedélyezése a megosztás ablakban. Ha le van tiltva, akkor a teljes felhasználónevet kell beírni.",
     "Last cron job execution: %s." : "Az utolsó cron feladat ekkor futott le: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Valami nincs rendben.",
     "Cron was not executed yet!" : "A cron feladat még nem futott le!",
@@ -144,7 +146,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
     "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
     "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "A szerveroldali titkosítás egyirányú folyamat. Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később nem lehet visszafordítani.",
     "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
     "Enable encryption" : "Titkosítás engedélyezése",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nincs titkosítási modul betöltve, kérjük engedélyezd a titkosítási modult az alkalmazások menüben.",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 141b155da83..533736d7823 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "Sandi lumayan",
     "Good password" : "Sandi baik",
     "Strong password" : "Sandi kuat",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.",
     "Valid until {date}" : "Berlaku sampai {date}",
     "Delete" : "Hapus",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.",
     "Groups" : "Grup",
     "Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
     "Error creating group" : "Terjadi kesalahan saat membuat grup",
@@ -157,10 +157,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
     "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
     "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Enkripsi server-side adalah proses sekali jalan. Setelah enkripsi diaktifkan, semua berkas mulai saat ini dan selanjutnya akan dienkripsi pada server dan tidak mungkin untuk menonaktifkan enkripsi di lain waktu",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Siapa saja yang memiliki hak akses pada server ownCloud dapat mendeskripsi berkas-berkas Anda dengan mencegat permintaan atau membaca sandi pengguna yang disimpan dalam berkas-berkas sesi teks biasa. Enkripsi server-side tidak serta merta melindungi dari administrator jahat tetapi akan berguna untuk melindungi data Anda pada penyimpanan eksternal.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Tergantung pada modul enkripsi yang sebenarnya, pada umumnya ukuran berkas akan bertambah (sekitar 35%% atau lebih ketika menggunakan modul standar)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Anda disarankan mencadangkan semua kunci enkripsi Anda secara berkala untuk mencegah kehilangan data pemanen (data/<user>/files_encryption dan data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
     "Enable encryption" : "Aktifkan enkripsi",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index fcc2b647465..b20943edc5d 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -82,9 +82,9 @@
     "So-so password" : "Sandi lumayan",
     "Good password" : "Sandi baik",
     "Strong password" : "Sandi kuat",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.",
     "Valid until {date}" : "Berlaku sampai {date}",
     "Delete" : "Hapus",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Terjadi kesalahan. Mohon unggah sertifikat PEM terenkode-ASCII.",
     "Groups" : "Grup",
     "Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
     "Error creating group" : "Terjadi kesalahan saat membuat grup",
@@ -155,10 +155,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
     "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
     "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Enkripsi server-side adalah proses sekali jalan. Setelah enkripsi diaktifkan, semua berkas mulai saat ini dan selanjutnya akan dienkripsi pada server dan tidak mungkin untuk menonaktifkan enkripsi di lain waktu",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Siapa saja yang memiliki hak akses pada server ownCloud dapat mendeskripsi berkas-berkas Anda dengan mencegat permintaan atau membaca sandi pengguna yang disimpan dalam berkas-berkas sesi teks biasa. Enkripsi server-side tidak serta merta melindungi dari administrator jahat tetapi akan berguna untuk melindungi data Anda pada penyimpanan eksternal.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Tergantung pada modul enkripsi yang sebenarnya, pada umumnya ukuran berkas akan bertambah (sekitar 35%% atau lebih ketika menggunakan modul standar)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Anda disarankan mencadangkan semua kunci enkripsi Anda secara berkala untuk mencegah kehilangan data pemanen (data/<user>/files_encryption dan data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
     "Enable encryption" : "Aktifkan enkripsi",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index f6fd6352fef..45e0690da6f 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -86,9 +86,9 @@ OC.L10N.register(
     "So-so password" : "Password così-così",
     "Good password" : "Password buona",
     "Strong password" : "Password forte",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Si è verificato un errore. Carica un certificato PEM codificato in ASCII.",
     "Valid until {date}" : "Valido fino al {date}",
     "Delete" : "Elimina",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Si è verificato un errore. Carica un certificato PEM codificato in ASCII.",
     "Groups" : "Gruppi",
     "Unable to delete {objName}" : "Impossibile eliminare {objName}",
     "Error creating group" : "Errore durante la creazione del gruppo",
@@ -160,10 +160,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
     "Enable server-side encryption" : "Abilita cifratura lato server",
     "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "La cifratura è un processo a senso unico. Una volta che la cifratura è abilitata, tutti i file da quel momento in poi saranno cifrati sul server e non sarà possibile disattivare la cifratura successivamente",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Chiunque abbia un accesso privilegiato al tuo server ownCloud può decifrare i tuoi file intercettando le richieste o leggendo le password degli utenti che sono memorizzate come testo semplice nei file di sessione. La cifratura lato server non protegge perciò dagli amministratori scorretti, ma è utile per proteggere i tuoi dati sulle archiviazioni ospitate esternamente.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "In base all'attuale modulo di cifratura, la dimensione generale dei file è \nincrementata (del 35%% o più quando si utilizza il modulo predefinito)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Dovresti fare regolarmente una copia di sicurezza di tutte le chiavi di cifratura per evitare perdite di dati definitive (data/<utente>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
     "Enable encryption" : "Abilita cifratura",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index a51b053c2c9..4ab8fef7db4 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -84,9 +84,9 @@
     "So-so password" : "Password così-così",
     "Good password" : "Password buona",
     "Strong password" : "Password forte",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Si è verificato un errore. Carica un certificato PEM codificato in ASCII.",
     "Valid until {date}" : "Valido fino al {date}",
     "Delete" : "Elimina",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Si è verificato un errore. Carica un certificato PEM codificato in ASCII.",
     "Groups" : "Gruppi",
     "Unable to delete {objName}" : "Impossibile eliminare {objName}",
     "Error creating group" : "Errore durante la creazione del gruppo",
@@ -158,10 +158,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
     "Enable server-side encryption" : "Abilita cifratura lato server",
     "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "La cifratura è un processo a senso unico. Una volta che la cifratura è abilitata, tutti i file da quel momento in poi saranno cifrati sul server e non sarà possibile disattivare la cifratura successivamente",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Chiunque abbia un accesso privilegiato al tuo server ownCloud può decifrare i tuoi file intercettando le richieste o leggendo le password degli utenti che sono memorizzate come testo semplice nei file di sessione. La cifratura lato server non protegge perciò dagli amministratori scorretti, ma è utile per proteggere i tuoi dati sulle archiviazioni ospitate esternamente.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "In base all'attuale modulo di cifratura, la dimensione generale dei file è \nincrementata (del 35%% o più quando si utilizza il modulo predefinito)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Dovresti fare regolarmente una copia di sicurezza di tutte le chiavi di cifratura per evitare perdite di dati definitive (data/<utente>/files_encryption and data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
     "Enable encryption" : "Abilita cifratura",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index 480179c27a0..d0b5ec25adb 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "그저 그런 암호",
     "Good password" : "좋은 암호",
     "Strong password" : "강력한 암호",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "오류가 발생하였습니다. ASCII로 인코딩된 PEM 인증서를 업로드하십시오.",
     "Valid until {date}" : "{date}까지 유효함",
     "Delete" : "삭제",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "오류가 발생하였습니다. ASCII로 인코딩된 PEM 인증서를 업로드하십시오.",
     "Groups" : "그룹",
     "Unable to delete {objName}" : "{objName}을(를) 삭제할 수 없음",
     "Error creating group" : "그룹을 생성하는 중 오류가 발생하였습니다",
@@ -158,10 +158,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
     "Enable server-side encryption" : "서버 측 암호화 사용",
     "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "서버 측 암호화 작업은 단방향입니다. 암호화를 한 번 활성화하면 그 시점 이후에 서버에 저장되는 모든 파일이 암호화되며 나중에 암호화를 비활성화할 수 없습니다.",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud 서버에 관리자 권한을 가지고 있는 임의의 사용자가 요청을 가로채거나 일반 텍스트 세션 파일에 있는 사용자 암호를 읽어서 암호화를 해제할 수 있습니다. 서버 측 암호화는 악의적인 관리자로부터 파일을 보호할 수는 없으나, 외부에 호스팅된 저장소에 있는 파일을 보호할 수 있습니다.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "암호화 방식에 따라서 파일이 저장된 크기가 증가합니다(기본 모듈 사용 시 최소 35%%)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "데이터 손실을 방지하려면 모든 암호화 키를 주기적으로 백업해야 합니다(data/<user>/files_encryption 및 data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
     "Enable encryption" : "암호화 사용",
     "No encryption module loaded, please enable an encryption module in the app menu." : "암호화 모듈을 불러오지 않았습니다. 앱 메뉴에서 암호화 모듈을 활성화하십시오.",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 68b64ee83a5..ee12aecca18 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -82,9 +82,9 @@
     "So-so password" : "그저 그런 암호",
     "Good password" : "좋은 암호",
     "Strong password" : "강력한 암호",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "오류가 발생하였습니다. ASCII로 인코딩된 PEM 인증서를 업로드하십시오.",
     "Valid until {date}" : "{date}까지 유효함",
     "Delete" : "삭제",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "오류가 발생하였습니다. ASCII로 인코딩된 PEM 인증서를 업로드하십시오.",
     "Groups" : "그룹",
     "Unable to delete {objName}" : "{objName}을(를) 삭제할 수 없음",
     "Error creating group" : "그룹을 생성하는 중 오류가 발생하였습니다",
@@ -156,10 +156,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
     "Enable server-side encryption" : "서버 측 암호화 사용",
     "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "서버 측 암호화 작업은 단방향입니다. 암호화를 한 번 활성화하면 그 시점 이후에 서버에 저장되는 모든 파일이 암호화되며 나중에 암호화를 비활성화할 수 없습니다.",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud 서버에 관리자 권한을 가지고 있는 임의의 사용자가 요청을 가로채거나 일반 텍스트 세션 파일에 있는 사용자 암호를 읽어서 암호화를 해제할 수 있습니다. 서버 측 암호화는 악의적인 관리자로부터 파일을 보호할 수는 없으나, 외부에 호스팅된 저장소에 있는 파일을 보호할 수 있습니다.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "암호화 방식에 따라서 파일이 저장된 크기가 증가합니다(기본 모듈 사용 시 최소 35%%)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "데이터 손실을 방지하려면 모든 암호화 키를 주기적으로 백업해야 합니다(data/<user>/files_encryption 및 data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
     "Enable encryption" : "암호화 사용",
     "No encryption module loaded, please enable an encryption module in the app menu." : "암호화 모듈을 불러오지 않았습니다. 앱 메뉴에서 암호화 모듈을 활성화하십시오.",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 84466f61617..3e6048d7405 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "So-so-passord",
     "Good password" : "Bra passord",
     "Strong password" : "Sterkt passord",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Det oppstod en feil. Vennligst last opp et ASCII-kodet PEM-sertifikat.",
     "Valid until {date}" : "Gyldig til {date}",
     "Delete" : "Slett",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Det oppstod en feil. Vennligst last opp et ASCII-kodet PEM-sertifikat.",
     "Groups" : "Grupper",
     "Unable to delete {objName}" : "Kan ikke slette {objName}",
     "Error creating group" : "Feil ved oppretting av gruppe",
@@ -157,10 +157,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
     "Enable server-side encryption" : "Aktiver serverkryptering",
     "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Serverkryptering er en enveisprosess. Når kryptering er blitt aktivert, vil alle filer fra det tidspunktet av bli kryptert på serveren og det vil ikke være mulig å deaktivere kryptering senere.",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Alle som har privilegert tilgang til ownCloud-serveren din kan dekryptere filene dine enten ved å fange opp forespørsler eller ved å lese brukerpassord som er lagret i klartekst i økt-filer. Serverkryptering beskytter derfor ikke mot uærlige administratorer, men det er nyttig for å beskytte dine data på eksternt oppkoblede lagringsplasser.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Avhengig av den faktiske krypteringsmodulen økes filstørrelsen generelt (med 35%% eller mer ved bruk av standardmodulen)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør ta periodisk sikkerhetskopi av alle krypteringsnøkler for å forhindre permanent tap av data (data/<user>/files_encryption og data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
     "Enable encryption" : "Aktiver kryptering",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul er lastet. Aktiver en krypteringsmodul i app-menyen.",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 6b3bd343762..79545168f56 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -82,9 +82,9 @@
     "So-so password" : "So-so-passord",
     "Good password" : "Bra passord",
     "Strong password" : "Sterkt passord",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Det oppstod en feil. Vennligst last opp et ASCII-kodet PEM-sertifikat.",
     "Valid until {date}" : "Gyldig til {date}",
     "Delete" : "Slett",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Det oppstod en feil. Vennligst last opp et ASCII-kodet PEM-sertifikat.",
     "Groups" : "Grupper",
     "Unable to delete {objName}" : "Kan ikke slette {objName}",
     "Error creating group" : "Feil ved oppretting av gruppe",
@@ -155,10 +155,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
     "Enable server-side encryption" : "Aktiver serverkryptering",
     "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Serverkryptering er en enveisprosess. Når kryptering er blitt aktivert, vil alle filer fra det tidspunktet av bli kryptert på serveren og det vil ikke være mulig å deaktivere kryptering senere.",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Alle som har privilegert tilgang til ownCloud-serveren din kan dekryptere filene dine enten ved å fange opp forespørsler eller ved å lese brukerpassord som er lagret i klartekst i økt-filer. Serverkryptering beskytter derfor ikke mot uærlige administratorer, men det er nyttig for å beskytte dine data på eksternt oppkoblede lagringsplasser.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Avhengig av den faktiske krypteringsmodulen økes filstørrelsen generelt (med 35%% eller mer ved bruk av standardmodulen)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør ta periodisk sikkerhetskopi av alle krypteringsnøkler for å forhindre permanent tap av data (data/<user>/files_encryption og data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
     "Enable encryption" : "Aktiver kryptering",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul er lastet. Aktiver en krypteringsmodul i app-menyen.",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 650879510dc..8f6634cef18 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "Matig wachtwoord",
     "Good password" : "Goed wachtwoord",
     "Strong password" : "Sterk wachtwoord",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Er trad een fout op. Upload als een ASCII-gecodeerd PEM certificaat.",
     "Valid until {date}" : "Geldig tot {date}",
     "Delete" : "Verwijder",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Er trad een fout op. Upload als een ASCII-gecodeerd PEM certificaat.",
     "Groups" : "Groepen",
     "Unable to delete {objName}" : "Kan {objName} niet verwijderen",
     "Error creating group" : "Fout bij aanmaken groep",
@@ -158,10 +158,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
     "Enable server-side encryption" : "Server-side versleuteling inschakelen",
     "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Versleuteling van de server is een eenrichtingsproces. Als versleuteling is ingeschakeld, worden alle bestanden vanaf dat moment versleuteld op de server en is het niet meer mogelijk versleuteling later uit te schakelen.",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Iedereen met toegang met hoge autorisaties op uw ownCloud server kan ue bestanden ontcijferen door aanvragen af te luisteren of de wachtwoorden van gebruikers die in leesbare tekst in sessie bestanden zijn opgeslagen uit te lezen. Versleuteling van de server beschermt dus niet tegen kwaadwillende beheerders, maar is praktisch om uw data op externe opslag te beveiligen.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhankelijk van de gebruikte cryptomodule, zal de bestandsomvang gemiddeld toenemen (35%% of meer bij gebruik van de standaardmodule)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "U zou regelmatig uw cryptosleutels moeten backuppen om permanent gegevensverlies te voorkomen (data/<user>/files_encryption en data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wilt u versleuteling echt inschakelen?",
     "Enable encryption" : "Versleuteling inschakelen",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index faf920b43ef..6fbe6a9ab4c 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -82,9 +82,9 @@
     "So-so password" : "Matig wachtwoord",
     "Good password" : "Goed wachtwoord",
     "Strong password" : "Sterk wachtwoord",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Er trad een fout op. Upload als een ASCII-gecodeerd PEM certificaat.",
     "Valid until {date}" : "Geldig tot {date}",
     "Delete" : "Verwijder",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Er trad een fout op. Upload als een ASCII-gecodeerd PEM certificaat.",
     "Groups" : "Groepen",
     "Unable to delete {objName}" : "Kan {objName} niet verwijderen",
     "Error creating group" : "Fout bij aanmaken groep",
@@ -156,10 +156,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
     "Enable server-side encryption" : "Server-side versleuteling inschakelen",
     "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Versleuteling van de server is een eenrichtingsproces. Als versleuteling is ingeschakeld, worden alle bestanden vanaf dat moment versleuteld op de server en is het niet meer mogelijk versleuteling later uit te schakelen.",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Iedereen met toegang met hoge autorisaties op uw ownCloud server kan ue bestanden ontcijferen door aanvragen af te luisteren of de wachtwoorden van gebruikers die in leesbare tekst in sessie bestanden zijn opgeslagen uit te lezen. Versleuteling van de server beschermt dus niet tegen kwaadwillende beheerders, maar is praktisch om uw data op externe opslag te beveiligen.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhankelijk van de gebruikte cryptomodule, zal de bestandsomvang gemiddeld toenemen (35%% of meer bij gebruik van de standaardmodule)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "U zou regelmatig uw cryptosleutels moeten backuppen om permanent gegevensverlies te voorkomen (data/<user>/files_encryption en data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wilt u versleuteling echt inschakelen?",
     "Enable encryption" : "Versleuteling inschakelen",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
index ac741571911..89fb4cc5133 100644
--- a/settings/l10n/oc.js
+++ b/settings/l10n/oc.js
@@ -80,9 +80,9 @@ OC.L10N.register(
     "So-so password" : "Senhal de seguretat tot bèl juste acceptable",
     "Good password" : "Senhal de seguretat sufisenta",
     "Strong password" : "Senhal de fòrta seguretat",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Una error s'es produsida. Provesissètz un certificat PEM encodat al format ASCII.",
     "Valid until {date}" : "Valid fins al {date}",
     "Delete" : "Suprimir",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Una error s'es produsida. Provesissètz un certificat PEM encodat al format ASCII.",
     "Groups" : "Gropes",
     "Unable to delete {objName}" : "Impossible de suprimir {objName}",
     "Error creating group" : "Error al moment de la creacion del grop",
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
index 11a67d294e7..4efe3443352 100644
--- a/settings/l10n/oc.json
+++ b/settings/l10n/oc.json
@@ -78,9 +78,9 @@
     "So-so password" : "Senhal de seguretat tot bèl juste acceptable",
     "Good password" : "Senhal de seguretat sufisenta",
     "Strong password" : "Senhal de fòrta seguretat",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Una error s'es produsida. Provesissètz un certificat PEM encodat al format ASCII.",
     "Valid until {date}" : "Valid fins al {date}",
     "Delete" : "Suprimir",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Una error s'es produsida. Provesissètz un certificat PEM encodat al format ASCII.",
     "Groups" : "Gropes",
     "Unable to delete {objName}" : "Impossible de suprimir {objName}",
     "Error creating group" : "Error al moment de la creacion del grop",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 8adfebcac11..97294ea0fa0 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -86,9 +86,9 @@ OC.L10N.register(
     "So-so password" : "Senha mais ou menos",
     "Good password" : "Boa senha",
     "Strong password" : "Senha forte",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor envie um certificado ASCII-encoded PEM",
     "Valid until {date}" : "Vádido até {date}",
     "Delete" : "Excluir",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor envie um certificado ASCII-encoded PEM",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Não é possível excluir {objName}",
     "Error creating group" : "Erro ao criar grupo",
@@ -160,10 +160,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Encriptação do lado do servidor é um processo de uma direção. Uma vez que a criptografia está habilitada, todos os arquivos a partir desse ponto em diante serão criptografados no servidor e não será possível desativar a criptografia em uma data posterior",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Qualquer pessoa que tenha acesso privilegiado ao seu servidor ownCloud pode descriptografar os arquivos quer, interceptando pedidos ou a leitura de senhas de usuários que são armazenados em arquivos de sessão texto simples. Encriptação do lado do servidor, portanto, não protege contra os administradores mal-intencionados, mas é útil para proteger seus dados em armazenamento hospedados externamente.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependendo do módulo atual de criptografia o tamanho geral do arquivo será aumentado (por 35 %% ou mais quando se usa o módulo padrão)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Você deve regularmente fazer backup de todas as chaves de criptografia para evitar a perda de dados permanente (data/<user>/files_encryption e data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
     "Enable encryption" : "Ativar criptografia",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 2bd0848cee5..f97eb1302b4 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -84,9 +84,9 @@
     "So-so password" : "Senha mais ou menos",
     "Good password" : "Boa senha",
     "Strong password" : "Senha forte",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor envie um certificado ASCII-encoded PEM",
     "Valid until {date}" : "Vádido até {date}",
     "Delete" : "Excluir",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Ocorreu um erro. Por favor envie um certificado ASCII-encoded PEM",
     "Groups" : "Grupos",
     "Unable to delete {objName}" : "Não é possível excluir {objName}",
     "Error creating group" : "Erro ao criar grupo",
@@ -158,10 +158,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Encriptação do lado do servidor é um processo de uma direção. Uma vez que a criptografia está habilitada, todos os arquivos a partir desse ponto em diante serão criptografados no servidor e não será possível desativar a criptografia em uma data posterior",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Qualquer pessoa que tenha acesso privilegiado ao seu servidor ownCloud pode descriptografar os arquivos quer, interceptando pedidos ou a leitura de senhas de usuários que são armazenados em arquivos de sessão texto simples. Encriptação do lado do servidor, portanto, não protege contra os administradores mal-intencionados, mas é útil para proteger seus dados em armazenamento hospedados externamente.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependendo do módulo atual de criptografia o tamanho geral do arquivo será aumentado (por 35 %% ou mais quando se usa o módulo padrão)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Você deve regularmente fazer backup de todas as chaves de criptografia para evitar a perda de dados permanente (data/<user>/files_encryption e data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
     "Enable encryption" : "Ativar criptografia",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 24b1d9e96f5..824a189ac26 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "Так себе пароль",
     "Good password" : "Хороший пароль",
     "Strong password" : "Стойкий пароль",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Произошла ошибка. Пожалуйста загрузите сертификат PEM в ASCII кодировке.",
     "Valid until {date}" : "Действительно до {дата}",
     "Delete" : "Удалить",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Произошла ошибка. Пожалуйста загрузите сертификат PEM в ASCII кодировке.",
     "Groups" : "Группы",
     "Unable to delete {objName}" : "Невозможно удалить {objName}",
     "Error creating group" : "Ошибка создания группы",
@@ -158,10 +158,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
     "Enable server-side encryption" : "Включить шифрование на стороне сервера",
     "Please read carefully before activating server-side encryption: " : "Пожалуйста прочтите внимательно прежде чем включать шифрование на стороне сервера:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Шифрование на стороне сервера необратимый процесс. После включения шифрования все файлы на сервере будут зашифрованы, отключение этой опции невозможно.",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Любой привилегированный пользователь, который имеет доступ к серверу ownCloud может расшифровать файлы путем перехвата паролей от пользователей, которые хранятся в открытом в виде в файлах сессии. Шифрование на стороне сервера не защищает от администраторов-злоумышленников, но оно может быть полезно при использовании стороннего хостинга.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "В зависимости от модуля шифрования общий размер файла может увеличиться (на 35 или более %% при использовании модуля по умолчанию)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Вам необходимо постоянно создавать резервную копию ключей шифрования с целью предотвращения потери данных (data/<user>/files_encryption и data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Это последнее предупреждение: Вы действительно желаете включить шифрование?",
     "Enable encryption" : "Включить шифрование",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Модуль шифрования не загружен, пожалуйста включите модуль шифрования в меню приложений.",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 0cc7346af1c..b4e0ce556c2 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -82,9 +82,9 @@
     "So-so password" : "Так себе пароль",
     "Good password" : "Хороший пароль",
     "Strong password" : "Стойкий пароль",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Произошла ошибка. Пожалуйста загрузите сертификат PEM в ASCII кодировке.",
     "Valid until {date}" : "Действительно до {дата}",
     "Delete" : "Удалить",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Произошла ошибка. Пожалуйста загрузите сертификат PEM в ASCII кодировке.",
     "Groups" : "Группы",
     "Unable to delete {objName}" : "Невозможно удалить {objName}",
     "Error creating group" : "Ошибка создания группы",
@@ -156,10 +156,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
     "Enable server-side encryption" : "Включить шифрование на стороне сервера",
     "Please read carefully before activating server-side encryption: " : "Пожалуйста прочтите внимательно прежде чем включать шифрование на стороне сервера:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Шифрование на стороне сервера необратимый процесс. После включения шифрования все файлы на сервере будут зашифрованы, отключение этой опции невозможно.",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Любой привилегированный пользователь, который имеет доступ к серверу ownCloud может расшифровать файлы путем перехвата паролей от пользователей, которые хранятся в открытом в виде в файлах сессии. Шифрование на стороне сервера не защищает от администраторов-злоумышленников, но оно может быть полезно при использовании стороннего хостинга.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "В зависимости от модуля шифрования общий размер файла может увеличиться (на 35 или более %% при использовании модуля по умолчанию)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Вам необходимо постоянно создавать резервную копию ключей шифрования с целью предотвращения потери данных (data/<user>/files_encryption и data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Это последнее предупреждение: Вы действительно желаете включить шифрование?",
     "Enable encryption" : "Включить шифрование",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Модуль шифрования не загружен, пожалуйста включите модуль шифрования в меню приложений.",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index 38026284af1..42901082535 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -81,9 +81,9 @@ OC.L10N.register(
     "So-so password" : "Осредња лозинка",
     "Good password" : "Добра лозинка",
     "Strong password" : "Јака лозинка",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Дошло је до грешке. Отпремите АСКИ кодирани ПЕМ сертификат.",
     "Valid until {date}" : "Важи до {date}",
     "Delete" : "Обриши",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Дошло је до грешке. Отпремите АСКИ кодирани ПЕМ сертификат.",
     "Groups" : "Групе",
     "Unable to delete {objName}" : "Не могу да обришем {objName}",
     "Error creating group" : "Грешка при прављењу групе",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index 5206512092d..44df955b25b 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -79,9 +79,9 @@
     "So-so password" : "Осредња лозинка",
     "Good password" : "Добра лозинка",
     "Strong password" : "Јака лозинка",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Дошло је до грешке. Отпремите АСКИ кодирани ПЕМ сертификат.",
     "Valid until {date}" : "Важи до {date}",
     "Delete" : "Обриши",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Дошло је до грешке. Отпремите АСКИ кодирани ПЕМ сертификат.",
     "Groups" : "Групе",
     "Unable to delete {objName}" : "Не могу да обришем {objName}",
     "Error creating group" : "Грешка при прављењу групе",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index 5757116f68d..cedc077652c 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "รหัสผ่านระดับปกติ",
     "Good password" : "รหัสผ่านระดับดี",
     "Strong password" : "รหัสผ่านระดับดีมาก",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM",
     "Valid until {date}" : "ใช้ได้จนถึงวันที่ {date}",
     "Delete" : "ลบ",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM",
     "Groups" : "กลุ่ม",
     "Unable to delete {objName}" : "ไม่สามารถลบ {objName}",
     "Error creating group" : "ข้อผิดพลาดขณะกำลังสร้างกลุ่ม",
@@ -158,10 +158,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "บริการ cron ของระบบจะเรียกไฟล์ cron.php ทุกq 15 นาที",
     "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
     "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "การเข้ารหัสฝั่งเซิร์ฟเวอร์เป็นกระบวนการหนึ่ง เมื่อมีการเปิดใช้การเข้ารหัสไฟล์ทั้งหมดและมันจะเป็นไปไม่ได้ที่จะปิดการใช้งานการเข้ารหัสในภายหลัง",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ทุกคนที่มีสิทธิในการเข้าถึงเซิร์ฟเวอร์ ownCloud คุณสามารถถอดรหัสไฟล์ของคุณโดยการสกัดกั้นการร้องขอหรือการอ่านรหัสผ่านของผู้ใช้ซึ่งจะถูกเก็บไว้ในเซสชั่นไฟล์ข้อความธรรมดา การเข้ารหัสฝั่งเซิร์ฟเวอร์จึงไม่ได้ป้องกันผู้ดูแลระบบที่เป็นอันตราย แต่จะเป็นประโยชน์สำหรับการปกป้องข้อมูลของคุณในการจัดเก็บข้อมูลจากภายนอก",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "ทั้งนี้ขึ้นอยู่กับโมดูลการเข้ารหัสที่เกิดขึ้นจริงขนาดไฟล์ทั่วไปจะเพิ่มขึ้น (35%% หรือมากกว่าเมื่อใช้โมดูลเริ่มต้น)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "คุณควรสำรองข้อมูลคีย์การเข้ารหัสอย่างสม่ำเสมอ เพื่อป้องกันการสูญเสียข้อมูลอย่างถาวร (data/<user>/files_encryption และ data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index b2ef07d5e29..c09be59ac2c 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -82,9 +82,9 @@
     "So-so password" : "รหัสผ่านระดับปกติ",
     "Good password" : "รหัสผ่านระดับดี",
     "Strong password" : "รหัสผ่านระดับดีมาก",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM",
     "Valid until {date}" : "ใช้ได้จนถึงวันที่ {date}",
     "Delete" : "ลบ",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "เกิดข้อผิดพลาด กรุณาอัพโหลดใบรับรองเข้ารหัส ASCII PEM",
     "Groups" : "กลุ่ม",
     "Unable to delete {objName}" : "ไม่สามารถลบ {objName}",
     "Error creating group" : "ข้อผิดพลาดขณะกำลังสร้างกลุ่ม",
@@ -156,10 +156,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "บริการ cron ของระบบจะเรียกไฟล์ cron.php ทุกq 15 นาที",
     "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
     "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "การเข้ารหัสฝั่งเซิร์ฟเวอร์เป็นกระบวนการหนึ่ง เมื่อมีการเปิดใช้การเข้ารหัสไฟล์ทั้งหมดและมันจะเป็นไปไม่ได้ที่จะปิดการใช้งานการเข้ารหัสในภายหลัง",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ทุกคนที่มีสิทธิในการเข้าถึงเซิร์ฟเวอร์ ownCloud คุณสามารถถอดรหัสไฟล์ของคุณโดยการสกัดกั้นการร้องขอหรือการอ่านรหัสผ่านของผู้ใช้ซึ่งจะถูกเก็บไว้ในเซสชั่นไฟล์ข้อความธรรมดา การเข้ารหัสฝั่งเซิร์ฟเวอร์จึงไม่ได้ป้องกันผู้ดูแลระบบที่เป็นอันตราย แต่จะเป็นประโยชน์สำหรับการปกป้องข้อมูลของคุณในการจัดเก็บข้อมูลจากภายนอก",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "ทั้งนี้ขึ้นอยู่กับโมดูลการเข้ารหัสที่เกิดขึ้นจริงขนาดไฟล์ทั่วไปจะเพิ่มขึ้น (35%% หรือมากกว่าเมื่อใช้โมดูลเริ่มต้น)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "คุณควรสำรองข้อมูลคีย์การเข้ารหัสอย่างสม่ำเสมอ เพื่อป้องกันการสูญเสียข้อมูลอย่างถาวร (data/<user>/files_encryption และ data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index e795feba4e4..aa73557302d 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "Normal parola",
     "Good password" : "İyi parola",
     "Strong password" : "Güçlü parola",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.",
     "Valid until {date}" : "{date} tarihine kadar geçerli",
     "Delete" : "Sil",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.",
     "Groups" : "Gruplar",
     "Unable to delete {objName}" : "{objName} silinemiyor",
     "Error creating group" : "Grup oluşturulurken hata",
@@ -158,10 +158,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
     "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
     "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Sunucu tarafında şifreleme tek yönlü bir işlemdir. Bir defa etkinleştirildiğinde sunucudaki tüm dosyalar şifrelenir ve ileri bir tarihte şifrelemeyi iptal etmek mümkün değildir",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud sunucunuza erişimi olan biri isteklere müdahale ederek veya oturum dosyalarında düz metin olarak saklanan parolayı kullanarak dosyalarınızın şifrelenmesini çözebilir. Bu nedenle sunucu tarafında şifreleme işlemi kötü niyetli sistem yöneticisine karşı koruma sağlamaz ama verinizi harici depolamada tutmanız durumunda yararlıdır.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Gerçek şifreleme modülüne bağlı olarak genel dosya boyutu artar (%%35 veya varsayılan modül kullanıldığında daha fazla)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Veri kaybının önüne geçmek için düzenli olarak tüm şifreleme anahtarlarınızı yedeklemelisiniz (data/<kullanıcı>/files_encryption ve data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
     "Enable encryption" : "Şifrelemeyi aç",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 2793bf807b9..96067996c9a 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -82,9 +82,9 @@
     "So-so password" : "Normal parola",
     "Good password" : "İyi parola",
     "Strong password" : "Güçlü parola",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.",
     "Valid until {date}" : "{date} tarihine kadar geçerli",
     "Delete" : "Sil",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.",
     "Groups" : "Gruplar",
     "Unable to delete {objName}" : "{objName} silinemiyor",
     "Error creating group" : "Grup oluşturulurken hata",
@@ -156,10 +156,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
     "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
     "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Sunucu tarafında şifreleme tek yönlü bir işlemdir. Bir defa etkinleştirildiğinde sunucudaki tüm dosyalar şifrelenir ve ileri bir tarihte şifrelemeyi iptal etmek mümkün değildir",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud sunucunuza erişimi olan biri isteklere müdahale ederek veya oturum dosyalarında düz metin olarak saklanan parolayı kullanarak dosyalarınızın şifrelenmesini çözebilir. Bu nedenle sunucu tarafında şifreleme işlemi kötü niyetli sistem yöneticisine karşı koruma sağlamaz ama verinizi harici depolamada tutmanız durumunda yararlıdır.",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Gerçek şifreleme modülüne bağlı olarak genel dosya boyutu artar (%%35 veya varsayılan modül kullanıldığında daha fazla)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Veri kaybının önüne geçmek için düzenli olarak tüm şifreleme anahtarlarınızı yedeklemelisiniz (data/<kullanıcı>/files_encryption ve data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
     "Enable encryption" : "Şifrelemeyi aç",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index 2a89154dafc..50c08d287a8 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -83,9 +83,9 @@ OC.L10N.register(
     "So-so password" : "Такий собі пароль",
     "Good password" : "Добрий пароль",
     "Strong password" : "Надійний пароль",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Виникла помилка. Будь ласка вивантажте PEM сертифікат в ASCII-кодуванні.",
     "Valid until {date}" : "Дійсно до {date}",
     "Delete" : "Видалити",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Виникла помилка. Будь ласка вивантажте PEM сертифікат в ASCII-кодуванні.",
     "Groups" : "Групи",
     "Unable to delete {objName}" : "Не вдалося видалити {objName}",
     "Error creating group" : "Помилка створення групи",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index de302d28aee..0dae9595c72 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -81,9 +81,9 @@
     "So-so password" : "Такий собі пароль",
     "Good password" : "Добрий пароль",
     "Strong password" : "Надійний пароль",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Виникла помилка. Будь ласка вивантажте PEM сертифікат в ASCII-кодуванні.",
     "Valid until {date}" : "Дійсно до {date}",
     "Delete" : "Видалити",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Виникла помилка. Будь ласка вивантажте PEM сертифікат в ASCII-кодуванні.",
     "Groups" : "Групи",
     "Unable to delete {objName}" : "Не вдалося видалити {objName}",
     "Error creating group" : "Помилка створення групи",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 2b6205f2f4c..8f219771e45 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -84,9 +84,9 @@ OC.L10N.register(
     "So-so password" : "一般强度的密码",
     "Good password" : "较强的密码",
     "Strong password" : "强密码",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。",
     "Valid until {date}" : "有效期至 {date}",
     "Delete" : "删除",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。",
     "Groups" : "组",
     "Unable to delete {objName}" : "无法删除 {objName}",
     "Error creating group" : "创建组时出错",
@@ -157,10 +157,6 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
     "Enable server-side encryption" : "启用服务器端加密",
     "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "服务器端加密是一个单向的过程。一旦启用加密，从该点向前所有文件都将在服务器上进行加密，它将无法在以后禁用加密",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "只要有权访问您的 ownCloud 服务器就可能解密你的文件，通过截获请求或读出以纯文本会话文件存储的用户密码。服务端加密。它不仅让你免遭恶意的管理员查看隐私，在保护你在外部托管的存储中的数据也非常有用。",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "根据实际加密模块上的一般文件大小而增加 (使用默认的模块时，35%% 以上)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "你应该定期备份所有加密密钥，以防数据永久丢失 (data/<user>/files_encryption 和 data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
     "Enable encryption" : "启用加密",
     "No encryption module loaded, please enable an encryption module in the app menu." : "没有加载加密模块，请在 APP 应用菜单中启用加密模块。",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index e67cba96e37..55c49f52075 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -82,9 +82,9 @@
     "So-so password" : "一般强度的密码",
     "Good password" : "较强的密码",
     "Strong password" : "强密码",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。",
     "Valid until {date}" : "有效期至 {date}",
     "Delete" : "删除",
-    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。",
     "Groups" : "组",
     "Unable to delete {objName}" : "无法删除 {objName}",
     "Error creating group" : "创建组时出错",
@@ -155,10 +155,6 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
     "Enable server-side encryption" : "启用服务器端加密",
     "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
-    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "服务器端加密是一个单向的过程。一旦启用加密，从该点向前所有文件都将在服务器上进行加密，它将无法在以后禁用加密",
-    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "只要有权访问您的 ownCloud 服务器就可能解密你的文件，通过截获请求或读出以纯文本会话文件存储的用户密码。服务端加密。它不仅让你免遭恶意的管理员查看隐私，在保护你在外部托管的存储中的数据也非常有用。",
-    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "根据实际加密模块上的一般文件大小而增加 (使用默认的模块时，35%% 以上)",
-    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "你应该定期备份所有加密密钥，以防数据永久丢失 (data/<user>/files_encryption 和 data/files_encryption)",
     "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
     "Enable encryption" : "启用加密",
     "No encryption module loaded, please enable an encryption module in the app menu." : "没有加载加密模块，请在 APP 应用菜单中启用加密模块。",
-- 
GitLab


From d29d018cc7233652b852de4ed94cf5b53ff9df89 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 11 Oct 2015 01:54:58 -0400
Subject: [PATCH 773/783] [tx-robot] updated from transifex

---
 apps/encryption/l10n/it.js   | 22 ++++++++++-----------
 apps/encryption/l10n/it.json | 22 ++++++++++-----------
 apps/files/l10n/sr.js        |  8 ++++++++
 apps/files/l10n/sr.json      |  8 ++++++++
 core/l10n/id.js              |  6 ++++++
 core/l10n/id.json            |  6 ++++++
 core/l10n/it.js              |  2 +-
 core/l10n/it.json            |  2 +-
 core/l10n/sr.js              |  9 +++++++++
 core/l10n/sr.json            |  9 +++++++++
 lib/l10n/sr.js               |  2 ++
 lib/l10n/sr.json             |  2 ++
 settings/l10n/fa.js          | 38 ++++++++++++++++++++++++++++++++++++
 settings/l10n/fa.json        | 38 ++++++++++++++++++++++++++++++++++++
 settings/l10n/id.js          |  7 +++++++
 settings/l10n/id.json        |  7 +++++++
 settings/l10n/it.js          |  6 +++++-
 settings/l10n/it.json        |  6 +++++-
 settings/l10n/pt_BR.js       |  4 ++++
 settings/l10n/pt_BR.json     |  4 ++++
 20 files changed, 182 insertions(+), 26 deletions(-)

diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
index c0d42e17f74..9f94b409f57 100644
--- a/apps/encryption/l10n/it.js
+++ b/apps/encryption/l10n/it.js
@@ -1,17 +1,17 @@
 OC.L10N.register(
     "encryption",
     {
-    "Missing recovery key password" : "Manca la password della chiave di recupero",
-    "Please repeat the recovery key password" : "Ripeti la password della chiave di recupero",
-    "Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di recupero ripetuta non corrisponde alla password della chiave di recupero fornita",
-    "Recovery key successfully enabled" : "Chiave di recupero abilitata correttamente",
+    "Missing recovery key password" : "Manca la password della chiave di ripristino",
+    "Please repeat the recovery key password" : "Ripeti la password della chiave di ripristino",
+    "Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di ripristino ripetuta non corrisponde alla password della chiave di ripristino fornita",
+    "Recovery key successfully enabled" : "Chiave di ripristino abilitata correttamente",
     "Could not enable recovery key. Please check your recovery key password!" : "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
-    "Recovery key successfully disabled" : "Chiave di recupero disabilitata correttamente",
-    "Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di recupero. Verifica la password della chiave di recupero.",
+    "Recovery key successfully disabled" : "Chiave di ripristino disabilitata correttamente",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
     "Missing parameters" : "Parametri mancanti",
-    "Please provide the old recovery password" : "Fornisci la vecchia password di recupero",
-    "Please provide a new recovery password" : "Fornisci una nuova password di recupero",
-    "Please repeat the new recovery password" : "Ripeti la nuova password di recupero",
+    "Please provide the old recovery password" : "Fornisci la vecchia password di ripristino",
+    "Please provide a new recovery password" : "Fornisci una nuova password di ripristino",
+    "Please repeat the new recovery password" : "Ripeti la nuova password di ripristino",
     "Password successfully changed." : "Password modificata correttamente.",
     "Could not change the password. Maybe the old password was not correct." : "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
     "Recovery Key disabled" : "Chiave di ripristino disabilitata",
@@ -35,9 +35,9 @@ OC.L10N.register(
     "Enable recovery key" : "Abilita chiave di ripristino",
     "Disable recovery key" : "Disabilita chiave di ripristino",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.",
-    "Recovery key password" : "Password della chiave di recupero",
+    "Recovery key password" : "Password della chiave di ripristino",
     "Repeat recovery key password" : "Ripeti la password della chiave di ripristino",
-    "Change recovery key password:" : "Cambia la password della chiave di recupero:",
+    "Change recovery key password:" : "Cambia la password della chiave di ripristino:",
     "Old recovery key password" : "Vecchia password della chiave di ripristino",
     "New recovery key password" : "Nuova password della chiave di ripristino",
     "Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino",
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
index ee3f487c54f..a117af8a317 100644
--- a/apps/encryption/l10n/it.json
+++ b/apps/encryption/l10n/it.json
@@ -1,15 +1,15 @@
 { "translations": {
-    "Missing recovery key password" : "Manca la password della chiave di recupero",
-    "Please repeat the recovery key password" : "Ripeti la password della chiave di recupero",
-    "Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di recupero ripetuta non corrisponde alla password della chiave di recupero fornita",
-    "Recovery key successfully enabled" : "Chiave di recupero abilitata correttamente",
+    "Missing recovery key password" : "Manca la password della chiave di ripristino",
+    "Please repeat the recovery key password" : "Ripeti la password della chiave di ripristino",
+    "Repeated recovery key password does not match the provided recovery key password" : "La password della chiave di ripristino ripetuta non corrisponde alla password della chiave di ripristino fornita",
+    "Recovery key successfully enabled" : "Chiave di ripristino abilitata correttamente",
     "Could not enable recovery key. Please check your recovery key password!" : "Impossibile abilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
-    "Recovery key successfully disabled" : "Chiave di recupero disabilitata correttamente",
-    "Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di recupero. Verifica la password della chiave di recupero.",
+    "Recovery key successfully disabled" : "Chiave di ripristino disabilitata correttamente",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossibile disabilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
     "Missing parameters" : "Parametri mancanti",
-    "Please provide the old recovery password" : "Fornisci la vecchia password di recupero",
-    "Please provide a new recovery password" : "Fornisci una nuova password di recupero",
-    "Please repeat the new recovery password" : "Ripeti la nuova password di recupero",
+    "Please provide the old recovery password" : "Fornisci la vecchia password di ripristino",
+    "Please provide a new recovery password" : "Fornisci una nuova password di ripristino",
+    "Please repeat the new recovery password" : "Ripeti la nuova password di ripristino",
     "Password successfully changed." : "Password modificata correttamente.",
     "Could not change the password. Maybe the old password was not correct." : "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
     "Recovery Key disabled" : "Chiave di ripristino disabilitata",
@@ -33,9 +33,9 @@
     "Enable recovery key" : "Abilita chiave di ripristino",
     "Disable recovery key" : "Disabilita chiave di ripristino",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.",
-    "Recovery key password" : "Password della chiave di recupero",
+    "Recovery key password" : "Password della chiave di ripristino",
     "Repeat recovery key password" : "Ripeti la password della chiave di ripristino",
-    "Change recovery key password:" : "Cambia la password della chiave di recupero:",
+    "Change recovery key password:" : "Cambia la password della chiave di ripristino:",
     "Old recovery key password" : "Vecchia password della chiave di ripristino",
     "New recovery key password" : "Nuova password della chiave di ripristino",
     "Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino",
diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js
index c9b8fd3ac54..93f8979c2cb 100644
--- a/apps/files/l10n/sr.js
+++ b/apps/files/l10n/sr.js
@@ -71,10 +71,14 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Складиште корисника {owner} је скоро пуно ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше складиште је скоро пуно ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["се поклапа са '{filter}'","се поклапају са '{filter}'","се поклапа са '{filter}'"],
+    "Path" : "Путања",
+    "_%n byte_::_%n bytes_" : ["%n бајт","%n бајта","%n бајта"],
     "Favorited" : "Омиљено",
     "Favorite" : "Омиљени",
+    "{newname} already exists" : "{newname} већ постоји",
     "Upload" : "Отпреми",
     "Text file" : "текстуални фајл",
+    "New text file.txt" : "Нов текстуални фајл.txt",
     "Folder" : "фасцикла",
     "New folder" : "Нова фасцикла",
     "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака",
@@ -92,12 +96,16 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s обриса %1$s",
     "You restored %1$s" : "Вратили сте %1$s",
     "%2$s restored %1$s" : "%2$s поврати %1$s",
+    "Changed by %2$s" : "Изменио %2$s",
+    "Deleted by %2$s" : "Обрисао %2$s",
+    "Restored by %2$s" : "Повратио %2$s",
     "%s could not be renamed as it has been deleted" : "%s се не може преименовати јер је обрисан",
     "%s could not be renamed" : "%s се не може преименовати",
     "Upload (max. %s)" : "Отпремање (макс. %s)",
     "File handling" : "Руковање фајловима",
     "Maximum upload size" : "Највећа величина отпремања",
     "max. possible: " : "највише могуће:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "У PHP-FPM-у ова вредност има ефекта тек након 5 минута након примене.",
     "Save" : "Сачувај",
     "Can not be edited from here due to insufficient permissions." : "Не може да се мења одавде због недостатка дозвола.",
     "Settings" : "Поставке",
diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json
index 8a1ed30cefe..08ba9712de7 100644
--- a/apps/files/l10n/sr.json
+++ b/apps/files/l10n/sr.json
@@ -69,10 +69,14 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Складиште корисника {owner} је скоро пуно ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше складиште је скоро пуно ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["се поклапа са '{filter}'","се поклапају са '{filter}'","се поклапа са '{filter}'"],
+    "Path" : "Путања",
+    "_%n byte_::_%n bytes_" : ["%n бајт","%n бајта","%n бајта"],
     "Favorited" : "Омиљено",
     "Favorite" : "Омиљени",
+    "{newname} already exists" : "{newname} већ постоји",
     "Upload" : "Отпреми",
     "Text file" : "текстуални фајл",
+    "New text file.txt" : "Нов текстуални фајл.txt",
     "Folder" : "фасцикла",
     "New folder" : "Нова фасцикла",
     "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака",
@@ -90,12 +94,16 @@
     "%2$s deleted %1$s" : "%2$s обриса %1$s",
     "You restored %1$s" : "Вратили сте %1$s",
     "%2$s restored %1$s" : "%2$s поврати %1$s",
+    "Changed by %2$s" : "Изменио %2$s",
+    "Deleted by %2$s" : "Обрисао %2$s",
+    "Restored by %2$s" : "Повратио %2$s",
     "%s could not be renamed as it has been deleted" : "%s се не може преименовати јер је обрисан",
     "%s could not be renamed" : "%s се не може преименовати",
     "Upload (max. %s)" : "Отпремање (макс. %s)",
     "File handling" : "Руковање фајловима",
     "Maximum upload size" : "Највећа величина отпремања",
     "max. possible: " : "највише могуће:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "У PHP-FPM-у ова вредност има ефекта тек након 5 минута након примене.",
     "Save" : "Сачувај",
     "Can not be edited from here due to insufficient permissions." : "Не може да се мења одавде због недостатка дозвола.",
     "Settings" : "Поставке",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index c113b1cd555..7213844072f 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "Tidak dapat mengirim Email ke pengguna berikut: %s",
     "Preparing update" : "Mempersiapkan pembaruan",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Percobaan migrasi dilompati - \"update.skip-migration-test\" diaktikan di config.php",
     "Turned on maintenance mode" : "Hidupkan mode perawatan",
     "Turned off maintenance mode" : "Matikan mode perawatan",
     "Maintenance mode is kept active" : "Mode Pemeliharaan masih aktif",
@@ -12,6 +13,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Terbaru \"%s\" sampai %s",
     "Repair warning: " : "Peringatan perbaikan:",
     "Repair error: " : "Kesalahan perbaikan:",
+    "Set log level to debug - current level: \"%s\"" : "Atur level log untuk debug - level saat ini: \"%s\"",
+    "Reset log level to  \"%s\"" : "Atur ulang level log menjadi \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Aplikasi tidak kompatibel berikut telah dinonaktifkan: %s",
     "Following apps have been disabled: %s" : "Aplikasi berikut telah dinonaktifkan: %s",
     "Already up to date" : "Sudah yang terbaru",
@@ -107,6 +110,7 @@ OC.L10N.register(
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom tidak terbaca oleh PHP sangat disarankan untuk alasan keamanan. Informasi lebih lanjut dapat ditemukan di <a href=\"{docLink}\">dokumentasi</a> kami.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Versi PHP Anda ({version}) tidak lagi <a href=\"{phpLink}\">didukung oleh PHP</a>. Kami menyarankan Anda untuk meningkatkan versi PHP Anda agar mendapatkan keuntungan pembaruan kinerja dan keamanan yang disediakan oleh PHP.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Konfigurasi header reverse proxy tidak benar atau Anda mengakses ownCloud dari proxy yang tidak terpercaya. Jika Anda tidak mengakses ownCloud dari proxy yang terpercaya, ini merupakan masalah keamanan dan memungkinkan peretas dapat memalsukan alamat IP mereka yang terlihat pada ownCloud. Informasi lebih lanjut dapat ditemukan pada <a href=\"{docLink}\">dokumentasi</a> kami.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached diatur sebagai cache terdistribusi, namun modul PHP \"memcache\" yang dipasang salah. \\OC\\Memcache\\Memcached hanya mendukung \"memcached\" bukan \"memcache\". Lihat <a href=\"{wikiLink}\">wiki memcached tentang kedua modul</a>.",
     "Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Header HTTP \"{header}\" tidak dikonfigurasi sama dengan \"{expected}\". Hal ini berpotensi pada resiko keamanan dan privasi. Kami sarankan untuk menyesuaikan pengaturan ini.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" tidak diatur kurang dari \"{seconds}\" detik. Untuk peningkatan keamanan, kami menyarankan untuk mengaktifkan HSTS seperti yang dijelaskan di <a href=\"{docUrl}\">tips keamanan</a>.",
@@ -183,6 +187,8 @@ OC.L10N.register(
     "New Password" : "Sandi Baru",
     "Reset password" : "Setel ulang sandi",
     "Searching other places" : "Mencari tempat lainnya",
+    "No search results in other folders" : "Tidak ada hasil penelusuran didalam folder yang lain",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} hasil pencarian di folder lain"],
     "Personal" : "Pribadi",
     "Users" : "Pengguna",
     "Apps" : "Aplikasi",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index f99a6568c01..1c71260efec 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Tidak dapat mengirim Email ke pengguna berikut: %s",
     "Preparing update" : "Mempersiapkan pembaruan",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "Percobaan migrasi dilompati - \"update.skip-migration-test\" diaktikan di config.php",
     "Turned on maintenance mode" : "Hidupkan mode perawatan",
     "Turned off maintenance mode" : "Matikan mode perawatan",
     "Maintenance mode is kept active" : "Mode Pemeliharaan masih aktif",
@@ -10,6 +11,8 @@
     "Updated \"%s\" to %s" : "Terbaru \"%s\" sampai %s",
     "Repair warning: " : "Peringatan perbaikan:",
     "Repair error: " : "Kesalahan perbaikan:",
+    "Set log level to debug - current level: \"%s\"" : "Atur level log untuk debug - level saat ini: \"%s\"",
+    "Reset log level to  \"%s\"" : "Atur ulang level log menjadi \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Aplikasi tidak kompatibel berikut telah dinonaktifkan: %s",
     "Following apps have been disabled: %s" : "Aplikasi berikut telah dinonaktifkan: %s",
     "Already up to date" : "Sudah yang terbaru",
@@ -105,6 +108,7 @@
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom tidak terbaca oleh PHP sangat disarankan untuk alasan keamanan. Informasi lebih lanjut dapat ditemukan di <a href=\"{docLink}\">dokumentasi</a> kami.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Versi PHP Anda ({version}) tidak lagi <a href=\"{phpLink}\">didukung oleh PHP</a>. Kami menyarankan Anda untuk meningkatkan versi PHP Anda agar mendapatkan keuntungan pembaruan kinerja dan keamanan yang disediakan oleh PHP.",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Konfigurasi header reverse proxy tidak benar atau Anda mengakses ownCloud dari proxy yang tidak terpercaya. Jika Anda tidak mengakses ownCloud dari proxy yang terpercaya, ini merupakan masalah keamanan dan memungkinkan peretas dapat memalsukan alamat IP mereka yang terlihat pada ownCloud. Informasi lebih lanjut dapat ditemukan pada <a href=\"{docLink}\">dokumentasi</a> kami.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached diatur sebagai cache terdistribusi, namun modul PHP \"memcache\" yang dipasang salah. \\OC\\Memcache\\Memcached hanya mendukung \"memcached\" bukan \"memcache\". Lihat <a href=\"{wikiLink}\">wiki memcached tentang kedua modul</a>.",
     "Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Header HTTP \"{header}\" tidak dikonfigurasi sama dengan \"{expected}\". Hal ini berpotensi pada resiko keamanan dan privasi. Kami sarankan untuk menyesuaikan pengaturan ini.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" tidak diatur kurang dari \"{seconds}\" detik. Untuk peningkatan keamanan, kami menyarankan untuk mengaktifkan HSTS seperti yang dijelaskan di <a href=\"{docUrl}\">tips keamanan</a>.",
@@ -181,6 +185,8 @@
     "New Password" : "Sandi Baru",
     "Reset password" : "Setel ulang sandi",
     "Searching other places" : "Mencari tempat lainnya",
+    "No search results in other folders" : "Tidak ada hasil penelusuran didalam folder yang lain",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} hasil pencarian di folder lain"],
     "Personal" : "Pribadi",
     "Users" : "Pengguna",
     "Apps" : "Aplikasi",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 50f7799ff13..af406d665e2 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -77,7 +77,7 @@ OC.L10N.register(
     "seconds ago" : "secondi fa",
     "Couldn't send reset email. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di ripristino, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
     "I know what I'm doing" : "So cosa sto facendo",
     "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
     "No" : "No",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 18052b86633..ef768b358a4 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -75,7 +75,7 @@
     "seconds ago" : "secondi fa",
     "Couldn't send reset email. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di ripristino, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
     "I know what I'm doing" : "So cosa sto facendo",
     "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
     "No" : "No",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index 17b0f7aa0c0..f34b4213f0f 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Не могу да пошаљем е-пошту следећим корисницима: %s ",
+    "Preparing update" : "Припремам надоградњу",
     "Turned on maintenance mode" : "Режим одржавања укључен",
     "Turned off maintenance mode" : "Режим одржавања искључен",
     "Maintenance mode is kept active" : "Режим одржавања се држи активним",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Грешка поправке:",
     "Following incompatible apps have been disabled: %s" : "Следеће неусаглашене апликације су искључене: %s",
     "Following apps have been disabled: %s" : "Следеће апликације су искључене: %s",
+    "File is too big" : "Фајл је превелик",
     "Invalid file provided" : "Понуђени фајл је неисправан",
     "No image or file provided" : "Није дата ни слика ни фајл",
     "Unknown filetype" : "Непознат тип фајла",
@@ -35,6 +37,13 @@ OC.L10N.register(
     "Thu." : "чет",
     "Fri." : "пет",
     "Sat." : "суб",
+    "Su" : "Не",
+    "Mo" : "По",
+    "Tu" : "Ут",
+    "We" : "Ср",
+    "Th" : "Че",
+    "Fr" : "Пе",
+    "Sa" : "Су",
     "January" : "јануар",
     "February" : "фебруар",
     "March" : "март",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index e9436162144..3825ab821cb 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Не могу да пошаљем е-пошту следећим корисницима: %s ",
+    "Preparing update" : "Припремам надоградњу",
     "Turned on maintenance mode" : "Режим одржавања укључен",
     "Turned off maintenance mode" : "Режим одржавања искључен",
     "Maintenance mode is kept active" : "Режим одржавања се држи активним",
@@ -11,6 +12,7 @@
     "Repair error: " : "Грешка поправке:",
     "Following incompatible apps have been disabled: %s" : "Следеће неусаглашене апликације су искључене: %s",
     "Following apps have been disabled: %s" : "Следеће апликације су искључене: %s",
+    "File is too big" : "Фајл је превелик",
     "Invalid file provided" : "Понуђени фајл је неисправан",
     "No image or file provided" : "Није дата ни слика ни фајл",
     "Unknown filetype" : "Непознат тип фајла",
@@ -33,6 +35,13 @@
     "Thu." : "чет",
     "Fri." : "пет",
     "Sat." : "суб",
+    "Su" : "Не",
+    "Mo" : "По",
+    "Tu" : "Ут",
+    "We" : "Ср",
+    "Th" : "Че",
+    "Fr" : "Пе",
+    "Sa" : "Су",
     "January" : "јануар",
     "February" : "фебруар",
     "March" : "март",
diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js
index 670a705364c..36f090a4dfc 100644
--- a/lib/l10n/sr.js
+++ b/lib/l10n/sr.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Не могу да читам фајл",
     "App directory already exists" : "Директоријум апликација већ постоји",
     "Can't create app folder. Please fix permissions. %s" : "Не могу да креирам фасциклу за апликацију. Исправите дозволе. %s",
+    "Archive does not contain a directory named %s" : "Архива не садржи директоријум назива %s",
     "No source specified when installing app" : "Није наведен извор за инсталирање апликације",
     "No href specified when installing app from http" : "Није наведена адреса за инсталирање апликације преко http",
     "No path specified when installing app from local file" : "Није наведена путања за инсталирање апликације са локалног фајла",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Дељење %s није успело зато што не постоји корисник %s",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Дељење %s није успело зато што корисник %s није члан групе која је %s члан ",
     "Sharing %s failed, because this item is already shared with %s" : "Дељење %s није успело зато што се ова ставка већ дели са %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Дељење %s није успело зато што се ова ставка већ дели са корисником %s",
     "Sharing %s failed, because the group %s does not exist" : "Дељење %s није успело зато што непостоји група %s",
     "Sharing %s failed, because %s is not a member of the group %s" : "Дељење %s није успело зато што %s није члан групе %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Морате да обезбедите лозинку за креирање јавне везе, дозвољене су само заштићене везе",
diff --git a/lib/l10n/sr.json b/lib/l10n/sr.json
index 8b4bcf3ab04..488a2d8202c 100644
--- a/lib/l10n/sr.json
+++ b/lib/l10n/sr.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Не могу да читам фајл",
     "App directory already exists" : "Директоријум апликација већ постоји",
     "Can't create app folder. Please fix permissions. %s" : "Не могу да креирам фасциклу за апликацију. Исправите дозволе. %s",
+    "Archive does not contain a directory named %s" : "Архива не садржи директоријум назива %s",
     "No source specified when installing app" : "Није наведен извор за инсталирање апликације",
     "No href specified when installing app from http" : "Није наведена адреса за инсталирање апликације преко http",
     "No path specified when installing app from local file" : "Није наведена путања за инсталирање апликације са локалног фајла",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Дељење %s није успело зато што не постоји корисник %s",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Дељење %s није успело зато што корисник %s није члан групе која је %s члан ",
     "Sharing %s failed, because this item is already shared with %s" : "Дељење %s није успело зато што се ова ставка већ дели са %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Дељење %s није успело зато што се ова ставка већ дели са корисником %s",
     "Sharing %s failed, because the group %s does not exist" : "Дељење %s није успело зато што непостоји група %s",
     "Sharing %s failed, because %s is not a member of the group %s" : "Дељење %s није успело зато што %s није члан групе %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Морате да обезбедите лозинку за креирање јавне везе, дозвољене су само заштићене везе",
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index b6345dbb767..3971f00a605 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -30,16 +30,29 @@ OC.L10N.register(
     "Enabled" : "فعال شده",
     "Not enabled" : "غیر فعال",
     "Group already exists." : "گروه در حال حاضر موجود است",
+    "Unable to add group." : "افزودن گروه امکان پذیر نیست.",
+    "Unable to delete group." : "حذف گروه امکان پذیر نیست.",
     "Saved" : "ذخیره شد",
     "test email settings" : "تنظیمات ایمیل آزمایشی",
     "Email sent" : "ایمیل ارسال شد",
+    "Invalid mail address" : "آدرس ایمیل نامعتبر است",
+    "A user with that name already exists." : "کاربری با همین نام در حال حاضر وجود دارد.",
+    "Unable to create user." : "ایجاد کاربر امکان‌پذیر نیست.",
+    "Your %s account was created" : "حساب کاربری شما  %s ایجاد شد",
+    "Unable to delete user." : "حذف کاربر امکان پذیر نیست.",
+    "Forbidden" : "ممنوعه",
     "Invalid user" : "کاربر نامعتبر",
+    "Unable to change mail address" : "تغییر آدرس ایمیل امکان‌پذیر نیست",
     "Email saved" : "ایمیل ذخیره شد",
+    "Add trusted domain" : "افزودن دامنه مورد اعتماد",
+    "Migration in progress. Please wait until the migration is finished" : "مهاجرت در حال اجراست. لطفا تا اتمام مهاجرت صبر کنید",
+    "Migration started …" : "مهاجرت شروع شد...",
     "Sending..." : "در حال ارسال...",
     "Official" : "رسمی",
     "Approved" : "تایید شده",
     "Experimental" : "آزمایشی",
     "All" : "همه",
+    "Update to %s" : "بروزرسانی به  %s",
     "Please wait...." : "لطفا صبر کنید ...",
     "Error while disabling app" : "خطا در هنگام غیر فعال سازی برنامه",
     "Disable" : "غیرفعال",
@@ -51,6 +64,8 @@ OC.L10N.register(
     "Uninstalling ...." : "در حال حذف...",
     "Error while uninstalling app" : "خطا در هنگام حذف برنامه....",
     "Uninstall" : "حذف",
+    "App update" : "به روز رسانی برنامه",
+    "An error occurred: {message}" : "یک خطا رخ‌داده است: {message}",
     "Select a profile picture" : "انتخاب تصویر پروفایل",
     "Very weak password" : "رمز عبور بسیار ضعیف",
     "Weak password" : "رمز عبور ضعیف",
@@ -69,6 +84,7 @@ OC.L10N.register(
     "never" : "هرگز",
     "deleted {userName}" : "کاربر {userName} حذف شد",
     "add group" : "افزودن گروه",
+    "Changing the password will result in data loss, because data recovery is not available for this user" : "با توجه به عدم دستیابی به بازگردانی اطلاعات برای کاربر، تغییر رمز عبور باعث از بین رفتن اطلاعات خواهد شد",
     "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
     "Error creating user" : "خطا در ایجاد کاربر",
     "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
@@ -95,17 +111,24 @@ OC.L10N.register(
     "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
     "Enforce password protection" : "اجبار برای محافظت توسط رمز عبور",
     "Allow public uploads" : "اجازه بارگذاری عمومی",
+    "Allow users to send mail notification for shared files" : "اجازه به کاربران برای ارسال ایمیل نوتیفیکیشن برای فایل‌های به اشتراک‌گذاشته شده",
     "Set default expiration date" : "اعمال تاریخ اتمام پیش فرض",
     "Expire after " : "اتمام اعتبار بعد از",
     "days" : "روز",
     "Enforce expiration date" : "اعمال تاریخ اتمام اشتراک گذاری",
     "Allow resharing" : "مجوز اشتراک گذاری مجدد",
+    "Restrict users to only share with users in their groups" : "محدود کردن کاربران برای اشتراک‌گذاری تنها میان کاربران گروه خود",
     "Exclude groups from sharing" : "مستثنی شدن گروه ها از اشتراک گذاری",
     "Cron was not executed yet!" : "کران هنوز اجرا نشده است!",
     "Execute one task with each page loaded" : "اجرای یک وظیفه با هر بار بارگذاری صفحه",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php در یک سرویس webcron ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
     "Enable server-side encryption" : "فعال‌سازی رمزگذاری سمت-سرور",
+    "Be aware that encryption always increases the file size." : "توجه داشته باشید که همواره رمزگذاری حجم فایل را افزایش خواهد داد.",
+    "This is the final warning: Do you really want to enable encryption?" : "این آخرین اخطار است: آیا می‌خواهید رمزگذاری را فعال کنید ؟",
     "Enable encryption" : "فعال کردن رمزگذاری",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "هیچ ماژول رمزگذاری‌ای بارگذاری نشده است، لطفا ماژول رمز‌گذاری را در منو برنامه فعال کنید.",
+    "Select default encryption module:" : "انتخاب ماژول پیش‌فرض رمزگذاری:",
+    "Start migration" : "شروع مهاجرت",
     "This is used for sending out notifications." : "این برای ارسال هشدار ها استفاده می شود",
     "Send mode" : "حالت ارسال",
     "Encryption" : "رمزگذاری",
@@ -125,6 +148,10 @@ OC.L10N.register(
     "More" : "بیش‌تر",
     "Less" : "کم‌تر",
     "Advanced monitoring" : "مانیتورینگ پیشرفته",
+    "Performance tuning" : "تنظیم کارایی",
+    "Improving the config.php" : "بهبود config.php",
+    "Theming" : "قالب‌بندی",
+    "Hardening and security guidance" : "راهنمای امن‌سازی",
     "Version" : "نسخه",
     "Developer documentation" : "مستندات توسعه‌دهندگان",
     "by" : "با",
@@ -134,11 +161,16 @@ OC.L10N.register(
     "Admin documentation" : "مستندات مدیر",
     "Show description …" : "نمایش توضیحات ...",
     "Hide description …" : "عدم نمایش توضیحات...",
+    "This app cannot be installed because the following dependencies are not fulfilled:" : "امکان نصب این برنامه وجود ندارد، این پیش‌نیازها انجام نشده‌اند:",
     "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص",
     "Uninstall App" : "حذف برنامه",
+    "Enable experimental apps" : "فعال‌سازی برنامه‌های آزمایشی",
+    "No apps found for your version" : "هیچ برنامه‌ای برای نسخه‌ی شما یافت نشد",
     "Cheers!" : "سلامتی!",
+    "Administrator documentation" : "مستندات مدیر",
     "Online documentation" : "مستندات آنلاین",
     "Forum" : "انجمن",
+    "Commercial support" : "پشتیبانی تجاری",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
     "Desktop client" : "نرم افزار دسکتاپ",
     "Android app" : "اپ اندروید",
@@ -151,13 +183,17 @@ OC.L10N.register(
     "New password" : "گذرواژه جدید",
     "Change password" : "تغییر گذر واژه",
     "Full name" : "نام کامل",
+    "No display name set" : "هیچ نام نمایشی تعیین نشده است",
     "Email" : "ایمیل",
     "Your email address" : "پست الکترونیکی شما",
+    "Fill in an email address to enable password recovery and receive notifications" : "فیلد آدرس ایمیل را به منظور فعال‌سازی بازیابی رمزعبور در دریافت نوتیفیکیش‌ها پر کنید",
     "No email address set" : "آدرس‌ایمیلی تنظیم نشده است",
+    "You are member of the following groups:" : "شما عضو این گروه‌ها هستید:",
     "Profile picture" : "تصویر پروفایل",
     "Upload new" : "بارگذاری جدید",
     "Select new from Files" : "انتخاب جدید از میان فایل ها",
     "Remove image" : "تصویر پاک شود",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "فایل pnd یا jpg. در حالت ایده‌آل بصورت مربع و یا شما می‌توانید آنرا برش بزنید. حجم فایل نمی‌تواند از حداکثر سایز 20MB بیشتر باشد.",
     "Cancel" : "منصرف شدن",
     "Choose as profile image" : "یک تصویر پروفایل انتخاب کنید",
     "Language" : "زبان",
@@ -166,6 +202,7 @@ OC.L10N.register(
     "Valid until" : "متعبر تا",
     "Issued By" : "صدور توسط",
     "Valid until %s" : "متعبر تا %s",
+    "Import root certificate" : "وارد کردن گواهی اصلی",
     "Show storage location" : "نمایش محل ذخیره‌سازی",
     "Show last log in" : "نمایش اخرین ورود",
     "Send email to new user" : "ارسال ایمیل به کاربر جدید",
@@ -184,6 +221,7 @@ OC.L10N.register(
     "Unlimited" : "نامحدود",
     "Other" : "دیگر",
     "Full Name" : "نام کامل",
+    "Group Admin for" : "مدیر گروه برای",
     "Quota" : "سهم",
     "Storage Location" : "محل فضای ذخیره سازی",
     "Last Login" : "اخرین ورود",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index b9f5e3aca22..5301d244861 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -28,16 +28,29 @@
     "Enabled" : "فعال شده",
     "Not enabled" : "غیر فعال",
     "Group already exists." : "گروه در حال حاضر موجود است",
+    "Unable to add group." : "افزودن گروه امکان پذیر نیست.",
+    "Unable to delete group." : "حذف گروه امکان پذیر نیست.",
     "Saved" : "ذخیره شد",
     "test email settings" : "تنظیمات ایمیل آزمایشی",
     "Email sent" : "ایمیل ارسال شد",
+    "Invalid mail address" : "آدرس ایمیل نامعتبر است",
+    "A user with that name already exists." : "کاربری با همین نام در حال حاضر وجود دارد.",
+    "Unable to create user." : "ایجاد کاربر امکان‌پذیر نیست.",
+    "Your %s account was created" : "حساب کاربری شما  %s ایجاد شد",
+    "Unable to delete user." : "حذف کاربر امکان پذیر نیست.",
+    "Forbidden" : "ممنوعه",
     "Invalid user" : "کاربر نامعتبر",
+    "Unable to change mail address" : "تغییر آدرس ایمیل امکان‌پذیر نیست",
     "Email saved" : "ایمیل ذخیره شد",
+    "Add trusted domain" : "افزودن دامنه مورد اعتماد",
+    "Migration in progress. Please wait until the migration is finished" : "مهاجرت در حال اجراست. لطفا تا اتمام مهاجرت صبر کنید",
+    "Migration started …" : "مهاجرت شروع شد...",
     "Sending..." : "در حال ارسال...",
     "Official" : "رسمی",
     "Approved" : "تایید شده",
     "Experimental" : "آزمایشی",
     "All" : "همه",
+    "Update to %s" : "بروزرسانی به  %s",
     "Please wait...." : "لطفا صبر کنید ...",
     "Error while disabling app" : "خطا در هنگام غیر فعال سازی برنامه",
     "Disable" : "غیرفعال",
@@ -49,6 +62,8 @@
     "Uninstalling ...." : "در حال حذف...",
     "Error while uninstalling app" : "خطا در هنگام حذف برنامه....",
     "Uninstall" : "حذف",
+    "App update" : "به روز رسانی برنامه",
+    "An error occurred: {message}" : "یک خطا رخ‌داده است: {message}",
     "Select a profile picture" : "انتخاب تصویر پروفایل",
     "Very weak password" : "رمز عبور بسیار ضعیف",
     "Weak password" : "رمز عبور ضعیف",
@@ -67,6 +82,7 @@
     "never" : "هرگز",
     "deleted {userName}" : "کاربر {userName} حذف شد",
     "add group" : "افزودن گروه",
+    "Changing the password will result in data loss, because data recovery is not available for this user" : "با توجه به عدم دستیابی به بازگردانی اطلاعات برای کاربر، تغییر رمز عبور باعث از بین رفتن اطلاعات خواهد شد",
     "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
     "Error creating user" : "خطا در ایجاد کاربر",
     "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
@@ -93,17 +109,24 @@
     "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
     "Enforce password protection" : "اجبار برای محافظت توسط رمز عبور",
     "Allow public uploads" : "اجازه بارگذاری عمومی",
+    "Allow users to send mail notification for shared files" : "اجازه به کاربران برای ارسال ایمیل نوتیفیکیشن برای فایل‌های به اشتراک‌گذاشته شده",
     "Set default expiration date" : "اعمال تاریخ اتمام پیش فرض",
     "Expire after " : "اتمام اعتبار بعد از",
     "days" : "روز",
     "Enforce expiration date" : "اعمال تاریخ اتمام اشتراک گذاری",
     "Allow resharing" : "مجوز اشتراک گذاری مجدد",
+    "Restrict users to only share with users in their groups" : "محدود کردن کاربران برای اشتراک‌گذاری تنها میان کاربران گروه خود",
     "Exclude groups from sharing" : "مستثنی شدن گروه ها از اشتراک گذاری",
     "Cron was not executed yet!" : "کران هنوز اجرا نشده است!",
     "Execute one task with each page loaded" : "اجرای یک وظیفه با هر بار بارگذاری صفحه",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php در یک سرویس webcron ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
     "Enable server-side encryption" : "فعال‌سازی رمزگذاری سمت-سرور",
+    "Be aware that encryption always increases the file size." : "توجه داشته باشید که همواره رمزگذاری حجم فایل را افزایش خواهد داد.",
+    "This is the final warning: Do you really want to enable encryption?" : "این آخرین اخطار است: آیا می‌خواهید رمزگذاری را فعال کنید ؟",
     "Enable encryption" : "فعال کردن رمزگذاری",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "هیچ ماژول رمزگذاری‌ای بارگذاری نشده است، لطفا ماژول رمز‌گذاری را در منو برنامه فعال کنید.",
+    "Select default encryption module:" : "انتخاب ماژول پیش‌فرض رمزگذاری:",
+    "Start migration" : "شروع مهاجرت",
     "This is used for sending out notifications." : "این برای ارسال هشدار ها استفاده می شود",
     "Send mode" : "حالت ارسال",
     "Encryption" : "رمزگذاری",
@@ -123,6 +146,10 @@
     "More" : "بیش‌تر",
     "Less" : "کم‌تر",
     "Advanced monitoring" : "مانیتورینگ پیشرفته",
+    "Performance tuning" : "تنظیم کارایی",
+    "Improving the config.php" : "بهبود config.php",
+    "Theming" : "قالب‌بندی",
+    "Hardening and security guidance" : "راهنمای امن‌سازی",
     "Version" : "نسخه",
     "Developer documentation" : "مستندات توسعه‌دهندگان",
     "by" : "با",
@@ -132,11 +159,16 @@
     "Admin documentation" : "مستندات مدیر",
     "Show description …" : "نمایش توضیحات ...",
     "Hide description …" : "عدم نمایش توضیحات...",
+    "This app cannot be installed because the following dependencies are not fulfilled:" : "امکان نصب این برنامه وجود ندارد، این پیش‌نیازها انجام نشده‌اند:",
     "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص",
     "Uninstall App" : "حذف برنامه",
+    "Enable experimental apps" : "فعال‌سازی برنامه‌های آزمایشی",
+    "No apps found for your version" : "هیچ برنامه‌ای برای نسخه‌ی شما یافت نشد",
     "Cheers!" : "سلامتی!",
+    "Administrator documentation" : "مستندات مدیر",
     "Online documentation" : "مستندات آنلاین",
     "Forum" : "انجمن",
+    "Commercial support" : "پشتیبانی تجاری",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
     "Desktop client" : "نرم افزار دسکتاپ",
     "Android app" : "اپ اندروید",
@@ -149,13 +181,17 @@
     "New password" : "گذرواژه جدید",
     "Change password" : "تغییر گذر واژه",
     "Full name" : "نام کامل",
+    "No display name set" : "هیچ نام نمایشی تعیین نشده است",
     "Email" : "ایمیل",
     "Your email address" : "پست الکترونیکی شما",
+    "Fill in an email address to enable password recovery and receive notifications" : "فیلد آدرس ایمیل را به منظور فعال‌سازی بازیابی رمزعبور در دریافت نوتیفیکیش‌ها پر کنید",
     "No email address set" : "آدرس‌ایمیلی تنظیم نشده است",
+    "You are member of the following groups:" : "شما عضو این گروه‌ها هستید:",
     "Profile picture" : "تصویر پروفایل",
     "Upload new" : "بارگذاری جدید",
     "Select new from Files" : "انتخاب جدید از میان فایل ها",
     "Remove image" : "تصویر پاک شود",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "فایل pnd یا jpg. در حالت ایده‌آل بصورت مربع و یا شما می‌توانید آنرا برش بزنید. حجم فایل نمی‌تواند از حداکثر سایز 20MB بیشتر باشد.",
     "Cancel" : "منصرف شدن",
     "Choose as profile image" : "یک تصویر پروفایل انتخاب کنید",
     "Language" : "زبان",
@@ -164,6 +200,7 @@
     "Valid until" : "متعبر تا",
     "Issued By" : "صدور توسط",
     "Valid until %s" : "متعبر تا %s",
+    "Import root certificate" : "وارد کردن گواهی اصلی",
     "Show storage location" : "نمایش محل ذخیره‌سازی",
     "Show last log in" : "نمایش اخرین ورود",
     "Send email to new user" : "ارسال ایمیل به کاربر جدید",
@@ -182,6 +219,7 @@
     "Unlimited" : "نامحدود",
     "Other" : "دیگر",
     "Full Name" : "نام کامل",
+    "Group Admin for" : "مدیر گروه برای",
     "Quota" : "سهم",
     "Storage Location" : "محل فضای ذخیره سازی",
     "Last Login" : "اخرین ورود",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 533736d7823..2910dc1ce09 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -77,6 +77,8 @@ OC.L10N.register(
     "Uninstalling ...." : "Mencopot ...",
     "Error while uninstalling app" : "Terjadi kesalahan saat mencopot aplikasi",
     "Uninstall" : "Copot",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikasi sudah diaktifkan tetapi perlu diperbarui. Anda akan dialihkan ke halaman pembaruan dalam 5 detik.",
+    "App update" : "Pembaruan Aplikasi",
     "An error occurred: {message}" : "Sebuah kesalahan yang muncul: {message}",
     "Select a profile picture" : "Pilih foto profil",
     "Very weak password" : "Sandi sangat lemah",
@@ -149,6 +151,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Izinkan pengguna mengirim pemberitahuan email saat berbagi berkas kepada pengguna lainnya",
     "Exclude groups from sharing" : "Tidak termasuk grup untuk berbagi",
     "These groups will still be able to receive shares, but not to initiate them." : "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Izinkan penyelesai otomatis pada nama pengguna di jendela dialog berbagi. Jika ini dinonaktifkan, nama pengguna utuh perlu dimasukkan.",
     "Last cron job execution: %s." : "Eksekusi penjadwalan cron terakhir: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Eksekusi penjadwalan cron terakhir: %s. Kelihatannya ada yang salah.",
     "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
@@ -157,6 +160,10 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
     "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
     "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Setelah enkripsi diaktifkan, semua berkas yang diunggah pada server mulai saat ini akan dienkripsi saat singgah pada server. Penonaktifan enkripsi hanya mungkin berhasil jika modul enkripsi yang aktif mendukung fungsi ini dan semua prasyarat (misalnya pengaturan kunci pemulihan) sudah terpenuhi.",
+    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Enkripsi saja tidak menjamin keamanan sistem. Silakan lihat dokumentasi ownCloud untuk informasi lebih lanjut tentang bagaimana aplikasi enkripsi bekerja, dan kasus penggunaan yang didukung.",
+    "Be aware that encryption always increases the file size." : "Ingat bahwa enkripsi selalu menambah ukuran berkas.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Alangkah baiknya untuk membuat cadangan data secara rutin, dalam kasus enkripsi, pastikan untuk mencadangkan kunci enkripsi bersama dengan data Anda.",
     "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
     "Enable encryption" : "Aktifkan enkripsi",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index b20943edc5d..4408965251b 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -75,6 +75,8 @@
     "Uninstalling ...." : "Mencopot ...",
     "Error while uninstalling app" : "Terjadi kesalahan saat mencopot aplikasi",
     "Uninstall" : "Copot",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Aplikasi sudah diaktifkan tetapi perlu diperbarui. Anda akan dialihkan ke halaman pembaruan dalam 5 detik.",
+    "App update" : "Pembaruan Aplikasi",
     "An error occurred: {message}" : "Sebuah kesalahan yang muncul: {message}",
     "Select a profile picture" : "Pilih foto profil",
     "Very weak password" : "Sandi sangat lemah",
@@ -147,6 +149,7 @@
     "Allow users to send mail notification for shared files to other users" : "Izinkan pengguna mengirim pemberitahuan email saat berbagi berkas kepada pengguna lainnya",
     "Exclude groups from sharing" : "Tidak termasuk grup untuk berbagi",
     "These groups will still be able to receive shares, but not to initiate them." : "Grup ini akan tetap dapat menerima berbagi, tatapi tidak dapat membagikan.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Izinkan penyelesai otomatis pada nama pengguna di jendela dialog berbagi. Jika ini dinonaktifkan, nama pengguna utuh perlu dimasukkan.",
     "Last cron job execution: %s." : "Eksekusi penjadwalan cron terakhir: %s.",
     "Last cron job execution: %s. Something seems wrong." : "Eksekusi penjadwalan cron terakhir: %s. Kelihatannya ada yang salah.",
     "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
@@ -155,6 +158,10 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
     "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
     "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Setelah enkripsi diaktifkan, semua berkas yang diunggah pada server mulai saat ini akan dienkripsi saat singgah pada server. Penonaktifan enkripsi hanya mungkin berhasil jika modul enkripsi yang aktif mendukung fungsi ini dan semua prasyarat (misalnya pengaturan kunci pemulihan) sudah terpenuhi.",
+    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Enkripsi saja tidak menjamin keamanan sistem. Silakan lihat dokumentasi ownCloud untuk informasi lebih lanjut tentang bagaimana aplikasi enkripsi bekerja, dan kasus penggunaan yang didukung.",
+    "Be aware that encryption always increases the file size." : "Ingat bahwa enkripsi selalu menambah ukuran berkas.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Alangkah baiknya untuk membuat cadangan data secara rutin, dalam kasus enkripsi, pastikan untuk mencadangkan kunci enkripsi bersama dengan data Anda.",
     "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
     "Enable encryption" : "Aktifkan enkripsi",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 45e0690da6f..3fd8ac02b07 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -160,6 +160,10 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
     "Enable server-side encryption" : "Abilita cifratura lato server",
     "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Quando la cifratura è abilitata, tutti i file caricati sul server da quel momento in poi saranno cifrati sul server. Sarà possibile solo disabilitare successivamente la cifratura se il modulo di cifratura attivo lo consente, e se tutti i prerequisiti (ad es. l'impostazione di una chiave di recupero) sono verificati.",
+    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "La sola cifratura non garantisce la sicurezza del sistema. Vedi la documentazione di ownCloud per ulteriori informazioni su come funziona l'applicazione di cifratura, e per i casi d'uso supportati.",
+    "Be aware that encryption always increases the file size." : "Considera che la cifratura incrementa sempre la dimensione dei file.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Ti consigliamo di creare copie di sicurezza dei tuoi dati con regolarità, in caso di utilizzo della cifratura, assicurati di creare una copia delle chiavi di cifratura insieme ai tuoi dati.",
     "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
     "Enable encryption" : "Abilita cifratura",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.",
@@ -236,7 +240,7 @@ OC.L10N.register(
     "No display name set" : "Nome visualizzato non impostato",
     "Email" : "Posta elettronica",
     "Your email address" : "Il tuo indirizzo email",
-    "Fill in an email address to enable password recovery and receive notifications" : "Inserisci il tuo indirizzo di posta per abilitare il recupero della password e ricevere notifiche",
+    "Fill in an email address to enable password recovery and receive notifications" : "Inserisci il tuo indirizzo di posta per abilitare il ripristino della password e ricevere notifiche",
     "No email address set" : "Nessun indirizzo email impostato",
     "You are member of the following groups:" : "Sei membro dei seguenti gruppi:",
     "Profile picture" : "Immagine del profilo",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 4ab8fef7db4..20c713419aa 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -158,6 +158,10 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
     "Enable server-side encryption" : "Abilita cifratura lato server",
     "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Quando la cifratura è abilitata, tutti i file caricati sul server da quel momento in poi saranno cifrati sul server. Sarà possibile solo disabilitare successivamente la cifratura se il modulo di cifratura attivo lo consente, e se tutti i prerequisiti (ad es. l'impostazione di una chiave di recupero) sono verificati.",
+    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "La sola cifratura non garantisce la sicurezza del sistema. Vedi la documentazione di ownCloud per ulteriori informazioni su come funziona l'applicazione di cifratura, e per i casi d'uso supportati.",
+    "Be aware that encryption always increases the file size." : "Considera che la cifratura incrementa sempre la dimensione dei file.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "Ti consigliamo di creare copie di sicurezza dei tuoi dati con regolarità, in caso di utilizzo della cifratura, assicurati di creare una copia delle chiavi di cifratura insieme ai tuoi dati.",
     "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
     "Enable encryption" : "Abilita cifratura",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.",
@@ -234,7 +238,7 @@
     "No display name set" : "Nome visualizzato non impostato",
     "Email" : "Posta elettronica",
     "Your email address" : "Il tuo indirizzo email",
-    "Fill in an email address to enable password recovery and receive notifications" : "Inserisci il tuo indirizzo di posta per abilitare il recupero della password e ricevere notifiche",
+    "Fill in an email address to enable password recovery and receive notifications" : "Inserisci il tuo indirizzo di posta per abilitare il ripristino della password e ricevere notifiche",
     "No email address set" : "Nessun indirizzo email impostato",
     "You are member of the following groups:" : "Sei membro dei seguenti gruppi:",
     "Profile picture" : "Immagine del profilo",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 97294ea0fa0..9805f5fc61e 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -160,6 +160,10 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez que a criptografia é ativada, todos os arquivos carregados para o servidor a partir desse ponto em diante serão criptografados e estarão disponíveis no servidor. Só será possível desativar a criptografia em uma data posterior, se o módulo de criptografia ativo suporta essa função, e todas as pré-condições sejam cumpridas(por exemplo, definindo uma chave de recuperação).",
+    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Criptografia por si só não garante a segurança do sistema. Por favor, consulte a documentação ownCloud para obter mais informações sobre como o aplicativo de criptografia funciona, e os casos de uso suportados.",
+    "Be aware that encryption always increases the file size." : "Esteja ciente de que a criptografia sempre aumenta o tamanho do arquivo.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar backups regulares dos seus dados, em caso de criptografia certifique-se de fazer backup das chaves de criptografia, juntamente com os seus dados.",
     "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
     "Enable encryption" : "Ativar criptografia",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index f97eb1302b4..d5328281a24 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -158,6 +158,10 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
     "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
+    "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "Uma vez que a criptografia é ativada, todos os arquivos carregados para o servidor a partir desse ponto em diante serão criptografados e estarão disponíveis no servidor. Só será possível desativar a criptografia em uma data posterior, se o módulo de criptografia ativo suporta essa função, e todas as pré-condições sejam cumpridas(por exemplo, definindo uma chave de recuperação).",
+    "Encryption alone does not guarantee security of the system. Please see ownCloud documentation for more information about how the encryption app works, and the supported use cases." : "Criptografia por si só não garante a segurança do sistema. Por favor, consulte a documentação ownCloud para obter mais informações sobre como o aplicativo de criptografia funciona, e os casos de uso suportados.",
+    "Be aware that encryption always increases the file size." : "Esteja ciente de que a criptografia sempre aumenta o tamanho do arquivo.",
+    "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "É sempre bom criar backups regulares dos seus dados, em caso de criptografia certifique-se de fazer backup das chaves de criptografia, juntamente com os seus dados.",
     "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
     "Enable encryption" : "Ativar criptografia",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
-- 
GitLab


From e16ac12f5a9b4537c97b3fdecbdbee68e706b587 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 12 Oct 2015 01:54:59 -0400
Subject: [PATCH 774/783] [tx-robot] updated from transifex

---
 apps/files/l10n/fr.js            | 2 +-
 apps/files/l10n/fr.json          | 2 +-
 apps/files_external/l10n/fr.js   | 2 +-
 apps/files_external/l10n/fr.json | 2 +-
 apps/files_sharing/l10n/fr.js    | 4 ++--
 apps/files_sharing/l10n/fr.json  | 4 ++--
 core/l10n/fr.js                  | 6 +++---
 core/l10n/fr.json                | 6 +++---
 core/l10n/lt_LT.js               | 7 +++++++
 core/l10n/lt_LT.json             | 7 +++++++
 settings/l10n/fr.js              | 8 ++++----
 settings/l10n/fr.json            | 8 ++++----
 12 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 650401d6fa3..0b290eb160a 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -78,7 +78,7 @@ OC.L10N.register(
     "{newname} already exists" : "{newname} existe déjà",
     "Upload" : "Chargement",
     "Text file" : "Fichier texte",
-    "New text file.txt" : "Nouveau fichier texte \"file.txt\"",
+    "New text file.txt" : "Nouveau fichier texte.txt",
     "Folder" : "Dossier",
     "New folder" : "Nouveau dossier",
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 5f28b9d12e7..5f51bdee302 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -76,7 +76,7 @@
     "{newname} already exists" : "{newname} existe déjà",
     "Upload" : "Chargement",
     "Text file" : "Fichier texte",
-    "New text file.txt" : "Nouveau fichier texte \"file.txt\"",
+    "New text file.txt" : "Nouveau fichier texte.txt",
     "Folder" : "Dossier",
     "New folder" : "Nouveau dossier",
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 4225914efcc..4c249dde970 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -35,7 +35,7 @@ OC.L10N.register(
     "Saved" : "Sauvegardé",
     "Access key" : "Clé d'accès",
     "Secret key" : "Clé secrète",
-    "Builtin" : "inclus",
+    "Builtin" : "Inclus",
     "None" : "Aucun",
     "OAuth1" : "OAuth1",
     "App key" : "App key",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index f6fe940e1aa..19796488b74 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -33,7 +33,7 @@
     "Saved" : "Sauvegardé",
     "Access key" : "Clé d'accès",
     "Secret key" : "Clé secrète",
-    "Builtin" : "inclus",
+    "Builtin" : "Inclus",
     "None" : "Aucun",
     "OAuth1" : "OAuth1",
     "App key" : "App key",
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index dc248783c5a..fc8c95c39e6 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -38,14 +38,14 @@ OC.L10N.register(
     "Public shared file %1$s was downloaded" : "Le fichier public %1$s a été téléchargé",
     "You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s",
     "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
-    "%2$s shared %1$s with %3$s" : "%2$s partagé %1$s avec %3$s",
+    "%2$s shared %1$s with %3$s" : "%2$s a partagé %1$s avec %3$s",
     "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Downloaded via public link" : "Téléchargé par lien public",
     "Shared via public link" : "Partagé par lien public",
     "Shares" : "Partages",
-    "You received %2$s as a remote share from %1$s" : "Vous avez reçu %2$s en tant que partage distant par %1$s",
+    "You received %2$s as a remote share from %1$s" : "Vous avez obtenu l'accès au partage distant %2$s de %1$s",
     "Accept" : "Accepter",
     "Decline" : "Refuser",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 1562e19304a..7b1c7c2f1ce 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -36,14 +36,14 @@
     "Public shared file %1$s was downloaded" : "Le fichier public %1$s a été téléchargé",
     "You shared %1$s with %2$s" : "Vous avez partagé %1$s avec %2$s",
     "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
-    "%2$s shared %1$s with %3$s" : "%2$s partagé %1$s avec %3$s",
+    "%2$s shared %1$s with %3$s" : "%2$s a partagé %1$s avec %3$s",
     "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Downloaded via public link" : "Téléchargé par lien public",
     "Shared via public link" : "Partagé par lien public",
     "Shares" : "Partages",
-    "You received %2$s as a remote share from %1$s" : "Vous avez reçu %2$s en tant que partage distant par %1$s",
+    "You received %2$s as a remote share from %1$s" : "Vous avez obtenu l'accès au partage distant %2$s de %1$s",
     "Accept" : "Accepter",
     "Decline" : "Refuser",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 3f836fae2f1..678429e9c75 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -13,8 +13,8 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s",
     "Repair warning: " : "Avertissement de réparation :",
     "Repair error: " : "Erreur de réparation :",
-    "Set log level to debug - current level: \"%s\"" : "Régler le niveau de journal pour le débogage - niveau actuel: \"%s\"",
-    "Reset log level to  \"%s\"" : "Réinitialiser le niveau des journaux pour \"%s\"",
+    "Set log level to debug - current level: \"%s\"" : "Réglage du niveau de log à \"debug\" - niveau actuel: \"%s\"",
+    "Reset log level to  \"%s\"" : "Réglage du niveau de log à \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Les applications incompatibles suivantes ont été désactivées : %s",
     "Following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
     "Already up to date" : "Déjà à jour",
@@ -74,7 +74,7 @@ OC.L10N.register(
     "Dec." : "Déc.",
     "Settings" : "Paramètres",
     "Saving..." : "Enregistrement…",
-    "seconds ago" : "il y a quelques secondes",
+    "seconds ago" : "à l'instant",
     "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Un lien permettant de réinitialiser votre mot de passe vient de vous être envoyé par courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index a55e0e10b9d..105a6b25697 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -11,8 +11,8 @@
     "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s",
     "Repair warning: " : "Avertissement de réparation :",
     "Repair error: " : "Erreur de réparation :",
-    "Set log level to debug - current level: \"%s\"" : "Régler le niveau de journal pour le débogage - niveau actuel: \"%s\"",
-    "Reset log level to  \"%s\"" : "Réinitialiser le niveau des journaux pour \"%s\"",
+    "Set log level to debug - current level: \"%s\"" : "Réglage du niveau de log à \"debug\" - niveau actuel: \"%s\"",
+    "Reset log level to  \"%s\"" : "Réglage du niveau de log à \"%s\"",
     "Following incompatible apps have been disabled: %s" : "Les applications incompatibles suivantes ont été désactivées : %s",
     "Following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
     "Already up to date" : "Déjà à jour",
@@ -72,7 +72,7 @@
     "Dec." : "Déc.",
     "Settings" : "Paramètres",
     "Saving..." : "Enregistrement…",
-    "seconds ago" : "il y a quelques secondes",
+    "seconds ago" : "à l'instant",
     "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Un lien permettant de réinitialiser votre mot de passe vient de vous être envoyé par courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index a5f9d19ac1e..622dbb5ab3d 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -104,6 +104,7 @@ OC.L10N.register(
     "Error while unsharing" : "Klaida, kai atšaukiamas dalijimasis",
     "Error while changing permissions" : "Klaida, keičiant privilegijas",
     "Error setting expiration date" : "Klaida nustatant galiojimo laiką",
+    "The public link will expire no later than {days} days after it is created" : "Vieša nuoroda galios ne mažiau kaip {days} dienas nuo sukūrimo",
     "Set expiration date" : "Nustatykite galiojimo laiką",
     "Expiration" : "Galiojimo laikas",
     "Expiration date" : "Galiojimo laikas",
@@ -114,6 +115,8 @@ OC.L10N.register(
     "Link" : "Nuoroda",
     "Password protect" : "Apsaugotas slaptažodžiu",
     "Password" : "Slaptažodis",
+    "Choose a password for the public link" : "Viešos nuorodos slaptažodis",
+    "Allow editing" : "Leisti redaguoti",
     "Email link to person" : "Nusiųsti nuorodą paštu",
     "Send" : "Siųsti",
     "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
@@ -129,7 +132,11 @@ OC.L10N.register(
     "change" : "keisti",
     "delete" : "ištrinti",
     "access control" : "priėjimo kontrolė",
+    "An error occured. Please try again" : "Klaida, prašau bandyti dar kartą.",
     "Share" : "Dalintis",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Dalintis su vartotoju kitame ownCloud debesyje, sintaksė vartotojas@example.com/owncloud",
+    "Share with users or groups …" : "Dalintis su vartotoju ar grupe",
+    "Share with users, groups or remote users …" : "Dalintis su vartotoju, grupe, ar nutolusiu vartotoju...",
     "Warning" : "Įspėjimas",
     "The object type is not specified." : "Objekto tipas nenurodytas.",
     "Enter new" : "Įveskite naują",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index defe7eece9b..998cd62a5b2 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -102,6 +102,7 @@
     "Error while unsharing" : "Klaida, kai atšaukiamas dalijimasis",
     "Error while changing permissions" : "Klaida, keičiant privilegijas",
     "Error setting expiration date" : "Klaida nustatant galiojimo laiką",
+    "The public link will expire no later than {days} days after it is created" : "Vieša nuoroda galios ne mažiau kaip {days} dienas nuo sukūrimo",
     "Set expiration date" : "Nustatykite galiojimo laiką",
     "Expiration" : "Galiojimo laikas",
     "Expiration date" : "Galiojimo laikas",
@@ -112,6 +113,8 @@
     "Link" : "Nuoroda",
     "Password protect" : "Apsaugotas slaptažodžiu",
     "Password" : "Slaptažodis",
+    "Choose a password for the public link" : "Viešos nuorodos slaptažodis",
+    "Allow editing" : "Leisti redaguoti",
     "Email link to person" : "Nusiųsti nuorodą paštu",
     "Send" : "Siųsti",
     "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
@@ -127,7 +130,11 @@
     "change" : "keisti",
     "delete" : "ištrinti",
     "access control" : "priėjimo kontrolė",
+    "An error occured. Please try again" : "Klaida, prašau bandyti dar kartą.",
     "Share" : "Dalintis",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Dalintis su vartotoju kitame ownCloud debesyje, sintaksė vartotojas@example.com/owncloud",
+    "Share with users or groups …" : "Dalintis su vartotoju ar grupe",
+    "Share with users, groups or remote users …" : "Dalintis su vartotoju, grupe, ar nutolusiu vartotoju...",
     "Warning" : "Įspėjimas",
     "The object type is not specified." : "Objekto tipas nenurodytas.",
     "Enter new" : "Įveskite naują",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index b85165d6bc7..2ff5d34d68d 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -119,20 +119,20 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php ne semble pas être configuré de manière à récupérer les valeurs des variables d’environnement. Le test de la commande getenv(\"PATH\") retourne seulement une réponse vide. ",
-    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez vérifier <a target=\"_blank\" href=\"%s\">la documentation d'installation ↗</a> concernant les instructions de configuration de php ainsi que la configuration de votre serveur, en particulier dans le cas où vous utilisez php-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez consulter <a target=\"_blank\" href=\"%s\">la documentation d'installation ↗</a> pour savoir comment configurer php sur votre serveur, en particulier en cas d'utilisation de php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.",
-    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé, cela peut conduire à des conflits en cas d'accès concurrents. Activez 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé. Cela peut causer des conflits en cas d'accès concurrent. Configurez 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
     "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux n'ont pu être configurés avec prise en charge d'UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nous vous recommandons d'installer sur votre système les paquets nécessaires à la prise en charge de l'un des paramètres régionaux suivants : %s",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
-    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers utilise la base de données comme moteur de verrouillage, pour de meilleures performances il est recommandé de configurer le memcache pour le verrouillage. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers utilise la base de données. Pour de meilleures performances il est recommandé d'utiliser plutôt memcache. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>,  et cherchez des erreurs ou avertissements dans  <a href=\"#log-section\">les logs</a>.",
     "All checks passed." : "Tous les tests ont réussi.",
     "Open documentation" : "Voir la documentation",
@@ -150,7 +150,7 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "Autoriser les utilisateurs à envoyer des notifications de partage par e-mail",
     "Exclude groups from sharing" : "Empêcher certains groupes de partager",
     "These groups will still be able to receive shares, but not to initiate them." : "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
-    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Autoriser la complétion du nom d'utilisateur dans la fenêtre de partage. Sinon le nom complet d'utilisateur doit être indiqué.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Activer l'autocomplétion des noms d'utilisateurs dans la fenêtre de partage. Si cette option est désactivée,  les noms complets doivent être indiqués.",
     "Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
     "Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
     "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index e3205497944..9b2589f9b44 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -117,20 +117,20 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php ne semble pas être configuré de manière à récupérer les valeurs des variables d’environnement. Le test de la commande getenv(\"PATH\") retourne seulement une réponse vide. ",
-    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez vérifier <a target=\"_blank\" href=\"%s\">la documentation d'installation ↗</a> concernant les instructions de configuration de php ainsi que la configuration de votre serveur, en particulier dans le cas où vous utilisez php-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez consulter <a target=\"_blank\" href=\"%s\">la documentation d'installation ↗</a> pour savoir comment configurer php sur votre serveur, en particulier en cas d'utilisation de php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Votre serveur fonctionne actuellement sur une plateforme Microsoft Windows. Nous vous recommandons fortement d'utiliser une plateforme Linux pour une expérience utilisateur optimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Une version de %1$s plus ancienne que %2$s est installée. Pour améliorer la stabilité et les performances, nous recommandons de mettre %1$s à jour.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats de détection mime-type.",
-    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé, cela peut conduire à des conflits en cas d'accès concurrents. Activez 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers est désactivé. Cela peut causer des conflits en cas d'accès concurrent. Configurez 'filelocking.enabled' dans config.php pour éviter ces problèmes. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
     "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux n'ont pu être configurés avec prise en charge d'UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nous vous recommandons d'installer sur votre système les paquets nécessaires à la prise en charge de l'un des paramètres régionaux suivants : %s",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
-    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers utilise la base de données comme moteur de verrouillage, pour de meilleures performances il est recommandé de configurer le memcache pour le verrouillage. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Le verrouillage transactionnel de fichiers utilise la base de données. Pour de meilleures performances il est recommandé d'utiliser plutôt memcache. Consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a> pour plus d'informations.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>,  et cherchez des erreurs ou avertissements dans  <a href=\"#log-section\">les logs</a>.",
     "All checks passed." : "Tous les tests ont réussi.",
     "Open documentation" : "Voir la documentation",
@@ -148,7 +148,7 @@
     "Allow users to send mail notification for shared files to other users" : "Autoriser les utilisateurs à envoyer des notifications de partage par e-mail",
     "Exclude groups from sharing" : "Empêcher certains groupes de partager",
     "These groups will still be able to receive shares, but not to initiate them." : "Ces groupes ne pourront plus initier de partage, mais ils pourront toujours rejoindre les partages faits par d'autres. ",
-    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Autoriser la complétion du nom d'utilisateur dans la fenêtre de partage. Sinon le nom complet d'utilisateur doit être indiqué.",
+    "Allow username autocompletion in share dialog. If this is disabled the full username needs to be entered." : "Activer l'autocomplétion des noms d'utilisateurs dans la fenêtre de partage. Si cette option est désactivée,  les noms complets doivent être indiqués.",
     "Last cron job execution: %s." : "Dernière tâche cron exécutée : %s.",
     "Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
     "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
-- 
GitLab


From aedb7a7e702037acb02dc82d94fe651aaa969539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 12 Oct 2015 11:30:15 +0200
Subject: [PATCH 775/783] Revert "Debounce cancel upload message"

---
 apps/files/js/file-upload.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 77b85ecd7da..8bae8567a05 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -75,9 +75,6 @@ OC.Upload = {
 			this._uploads.push(jqXHR);
 		}
 	},
-	showUploadCancelMessage: _.debounce(function() {
-		OC.Notification.showTemporary(t('files', 'Upload cancelled.'), {timeout: 10});
-	}, 500),
 	/**
 	 * Checks the currently known uploads.
 	 * returns true if any hxr has the state 'pending'
@@ -418,10 +415,10 @@ OC.Upload = {
 					OC.Upload.log('fail', e, data);
 					if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
 						if (data.textStatus === 'abort') {
-							OC.Upload.showUploadCancelMessage();
+							OC.Notification.show(t('files', 'Upload cancelled.'));
 						} else {
 							// HTTP connection problem
-							OC.Notification.showTemporary(data.errorThrown, {timeout: 10});
+							OC.Notification.show(data.errorThrown);
 							if (data.result) {
 								var result = JSON.parse(data.result);
 								if (result && result[0] && result[0].data && result[0].data.code === 'targetnotfound') {
@@ -430,6 +427,10 @@ OC.Upload = {
 								}
 							}
 						}
+						//hide notification after 10 sec
+						setTimeout(function() {
+							OC.Notification.hide();
+						}, 10000);
 					}
 					OC.Upload.deleteUpload(data);
 				},
-- 
GitLab


From 783971422cfd868a3f37377b9e99844a36aa0004 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 12 Oct 2015 11:39:04 +0200
Subject: [PATCH 776/783] Move trashbin specific CSS that modifies sidebar

Only when trashbin is enabled, its sidebar nav element must be fixed at
the bottom.
---
 apps/files/css/files.css          | 13 -------------
 apps/files_trashbin/css/trash.css | 18 ++++++++++++++++++
 core/css/apps.css                 |  1 -
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index d0a2cce1a86..bdb02c20546 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -85,19 +85,6 @@
 	background-image: url('../img/delete.svg');
 }
 
-/* move Deleted Files to bottom of sidebar */
-.nav-trashbin {
-	position: fixed !important;
-	bottom: 44px;
-	width: inherit !important;
-	background-color: #fff;
-	border-right: 1px solid #eee;
-}
-/* double padding to account for Deleted files entry, issue with Firefox */
-.app-files #app-navigation > ul li:nth-last-child(2) {
-	margin-bottom: 44px;
-}
-
 #app-navigation .nav-files a.nav-icon-files {
 	width: auto;
 }
diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css
index 15a9249d7b2..053e2e7002c 100644
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -18,3 +18,21 @@
 #app-content-trashbin #filestable .summary .filesize {
 	display: none;
 }
+
+#app-navigation > ul {
+	padding-bottom: 44px;
+}
+
+/* move Deleted Files to bottom of sidebar */
+.nav-trashbin {
+	position: fixed !important;
+	bottom: 44px;
+	width: inherit !important;
+	background-color: #fff;
+	border-right: 1px solid #eee;
+}
+/* double padding to account for Deleted files entry, issue with Firefox */
+.app-files #app-navigation > ul li:nth-last-child(2) {
+	margin-bottom: 44px;
+}
+
diff --git a/core/css/apps.css b/core/css/apps.css
index 3122a2b48a1..4d3d3e39a37 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -35,7 +35,6 @@
 	height: 100%;
 	width: inherit;
 	overflow: auto;
-	padding-bottom: 44px;
 	-moz-box-sizing: border-box; box-sizing: border-box;
 }
 #app-navigation li {
-- 
GitLab


From 8185eaa6dd1ca6c86bff73002e5a1a71bbd17529 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 12 Oct 2015 13:59:16 +0200
Subject: [PATCH 777/783] also detect files in a .part folder as part file

---
 lib/private/files/cache/scanner.php |  4 ++++
 tests/lib/files/cache/scanner.php   | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index dbffba1e306..b0890dcdc00 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -408,6 +408,10 @@ class Scanner extends BasicEmitter {
 		if (pathinfo($file, PATHINFO_EXTENSION) === 'part') {
 			return true;
 		}
+		if (strpos($file, '.part/') !== false) {
+			return true;
+		}
+
 		return false;
 	}
 
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index b44cf0a49df..871b12bac3a 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -284,4 +284,27 @@ class Scanner extends \Test\TestCase {
 		$cachedData = $this->cache->get('folder/bar.txt');
 		$this->assertEquals($newFolderId, $cachedData['parent']);
 	}
+
+	/**
+	 * @dataProvider dataTestIsPartialFile
+	 *
+	 * @param string $path
+	 * @param bool $expected
+	 */
+	public function testIsPartialFile($path, $expected) {
+		$this->assertSame($expected,
+			$this->scanner->isPartialFile($path)
+		);
+	}
+
+	public function dataTestIsPartialFile() {
+		return [
+			['foo.txt.part', true],
+			['/sub/folder/foo.txt.part', true],
+			['/sub/folder.part/foo.txt', true],
+			['foo.txt', false],
+			['/sub/folder/foo.txt', false],
+		];
+	}
+
 }
-- 
GitLab


From 0738ddfb768c541e8a6b112fb2cd12d15676a0ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 12 Oct 2015 13:59:29 +0200
Subject: [PATCH 778/783] Revert "Move trashbin specific CSS that modifies
 sidebar"

---
 apps/files/css/files.css          | 13 +++++++++++++
 apps/files_trashbin/css/trash.css | 18 ------------------
 core/css/apps.css                 |  1 +
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index bdb02c20546..d0a2cce1a86 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -85,6 +85,19 @@
 	background-image: url('../img/delete.svg');
 }
 
+/* move Deleted Files to bottom of sidebar */
+.nav-trashbin {
+	position: fixed !important;
+	bottom: 44px;
+	width: inherit !important;
+	background-color: #fff;
+	border-right: 1px solid #eee;
+}
+/* double padding to account for Deleted files entry, issue with Firefox */
+.app-files #app-navigation > ul li:nth-last-child(2) {
+	margin-bottom: 44px;
+}
+
 #app-navigation .nav-files a.nav-icon-files {
 	width: auto;
 }
diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css
index 053e2e7002c..15a9249d7b2 100644
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -18,21 +18,3 @@
 #app-content-trashbin #filestable .summary .filesize {
 	display: none;
 }
-
-#app-navigation > ul {
-	padding-bottom: 44px;
-}
-
-/* move Deleted Files to bottom of sidebar */
-.nav-trashbin {
-	position: fixed !important;
-	bottom: 44px;
-	width: inherit !important;
-	background-color: #fff;
-	border-right: 1px solid #eee;
-}
-/* double padding to account for Deleted files entry, issue with Firefox */
-.app-files #app-navigation > ul li:nth-last-child(2) {
-	margin-bottom: 44px;
-}
-
diff --git a/core/css/apps.css b/core/css/apps.css
index 4d3d3e39a37..3122a2b48a1 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -35,6 +35,7 @@
 	height: 100%;
 	width: inherit;
 	overflow: auto;
+	padding-bottom: 44px;
 	-moz-box-sizing: border-box; box-sizing: border-box;
 }
 #app-navigation li {
-- 
GitLab


From 81cd823c2a7ef0211e8b3398b969611fe321fd41 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 13 Oct 2015 09:41:52 +1300
Subject: [PATCH 779/783] add specific edit icon

---
 core/css/icons.css        |   4 ++++
 core/img/actions/edit.png | Bin 0 -> 169 bytes
 core/img/actions/edit.svg |   4 ++++
 3 files changed, 8 insertions(+)
 create mode 100644 core/img/actions/edit.png
 create mode 100644 core/img/actions/edit.svg

diff --git a/core/css/icons.css b/core/css/icons.css
index 2461ee46c9f..14b2101b331 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -78,6 +78,10 @@
 	background-image: url('../img/actions/download.svg');
 }
 
+.icon-edit {
+	background-image: url('../img/actions/edit.svg');
+}
+
 .icon-external {
 	background-image: url('../img/actions/external.svg');
 }
diff --git a/core/img/actions/edit.png b/core/img/actions/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca20eba363b77d280b976c690ce778e9c4d2fbe
GIT binary patch
literal 169
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a1=6^{l)y&{Ksk<*AirP+
zBTJ_@A3lFkE!?yhC}!&E;uyjaot)6n+|$>`=PtnPQNBg1K|&#hNAzVzyP=grkc<FZ
n42vh%D$&^@vpiUC7_}%f{Nqts_A$bDJIF#$S3j3^P6<r_-)Sf^

literal 0
HcmV?d00001

diff --git a/core/img/actions/edit.svg b/core/img/actions/edit.svg
new file mode 100644
index 00000000000..a8ab95e615b
--- /dev/null
+++ b/core/img/actions/edit.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0 0.23 0.2061 0.438 0.4316 0.438h11.138c0.226 0 0.432-0.208 0.432-0.438v-10.142c-0.004-0.0669-0.023-0.133-0.055-0.1915l-3.312-3.1992c-0.043-0.0164-0.089-0.0255-0.135-0.0273h-8.0684c-0.0268-0.00265-0.0552-0.00265-0.082 0zm1.6504 1.998h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z"/>
+</svg>
-- 
GitLab


From e03f0542e483c6d678414b0f3338110d0d506e8f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 12 Oct 2015 23:39:16 +0200
Subject: [PATCH 780/783] Strip directory from scriptName

`\OCP\IRequest::getScriptName` will also return the directory, so if ownCloud is installed in a subfolder such as `owncloud/` it will resolve to `/owncloud/ocs/v2.php`. This made this check fail and also made it return invalid status codes.
---
 lib/private/api.php | 10 +++++-----
 tests/lib/api.php   | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/lib/private/api.php b/lib/private/api.php
index cd5148c51a1..10d58f2d9e6 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -386,7 +386,7 @@ class OC_API {
 
 		$meta = $result->getMeta();
 		$data = $result->getData();
-		if (self::isV2()) {
+		if (self::isV2(\OC::$server->getRequest())) {
 			$statusCode = self::mapStatusCodes($result->getStatusCode());
 			if (!is_null($statusCode)) {
 				$meta['statuscode'] = $statusCode;
@@ -449,13 +449,13 @@ class OC_API {
 	}
 
 	/**
-	 * @return boolean
+	 * @param \OCP\IRequest $request
+	 * @return bool
 	 */
-	private static function isV2() {
-		$request = \OC::$server->getRequest();
+	protected static function isV2(\OCP\IRequest $request) {
 		$script = $request->getScriptName();
 
-		return $script === '/ocs/v2.php';
+		return substr($script, -11) === '/ocs/v2.php';
 	}
 
 	/**
diff --git a/tests/lib/api.php b/tests/lib/api.php
index 3b925a63960..f8f03965711 100644
--- a/tests/lib/api.php
+++ b/tests/lib/api.php
@@ -34,6 +34,50 @@ class Test_API extends \Test\TestCase {
 		$this->assertEquals($success, $result->succeeded());
 	}
 
+	/**
+	 * @return array
+	 */
+	public function versionDataScriptNameProvider() {
+		return [
+			// Valid script name
+			[
+				'/master/ocs/v2.php',
+				true,
+			],
+
+			// Invalid script names
+			[
+				'/master/ocs/v2.php/someInvalidPathName',
+				false,
+			],
+			[
+				'/master/ocs/v1.php',
+				false,
+			],
+			[
+				'',
+				false,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider versionDataScriptNameProvider
+	 * @param string $scriptName
+	 * @param bool $expected
+	 */
+	public function testIsV2($scriptName, $expected) {
+		$request = $this->getMockBuilder('\OCP\IRequest')
+			->disableOriginalConstructor()
+			->getMock();
+		$request
+			->expects($this->once())
+			->method('getScriptName')
+			->will($this->returnValue($scriptName));
+
+		$this->assertEquals($expected, $this->invokePrivate(new \OC_API, 'isV2', [$request]));
+	}
+
 	function dataProviderTestOneResult() {
 		return array(
 			array(100, true),
-- 
GitLab


From 1f146d678c115ba9e6894e5ee6f8f5f3978f0dd9 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 13 Oct 2015 01:55:06 -0400
Subject: [PATCH 781/783] [tx-robot] updated from transifex

---
 apps/files/l10n/th_TH.js            |  3 +++
 apps/files/l10n/th_TH.json          |  3 +++
 apps/files_external/l10n/de.js      |  6 ++++++
 apps/files_external/l10n/de.json    |  6 ++++++
 apps/files_external/l10n/fr.js      |  2 +-
 apps/files_external/l10n/fr.json    |  2 +-
 apps/files_external/l10n/lt_LT.js   |  1 +
 apps/files_external/l10n/lt_LT.json |  1 +
 apps/files_sharing/l10n/de.js       |  9 +++++++++
 apps/files_sharing/l10n/de.json     |  9 +++++++++
 apps/files_sharing/l10n/fr.js       |  1 +
 apps/files_sharing/l10n/fr.json     |  1 +
 apps/files_sharing/l10n/th_TH.js    |  8 ++++++++
 apps/files_sharing/l10n/th_TH.json  |  8 ++++++++
 core/l10n/fr.js                     | 10 +++++-----
 core/l10n/fr.json                   | 10 +++++-----
 core/l10n/th_TH.js                  |  1 +
 core/l10n/th_TH.json                |  1 +
 lib/l10n/lt_LT.js                   |  1 +
 lib/l10n/lt_LT.json                 |  1 +
 settings/l10n/de.js                 |  3 +++
 settings/l10n/de.json               |  3 +++
 settings/l10n/lt_LT.js              |  2 ++
 settings/l10n/lt_LT.json            |  2 ++
 settings/l10n/th_TH.js              |  2 ++
 settings/l10n/th_TH.json            |  2 ++
 26 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js
index 021179c6432..1cee4efd362 100644
--- a/apps/files/l10n/th_TH.js
+++ b/apps/files/l10n/th_TH.js
@@ -96,6 +96,9 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s ลบ %1$s ออก",
     "You restored %1$s" : "คุณกู้คืน %1$s",
     "%2$s restored %1$s" : "%2$s ได้กู้คืน %1$s",
+    "Changed by %2$s" : "เปลี่ยนแปลงโดย %2$s",
+    "Deleted by %2$s" : "ลบโดย %2$s",
+    "Restored by %2$s" : "กู้คืนโดย %2$s",
     "%s could not be renamed as it has been deleted" : "%s ไม่สามารถเปลี่ยนชื่อเนื่องจากถูกลบไปแล้ว",
     "%s could not be renamed" : "%s ไม่สามารถเปลี่ยนชื่อ",
     "Upload (max. %s)" : "อัพโหลด (สูงสุด %s)",
diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json
index 6ce9bc4b9ed..e15e4e5803b 100644
--- a/apps/files/l10n/th_TH.json
+++ b/apps/files/l10n/th_TH.json
@@ -94,6 +94,9 @@
     "%2$s deleted %1$s" : "%2$s ลบ %1$s ออก",
     "You restored %1$s" : "คุณกู้คืน %1$s",
     "%2$s restored %1$s" : "%2$s ได้กู้คืน %1$s",
+    "Changed by %2$s" : "เปลี่ยนแปลงโดย %2$s",
+    "Deleted by %2$s" : "ลบโดย %2$s",
+    "Restored by %2$s" : "กู้คืนโดย %2$s",
     "%s could not be renamed as it has been deleted" : "%s ไม่สามารถเปลี่ยนชื่อเนื่องจากถูกลบไปแล้ว",
     "%s could not be renamed" : "%s ไม่สามารถเปลี่ยนชื่อ",
     "Upload (max. %s)" : "อัพโหลด (สูงสุด %s)",
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index afedf29dc03..633b499934e 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel korrekt sind.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel korrekt sind.",
+    "Please provide a valid app key and secret." : "Bitte trage einen gültigen App-Key mit Secret ein.",
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
@@ -11,6 +14,7 @@ OC.L10N.register(
     "System" : "System",
     "Grant access" : "Zugriff gestatten",
     "Access granted" : "Zugriff gestattet",
+    "Error configuring OAuth2" : "Fehler beim Einrichten von OAuth2",
     "Generate keys" : "Schlüssel erzeugen",
     "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
@@ -28,6 +32,7 @@ OC.L10N.register(
     "OAuth1" : "OAuth1",
     "App key" : "App-Schlüssel",
     "App secret" : "Geheime Zeichenkette der App",
+    "OAuth2" : "OAutch2",
     "Client ID" : "Client-ID",
     "Client secret" : "Geheime Zeichenkette des Client",
     "OpenStack" : "OpenStack",
@@ -76,6 +81,7 @@ OC.L10N.register(
     "Scope" : "Anwendungsbereich",
     "External Storage" : "Externer Speicher",
     "Folder name" : "Ordnername",
+    "Authentication" : "Authentifizierung",
     "Configuration" : "Konfiguration",
     "Available for" : "Verfügbar für",
     "Advanced settings" : "Erweiterte Einstellungen",
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index ef96bdcf0e5..94a89346c5d 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel korrekt sind.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel korrekt sind.",
+    "Please provide a valid app key and secret." : "Bitte trage einen gültigen App-Key mit Secret ein.",
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
@@ -9,6 +12,7 @@
     "System" : "System",
     "Grant access" : "Zugriff gestatten",
     "Access granted" : "Zugriff gestattet",
+    "Error configuring OAuth2" : "Fehler beim Einrichten von OAuth2",
     "Generate keys" : "Schlüssel erzeugen",
     "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
@@ -26,6 +30,7 @@
     "OAuth1" : "OAuth1",
     "App key" : "App-Schlüssel",
     "App secret" : "Geheime Zeichenkette der App",
+    "OAuth2" : "OAutch2",
     "Client ID" : "Client-ID",
     "Client secret" : "Geheime Zeichenkette des Client",
     "OpenStack" : "OpenStack",
@@ -74,6 +79,7 @@
     "Scope" : "Anwendungsbereich",
     "External Storage" : "Externer Speicher",
     "Folder name" : "Ordnername",
+    "Authentication" : "Authentifizierung",
     "Configuration" : "Konfiguration",
     "Available for" : "Verfügbar für",
     "Advanced settings" : "Erweiterte Einstellungen",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 4c249dde970..464508ad298 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -8,7 +8,7 @@ OC.L10N.register(
     "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
-    "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
+    "Invalid backend or authentication mechanism class" : "Service ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
     "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 19796488b74..993ea0b95f4 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -6,7 +6,7 @@
     "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
-    "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
+    "Invalid backend or authentication mechanism class" : "Service ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
     "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
diff --git a/apps/files_external/l10n/lt_LT.js b/apps/files_external/l10n/lt_LT.js
index 9232ec997d2..741d507db42 100644
--- a/apps/files_external/l10n/lt_LT.js
+++ b/apps/files_external/l10n/lt_LT.js
@@ -5,6 +5,7 @@ OC.L10N.register(
     "Personal" : "Asmeniniai",
     "Grant access" : "Suteikti priėjimą",
     "Access granted" : "Priėjimas suteiktas",
+    "Saved" : "Išsaugoti",
     "None" : "Nieko",
     "Username" : "Prisijungimo vardas",
     "Password" : "Slaptažodis",
diff --git a/apps/files_external/l10n/lt_LT.json b/apps/files_external/l10n/lt_LT.json
index d196c8e00bd..152c48a1035 100644
--- a/apps/files_external/l10n/lt_LT.json
+++ b/apps/files_external/l10n/lt_LT.json
@@ -3,6 +3,7 @@
     "Personal" : "Asmeniniai",
     "Grant access" : "Suteikti priėjimą",
     "Access granted" : "Priėjimas suteiktas",
+    "Saved" : "Išsaugoti",
     "None" : "Nieko",
     "Username" : "Prisijungimo vardas",
     "Password" : "Slaptažodis",
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 0eb2b032e52..295c7cdbb76 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -45,8 +45,16 @@ OC.L10N.register(
     "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben",
     "Downloaded via public link" : "Runtergeladen mittels öffentlichen Link",
     "Shared with %2$s" : "Geteilt mit %2$s",
+    "Shared with group %2$s" : "Geteilt mit Gruppe %2$s",
+    "Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s",
+    "Shared with group %3$s by %2$s" : "Geteilt mit Gruppe %3$s von %2$s",
+    "Shared via link by %2$s" : "Geteilt mittels Link von %2$s",
+    "Shared by %2$s" : "Geteilt von %2$s",
+    "Shared via public link" : "Geteilt mittels öffentlichen Link",
     "Shares" : "Freigaben",
+    "You received %2$s as a remote share from %1$s" : "Du hast %2$s als Remotefreigabe von %1$s erhalten",
     "Accept" : "Ok",
+    "Decline" : "Abgelehnt",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID",
     "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
@@ -72,6 +80,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
     "Share it:" : "Zum Teilen:",
+    "Add to your website" : "Zu deiner Webseite hinzufügen",
     "Share with me via ownCloud" : "Teile mit mir über ownCloud",
     "HTML Code:" : "HTML-Code:"
 },
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 3c0b3dd5714..690e7596ffc 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -43,8 +43,16 @@
     "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben",
     "Downloaded via public link" : "Runtergeladen mittels öffentlichen Link",
     "Shared with %2$s" : "Geteilt mit %2$s",
+    "Shared with group %2$s" : "Geteilt mit Gruppe %2$s",
+    "Shared with %3$s by %2$s" : "Geteilt mit %3$s von %2$s",
+    "Shared with group %3$s by %2$s" : "Geteilt mit Gruppe %3$s von %2$s",
+    "Shared via link by %2$s" : "Geteilt mittels Link von %2$s",
+    "Shared by %2$s" : "Geteilt von %2$s",
+    "Shared via public link" : "Geteilt mittels öffentlichen Link",
     "Shares" : "Freigaben",
+    "You received %2$s as a remote share from %1$s" : "Du hast %2$s als Remotefreigabe von %1$s erhalten",
     "Accept" : "Ok",
+    "Decline" : "Abgelehnt",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID",
     "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
@@ -70,6 +78,7 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
     "Share it:" : "Zum Teilen:",
+    "Add to your website" : "Zu deiner Webseite hinzufügen",
     "Share with me via ownCloud" : "Teile mit mir über ownCloud",
     "HTML Code:" : "HTML-Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index fc8c95c39e6..31680b85fcd 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -40,6 +40,7 @@ OC.L10N.register(
     "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s a partagé %1$s avec %3$s",
     "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
+    "%2$s shared %1$s via link" : "%2$s a partagé %1$s par lien",
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Downloaded via public link" : "Téléchargé par lien public",
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 7b1c7c2f1ce..6a3cca61374 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -38,6 +38,7 @@
     "You shared %1$s with group %2$s" : "Vous avez partagé %1$s avec le groupe %2$s",
     "%2$s shared %1$s with %3$s" : "%2$s a partagé %1$s avec %3$s",
     "%2$s shared %1$s with group %3$s" : "%2$s partagé %1$s avec le groupe %3$s",
+    "%2$s shared %1$s via link" : "%2$s a partagé %1$s par lien",
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Downloaded via public link" : "Téléchargé par lien public",
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
index c5b644cf254..b1400469af8 100644
--- a/apps/files_sharing/l10n/th_TH.js
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -43,6 +43,14 @@ OC.L10N.register(
     "%2$s shared %1$s via link" : "%2$s ได้แชร์ %1$s ผ่านลิงค์",
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
+    "Downloaded via public link" : "ดาวน์โหลดผ่านลิงค์สาธารณะ",
+    "Shared with %2$s" : "แชร์กับ %2$s",
+    "Shared with group %2$s" : "แชร์กับกลุ่ม %2$s",
+    "Shared with %3$s by %2$s" : "แชร์กับ %3$s โดย %2$s",
+    "Shared with group %3$s by %2$s" : "แชร์กับกลุ่ม %3$s โดย %2$s",
+    "Shared via link by %2$s" : "แชร์ผ่านลิงค์โดย %2$s",
+    "Shared by %2$s" : "แชร์โดย %2$s",
+    "Shared via public link" : "แชร์ผ่านลิงค์สาธารณะ",
     "Shares" : "แชร์",
     "You received %2$s as a remote share from %1$s" : "คุณได้รับรีโมทแชร์ %2$s จาก %1$s",
     "Accept" : "ยอมรับ",
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
index 4ff45e2734e..a9ee8d6eb53 100644
--- a/apps/files_sharing/l10n/th_TH.json
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -41,6 +41,14 @@
     "%2$s shared %1$s via link" : "%2$s ได้แชร์ %1$s ผ่านลิงค์",
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
+    "Downloaded via public link" : "ดาวน์โหลดผ่านลิงค์สาธารณะ",
+    "Shared with %2$s" : "แชร์กับ %2$s",
+    "Shared with group %2$s" : "แชร์กับกลุ่ม %2$s",
+    "Shared with %3$s by %2$s" : "แชร์กับ %3$s โดย %2$s",
+    "Shared with group %3$s by %2$s" : "แชร์กับกลุ่ม %3$s โดย %2$s",
+    "Shared via link by %2$s" : "แชร์ผ่านลิงค์โดย %2$s",
+    "Shared by %2$s" : "แชร์โดย %2$s",
+    "Shared via public link" : "แชร์ผ่านลิงค์สาธารณะ",
     "Shares" : "แชร์",
     "You received %2$s as a remote share from %1$s" : "คุณได้รับรีโมทแชร์ %2$s จาก %1$s",
     "Accept" : "ยอมรับ",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 678429e9c75..eac5c9ad233 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -109,7 +109,7 @@ OC.L10N.register(
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Aucun cache de la mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a href=\"{docLink}\">documentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP, ce qui est fortement déconseillé pour des raisons de sécurité. Plus d'informations peuvent être trouvées dans notre <a href=\"{docLink}\">documentation</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La version de PHP utilisée ({version}) <a href=\"{phpLink}\">n'est plus prise en charge par les créateurs de PHP</a>. Nous vous recommandons de mettre à niveau votre installation de PHP pour bénéficier de meilleures performances et des mises à jour de sécurité fournies par PHP.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "L'entête du fichier de configuration du reverse proxy est incorrect, ou vous accédez ownCloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accédé ownCloud depuis un proxy de confiance, ceci est un problème de sécurité and peut permettre à un attaquant de parodier son adresse IP visible par ownCloud. Plus d'information est accessible dans notre <a href=\"{docLink}\">documentation</a>.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configuration des headers du reverse proxy est incorrecte, ou vous accédez ownCloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accéder à ownCloud depuis un proxy de confiance, ceci est un problème de sécurité qui peut permettre à un attaquant de masquer sa véritable adresse IP. <a href=\"{docLink}\">Plus d'info dans la documentation.</a>",
     "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est donc recommandé d'ajuster ce paramètre.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans notre <a href=\"{docUrl}\">Guide pour le renforcement et la sécurité</a>.",
@@ -145,9 +145,9 @@ OC.L10N.register(
     "Unshare" : "Ne plus partager",
     "can share" : "peut partager",
     "can edit" : "peut modifier",
-    "create" : "créer",
+    "create" : "création",
     "change" : "modification",
-    "delete" : "supprimer",
+    "delete" : "suppression",
     "access control" : "contrôle d'accès",
     "Share details could not be loaded for this item." : "Les informations de partage n'ont pu être chargées pour cet élément.",
     "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer",
@@ -227,7 +227,7 @@ OC.L10N.register(
     "Storage & database" : "Stockage & base de données",
     "Data folder" : "Répertoire des données",
     "Configure the database" : "Configurer la base de données",
-    "Only %s is available." : "%s seulement est disponible.",
+    "Only %s is available." : "Seul(e) %s est disponible.",
     "Install and activate additional PHP modules to choose other database types." : "Installez et activez les modules PHP additionnels adéquats pour choisir d'autres types de base de données.",
     "For more details check out the documentation." : "Consultez la documentation pour plus de détails.",
     "Database user" : "Utilisateur de la base de données",
@@ -235,7 +235,7 @@ OC.L10N.register(
     "Database name" : "Nom de la base de données",
     "Database tablespace" : "Tablespace de la base de données",
     "Database host" : "Hôte de la base de données",
-    "Performance warning" : "Avertissement de performance",
+    "Performance warning" : "Avertissement à propos des performances",
     "SQLite will be used as database." : "SQLite sera utilisé comme gestionnaire de base de données.",
     "For larger installations we recommend to choose a different database backend." : "Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 105a6b25697..18817897c43 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -107,7 +107,7 @@
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Aucun cache de la mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a href=\"{docLink}\">documentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP, ce qui est fortement déconseillé pour des raisons de sécurité. Plus d'informations peuvent être trouvées dans notre <a href=\"{docLink}\">documentation</a>.",
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La version de PHP utilisée ({version}) <a href=\"{phpLink}\">n'est plus prise en charge par les créateurs de PHP</a>. Nous vous recommandons de mettre à niveau votre installation de PHP pour bénéficier de meilleures performances et des mises à jour de sécurité fournies par PHP.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "L'entête du fichier de configuration du reverse proxy est incorrect, ou vous accédez ownCloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accédé ownCloud depuis un proxy de confiance, ceci est un problème de sécurité and peut permettre à un attaquant de parodier son adresse IP visible par ownCloud. Plus d'information est accessible dans notre <a href=\"{docLink}\">documentation</a>.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configuration des headers du reverse proxy est incorrecte, ou vous accédez ownCloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accéder à ownCloud depuis un proxy de confiance, ceci est un problème de sécurité qui peut permettre à un attaquant de masquer sa véritable adresse IP. <a href=\"{docLink}\">Plus d'info dans la documentation.</a>",
     "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est donc recommandé d'ajuster ce paramètre.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans notre <a href=\"{docUrl}\">Guide pour le renforcement et la sécurité</a>.",
@@ -143,9 +143,9 @@
     "Unshare" : "Ne plus partager",
     "can share" : "peut partager",
     "can edit" : "peut modifier",
-    "create" : "créer",
+    "create" : "création",
     "change" : "modification",
-    "delete" : "supprimer",
+    "delete" : "suppression",
     "access control" : "contrôle d'accès",
     "Share details could not be loaded for this item." : "Les informations de partage n'ont pu être chargées pour cet élément.",
     "An error occured. Please try again" : "Une erreur est survenue. Merci de réessayer",
@@ -225,7 +225,7 @@
     "Storage & database" : "Stockage & base de données",
     "Data folder" : "Répertoire des données",
     "Configure the database" : "Configurer la base de données",
-    "Only %s is available." : "%s seulement est disponible.",
+    "Only %s is available." : "Seul(e) %s est disponible.",
     "Install and activate additional PHP modules to choose other database types." : "Installez et activez les modules PHP additionnels adéquats pour choisir d'autres types de base de données.",
     "For more details check out the documentation." : "Consultez la documentation pour plus de détails.",
     "Database user" : "Utilisateur de la base de données",
@@ -233,7 +233,7 @@
     "Database name" : "Nom de la base de données",
     "Database tablespace" : "Tablespace de la base de données",
     "Database host" : "Hôte de la base de données",
-    "Performance warning" : "Avertissement de performance",
+    "Performance warning" : "Avertissement à propos des performances",
     "SQLite will be used as database." : "SQLite sera utilisé comme gestionnaire de base de données.",
     "For larger installations we recommend to choose a different database backend." : "Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index 1ceb8e7d2dd..07324c614a8 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Couldn't send mail to following users: %s " : "ไม่สามารถส่งอีเมลไปยังผู้ใช้: %s",
     "Preparing update" : "เตรียมอัพเดท",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "ทดสอบการย้ายจะถูกข้าม \"update.skip-migration-test\" สามารถเปิดใช้งานได้ใน config.php",
     "Turned on maintenance mode" : "เปิดโหมดการบำรุงรักษา",
     "Turned off maintenance mode" : "ปิดโหมดการบำรุงรักษา",
     "Maintenance mode is kept active" : "โหมดการบำรุงรักษาจะถูกเก็บไว้ใช้งาน",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index 53954b3110b..7d700b9adf6 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "ไม่สามารถส่งอีเมลไปยังผู้ใช้: %s",
     "Preparing update" : "เตรียมอัพเดท",
+    "Migration tests are skipped - \"update.skip-migration-test\" is activated in config.php" : "ทดสอบการย้ายจะถูกข้าม \"update.skip-migration-test\" สามารถเปิดใช้งานได้ใน config.php",
     "Turned on maintenance mode" : "เปิดโหมดการบำรุงรักษา",
     "Turned off maintenance mode" : "ปิดโหมดการบำรุงรักษา",
     "Maintenance mode is kept active" : "โหมดการบำรุงรักษาจะถูกเก็บไว้ใช้งาน",
diff --git a/lib/l10n/lt_LT.js b/lib/l10n/lt_LT.js
index 47c5e4adba5..b379bdb2443 100644
--- a/lib/l10n/lt_LT.js
+++ b/lib/l10n/lt_LT.js
@@ -17,6 +17,7 @@ OC.L10N.register(
     "_%n minute ago_::_%n minutes ago_" : ["prieš %n min.","Prieš % minutes","Prieš %n minučių"],
     "seconds ago" : "prieš sekundę",
     "web services under your control" : "jūsų valdomos web paslaugos",
+    "File name contains at least one invalid character" : "Failo vardas sudarytas iš neleistinų simbolių",
     "App directory already exists" : "Programos aplankas jau egzistuoja",
     "Can't create app folder. Please fix permissions. %s" : "Nepavyksta sukurti aplanko. Prašome pataisyti leidimus. %s",
     "No source specified when installing app" : "Nenurodytas šaltinis diegiant programą",
diff --git a/lib/l10n/lt_LT.json b/lib/l10n/lt_LT.json
index ab7eabe5d22..9ef545b9ebb 100644
--- a/lib/l10n/lt_LT.json
+++ b/lib/l10n/lt_LT.json
@@ -15,6 +15,7 @@
     "_%n minute ago_::_%n minutes ago_" : ["prieš %n min.","Prieš % minutes","Prieš %n minučių"],
     "seconds ago" : "prieš sekundę",
     "web services under your control" : "jūsų valdomos web paslaugos",
+    "File name contains at least one invalid character" : "Failo vardas sudarytas iš neleistinų simbolių",
     "App directory already exists" : "Programos aplankas jau egzistuoja",
     "Can't create app folder. Please fix permissions. %s" : "Nepavyksta sukurti aplanko. Prašome pataisyti leidimus. %s",
     "No source specified when installing app" : "Nenurodytas šaltinis diegiant programą",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index c9cab4d9ecb..39fc0de9362 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Deinstallieren…",
     "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
     "Uninstall" : "Deinstallieren",
+    "App update" : "App aktualisiert",
     "An error occurred: {message}" : "Ein Fehler ist aufgetreten: {message}",
     "Select a profile picture" : "Wähle ein Profilbild",
     "Very weak password" : "Sehr schwaches Passwort",
@@ -153,6 +154,8 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Please read carefully before activating server-side encryption: " : "Bitte sorgfältig lesen, bevor die serverseitige Verschlüsselung aktiviert wird:",
+    "Be aware that encryption always increases the file size." : "Sei dir bewusst, dass die Verschlüsselung immer die Dateigröße erhöht.",
     "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 637a1381eeb..52781799d0b 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -75,6 +75,7 @@
     "Uninstalling ...." : "Deinstallieren…",
     "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
     "Uninstall" : "Deinstallieren",
+    "App update" : "App aktualisiert",
     "An error occurred: {message}" : "Ein Fehler ist aufgetreten: {message}",
     "Select a profile picture" : "Wähle ein Profilbild",
     "Very weak password" : "Sehr schwaches Passwort",
@@ -151,6 +152,8 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
+    "Please read carefully before activating server-side encryption: " : "Bitte sorgfältig lesen, bevor die serverseitige Verschlüsselung aktiviert wird:",
+    "Be aware that encryption always increases the file size." : "Sei dir bewusst, dass die Verschlüsselung immer die Dateigröße erhöht.",
     "This is the final warning: Do you really want to enable encryption?" : "Dies ist die letzte Warnung: Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js
index 616923182cd..75a9eab3986 100644
--- a/settings/l10n/lt_LT.js
+++ b/settings/l10n/lt_LT.js
@@ -19,6 +19,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.",
     "Unable to change password" : "Nepavyksta pakeisti slaptažodžio",
     "Enabled" : "Įjungta",
+    "Saved" : "Išsaugoti",
     "Email sent" : "Laiškas išsiųstas",
     "Email saved" : "El. paštas išsaugotas",
     "All" : "Viskas",
@@ -57,6 +58,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kas 15 minučių per http.",
     "Encryption" : "Šifravimas",
+    "Authentication required" : "Reikalinga autentikacija",
     "Server address" : "Serverio adresas",
     "Port" : "Prievadas",
     "Log level" : "Žurnalo išsamumas",
diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json
index d78b5fc8632..ee3c7ff0747 100644
--- a/settings/l10n/lt_LT.json
+++ b/settings/l10n/lt_LT.json
@@ -17,6 +17,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.",
     "Unable to change password" : "Nepavyksta pakeisti slaptažodžio",
     "Enabled" : "Įjungta",
+    "Saved" : "Išsaugoti",
     "Email sent" : "Laiškas išsiųstas",
     "Email saved" : "El. paštas išsaugotas",
     "All" : "Viskas",
@@ -55,6 +56,7 @@
     "Execute one task with each page loaded" : "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kas 15 minučių per http.",
     "Encryption" : "Šifravimas",
+    "Authentication required" : "Reikalinga autentikacija",
     "Server address" : "Serverio adresas",
     "Port" : "Prievadas",
     "Log level" : "Žurnalo išsamumas",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index cedc077652c..11dfd5273d2 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "กำลังถอนการติดตั้ง ...",
     "Error while uninstalling app" : "เกิดข้อผิดพลาดขณะถอนการติดตั้งแอพพลิเคชัน",
     "Uninstall" : "ถอนการติดตั้ง",
+    "App update" : "อัพเดทแอพฯ",
     "An error occurred: {message}" : "เกิดข้อผิดพลาด: {message}",
     "Select a profile picture" : "เลือกรูปภาพโปรไฟล์",
     "Very weak password" : "รหัสผ่านระดับต่ำมาก",
@@ -158,6 +159,7 @@ OC.L10N.register(
     "Use system's cron service to call the cron.php file every 15 minutes." : "บริการ cron ของระบบจะเรียกไฟล์ cron.php ทุกq 15 นาที",
     "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
     "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
+    "Be aware that encryption always increases the file size." : "โปรดทราบว่าหากเข้ารหัสไฟล์จะทำให้ขนาดของไฟล์ใหญ่ขึ้น",
     "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index c09be59ac2c..ac669176f92 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -75,6 +75,7 @@
     "Uninstalling ...." : "กำลังถอนการติดตั้ง ...",
     "Error while uninstalling app" : "เกิดข้อผิดพลาดขณะถอนการติดตั้งแอพพลิเคชัน",
     "Uninstall" : "ถอนการติดตั้ง",
+    "App update" : "อัพเดทแอพฯ",
     "An error occurred: {message}" : "เกิดข้อผิดพลาด: {message}",
     "Select a profile picture" : "เลือกรูปภาพโปรไฟล์",
     "Very weak password" : "รหัสผ่านระดับต่ำมาก",
@@ -156,6 +157,7 @@
     "Use system's cron service to call the cron.php file every 15 minutes." : "บริการ cron ของระบบจะเรียกไฟล์ cron.php ทุกq 15 นาที",
     "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
     "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
+    "Be aware that encryption always increases the file size." : "โปรดทราบว่าหากเข้ารหัสไฟล์จะทำให้ขนาดของไฟล์ใหญ่ขึ้น",
     "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
-- 
GitLab


From b2ae4cab52437d7b890517e6276fd743b55211eb Mon Sep 17 00:00:00 2001
From: RealRancor <Fisch.666@gmx.de>
Date: Wed, 23 Sep 2015 10:04:41 +0200
Subject: [PATCH 782/783] Restructure config.sample.php of master

---
 config/config.sample.php | 62 ++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 432569f12a9..743d76aae35 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -54,12 +54,6 @@ $CONFIG = array(
  */
 'passwordsalt' => '',
 
-/**
- * The hashing cost used by hashes generated by ownCloud
- * Using a higher value requires more time and CPU power to calculate the hashes
- */
-'hashingCost' => 10,
-
 /**
  * Your list of trusted domains that users can log into. Specifying trusted
  * domains prevents host header poisoning. Do not remove this, as it performs
@@ -79,16 +73,6 @@ $CONFIG = array(
  */
 'datadirectory' => '/var/www/owncloud/data',
 
-/**
- * Override where ownCloud stores temporary files. Useful in situations where
- * the system temporary directory is on a limited space ramdisk or is otherwise
- * restricted, or if external storages which do not support streaming are in
- * use.
- *
- * The web server user must have write access to this directory.
- */
-'tempdirectory' => '/tmp/owncloudtemp',
-
 /**
  * The current version number of your ownCloud installation. This is set up
  * during installation and update, so you shouldn't need to change it.
@@ -139,20 +123,6 @@ $CONFIG = array(
  */
 'dbtableprefix' => '',
 
-/**
- * Additional driver options for the database connection, eg. to enable SSL
- * encryption in MySQL.
- */
-'dbdriveroptions' => array(
-	PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
-),
-
-/**
- * sqlite3 journal mode can be specified using this config parameter - can be
- * 'WAL' or 'DELETE' see for more details https://www.sqlite.org/wal.html
- */
-'sqlite.journal_mode' => 'DELETE',
-
 /**
  * Indicates whether the ownCloud instance was installed successfully; ``true``
  * indicates a successful installation, and ``false`` indicates an unsuccessful
@@ -974,6 +944,24 @@ $CONFIG = array(
 	),
 ),
 
+/**
+ * All other config options
+ */
+
+/**
+ * Additional driver options for the database connection, eg. to enable SSL
+ * encryption in MySQL.
+ */
+'dbdriveroptions' => array(
+	PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
+),
+
+/**
+ * sqlite3 journal mode can be specified using this config parameter - can be
+ * 'WAL' or 'DELETE' see for more details https://www.sqlite.org/wal.html
+ */
+'sqlite.journal_mode' => 'DELETE',
+
 /**
  * Database types that are supported for installation.
  *
@@ -991,8 +979,20 @@ $CONFIG = array(
 ),
 
 /**
- * All other config options
+ * Override where ownCloud stores temporary files. Useful in situations where
+ * the system temporary directory is on a limited space ramdisk or is otherwise
+ * restricted, or if external storages which do not support streaming are in
+ * use.
+ *
+ * The web server user must have write access to this directory.
  */
+'tempdirectory' => '/tmp/owncloudtemp',
+
+/**
+ * The hashing cost used by hashes generated by ownCloud
+ * Using a higher value requires more time and CPU power to calculate the hashes
+ */
+'hashingCost' => 10,
 
 /**
  * Blacklist a specific file or files and disallow the upload of files
-- 
GitLab


From f89e7769dca70c4e11213e087dc2fe58519635a6 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 13 Oct 2015 11:52:56 +0200
Subject: [PATCH 783/783] Fix testDeleteStorage signature to match the one from
 the base class

Prevents Strict warning when running autotest-external.sh
---
 .../tests/service/userglobalstoragesservicetest.php          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php
index 7c2516f0477..1b902b6eee5 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php
@@ -155,8 +155,9 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 
 	/**
 	 * @expectedException \DomainException
+	 * @dataProvider deleteStorageDataProvider
 	 */
-	public function testDeleteStorage() {
+	public function testDeleteStorage($backendOptions, $rustyStorageId, $expectedCountAfterDeletion) {
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
 		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
 
@@ -164,7 +165,7 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$storage->setMountPoint('mountpoint');
 		$storage->setBackend($backend);
 		$storage->setAuthMechanism($authMechanism);
-		$storage->setBackendOptions(['password' => 'testPassword']);
+		$storage->setBackendOptions($backendOptions);
 
 		$newStorage = $this->globalStoragesService->addStorage($storage);
 		$this->assertEquals(1, $newStorage->getId());
-- 
GitLab